Merge pull request #117576 from wzshiming/fix/clientcmd-localtion-of-origin

Fix LocationOfOrigin shows up unexpectedly

Kubernetes-commit: 34d6b92a8ceaf0b2243dd62b1f3517878fc75e35

tools/clientcmd/api/helpers_test.go

@@ -228,19 +228,16 @@ func Example_minifyAndShorten() {
 	// Output:
 	// clusters:
 	//   cow-cluster:
-	//     LocationOfOrigin: ""
 	//     certificate-authority-data: DATA+OMITTED
 	//     server: http://cow.org:8080
 	// contexts:
 	//   federal-context:
-	//     LocationOfOrigin: ""
 	//     cluster: cow-cluster
 	//     user: red-user
 	// current-context: federal-context
 	// preferences: {}
 	// users:
 	//   red-user:
-	//     LocationOfOrigin: ""
 	//     client-certificate-data: DATA+OMITTED
 	//     client-key-data: DATA+OMITTED
 	//     token: REDACTED

tools/clientcmd/api/types.go

@@ -67,7 +67,7 @@ type Preferences struct {
 type Cluster struct {
 	// LocationOfOrigin indicates where this object came from.  It is used for round tripping config post-merge, but never serialized.
 	// +k8s:conversion-gen=false
-	LocationOfOrigin string
+	LocationOfOrigin string `json:"-"`
 	// Server is the address of the kubernetes cluster (https://hostname:port).
 	Server string `json:"server"`
 	// TLSServerName is used to check server certificate. If TLSServerName is empty, the hostname used to contact the server is used.
@@ -107,7 +107,7 @@ type Cluster struct {
 type AuthInfo struct {
 	// LocationOfOrigin indicates where this object came from.  It is used for round tripping config post-merge, but never serialized.
 	// +k8s:conversion-gen=false
-	LocationOfOrigin string
+	LocationOfOrigin string `json:"-"`
 	// ClientCertificate is the path to a client cert file for TLS.
 	// +optional
 	ClientCertificate string `json:"client-certificate,omitempty"`
@@ -159,7 +159,7 @@ type AuthInfo struct {
 type Context struct {
 	// LocationOfOrigin indicates where this object came from.  It is used for round tripping config post-merge, but never serialized.
 	// +k8s:conversion-gen=false
-	LocationOfOrigin string
+	LocationOfOrigin string `json:"-"`
 	// Cluster is the name of the cluster for this context
 	Cluster string `json:"cluster"`
 	// AuthInfo is the name of the authInfo for this context
@@ -252,7 +252,7 @@ type ExecConfig struct {
 	// recommended as one of the prime benefits of exec plugins is that no secrets need
 	// to be stored directly in the kubeconfig.
 	// +k8s:conversion-gen=false
-	Config runtime.Object
+	Config runtime.Object `json:"-"`
 
 	// InteractiveMode determines this plugin's relationship with standard input. Valid
 	// values are "Never" (this exec plugin never uses standard input), "IfAvailable" (this
@@ -264,7 +264,7 @@ type ExecConfig struct {
 	// client.authentication.k8s.io/v1beta1, then this field is optional and defaults
 	// to "IfAvailable" when unset. Otherwise, this field is required.
 	// +optional
-	InteractiveMode ExecInteractiveMode
+	InteractiveMode ExecInteractiveMode `json:"interactiveMode,omitempty"`
 
 	// StdinUnavailable indicates whether the exec authenticator can pass standard
 	// input through to this exec plugin. For example, a higher level entity might be using
@@ -272,14 +272,14 @@ type ExecConfig struct {
 	// plugin to use standard input. This is kept here in order to keep all of the exec configuration
 	// together, but it is never serialized.
 	// +k8s:conversion-gen=false
-	StdinUnavailable bool
+	StdinUnavailable bool `json:"-"`
 
 	// StdinUnavailableMessage is an optional message to be displayed when the exec authenticator
 	// cannot successfully run this exec plugin because it needs to use standard input and
 	// StdinUnavailable is true. For example, a process that is already using standard input to
 	// read user instructions might set this to "used by my-program to read user instructions".
 	// +k8s:conversion-gen=false
-	StdinUnavailableMessage string
+	StdinUnavailableMessage string `json:"-"`
 }
 
 var _ fmt.Stringer = new(ExecConfig)

tools/clientcmd/api/types_test.go

@@ -94,26 +94,21 @@ func Example_ofOptionsConfig() {
 	// Output:
 	// clusters:
 	//   alfa:
-	//     LocationOfOrigin: ""
 	//     certificate-authority: path/to/my/cert-ca-filename
 	//     disable-compression: true
 	//     insecure-skip-tls-verify: true
 	//     server: https://alfa.org:8080
 	//   bravo:
-	//     LocationOfOrigin: ""
 	//     server: https://bravo.org:8080
 	// contexts:
 	//   alfa-as-black-mage:
-	//     LocationOfOrigin: ""
 	//     cluster: alfa
 	//     namespace: zulu
 	//     user: black-mage-via-auth-provider
 	//   alfa-as-white-mage:
-	//     LocationOfOrigin: ""
 	//     cluster: alfa
 	//     user: white-mage-via-cert
 	//   bravo-as-black-mage:
-	//     LocationOfOrigin: ""
 	//     cluster: bravo
 	//     namespace: yankee
 	//     user: black-mage-via-auth-provider
@@ -122,17 +117,14 @@ func Example_ofOptionsConfig() {
 	//   colors: true
 	// users:
 	//   black-mage-via-auth-provider:
-	//     LocationOfOrigin: ""
 	//     auth-provider:
 	//       config:
 	//         foo: bar
 	//         token: s3cr3t-t0k3n
 	//       name: gcp
 	//   red-mage-via-token:
-	//     LocationOfOrigin: ""
 	//     token: my-secret-token
 	//   white-mage-via-cert:
-	//     LocationOfOrigin: ""
 	//     client-certificate: path/to/my/client-cert-filename
 	//     client-key: path/to/my/client-key-filename
 }