From 8cb7b96abd4e95dfa6bb67132d5f1e1bd8f35127 Mon Sep 17 00:00:00 2001 From: "kingoliver@microsoft.com" Date: Fri, 16 Aug 2024 22:18:23 -0400 Subject: [PATCH] bump nginx to v1.11.2 --- .../fixtures/nginx/full-with-replicas.json | 2 +- .../fixtures/nginx/full-with-target-cpu.json | 2 +- pkg/manifests/fixtures/nginx/full.json | 2 +- .../nginx/internal-with-ssl-cert.json | 2 +- pkg/manifests/fixtures/nginx/internal.json | 2 +- pkg/manifests/fixtures/nginx/kube-system.json | 2 +- .../fixtures/nginx/no-ownership.json | 2 +- .../nginx/optional-features-disabled.json | 2 +- pkg/manifests/nginx.go | 120 +++++++++--------- 9 files changed, 67 insertions(+), 69 deletions(-) diff --git a/pkg/manifests/fixtures/nginx/full-with-replicas.json b/pkg/manifests/fixtures/nginx/full-with-replicas.json index 30d4dc81..e15421ad 100644 --- a/pkg/manifests/fixtures/nginx/full-with-replicas.json +++ b/pkg/manifests/fixtures/nginx/full-with-replicas.json @@ -460,7 +460,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=webapprouting.kubernetes.azure.com", diff --git a/pkg/manifests/fixtures/nginx/full-with-target-cpu.json b/pkg/manifests/fixtures/nginx/full-with-target-cpu.json index 2d2236f9..9c3afdc3 100644 --- a/pkg/manifests/fixtures/nginx/full-with-target-cpu.json +++ b/pkg/manifests/fixtures/nginx/full-with-target-cpu.json @@ -460,7 +460,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=webapprouting.kubernetes.azure.com", diff --git a/pkg/manifests/fixtures/nginx/full.json b/pkg/manifests/fixtures/nginx/full.json index 3b54338e..f0848cf3 100644 --- a/pkg/manifests/fixtures/nginx/full.json +++ b/pkg/manifests/fixtures/nginx/full.json @@ -460,7 +460,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=webapprouting.kubernetes.azure.com", diff --git a/pkg/manifests/fixtures/nginx/internal-with-ssl-cert.json b/pkg/manifests/fixtures/nginx/internal-with-ssl-cert.json index 5326838b..f81c1103 100644 --- a/pkg/manifests/fixtures/nginx/internal-with-ssl-cert.json +++ b/pkg/manifests/fixtures/nginx/internal-with-ssl-cert.json @@ -459,7 +459,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=nginx-private", diff --git a/pkg/manifests/fixtures/nginx/internal.json b/pkg/manifests/fixtures/nginx/internal.json index 528e805e..1e917344 100644 --- a/pkg/manifests/fixtures/nginx/internal.json +++ b/pkg/manifests/fixtures/nginx/internal.json @@ -459,7 +459,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=nginx-private", diff --git a/pkg/manifests/fixtures/nginx/kube-system.json b/pkg/manifests/fixtures/nginx/kube-system.json index eef1c8be..60e392cd 100644 --- a/pkg/manifests/fixtures/nginx/kube-system.json +++ b/pkg/manifests/fixtures/nginx/kube-system.json @@ -447,7 +447,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=webapprouting.kubernetes.azure.com", diff --git a/pkg/manifests/fixtures/nginx/no-ownership.json b/pkg/manifests/fixtures/nginx/no-ownership.json index 3b54338e..f0848cf3 100644 --- a/pkg/manifests/fixtures/nginx/no-ownership.json +++ b/pkg/manifests/fixtures/nginx/no-ownership.json @@ -460,7 +460,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=webapprouting.kubernetes.azure.com", diff --git a/pkg/manifests/fixtures/nginx/optional-features-disabled.json b/pkg/manifests/fixtures/nginx/optional-features-disabled.json index e00bb5e1..aadafb61 100644 --- a/pkg/manifests/fixtures/nginx/optional-features-disabled.json +++ b/pkg/manifests/fixtures/nginx/optional-features-disabled.json @@ -456,7 +456,7 @@ "containers": [ { "name": "controller", - "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.10.0", + "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.11.2", "args": [ "/nginx-ingress-controller", "--ingress-class=webapprouting.kubernetes.azure.com", diff --git a/pkg/manifests/nginx.go b/pkg/manifests/nginx.go index 6971c419..107a0910 100644 --- a/pkg/manifests/nginx.go +++ b/pkg/manifests/nginx.go @@ -21,71 +21,69 @@ import ( ) const ( - controllerImageTag = "v1.10.0" + controllerImageTag = "v1.11.2" prom = "prometheus" IngressControllerComponentName = "ingress-controller" ) -var ( - // NginxResourceTypes is a list of resource types used to deploy the Nginx Ingress Controller - NginxResourceTypes = []resourceType{ - { - Group: netv1.GroupName, - Version: netv1.SchemeGroupVersion.Version, - Name: "IngressClass", - }, - { - Group: corev1.GroupName, - Version: corev1.SchemeGroupVersion.Version, - Name: "ServiceAccount", - }, - { - Group: rbacv1.GroupName, - Version: rbacv1.SchemeGroupVersion.Version, - Name: "ClusterRole", - }, - { - Group: rbacv1.GroupName, - Version: rbacv1.SchemeGroupVersion.Version, - Name: "Role", - }, - { - Group: rbacv1.GroupName, - Version: rbacv1.SchemeGroupVersion.Version, - Name: "ClusterRoleBinding", - }, - { - Group: rbacv1.GroupName, - Version: rbacv1.SchemeGroupVersion.Version, - Name: "RoleBinding", - }, - { - Group: corev1.GroupName, - Version: corev1.SchemeGroupVersion.Version, - Name: "Service", - }, - { - Group: appsv1.GroupName, - Version: appsv1.SchemeGroupVersion.Version, - Name: "Deployment", - }, - { - Group: corev1.GroupName, - Version: corev1.SchemeGroupVersion.Version, - Name: "ConfigMap", - }, - { - Group: policyv1.GroupName, - Version: policyv1.SchemeGroupVersion.Version, - Name: "PodDisruptionBudget", - }, - { - Group: autov1.GroupName, - Version: autov1.SchemeGroupVersion.Version, - Name: "HorizontalPodAutoscaler", - }, - } -) +// NginxResourceTypes is a list of resource types used to deploy the Nginx Ingress Controller +var NginxResourceTypes = []resourceType{ + { + Group: netv1.GroupName, + Version: netv1.SchemeGroupVersion.Version, + Name: "IngressClass", + }, + { + Group: corev1.GroupName, + Version: corev1.SchemeGroupVersion.Version, + Name: "ServiceAccount", + }, + { + Group: rbacv1.GroupName, + Version: rbacv1.SchemeGroupVersion.Version, + Name: "ClusterRole", + }, + { + Group: rbacv1.GroupName, + Version: rbacv1.SchemeGroupVersion.Version, + Name: "Role", + }, + { + Group: rbacv1.GroupName, + Version: rbacv1.SchemeGroupVersion.Version, + Name: "ClusterRoleBinding", + }, + { + Group: rbacv1.GroupName, + Version: rbacv1.SchemeGroupVersion.Version, + Name: "RoleBinding", + }, + { + Group: corev1.GroupName, + Version: corev1.SchemeGroupVersion.Version, + Name: "Service", + }, + { + Group: appsv1.GroupName, + Version: appsv1.SchemeGroupVersion.Version, + Name: "Deployment", + }, + { + Group: corev1.GroupName, + Version: corev1.SchemeGroupVersion.Version, + Name: "ConfigMap", + }, + { + Group: policyv1.GroupName, + Version: policyv1.SchemeGroupVersion.Version, + Name: "PodDisruptionBudget", + }, + { + Group: autov1.GroupName, + Version: autov1.SchemeGroupVersion.Version, + Name: "HorizontalPodAutoscaler", + }, +} var nginxLabels = util.MergeMaps( map[string]string{