fix stability test, add v1 to statefulset apiVersions

Author: weekface

manifests/webhook.yaml

@@ -105,5 +105,5 @@ webhooks:
     rules:
       - operations: [ "UPDATE" ]
         apiGroups: [ "apps", "" ]
-        apiVersions: ["v1beta1"]
+        apiVersions: ["v1beta1", "v1"]
         resources: ["statefulsets"]

pkg/webhook/statefulset/statefulset.go

@@ -24,7 +24,8 @@ import (
 	"github.com/pingcap/tidb-operator/pkg/label"
 	"github.com/pingcap/tidb-operator/pkg/webhook/util"
 	"k8s.io/api/admission/v1beta1"
-	apps "k8s.io/api/apps/v1beta1"
+	apps "k8s.io/api/apps/v1"
+	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/rest"
@@ -45,8 +46,9 @@ func AdmitStatefulSets(ar v1beta1.AdmissionReview) *v1beta1.AdmissionResponse {
 	namespace := ar.Request.Namespace
 	glog.V(4).Infof("admit statefulsets [%s/%s]", namespace, name)
 
-	setResource := metav1.GroupVersionResource{Group: "apps", Version: "v1beta1", Resource: "statefulsets"}
-	if ar.Request.Resource != setResource {
+	apiVersion := ar.Request.Resource.Version
+	setResource := metav1.GroupVersionResource{Group: "apps", Version: apiVersion, Resource: "statefulsets"}
+	if ar.Request.Resource.Group != "apps" || ar.Request.Resource.Resource != "statefulsets" {
 		err := fmt.Errorf("expect resource to be %s instead of %s", setResource, ar.Request.Resource)
 		glog.Errorf("%v", err)
 		return util.ARFail(err)
@@ -66,21 +68,20 @@ func AdmitStatefulSets(ar v1beta1.AdmissionReview) *v1beta1.AdmissionResponse {
 		}
 	}
 
-	raw := ar.Request.OldObject.Raw
-	set := apps.StatefulSet{}
-	if _, _, err := deserializer.Decode(raw, nil, &set); err != nil {
+	stsObjectMeta, stsPartition, err := getStsAttributes(ar.Request.OldObject.Raw, apiVersion)
+	if err != nil {
 		glog.Errorf("statefulset %s/%s, decode request failed, err: %v", namespace, name, err)
 		return util.ARFail(err)
 	}
 
-	l := label.Label(set.Labels)
+	l := label.Label(stsObjectMeta.Labels)
 
 	if !(l.IsTiDB() || l.IsTiKV()) {
 		// If it is not statefulset of tikv and tidb, return quickly.
 		return util.ARSuccess()
 	}
 
-	controllerRef := metav1.GetControllerOf(&set)
+	controllerRef := metav1.GetControllerOf(stsObjectMeta)
 	if controllerRef == nil || controllerRef.Kind != controller.ControllerKind.Kind {
 		// In this case, we can't tell if this statefulset is controlled by tidb-operator,
 		// so we don't block this statefulset upgrade, return directly.
@@ -111,11 +112,27 @@ func AdmitStatefulSets(ar v1beta1.AdmissionReview) *v1beta1.AdmissionResponse {
 		return util.ARFail(err)
 	}
 
-	setPartition := *set.Spec.UpdateStrategy.RollingUpdate.Partition
+	setPartition := *(stsPartition)
 	if setPartition > 0 && setPartition <= int32(partition) {
 		glog.V(4).Infof("statefulset %s/%s has been protect by partition %s annotations", namespace, name, partitionStr)
 		return util.ARFail(errors.New("protect by partition annotation"))
 	}
 	glog.Infof("admit statefulset %s/%s update partition to %d, protect partition is %d", namespace, name, setPartition, partition)
 	return util.ARSuccess()
 }
+
+func getStsAttributes(data []byte, apiVersion string) (*metav1.ObjectMeta, *int32, error) {
+	if apiVersion == "v1" {
+		set := apps.StatefulSet{}
+		if _, _, err := deserializer.Decode(data, nil, &set); err != nil {
+			return nil, nil, err
+		}
+		return &(set.ObjectMeta), set.Spec.UpdateStrategy.RollingUpdate.Partition, nil
+	}
+
+	set := appsv1beta1.StatefulSet{}
+	if _, _, err := deserializer.Decode(data, nil, &set); err != nil {
+		return nil, nil, err
+	}
+	return &(set.ObjectMeta), set.Spec.UpdateStrategy.RollingUpdate.Partition, nil
+}

tests/actions.go

@@ -448,7 +448,7 @@ func (oa *operatorActions) DeployOperator(info *OperatorConfig) error {
 	}
 
 	// deploy statefulset webhook and configuration to hijack update statefulset opeartion
-	cmd = fmt.Sprintf("kubectl apply -f %s/webhook.yaml", oa.manifestPath(info.Tag))
+	cmd = fmt.Sprintf(`sed 's/apiVersions: \["v1beta1"\]/apiVersions: ["v1", "v1beta1"]/' %s/webhook.yaml | kubectl apply -f -`, oa.manifestPath(info.Tag))
 	glog.Info(cmd)
 
 	res, err = exec.Command("/bin/sh", "-c", cmd).CombinedOutput()