From f402171e42356bc1e805782f1d7f090ce1f6ab17 Mon Sep 17 00:00:00 2001 From: Sean Eagan Date: Tue, 10 Apr 2018 09:34:56 -0500 Subject: [PATCH] Move to v0.3.1 of kubernetes-entrypoint Move to v0.3.1 of kubernetes-entrypoint which has 2 breaking changes to pod dependencies, and also adds support for depending on jobs via labels. Change-Id: I2bafc2153ddd46b3833b253a2e7950bccbccf8ed --- calico/values.yaml | 2 +- elasticsearch/values.yaml | 2 +- flannel/values.yaml | 2 +- fluent-logging/values.yaml | 2 +- grafana/values.yaml | 2 +- .../snippets/_kubernetes_entrypoint_init_container.tpl | 9 ++++++++- kibana/values.yaml | 2 +- kube-dns/values.yaml | 2 +- nfs-provisioner/values.yaml | 2 +- prometheus-alertmanager/values.yaml | 2 +- prometheus-kube-state-metrics/values.yaml | 2 +- prometheus-node-exporter/values.yaml | 2 +- prometheus-openstack-exporter/values.yaml | 2 +- prometheus/values.yaml | 2 +- redis/values.yaml | 2 +- registry/values.yaml | 4 ++-- tiller/values.yaml | 2 +- 17 files changed, 25 insertions(+), 18 deletions(-) diff --git a/calico/values.yaml b/calico/values.yaml index 85b302fac..5ac52fb60 100644 --- a/calico/values.yaml +++ b/calico/values.yaml @@ -33,7 +33,7 @@ images: calico_ctl: quay.io/calico/ctl:v1.6.2 calico_settings: quay.io/calico/ctl:v1.6.2 calico_kube_policy_controller: quay.io/calico/kube-policy-controller:v0.7.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml index c4b9df0ea..95f2e26b9 100644 --- a/elasticsearch/values.yaml +++ b/elasticsearch/values.yaml @@ -24,7 +24,7 @@ images: elasticsearch: docker.io/elasticsearch:5.6.4 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 snapshot_repository: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent" diff --git a/flannel/values.yaml b/flannel/values.yaml index 2b8a8eec4..712a1c7aa 100644 --- a/flannel/values.yaml +++ b/flannel/values.yaml @@ -22,7 +22,7 @@ labels: images: tags: flannel: quay.io/coreos/flannel:v0.8.0-amd64 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml index 5a96679d0..76f4bebbf 100644 --- a/fluent-logging/values.yaml +++ b/fluent-logging/values.yaml @@ -37,7 +37,7 @@ images: fluentbit: docker.io/fluent/fluent-bit:0.12.14 fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 elasticsearch_template: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 image_repo_sync: docker.io/docker:17.07.0 diff --git a/grafana/values.yaml b/grafana/values.yaml index 0a573cfde..f1f8127c0 100644 --- a/grafana/values.yaml +++ b/grafana/values.yaml @@ -20,7 +20,7 @@ images: tags: grafana: docker.io/grafana/grafana:4.5.2 datasource: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 grafana_db_session_sync: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 image_repo_sync: docker.io/docker:17.07.0 diff --git a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl index 41915a78a..70a11ec66 100644 --- a/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl +++ b/helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl @@ -47,13 +47,20 @@ limitations under the License. value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/ - name: DEPENDENCY_SERVICE value: "{{ tuple $deps.services $envAll | include "helm-toolkit.utils.comma_joined_service_list" }}" +{{- if $deps.jobs -}} + {{- if kindIs "string" (index $deps.jobs 0) }} - name: DEPENDENCY_JOBS value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.jobs }}" + {{- else }} + - name: DEPENDENCY_JOBS_JSON + value: {{- toJson $deps.jobs | quote -}} + {{- end -}} +{{- end }} - name: DEPENDENCY_DAEMONSET value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" - name: DEPENDENCY_CONTAINER value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.container }}" - - name: DEPENDENCY_POD + - name: DEPENDENCY_POD_JSON value: {{ if $deps.pod }}{{ toJson $deps.pod | quote }}{{ else }}""{{ end }} - name: COMMAND value: "echo done" diff --git a/kibana/values.yaml b/kibana/values.yaml index 7709dd625..b42ce08a3 100644 --- a/kibana/values.yaml +++ b/kibana/values.yaml @@ -24,7 +24,7 @@ images: tags: apache_proxy: docker.io/httpd:2.4 kibana: docker.io/kibana:5.6.4 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/kube-dns/values.yaml b/kube-dns/values.yaml index fff1ad953..1d35994ff 100644 --- a/kube-dns/values.yaml +++ b/kube-dns/values.yaml @@ -24,7 +24,7 @@ images: kube_dns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 kube_dns_nanny: gcr.io/google_containers/k8s-dns-dnsmasq-nanny-amd64:1.14.5 kube_dns_sidecar: gcr.io/google_containers/k8s-dns-sidecar-amd64:1.14.5 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/nfs-provisioner/values.yaml b/nfs-provisioner/values.yaml index b05819fff..aafe5fa2c 100644 --- a/nfs-provisioner/values.yaml +++ b/nfs-provisioner/values.yaml @@ -47,7 +47,7 @@ pod: images: tags: nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.8 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-alertmanager/values.yaml b/prometheus-alertmanager/values.yaml index 2806cc036..0697e39b2 100644 --- a/prometheus-alertmanager/values.yaml +++ b/prometheus-alertmanager/values.yaml @@ -20,7 +20,7 @@ images: tags: alertmanager: docker.io/prom/alertmanager:v0.11.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-kube-state-metrics/values.yaml b/prometheus-kube-state-metrics/values.yaml index 2448cfa78..9452a153c 100644 --- a/prometheus-kube-state-metrics/values.yaml +++ b/prometheus-kube-state-metrics/values.yaml @@ -19,7 +19,7 @@ images: tags: kube_state_metrics: quay.io/coreos/kube-state-metrics:v1.2.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-node-exporter/values.yaml b/prometheus-node-exporter/values.yaml index 436483297..78f0c11bf 100644 --- a/prometheus-node-exporter/values.yaml +++ b/prometheus-node-exporter/values.yaml @@ -19,7 +19,7 @@ images: tags: node_exporter: docker.io/prom/node-exporter:v0.15.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml index acfa49955..d196efc22 100644 --- a/prometheus-openstack-exporter/values.yaml +++ b/prometheus-openstack-exporter/values.yaml @@ -19,7 +19,7 @@ images: tags: prometheus_openstack_exporter: docker.io/rakeshpatnaik/prometheus-openstack-exporter:v0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 pull_policy: IfNotPresent diff --git a/prometheus/values.yaml b/prometheus/values.yaml index c9ae835f6..9e2d60b41 100644 --- a/prometheus/values.yaml +++ b/prometheus/values.yaml @@ -21,7 +21,7 @@ images: tags: prometheus: docker.io/prom/prometheus:v2.0.0 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/redis/values.yaml b/redis/values.yaml index 081d0e72b..2328ddaa0 100644 --- a/redis/values.yaml +++ b/redis/values.yaml @@ -20,7 +20,7 @@ images: tags: redis: docker.io/redis:4.0.1 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: diff --git a/registry/values.yaml b/registry/values.yaml index 0bbbe2d9a..4a3738d77 100644 --- a/registry/values.yaml +++ b/registry/values.yaml @@ -32,7 +32,7 @@ images: registry: docker.io/registry:2 registry_proxy: gcr.io/google_containers/kube-registry-proxy:0.4 bootstrap: docker.io/docker:17.07.0 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 pull_policy: "IfNotPresent" local_registry: active: false @@ -121,7 +121,7 @@ bootstrap: script: docker info preload_images: - - quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + - quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 dependencies: static: diff --git a/tiller/values.yaml b/tiller/values.yaml index d5aae78ec..7b863a735 100644 --- a/tiller/values.yaml +++ b/tiller/values.yaml @@ -27,7 +27,7 @@ release_group: null images: tags: tiller: gcr.io/kubernetes-helm/tiller:v2.8.2 - dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 + dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: IfNotPresent local_registry: