diff --git a/examples_test.go b/examples_test.go index 103d28a6..835d69dd 100644 --- a/examples_test.go +++ b/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{}, }, diff --git a/rbd/README.md b/rbd/README.md index ce4a18ec..a71f971f 100644 --- a/rbd/README.md +++ b/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 ``` @@ -45,4 +45,4 @@ On the Kubernetes host, I got these in mount output If you ssh to that machine, you can run `docker ps` to see the actual pod and `docker inspect` to see the volumes used by the container. -[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/examples/rbd/README.md?pixel)]() \ No newline at end of file +[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/examples/rbd/README.md?pixel)]() diff --git a/rbd/v1beta3/rbd-with-secret.json b/rbd/rbd-with-secret.json similarity index 97% rename from rbd/v1beta3/rbd-with-secret.json rename to rbd/rbd-with-secret.json index 295009d3..abf265fe 100644 --- a/rbd/v1beta3/rbd-with-secret.json +++ b/rbd/rbd-with-secret.json @@ -1,5 +1,5 @@ { - "apiVersion": "v1beta3", + "apiVersion": "v1", "id": "rbdpd2", "kind": "Pod", "metadata": { diff --git a/rbd/v1beta3/rbd.json b/rbd/rbd.json similarity index 97% rename from rbd/v1beta3/rbd.json rename to rbd/rbd.json index e704c8da..e9036412 100644 --- a/rbd/v1beta3/rbd.json +++ b/rbd/rbd.json @@ -1,5 +1,5 @@ { - "apiVersion": "v1beta3", + "apiVersion": "v1", "id": "rbdpd", "kind": "Pod", "metadata": { diff --git a/rbd/secret/ceph-secret.yaml b/rbd/secret/ceph-secret.yaml index 1acd1a29..e29a5535 100644 --- a/rbd/secret/ceph-secret.yaml +++ b/rbd/secret/ceph-secret.yaml @@ -1,4 +1,4 @@ -apiVersion: v1beta3 +apiVersion: v1 kind: Secret metadata: name: ceph-secret