From 73d528dce915e4234f3e48443f40301025aa0266 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Tue, 28 Sep 2021 16:32:32 +0300 Subject: [PATCH] kubeadm: make output/BootstrapToken use bootstraptoken/v1 --- cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go | 4 ++-- cmd/kubeadm/app/apis/output/types.go | 8 +++----- cmd/kubeadm/app/apis/output/v1alpha1/types.go | 2 -- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go b/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go index b4374b6e0ed..3805bc91ab5 100644 --- a/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go +++ b/cmd/kubeadm/app/apis/output/fuzzer/fuzzer.go @@ -24,7 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer" - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" "k8s.io/kubernetes/cmd/kubeadm/app/apis/output" ) @@ -38,7 +38,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} { func fuzzBootstrapToken(obj *output.BootstrapToken, c fuzz.Continue) { c.FuzzNoCustom(obj) - obj.Token = &kubeadmapiv1beta2.BootstrapTokenString{ID: "uvxdac", Secret: "fq35fuyue3kd4gda"} + obj.Token = &bootstraptokenv1.BootstrapTokenString{ID: "uvxdac", Secret: "fq35fuyue3kd4gda"} obj.Description = "" obj.TTL = &metav1.Duration{Duration: time.Hour * 24} obj.Usages = []string{"authentication", "signing"} diff --git a/cmd/kubeadm/app/apis/output/types.go b/cmd/kubeadm/app/apis/output/types.go index b1a319a58df..cd3b4a7746b 100644 --- a/cmd/kubeadm/app/apis/output/types.go +++ b/cmd/kubeadm/app/apis/output/types.go @@ -19,18 +19,16 @@ package output import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - kubeadmapiv1beta2 "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2" + bootstraptokenv1 "k8s.io/kubernetes/cmd/kubeadm/app/apis/bootstraptoken/v1" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// BootstrapToken represents information for the output produced by 'kubeadm token list' -// This is a copy of BootstrapToken struct from ../kubeadm/types.go with 2 additions: -// metav1.TypeMeta and metav1.ObjectMeta +// BootstrapToken represents information for the bootstrap token output produced by kubeadm type BootstrapToken struct { metav1.TypeMeta - kubeadmapiv1beta2.BootstrapToken + bootstraptokenv1.BootstrapToken } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object diff --git a/cmd/kubeadm/app/apis/output/v1alpha1/types.go b/cmd/kubeadm/app/apis/output/v1alpha1/types.go index 5a2f3a262a3..372cc72b4c1 100644 --- a/cmd/kubeadm/app/apis/output/v1alpha1/types.go +++ b/cmd/kubeadm/app/apis/output/v1alpha1/types.go @@ -25,8 +25,6 @@ import ( // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // BootstrapToken represents information for the bootstrap token output produced by kubeadm -// This is a copy of BootstrapToken struct from ../kubeadm/types.go with 2 additions: -// metav1.TypeMeta and metav1.ObjectMeta type BootstrapToken struct { metav1.TypeMeta `json:",inline"`