diff --git a/charts/tidb-cluster/templates/discovery-deployment.yaml b/charts/tidb-cluster/templates/discovery-deployment.yaml index 137d0a9abcb..a00c0790ab1 100644 --- a/charts/tidb-cluster/templates/discovery-deployment.yaml +++ b/charts/tidb-cluster/templates/discovery-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "cluster.name" . }}-discovery diff --git a/charts/tidb-cluster/templates/monitor-deployment.yaml b/charts/tidb-cluster/templates/monitor-deployment.yaml index 2cfd4b5c1f2..84501c9ed9d 100644 --- a/charts/tidb-cluster/templates/monitor-deployment.yaml +++ b/charts/tidb-cluster/templates/monitor-deployment.yaml @@ -1,5 +1,5 @@ {{- if .Values.monitor.create }} -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ template "cluster.name" . }}-monitor diff --git a/charts/tidb-operator/templates/controller-manager-deployment.yaml b/charts/tidb-operator/templates/controller-manager-deployment.yaml index 1a5e89c28f6..d593c175165 100644 --- a/charts/tidb-operator/templates/controller-manager-deployment.yaml +++ b/charts/tidb-operator/templates/controller-manager-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: tidb-controller-manager diff --git a/charts/tidb-operator/templates/scheduler-deployment.yaml b/charts/tidb-operator/templates/scheduler-deployment.yaml index 7b2ced2e4c1..2b5f5543022 100644 --- a/charts/tidb-operator/templates/scheduler-deployment.yaml +++ b/charts/tidb-operator/templates/scheduler-deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: {{ .Values.scheduler.schedulerName }} diff --git a/deploy/gcp/manifests/local-ssd/overlays/terraform-local-ssd-provision.yaml b/deploy/gcp/manifests/local-ssd/overlays/terraform-local-ssd-provision.yaml index 4632276a355..cba00d9bfbd 100644 --- a/deploy/gcp/manifests/local-ssd/overlays/terraform-local-ssd-provision.yaml +++ b/deploy/gcp/manifests/local-ssd/overlays/terraform-local-ssd-provision.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: local-volume-provisioner diff --git a/deploy/modules/aws/tidb-operator/manifests/local-volume-provisioner.yaml b/deploy/modules/aws/tidb-operator/manifests/local-volume-provisioner.yaml index 9873298bb4f..0508fec16a5 100644 --- a/deploy/modules/aws/tidb-operator/manifests/local-volume-provisioner.yaml +++ b/deploy/modules/aws/tidb-operator/manifests/local-volume-provisioner.yaml @@ -20,7 +20,7 @@ data: mountDir: /mnt/local-ssd --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: local-volume-provisioner diff --git a/hack/kind-cluster-build.sh b/hack/kind-cluster-build.sh index aa5b8b82312..26e2c66e2ef 100755 --- a/hack/kind-cluster-build.sh +++ b/hack/kind-cluster-build.sh @@ -133,7 +133,7 @@ registryNodeIP=$(kubectl get nodes ${registryNode} -o template --template='{{ran registryFile=${workDir}/registry.yaml cat <${registryFile} -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: registry @@ -164,7 +164,7 @@ spec: hostPath: path: /data --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: registry-proxy diff --git a/manifests/gke/local-ssd-optimize.yaml b/manifests/gke/local-ssd-optimize.yaml index 578fe635a49..c3d9b4a4ce8 100644 --- a/manifests/gke/local-ssd-optimize.yaml +++ b/manifests/gke/local-ssd-optimize.yaml @@ -1,5 +1,5 @@ --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: local-ssd-startup-cos diff --git a/manifests/local-dind/dind-cluster-v1.10.sh b/manifests/local-dind/dind-cluster-v1.10.sh index 85f35a9fb41..47165190676 100755 --- a/manifests/local-dind/dind-cluster-v1.10.sh +++ b/manifests/local-dind/dind-cluster-v1.10.sh @@ -1665,7 +1665,7 @@ data: } } --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: labels: diff --git a/manifests/local-dind/dind-cluster-v1.12.sh b/manifests/local-dind/dind-cluster-v1.12.sh index d51992e9d69..86bd7a75ead 100755 --- a/manifests/local-dind/dind-cluster-v1.12.sh +++ b/manifests/local-dind/dind-cluster-v1.12.sh @@ -1680,7 +1680,7 @@ data: } } --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: labels: diff --git a/manifests/local-dind/kube-flannel.yaml b/manifests/local-dind/kube-flannel.yaml index 83f50441d46..0ea56703599 100644 --- a/manifests/local-dind/kube-flannel.yaml +++ b/manifests/local-dind/kube-flannel.yaml @@ -79,7 +79,7 @@ data: } } --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: kube-flannel-ds-amd64 diff --git a/manifests/local-dind/kubernetes-dashboard.yaml b/manifests/local-dind/kubernetes-dashboard.yaml index 81deef391a0..193dfe478bc 100644 --- a/manifests/local-dind/kubernetes-dashboard.yaml +++ b/manifests/local-dind/kubernetes-dashboard.yaml @@ -41,7 +41,7 @@ subjects: namespace: kube-system --- kind: Deployment -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 metadata: labels: k8s-app: kubernetes-dashboard diff --git a/manifests/local-dind/local-volume-provisioner.yaml b/manifests/local-dind/local-volume-provisioner.yaml index d018a2527e5..df1e99e2c27 100644 --- a/manifests/local-dind/local-volume-provisioner.yaml +++ b/manifests/local-dind/local-volume-provisioner.yaml @@ -20,7 +20,7 @@ data: mountDir: /mnt/disks --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: local-volume-provisioner diff --git a/manifests/local-dind/registry-proxy-deployment.yaml b/manifests/local-dind/registry-proxy-deployment.yaml index 83fc09d739a..51f7fd892e8 100644 --- a/manifests/local-dind/registry-proxy-deployment.yaml +++ b/manifests/local-dind/registry-proxy-deployment.yaml @@ -48,7 +48,7 @@ data: --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: registry-proxy diff --git a/manifests/webhook.yaml b/manifests/webhook.yaml index cd8fe8aee80..3c86dbe5f77 100644 --- a/manifests/webhook.yaml +++ b/manifests/webhook.yaml @@ -105,5 +105,5 @@ webhooks: rules: - operations: [ "UPDATE" ] apiGroups: [ "apps", "" ] - apiVersions: ["v1beta1"] + apiVersions: ["v1"] resources: ["statefulsets"] diff --git a/marketplace/gcp/tidb-operator/chart/tidb-mp/templates/application.yml b/marketplace/gcp/tidb-operator/chart/tidb-mp/templates/application.yml index 1c7d1f133f8..b4ea0433652 100644 --- a/marketplace/gcp/tidb-operator/chart/tidb-mp/templates/application.yml +++ b/marketplace/gcp/tidb-operator/chart/tidb-mp/templates/application.yml @@ -43,9 +43,9 @@ spec: matchExpressions: - {key: app.kubernetes.io/name, operator: In, values: [tidb-operator, tidb-cluster, tidb-mp]} componentKinds: - - group: apps/v1beta2 + - group: apps/v1 kind: Deployment - - group: apps/v1beta2 + - group: apps/v1 kind: StatefulSet - group: batch/v1 kind: Job diff --git a/pkg/apis/pingcap.com/v1alpha1/tidbcluster_test.go b/pkg/apis/pingcap.com/v1alpha1/tidbcluster_test.go index 901545bc2c5..b78d17b1194 100644 --- a/pkg/apis/pingcap.com/v1alpha1/tidbcluster_test.go +++ b/pkg/apis/pingcap.com/v1alpha1/tidbcluster_test.go @@ -17,7 +17,7 @@ import ( "testing" . "github.com/onsi/gomega" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/apis/pingcap.com/v1alpha1/types.go b/pkg/apis/pingcap.com/v1alpha1/types.go index cba36891dea..961231d4092 100644 --- a/pkg/apis/pingcap.com/v1alpha1/types.go +++ b/pkg/apis/pingcap.com/v1alpha1/types.go @@ -14,7 +14,7 @@ package v1alpha1 import ( - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/apis/pingcap.com/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/pingcap.com/v1alpha1/zz_generated.deepcopy.go index 920a5af7403..ea891dfcba5 100644 --- a/pkg/apis/pingcap.com/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/pingcap.com/v1alpha1/zz_generated.deepcopy.go @@ -21,8 +21,8 @@ limitations under the License. package v1alpha1 import ( - appsv1beta1 "k8s.io/api/apps/v1beta1" - v1 "k8s.io/api/core/v1" + v1 "k8s.io/api/apps/v1" + corev1 "k8s.io/api/core/v1" v1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -400,7 +400,7 @@ func (in *PDStatus) DeepCopyInto(out *PDStatus) { *out = *in if in.StatefulSet != nil { in, out := &in.StatefulSet, &out.StatefulSet - *out = new(appsv1beta1.StatefulSetStatus) + *out = new(v1.StatefulSetStatus) (*in).DeepCopyInto(*out) } if in.Members != nil { @@ -436,7 +436,7 @@ func (in *PodAttributesSpec) DeepCopyInto(out *PodAttributesSpec) { *out = *in if in.Affinity != nil { in, out := &in.Affinity, &out.Affinity - *out = new(v1.Affinity) + *out = new(corev1.Affinity) (*in).DeepCopyInto(*out) } if in.NodeSelector != nil { @@ -448,7 +448,7 @@ func (in *PodAttributesSpec) DeepCopyInto(out *PodAttributesSpec) { } if in.Tolerations != nil { in, out := &in.Tolerations, &out.Tolerations - *out = make([]v1.Toleration, len(*in)) + *out = make([]corev1.Toleration, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } @@ -462,7 +462,7 @@ func (in *PodAttributesSpec) DeepCopyInto(out *PodAttributesSpec) { } if in.PodSecurityContext != nil { in, out := &in.PodSecurityContext, &out.PodSecurityContext - *out = new(v1.PodSecurityContext) + *out = new(corev1.PodSecurityContext) (*in).DeepCopyInto(*out) } return @@ -725,7 +725,7 @@ func (in *TiDBStatus) DeepCopyInto(out *TiDBStatus) { *out = *in if in.StatefulSet != nil { in, out := &in.StatefulSet, &out.StatefulSet - *out = new(appsv1beta1.StatefulSetStatus) + *out = new(v1.StatefulSetStatus) (*in).DeepCopyInto(*out) } if in.Members != nil { @@ -812,7 +812,7 @@ func (in *TiKVStatus) DeepCopyInto(out *TiKVStatus) { *out = *in if in.StatefulSet != nil { in, out := &in.StatefulSet, &out.StatefulSet - *out = new(appsv1beta1.StatefulSetStatus) + *out = new(v1.StatefulSetStatus) (*in).DeepCopyInto(*out) } if in.Stores != nil { diff --git a/pkg/controller/controller_utils_test.go b/pkg/controller/controller_utils_test.go index 1af6127a3e1..24378c5bc93 100644 --- a/pkg/controller/controller_utils_test.go +++ b/pkg/controller/controller_utils_test.go @@ -21,7 +21,7 @@ import ( . "github.com/onsi/gomega" "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/stateful_set_control.go b/pkg/controller/stateful_set_control.go index 5cc1249a853..65e1cb15f3c 100644 --- a/pkg/controller/stateful_set_control.go +++ b/pkg/controller/stateful_set_control.go @@ -21,13 +21,13 @@ import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" tcinformers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions/pingcap.com/v1alpha1" v1listers "github.com/pingcap/tidb-operator/pkg/client/listers/pingcap.com/v1alpha1" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - appsinformers "k8s.io/client-go/informers/apps/v1beta1" + appsinformers "k8s.io/client-go/informers/apps/v1" "k8s.io/client-go/kubernetes" - appslisters "k8s.io/client-go/listers/apps/v1beta1" + appslisters "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/retry" @@ -56,7 +56,7 @@ func NewRealStatefuSetControl(kubeCli kubernetes.Interface, setLister appslister // CreateStatefulSet create a StatefulSet in a TidbCluster. func (sc *realStatefulSetControl) CreateStatefulSet(tc *v1alpha1.TidbCluster, set *apps.StatefulSet) error { - _, err := sc.kubeCli.AppsV1beta1().StatefulSets(tc.Namespace).Create(set) + _, err := sc.kubeCli.AppsV1().StatefulSets(tc.Namespace).Create(set) // sink already exists errors if apierrors.IsAlreadyExists(err) { return err @@ -76,7 +76,7 @@ func (sc *realStatefulSetControl) UpdateStatefulSet(tc *v1alpha1.TidbCluster, se err := retry.RetryOnConflict(retry.DefaultBackoff, func() error { // TODO: verify if StatefulSet identity(name, namespace, labels) matches TidbCluster var updateErr error - updatedSS, updateErr = sc.kubeCli.AppsV1beta1().StatefulSets(ns).Update(set) + updatedSS, updateErr = sc.kubeCli.AppsV1().StatefulSets(ns).Update(set) if updateErr == nil { glog.Infof("TidbCluster: [%s/%s]'s StatefulSet: [%s/%s] updated successfully", ns, tcName, ns, setName) return nil @@ -99,7 +99,7 @@ func (sc *realStatefulSetControl) UpdateStatefulSet(tc *v1alpha1.TidbCluster, se // DeleteStatefulSet delete a StatefulSet in a TidbCluster. func (sc *realStatefulSetControl) DeleteStatefulSet(tc *v1alpha1.TidbCluster, set *apps.StatefulSet) error { - err := sc.kubeCli.AppsV1beta1().StatefulSets(tc.Namespace).Delete(set.Name, nil) + err := sc.kubeCli.AppsV1().StatefulSets(tc.Namespace).Delete(set.Name, nil) sc.recordStatefulSetEvent("delete", tc, set, err) return err } diff --git a/pkg/controller/stateful_set_control_test.go b/pkg/controller/stateful_set_control_test.go index 1700ce3d5c2..3d5853e9340 100644 --- a/pkg/controller/stateful_set_control_test.go +++ b/pkg/controller/stateful_set_control_test.go @@ -22,7 +22,7 @@ import ( apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/kubernetes/fake" - appslisters "k8s.io/client-go/listers/apps/v1beta1" + appslisters "k8s.io/client-go/listers/apps/v1" core "k8s.io/client-go/testing" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" diff --git a/pkg/controller/tidbcluster/tidb_cluster_control_test.go b/pkg/controller/tidbcluster/tidb_cluster_control_test.go index 9511cf0e5a2..c97f9d53aea 100644 --- a/pkg/controller/tidbcluster/tidb_cluster_control_test.go +++ b/pkg/controller/tidbcluster/tidb_cluster_control_test.go @@ -25,7 +25,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" mm "github.com/pingcap/tidb-operator/pkg/manager/member" "github.com/pingcap/tidb-operator/pkg/manager/meta" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/controller/tidbcluster/tidb_cluster_controller.go b/pkg/controller/tidbcluster/tidb_cluster_controller.go index d8906ff916d..211a1616437 100644 --- a/pkg/controller/tidbcluster/tidb_cluster_controller.go +++ b/pkg/controller/tidbcluster/tidb_cluster_controller.go @@ -27,7 +27,7 @@ import ( mm "github.com/pingcap/tidb-operator/pkg/manager/member" "github.com/pingcap/tidb-operator/pkg/manager/meta" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -36,7 +36,7 @@ import ( kubeinformers "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" eventv1 "k8s.io/client-go/kubernetes/typed/core/v1" - appslisters "k8s.io/client-go/listers/apps/v1beta1" + appslisters "k8s.io/client-go/listers/apps/v1" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" @@ -84,7 +84,7 @@ func NewController( recorder := eventBroadcaster.NewRecorder(v1alpha1.Scheme, corev1.EventSource{Component: "tidbcluster"}) tcInformer := informerFactory.Pingcap().V1alpha1().TidbClusters() - setInformer := kubeInformerFactory.Apps().V1beta1().StatefulSets() + setInformer := kubeInformerFactory.Apps().V1().StatefulSets() svcInformer := kubeInformerFactory.Core().V1().Services() epsInformer := kubeInformerFactory.Core().V1().Endpoints() pvcInformer := kubeInformerFactory.Core().V1().PersistentVolumeClaims() diff --git a/pkg/controller/tidbcluster/tidb_cluster_controller_test.go b/pkg/controller/tidbcluster/tidb_cluster_controller_test.go index 7e08c9424ec..685c4a8a1fe 100644 --- a/pkg/controller/tidbcluster/tidb_cluster_controller_test.go +++ b/pkg/controller/tidbcluster/tidb_cluster_controller_test.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" "github.com/pingcap/tidb-operator/pkg/client/clientset/versioned/fake" informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" @@ -320,7 +320,7 @@ func newStatefuSet(tc *v1alpha1.TidbCluster) *apps.StatefulSet { return &apps.StatefulSet{ TypeMeta: metav1.TypeMeta{ Kind: "StatefulSet", - APIVersion: "apps/v1beta1", + APIVersion: "apps/v1", }, ObjectMeta: metav1.ObjectMeta{ Name: "test-statefuset", diff --git a/pkg/manager/member/pd_member_manager.go b/pkg/manager/member/pd_member_manager.go index 4875fae0749..a40162af3ee 100644 --- a/pkg/manager/member/pd_member_manager.go +++ b/pkg/manager/member/pd_member_manager.go @@ -24,14 +24,14 @@ import ( "github.com/pingcap/tidb-operator/pkg/manager" "github.com/pingcap/tidb-operator/pkg/pdapi" "github.com/pingcap/tidb-operator/pkg/util" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/client-go/listers/apps/v1beta1" + "k8s.io/client-go/listers/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" ) @@ -39,7 +39,7 @@ type pdMemberManager struct { pdControl pdapi.PDControlInterface setControl controller.StatefulSetControlInterface svcControl controller.ServiceControlInterface - setLister v1beta1.StatefulSetLister + setLister v1.StatefulSetLister svcLister corelisters.ServiceLister podLister corelisters.PodLister epsLister corelisters.EndpointsLister @@ -55,7 +55,7 @@ type pdMemberManager struct { func NewPDMemberManager(pdControl pdapi.PDControlInterface, setControl controller.StatefulSetControlInterface, svcControl controller.ServiceControlInterface, - setLister v1beta1.StatefulSetLister, + setLister v1.StatefulSetLister, svcLister corelisters.ServiceLister, podLister corelisters.PodLister, epsLister corelisters.EndpointsLister, diff --git a/pkg/manager/member/pd_member_manager_test.go b/pkg/manager/member/pd_member_manager_test.go index a7120ecee2d..53e2e854c6e 100644 --- a/pkg/manager/member/pd_member_manager_test.go +++ b/pkg/manager/member/pd_member_manager_test.go @@ -26,7 +26,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -238,7 +238,7 @@ func TestPDMemberManagerSyncUpdate(t *testing.T) { set.Status.CurrentRevision = "pd-1" set.Status.UpdateRevision = "pd-1" observedGeneration := int64(1) - set.Status.ObservedGeneration = &observedGeneration + set.Status.ObservedGeneration = observedGeneration }) } else { fakeSetControl.SetStatusChange(test.statusChange) @@ -328,7 +328,7 @@ func TestPDMemberManagerSyncUpdate(t *testing.T) { expectTidbClusterFn: func(g *GomegaWithT, tc *v1alpha1.TidbCluster) { g.Expect(tc.Status.ClusterID).To(Equal("1")) g.Expect(tc.Status.PD.Phase).To(Equal(v1alpha1.NormalPhase)) - g.Expect(*tc.Status.PD.StatefulSet.ObservedGeneration).To(Equal(int64(1))) + g.Expect(tc.Status.PD.StatefulSet.ObservedGeneration).To(Equal(int64(1))) g.Expect(len(tc.Status.PD.Members)).To(Equal(3)) g.Expect(tc.Status.PD.Members["pd1"].Health).To(Equal(true)) g.Expect(tc.Status.PD.Members["pd2"].Health).To(Equal(true)) @@ -500,7 +500,7 @@ func TestPDMemberManagerPdStatefulSetIsUpgrading(t *testing.T) { setUpdate: func(set *apps.StatefulSet) { set.Status.CurrentRevision = "v1" set.Status.UpdateRevision = "v2" - set.Status.ObservedGeneration = func() *int64 { var i int64; i = 1000; return &i }() + set.Status.ObservedGeneration = 1000 }, hasPod: false, updatePod: nil, @@ -617,7 +617,7 @@ func TestPDMemberManagerUpgrade(t *testing.T) { set.Status.CurrentRevision = "pd-1" set.Status.UpdateRevision = "pd-1" observedGeneration := int64(1) - set.Status.ObservedGeneration = &observedGeneration + set.Status.ObservedGeneration = observedGeneration }, expectStatefulSetFn: func(g *GomegaWithT, set *apps.StatefulSet, err error) { g.Expect(err).NotTo(HaveOccurred()) @@ -717,7 +717,7 @@ func TestPDMemberManagerSyncPDSts(t *testing.T) { set.Status.CurrentRevision = "pd-1" set.Status.UpdateRevision = "pd-1" observedGeneration := int64(1) - set.Status.ObservedGeneration = &observedGeneration + set.Status.ObservedGeneration = observedGeneration }, expectStatefulSetFn: func(g *GomegaWithT, set *apps.StatefulSet, err error) { g.Expect(err).NotTo(HaveOccurred()) @@ -746,7 +746,7 @@ func TestPDMemberManagerSyncPDSts(t *testing.T) { set.Status.CurrentRevision = "pd-1" set.Status.UpdateRevision = "pd-1" observedGeneration := int64(1) - set.Status.ObservedGeneration = &observedGeneration + set.Status.ObservedGeneration = observedGeneration }, expectStatefulSetFn: func(g *GomegaWithT, set *apps.StatefulSet, err error) { g.Expect(err).NotTo(HaveOccurred()) @@ -769,7 +769,7 @@ func TestPDMemberManagerSyncPDSts(t *testing.T) { func newFakePDMemberManager() (*pdMemberManager, *controller.FakeStatefulSetControl, *controller.FakeServiceControl, *pdapi.FakePDControl, cache.Indexer, cache.Indexer, *controller.FakePodControl) { cli := fake.NewSimpleClientset() kubeCli := kubefake.NewSimpleClientset() - setInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Apps().V1beta1().StatefulSets() + setInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Apps().V1().StatefulSets() svcInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Services() podInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Pods() epsInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Endpoints() diff --git a/pkg/manager/member/pd_scaler.go b/pkg/manager/member/pd_scaler.go index 8a2c24f51e8..95a45714cbd 100644 --- a/pkg/manager/member/pd_scaler.go +++ b/pkg/manager/member/pd_scaler.go @@ -22,7 +22,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" ) diff --git a/pkg/manager/member/pd_scaler_test.go b/pkg/manager/member/pd_scaler_test.go index e001c1b371c..76184d2231a 100644 --- a/pkg/manager/member/pd_scaler_test.go +++ b/pkg/manager/member/pd_scaler_test.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/pkg/manager/member/pd_upgrader.go b/pkg/manager/member/pd_upgrader.go index faf58444a19..5d5d2a2f706 100644 --- a/pkg/manager/member/pd_upgrader.go +++ b/pkg/manager/member/pd_upgrader.go @@ -20,7 +20,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" ) diff --git a/pkg/manager/member/pd_upgrader_test.go b/pkg/manager/member/pd_upgrader_test.go index 04c276c2747..0fb6a667ce5 100644 --- a/pkg/manager/member/pd_upgrader_test.go +++ b/pkg/manager/member/pd_upgrader_test.go @@ -22,7 +22,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/manager/member/scaler.go b/pkg/manager/member/scaler.go index 4ebbe1fb3d9..f985a7ee779 100644 --- a/pkg/manager/member/scaler.go +++ b/pkg/manager/member/scaler.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" "k8s.io/apimachinery/pkg/api/errors" corelisters "k8s.io/client-go/listers/core/v1" ) diff --git a/pkg/manager/member/tidb_member_manager.go b/pkg/manager/member/tidb_member_manager.go index 9d2d561f35c..7aaa9d0686c 100644 --- a/pkg/manager/member/tidb_member_manager.go +++ b/pkg/manager/member/tidb_member_manager.go @@ -22,14 +22,14 @@ import ( "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/manager" "github.com/pingcap/tidb-operator/pkg/util" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/client-go/listers/apps/v1beta1" + "k8s.io/client-go/listers/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" ) @@ -43,7 +43,7 @@ type tidbMemberManager struct { setControl controller.StatefulSetControlInterface svcControl controller.ServiceControlInterface tidbControl controller.TiDBControlInterface - setLister v1beta1.StatefulSetLister + setLister v1.StatefulSetLister svcLister corelisters.ServiceLister podLister corelisters.PodLister tidbUpgrader Upgrader @@ -56,7 +56,7 @@ type tidbMemberManager struct { func NewTiDBMemberManager(setControl controller.StatefulSetControlInterface, svcControl controller.ServiceControlInterface, tidbControl controller.TiDBControlInterface, - setLister v1beta1.StatefulSetLister, + setLister v1.StatefulSetLister, svcLister corelisters.ServiceLister, podLister corelisters.PodLister, tidbUpgrader Upgrader, diff --git a/pkg/manager/member/tidb_member_manager_test.go b/pkg/manager/member/tidb_member_manager_test.go index e91e2ebd45c..82f38ac5eba 100644 --- a/pkg/manager/member/tidb_member_manager_test.go +++ b/pkg/manager/member/tidb_member_manager_test.go @@ -25,7 +25,7 @@ import ( informers "github.com/pingcap/tidb-operator/pkg/client/informers/externalversions" "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -148,7 +148,7 @@ func TestTiDBMemberManagerSyncUpdate(t *testing.T) { set.Status.CurrentRevision = "tidb-1" set.Status.UpdateRevision = "tidb-1" observedGeneration := int64(1) - set.Status.ObservedGeneration = &observedGeneration + set.Status.ObservedGeneration = observedGeneration }) } else { fakeSetControl.SetStatusChange(test.statusChange) @@ -285,7 +285,7 @@ func TestTiDBMemberManagerTiDBStatefulSetIsUpgrading(t *testing.T) { setUpdate: func(set *apps.StatefulSet) { set.Status.CurrentRevision = "v1" set.Status.UpdateRevision = "v2" - set.Status.ObservedGeneration = func() *int64 { var i int64; i = 1000; return &i }() + set.Status.ObservedGeneration = 1000 }, hasPod: false, updatePod: nil, @@ -524,7 +524,7 @@ func TestTiDBMemberManagerSyncTidbClusterStatus(t *testing.T) { func newFakeTiDBMemberManager() (*tidbMemberManager, *controller.FakeStatefulSetControl, cache.Indexer, *controller.FakeTiDBControl) { cli := fake.NewSimpleClientset() kubeCli := kubefake.NewSimpleClientset() - setInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Apps().V1beta1().StatefulSets() + setInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Apps().V1().StatefulSets() tcInformer := informers.NewSharedInformerFactory(cli, 0).Pingcap().V1alpha1().TidbClusters() svcInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Services() epsInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Endpoints() diff --git a/pkg/manager/member/tidb_upgrader.go b/pkg/manager/member/tidb_upgrader.go index 01529211d10..7df41c2b9a4 100644 --- a/pkg/manager/member/tidb_upgrader.go +++ b/pkg/manager/member/tidb_upgrader.go @@ -17,7 +17,7 @@ import ( "github.com/golang/glog" "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" "github.com/pingcap/tidb-operator/pkg/controller" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" ) diff --git a/pkg/manager/member/tidb_upgrader_test.go b/pkg/manager/member/tidb_upgrader_test.go index 6b32fdcf662..4072babbfbb 100644 --- a/pkg/manager/member/tidb_upgrader_test.go +++ b/pkg/manager/member/tidb_upgrader_test.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/manager/member/tikv_member_manager.go b/pkg/manager/member/tikv_member_manager.go index 0174330682d..7b9383bae7e 100644 --- a/pkg/manager/member/tikv_member_manager.go +++ b/pkg/manager/member/tikv_member_manager.go @@ -26,14 +26,14 @@ import ( "github.com/pingcap/tidb-operator/pkg/manager" "github.com/pingcap/tidb-operator/pkg/pdapi" "github.com/pingcap/tidb-operator/pkg/util" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/uuid" - "k8s.io/client-go/listers/apps/v1beta1" + "k8s.io/client-go/listers/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" "k8s.io/kubernetes/pkg/kubelet/apis" ) @@ -43,7 +43,7 @@ type tikvMemberManager struct { setControl controller.StatefulSetControlInterface svcControl controller.ServiceControlInterface pdControl pdapi.PDControlInterface - setLister v1beta1.StatefulSetLister + setLister v1.StatefulSetLister svcLister corelisters.ServiceLister podLister corelisters.PodLister nodeLister corelisters.NodeLister @@ -58,7 +58,7 @@ type tikvMemberManager struct { func NewTiKVMemberManager(pdControl pdapi.PDControlInterface, setControl controller.StatefulSetControlInterface, svcControl controller.ServiceControlInterface, - setLister v1beta1.StatefulSetLister, + setLister v1.StatefulSetLister, svcLister corelisters.ServiceLister, podLister corelisters.PodLister, nodeLister corelisters.NodeLister, diff --git a/pkg/manager/member/tikv_member_manager_test.go b/pkg/manager/member/tikv_member_manager_test.go index 798fde31131..3b9566896e8 100644 --- a/pkg/manager/member/tikv_member_manager_test.go +++ b/pkg/manager/member/tikv_member_manager_test.go @@ -29,7 +29,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -258,7 +258,7 @@ func TestTiKVMemberManagerSyncUpdate(t *testing.T) { set.Status.CurrentRevision = "pd-1" set.Status.UpdateRevision = "pd-1" observedGeneration := int64(1) - set.Status.ObservedGeneration = &observedGeneration + set.Status.ObservedGeneration = observedGeneration }) } else { fakeSetControl.SetStatusChange(test.statusChange) @@ -325,7 +325,7 @@ func TestTiKVMemberManagerSyncUpdate(t *testing.T) { g.Expect(int(*set.Spec.Replicas)).To(Equal(4)) }, expectTidbClusterFn: func(g *GomegaWithT, tc *v1alpha1.TidbCluster) { - g.Expect(*tc.Status.TiKV.StatefulSet.ObservedGeneration).To(Equal(int64(1))) + g.Expect(tc.Status.TiKV.StatefulSet.ObservedGeneration).To(Equal(int64(1))) g.Expect(tc.Status.TiKV.Stores).To(Equal(map[string]v1alpha1.TiKVStore{})) g.Expect(tc.Status.TiKV.TombstoneStores).To(Equal(map[string]v1alpha1.TiKVStore{})) }, @@ -447,7 +447,7 @@ func TestTiKVMemberManagerTiKVStatefulSetIsUpgrading(t *testing.T) { setUpdate: func(set *apps.StatefulSet) { set.Status.CurrentRevision = "v1" set.Status.UpdateRevision = "v2" - set.Status.ObservedGeneration = func() *int64 { var i int64; i = 1000; return &i }() + set.Status.ObservedGeneration = 1000 }, hasPod: false, updatePod: nil, @@ -1368,7 +1368,7 @@ func newFakeTiKVMemberManager(tc *v1alpha1.TidbCluster) ( kubeCli := kubefake.NewSimpleClientset() pdControl := pdapi.NewFakePDControl() pdClient := controller.NewFakePDClient(pdControl, tc) - setInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Apps().V1beta1().StatefulSets() + setInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Apps().V1().StatefulSets() svcInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Services() epsInformer := kubeinformers.NewSharedInformerFactory(kubeCli, 0).Core().V1().Endpoints() tcInformer := informers.NewSharedInformerFactory(cli, 0).Pingcap().V1alpha1().TidbClusters() diff --git a/pkg/manager/member/tikv_scaler.go b/pkg/manager/member/tikv_scaler.go index a803e79c9e6..9990da0677c 100644 --- a/pkg/manager/member/tikv_scaler.go +++ b/pkg/manager/member/tikv_scaler.go @@ -23,7 +23,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corelisters "k8s.io/client-go/listers/core/v1" podutil "k8s.io/kubernetes/pkg/api/v1/pod" ) diff --git a/pkg/manager/member/tikv_upgrader.go b/pkg/manager/member/tikv_upgrader.go index 78d2de0588d..158089c30bd 100644 --- a/pkg/manager/member/tikv_upgrader.go +++ b/pkg/manager/member/tikv_upgrader.go @@ -22,7 +22,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" corelisters "k8s.io/client-go/listers/core/v1" ) diff --git a/pkg/manager/member/tikv_upgrader_test.go b/pkg/manager/member/tikv_upgrader_test.go index 2856cbb24c3..47f95309f49 100644 --- a/pkg/manager/member/tikv_upgrader_test.go +++ b/pkg/manager/member/tikv_upgrader_test.go @@ -24,7 +24,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" "github.com/pingcap/tidb-operator/pkg/pdapi" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/pkg/manager/member/upgrader.go b/pkg/manager/member/upgrader.go index 20f3fe4313b..47c978fdca6 100644 --- a/pkg/manager/member/upgrader.go +++ b/pkg/manager/member/upgrader.go @@ -15,7 +15,7 @@ package member import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" ) // Upgrader implements the logic for upgrading the tidb cluster. diff --git a/pkg/manager/member/utils.go b/pkg/manager/member/utils.go index e69f1c6ffa9..1baec878398 100644 --- a/pkg/manager/member/utils.go +++ b/pkg/manager/member/utils.go @@ -21,7 +21,7 @@ import ( "github.com/pingcap/tidb-operator/pkg/apis/pingcap.com/v1alpha1" "github.com/pingcap/tidb-operator/pkg/controller" "github.com/pingcap/tidb-operator/pkg/label" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" apiequality "k8s.io/apimachinery/pkg/api/equality" ) @@ -55,13 +55,10 @@ func annotationsMountVolume() (corev1.VolumeMount, corev1.Volume) { // statefulSetIsUpgrading confirms whether the statefulSet is upgrading phase func statefulSetIsUpgrading(set *apps.StatefulSet) bool { - if set.Status.ObservedGeneration == nil { - return false - } if set.Status.CurrentRevision != set.Status.UpdateRevision { return true } - if set.Generation > *set.Status.ObservedGeneration && *set.Spec.Replicas == set.Status.Replicas { + if set.Generation > set.Status.ObservedGeneration && *set.Spec.Replicas == set.Status.Replicas { return true } return false diff --git a/pkg/manager/member/utils_test.go b/pkg/manager/member/utils_test.go index 3b602d0ccb0..a785b300f93 100644 --- a/pkg/manager/member/utils_test.go +++ b/pkg/manager/member/utils_test.go @@ -17,7 +17,7 @@ import ( "testing" . "github.com/onsi/gomega" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -58,7 +58,7 @@ func TestStatefulSetIsUpgrading(t *testing.T) { { name: "CurrentRevision not equal UpdateRevision", update: func(set *apps.StatefulSet) { - set.Status.ObservedGeneration = func() *int64 { var i int64; i = 1000; return &i }() + set.Status.ObservedGeneration = 1000 set.Status.CurrentRevision = "v1" set.Status.UpdateRevision = "v2" }, @@ -68,7 +68,7 @@ func TestStatefulSetIsUpgrading(t *testing.T) { name: "set.Generation > *set.Status.ObservedGeneration && *set.Spec.Replicas == set.Status.Replicas", update: func(set *apps.StatefulSet) { set.Generation = 1001 - set.Status.ObservedGeneration = func() *int64 { var i int64; i = 1000; return &i }() + set.Status.ObservedGeneration = 1000 set.Status.CurrentRevision = "v1" set.Status.UpdateRevision = "v1" set.Status.Replicas = 3 @@ -80,7 +80,7 @@ func TestStatefulSetIsUpgrading(t *testing.T) { name: "replicas not equal", update: func(set *apps.StatefulSet) { set.Generation = 1001 - set.Status.ObservedGeneration = func() *int64 { var i int64; i = 1000; return &i }() + set.Status.ObservedGeneration = 1000 set.Status.CurrentRevision = "v1" set.Status.UpdateRevision = "v1" set.Status.Replicas = 3 diff --git a/pkg/tkctl/cmd/upinfo/upinfo.go b/pkg/tkctl/cmd/upinfo/upinfo.go index 9e8e1978221..634cf8ee577 100644 --- a/pkg/tkctl/cmd/upinfo/upinfo.go +++ b/pkg/tkctl/cmd/upinfo/upinfo.go @@ -26,7 +26,7 @@ import ( tkctlUtil "github.com/pingcap/tidb-operator/pkg/tkctl/util" "github.com/pingcap/tidb-operator/pkg/util" "github.com/spf13/cobra" - apps "k8s.io/api/apps/v1beta1" + apps "k8s.io/api/apps/v1" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/cli-runtime/pkg/genericclioptions" @@ -138,7 +138,7 @@ func (o *UpInfoOptions) Run() error { return err } setName := controller.TiDBMemberName(tc.Name) - set, err := o.KubeCli.AppsV1beta1().StatefulSets(o.Namespace).Get(setName, metav1.GetOptions{}) + set, err := o.KubeCli.AppsV1().StatefulSets(o.Namespace).Get(setName, metav1.GetOptions{}) if err != nil { return err } diff --git a/pkg/webhook/statefulset/statefulset.go b/pkg/webhook/statefulset/statefulset.go index fb45ef69858..30cabc3e48a 100644 --- a/pkg/webhook/statefulset/statefulset.go +++ b/pkg/webhook/statefulset/statefulset.go @@ -24,7 +24,7 @@ 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" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/client-go/rest" @@ -45,7 +45,7 @@ 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"} + setResource := metav1.GroupVersionResource{Group: "apps", Version: "v1", Resource: "statefulsets"} if ar.Request.Resource != setResource { err := fmt.Errorf("expect resource to be %s instead of %s", setResource, ar.Request.Resource) glog.Errorf("%v", err) diff --git a/tests/actions.go b/tests/actions.go index ffdb8a651cf..7d2a18dddd2 100644 --- a/tests/actions.go +++ b/tests/actions.go @@ -50,7 +50,7 @@ import ( "github.com/pingcap/tidb-operator/tests/pkg/webhook" "github.com/pingcap/tidb-operator/tests/slack" admissionV1beta1 "k8s.io/api/admissionregistration/v1beta1" - "k8s.io/api/apps/v1beta1" + "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" @@ -1301,7 +1301,7 @@ func (oa *operatorActions) tikvMembersReadyFn(tc *v1alpha1.TidbCluster) (bool, e ns := tc.GetNamespace() tikvSetName := controller.TiKVMemberName(tcName) - tikvSet, err := oa.kubeCli.AppsV1beta1().StatefulSets(ns).Get(tikvSetName, metav1.GetOptions{}) + tikvSet, err := oa.kubeCli.AppsV1().StatefulSets(ns).Get(tikvSetName, metav1.GetOptions{}) if err != nil { glog.Errorf("failed to get statefulset: %s/%s, %v", ns, tikvSetName, err) return false, nil @@ -2947,7 +2947,7 @@ func (oa *operatorActions) getHelmUpgradeClusterCmd(info *TidbClusterConfig, set func (oa *operatorActions) CheckManualPauseTiDB(info *TidbClusterConfig) error { var tc *v1alpha1.TidbCluster - var tidbSet *v1beta1.StatefulSet + var tidbSet *v1.StatefulSet var err error ns := info.Namespace @@ -2971,7 +2971,7 @@ func (oa *operatorActions) CheckManualPauseTiDB(info *TidbClusterConfig) error { return false, nil } - if tidbPod.Labels[v1beta1.ControllerRevisionHashLabelKey] == tc.Status.TiDB.StatefulSet.UpdateRevision && + if tidbPod.Labels[v1.ControllerRevisionHashLabelKey] == tc.Status.TiDB.StatefulSet.UpdateRevision && tc.Status.TiDB.Phase == v1alpha1.UpgradePhase { if member, ok := tc.Status.TiDB.Members[tidbPod.Name]; !ok || !member.Health { glog.Infof("wait for tidb pod [%s/%s] ready member health %t ok %t", ns, podName, member.Health, ok) @@ -2993,7 +2993,7 @@ func (oa *operatorActions) CheckManualPauseTiDB(info *TidbClusterConfig) error { time.Sleep(30 * time.Second) tidbSetName := controller.TiDBMemberName(info.ClusterName) - if tidbSet, err = oa.kubeCli.AppsV1beta1().StatefulSets(ns).Get(tidbSetName, metav1.GetOptions{}); err != nil { + if tidbSet, err = oa.kubeCli.AppsV1().StatefulSets(ns).Get(tidbSetName, metav1.GetOptions{}); err != nil { return fmt.Errorf("failed to get statefulset: [%s/%s], %v", ns, tidbSetName, err) }