From 2618cefc1f24643b157466f925bf7c6f7aaae40c Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Thu, 7 Mar 2024 21:05:53 +0700 Subject: [PATCH] Replace images with ones that support ARM64 (#11370) Signed-off-by: Artem Glazychev --- .github/workflows/release.yaml | 2 +- examples/features/policy-based-routing/client.yaml | 2 +- examples/features/vl3-lb/finance-client.yaml | 2 +- examples/features/vl3-lb/finance-lb-patch.yaml | 2 +- examples/features/vl3-lb/finance-server.yaml | 6 +++--- examples/features/webhook/client.yaml | 2 +- .../usecases/nsm_istio/greeting/server.yaml | 2 +- examples/pss/use-cases/nginx/client.yaml | 2 +- examples/spire/base/agent-daemonset.yaml | 11 +++++------ external-images.yaml | 5 +++-- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index efb81dbbcec1..649f3b59affb 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -164,7 +164,7 @@ jobs: - name: Push update to the ${{ matrix.repository }} working-directory: ${{ github.workspace }}/src/github.com/networkservicemesh/${{ matrix.repository }} run: | - sed -r -i 's/sha = "[a-z0-9]*"/sha = "tags\/${{ needs.get-tag.outputs.tag }}"/g' extensions/base/suite.go + sed -r -i 's/sha = "[a-z0-9]*"/sha = "tags\/${{ needs.get-tag.outputs.tag }}"/g' extensions/base/suite.gen.go git add -- . echo Starting to update repositotry ${{ matrix.repository }} if ! [ -n "$(git diff --cached --exit-code)" ]; then diff --git a/examples/features/policy-based-routing/client.yaml b/examples/features/policy-based-routing/client.yaml index 23a4bf21c483..e410a6ca9dde 100644 --- a/examples/features/policy-based-routing/client.yaml +++ b/examples/features/policy-based-routing/client.yaml @@ -10,7 +10,7 @@ metadata: spec: containers: - name: nettools - image: travelping/nettools:1.10.1 + image: aeciopires/nettools:1.0.0 imagePullPolicy: IfNotPresent # simple `sleep` command would work # but we need `trap` to be able to delete pods quckly diff --git a/examples/features/vl3-lb/finance-client.yaml b/examples/features/vl3-lb/finance-client.yaml index 9b014ec1af07..7bbeee091334 100644 --- a/examples/features/vl3-lb/finance-client.yaml +++ b/examples/features/vl3-lb/finance-client.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: nettools - image: travelping/nettools:1.10.1 + image: aeciopires/nettools:1.0.0 imagePullPolicy: IfNotPresent # simple `sleep` command would work # but we need `trap` to be able to delete pods quckly diff --git a/examples/features/vl3-lb/finance-lb-patch.yaml b/examples/features/vl3-lb/finance-lb-patch.yaml index 0743eff44347..e9923c1705aa 100644 --- a/examples/features/vl3-lb/finance-lb-patch.yaml +++ b/examples/features/vl3-lb/finance-lb-patch.yaml @@ -17,7 +17,7 @@ spec: - name: NSM_PORT value: "8080" - name: NSM_TARGET_PORT - value: "80" + value: "8081" - name: NSM_SELECTOR value: "app:finance" - name: NSM_NETWORK_SERVICES diff --git a/examples/features/vl3-lb/finance-server.yaml b/examples/features/vl3-lb/finance-server.yaml index 4e7b03d7ba2a..b7a38386186d 100644 --- a/examples/features/vl3-lb/finance-server.yaml +++ b/examples/features/vl3-lb/finance-server.yaml @@ -18,7 +18,7 @@ spec: spec: containers: - name: nginx - image: hashicorp/http-echo:alpine + image: hashicorp/http-echo:1.0 env: - name: POD_NAME valueFrom: @@ -26,6 +26,6 @@ spec: fieldPath: metadata.name args: - "-text=Hello! I'm $(POD_NAME)" - - -listen=:80 + - -listen=:8081 ports: - - containerPort: 80 + - containerPort: 8081 diff --git a/examples/features/webhook/client.yaml b/examples/features/webhook/client.yaml index 5f9d023a27b0..b8c0162b940a 100644 --- a/examples/features/webhook/client.yaml +++ b/examples/features/webhook/client.yaml @@ -10,7 +10,7 @@ metadata: spec: containers: - name: nettools - image: travelping/nettools:1.10.1 + image: aeciopires/nettools:1.0.0 imagePullPolicy: IfNotPresent # simple `sleep` command would work # but we need `trap` to be able to delete pods quckly diff --git a/examples/interdomain/usecases/nsm_istio/greeting/server.yaml b/examples/interdomain/usecases/nsm_istio/greeting/server.yaml index 76e07490b4c0..70702399c139 100644 --- a/examples/interdomain/usecases/nsm_istio/greeting/server.yaml +++ b/examples/interdomain/usecases/nsm_istio/greeting/server.yaml @@ -39,7 +39,7 @@ spec: serviceAccountName: greeting-sa containers: - name: server - image: hashicorp/http-echo:alpine + image: hashicorp/http-echo:1.0 args: - -text="hello world from istio" - -listen=:9080 diff --git a/examples/pss/use-cases/nginx/client.yaml b/examples/pss/use-cases/nginx/client.yaml index 7fb5e46cd253..60147eb4eaf8 100644 --- a/examples/pss/use-cases/nginx/client.yaml +++ b/examples/pss/use-cases/nginx/client.yaml @@ -19,7 +19,7 @@ spec: allowPrivilegeEscalation: false capabilities: drop: ["ALL"] - image: travelping/nettools:1.10.1 + image: aeciopires/nettools:1.0.0 imagePullPolicy: IfNotPresent # simple `sleep` command would work # but we need `trap` to be able to delete pods quckly diff --git a/examples/spire/base/agent-daemonset.yaml b/examples/spire/base/agent-daemonset.yaml index c8a9e4eba604..d6bc3f576d81 100644 --- a/examples/spire/base/agent-daemonset.yaml +++ b/examples/spire/base/agent-daemonset.yaml @@ -23,16 +23,15 @@ spec: initContainers: - name: init # This is a small image with wait-for-it, choose whatever image - # you prefer that waits for a service to be up. This image is built - # from https://github.com/lqhl/wait-for-it - image: gcr.io/spiffe-io/wait-for-it + # you prefer that waits for a service to be up. + # It is used by https://github.com/spiffe/spire-tutorials/blob/d27c579eb4f4e26f36f60373446c42c4ebd1e3da/k8s/quickstart/agent-daemonset.yaml#L27 + image: cgr.dev/chainguard/wait-for-it imagePullPolicy: IfNotPresent args: ["-t", "30", "spire-server:8081"] - name: init-bundle - # Additional init container with the same wait-for-it image to - # provide workaround for https://github.com/spiffe/spire/issues/3032 + # Additional init container to provide workaround for https://github.com/spiffe/spire/issues/3032 # It checks if the bundle is in place and ready to be parsed or not. - image: gcr.io/spiffe-io/wait-for-it + image: alpine imagePullPolicy: IfNotPresent command: ['sh', '-c', "t=0; until [ -f /run/spire/bundle/bundle.crt 2>&1 ] || [ $t -eq 60 ]; do t=`expr $t + 1`; sleep 1; done"] volumeMounts: diff --git a/external-images.yaml b/external-images.yaml index c3408273bec5..afd984e93cc4 100644 --- a/external-images.yaml +++ b/external-images.yaml @@ -8,16 +8,17 @@ images: - docker.io/coredns/coredns:1.8.3 - ghcr.io/spiffe/spire-agent:1.6.1 - ghcr.io/spiffe/spire-server:1.6.1 - - gcr.io/spiffe-io/wait-for-it:latest + - cgr.dev/chainguard/wait-for-it:latest - ghcr.io/spiffe/spire-controller-manager:0.2.2 - ghcr.io/spiffe/spiffe-csi-driver:0.2.3 - quay.io/metallb/speaker:v0.12.1 - quay.io/metallb/controller:v0.12.1 - docker.io/library/alpine:3.15.0 - docker.io/frolvlad/alpine-bash:latest - - docker.io/travelping/nettools:1.10.1 + - docker.io/aeciopires/nettools:1.0.0 - k8s.gcr.io/e2e-test-images/jessie-dnsutils:1.3 - jaegertracing/all-in-one:1.36 - otel/opentelemetry-collector:0.35.0 - prom/prometheus:v2.37.0 - networkstatic/iperf3:latest + - hashicorp/http-echo:1.0