diff --git a/cmd/kubeadm/app/cmd/token_test.go b/cmd/kubeadm/app/cmd/token_test.go index 303eb7f0dd1..b3f0a12fc09 100644 --- a/cmd/kubeadm/app/cmd/token_test.go +++ b/cmd/kubeadm/app/cmd/token_test.go @@ -54,7 +54,6 @@ contexts: name: default current-context: default kind: Config -preferences: {} users: - name: kubernetes-admin user: diff --git a/cmd/kubeadm/app/cmd/upgrade/common_test.go b/cmd/kubeadm/app/cmd/upgrade/common_test.go index 458c97ffb77..c7965156560 100644 --- a/cmd/kubeadm/app/cmd/upgrade/common_test.go +++ b/cmd/kubeadm/app/cmd/upgrade/common_test.go @@ -46,7 +46,6 @@ contexts: name: default current-context: default kind: Config -preferences: {} users: - name: kubernetes-admin user: diff --git a/cmd/kubeadm/app/discovery/token/token_test.go b/cmd/kubeadm/app/discovery/token/token_test.go index 908c5716610..a823af66ccd 100644 --- a/cmd/kubeadm/app/discovery/token/token_test.go +++ b/cmd/kubeadm/app/discovery/token/token_test.go @@ -69,7 +69,6 @@ contexts: name: token-bootstrap-client@somecluster current-context: token-bootstrap-client@somecluster kind: Config -preferences: {} users: null ` ) diff --git a/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo_test.go b/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo_test.go index 74b34d758e3..9913c145e07 100644 --- a/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo_test.go +++ b/cmd/kubeadm/app/phases/bootstraptoken/clusterinfo/clusterinfo_test.go @@ -49,7 +49,6 @@ contexts: name: kubernetes-admin@kubernetes current-context: kubernetes-admin@kubernetes kind: Config -preferences: {} users: - name: kubernetes-admin`)) diff --git a/cmd/kubeadm/app/util/apiclient/dryrun.go b/cmd/kubeadm/app/util/apiclient/dryrun.go index 1bb4caa8281..c677e4c502e 100644 --- a/cmd/kubeadm/app/util/apiclient/dryrun.go +++ b/cmd/kubeadm/app/util/apiclient/dryrun.go @@ -607,7 +607,6 @@ clusters: contexts: null current-context: "" kind: Config -preferences: {} users: null `) data := map[string]string{ diff --git a/cmd/kubeadm/app/util/config/cluster_test.go b/cmd/kubeadm/app/util/config/cluster_test.go index 1ed8786ef5c..5b9f3eb5d69 100644 --- a/cmd/kubeadm/app/util/config/cluster_test.go +++ b/cmd/kubeadm/app/util/config/cluster_test.go @@ -90,7 +90,6 @@ contexts: name: system:node:mynode@kubernetes current-context: system:node:mynode@kubernetes kind: Config -preferences: {} users: - name: system:node:mynode user: @@ -108,7 +107,6 @@ contexts: name: system:node:mynode@kubernetes current-context: system:node:mynode@kubernetes kind: Config -preferences: {} users: - name: system:node:mynode user: @@ -127,7 +125,6 @@ contexts: name: system:node:mynode@kubernetes current-context: system:node:mynode@kubernetes kind: Config -preferences: {} users: - name: system:node:mynode user: @@ -146,7 +143,6 @@ contexts: name: system:node:mynode@kubernetes current-context: invalidContext kind: Config -preferences: {} users: - name: system:node:mynode user: @@ -165,7 +161,6 @@ contexts: name: system:node:mynode@kubernetes current-context: system:node:mynode@kubernetes kind: Config -preferences: {} users: - name: system:node:mynode user: diff --git a/cmd/kubeadm/app/util/kubeconfig/kubeconfig_test.go b/cmd/kubeadm/app/util/kubeconfig/kubeconfig_test.go index e12dbcac5f9..45934874b87 100644 --- a/cmd/kubeadm/app/util/kubeconfig/kubeconfig_test.go +++ b/cmd/kubeadm/app/util/kubeconfig/kubeconfig_test.go @@ -39,7 +39,6 @@ contexts: name: user1@k8s current-context: user1@k8s kind: Config -preferences: {} users: - name: user1 user: @@ -57,7 +56,6 @@ contexts: name: user2@kubernetes current-context: user2@kubernetes kind: Config -preferences: {} users: - name: user2 user: diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/helpers_test.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/helpers_test.go index f823ef0f899..1ae48cf2a63 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/api/helpers_test.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/helpers_test.go @@ -225,7 +225,6 @@ func Example_minifyAndShorten() { // cluster: cow-cluster // user: red-user // current-context: federal-context - // preferences: {} // users: // red-user: // client-certificate-data: DATA+OMITTED diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/types.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/types.go index ae8b8c70386..95b0b16d599 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/api/types.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/types.go @@ -40,7 +40,8 @@ type Config struct { // +optional APIVersion string `json:"apiVersion,omitempty"` // Preferences holds general information to be use for cli interactions - Preferences Preferences `json:"preferences"` + // Deprecated: this field is deprecated in v1.34. It is not used by any of the Kubernetes components. + Preferences Preferences `json:"preferences,omitzero"` // Clusters is a map of referencable names to cluster configs Clusters map[string]*Cluster `json:"clusters"` // AuthInfos is a map of referencable names to user configs @@ -55,6 +56,7 @@ type Config struct { } // IMPORTANT if you add fields to this struct, please update IsConfigEmpty() +// Deprecated: this structure is deprecated in v1.34. It is not used by any of the Kubernetes components. type Preferences struct { // +optional Colors bool `json:"colors,omitempty"` @@ -339,11 +341,10 @@ const ( // NewConfig is a convenience function that returns a new Config object with non-nil maps func NewConfig() *Config { return &Config{ - Preferences: *NewPreferences(), - Clusters: make(map[string]*Cluster), - AuthInfos: make(map[string]*AuthInfo), - Contexts: make(map[string]*Context), - Extensions: make(map[string]runtime.Object), + Clusters: make(map[string]*Cluster), + AuthInfos: make(map[string]*AuthInfo), + Contexts: make(map[string]*Context), + Extensions: make(map[string]runtime.Object), } } @@ -370,6 +371,7 @@ func NewAuthInfo() *AuthInfo { // NewPreferences is a convenience function that returns a new // Preferences object with non-nil maps +// Deprecated: this method is deprecated in v1.34. It is not used by any of the Kubernetes components. func NewPreferences() *Preferences { return &Preferences{Extensions: make(map[string]runtime.Object)} } diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/types_test.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/types_test.go index 21bb4c825fa..94742d3b4a0 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/api/types_test.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/types_test.go @@ -35,7 +35,6 @@ func Example_emptyConfig() { // clusters: {} // contexts: {} // current-context: "" - // preferences: {} // users: {} } diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/types.go b/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/types.go index 5018a72b1c0..f144e16ebc4 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/types.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/api/v1/types.go @@ -37,7 +37,8 @@ type Config struct { // +optional APIVersion string `json:"apiVersion,omitempty"` // Preferences holds general information to be use for cli interactions - Preferences Preferences `json:"preferences"` + // Deprecated: this field is deprecated in v1.34. It is not used by any of the Kubernetes components. + Preferences Preferences `json:"preferences,omitzero"` // Clusters is a map of referencable names to cluster configs Clusters []NamedCluster `json:"clusters"` // AuthInfos is a map of referencable names to user configs @@ -51,6 +52,7 @@ type Config struct { Extensions []NamedExtension `json:"extensions,omitempty"` } +// Deprecated: this structure is deprecated in v1.34. It is not used by any of the Kubernetes components. type Preferences struct { // +optional Colors bool `json:"colors,omitempty"` diff --git a/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go b/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go index 778ef03ca6b..e9d78bbe850 100644 --- a/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go +++ b/staging/src/k8s.io/client-go/tools/clientcmd/loader_test.go @@ -309,7 +309,6 @@ contexts: name: "433e40" current-context: any-context-value kind: Config -preferences: {} users: null `) if !bytes.Equal(expected, data) { @@ -757,7 +756,6 @@ func Example_noMergingOnExplicitPaths() { // name: federal-context // current-context: "" // kind: Config - // preferences: {} // users: // - name: red-user // user: @@ -809,7 +807,6 @@ func Example_mergingSomeWithConflict() { // name: federal-context // current-context: federal-context // kind: Config - // preferences: {} // users: // - name: red-user // user: @@ -887,7 +884,6 @@ func Example_mergingEverythingNoConflicts() { // name: shaker-context // current-context: "" // kind: Config - // preferences: {} // users: // - name: black-user // user: diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go index 5ec8ff59de1..c09d27e0157 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/config_test.go @@ -69,7 +69,6 @@ func Example_view() { // name: federal-context // current-context: federal-context // kind: Config - // preferences: {} // users: // - name: red-user // user: diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/config/view_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/config/view_test.go index ddc12945a2d..ec4343929c9 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/config/view_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/config/view_test.go @@ -85,7 +85,6 @@ contexts: name: my-cluster current-context: minikube kind: Config -preferences: {} users: - name: minikube user: @@ -165,7 +164,6 @@ contexts: name: my-cluster current-context: minikube kind: Config -preferences: {} users: - name: minikube user: @@ -247,7 +245,6 @@ contexts: name: minikube current-context: minikube kind: Config -preferences: {} users: - name: minikube user: @@ -272,7 +269,6 @@ contexts: name: my-cluster current-context: my-cluster kind: Config -preferences: {} users: - name: mu-cluster user: diff --git a/test/cmd/authentication.sh b/test/cmd/authentication.sh index 3e1c9d5d6e3..04c43bce783 100644 --- a/test/cmd/authentication.sh +++ b/test/cmd/authentication.sh @@ -43,7 +43,6 @@ contexts: name: test current-context: test kind: Config -preferences: {} users: - name: invalid_token_user user: @@ -94,7 +93,6 @@ contexts: name: test current-context: test kind: Config -preferences: {} users: - name: valid_token_user user: @@ -214,7 +212,6 @@ contexts: name: test current-context: test kind: Config -preferences: {} users: - name: always_interactive_token_user user: @@ -287,7 +284,6 @@ contexts: name: test current-context: test kind: Config -preferences: {} users: - name: missing_interactive_token_user user: