Updating ingress repo and bumping version (#255)

rackerlabs · May 8, 2024 · 36718b8 · 36718b8
1 parent 82981bb
commit 36718b8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 16 deletions.
diff --git 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
@@ -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
+    includeCRDs: true
diff --git 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
@@ -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
@@ -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
@@ -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: