Skip to content

Commit b63bedb

Browse files
authored
Merge pull request #1182 from k8s-infra-cherrypick-robot/cherry-pick-1161-to-release-1.3
[release-1.3] chore: use base and test image from `registry.k8s.io`
2 parents bd02eb2 + 8bd2629 commit b63bedb

23 files changed

+36
-36
lines changed

.local/debug-driver.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
serviceAccountName: secrets-store-csi-driver
1818
containers:
1919
- name: node-driver-registrar
20-
image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0
20+
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.2.0
2121
args:
2222
- --v=5
2323
- --csi-address=/csi/csi.sock
@@ -42,7 +42,7 @@ spec:
4242
cpu: 10m
4343
memory: 20Mi
4444
- name: liveness-probe
45-
image: k8s.gcr.io/sig-storage/livenessprobe:v2.3.0
45+
image: registry.k8s.io/sig-storage/livenessprobe:v2.3.0
4646
imagePullPolicy: IfNotPresent
4747
args:
4848
- --csi-address=/csi/csi.sock

docker/BASEIMAGE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
linux/amd64=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2
2-
linux/arm64=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2
1+
linux/amd64=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2
2+
linux/arm64=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2
33
windows/amd64/1809=mcr.microsoft.com/windows/nanoserver:1809
44
windows/amd64/1903=mcr.microsoft.com/windows/nanoserver:1903
55
windows/amd64/1909=mcr.microsoft.com/windows/nanoserver:1909

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
ARG BASEIMAGE=k8s.gcr.io/build-image/debian-base:bullseye-v1.4.2
15+
ARG BASEIMAGE=registry.k8s.io/build-image/debian-base:bullseye-v1.4.2
1616

1717
FROM golang:1.19 as builder
1818
WORKDIR /go/src/sigs.k8s.io/secrets-store-csi-driver

docs/book/src/topics/set-as-env-var.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ spec:
1515
secretObjects: # [OPTIONAL] SecretObject defines the desired state of synced K8s secret objects
1616
- secretName: foosecret
1717
type: Opaque
18-
labels:
18+
labels:
1919
environment: "test"
20-
data:
21-
- objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias
20+
data:
21+
- objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias
2222
key: username
2323
parameters:
24-
usePodIdentity: "false"
24+
usePodIdentity: "false"
2525
keyvaultName: "$KEYVAULT_NAME" # the name of the KeyVault
2626
objects: |
2727
array:
@@ -35,7 +35,7 @@ spec:
3535
objectType: key
3636
objectVersion: $KEY_VERSION
3737
tenantId: "tid" # the tenant ID of the KeyVault
38-
```
38+
```
3939
4040
- `Pod` yaml
4141

@@ -47,7 +47,7 @@ metadata:
4747
spec:
4848
containers:
4949
- name: busybox
50-
image: k8s.gcr.io/e2e-test-images/busybox:1.29
50+
image: registry.k8s.io/e2e-test-images/busybox:1.29
5151
command:
5252
- "/bin/sleep"
5353
- "10000"
@@ -77,7 +77,7 @@ Once the [secret is created](./sync-as-kubernetes-secret.md), you may wish to se
7777
```yaml
7878
spec:
7979
containers:
80-
- image: k8s.gcr.io/e2e-test-images/busybox:1.29
80+
- image: registry.k8s.io/e2e-test-images/busybox:1.29
8181
name: busybox
8282
command:
8383
- "/bin/sleep"

docs/book/src/topics/sync-as-kubernetes-secret.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ spec:
1515
secretObjects: # [OPTIONAL] SecretObject defines the desired state of synced K8s secret objects
1616
- secretName: foosecret
1717
type: Opaque
18-
labels:
18+
labels:
1919
environment: "test"
20-
data:
21-
- objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias
20+
data:
21+
- objectName: secretalias # name of the mounted content to sync. this could be the object name or object alias
2222
key: username
2323
parameters:
24-
usePodIdentity: "true"
24+
usePodIdentity: "true"
2525
keyvaultName: "$KEYVAULT_NAME" # the name of the KeyVault
2626
objects: |
2727
array:
@@ -47,7 +47,7 @@ metadata:
4747
spec:
4848
containers:
4949
- name: busybox
50-
image: k8s.gcr.io/e2e-test-images/busybox:1.29
50+
image: registry.k8s.io/e2e-test-images/busybox:1.29
5151
command:
5252
- "/bin/sleep"
5353
- "10000"
@@ -88,4 +88,4 @@ spec:
8888
type: Opaque # type of the Kubernetes Secret object e.g. Opaque, kubernetes.io/tls
8989
```
9090

91-
> 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`.
91+
> 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`.

test/bats/tests/akeyless/pod-inline-volume-secretproviderclass.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
name: secrets-store-inline
55
spec:
66
containers:
7-
- image: k8s.gcr.io/e2e-test-images/busybox:1.29
7+
- image: registry.k8s.io/e2e-test-images/busybox:1.29-4
88
name: busybox
99
imagePullPolicy: IfNotPresent
1010
command:

test/bats/tests/aws/BasicTestMount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
serviceAccountName: basic-test-mount-sa
77
containers:
8-
- image: k8s.gcr.io/e2e-test-images/busybox:1.29
8+
- image: registry.k8s.io/e2e-test-images/busybox:1.29-4
99
name: busybox
1010
imagePullPolicy: IfNotPresent
1111
command:

test/bats/tests/azure/deployment-synck8s-azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
terminationGracePeriodSeconds: 0
1818
containers:
19-
- image: k8s.gcr.io/e2e-test-images/busybox:1.29
19+
- image: registry.k8s.io/e2e-test-images/busybox:1.29-4
2020
name: busybox
2121
imagePullPolicy: IfNotPresent
2222
command:

test/bats/tests/azure/deployment-two-synck8s-azure.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ spec:
1616
spec:
1717
terminationGracePeriodSeconds: 0
1818
containers:
19-
- image: k8s.gcr.io/e2e-test-images/busybox:1.29
19+
- image: registry.k8s.io/e2e-test-images/busybox:1.29-4
2020
name: busybox
2121
imagePullPolicy: IfNotPresent
2222
command:

test/bats/tests/azure/pod-azure-inline-volume-multiple-spc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
terminationGracePeriodSeconds: 0
77
containers:
8-
- image: k8s.gcr.io/e2e-test-images/busybox:1.29
8+
- image: registry.k8s.io/e2e-test-images/busybox:1.29-4
99
name: busybox
1010
imagePullPolicy: IfNotPresent
1111
command:

0 commit comments

Comments
 (0)