From 36718b840a5d4d3a0967cbdceae674bcb58d99c1 Mon Sep 17 00:00:00 2001 From: "phillip.toohill" Date: Wed, 8 May 2024 15:10:32 -0500 Subject: [PATCH] Updating ingress repo and bumping version (#255) --- .../ingress/external/helm/ingress-helm-overrides.yaml | 2 +- kustomize/ingress/external/kustomization.yaml | 8 +++----- .../ingress/grafana/helm/ingress-helm-overrides.yaml | 2 +- kustomize/ingress/grafana/kustomization.yaml | 6 ++---- .../ingress/internal/helm/ingress-helm-overrides.yaml | 2 +- kustomize/ingress/internal/kustomization.yaml | 6 ++---- 6 files changed, 10 insertions(+), 16 deletions(-) diff --git a/kustomize/ingress/external/helm/ingress-helm-overrides.yaml b/kustomize/ingress/external/helm/ingress-helm-overrides.yaml index 3d50942e..9b5fb159 100644 --- a/kustomize/ingress/external/helm/ingress-helm-overrides.yaml +++ b/kustomize/ingress/external/helm/ingress-helm-overrides.yaml @@ -9,7 +9,7 @@ deployment: images: tags: entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2 + ingress: registry.k8s.io/ingress-nginx/controller:v1.10.1 ingress_module_init: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" ingress_routed_vip: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" error_pages: registry.k8s.io/defaultbackend:1.4 diff --git a/kustomize/ingress/external/kustomization.yaml b/kustomize/ingress/external/kustomization.yaml index 79c55654..42615c0e 100644 --- a/kustomize/ingress/external/kustomization.yaml +++ b/kustomize/ingress/external/kustomization.yaml @@ -1,16 +1,14 @@ resources: - ns-ingress-nginx.yaml -helmGlobals: - chartHome: ../../../submodules/openstack-helm-infra - helmCharts: - - name: ingress + - name: ingress-nginx releaseName: ingress-nginx + repo: https://kubernetes.github.io/ingress-nginx valuesInline: deployment: cluster: class: nginx-cluster valuesFile: helm/ingress-helm-overrides.yaml namespace: ingress-nginx - includeCRDs: true \ No newline at end of file + includeCRDs: true diff --git a/kustomize/ingress/grafana/helm/ingress-helm-overrides.yaml b/kustomize/ingress/grafana/helm/ingress-helm-overrides.yaml index ce997ebe..567406c1 100644 --- a/kustomize/ingress/grafana/helm/ingress-helm-overrides.yaml +++ b/kustomize/ingress/grafana/helm/ingress-helm-overrides.yaml @@ -9,7 +9,7 @@ deployment: images: tags: entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2 + ingress: registry.k8s.io/ingress-nginx/controller:v1.10.1 ingress_module_init: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" ingress_routed_vip: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" error_pages: registry.k8s.io/defaultbackend:1.4 diff --git a/kustomize/ingress/grafana/kustomization.yaml b/kustomize/ingress/grafana/kustomization.yaml index 430c7fba..e571c69a 100644 --- a/kustomize/ingress/grafana/kustomization.yaml +++ b/kustomize/ingress/grafana/kustomization.yaml @@ -1,9 +1,7 @@ -helmGlobals: - chartHome: ../../../submodules/openstack-helm-infra - helmCharts: - - name: ingress + - name: ingress-nginx releaseName: ingress-grafana-internal + repo: https://kubernetes.github.io/ingress-nginx valuesInline: deployment: cluster: diff --git a/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml b/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml index 06721d72..94c94b41 100644 --- a/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml +++ b/kustomize/ingress/internal/helm/ingress-helm-overrides.yaml @@ -9,7 +9,7 @@ deployment: images: tags: entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 - ingress: registry.k8s.io/ingress-nginx/controller:v1.8.2 + ingress: registry.k8s.io/ingress-nginx/controller:v1.10.1 ingress_module_init: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" ingress_routed_vip: "docker.io/openstackhelm/neutron:2023.1-ubuntu_jammy" error_pages: registry.k8s.io/defaultbackend:1.4 diff --git a/kustomize/ingress/internal/kustomization.yaml b/kustomize/ingress/internal/kustomization.yaml index e02e76f2..e2c2d836 100644 --- a/kustomize/ingress/internal/kustomization.yaml +++ b/kustomize/ingress/internal/kustomization.yaml @@ -1,9 +1,7 @@ -helmGlobals: - chartHome: ../../../submodules/openstack-helm-infra - helmCharts: - - name: ingress + - name: ingress-nginx releaseName: ingress-openstack-internal + repo: https://kubernetes.github.io/ingress-nginx valuesInline: deployment: cluster: