openstack/openstack-helm-infra
Code Issues Proposed changes

Ingress: Break out helper container images

Browse Source 
This PS breaks out the helper container images, which is required
now that the ingress image is more compact.

Change-Id: I6afb08954f37eda1ed913a4b3acdaf6e2b89d30e
Signed-off-by: Pete Birley <pete@port.direct>
This commit is contained in:
Pete Birley 2018-11-28 20:54:35 -06:00
parent 2bec7040a9
commit 4803fe31d1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ingress/templates/deployment-ingress.yaml
View File

@ -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:

4
ingress/values.yaml
View File

@ -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"