openstack/openstack-helm
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: I49d2cea11fbe5c5919ae22a020b877ebbb285992
This commit is contained in:
Sean Eagan 2018-03-28 14:59:57 -05:00
parent 115ee2afb9
commit 97ac197a6e
31 changed files with 84 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
barbican/values.yaml
View File

@ -26,7 +26,7 @@ release_group: null
images:
tags:
bootstrap: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
scripted_test: docker.io/openstackhelm/heat:newton
db_init: docker.io/openstackhelm/heat:newton
barbican_db_sync: docker.io/openstackhelm/barbican:newton

2
ceilometer/values.yaml
View File

@ -55,7 +55,7 @@ images:
ceilometer_collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3
ceilometer_compute: quay.io/larryrensing/ubuntu-source-ceilometer-compute:3.0.3
ceilometer_notification: quay.io/larryrensing/ubuntu-source-ceilometer-notification:3.0.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
network:

2
ceph/values.yaml
View File

@ -34,7 +34,7 @@ images:
ceph_rbd_pool: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
ceph_rbd_provisioner: 'quay.io/external_storage/rbd-provisioner:v0.1.1'
ceph_rgw: 'docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.0'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
ks_endpoints: 'docker.io/openstackhelm/heat:newton'
ks_service: 'docker.io/openstackhelm/heat:newton'
ks_user: 'docker.io/openstackhelm/heat:newton'

2
cinder/values.yaml
View File

@ -59,7 +59,7 @@ images:
cinder_storage_init: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
cinder_backup: docker.io/openstackhelm/cinder:newton
cinder_backup_storage_init: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
jobs:

2
congress/values.yaml
View File

@ -47,7 +47,7 @@ images:
ks_endpoints: docker.io/openstackhelm/heat:newton
congress_ds_create: docker.io/openstackhelm/congress:newton
congress_scripted_test: docker.io/openstackhelm/congress:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
network:

2
doc/source/devref/images.rst
View File

@ -68,7 +68,7 @@ chart:
cfn: docker.io/kolla/ubuntu-source-heat-api:3.0.3
cloudwatch: docker.io/kolla/ubuntu-source-heat-api:3.0.3
engine: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
The OpenStack-Helm project today uses a mix of Docker images from

12
doc/source/devref/networking.rst
View File

@ -139,7 +139,8 @@ for the L2 agent daemonset:
endpoint: internal
pod:
# this should be set to corresponding neutron L2 agent
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-ovs-agent
@ -320,17 +321,20 @@ and use this `neutron/values.yaml` override:
dependencies:
dhcp:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
metadata:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
l3:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
conf:

9
doc/source/specs/support-linux-bridge-on-neutron.rst
View File

@ -99,17 +99,20 @@ updated to reflect the new kind on L2 agent:
dependencies:
dhcp:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
metadata:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
l3:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent

2
etcd/values.yaml
View File

@ -20,7 +20,7 @@
images:
tags:
etcd: 'gcr.io/google_containers/etcd-amd64:2.2.5'
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: IfNotPresent
labels:

2
glance/values.yaml
View File

@ -51,7 +51,7 @@ images:
glance_registry: docker.io/openstackhelm/glance:newton
# Bootstrap image requires curl
bootstrap: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
bootstrap:

2
gnocchi/values.yaml
View File

@ -21,7 +21,7 @@ labels:
images:
tags:
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
gnocchi_storage_init: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
db_init_indexer: docker.io/postgres:9.5
# using non-kolla images until kolla supports postgres as

2
heat/values.yaml
View File

@ -51,7 +51,7 @@ images:
heat_cloudwatch: docker.io/openstackhelm/heat:newton
heat_engine: docker.io/openstackhelm/heat:newton
heat_engine_cleaner: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
jobs:

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

@ -38,13 +38,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 }}"
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"

2
horizon/values.yaml
View File

@ -23,7 +23,7 @@ images:
horizon_db_sync: docker.io/openstackhelm/horizon:newton
db_drop: docker.io/openstackhelm/heat:newton
horizon: docker.io/openstackhelm/horizon:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
release_group: null

4
ingress/values.yaml
View File

@ -25,11 +25,11 @@ deployment:
images:
tags:
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
# https://github.com/kubernetes/ingress-nginx/blob/09524cd3363693463da5bf4a9bb3900da435ad05/Changelog.md#090
ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
error_pages: gcr.io/google_containers/defaultbackend:1.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
pod:

2
ironic/values.yaml
View File

@ -45,7 +45,7 @@ images:
ironic_pxe: docker.io/openstackhelm/ironic:newton
ironic_pxe_init: docker.io/openstackhelm/ironic:newton
ironic_pxe_http: docker.io/nginx:1.13.3
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
conf:

2
keystone/values.yaml
View File

@ -42,7 +42,7 @@ images:
keystone_credential_rotate: docker.io/openstackhelm/keystone:newton
keystone_api: docker.io/openstackhelm/keystone:newton
keystone_domain_manage: docker.io/openstackhelm/keystone:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
bootstrap:

2
ldap/values.yaml
View File

@ -59,7 +59,7 @@ images:
tags:
bootstrap: "docker.io/osixia/openldap:1.2.0"
ldap: "docker.io/osixia/openldap:1.2.0"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: IfNotPresent
dependencies:

2
libvirt/values.yaml
View File

