Skip to content

Commit cf9332a

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #252 from megian/switch-to-registry.k8s.io
Switch from k8s.gcr.io to registry.k8s.io
2 parents 4c82f69 + 7c1b24a commit cf9332a

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
**NFS subdir external provisioner** is an automatic provisioner that use your _existing and already configured_ NFS server to support dynamic provisioning of Kubernetes Persistent Volumes via Persistent Volume Claims. Persistent volumes are provisioned as `${namespace}-${pvcName}-${pvName}`.
44

55
Note: This repository is migrated from https://github.com/kubernetes-incubator/external-storage/tree/master/nfs-client. As part of the migration:
6-
- The container image name and repository has changed to `k8s.gcr.io/sig-storage` and `nfs-subdir-external-provisioner` respectively.
6+
- The container image name and repository has changed to `registry.k8s.io/sig-storage` and `nfs-subdir-external-provisioner` respectively.
77
- To maintain backward compatibility with earlier deployment files, the naming of NFS Client Provisioner is retained as `nfs-client-provisioner` in the deployment YAMLs.
88
- One of the pending areas for development on this repository is to add automated e2e tests. If you would like to contribute, please raise an issue or reach us on the Kubernetes slack #sig-storage channel.
99

@@ -208,7 +208,7 @@ spec:
208208
serviceAccountName: nfs-client-provisioner
209209
containers:
210210
- name: nfs-client-provisioner
211-
image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
211+
image: registry.k8s.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
212212
volumeMounts:
213213
- name: nfs-client-root
214214
mountPath: /persistentvolumes

‎charts/nfs-subdir-external-provisioner/README.md‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -48,43 +48,43 @@ The command removes all the Kubernetes components associated with the chart and
4848

4949
The following tables lists the configurable parameters of this chart and their default values.
5050

