bump nginx to 1.9.4

Azure · Oct 27, 2023 · af244b4 · af244b4
1 parent 4db42d5
commit af244b4
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/pkg/manifests/fixtures/nginx/full.json b/pkg/manifests/fixtures/nginx/full.json
@@ -509,7 +509,7 @@
             "containers": [
               {
                 "name": "controller",
-                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.3",
+                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.4",
                 "args": [
                   "/nginx-ingress-controller",
                   "--ingress-class=webapprouting.kubernetes.azure.com",

diff --git a/pkg/manifests/fixtures/nginx/internal.json b/pkg/manifests/fixtures/nginx/internal.json
@@ -509,7 +509,7 @@
             "containers": [
               {
                 "name": "controller",
-                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.3",
+                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.4",
                 "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
@@ -431,7 +431,7 @@
             "containers": [
               {
                 "name": "controller",
-                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.3",
+                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.4",
                 "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
@@ -445,7 +445,7 @@
             "containers": [
               {
                 "name": "controller",
-                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.3",
+                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.4",
                 "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
@@ -444,7 +444,7 @@
             "containers": [
               {
                 "name": "controller",
-                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.3",
+                "image": "test-registry/oss/kubernetes/ingress/nginx-ingress-controller:v1.9.4",
                 "args": [
                   "/nginx-ingress-controller",
                   "--ingress-class=webapprouting.kubernetes.azure.com",

diff --git a/pkg/manifests/nginx.go b/pkg/manifests/nginx.go
@@ -23,7 +23,7 @@ import (
 )
 
 const (
-	controllerImageTag = "v1.9.3"
+	controllerImageTag = "v1.9.4"
 	prom               = "prometheus"
 )
 

diff --git a/testing/e2e/suites/basic.go b/testing/e2e/suites/basic.go
@@ -122,17 +122,16 @@ var clientServerTest = func(ctx context.Context, config *rest.Config, operator m
 			ctx = logger.WithContext(ctx, lgr)
 
 			testingResources := manifests.ClientAndServer(ns.Name, "e2e-testing", zone.GetName(), zone.GetNameserver(), infra.Cert.GetId())
-			for _, object := range testingResources.Objects() {
-				if err := upsert(ctx, c, object); err != nil {
-					return fmt.Errorf("upserting resource: %w", err)
-				}
-			}
-
 			if mod != nil {
 				if err := mod(testingResources.Ingress, testingResources.Service, zone); err != nil {
 					return fmt.Errorf("modifying ingress and service: %w", err)
 				}
 			}
+			for _, object := range testingResources.Objects() {
+				if err := upsert(ctx, c, object); err != nil {
+					return fmt.Errorf("upserting resource: %w", err)
+				}
+			}
 
 			ctx = logger.WithContext(ctx, lgr.With("client", testingResources.Client.GetName(), "clientNamespace", testingResources.Client.GetNamespace()))
 			if err := waitForAvailable(ctx, c, *testingResources.Client); err != nil {
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,7 @@ import ( @@
     )
     const (
-    	controllerImageTag = "v1.9.3"
+    	controllerImageTag = "v1.9.4"
     	prom               = "prometheus"
     )
@@ Expand Down @@