From c694b9f7619b6f67555f744dd04403198da47de0 Mon Sep 17 00:00:00 2001 From: Mengjiao Liu Date: Thu, 27 May 2021 18:07:16 +0800 Subject: [PATCH] CronJob: switch storage version to batch/v1 in 1.22 --- pkg/kubeapiserver/default_storage_factory_builder.go | 2 -- test/integration/etcd/data.go | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pkg/kubeapiserver/default_storage_factory_builder.go b/pkg/kubeapiserver/default_storage_factory_builder.go index d19f6578953..31479d77646 100644 --- a/pkg/kubeapiserver/default_storage_factory_builder.go +++ b/pkg/kubeapiserver/default_storage_factory_builder.go @@ -28,7 +28,6 @@ import ( "k8s.io/apiserver/pkg/storage/storagebackend" "k8s.io/kubernetes/pkg/api/legacyscheme" "k8s.io/kubernetes/pkg/apis/apps" - "k8s.io/kubernetes/pkg/apis/batch" api "k8s.io/kubernetes/pkg/apis/core" "k8s.io/kubernetes/pkg/apis/events" "k8s.io/kubernetes/pkg/apis/extensions" @@ -62,7 +61,6 @@ func DefaultWatchCacheSizes() map[schema.GroupResource]int { func NewStorageFactoryConfig() *StorageFactoryConfig { resources := []schema.GroupVersionResource{ - batch.Resource("cronjobs").WithVersion("v1beta1"), apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"), } diff --git a/test/integration/etcd/data.go b/test/integration/etcd/data.go index 9b1813bd660..90b1e4bb733 100644 --- a/test/integration/etcd/data.go +++ b/test/integration/etcd/data.go @@ -155,9 +155,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("batch", "v1", "cronjobs"): { Stub: `{"metadata": {"name": "cjv1"}, "spec": {"jobTemplate": {"spec": {"template": {"metadata": {"labels": {"controller-uid": "uid0"}}, "spec": {"containers": [{"image": "` + image + `", "name": "container0"}], "dnsPolicy": "ClusterFirst", "restartPolicy": "Never"}}}}, "schedule": "* * * * *"}}`, ExpectedEtcdPath: "/registry/cronjobs/" + namespace + "/cjv1", - // TODO (soltysh): in 1.22 this should be switched to v1. See https://github.com/kubernetes/kubernetes/pull/98965 - // this has to stay at v1beta1 for a release, otherwise a 1.20 API server won't be able to read the data persisted in etcd and will break during a multi-server upgrade - ExpectedGVK: gvkP("batch", "v1beta1", "CronJob"), }, // -- @@ -165,6 +162,7 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes gvr("batch", "v1beta1", "cronjobs"): { Stub: `{"metadata": {"name": "cjv1beta1"}, "spec": {"jobTemplate": {"spec": {"template": {"metadata": {"labels": {"controller-uid": "uid0"}}, "spec": {"containers": [{"image": "` + image + `", "name": "container0"}], "dnsPolicy": "ClusterFirst", "restartPolicy": "Never"}}}}, "schedule": "* * * * *"}}`, ExpectedEtcdPath: "/registry/cronjobs/" + namespace + "/cjv1beta1", + ExpectedGVK: gvkP("batch", "v1", "CronJob"), }, // --