From 4b29b03573ff66c32224672d9e7e4c1dbfe2c414 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Thu, 29 Oct 2020 18:11:22 +0100 Subject: [PATCH] Add datapolicy tags to staging/src/k8s.io/kubectl --- .../k8s.io/kubectl/pkg/cmd/config/create_authinfo.go | 4 ++-- .../generate/versioned/secret_for_docker_registry.go | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go index 93a94485ffe..3d80e992766 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go @@ -40,9 +40,9 @@ type createAuthInfoOptions struct { name string clientCertificate cliflag.StringFlag clientKey cliflag.StringFlag - token cliflag.StringFlag + token cliflag.StringFlag `datapolicy:"token"` username cliflag.StringFlag - password cliflag.StringFlag + password cliflag.StringFlag `datapolicy:"password"` embedCertData cliflag.Tristate authProvider cliflag.StringFlag diff --git a/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go index afbe2d3d84e..67f689903c4 100644 --- a/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go +++ b/staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go @@ -38,7 +38,7 @@ type SecretForDockerRegistryGeneratorV1 struct { // Email for registry (optional) Email string // Password for registry (required) - Password string + Password string `datapolicy:"password"` // Server for registry (required) Server string // AppendHash; if true, derive a hash from the Secret and append it to the name @@ -171,9 +171,9 @@ func encodeDockerConfigFieldAuth(username, password string) string { // DockerConfigJSON represents a local docker auth config file // for pulling images. type DockerConfigJSON struct { - Auths DockerConfig `json:"auths"` + Auths DockerConfig `json:"auths" datapolicy:"token"` // +optional - HttpHeaders map[string]string `json:"HttpHeaders,omitempty"` + HttpHeaders map[string]string `json:"HttpHeaders,omitempty" datapolicy:"token"` } // DockerConfig represents the config file used by the docker CLI. @@ -183,7 +183,7 @@ type DockerConfig map[string]DockerConfigEntry type DockerConfigEntry struct { Username string `json:"username,omitempty"` - Password string `json:"password,omitempty"` + Password string `json:"password,omitempty" datapolicy:"password"` Email string `json:"email,omitempty"` - Auth string `json:"auth,omitempty"` + Auth string `json:"auth,omitempty" datapolicy:"token"` }