From 7951913107da35f7f8001e2ebdc4fd6d1bec8543 Mon Sep 17 00:00:00 2001 From: Anish Ramasekar Date: Thu, 9 Feb 2023 00:42:35 +0000 Subject: [PATCH] chore: use base and test image from `registry.k8s.io` Signed-off-by: Anish Ramasekar --- .local/debug-driver.yaml | 4 ++-- docker/BASEIMAGE | 4 ++-- docker/Dockerfile | 2 +- docs/book/src/topics/set-as-env-var.md | 14 +++++++------- docs/book/src/topics/sync-as-kubernetes-secret.md | 12 ++++++------ .../pod-inline-volume-secretproviderclass.yaml | 2 +- test/bats/tests/aws/BasicTestMount.yaml | 2 +- .../bats/tests/azure/deployment-synck8s-azure.yaml | 2 +- .../tests/azure/deployment-two-synck8s-azure.yaml | 2 +- .../pod-azure-inline-volume-multiple-spc.yaml | 2 +- .../azure/pod-secrets-store-inline-volume-crd.yaml | 2 +- .../tests/azure/rotation/pod-synck8s-azure.yaml | 2 +- .../deployment-synck8s-e2e-provider.yaml | 2 +- .../deployment-two-synck8s-e2e-provider.yaml | 2 +- ...od-e2e-provider-inline-volume-multiple-spc.yaml | 2 +- .../pod-secrets-store-inline-volume-crd.yaml | 2 +- .../rotation/pod-synck8s-e2e-provider.yaml | 2 +- .../gcp/pod-secrets-store-inline-volume-crd.yaml | 2 +- test/bats/tests/vault/deployment-synck8s.yaml | 2 +- test/bats/tests/vault/deployment-two-synck8s.yaml | 2 +- .../pod-vault-inline-volume-multiple-spc.yaml | 2 +- ...od-vault-inline-volume-secretproviderclass.yaml | 2 +- test/bats/tests/vault/pod-vault-rotation.yaml | 2 +- 23 files changed, 36 insertions(+), 36 deletions(-) diff --git a/.local/debug-driver.yaml b/.local/debug-driver.yaml index 395df875d..a542da584 100644 --- a/.local/debug-driver.yaml +++ b/.local/debug-driver.yaml @@ -17,7 +17,7 @@ spec: serviceAccountName: secrets-store-csi-driver containers: - name: node-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.2.0 args: - --v=5 - --csi-address=/csi/csi.sock @@ -42,7 +42,7 @@ spec: cpu: 10m memory: 20Mi - name: liveness-probe - image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0 + image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0 imagePullPolicy: IfNotPresent args: - --csi-address=/csi/csi.sock diff --git a/docker/BASEIMAGE b/docker/BASEIMAGE index 6e8e9a683..222ed9efb 100644 --- a/docker/BASEIMAGE +++ b/docker/BASEIMAGE @@ -1,4 +1,4 @@ -linux/amd64=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2 -linux/arm64=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2 +linux/amd64=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2 +linux/arm64=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2 windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809 windows/amd64/ltsc2022=mcr.microsoft.com/windows/nanoserver:ltsc2022 diff --git a/docker/Dockerfile b/docker/Dockerfile index 00eb30ee5..1a4a4b94e 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG BASEIMAGE=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2 +ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2 FROM golang:1.19 as builder WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver diff --git a/docs/book/src/topics/set-as-env-var.md b/docs/book/src/topics/set-as-env-var.md index 196387f9e..b1813a3ea 100644 --- a/docs/book/src/topics/set-as-env-var.md +++ b/docs/book/src/topics/set-as-env-var.md @@ -15,13 +15,13 @@ spec: secretObjects: # [OPTIONAL] SecretObject defines the desired state of synced K8s secret objects - secretName: foosecret type: Opaque - labels: + labels: environment: "test" - data: - - objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias + data: + - objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias key: username parameters: - usePodIdentity: "false" + usePodIdentity: "false" keyvaultName: "$KEYVAULT_NAME" # the name of the KeyVault objects: | array: @@ -35,7 +35,7 @@ spec: objectType: key objectVersion: $KEY_VERSION tenantId: "tid" # the tenant ID of the KeyVault -``` +``` - `Pod` yaml @@ -47,7 +47,7 @@ metadata: spec: containers: - name: busybox - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + image: registry.k8s.io/e2e-test-images/busybox:1.29 command: - "/bin/sleep" - "10000" @@ -77,7 +77,7 @@ Once the [secret is created](./sync-as-kubernetes-secret.md), you may wish to se ```yaml spec: containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29 name: busybox command: - "/bin/sleep" diff --git a/docs/book/src/topics/sync-as-kubernetes-secret.md b/docs/book/src/topics/sync-as-kubernetes-secret.md index 1f891a02d..3b2948b7d 100644 --- a/docs/book/src/topics/sync-as-kubernetes-secret.md +++ b/docs/book/src/topics/sync-as-kubernetes-secret.md @@ -15,13 +15,13 @@ spec: secretObjects: # [OPTIONAL] SecretObject defines the desired state of synced K8s secret objects - secretName: foosecret type: Opaque - labels: + labels: environment: "test" - data: - - objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias + data: + - objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias key: username parameters: - usePodIdentity: "true" + usePodIdentity: "true" keyvaultName: "$KEYVAULT_NAME" # the name of the KeyVault objects: | array: @@ -47,7 +47,7 @@ metadata: spec: containers: - name: busybox - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + image: registry.k8s.io/e2e-test-images/busybox:1.29 command: - "/bin/sleep" - "10000" @@ -88,4 +88,4 @@ spec: type: Opaque # type of the Kubernetes Secret object e.g. Opaque, kubernetes.io/tls ``` -> NOTE: Here is the list of supported Kubernetes Secret types: `Opaque`, `kubernetes.io/basic-auth`, `bootstrap.kubernetes.io/token`, `kubernetes.io/dockerconfigjson`, `kubernetes.io/dockercfg`, `kubernetes.io/ssh-auth`, `kubernetes.io/service-account-token`, `kubernetes.io/tls`. +> NOTE: Here is the list of supported Kubernetes Secret types: `Opaque`, `kubernetes.io/basic-auth`, `bootstrap.kubernetes.io/token`, `kubernetes.io/dockerconfigjson`, `kubernetes.io/dockercfg`, `kubernetes.io/ssh-auth`, `kubernetes.io/service-account-token`, `kubernetes.io/tls`. diff --git a/test/bats/tests/akeyless/pod-inline-volume-secretproviderclass.yaml b/test/bats/tests/akeyless/pod-inline-volume-secretproviderclass.yaml index 1465a0bc6..887480f27 100644 --- a/test/bats/tests/akeyless/pod-inline-volume-secretproviderclass.yaml +++ b/test/bats/tests/akeyless/pod-inline-volume-secretproviderclass.yaml @@ -4,7 +4,7 @@ metadata: name: secrets-store-inline spec: containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/aws/BasicTestMount.yaml b/test/bats/tests/aws/BasicTestMount.yaml index a9474bebb..d31600a12 100644 --- a/test/bats/tests/aws/BasicTestMount.yaml +++ b/test/bats/tests/aws/BasicTestMount.yaml @@ -5,7 +5,7 @@ metadata: spec: serviceAccountName: basic-test-mount-sa containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/azure/deployment-synck8s-azure.yaml b/test/bats/tests/azure/deployment-synck8s-azure.yaml index 94ad4afdf..880931bb1 100644 --- a/test/bats/tests/azure/deployment-synck8s-azure.yaml +++ b/test/bats/tests/azure/deployment-synck8s-azure.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/azure/deployment-two-synck8s-azure.yaml b/test/bats/tests/azure/deployment-two-synck8s-azure.yaml index c818fcec1..8c2d05e81 100644 --- a/test/bats/tests/azure/deployment-two-synck8s-azure.yaml +++ b/test/bats/tests/azure/deployment-two-synck8s-azure.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/azure/pod-azure-inline-volume-multiple-spc.yaml b/test/bats/tests/azure/pod-azure-inline-volume-multiple-spc.yaml index d135a2a02..53274cc4d 100644 --- a/test/bats/tests/azure/pod-azure-inline-volume-multiple-spc.yaml +++ b/test/bats/tests/azure/pod-azure-inline-volume-multiple-spc.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/azure/pod-secrets-store-inline-volume-crd.yaml b/test/bats/tests/azure/pod-secrets-store-inline-volume-crd.yaml index 460086874..8223e8b74 100644 --- a/test/bats/tests/azure/pod-secrets-store-inline-volume-crd.yaml +++ b/test/bats/tests/azure/pod-secrets-store-inline-volume-crd.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/azure/rotation/pod-synck8s-azure.yaml b/test/bats/tests/azure/rotation/pod-synck8s-azure.yaml index d918a2882..ced17a854 100644 --- a/test/bats/tests/azure/rotation/pod-synck8s-azure.yaml +++ b/test/bats/tests/azure/rotation/pod-synck8s-azure.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/e2e_provider/deployment-synck8s-e2e-provider.yaml b/test/bats/tests/e2e_provider/deployment-synck8s-e2e-provider.yaml index 8c26c7264..5a6cd832f 100644 --- a/test/bats/tests/e2e_provider/deployment-synck8s-e2e-provider.yaml +++ b/test/bats/tests/e2e_provider/deployment-synck8s-e2e-provider.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/e2e_provider/deployment-two-synck8s-e2e-provider.yaml b/test/bats/tests/e2e_provider/deployment-two-synck8s-e2e-provider.yaml index cbbb453b0..86c6aace4 100644 --- a/test/bats/tests/e2e_provider/deployment-two-synck8s-e2e-provider.yaml +++ b/test/bats/tests/e2e_provider/deployment-two-synck8s-e2e-provider.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/e2e_provider/pod-e2e-provider-inline-volume-multiple-spc.yaml b/test/bats/tests/e2e_provider/pod-e2e-provider-inline-volume-multiple-spc.yaml index 7b591b8e3..8538ba8a5 100644 --- a/test/bats/tests/e2e_provider/pod-e2e-provider-inline-volume-multiple-spc.yaml +++ b/test/bats/tests/e2e_provider/pod-e2e-provider-inline-volume-multiple-spc.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/e2e_provider/pod-secrets-store-inline-volume-crd.yaml b/test/bats/tests/e2e_provider/pod-secrets-store-inline-volume-crd.yaml index 65eef1f5d..0f8e2e619 100644 --- a/test/bats/tests/e2e_provider/pod-secrets-store-inline-volume-crd.yaml +++ b/test/bats/tests/e2e_provider/pod-secrets-store-inline-volume-crd.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/e2e_provider/rotation/pod-synck8s-e2e-provider.yaml b/test/bats/tests/e2e_provider/rotation/pod-synck8s-e2e-provider.yaml index 9d60f1cc2..bff3ec9ea 100644 --- a/test/bats/tests/e2e_provider/rotation/pod-synck8s-e2e-provider.yaml +++ b/test/bats/tests/e2e_provider/rotation/pod-synck8s-e2e-provider.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/gcp/pod-secrets-store-inline-volume-crd.yaml b/test/bats/tests/gcp/pod-secrets-store-inline-volume-crd.yaml index 3909e25d9..3df6d6808 100644 --- a/test/bats/tests/gcp/pod-secrets-store-inline-volume-crd.yaml +++ b/test/bats/tests/gcp/pod-secrets-store-inline-volume-crd.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/vault/deployment-synck8s.yaml b/test/bats/tests/vault/deployment-synck8s.yaml index ab775c509..08a96ccc7 100644 --- a/test/bats/tests/vault/deployment-synck8s.yaml +++ b/test/bats/tests/vault/deployment-synck8s.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/vault/deployment-two-synck8s.yaml b/test/bats/tests/vault/deployment-two-synck8s.yaml index d91d7c7ee..d69e3a1db 100644 --- a/test/bats/tests/vault/deployment-two-synck8s.yaml +++ b/test/bats/tests/vault/deployment-two-synck8s.yaml @@ -16,7 +16,7 @@ spec: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/vault/pod-vault-inline-volume-multiple-spc.yaml b/test/bats/tests/vault/pod-vault-inline-volume-multiple-spc.yaml index 5daba346b..d9186563e 100644 --- a/test/bats/tests/vault/pod-vault-inline-volume-multiple-spc.yaml +++ b/test/bats/tests/vault/pod-vault-inline-volume-multiple-spc.yaml @@ -5,7 +5,7 @@ metadata: spec: terminationGracePeriodSeconds: 0 containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/vault/pod-vault-inline-volume-secretproviderclass.yaml b/test/bats/tests/vault/pod-vault-inline-volume-secretproviderclass.yaml index 2da55e5df..79364ef61 100644 --- a/test/bats/tests/vault/pod-vault-inline-volume-secretproviderclass.yaml +++ b/test/bats/tests/vault/pod-vault-inline-volume-secretproviderclass.yaml @@ -4,7 +4,7 @@ metadata: name: secrets-store-inline spec: containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: diff --git a/test/bats/tests/vault/pod-vault-rotation.yaml b/test/bats/tests/vault/pod-vault-rotation.yaml index df6b14b36..3f2bab500 100644 --- a/test/bats/tests/vault/pod-vault-rotation.yaml +++ b/test/bats/tests/vault/pod-vault-rotation.yaml @@ -4,7 +4,7 @@ metadata: name: secrets-store-rotation spec: containers: - - image: k8s.gcr.io/e2e-test-images/busybox:1.29 + - image: registry.k8s.io/e2e-test-images/busybox:1.29-4 name: busybox imagePullPolicy: IfNotPresent command: