Merge pull request kubernetes#87706 from liggitt/fix-statefulset-conv…

…ersion Fix statefulset conversion
zed-0xff · Feb 1, 2020 · 536c2c8 · 536c2c8
2 parents 2514c4b + 82107ff
commit 536c2c8
Show file tree

Hide file tree

Showing 9 changed files with 249 additions and 62 deletions.
diff --git a/hack/local-up-cluster.sh b/hack/local-up-cluster.sh
@@ -80,7 +80,7 @@ CLOUD_PROVIDER=${CLOUD_PROVIDER:-""}
 CLOUD_CONFIG=${CLOUD_CONFIG:-""}
 FEATURE_GATES=${FEATURE_GATES:-"AllAlpha=false"}
 STORAGE_BACKEND=${STORAGE_BACKEND:-"etcd3"}
-STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-""}
+STORAGE_MEDIA_TYPE=${STORAGE_MEDIA_TYPE:-"application/vnd.kubernetes.protobuf"}
 # preserve etcd data. you also need to set ETCD_DIR.
 PRESERVE_ETCD="${PRESERVE_ETCD:-false}"
 

diff --git a/pkg/apis/apps/v1/conversion.go b/pkg/apis/apps/v1/conversion.go
@@ -21,8 +21,10 @@ import (
 	"strconv"
 
 	appsv1 "k8s.io/api/apps/v1"
+	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/kubernetes/pkg/apis/apps"
+	"k8s.io/kubernetes/pkg/apis/core"
 	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
@@ -198,3 +200,45 @@ func deepCopyStringMap(m map[string]string) map[string]string {
 	}
 	return ret
 }
+
+// Convert_apps_StatefulSetSpec_To_v1_StatefulSetSpec augments auto-conversion to preserve < 1.17 behavior
+// setting apiVersion/kind in nested persistent volume claim objects.
+func Convert_v1_StatefulSetSpec_To_apps_StatefulSetSpec(in *appsv1.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
+	if err := autoConvert_v1_StatefulSetSpec_To_apps_StatefulSetSpec(in, out, s); err != nil {
+		return err
+	}
+	// set APIVersion/Kind to behave the same as reflective conversion < 1.17.
+	// see http://issue.k8s.io/87583
+	if out.VolumeClaimTemplates != nil {
+		// copy so we don't modify the input
+		templatesCopy := make([]core.PersistentVolumeClaim, len(out.VolumeClaimTemplates))
+		copy(templatesCopy, out.VolumeClaimTemplates)
+		out.VolumeClaimTemplates = templatesCopy
+		for i := range out.VolumeClaimTemplates {
+			out.VolumeClaimTemplates[i].APIVersion = ""
+			out.VolumeClaimTemplates[i].Kind = ""
+		}
+	}
+	return nil
+}
+
+// Convert_apps_StatefulSetSpec_To_v1_StatefulSetSpec augments auto-conversion to preserve < 1.17 behavior
+// setting apiVersion/kind in nested persistent volume claim objects.
+func Convert_apps_StatefulSetSpec_To_v1_StatefulSetSpec(in *apps.StatefulSetSpec, out *appsv1.StatefulSetSpec, s conversion.Scope) error {
+	if err := autoConvert_apps_StatefulSetSpec_To_v1_StatefulSetSpec(in, out, s); err != nil {
+		return err
+	}
+	// set APIVersion/Kind to behave the same as reflective conversion < 1.17.
+	// see http://issue.k8s.io/87583
+	if out.VolumeClaimTemplates != nil {
+		// copy so we don't modify the input
+		templatesCopy := make([]corev1.PersistentVolumeClaim, len(out.VolumeClaimTemplates))
+		copy(templatesCopy, out.VolumeClaimTemplates)
+		out.VolumeClaimTemplates = templatesCopy
+		for i := range out.VolumeClaimTemplates {
+			out.VolumeClaimTemplates[i].APIVersion = "v1"
+			out.VolumeClaimTemplates[i].Kind = "PersistentVolumeClaim"
+		}
+	}
+	return nil
+}
diff --git a/pkg/apis/apps/v1/zz_generated.conversion.go b/pkg/apis/apps/v1/zz_generated.conversion.go
diff --git a/pkg/apis/apps/v1beta1/conversion.go b/pkg/apis/apps/v1beta1/conversion.go
@@ -20,11 +20,14 @@ import (
 	"fmt"
 
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
+	apps "k8s.io/kubernetes/pkg/apis/apps"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
+	"k8s.io/kubernetes/pkg/apis/core"
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) error {
@@ -76,3 +79,45 @@ func Convert_v1beta1_ScaleStatus_To_autoscaling_ScaleStatus(in *appsv1beta1.Scal
 	}
 	return nil
 }