51-
| Parameter | Description | Default |
52-
| ----------------------------------- | ----------------------------------------------------------------------------------------------------- | -------------------------------------------------------- |
53-
| `replicaCount` | Number of provisioner instances to deployed | `1` |
54-
| `strategyType` | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
55-
| `image.repository` | Provisioner image | `k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner` |
56-
| `image.tag` | Version of provisioner image | `v4.0.2` |
57-
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
58-
| `imagePullSecrets` | Image pull secrets | `[]` |
59-
| `storageClass.name` | Name of the storageClass | `nfs-client` |
60-
| `storageClass.defaultClass` | Set as the default StorageClass | `false` |
61-
| `storageClass.allowVolumeExpansion` | Allow expanding the volume | `true` |
62-
| `storageClass.reclaimPolicy` | Method used to reclaim an obsoleted volume | `Delete` |
63-
| `storageClass.provisionerName` | Name of the provisionerName | null |
64-
| `storageClass.archiveOnDelete` | Archive PVC when deleting | `true` |
65-
| `storageClass.onDelete` | Strategy on PVC deletion. Overrides archiveOnDelete when set to lowercase values 'delete' or 'retain' | null |
66-
| `storageClass.pathPattern` | Specifies a template for the directory name | null |
67-
| `storageClass.accessModes` | Set access mode for PV | `ReadWriteOnce` |
68-
| `storageClass.volumeBindingMode` | Set volume binding mode for Storage Class | `Immediate` |
69-
| `storageClass.annotations` | Set additional annotations for the StorageClass | `{}` |
70-
| `leaderElection.enabled` | Enables or disables leader election | `true` |
71-
| `nfs.server` | Hostname of the NFS server (required) | null (ip or hostname) |
72-
| `nfs.path` | Basepath of the mount point to be used | `/nfs-storage` |
73-
| `nfs.mountOptions` | Mount options (e.g. 'nfsvers=3') | null |
74-
| `nfs.volumeName` | Volume name used inside the pods | `nfs-subdir-external-provisioner-root` |
75-
| `nfs.reclaimPolicy` | Reclaim policy for the main nfs volume used for subdir provisioning | `Retain` |
76-
| `resources` | Resources required (e.g. CPU, memory) | `{}` |
77-
| `rbac.create` | Use Role-based Access Control | `true` |
78-
| `podSecurityPolicy.enabled` | Create & use Pod Security Policy resources | `false` |
79-
| `podAnnotations` | Additional annotations for the Pods | `{}` |
80-
| `priorityClassName` | Set pod priorityClassName | null |
81-
| `serviceAccount.create` | Should we create a ServiceAccount | `true` |
82-
| `serviceAccount.name` | Name of the ServiceAccount to use | null |
83-
| `serviceAccount.annotations` | Additional annotations for the ServiceAccount | `{}` |
84-
| `nodeSelector` | Node labels for pod assignment | `{}` |
85-
| `affinity` | Affinity settings | `{}` |
86-
| `tolerations` | List of node taints to tolerate | `[]` |
87-
| `labels` | Additional labels for any resource created | `{}` |
51+
| Parameter | Description | Default |
52+
| ----------------------------------- | ----------------------------------------------------------------------------------------------------- | ------------------------------------------------------------- |
53+
| `replicaCount` | Number of provisioner instances to deployed | `1` |
54+
| `strategyType` | Specifies the strategy used to replace old Pods by new ones | `Recreate` |
55+
| `image.repository` | Provisioner image | `registry.k8s.io/sig-storage/nfs-subdir-external-provisioner` |
56+
| `image.tag` | Version of provisioner image | `v4.0.2` |
57+
| `image.pullPolicy` | Image pull policy | `IfNotPresent` |
58+
| `imagePullSecrets` | Image pull secrets | `[]` |
59+
| `storageClass.name` | Name of the storageClass | `nfs-client` |
60+
| `storageClass.defaultClass` | Set as the default StorageClass | `false` |
61+
| `storageClass.allowVolumeExpansion` | Allow expanding the volume | `true` |
62+
| `storageClass.reclaimPolicy` | Method used to reclaim an obsoleted volume | `Delete` |
63+
| `storageClass.provisionerName` | Name of the provisionerName | null |
64+
| `storageClass.archiveOnDelete` | Archive PVC when deleting | `true` |
65+
| `storageClass.onDelete` | Strategy on PVC deletion. Overrides archiveOnDelete when set to lowercase values 'delete' or 'retain' | null |
66+
| `storageClass.pathPattern` | Specifies a template for the directory name | null |
67+
| `storageClass.accessModes` | Set access mode for PV | `ReadWriteOnce` |
68+
| `storageClass.volumeBindingMode` | Set volume binding mode for Storage Class | `Immediate` |
69+
| `storageClass.annotations` | Set additional annotations for the StorageClass | `{}` |
70+
| `leaderElection.enabled` | Enables or disables leader election | `true` |
71+
| `nfs.server` | Hostname of the NFS server (required) | null (ip or hostname) |
72+
| `nfs.path` | Basepath of the mount point to be used | `/nfs-storage` |
73+
| `nfs.mountOptions` | Mount options (e.g. 'nfsvers=3') | null |
74+
| `nfs.volumeName` | Volume name used inside the pods | `nfs-subdir-external-provisioner-root` |
75+
| `nfs.reclaimPolicy` | Reclaim policy for the main nfs volume used for subdir provisioning | `Retain` |
76+
| `resources` | Resources required (e.g. CPU, memory) | `{}` |
77+
| `rbac.create` | Use Role-based Access Control | `true` |
78+
| `podSecurityPolicy.enabled` | Create & use Pod Security Policy resources | `false` |
79+
| `podAnnotations` | Additional annotations for the Pods | `{}` |
80+
| `priorityClassName` | Set pod priorityClassName | null |
81+
| `serviceAccount.create` | Should we create a ServiceAccount | `true` |
82+
| `serviceAccount.name` | Name of the ServiceAccount to use | null |
83+
| `serviceAccount.annotations` | Additional annotations for the ServiceAccount | `{}` |
84+
| `nodeSelector` | Node labels for pod assignment | `{}` |
85+
| `affinity` | Affinity settings | `{}` |
86+
| `tolerations` | List of node taints to tolerate | `[]` |
87+
| `labels` | Additional labels for any resource created | `{}` |
8888

8989
## Install Multiple Provisioners
9090

‎charts/nfs-subdir-external-provisioner/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ replicaCount: 1
22
strategyType: Recreate
33

44
image:
5-
repository: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner
5+
repository: registry.k8s.io/sig-storage/nfs-subdir-external-provisioner
66
tag: v4.0.2
77
pullPolicy: IfNotPresent
88
imagePullSecrets: []

‎deploy/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
serviceAccountName: nfs-client-provisioner
2222
containers:
2323
- name: nfs-client-provisioner
24-
image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
24+
image: registry.k8s.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
2525
volumeMounts:
2626
- name: nfs-client-root
2727
mountPath: /persistentvolumes

‎deploy/objects/deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ spec:
2121
serviceAccountName: nfs-client-provisioner
2222
containers:
2323
- name: nfs-client-provisioner
24-
image: k8s.gcr.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
24+
image: registry.k8s.io/sig-storage/nfs-subdir-external-provisioner:v4.0.2
2525
volumeMounts:
2626
- name: nfs-client-root
2727
mountPath: /persistentvolumes

0 commit comments

Comments
 (0)