scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35905 from jsafrane/secret-types

Browse Source 
Automatic merge from submit-queue

Update Secret.type examples used for provisioning.

Kubernetes now checks that secrets used for provisioning of volumes
have correct type (PR #35675), all examples should reflect it.
This commit is contained in:
Kubernetes Submit Queue
2016-11-06 11:00:17 -08:00
committed by GitHub
parent 28733b0f8b 7f5b6afbc0
commit 1f0febc8c9
4 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/experimental/persistent-volume-provisioning/README.md
View File

@@ -84,7 +84,7 @@ parameters:
* `restauthenabled` : Gluster REST service authentication boolean that enables authentication to the REST server. If this value is 'true', `restuser` and `restuserkey` or `secretNamespace` + `secretName` have to be filled. This option is deprecated, authentication is enabled when any of `restuser`, `restuserkey`, `secretName` or `secretNamespace` is specified. * `restauthenabled` : Gluster REST service authentication boolean that enables authentication to the REST server. If this value is 'true', `restuser` and `restuserkey` or `secretNamespace` + `secretName` have to be filled. This option is deprecated, authentication is enabled when any of `restuser`, `restuserkey`, `secretName` or `secretNamespace` is specified.
* `restuser` : Gluster REST service/Heketi user who has access to create volumes in the Gluster Trusted Pool. * `restuser` : Gluster REST service/Heketi user who has access to create volumes in the Gluster Trusted Pool.
* `restuserkey` : Gluster REST service/Heketi user's password which will be used for authentication to the REST server. This parameter is deprecated in favor of `secretNamespace` + `secretName`. * `restuserkey` : Gluster REST service/Heketi user's password which will be used for authentication to the REST server. This parameter is deprecated in favor of `secretNamespace` + `secretName`.
* `secretNamespace` + `secretName` : Identification of Secret instance that containes user password to use when talking to Gluster REST service. These parameters are optional, empty password will be used when both `secretNamespace` and `secretName` are omitted. * `secretNamespace` + `secretName` : Identification of Secret instance that containes user password to use when talking to Gluster REST service. These parameters are optional, empty password will be used when both `secretNamespace` and `secretName` are omitted. The provided secret must have type "kubernetes.io/glusterfs".
When both `restuserkey` and `secretNamespace` + `secretName` is specified, the secret will be used. When both `restuserkey` and `secretNamespace` + `secretName` is specified, the secret will be used.
@@ -131,7 +131,7 @@ parameters:
* `monitors`: Ceph monitors, comma delimited. It is required. * `monitors`: Ceph monitors, comma delimited. It is required.
* `adminId`: Ceph client ID that is capable of creating images in the pool. Default is "admin". * `adminId`: Ceph client ID that is capable of creating images in the pool. Default is "admin".
* `adminSecret`: Secret Name for `adminId`. It is required. * `adminSecret`: Secret Name for `adminId`. It is required. The provided secret must have type "kubernetes.io/rbd".
* `adminSecretNamespace`: The namespace for `adminSecret`. Default is "default". * `adminSecretNamespace`: The namespace for `adminSecret`. Default is "default".
* `pool`: Ceph RBD pool. Default is "rbd". * `pool`: Ceph RBD pool. Default is "rbd".
* `userId`: Ceph client ID that is used to map the RBD image. Default is the same as `adminId`. * `userId`: Ceph client ID that is used to map the RBD image. Default is the same as `adminId`.
@@ -163,7 +163,7 @@ parameters:
* **quobyteAPIServer** API Server of Quobyte in the format http(s)://api-server:7860 * **quobyteAPIServer** API Server of Quobyte in the format http(s)://api-server:7860
* **registry** Quobyte registry to use to mount the volume. You can specifiy the registry as <host>:<port> pair or if you want to specify multiple registries you just have to put a comma between them e.q. <host1>:<port>,<host2>:<port>,<host3>:<port>. The host can be an IP address or if you have a working DNS you can also provide the DNS names. * **registry** Quobyte registry to use to mount the volume. You can specifiy the registry as <host>:<port> pair or if you want to specify multiple registries you just have to put a comma between them e.q. <host1>:<port>,<host2>:<port>,<host3>:<port>. The host can be an IP address or if you have a working DNS you can also provide the DNS names.
* **adminSecretName** secret that holds information about the Quobyte user and the password to authenticate agains the API server. * **adminSecretName** secret that holds information about the Quobyte user and the password to authenticate agains the API server. The provided secret must have type "kubernetes.io/quobyte".
* **adminSecretNamespace** The namespace for **adminSecretName**. Default is `default`. * **adminSecretNamespace** The namespace for **adminSecretName**. Default is `default`.
* **user** maps all access to this user. Default is `root`. * **user** maps all access to this user. Default is `root`.
* **group** maps all access to this group. Default is `nfsnobody`. * **group** maps all access to this group. Default is `nfsnobody`.

1
examples/experimental/persistent-volume-provisioning/glusterfs-provisioning-secret.yaml
View File

@@ -6,3 +6,4 @@ metadata:
data: data:
# base64 encoded password. E.g.: echo -n "mypassword" | base64 # base64 encoded password. E.g.: echo -n "mypassword" | base64
key: bXlwYXNzd29yZA== key: bXlwYXNzd29yZA==
type: kubernetes.io/glusterfs

1
examples/experimental/persistent-volume-provisioning/quobyte/quobyte-admin-secret.yaml
View File

@@ -5,3 +5,4 @@ metadata:
data: data:
password: cXVvYnl0ZQ== password: cXVvYnl0ZQ==
user: YWRtaW4= user: YWRtaW4=
type: kubernetes.io/quobyte

1
examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
View File

@@ -5,3 +5,4 @@ metadata:
type: "kubernetes.io/rbd" type: "kubernetes.io/rbd"
data: data:
key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ== key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ==
type: kubernetes.io/rbd