kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't expose v1alpha3 API

This commit is contained in:
John Gardiner Myers 2022-12-27 11:49:38 -08:00
parent 41286e1ec7
commit b51e1ba7f7
3 changed files with 7 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/apis/kops/install/install.go
View File

@ -23,12 +23,10 @@ import (
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/kops/pkg/apis/kops" "k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/apis/kops/v1alpha2" "k8s.io/kops/pkg/apis/kops/v1alpha2"
"k8s.io/kops/pkg/apis/kops/v1alpha3"
) )
func Install(scheme *runtime.Scheme) { func Install(scheme *runtime.Scheme) {
utilruntime.Must(kops.AddToScheme(scheme)) utilruntime.Must(kops.AddToScheme(scheme))
utilruntime.Must(v1alpha2.AddToScheme(scheme)) utilruntime.Must(v1alpha2.AddToScheme(scheme))
utilruntime.Must(v1alpha3.AddToScheme(scheme)) utilruntime.Must(scheme.SetVersionPriority(v1alpha2.SchemeGroupVersion))
utilruntime.Must(scheme.SetVersionPriority(v1alpha2.SchemeGroupVersion, v1alpha3.SchemeGroupVersion))
} }

15
tests/codecs/componentconfig_test.go
View File

@ -19,31 +19,28 @@ package codecs
import ( import (
"testing" "testing"
"k8s.io/kops/pkg/apis/kops/v1alpha3" "k8s.io/kops/pkg/apis/kops/v1alpha2"
"k8s.io/kops/pkg/diff" "k8s.io/kops/pkg/diff"
"k8s.io/kops/pkg/kopscodecs" "k8s.io/kops/pkg/kopscodecs"
) )
func TestSerializeEmptyCluster(t *testing.T) { func TestSerializeEmptyCluster(t *testing.T) {
cluster := &v1alpha3.Cluster{} cluster := &v1alpha2.Cluster{}
cluster.Spec.Kubelet = &v1alpha3.KubeletConfigSpec{} cluster.Spec.Kubelet = &v1alpha2.KubeletConfigSpec{}
cluster.Spec.KubeControllerManager = &v1alpha3.KubeControllerManagerConfig{} cluster.Spec.KubeControllerManager = &v1alpha2.KubeControllerManagerConfig{}
yaml, err := kopscodecs.ToVersionedYamlWithVersion(cluster, v1alpha3.SchemeGroupVersion) yaml, err := kopscodecs.ToVersionedYamlWithVersion(cluster, v1alpha2.SchemeGroupVersion)
if err != nil { if err != nil {
t.Errorf("unexpected error marshaling Cluster: %v", err) t.Errorf("unexpected error marshaling Cluster: %v", err)
} }
yamlString := string(yaml) yamlString := string(yaml)
expected := `apiVersion: kops.k8s.io/v1alpha3 expected := `apiVersion: kops.k8s.io/v1alpha2
kind: Cluster kind: Cluster
metadata: metadata:
creationTimestamp: null creationTimestamp: null
spec: spec:
api: {}
cloudProvider: {}
kubeControllerManager: {} kubeControllerManager: {}
kubelet: {} kubelet: {}
networking: {}
` `
if yamlString != expected { if yamlString != expected {
diffString := diff.FormatDiff(expected, yamlString) diffString := diff.FormatDiff(expected, yamlString)

38
tests/integration/conversion/integration_test.go
View File

@ -34,45 +34,7 @@ import (
// TestConversionMinimal runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a // TestConversionMinimal runs the test on a minimum configuration, similar to kops create cluster minimal.example.com --zones us-west-1a
func TestConversionMinimal(t *testing.T) { func TestConversionMinimal(t *testing.T) {
runTest(t, "minimal", "legacy-v1alpha2", "v1alpha2") runTest(t, "minimal", "legacy-v1alpha2", "v1alpha2")
runTest(t, "minimal", "v1alpha2", "v1alpha3")
runTest(t, "minimal", "v1alpha3", "v1alpha2")
} }
func TestConversionAWS(t *testing.T) {
runTest(t, "aws", "v1alpha2", "v1alpha3")
runTest(t, "aws", "v1alpha3", "v1alpha2")
}
func TestConversionAzure(t *testing.T) {
runTest(t, "azure", "v1alpha2", "v1alpha3")
runTest(t, "azure", "v1alpha3", "v1alpha2")
}
func TestConversionCanal(t *testing.T) {
runTest(t, "canal", "v1alpha2", "v1alpha3")
runTest(t, "canal", "v1alpha3", "v1alpha2")
}
func TestConversionCilium(t *testing.T) {
runTest(t, "cilium", "v1alpha2", "v1alpha3")
runTest(t, "cilium", "v1alpha3", "v1alpha2")
}
func TestConversionDO(t *testing.T) {
runTest(t, "do", "v1alpha2", "v1alpha3")
runTest(t, "do", "v1alpha3", "v1alpha2")
}
func TestConversionGCE(t *testing.T) {
runTest(t, "gce", "v1alpha2", "v1alpha3")
runTest(t, "gce", "v1alpha3", "v1alpha2")
}
func TestConversionOpenstack(t *testing.T) {
runTest(t, "openstack", "v1alpha2", "v1alpha3")
runTest(t, "openstack", "v1alpha3", "v1alpha2")
}
func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string) { func runTest(t *testing.T, srcDir string, fromVersion string, toVersion string) {
t.Run(fromVersion+"-"+toVersion, func(t *testing.T) { t.Run(fromVersion+"-"+toVersion, func(t *testing.T) {
sourcePath := path.Join(srcDir, fromVersion+".yaml") sourcePath := path.Join(srcDir, fromVersion+".yaml")