From 622b388452c607a8da29c413188cc0f535460989 Mon Sep 17 00:00:00 2001 From: Huamin Chen Date: Thu, 3 Nov 2016 13:45:25 -0400 Subject: [PATCH] add secret type to RBD secrets in examples and e2e test Signed-off-by: Huamin Chen --- .../persistent-volume-provisioning/rbd/ceph-secret-admin.yaml | 1 + .../persistent-volume-provisioning/rbd/ceph-secret-user.yaml | 1 + examples/volumes/rbd/secret/ceph-secret.yaml | 1 + test/e2e/volumes.go | 2 ++ 4 files changed, 5 insertions(+) diff --git a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml index 5c7af1e1389..44afd8950be 100644 --- a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml +++ b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml @@ -2,5 +2,6 @@ apiVersion: v1 kind: Secret metadata: name: ceph-secret-admin +type: "kubernetes.io/rbd" data: key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ== diff --git a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml index 32f8420938b..96b777646d5 100644 --- a/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml +++ b/examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml @@ -2,5 +2,6 @@ apiVersion: v1 kind: Secret metadata: name: ceph-secret-user +type: "kubernetes.io/rbd" data: key: QVFBTWdYaFZ3QkNlRGhBQTlubFBhRnlmVVNhdEdENGRyRldEdlE9PQ== diff --git a/examples/volumes/rbd/secret/ceph-secret.yaml b/examples/volumes/rbd/secret/ceph-secret.yaml index e29a5535ab4..f717f9005ec 100644 --- a/examples/volumes/rbd/secret/ceph-secret.yaml +++ b/examples/volumes/rbd/secret/ceph-secret.yaml @@ -2,5 +2,6 @@ apiVersion: v1 kind: Secret metadata: name: ceph-secret +type: "kubernetes.io/rbd" data: key: QVFCMTZWMVZvRjVtRXhBQTVrQ1FzN2JCajhWVUxSdzI2Qzg0SEE9PQ== diff --git a/test/e2e/volumes.go b/test/e2e/volumes.go index b67608d68f0..ce2ccf030a5 100644 --- a/test/e2e/volumes.go +++ b/test/e2e/volumes.go @@ -556,6 +556,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { // from test/images/volumes-tester/rbd/keyring "key": []byte("AQDRrKNVbEevChAAEmRC+pW/KBVHxa0w/POILA=="), }, + Type: "kubernetes.io/rbd", } secClient := cs.Core().Secrets(config.namespace) @@ -627,6 +628,7 @@ var _ = framework.KubeDescribe("Volumes [Feature:Volumes]", func() { Data: map[string][]byte{ "key": []byte("AQAMgXhVwBCeDhAA9nlPaFyfUSatGD4drFWDvQ=="), }, + Type: "kubernetes.io/cephfs", } defer func() {