diff --git a/ingress/Chart.yaml b/ingress/Chart.yaml index 9537a0bb5..3056e8b84 100644 --- a/ingress/Chart.yaml +++ b/ingress/Chart.yaml @@ -12,10 +12,10 @@ --- apiVersion: v1 -appVersion: v0.32.0 +appVersion: v0.42.0 description: OpenStack-Helm Ingress Controller name: ingress -version: 0.2.2 +version: 0.2.3 home: https://github.com/kubernetes/ingress sources: - https://github.com/kubernetes/ingress diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml index 07bd2db03..c6aaf46a7 100644 --- a/ingress/templates/deployment-ingress.yaml +++ b/ingress/templates/deployment-ingress.yaml @@ -160,6 +160,13 @@ metadata: labels: {{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }} app: ingress-api + app.kubernetes.io/name: "ingress-api" + app.kubernetes.io/instance: {{ $serviceAccountName }} + app.kubernetes.io/component: "ingress" + app.kubernetes.io/managed-by: {{ $envAll.Release.Service }} +{{- if $envAll.Chart.AppVersion }} + app.kubernetes.io/version: {{ $envAll.Chart.AppVersion | quote }} +{{- end }} spec: {{- if eq .Values.deployment.type "Deployment" }} replicas: {{ .Values.pod.replicas.ingress }} @@ -174,6 +181,13 @@ spec: labels: {{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} app: ingress-api + app.kubernetes.io/name: "ingress-api" + app.kubernetes.io/instance: {{ $serviceAccountName }} + app.kubernetes.io/component: "ingress" + app.kubernetes.io/managed-by: {{ $envAll.Release.Service }} +{{- if $envAll.Chart.AppVersion }} + app.kubernetes.io/version: {{ $envAll.Chart.AppVersion | quote }} +{{- end }} annotations: {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} diff --git a/ingress/values.yaml b/ingress/values.yaml index 06654d140..b70ec2a82 100644 --- a/ingress/values.yaml +++ b/ingress/values.yaml @@ -25,7 +25,7 @@ deployment: images: tags: entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.32.0 + ingress: k8s.gcr.io/ingress-nginx/controller:v0.42.0 ingress_module_init: docker.io/openstackhelm/neutron:stein-ubuntu_bionic ingress_routed_vip: docker.io/openstackhelm/neutron:stein-ubuntu_bionic error_pages: k8s.gcr.io/defaultbackend:1.4 diff --git a/releasenotes/notes/ingress.yaml b/releasenotes/notes/ingress.yaml index a1a9d31bc..57b3db2ef 100644 --- a/releasenotes/notes/ingress.yaml +++ b/releasenotes/notes/ingress.yaml @@ -6,4 +6,5 @@ ingress: - 0.2.0 Update default Kubernetes API for use with Helm v3 - 0.2.1 Use HostToContainer mountPropagation - 0.2.2 Use full image ref for docker official images + - 0.2.3 Uplift ingress to 0.42.0 ...