Merge pull request #12565 from sbueringer/pr-fix-token

⚠️ Change BootstrapToken.Token from *BootstrapTokenString to BootstrapTokenString

Author: k8s-ci-robot

.golangci-kal.yml

@@ -142,12 +142,6 @@ linters:
       text: "nomaps: FeatureGates should not use a map type, use a list type with a unique name/identifier instead"
       linters:
         - kubeapilinter
-    # Note: Maybe this has to stay a pointer for marshalling reasons.
-    # TODO: we should eventually remove the pointer: https://github.com/kubernetes-sigs/cluster-api/issues/10852
-    - path: "api/bootstrap/kubeadm/v1beta2/kubeadm_types.go"
-      text: "field Token is marked as required, should not be a pointer"
-      linters:
-        - kubeapilinter
 
     ## Excludes for optionalfields
     # Empty Bootstrap object is blocked via validating webhooks. This cannot be detected by KAL (same if we move the validation to CEL).

api/bootstrap/kubeadm/v1beta1/conversion.go

@@ -435,6 +435,12 @@ func Convert_v1beta2_BootstrapToken_To_v1beta1_BootstrapToken(in *bootstrapv1.Bo
 	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
 		out.Expires = ptr.To(in.Expires)
 	}
+	if !reflect.DeepEqual(in.Token, bootstrapv1.BootstrapTokenString{}) {
+		out.Token = &BootstrapTokenString{}
+		if err := autoConvert_v1beta2_BootstrapTokenString_To_v1beta1_BootstrapTokenString(&in.Token, out.Token, s); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 
@@ -569,6 +575,11 @@ func Convert_v1beta1_BootstrapToken_To_v1beta2_BootstrapToken(in *BootstrapToken
 	if in.Expires != nil && !reflect.DeepEqual(in.Expires, &metav1.Time{}) {
 		out.Expires = *in.Expires
 	}
+	if in.Token != nil {
+		if err := autoConvert_v1beta1_BootstrapTokenString_To_v1beta2_BootstrapTokenString(in.Token, &out.Token, s); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

api/bootstrap/kubeadm/v1beta1/zz_generated.conversion.go

@@ -424,7 +424,7 @@ type BootstrapToken struct {
 	// token is used for establishing bidirectional trust between nodes and control-planes.
 	// Used for joining nodes in the cluster.
 	// +required
-	Token *BootstrapTokenString `json:"token"`
+	Token BootstrapTokenString `json:"token,omitempty,omitzero"`
 
 	// description sets a human-friendly message why this token exists and what it's used
 	// for, so other administrators can know its purpose.

api/bootstrap/kubeadm/v1beta2/kubeadm_types.go

@@ -213,6 +213,11 @@ func Convert_upstreamv1beta3_BootstrapToken_To_v1beta2_BootstrapToken(in *Bootst
 	if in.Expires != nil && !reflect.DeepEqual(in.Expires, &metav1.Time{}) {
 		out.Expires = *in.Expires
 	}
+	if in.Token != nil {
+		if err := autoConvert_upstreamv1beta3_BootstrapTokenString_To_v1beta2_BootstrapTokenString(in.Token, &out.Token, s); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 
@@ -306,6 +311,12 @@ func Convert_v1beta2_BootstrapToken_To_upstreamv1beta3_BootstrapToken(in *bootst
 	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
 		out.Expires = ptr.To(in.Expires)
 	}
+	if !reflect.DeepEqual(in.Token, bootstrapv1.BootstrapTokenString{}) {
+		out.Token = &BootstrapTokenString{}
+		if err := autoConvert_v1beta2_BootstrapTokenString_To_upstreamv1beta3_BootstrapTokenString(&in.Token, out.Token, s); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

api/bootstrap/kubeadm/v1beta2/zz_generated.deepcopy.go

@@ -36,6 +36,11 @@ import (
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
+const (
+	fakeID     = "abcdef"
+	fakeSecret = "abcdef0123456789"
+)
+
 // Test is disabled when the race detector is enabled (via "//go:build !race" above) because otherwise the fuzz tests would just time out.
 
 func TestFuzzyConversion(t *testing.T) {
@@ -99,6 +104,7 @@ func clusterConfigurationFuzzFuncs(_ runtimeserializer.CodecFactory) []interface
 func initConfigurationFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		spokeBootstrapToken,
+		spokeBootstrapTokenString,
 	}
 }
 
@@ -190,6 +196,11 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	}
 }
 
+func spokeBootstrapTokenString(in *BootstrapTokenString, _ randfill.Continue) {
+	in.ID = fakeID
+	in.Secret = fakeSecret
+}
+
 func hubAPIServerFuzzer(obj *bootstrapv1.APIServer, c randfill.Continue) {
 	c.FillNoCustom(obj)
 

bootstrap/kubeadm/types/upstreamv1beta3/conversion.go

@@ -172,6 +172,11 @@ func Convert_upstreamv1beta4_BootstrapToken_To_v1beta2_BootstrapToken(in *Bootst
 	if in.Expires != nil && !reflect.DeepEqual(in.Expires, &metav1.Time{}) {
 		out.Expires = *in.Expires
 	}
+	if in.Token != nil {
+		if err := autoConvert_upstreamv1beta4_BootstrapTokenString_To_v1beta2_BootstrapTokenString(in.Token, &out.Token, s); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 
@@ -423,6 +428,12 @@ func Convert_v1beta2_BootstrapToken_To_upstreamv1beta4_BootstrapToken(in *bootst
 	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
 		out.Expires = ptr.To(in.Expires)
 	}
+	if !reflect.DeepEqual(in.Token, bootstrapv1.BootstrapTokenString{}) {
+		out.Token = &BootstrapTokenString{}
+		if err := autoConvert_v1beta2_BootstrapTokenString_To_upstreamv1beta4_BootstrapTokenString(&in.Token, out.Token, s); err != nil {
+			return err
+		}
+	}
 	return nil
 }
 

bootstrap/kubeadm/types/upstreamv1beta3/conversion_test.go

@@ -36,6 +36,11 @@ import (
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 )
 
+const (
+	fakeID     = "abcdef"
+	fakeSecret = "abcdef0123456789"
+)
+
 // Test is disabled when the race detector is enabled (via "//go:build !race" above) because otherwise the fuzz tests would just time out.
 
 func TestFuzzyConversion(t *testing.T) {
@@ -90,6 +95,7 @@ func fuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 func initConfigurationFuzzFuncs(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		spokeBootstrapToken,
+		spokeBootstrapTokenString,
 	}
 }
 
@@ -203,6 +209,11 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	}
 }
 
+func spokeBootstrapTokenString(in *BootstrapTokenString, _ randfill.Continue) {
+	in.ID = fakeID
+	in.Secret = fakeSecret
+}
+
 func hubClusterConfigurationFuzzer(in *bootstrapv1.ClusterConfiguration, c randfill.Continue) {
 	c.FillNoCustom(in)