github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #72344 from liggitt/fix-create-docker-registry

Browse Source 
Fix create secret docker-registry compatibility
This commit is contained in:
Kubernetes Prow Robot 2018-12-26 12:08:39 -08:00 committed by GitHub
commit ee00cd3d0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/kubectl/generate/versioned/secret_for_docker_registry.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package versioned package versioned
import ( import (
"encoding/base64"
"encoding/json" "encoding/json"
"fmt" "fmt"
@ -152,6 +153,7 @@ func handleDockerCfgJSONContent(username, password, email, server string) ([]byt
Username: username, Username: username,
Password: password, Password: password,
Email: email, Email: email,
Auth: encodeDockerConfigFieldAuth(username, password),
} }
dockerCfgJSON := DockerConfigJSON{ dockerCfgJSON := DockerConfigJSON{
@ -161,6 +163,11 @@ func handleDockerCfgJSONContent(username, password, email, server string) ([]byt
return json.Marshal(dockerCfgJSON) return json.Marshal(dockerCfgJSON)
} }
func encodeDockerConfigFieldAuth(username, password string) string {
fieldValue := username + ":" + password
return base64.StdEncoding.EncodeToString([]byte(fieldValue))
}
// DockerConfigJSON represents a local docker auth config file // DockerConfigJSON represents a local docker auth config file
// for pulling images. // for pulling images.
type DockerConfigJSON struct { type DockerConfigJSON struct {
@ -175,7 +182,8 @@ type DockerConfigJSON struct {
type DockerConfig map[string]DockerConfigEntry type DockerConfig map[string]DockerConfigEntry
type DockerConfigEntry struct { type DockerConfigEntry struct {
Username string Username string `json:"username,omitempty"`
Password string Password string `json:"password,omitempty"`
Email string Email string `json:"email,omitempty"`
Auth string `json:"auth,omitempty"`
} }

2
pkg/kubectl/generate/versioned/secret_for_docker_registry_test.go
View File

@ -73,7 +73,7 @@ func TestSecretForDockerRegistryGenerate(t *testing.T) {
}, },
expected: &v1.Secret{ expected: &v1.Secret{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "foo-7566tc6mgc", Name: "foo-548cm7fgdh",
}, },
Data: map[string][]byte{ Data: map[string][]byte{
v1.DockerConfigJsonKey: secretData, v1.DockerConfigJsonKey: secretData,

2
test/cmd/core.sh
View File

@ -739,7 +739,7 @@ run_secrets_test() {
# Post-condition: secret exists and has expected values # Post-condition: secret exists and has expected values
kube::test::get_object_assert 'secret/test-secret --namespace=test-secrets' "{{$id_field}}" 'test-secret' kube::test::get_object_assert 'secret/test-secret --namespace=test-secrets' "{{$id_field}}" 'test-secret'
kube::test::get_object_assert 'secret/test-secret --namespace=test-secrets' "{{$secret_type}}" 'kubernetes.io/dockerconfigjson' kube::test::get_object_assert 'secret/test-secret --namespace=test-secrets' "{{$secret_type}}" 'kubernetes.io/dockerconfigjson'
[[ "$(kubectl get secret/test-secret --namespace=test-secrets -o yaml "${kube_flags[@]}" | grep '.dockerconfigjson:')" ]] [[ "$(kubectl get secret/test-secret --namespace=test-secrets -o yaml "${kube_flags[@]}" | grep '.dockerconfigjson: eyJhdXRocyI6eyJodHRwczovL2luZGV4LmRvY2tlci5pby92MS8iOnsidXNlcm5hbWUiOiJ0ZXN0LXVzZXIiLCJwYXNzd29yZCI6InRlc3QtcGFzc3dvcmQiLCJlbWFpbCI6InRlc3QtdXNlckB0ZXN0LmNvbSIsImF1dGgiOiJkR1Z6ZEMxMWMyVnlPblJsYzNRdGNHRnpjM2R2Y21RPSJ9fX0=')" ]]
# Clean-up # Clean-up
kubectl delete secret test-secret --namespace=test-secrets kubectl delete secret test-secret --namespace=test-secrets