Merge pull request #17526 from justinsb/enable_roundtrip_tests_2

Add round-trip tests / PodCIDR to all versions

Author: k8s-ci-robot

pkg/apis/kops/host.go

@@ -0,0 +1,49 @@
+/*
+Copyright 2023 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kops
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// Host represents a bare-metal machine that could be registered as a Node.
+type Host struct {
+	metav1.TypeMeta   `json:",inline"`
+	metav1.ObjectMeta `json:"metadata,omitempty"`
+
+	Spec HostSpec `json:"spec,omitempty"`
+}
+
+type HostSpec struct {
+	PublicKey     string `json:"publicKey,omitempty"`
+	InstanceGroup string `json:"instanceGroup,omitempty"`
+
+	// PodCIDRs configures the IP ranges to be used for pods on this node/host.
+	PodCIDRs []string `json:"podCIDRs,omitempty"`
+}
+
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+type HostList struct {
+	metav1.TypeMeta `json:",inline"`
+	metav1.ListMeta `json:"metadata,omitempty"`
+
+	Items []Host `json:"items"`
+}

pkg/apis/kops/install/install_test.go

@@ -0,0 +1,52 @@
+/*
+Copyright 2025 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package install
+
+import (
+	"strings"
+	"testing"
+
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+)
+
+func TestTypesExistInAllVersions(t *testing.T) {
+	scheme := runtime.NewScheme()
+	Install(scheme)
+
+	group := "kops.k8s.io"
+	internalVersion := schema.GroupVersion{Group: group, Version: runtime.APIVersionInternal}
+	internalKindToGoType := scheme.KnownTypes(internalVersion)
+
+	internalKinds := make(map[string]bool)
+	for kind := range internalKindToGoType {
+		internalKinds[kind] = true
+	}
+
+	for _, version := range []string{"v1alpha2", "v1alpha3"} {
+		versionKinds := scheme.KnownTypes(schema.GroupVersion{Group: group, Version: version})
+		for kind := range versionKinds {
+			// Ignore ListOptions, DeleteOptions, etc.
+			if strings.HasSuffix(kind, "Options") {
+				continue
+			}
+			if !internalKinds[kind] {
+				t.Errorf("version %s has kind %s, not found in internal API", version, kind)
+			}
+		}
+	}
+}

pkg/apis/kops/install/roundtrip_test.go

@@ -17,11 +17,42 @@ limitations under the License.
 package install
 
 import (
+	"math/rand"
 	"testing"
+
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	"k8s.io/apimachinery/pkg/api/apitesting/roundtrip"
+	metafuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 )
 
 func TestRoundTripTypes(t *testing.T) {
-	t.Skipped()
-	// TODO: Reenable
-	// roundtrip.RoundTripTestForAPIGroup(t, Install, nil)
+	var fuzzingFuncs fuzzer.FuzzerFuncs
+
+	nonRoundTrippableTypes := make(map[schema.GroupVersionKind]bool)
+
+	// TODO: Eliminate this once all types round-trip
+	for _, version := range []string{"v1alpha2", "v1alpha3"} {
+		nonRoundTrippableTypes[schema.GroupVersionKind{Group: "kops.k8s.io", Version: version, Kind: "Cluster"}] = true
+		nonRoundTrippableTypes[schema.GroupVersionKind{Group: "kops.k8s.io", Version: version, Kind: "ClusterList"}] = true
+		nonRoundTrippableTypes[schema.GroupVersionKind{Group: "kops.k8s.io", Version: version, Kind: "InstanceGroup"}] = true
+		nonRoundTrippableTypes[schema.GroupVersionKind{Group: "kops.k8s.io", Version: version, Kind: "InstanceGroupList"}] = true
+	}
+
+	if len(nonRoundTrippableTypes) == 0 {
+		roundtrip.RoundTripTestForAPIGroup(t, Install, fuzzingFuncs)
+	} else {
+		scheme := runtime.NewScheme()
+		Install(scheme)
+
+		codecFactory := runtimeserializer.NewCodecFactory(scheme)
+		f := fuzzer.FuzzerFor(
+			fuzzer.MergeFuzzerFuncs(metafuzzer.Funcs, fuzzingFuncs),
+			rand.NewSource(rand.Int63()),
+			codecFactory,
+		)
+		roundtrip.RoundTripTypesWithoutProtobuf(t, scheme, codecFactory, f, nonRoundTrippableTypes)
+	}
 }

pkg/apis/kops/register.go

@@ -63,6 +63,8 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&KeysetList{},
 		&SSHCredential{},
 		&SSHCredentialList{},
+		&Host{},
+		&HostList{},
 	)
 	// metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
 	return nil

pkg/apis/kops/v1alpha2/zz_generated.conversion.go

@@ -36,6 +36,9 @@ type Host struct {
 type HostSpec struct {
 	PublicKey     string `json:"publicKey,omitempty"`
 	InstanceGroup string `json:"instanceGroup,omitempty"`
+
+	// PodCIDRs configures the IP ranges to be used for pods on this node/host.
+	PodCIDRs []string `json:"podCIDRs,omitempty"`
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object