@ -28,7 +28,7 @@ labels:
images:
tags:
libvirt: docker.io/openstackhelm/libvirt:ubuntu-xenial-1.3.1
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
ceph:

2
magnum/values.yaml
View File

@ -42,7 +42,7 @@ images:
ks_endpoints: docker.io/openstackhelm/heat:newton
magnum_api: docker.io/openstackhelm/magnum:newton
magnum_conductor: docker.io/openstackhelm/magnum:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
conf:

2
mariadb/values.yaml
View File

@ -21,7 +21,7 @@ images:
prometheus_create_mysql_user: docker.io/mariadb:10.2.13
prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0
prometheus_mysql_exporter_helm_tests: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: IfNotPresent
labels:

2
memcached/values.yaml
View File

@ -44,7 +44,7 @@ endpoints:
images:
pull_policy: IfNotPresent
tags:
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.0'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
memcached: 'docker.io/memcached:1.5.5'
labels:

2
mistral/values.yaml
View File

@ -39,7 +39,7 @@ release_group: null
images:
tags:
bootstrap: docker.io/openstackhelm/heat:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
db_init: docker.io/openstackhelm/heat:newton
mistral_db_sync: docker.io/kolla/ubuntu-source-mistral-api:3.0.3
db_drop: docker.io/openstackhelm/heat:newton

2
mongodb/values.yaml
View File

@ -40,7 +40,7 @@ pod:
images:
tags:
mongodb: docker.io/mongo:3.4.9-jessie
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: IfNotPresent
storage:

35
neutron/values.yaml
View File

@ -38,7 +38,7 @@ images:
neutron_linuxbridge_agent: docker.io/openstackhelm/neutron:newton
neutron_sriov_agent: docker.io/openstackhelm/neutron:newton-sriov-1804
neutron_sriov_agent_init: docker.io/openstackhelm/neutron:newton-sriov-1804
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
labels:
@ -135,33 +135,39 @@ dependencies:
openvswitch:
dhcp:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-ovs-agent
l3:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-ovs-agent
metadata:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-ovs-agent
linuxbridge:
dhcp:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
l3:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
metadata:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
lb_agent:
@ -169,17 +175,20 @@ dependencies:
sriov:
dhcp:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-sriov-agent
l3:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-sriov-agent
metadata:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-sriov-agent
static:
@ -269,10 +278,12 @@ dependencies:
jobs:
- neutron-rabbit-init
pod:
- labels:
- requireSameNode: true
labels:
application: openvswitch
component: openvswitch-vswitchd
- labels:
- requireSameNode: true
labels:
application: openvswitch
component: openvswitch-vswitchd-db
services:

18
nova/values.yaml
View File

@ -64,7 +64,7 @@ images:
bootstrap: docker.io/openstackhelm/heat:newton
db_drop: docker.io/openstackhelm/heat:newton
db_init: docker.io/openstackhelm/heat:newton
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.0'
dep_check: 'quay.io/stackanetes/kubernetes-entrypoint:v0.3.1'
rabbit_init: docker.io/rabbitmq:3.7-management
ks_user: docker.io/openstackhelm/heat:newton
ks_service: docker.io/openstackhelm/heat:newton
@ -199,19 +199,22 @@ dependencies:
openvswitch:
compute:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-ovs-agent
linuxbridge:
compute:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-lb-agent
sriov:
compute:
pod:
- labels:
- requireSameNode: true
labels:
application: neutron
component: neutron-sriov-agent
static:
@ -251,9 +254,10 @@ dependencies:
service: compute
compute:
pod:
- labels:
application: libvirt
component: libvirt
- requireSameNode: true
labels:
application: libvirt
component: libvirt
jobs:
- nova-db-sync
- nova-rabbit-init

2
openvswitch/values.yaml
View File

@ -23,7 +23,7 @@ images:
tags:
openvswitch_db_server: docker.io/openstackhelm/openvswitch:v2.8.1
openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:v2.8.1
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
labels:

2
postgresql/values.yaml
View File

@ -40,7 +40,7 @@ pod:
images:
tags:
postgresql: "docker.io/postgres:9.5"
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: IfNotPresent
storage:

2
rabbitmq/values.yaml
View File

@ -33,7 +33,7 @@ images:
prometheus_rabbitmq_exporter: docker.io/kbudde/rabbitmq-exporter:v0.21.0
prometheus_rabbitmq_exporter_helm_tests: docker.io/openstackhelm/heat:newton
rabbitmq: docker.io/rabbitmq:3.7.4
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
scripted_test: docker.io/rabbitmq:3.7.4-management
pull_policy: "IfNotPresent"

2
rally/values.yaml
View File

@ -20,7 +20,7 @@ labels:
images:
tags:
bootstrap: docker.io/kolla/ubuntu-source-rally: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-rally:3.0.3
manage_db: docker.io/kolla/ubuntu-source-rally:3.0.3
run_task: docker.io/kolla/ubuntu-source-rally:3.0.3

2
senlin/values.yaml
View File

@ -42,7 +42,7 @@ images:
ks_endpoints: docker.io/openstackhelm/heat:newton
senlin_api: docker.io/openstackhelm/senlin:newton
senlin_engine: docker.io/openstackhelm/senlin:newton
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.0
dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
pull_policy: "IfNotPresent"
conf: