kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #95996 from serathius/datapolicy-kubectl 

git Add datapolicy tags to  staging/src/k8s.io/kubectl/

Kubernetes-commit: 4483e1465d10c5327443d22d80cc584f11abb660
This commit is contained in:
Kubernetes Publisher 2020-10-30 19:24:51 -07:00
parent ea3f00277d 01f27135e8
commit c1d804c03f
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Godeps/Godeps.json generated
View File

@ -764,7 +764,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "840d9f1c83b8"
"Rev": "4d8a081546cb"
},
{
"ImportPath": "k8s.io/apimachinery",
@ -776,7 +776,7 @@
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "d58491a0a78d"
"Rev": "0c53f2fd3c33"
},
{
"ImportPath": "k8s.io/code-generator",

8
go.mod
View File

@ -34,10 +34,10 @@ require (
github.com/stretchr/testify v1.4.0
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0-20201028002138-840d9f1c83b8
k8s.io/api v0.0.0-20201030042148-4d8a081546cb
k8s.io/apimachinery v0.0.0-20201027202001-d10b9c3a6d2e
k8s.io/cli-runtime v0.0.0-20201023084906-87ad57c444cb
k8s.io/client-go v0.0.0-20201028202406-d58491a0a78d
k8s.io/client-go v0.0.0-20201030042407-0c53f2fd3c33
k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8
k8s.io/klog/v2 v2.2.0
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488
@ -48,10 +48,10 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20201028002138-840d9f1c83b8
k8s.io/api => k8s.io/api v0.0.0-20201030042148-4d8a081546cb
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201027202001-d10b9c3a6d2e
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201023084906-87ad57c444cb
k8s.io/client-go => k8s.io/client-go v0.0.0-20201028202406-d58491a0a78d
k8s.io/client-go => k8s.io/client-go v0.0.0-20201030042407-0c53f2fd3c33
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201020200306-60862b8acf58
k8s.io/component-base => k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8
k8s.io/metrics => k8s.io/metrics v0.0.0-20201020202354-32c3330b6a44

4
go.sum
View File

@ -508,10 +508,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
k8s.io/api v0.0.0-20201028002138-840d9f1c83b8/go.mod h1:cNY/tFihnYSIhuIdtw13PBhc93n4lCG6qO7w51VdJ1I=
k8s.io/api v0.0.0-20201030042148-4d8a081546cb/go.mod h1:cNY/tFihnYSIhuIdtw13PBhc93n4lCG6qO7w51VdJ1I=
k8s.io/apimachinery v0.0.0-20201027202001-d10b9c3a6d2e/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
k8s.io/cli-runtime v0.0.0-20201023084906-87ad57c444cb/go.mod h1:8J/p/CEj2WGIZobSh/Oe9kVIVndBvFpmRutcbtZVJ1U=
k8s.io/client-go v0.0.0-20201028202406-d58491a0a78d/go.mod h1:Njr813ITnNGQWu3yUThiKmXpNLz9RWxDiT0/cZFfZHI=
k8s.io/client-go v0.0.0-20201030042407-0c53f2fd3c33/go.mod h1:O1wpED2x/HRMg8YeWLCeeZ6lc2vJcHtdl3Xkm6kPGJ0=
k8s.io/code-generator v0.0.0-20201020200306-60862b8acf58/go.mod h1:oioc17TXBB973K4R+ytm5k9jY1BktboxJc7qu3i29V0=
k8s.io/component-base v0.0.0-20201020201314-b8c7ac1518d8/go.mod h1:/qyqddjukzwbk9MFz10nyuHMur+ykWBpJ1oweb8IDNE=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

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