From 575ee2c782304bb9c7e001ebf500218339ebd873 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Mon, 14 Nov 2022 14:21:03 -0800 Subject: [PATCH 1/2] Updating refs for e2e test images to latest Signed-off-by: Mark Rossetti --- test/utils/image/manifest.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index abaf47f95bb..ad7d57ef5d7 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -231,39 +231,39 @@ const ( func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config) { configs := map[ImageID]Config{} - configs[Agnhost] = Config{list.PromoterE2eRegistry, "agnhost", "2.40"} + configs[Agnhost] = Config{list.PromoterE2eRegistry, "agnhost", "2.43"} configs[AgnhostPrivate] = Config{list.PrivateRegistry, "agnhost", "2.6"} configs[AuthenticatedAlpine] = Config{list.GcAuthenticatedRegistry, "alpine", "3.7"} - configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v1"} - configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.17.5"} + configs[AuthenticatedWindowsNanoServer] = Config{list.GcAuthenticatedRegistry, "windows-nanoserver", "v3"} + configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.17.7"} configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"} - configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-2"} + configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.29-4"} configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"} configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.2"} configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.1.2"} - configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.5-0"} + configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.5-1"} configs[GlusterDynamicProvisioner] = Config{list.PromoterE2eRegistry, "glusterdynamic-provisioner", "v1.3"} - configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-2"} - configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-2"} + configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"} + configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"} configs[InvalidRegistryImage] = Config{list.InvalidRegistry, "alpine", "3.1"} configs[IpcUtils] = Config{list.PromoterE2eRegistry, "ipc-utils", "1.3"} - configs[JessieDnsutils] = Config{list.PromoterE2eRegistry, "jessie-dnsutils", "1.5"} - configs[Kitten] = Config{list.PromoterE2eRegistry, "kitten", "1.5"} - configs[Nautilus] = Config{list.PromoterE2eRegistry, "nautilus", "1.5"} + configs[JessieDnsutils] = Config{list.PromoterE2eRegistry, "jessie-dnsutils", "1.7"} + configs[Kitten] = Config{list.PromoterE2eRegistry, "kitten", "1.7"} + configs[Nautilus] = Config{list.PromoterE2eRegistry, "nautilus", "1.7"} configs[NFSProvisioner] = Config{list.SigStorageRegistry, "nfs-provisioner", "v3.0.1"} - configs[Nginx] = Config{list.PromoterE2eRegistry, "nginx", "1.14-2"} - configs[NginxNew] = Config{list.PromoterE2eRegistry, "nginx", "1.15-2"} + configs[Nginx] = Config{list.PromoterE2eRegistry, "nginx", "1.14-4"} + configs[NginxNew] = Config{list.PromoterE2eRegistry, "nginx", "1.15-4"} configs[NodePerfNpbEp] = Config{list.PromoterE2eRegistry, "node-perf/npb-ep", "1.2"} configs[NodePerfNpbIs] = Config{list.PromoterE2eRegistry, "node-perf/npb-is", "1.2"} configs[NodePerfTfWideDeep] = Config{list.PromoterE2eRegistry, "node-perf/tf-wide-deep", "1.3"} configs[Nonewprivs] = Config{list.PromoterE2eRegistry, "nonewprivs", "1.3"} - configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.2"} + configs[NonRoot] = Config{list.PromoterE2eRegistry, "nonroot", "1.4"} // Pause - when these values are updated, also update cmd/kubelet/app/options/container_runtime.go configs[Pause] = Config{list.GcRegistry, "pause", "3.8"} configs[Perl] = Config{list.PromoterE2eRegistry, "perl", "5.26"} configs[PrometheusDummyExporter] = Config{list.GcRegistry, "prometheus-dummy-exporter", "v0.1.0"} configs[PrometheusToSd] = Config{list.GcRegistry, "prometheus-to-sd", "v0.5.0"} - configs[Redis] = Config{list.PromoterE2eRegistry, "redis", "5.0.5-1"} + configs[Redis] = Config{list.PromoterE2eRegistry, "redis", "5.0.5-3"} configs[RegressionIssue74839] = Config{list.PromoterE2eRegistry, "regression-issue-74839", "1.2"} configs[ResourceConsumer] = Config{list.PromoterE2eRegistry, "resource-consumer", "1.13"} configs[SdDummyExporter] = Config{list.GcRegistry, "sd-dummy-exporter", "v0.2.0"} From e6a1f3b62623a6def6ff952ada459574454db9e8 Mon Sep 17 00:00:00 2001 From: Mark Rossetti Date: Mon, 14 Nov 2022 16:00:44 -0800 Subject: [PATCH 2/2] Removing --alsologtostderr from sample-webhook containers used for e2e tests Signed-off-by: Mark Rossetti --- test/e2e/apimachinery/crd_conversion_webhook.go | 1 - test/e2e/apimachinery/webhook.go | 1 - 2 files changed, 2 deletions(-) diff --git a/test/e2e/apimachinery/crd_conversion_webhook.go b/test/e2e/apimachinery/crd_conversion_webhook.go index c69569103bc..95c54679222 100644 --- a/test/e2e/apimachinery/crd_conversion_webhook.go +++ b/test/e2e/apimachinery/crd_conversion_webhook.go @@ -291,7 +291,6 @@ func deployCustomResourceWebhookAndService(f *framework.Framework, image string, "crd-conversion-webhook", "--tls-cert-file=/webhook.local.config/certificates/tls.crt", "--tls-private-key-file=/webhook.local.config/certificates/tls.key", - "--alsologtostderr", "-v=4", // Use a non-default port for containers. fmt.Sprintf("--port=%d", containerPort), diff --git a/test/e2e/apimachinery/webhook.go b/test/e2e/apimachinery/webhook.go index c6205f521f0..a93bd01dcc8 100644 --- a/test/e2e/apimachinery/webhook.go +++ b/test/e2e/apimachinery/webhook.go @@ -793,7 +793,6 @@ func deployWebhookAndService(f *framework.Framework, image string, certCtx *cert "webhook", "--tls-cert-file=/webhook.local.config/certificates/tls.crt", "--tls-private-key-file=/webhook.local.config/certificates/tls.key", - "--alsologtostderr", "-v=4", // Use a non-default port for containers. fmt.Sprintf("--port=%d", containerPort),