From af244b41f5ae995f5aaf09416efd4cf4826865b8 Mon Sep 17 00:00:00 2001 From: Oliver King Date: Thu, 26 Oct 2023 21:15:56 -0500 Subject: [PATCH] bump nginx to 1.9.4 --- pkg/manifests/fixtures/nginx/full.json | 2 +- pkg/manifests/fixtures/nginx/internal.json | 2 +- pkg/manifests/fixtures/nginx/kube-system.json | 2 +- pkg/manifests/fixtures/nginx/no-ownership.json | 2 +- .../fixtures/nginx/optional-features-disabled.json | 2 +- pkg/manifests/nginx.go | 2 +- testing/e2e/suites/basic.go | 11 +++++------ 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkg/manifests/fixtures/nginx/full.json b/pkg/manifests/fixtures/nginx/full.json index 67ca9db7..e92a00be 100644 --- 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 index f9c36dc8..c490c1ed 100644 --- 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 index b1673b3a..09cf906f 100644 --- 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 index 68133959..2751f177 100644 --- 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 index 3a3a3fce..7c05a3a1 100644 --- 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 index 61ecb46a..02463cba 100644 --- 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 index c9a27836..86a55d73 100644 --- 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 {