k3s/pkg
k8s-merge-robot 34244efd22 Merge pull request #28263 from liggitt/stringdata
Automatic merge from submit-queue

Allow specifying secret data using strings

This PR allows specifying non-binary data values in `Secret` objects as `"stringData":{"key":"string value"}`, in addition to the existing base64 []byte serializations in the `data` field.

On write, the keys and values in the `stringData` field are merged to the `data` map, overwriting any values already present in the `data` map. The move is one-way, the `stringData` field is never output when reading from the API.

A Secret could be created like this:
```
{
  "kind":"Secret",
  "apiVersion":"v1",
  "metadata":{"name":"mysecret"},
  "data":{
    "image":"<base64-encoded-jpg>"
  },
  "stringData":{
    "username": "myuser",
    "password": "mypassword"
  }
}
```
and when read from the API would look like this:
```
{
  "kind":"Secret",
  "apiVersion":"v1",
  "metadata":{"name":"mysecret",...},
  "data":{
    "image":"<base64-encoded-jpg>"
    "username": "bXl1c2Vy",
    "password": "bXlwYXNzd29yZA=="
  }
}
```
2016-07-01 00:28:56 -07:00
..
admission Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
api Allow specifying secret data using strings 2016-06-30 16:03:47 -04:00
apimachinery Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
apis Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
apiserver Merge pull request #28036 from ericchiang/oidc-auth-plugin-dont-error-if-provider-is-unavailable 2016-06-30 13:02:16 -07:00
auth Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
capabilities Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
client Merge pull request #28254 from grodrigues3/Fix-TreeStateVersion-Check 2016-06-30 23:54:41 -07:00
cloudprovider Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
controller Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
conversion Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
credentialprovider Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
dns Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
fieldpath Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
fields Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
genericapiserver Merge pull request #28143 from xiangpengzhao/service-node-port-range 2016-06-30 19:30:31 -07:00
healthz Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
httplog Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
hyperkube Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
kubectl Merge pull request #28110 from mfojtik/describe-volume-mounts 2016-06-30 17:15:05 -07:00
kubelet Merge pull request #28240 from Random-Liu/add-semver-back 2016-06-30 23:20:56 -07:00
kubemark Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
labels Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
master Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
metrics Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
probe Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
proxy Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
quota Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
registry Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
runtime Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
security Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
securitycontext Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
serviceaccount Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
ssh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
storage Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
types Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
ui Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
util Merge pull request #28153 from jsafrane/flaky-goroutinemap-wait 2016-06-29 19:54:05 -07:00
version Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
volume Fix problems with container restarts and flocker 2016-06-30 05:49:15 +00:00
watch Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
OWNERS Remove bgrant from pkg/OWNERS and pkg/kubectl/OWNERS since he has plenty to do. 2016-06-16 08:21:27 -07:00