Skip to content

Commit

Permalink
chore: use base and test image from registry.k8s.io
Browse files Browse the repository at this point in the history
Signed-off-by: Anish Ramasekar <anish.ramasekar@gmail.com>
  • Loading branch information
aramase committed Feb 9, 2023
1 parent c851df5 commit 7951913
Show file tree
Hide file tree
Showing 23 changed files with 36 additions and 36 deletions.
4 changes: 2 additions & 2 deletions .local/debug-driver.yaml
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions 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
2 changes: 1 addition & 1 deletion docker/Dockerfile
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions docs/book/src/topics/set-as-env-var.md
Expand Up @@ -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:
Expand All @@ -35,7 +35,7 @@ spec:
objectType: key
objectVersion: $KEY_VERSION
tenantId: "tid" # the tenant ID of the KeyVault
```
```

- `Pod` yaml

Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions docs/book/src/topics/sync-as-kubernetes-secret.md
Expand Up @@ -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:
Expand All @@ -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"
Expand Down Expand Up @@ -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`.
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/aws/BasicTestMount.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/azure/deployment-synck8s-azure.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/azure/deployment-two-synck8s-azure.yaml
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/azure/rotation/pod-synck8s-azure.yaml
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/vault/deployment-synck8s.yaml
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/vault/deployment-two-synck8s.yaml
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test/bats/tests/vault/pod-vault-rotation.yaml
Expand Up @@ -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:
Expand Down

0 comments on commit 7951913

Please sign in to comment.