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

Merge pull request #95996 from serathius/datapolicy-kubectl

Browse Source 
git Add datapolicy tags to  staging/src/k8s.io/kubectl/
This commit is contained in:
Kubernetes Prow Robot 2020-10-30 19:24:51 -07:00 committed by GitHub
commit 4483e1465d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
staging/src/k8s.io/kubectl/pkg/cmd/config/create_authinfo.go
View File

@ -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

10
staging/src/k8s.io/kubectl/pkg/generate/versioned/secret_for_docker_registry.go
View File

@ -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"`
}