Merge pull request #8363 from caesarxuchao/secrets-doc

update docs/secrets.md to v1beta3
This commit is contained in:
Victor Marmol 2015-05-18 08:38:29 -07:00
commit 0b4eb95dad

View File

@ -108,12 +108,14 @@ To create a pod that uses an ssh key stored as a secret, we first need to create
```json ```json
{ {
"apiVersion": "v1beta2",
"kind": "Secret", "kind": "Secret",
"id": "ssh-key-secret", "apiVersion": "v1beta3",
"metadata": {
"name": "ssh-key-secret"
},
"data": { "data": {
"id-rsa.pub": "dmFsdWUtMQ0K", "id-rsa": "dmFsdWUtMg0KDQo=",
"id-rsa": "dmFsdWUtMg0KDQo=" "id-rsa.pub": "dmFsdWUtMQ0K"
} }
} }
``` ```
@ -127,34 +129,36 @@ consumes it in a volume:
```json ```json
{ {
"id": "secret-test-pod",
"kind": "Pod", "kind": "Pod",
"apiVersion":"v1beta2", "apiVersion": "v1beta3",
"metadata": {
"name": "secret-test-pod",
"labels": { "labels": {
"name": "secret-test" "name": "secret-test"
}
}, },
"desiredState": { "spec": {
"manifest": { "volumes": [
"version": "v1beta1", {
"id": "secret-test-pod",
"containers": [{
"name": "ssh-test-container",
"image": "mySshImage",
"volumeMounts": [{
"name": "secret-volume", "name": "secret-volume",
"mountPath": "/etc/secret-volume",
"readOnly": true
}]
}],
"volumes": [{
"name": "secret-volume",
"source": {
"secret": { "secret": {
"secretName": "ssh-key-secret" "secretName": "ssh-key-secret"
} }
} }
}] ],
"containers": [
{
"name": "ssh-test-container",
"image": "mySshImage",
"volumeMounts": [
{
"name": "secret-volume",
"readOnly": true,
"mountPath": "/etc/secret-volume"
} }
]
}
]
} }
} }
``` ```
@ -175,91 +179,109 @@ credentials.
The secrets: The secrets:
```json ```json
{
"apiVersion": "v1beta3",
"kind": "List",
"items":
[{ [{
"apiVersion": "v1beta2",
"kind": "Secret", "kind": "Secret",
"id": "prod-db-secret", "apiVersion": "v1beta3",
"metadata": {
"name": "prod-db-secret"
},
"data": { "data": {
"username": "dmFsdWUtMQ0K", "password": "dmFsdWUtMg0KDQo=",
"password": "dmFsdWUtMg0KDQo=" "username": "dmFsdWUtMQ0K"
} }
}, },
{ {
"apiVersion": "v1beta2",
"kind": "Secret", "kind": "Secret",
"id": "test-db-secret", "apiVersion": "v1beta3",
"metadata": {
"name": "test-db-secret"
},
"data": { "data": {
"username": "dmFsdWUtMQ0K", "password": "dmFsdWUtMg0KDQo=",
"password": "dmFsdWUtMg0KDQo=" "username": "dmFsdWUtMQ0K"
} }
}] }]
}
``` ```
The pods: The pods:
```json ```json
{
"apiVersion": "v1beta3",
"kind": "List",
"items":
[{ [{
"id": "prod-db-client-pod",
"kind": "Pod", "kind": "Pod",
"apiVersion":"v1beta2", "apiVersion": "v1beta3",
"metadata": {
"name": "prod-db-client-pod",
"labels": { "labels": {
"name": "prod-db-client" "name": "prod-db-client"
}
}, },
"desiredState": { "spec": {
"manifest": { "volumes": [
"version": "v1beta1", {
"id": "prod-db-pod",
"containers": [{
"name": "db-client-container",
"image": "myClientImage",
"volumeMounts": [{
"name": "secret-volume", "name": "secret-volume",
"mountPath": "/etc/secret-volume",
"readOnly": true
}]
}],
"volumes": [{
"name": "secret-volume",
"source": {
"secret": { "secret": {
"secretName": "prod-db-secret" "secretName": "prod-db-secret"
} }
} }
}] ],
"containers": [
{
"name": "db-client-container",
"image": "myClientImage",
"volumeMounts": [
{
"name": "secret-volume",
"readOnly": true,
"mountPath": "/etc/secret-volume"
} }
]
}
]
} }
}, },
{ {
"id": "test-db-client-pod",
"kind": "Pod", "kind": "Pod",
"apiVersion":"v1beta2", "apiVersion": "v1beta3",
"metadata": {
"name": "test-db-client-pod",
"labels": { "labels": {
"name": "test-db-client" "name": "test-db-client"
}
}, },
"desiredState": { "spec": {
"manifest": { "volumes": [
"version": "v1beta1", {
"id": "test-db-pod",
"containers": [{
"name": "db-client-container",
"image": "myClientImage",
"volumeMounts": [{
"name": "secret-volume", "name": "secret-volume",
"mountPath": "/etc/secret-volume",
"readOnly": true
}]
}],
"volumes": [{
"name": "secret-volume",
"source": {
"secret": { "secret": {
"secretName": "test-db-secret" "secretName": "test-db-secret"
} }
} }
}] ],
"containers": [
{
"name": "db-client-container",
"image": "myClientImage",
"volumeMounts": [
{
"name": "secret-volume",
"readOnly": true,
"mountPath": "/etc/secret-volume"
} }
]
}
]
} }
}] }]
}
``` ```
Both containers will have the following files present on their filesystems: Both containers will have the following files present on their filesystems: