From 1025487fc2a520a9a74a9edab3dbc20efe2e9575 Mon Sep 17 00:00:00 2001 From: Rich Scott Date: Fri, 13 Mar 2026 14:30:28 -0600 Subject: [PATCH] Add work-around for armada-operator image pull error This is a temporary work-around to patch the armada-operator repo copy when running the E2E tests, as gcr.io has stopped hosting the kube-rbc-proxy v0.16.0 image - pull it from docker.io for now, and run `make kind-all-dev` to invoke the Armada Operator. Signed-off-by: Rich Scott --- e2e/armada-operator.patch | 26 ++++++++++++++++++++++++++ scripts/dev-e2e.sh | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/e2e/armada-operator.patch b/e2e/armada-operator.patch index 27de3943..8f5a4cb4 100644 --- a/e2e/armada-operator.patch +++ b/e2e/armada-operator.patch @@ -39,3 +39,29 @@ index a8d45c3..4a72570 100644 +- role: worker + labels: + armada-spark: true +diff --git a/charts/armada-operator/values.yaml b/charts/armada-operator/values.yaml +index 9ead2fe..1862720 100644 +--- a/charts/armada-operator/values.yaml ++++ b/charts/armada-operator/values.yaml +@@ -11,7 +11,7 @@ controllerManager: + drop: + - ALL + image: +- repository: gcr.io/kubebuilder/kube-rbac-proxy ++ repository: docker.io/kubebuilder/kube-rbac-proxy + tag: v0.16.0 + resources: + limits: +diff --git a/config/default/manager_auth_proxy_patch.yaml b/config/default/manager_auth_proxy_patch.yaml +index 801e9bb..4dae292 100644 +--- a/config/default/manager_auth_proxy_patch.yaml ++++ b/config/default/manager_auth_proxy_patch.yaml +@@ -31,7 +31,7 @@ spec: + capabilities: + drop: + - "ALL" +- image: gcr.io/kubebuilder/kube-rbac-proxy:v0.16.0 ++ image: docker.io/kubebuilder/kube-rbac-proxy:v0.16.0 + args: + - "--secure-listen-address=0.0.0.0:8443" + - "--upstream=http://127.0.0.1:8080/" diff --git a/scripts/dev-e2e.sh b/scripts/dev-e2e.sh index 9bead731..cc67dec0 100755 --- a/scripts/dev-e2e.sh +++ b/scripts/dev-e2e.sh @@ -87,8 +87,8 @@ start-armada() { fi fi - echo "Running 'make kind-all' to install and start Armada; this may take up to 6 minutes" - if ! (cd "$AOHOME"; make kind-all 2>&1) | tee armada-start.txt; then + echo "Running 'make kind-all-dev' to install and start Armada; this may take up to 6 minutes" + if ! (cd "$AOHOME"; make kind-all-dev 2>&1) | tee armada-start.txt; then echo "" err "There was a problem starting Armada; exiting now" exit 1 @@ -187,4 +187,4 @@ main() { run-test } -main \ No newline at end of file +main