Skip to content

Commit 5225a85

Browse files
authored
Merge pull request #124 from asa3311/update-k8s.gcr.io-to-registry.k8s.io
Replace k8s.gcr.io references with registry.k8s.io
2 parents 0fa28a3 + cdb89a8 commit 5225a85

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

charts/nfs-server-provisioner/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v1
22
appVersion: 4.0.8
33
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.
44
name: nfs-server-provisioner
5-
version: 1.7.0
5+
version: 1.8.0
66
maintainers:
77
- name: kiall
88

charts/nfs-server-provisioner/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ their default values.
5757
|:-------------------------------|:----------------------------------------------------------------------------------------------------------------|:---------------------------------------------------------|
5858
| `extraArgs` | [Additional command line arguments](https://github.com/kubernetes-incubator/external-storage/blob/HEAD/nfs/docs/deployment.md#arguments) | `{}`
5959
| `imagePullSecrets` | Specify image pull secrets | `nil` (does not add image pull secrets to deployed pods) |
60-
| `image.repository` | The image repository to pull from | `k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8` |
60+
| `image.repository` | The image repository to pull from | `registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8` |
6161
| `image.tag` | The image tag to pull | `v4.0.8` |
6262
| `image.digest` | The image digest to pull, this option has precedence over `image.tag` | `nil` |
6363
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |

charts/nfs-server-provisioner/values.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replicaCount: 1
77
# imagePullSecrets:
88

99
image:
10-
repository: k8s.gcr.io/sig-storage/nfs-provisioner
10+
repository: registry.k8s.io/sig-storage/nfs-provisioner
1111
tag: v4.0.8
1212
# digest:
1313
pullPolicy: IfNotPresent

deploy/kubernetes/deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
serviceAccount: nfs-provisioner
6464
containers:
6565
- name: nfs-provisioner
66-
image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
66+
image: registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8
6767
ports:
6868
- name: nfs
6969
containerPort: 2049

deploy/kubernetes/pod.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
serviceAccount: nfs-provisioner
1212
containers:
1313
- name: nfs-provisioner
14-
image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
14+
image: registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8
1515
ports:
1616
- name: nfs
1717
containerPort: 2049

deploy/kubernetes/statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ spec:
6363
terminationGracePeriodSeconds: 10
6464
containers:
6565
- name: nfs-provisioner
66-
image: k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
66+
image: registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8
6767
ports:
6868
- name: nfs
6969
containerPort: 2049

docs/deployment.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ $ make container
2929
If you are running in Kubernetes, it will pull the image from GCR for you. Or you can do it yourself.
3030

3131
```
32-
$ docker pull k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8
32+
$ docker pull registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8
3333
```
3434

3535
## Deploying the provisioner
@@ -87,15 +87,15 @@ You may want to specify the hostname the NFS server exports from, i.e. the serve
8787
$ docker run --cap-add DAC_READ_SEARCH --cap-add SYS_RESOURCE \
8888
--security-opt seccomp:deploy/docker/nfs-provisioner-seccomp.json \
8989
-v $HOME/.kube:/.kube:Z \
90-
k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 \
90+
registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 \
9191
-provisioner=example.com/nfs \
9292
-kubeconfig=/.kube/config
9393
```
9494
or
9595
```
9696
$ docker run --cap-add DAC_READ_SEARCH --cap-add SYS_RESOURCE \
9797
--security-opt seccomp:deploy/docker/nfs-provisioner-seccomp.json \
98-
k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 \
98+
registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 \
9999
-provisioner=example.com/nfs \
100100
-master=http://172.17.0.1:8080
101101
```
@@ -110,7 +110,7 @@ With the two above options, the run command will look something like this.
110110
$ docker run --privileged \
111111
-v $HOME/.kube:/.kube:Z \
112112
-v /xfs:/export:Z \
113-
k8s.gcr.io/sig-storage/nfs-provisioner:v4.0.8 \
113+
registry.k8s.io/sig-storage/nfs-provisioner:v4.0.8 \
114114
-provisioner=example.com/nfs \
115115
-kubeconfig=/.kube/config \
116116
-enable-xfs-quota=true

release-tools/SIDECAR_RELEASE_PROCESS.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,9 @@ naming convention `<hostpath-deployment-version>-on-<kubernetes-version>`.
8888
1. If release was a new major/minor version, create a new `release-<minor>`
8989
branch at that commit.
9090
1. Check [image build status](https://k8s-testgrid.appspot.com/sig-storage-image-build).
91-
1. Promote images from k8s-staging-sig-storage to k8s.gcr.io/sig-storage. From
91+
1. Promote images from k8s-staging-sig-storage to registry.k8s.io/sig-storage. From
9292
the [k8s image
93-
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage),
93+
repo](https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage),
9494
run `./generate.sh > images.yaml`, and send a PR with the updated images.
9595
Once merged, the image promoter will copy the images from staging to prod.
9696
1. Update [kubernetes-csi/docs](https://github.com/kubernetes-csi/docs) sidecar

release-tools/cloudbuild.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# See https://github.com/kubernetes/test-infra/blob/HEAD/config/jobs/image-pushing/README.md
1414
# for more details on image pushing process in Kubernetes.
1515
#
16-
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/k8s.gcr.io/images/k8s-staging-sig-storage.
16+
# To promote release images, see https://github.com/kubernetes/k8s.io/tree/HEAD/registry.k8s.io/images/k8s-staging-sig-storage.
1717

1818
# This must be specified in seconds. If omitted, defaults to 600s (10 mins).
1919
# Building the Dockerfile we maintain for non-amd64 architectures has been found

release-tools/prow.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ install_snapshot_controller() {
813813
modified="$(cat "$i" | while IFS= read -r line; do
814814
nocomments="$(echo "$line" | sed -e 's/ *#.*$//')"
815815
if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then
816-
# Split 'image: k8s.gcr.io/sig-storage/snapshot-controller:v3.0.0'
816+
# Split 'image: registry.k8s.io/sig-storage/snapshot-controller:v3.0.0'
817817
# into image (snapshot-controller:v3.0.0),
818818
# name (snapshot-controller),
819819
# tag (v3.0.0).
@@ -914,11 +914,11 @@ patch_kubernetes () {
914914
local source="$1" target="$2"
915915
916916
if [ "${CSI_PROW_DRIVER_CANARY}" = "canary" ]; then
917-
# We cannot replace k8s.gcr.io/sig-storage with gcr.io/k8s-staging-sig-storage because
917+
# We cannot replace registry.k8s.io/sig-storage with gcr.io/k8s-staging-sig-storage because
918918
# e2e.test does not support it (see test/utils/image/manifest.go). Instead we
919919
# invoke the e2e.test binary with KUBE_TEST_REPO_LIST set to a file that
920920
# overrides that registry.
921-
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;'
921+
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;'
922922
cat >"$target/e2e-repo-list" <<EOF
923923
sigStorageRegistry: gcr.io/k8s-staging-sig-storage
924924
EOF

0 commit comments

Comments
 (0)