+
+// Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec augments auto-conversion to preserve < 1.17 behavior
+// setting apiVersion/kind in nested persistent volume claim objects.
+func Convert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in *appsv1beta1.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
+	if err := autoConvert_v1beta1_StatefulSetSpec_To_apps_StatefulSetSpec(in, out, s); err != nil {
+		return err
+	}
+	// set APIVersion/Kind to behave the same as reflective conversion < 1.17.
+	// see http://issue.k8s.io/87583
+	if out.VolumeClaimTemplates != nil {
+		// copy so we don't modify the input
+		templatesCopy := make([]core.PersistentVolumeClaim, len(out.VolumeClaimTemplates))
+		copy(templatesCopy, out.VolumeClaimTemplates)
+		out.VolumeClaimTemplates = templatesCopy
+		for i := range out.VolumeClaimTemplates {
+			out.VolumeClaimTemplates[i].APIVersion = ""
+			out.VolumeClaimTemplates[i].Kind = ""
+		}
+	}
+	return nil
+}
+
+// Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec augments auto-conversion to preserve < 1.17 behavior
+// setting apiVersion/kind in nested persistent volume claim objects.
+func Convert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in *apps.StatefulSetSpec, out *appsv1beta1.StatefulSetSpec, s conversion.Scope) error {
+	if err := autoConvert_apps_StatefulSetSpec_To_v1beta1_StatefulSetSpec(in, out, s); err != nil {
+		return err
+	}
+	// set APIVersion/Kind to behave the same as reflective conversion < 1.17.
+	// see http://issue.k8s.io/87583
+	if out.VolumeClaimTemplates != nil {
+		// copy so we don't modify the input
+		templatesCopy := make([]corev1.PersistentVolumeClaim, len(out.VolumeClaimTemplates))
+		copy(templatesCopy, out.VolumeClaimTemplates)
+		out.VolumeClaimTemplates = templatesCopy
+		for i := range out.VolumeClaimTemplates {
+			out.VolumeClaimTemplates[i].APIVersion = "v1"
+			out.VolumeClaimTemplates[i].Kind = "PersistentVolumeClaim"
+		}
+	}
+	return nil
+}
diff --git a/pkg/apis/apps/v1beta1/zz_generated.conversion.go b/pkg/apis/apps/v1beta1/zz_generated.conversion.go
diff --git a/pkg/apis/apps/v1beta2/conversion.go b/pkg/apis/apps/v1beta2/conversion.go
@@ -21,12 +21,14 @@ import (
 	"strconv"
 
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/kubernetes/pkg/apis/apps"
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling"
+	"k8s.io/kubernetes/pkg/apis/core"
 	k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
 )
 
@@ -255,3 +257,45 @@ func deepCopyStringMap(m map[string]string) map[string]string {
 	}
 	return ret
 }
+
+// Convert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec augments auto-conversion to preserve < 1.17 behavior
+// setting apiVersion/kind in nested persistent volume claim objects.
+func Convert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec(in *appsv1beta2.StatefulSetSpec, out *apps.StatefulSetSpec, s conversion.Scope) error {
+	if err := autoConvert_v1beta2_StatefulSetSpec_To_apps_StatefulSetSpec(in, out, s); err != nil {
+		return err
+	}
+	// set APIVersion/Kind to behave the same as reflective conversion < 1.17.
+	// see http://issue.k8s.io/87583
+	if out.VolumeClaimTemplates != nil {
+		// copy so we don't modify the input
+		templatesCopy := make([]core.PersistentVolumeClaim, len(out.VolumeClaimTemplates))
+		copy(templatesCopy, out.VolumeClaimTemplates)
+		out.VolumeClaimTemplates = templatesCopy
+		for i := range out.VolumeClaimTemplates {
+			out.VolumeClaimTemplates[i].APIVersion = ""
+			out.VolumeClaimTemplates[i].Kind = ""
+		}
+	}
+	return nil
+}
+
+// Convert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec augments auto-conversion to preserve < 1.17 behavior
+// setting apiVersion/kind in nested persistent volume claim objects.
+func Convert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in *apps.StatefulSetSpec, out *appsv1beta2.StatefulSetSpec, s conversion.Scope) error {
+	if err := autoConvert_apps_StatefulSetSpec_To_v1beta2_StatefulSetSpec(in, out, s); err != nil {
+		return err
+	}
+	// set APIVersion/Kind to behave the same as reflective conversion < 1.17.
+	// see http://issue.k8s.io/87583
+	if out.VolumeClaimTemplates != nil {
+		// copy so we don't modify the input
+		templatesCopy := make([]corev1.PersistentVolumeClaim, len(out.VolumeClaimTemplates))
+		copy(templatesCopy, out.VolumeClaimTemplates)
+		out.VolumeClaimTemplates = templatesCopy
+		for i := range out.VolumeClaimTemplates {
+			out.VolumeClaimTemplates[i].APIVersion = "v1"
+			out.VolumeClaimTemplates[i].Kind = "PersistentVolumeClaim"
+		}
+	}
+	return nil
+}
diff --git a/pkg/apis/apps/v1beta2/zz_generated.conversion.go b/pkg/apis/apps/v1beta2/zz_generated.conversion.go
diff --git a/test/integration/statefulset/BUILD b/test/integration/statefulset/BUILD
@@ -34,10 +34,14 @@ go_test(
     embed = [":go_default_library"],
     tags = ["integration"],
     deps = [
+        "//cmd/kube-apiserver/app/testing:go_default_library",
         "//staging/src/k8s.io/api/apps/v1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/util/json:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library",
+        "//staging/src/k8s.io/client-go/dynamic:go_default_library",
         "//test/integration/framework:go_default_library",
     ],
 )