github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
k3s/hack
History
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
..
boilerplate Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
cmd/teststale Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
e2e-internal Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
gen-swagger-doc Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
jenkins Merge pull request #28237 from ixdy/kubekins-aws 2016-06-30 22:07:51 -07:00
lib Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
testdata Merge pull request #27902 from caesarxuchao/fix-test-cmd 2016-06-25 14:47:30 -07:00
verify-flags Merge pull request #27291 from mnshaw/configmaptest 2016-06-28 14:36:06 -07:00
OWNERS
…
autogenerated_placeholder.txt Revamp doc generation 2016-06-08 17:22:12 -07:00
benchmark-go.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
benchmark-integration.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
build-cross.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
build-go.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
build-ui.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
cherry_pick_pull.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
dev-build-and-push.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
dev-build-and-up.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
dev-push-hyperkube.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
e2e-node-test.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
e2e.go Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
federated-ginkgo-e2e.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
generate-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
get-build.sh Merge pull request #26755 from david-mcmahon/fix-headers 2016-06-29 18:46:07 -07:00
ginkgo-e2e.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
godep-save.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
grab-profiles.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
install-etcd.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
list-feature-tests.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
local-up-cluster.sh Merge pull request #23866 from intelsdi-x/chcon_invalid_argument_in_dockerized_kubelet 2016-06-30 20:39:31 -07:00
lookup_pull.py Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
test-cmd.sh Allow specifying secret data using strings 2016-06-30 16:03:47 -04:00
test-go.sh Merge pull request #28166 from asalkeld/fix-coverage 2016-06-29 20:29:50 -07:00
test-integration.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
test-update-storage-objects.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-all.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-api-reference-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-codecgen.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-codegen.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-generated-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-generated-protobuf-dockerized.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-generated-protobuf.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-generated-swagger-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-godep-licenses.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-gofmt.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-munge-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
update-swagger-spec.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-all.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-api-reference-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-boilerplate.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-codecgen.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-codegen.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-description.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-flags-underscore.py Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-generated-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-generated-protobuf.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-generated-swagger-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-godep-licenses.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-godeps.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-gofmt.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-govet.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-import-boss.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-linkcheck.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-munge-docs.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-swagger-spec.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-symbols.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00
verify-test-images.sh Remove "All rights reserved" from all the headers. 2016-06-29 17:47:36 -07:00