Merge pull request #13515 from rook/mergify/bp/release-1.13/pr-13506

multus: use nginx-unprivileged image from quay (backport #13506)

deploy/examples/multus-validation.yaml

@@ -31,7 +31,7 @@
 #       --flaky-threshold-seconds timeoutSeconds   This is the time window in which validation clients are all expected to become 'Ready' together. Validation clients are all started at approximately the same time, and they should all stabilize at approximately the same time. Once the first validation client becomes 'Ready', the tool checks that all of the remaining clients become 'Ready' before this threshold duration elapses. In networks that have connectivity issues, limited bandwidth, or high latency, clients will contend for network traffic with each other, causing some clients to randomly fail and become 'Ready' later than others. These randomly-failing clients are considered 'flaky.' Adjust this value to reflect expectations for the underlying network. For fast and reliable networks, this can be set to a smaller value. For networks that are intended to be slow, this can be set to a larger value. Additionally, for very large Kubernetes clusters, it may take longer for all clients to start, and it therefore may take longer for all clients to become 'Ready'; in that case, this value can be set slightly higher. (default 30s)
 #   -h, --help                                     help for run
 #   -n, --namespace string                         The namespace for validation test resources. It is recommended to set this to the namespace in which Rook's Ceph cluster will be installed. (default "rook-ceph")
-#       --nginx-image string                       The Nginx image used for the validation server and clients. (default "nginxinc/nginx-unprivileged:stable-alpine")
+#       --nginx-image string                       The Nginx image used for the validation server and clients. (default "quay.io/nginx/nginx-unprivileged:stable-alpine")
 #       --public-network string                    The name of the Network Attachment Definition (NAD) that will be used for Ceph's public network. This should be a namespaced name in the form <namespace>/<name> if the NAD is defined in a different namespace from the cluster namespace.
 #       --timeout-minutes timeoutMinutes           The time to wait for resources to change to the expected state. For example, for the test web server to start, for test clients to become ready, or for test resources to be deleted. At longest, this may need to reflect the time it takes for client pods to to pull images, get address assignments, and then for each client to determine that its network connection is stable. Minimum: 1 minute. Recommended: 2 minutes or more. (default 3m0s)
 #

pkg/daemon/multus/config.go

@@ -42,7 +42,7 @@ var (
 
 	DefaultValidationOtherDaemonsPerNode = 16
 
-	DefaultValidationNginxImage = "nginxinc/nginx-unprivileged:stable-alpine"
+	DefaultValidationNginxImage = "quay.io/nginx/nginx-unprivileged:stable-alpine"
 
 	DefaultValidationResourceTimeout = 3 * time.Minute
 

tests/scripts/multus/stretch.yaml

@@ -5,7 +5,7 @@ clusterNetwork: "cluster-net"
 
 resourceTimeout: "1m0s"
 flakyThreshold: "30s"
-nginxImage: "nginxinc/nginx-unprivileged:stable-alpine"
+nginxImage: "quay.io/nginx/nginx-unprivileged:stable-alpine"
 
 nodeTypes:
   arbiter-node: