Skip to content

K
k3s
Commit 515acee0 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #36179 from rootfs/fix-secret

Automatic merge from submit-queue add secret type to RBD secrets in examples and e2e test <!-- Thanks for sending a pull request! Here are some tips for you: 1. If this is your first time, read our contributor guidelines https://github.com/kubernetes/kubernetes/blob/master/CONTRIBUTING.md and developer guide https://github.com/kubernetes/kubernetes/blob/master/docs/devel/development.md 2. If you want *faster* PR reviews, read how: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md 3. Follow the instructions for writing a release note: https://github.com/kubernetes/kubernetes/blob/master/docs/devel/pull-requests.md#release-notes --> **What this PR does / why we need it**: This is a followup to recent changes in secret type matching **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: @kubernetes/sig-storage @liggitt **Release note**: <!-- Steps to write your release note: 1. Use the release-note-* labels to set the release note state (if you have access) 2. Enter your extended release note in the below block; leaving it blank means using the PR title as the release note. If no release note is required, just write `NONE`. --> ```release-note ```
parents dd53b749 622b3884
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-admin.yaml
View file @ 515acee0
......@@ -2,5 +2,6 @@ apiVersion: v1
kind: Secret
metadata:
name: ceph-secret-admin
type: "kubernetes.io/rbd"
data:
key: QVFEQ1pMdFhPUnQrSmhBQUFYaERWNHJsZ3BsMmNjcDR6RFZST0E9PQ==
examples/experimental/persistent-volume-provisioning/rbd/ceph-secret-user.yaml
View file @ 515acee0
......@@ -2,5 +2,6 @@ apiVersion: v1
kind: Secret
metadata:
name: ceph-secret-user
type: "kubernetes.io/rbd"
data:
key: QVFBTWdYaFZ3QkNlRGhBQTlubFBhRnlmVVNhdEdENGRyRldEdlE9PQ==
examples/volumes/rbd/secret/ceph-secret.yaml
View file @ 515acee0
......@@ -2,5 +2,6 @@ apiVersion: v1
kind: Secret
metadata:
name: ceph-secret
type: "kubernetes.io/rbd"
data:
key: QVFCMTZWMVZvRjVtRXhBQTVrQ1FzN2JCajhWVUxSdzI2Qzg0SEE9PQ==
test/e2e/volumes.go
View file @ 515acee0
......@@ -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() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment