Merge pull request #9628 from krousey/exmaple_rbd

examples/examples_test.go

@@ -204,7 +204,7 @@ func TestExampleObjectSchemas(t *testing.T) {
 		"../examples/rbd/secret": {
 			"ceph-secret": &api.Secret{},
 		},
-		"../examples/rbd/v1beta3": {
+		"../examples/rbd": {
 			"rbd":             &api.Pod{},
 			"rbd-with-secret": &api.Pod{},
 		},

examples/rbd/README.md

@@ -7,7 +7,7 @@ If you don't have a Ceph cluster, you can set up a [containerized Ceph cluster](
    
 Then get the keyring from the Ceph cluster and copy it to */etc/ceph/keyring*.
 
-Once you have installed Ceph and new Kubernetes, you can create a pod based on my examples [rbd.json](v1beta3/rbd.json)  [rbd-with-secret.json](v1beta3/rbd-with-secret.json). In the pod JSON, you need to provide the following information.
+Once you have installed Ceph and new Kubernetes, you can create a pod based on my examples [rbd.json](rbd.json)  [rbd-with-secret.json](rbd-with-secret.json). In the pod JSON, you need to provide the following information.
 
 - *monitors*:  Ceph monitors.
 - *pool*: The name of the RADOS pool, if not provided, default *rbd* pool is used.
@@ -31,7 +31,7 @@ If Ceph authentication secret is provided, the secret should be first be base64
 Here are my commands:
 
 ```console
-    # kubectl create -f examples/rbd/v1beta3/rbd.json
+    # kubectl create -f examples/rbd/rbd.json
     # kubectl get pods
 ```
 

examples/rbd/v1beta3/rbd-with-secret.json → examples/rbd/rbd-with-secret.json

 {
-    "apiVersion": "v1beta3",
+    "apiVersion": "v1",
     "id": "rbdpd2",
     "kind": "Pod",
     "metadata": {

examples/rbd/v1beta3/rbd.json → examples/rbd/rbd.json

 {
-    "apiVersion": "v1beta3",
+    "apiVersion": "v1",
     "id": "rbdpd",
     "kind": "Pod",
     "metadata": {

examples/rbd/secret/ceph-secret.yaml

-apiVersion: v1beta3
+apiVersion: v1
 kind: Secret
 metadata:
   name: ceph-secret