diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index c3134d9ae..4932c1588 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -191,7 +191,7 @@ spec: {{ tuple $envAll "ingress" list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{- if and .Values.network.host_namespace .Values.network.vip.manage }} - name: ingress-vip-kernel-modules -{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} +{{ tuple $envAll "ingress_module_init" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -209,7 +209,7 @@ spec: mountPath: /mnt/host-rootfs readOnly: true - name: ingress-vip-init -{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} +{{ tuple $envAll "ingress_routed_vip" | include "helm-toolkit.snippets.image" | indent 10 }} securityContext: capabilities: add: @@ -309,7 +309,7 @@ spec: - NET_ADMIN runAsUser: 0 {{- if eq .Values.network.vip.mode "routed" }} -{{ tuple $envAll "ingress" | include "helm-toolkit.snippets.image" | indent 10 }} +{{ tuple $envAll "ingress_routed_vip" | include "helm-toolkit.snippets.image" | indent 10 }} env: {{ include "helm-toolkit.utils.to_k8s_env_vars" .Values.network.vip | indent 12 }} command: diff --git a/ingress/values.yaml b/ingress/values.yaml index c1c4ecdaa..6b7df26ab 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -27,8 +27,10 @@ images: tags: entrypoint: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.20.0 + ingress_module_init: docker.io/openstackhelm/neutron:ocata + ingress_routed_vip: docker.io/openstackhelm/neutron:ocata error_pages: gcr.io/google_containers/defaultbackend:1.0 - keepalived: osixia/keepalived:1.4.5 + keepalived: docker.io/osixia/keepalived:1.4.5 dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1 image_repo_sync: docker.io/docker:17.07.0 pull_policy: "IfNotPresent"