Prefixed all heapster related applications with heapster_

This commit is contained in:
Vincent Schwarzer 2017-03-02 16:42:29 +01:00
parent 2010f39b42
commit 7ef8d67a26
2 changed files with 17 additions and 16 deletions

View file

@ -91,15 +91,15 @@ fluentd_image_tag: "{{ fluentd_version }}"
kibana_version: "v4.6.1" kibana_version: "v4.6.1"
kibana_image_repo: "gcr.io/google_containers/kibana" kibana_image_repo: "gcr.io/google_containers/kibana"
kibana_image_tag: "{{ kibana_version }}" kibana_image_tag: "{{ kibana_version }}"
grafana_version: "v4.0.2" heapster_grafana_version: "v4.0.2"
grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64" heapster_grafana_image_repo: "gcr.io/google_containers/heapster-grafana-amd64"
grafana_image_tag: "{{ grafana_version }}" heapster_grafana_image_tag: "{{ grafana_version }}"
heapster_version: "v1.3.0-beta.1" heapster_version: "v1.3.0-beta.1"
heapster_image_repo: "gcr.io/google_containers/heapster-amd64" heapster_image_repo: "gcr.io/google_containers/heapster-amd64"
heapster_image_tag: "{{ heapster_version }}" heapster_image_tag: "{{ heapster_version }}"
influxdb_version: "v1.1.1" heapster_influxdb_version: "v1.1.1"
influxdb_image_repo: "gcr.io/google_containers/heapster-influxdb-amd64" heapster_influxdb_image_repo: "gcr.io/google_containers/heapster-influxdb-amd64"
influxdb_image_tag: "{{ influxdb_version }}" heapster_influxdb_image_tag: "{{ influxdb_version }}"
helm_version: "v2.2.2" helm_version: "v2.2.2"
@ -238,6 +238,7 @@ downloads:
repo: "{{ kibana_image_repo }}" repo: "{{ kibana_image_repo }}"
tag: "{{ kibana_image_tag }}" tag: "{{ kibana_image_tag }}"
sha256: "{{ kibana_digest_checksum|default(None) }}" sha256: "{{ kibana_digest_checksum|default(None) }}"
<<<<<<< HEAD
helm: helm:
container: true container: true
repo: "{{ helm_image_repo }}" repo: "{{ helm_image_repo }}"
@ -248,21 +249,21 @@ downloads:
repo: "{{ tiller_image_repo }}" repo: "{{ tiller_image_repo }}"
tag: "{{ tiller_image_tag }}" tag: "{{ tiller_image_tag }}"
sha256: "{{ tiller_digest_checksum|default(None) }}" sha256: "{{ tiller_digest_checksum|default(None) }}"
grafana: heapster_grafana:
container: true container: true
repo: "{{ grafana_image_repo }}" repo: "{{ heapster_grafana_image_repo }}"
tag: "{{ grafana_image_tag }}" tag: "{{ heapster_grafana_image_tag }}"
sha256: "{{ grafana_digest_checksum|default(None) }}" sha256: "{{ heapster_grafana_digest_checksum|default(None) }}"
heapster: heapster:
container: true container: true
repo: "{{ heapster_image_repo }}" repo: "{{ heapster_image_repo }}"
tag: "{{ heapster_image_tag }}" tag: "{{ heapster_image_tag }}"
sha256: "{{ heapster_digest_checksum|default(None) }}" sha256: "{{ heapster_digest_checksum|default(None) }}"
influxdb: heapster_influxdb:
container: true container: true
repo: "{{ influxdb_image_repo }}" repo: "{{ heapster_influxdb_image_repo }}"
tag: "{{ influxdb_image_tag }}" tag: "{{ heapster_influxdb_image_tag }}"
sha256: "{{ influxdb_digest_checksum|default(None) }}" sha256: "{{ heapster_influxdb_digest_checksum|default(None) }}"
download: download:
container: "{{ file.container|default('false') }}" container: "{{ file.container|default('false') }}"

View file

@ -1,8 +1,8 @@
--- ---
dependencies: dependencies:
- role: download - role: download
file: "{{ downloads.grafana }}" file: "{{ downloads.heapster_grafana }}"
- role: download - role: download
file: "{{ downloads.heapster }}" file: "{{ downloads.heapster }}"
- role: download - role: download
file: "{{ downloads.influxdb }}" file: "{{ downloads.heapster_influxdb }}"