From 9fc4eda14e814508ea29391a4e1ccaa31aca9912 Mon Sep 17 00:00:00 2001 From: xin gu <418294249@qq.com> Date: Tue, 7 Mar 2023 14:40:59 +0800 Subject: [PATCH 1/2] update k8s.gcr.io to registry.k8s.io update k8s.gcr.io to registry.k8s.io --- charts/nfs-server-provisioner/README.md | 2 +- charts/nfs-server-provisioner/values.yaml | 2 +- deploy/kubernetes/deployment.yaml | 2 +- deploy/kubernetes/pod.yaml | 2 +- deploy/kubernetes/statefulset.yaml | 2 +- docs/deployment.md | 8 ++++---- release-tools/SIDECAR_RELEASE_PROCESS.md | 4 ++-- release-tools/cloudbuild.yaml | 2 +- release-tools/prow.sh | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/nfs-server-provisioner/README.md b/charts/nfs-server-provisioner/README.md index 52b0315f..48d0d0ff 100644 --- a/charts/nfs-server-provisioner/README.md +++ b/charts/nfs-server-provisioner/README.md @@ -57,7 +57,7 @@ their default values. |:-------------------------------|:----------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------| | `extraArgs` | [Additional command line arguments](https://github.com/kubernetes-incubator/external-storage/blob/HEAD/nfs/docs/deployment.md#arguments) | `{}` | `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) | -| `image.repository` | The image repository to pull from | `k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8` | +| `image.repository` | The image repository to pull from | `registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8` | | `image.tag` | The image tag to pull | `v4.0.8` | | `image.digest` | The image digest to pull, this option has precedence over `image.tag` | `nil` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | diff --git a/charts/nfs-server-provisioner/values.yaml b/charts/nfs-server-provisioner/values.yaml index fafb9cb4..85cb9759 100644 --- a/charts/nfs-server-provisioner/values.yaml +++ b/charts/nfs-server-provisioner/values.yaml @@ -7,7 +7,7 @@ replicaCount: 1 # imagePullSecrets: image: - repository: k8s.gcr.io/sig-storage/nfs-provisioner + repository: registry.k8s.io/sig-storage/nfs-provisioner tag: v4.0.8 # digest: pullPolicy: IfNotPresent diff --git a/deploy/kubernetes/deployment.yaml b/deploy/kubernetes/deployment.yaml index b2510cd3..df64118c 100644 --- a/deploy/kubernetes/deployment.yaml +++ b/deploy/kubernetes/deployment.yaml @@ -63,7 +63,7 @@ spec: serviceAccount: nfs-provisioner containers: - name: nfs-provisioner - image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 + image: registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 ports: - name: nfs containerPort: 2049 diff --git a/deploy/kubernetes/pod.yaml b/deploy/kubernetes/pod.yaml index 3810a970..7ca29646 100644 --- a/deploy/kubernetes/pod.yaml +++ b/deploy/kubernetes/pod.yaml @@ -11,7 +11,7 @@ spec: serviceAccount: nfs-provisioner containers: - name: nfs-provisioner - image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 + image: registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 ports: - name: nfs containerPort: 2049 diff --git a/deploy/kubernetes/statefulset.yaml b/deploy/kubernetes/statefulset.yaml index 7b218cd1..01dcb26d 100644 --- a/deploy/kubernetes/statefulset.yaml +++ b/deploy/kubernetes/statefulset.yaml @@ -63,7 +63,7 @@ spec: terminationGracePeriodSeconds: 10 containers: - name: nfs-provisioner - image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 + image: registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 ports: - name: nfs containerPort: 2049 diff --git a/docs/deployment.md b/docs/deployment.md index 711652eb..16564014 100644 --- a/docs/deployment.md +++ b/docs/deployment.md @@ -29,7 +29,7 @@ $ make container If you are running in Kubernetes, it will pull the image from GCR for you. Or you can do it yourself. ``` -$ docker pull k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 +$ docker pull registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 ``` ## Deploying the provisioner @@ -87,7 +87,7 @@ You may want to specify the hostname the NFS server exports from, i.e. the serve $ docker run --cap-add DAC_READ_SEARCH --cap-add SYS_RESOURCE \ --security-opt seccomp:deploy/docker/nfs-provisioner-seccomp.json \ -v $HOME/.kube:/.kube:Z \ -k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 \ +registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 \ -provisioner=example.com/nfs \ -kubeconfig=/.kube/config ``` @@ -95,7 +95,7 @@ or ``` $ docker run --cap-add DAC_READ_SEARCH --cap-add SYS_RESOURCE \ --security-opt seccomp:deploy/docker/nfs-provisioner-seccomp.json \ -k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 \ +registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 \ -provisioner=example.com/nfs \ -master=http://172.17.0.1:8080 ``` @@ -110,7 +110,7 @@ With the two above options, the run command will look something like this. $ docker run --privileged \ -v $HOME/.kube:/.kube:Z \ -v /xfs:/export:Z \ -k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 \ +registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 \ -provisioner=example.com/nfs \ -kubeconfig=/.kube/config \ -enable-xfs-quota=true diff --git a/release-tools/SIDECAR_RELEASE_PROCESS.md b/release-tools/SIDECAR_RELEASE_PROCESS.md index e4b30e89..9b48b81c 100644 --- a/release-tools/SIDECAR_RELEASE_PROCESS.md +++ b/release-tools/SIDECAR_RELEASE_PROCESS.md @@ -88,9 +88,9 @@ naming convention `-on-`. 1. If release was a new major/minor version, create a new `release-` branch at that commit. 1. Check [image build status](https://k8s-testgrid.appspot.com/sig-storage-image-build). -1. Promote images from k8s-staging-sig-storage to k8s.gcr.io/sig-storage. From +1. Promote images from k8s-staging-sig-storage to registry.k8s.io/sig-storage. From the [k8s image - repo](https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage), + repo](https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage), run `./generate.sh > images.yaml`, and send a PR with the updated images. Once merged, the image promoter will copy the images from staging to prod. 1. Update [kubernetes-csi/docs](https://github.com/kubernetes-csi/docs) sidecar diff --git a/release-tools/cloudbuild.yaml b/release-tools/cloudbuild.yaml index 21f1eef8..128ce2ad 100644 --- a/release-tools/cloudbuild.yaml +++ b/release-tools/cloudbuild.yaml @@ -13,7 +13,7 @@ # See https://github.com/kubernetes/test-infra/blob/HEAD/config/jobs/image-pushing/README.md # for more details on image pushing process in Kubernetes. # -# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage. +# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage. # This must be specified in seconds. If omitted, defaults to 600s (10 mins). # Building the Dockerfile we maintain for non-amd64 architectures has been found diff --git a/release-tools/prow.sh b/release-tools/prow.sh index 85b89007..cfe399c8 100755 --- a/release-tools/prow.sh +++ b/release-tools/prow.sh @@ -813,7 +813,7 @@ install_snapshot_controller() { modified="$(cat "$i" | while IFS= read -r line; do nocomments="$(echo "$line" | sed -e 's/ *#.*$//')" if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then - # Split 'image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0' + # Split 'image: registry.k8s.io/sig-storage/snapshot-controller:v3.0.0' # into image (snapshot-controller:v3.0.0), # name (snapshot-controller), # tag (v3.0.0). @@ -914,11 +914,11 @@ patch_kubernetes () { local source="$1" target="$2" if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then - # We cannot replace k8s.gcr.io/sig-storage with gcr.io/k8s-staging-sig-storage because + # We cannot replace registry.k8s.io/sig-storage with gcr.io/k8s-staging-sig-storage because # e2e.test does not support it (see test/utils/image/manifest.go). Instead we # invoke the e2e.test binary with KUBE_TEST_REPO_LIST set to a file that # overrides that registry. - find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;k8s.gcr.io/sig-storage/\(.*\):v.*;k8s.gcr.io/sig-storage/\1:canary;' + find "$source/test/e2e/testing-manifests/storage-csi/mock" -name '*.yaml' -print0 | xargs -0 sed -i -e 's;registry.k8s.io/sig-storage/\(.*\):v.*;registry.k8s.io/sig-storage/\1:canary;' cat >"$target/e2e-repo-list" < Date: Tue, 7 Mar 2023 18:18:46 +0800 Subject: [PATCH 2/2] Update Chart.yaml --- charts/nfs-server-provisioner/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/nfs-server-provisioner/Chart.yaml b/charts/nfs-server-provisioner/Chart.yaml index d50a0dc2..e6c6d596 100644 --- a/charts/nfs-server-provisioner/Chart.yaml +++ b/charts/nfs-server-provisioner/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: 4.0.8 description: nfs-server-provisioner is an out-of-tree dynamic provisioner for Kubernetes. You can use it to quickly & easily deploy shared storage that works almost anywhere. name: nfs-server-provisioner -version: 1.7.0 +version: 1.8.0 maintainers: - name: kiall email: kiall@macinnes.ie