openstack/openstack-helm-infra
Code Issues Proposed changes

Move to v0.3.1 of kubernetes-entrypoint

Browse Source 
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
This commit is contained in:
Sean Eagan 2018-04-10 09:34:56 -05:00
parent 3fe018d7d3
commit f402171e42
17 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calico/values.yaml
View File

@ -33,7 +33,7 @@ images:
calico_ctl: quay.io/calico/ctl:v1.6.2 calico_ctl: quay.io/calico/ctl:v1.6.2
calico_settings: 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 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
elasticsearch/values.yaml
View File

@ -24,7 +24,7 @@ images:
elasticsearch: docker.io/elasticsearch:5.6.4 elasticsearch: docker.io/elasticsearch:5.6.4
helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.0.1 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 snapshot_repository: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"

2
flannel/values.yaml
View File

@ -22,7 +22,7 @@ labels:
images: images:
tags: tags:
flannel: quay.io/coreos/flannel:v0.8.0-amd64 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
fluent-logging/values.yaml
View File

@ -37,7 +37,7 @@ images:
fluentbit: docker.io/fluent/fluent-bit:0.12.14 fluentbit: docker.io/fluent/fluent-bit:0.12.14
fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata fluentd: docker.io/kolla/ubuntu-source-fluentd:ocata
prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1 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 helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
elasticsearch_template: 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 image_repo_sync: docker.io/docker:17.07.0

2
grafana/values.yaml
View File

@ -20,7 +20,7 @@ images:
tags: tags:
grafana: docker.io/grafana/grafana:4.5.2 grafana: docker.io/grafana/grafana:4.5.2
datasource: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 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 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 grafana_db_session_sync: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
image_repo_sync: docker.io/docker:17.07.0 image_repo_sync: docker.io/docker:17.07.0

9
helm-toolkit/templates/snippets/_kubernetes_entrypoint_init_container.tpl
View File

@ -47,13 +47,20 @@ limitations under the License.
value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/ value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
- name: DEPENDENCY_SERVICE - name: DEPENDENCY_SERVICE
value: "{{ tuple $deps.services $envAll | include "helm-toolkit.utils.comma_joined_service_list" }}" 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 - name: DEPENDENCY_JOBS
value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.jobs }}" value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.jobs }}"
{{- else }}
- name: DEPENDENCY_JOBS_JSON
value: {{- toJson $deps.jobs | quote -}}
{{- end -}}
{{- end }}
- name: DEPENDENCY_DAEMONSET - name: DEPENDENCY_DAEMONSET
value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}" value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.daemonset }}"
- name: DEPENDENCY_CONTAINER - name: DEPENDENCY_CONTAINER
value: "{{ include "helm-toolkit.utils.joinListWithComma" $deps.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 }} value: {{ if $deps.pod }}{{ toJson $deps.pod | quote }}{{ else }}""{{ end }}
- name: COMMAND - name: COMMAND
value: "echo done" value: "echo done"

2
kibana/values.yaml
View File

@ -24,7 +24,7 @@ images:
tags: tags:
apache_proxy: docker.io/httpd:2.4 apache_proxy: docker.io/httpd:2.4
kibana: docker.io/kibana:5.6.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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
kube-dns/values.yaml
View File

@ -24,7 +24,7 @@ images:
kube_dns: gcr.io/google_containers/k8s-dns-kube-dns-amd64:1.14.5 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_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 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
nfs-provisioner/values.yaml
View File

@ -47,7 +47,7 @@ pod:
images: images:
tags: tags:
nfs_provisioner: quay.io/kubernetes_incubator/nfs-provisioner:v1.0.8 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
prometheus-alertmanager/values.yaml
View File

@ -20,7 +20,7 @@
images: images:
tags: tags:
alertmanager: docker.io/prom/alertmanager:v0.11.0 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
prometheus-kube-state-metrics/values.yaml
View File

@ -19,7 +19,7 @@
images: images:
tags: tags:
kube_state_metrics: quay.io/coreos/kube-state-metrics:v1.2.0 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
prometheus-node-exporter/values.yaml
View File

@ -19,7 +19,7 @@
images: images:
tags: tags:
node_exporter: docker.io/prom/node-exporter:v0.15.0 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
prometheus-openstack-exporter/values.yaml
View File

@ -19,7 +19,7 @@
images: images:
tags: tags:
prometheus_openstack_exporter: docker.io/rakeshpatnaik/prometheus-openstack-exporter:v0.1 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 image_repo_sync: docker.io/docker:17.07.0
ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
pull_policy: IfNotPresent pull_policy: IfNotPresent

2
prometheus/values.yaml
View File

@ -21,7 +21,7 @@ images:
tags: tags:
prometheus: docker.io/prom/prometheus:v2.0.0 prometheus: docker.io/prom/prometheus:v2.0.0
helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

2
redis/values.yaml
View File

@ -20,7 +20,7 @@
images: images:
tags: tags:
redis: docker.io/redis:4.0.1 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry:

4
registry/values.yaml
View File

@ -32,7 +32,7 @@ images:
registry: docker.io/registry:2 registry: docker.io/registry:2
registry_proxy: gcr.io/google_containers/kube-registry-proxy:0.4 registry_proxy: gcr.io/google_containers/kube-registry-proxy:0.4
bootstrap: docker.io/docker:17.07.0 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" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@ -121,7 +121,7 @@ bootstrap:
script: script:
docker info docker info
preload_images: preload_images:
- quay.io/stackanetes/kubernetes-entrypoint:v0.3.0 - quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
dependencies: dependencies:
static: static:

2
tiller/values.yaml
View File

@ -27,7 +27,7 @@ release_group: null
images: images:
tags: tags:
tiller: gcr.io/kubernetes-helm/tiller:v2.8.2 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 image_repo_sync: docker.io/docker:17.07.0
pull_policy: IfNotPresent pull_policy: IfNotPresent
local_registry: local_registry: