mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-22 19:31:44 +00:00
Merge pull request #102363 from mengjiao-liu/promote-cronjob-batchv1-storage
CronJob: switch storage version to batch/v1 in 1.22
This commit is contained in:
commit
a5b117fab4
@ -28,7 +28,6 @@ import (
|
|||||||
"k8s.io/apiserver/pkg/storage/storagebackend"
|
"k8s.io/apiserver/pkg/storage/storagebackend"
|
||||||
"k8s.io/kubernetes/pkg/api/legacyscheme"
|
"k8s.io/kubernetes/pkg/api/legacyscheme"
|
||||||
"k8s.io/kubernetes/pkg/apis/apps"
|
"k8s.io/kubernetes/pkg/apis/apps"
|
||||||
"k8s.io/kubernetes/pkg/apis/batch"
|
|
||||||
api "k8s.io/kubernetes/pkg/apis/core"
|
api "k8s.io/kubernetes/pkg/apis/core"
|
||||||
"k8s.io/kubernetes/pkg/apis/events"
|
"k8s.io/kubernetes/pkg/apis/events"
|
||||||
"k8s.io/kubernetes/pkg/apis/extensions"
|
"k8s.io/kubernetes/pkg/apis/extensions"
|
||||||
@ -62,7 +61,6 @@ func DefaultWatchCacheSizes() map[schema.GroupResource]int {
|
|||||||
func NewStorageFactoryConfig() *StorageFactoryConfig {
|
func NewStorageFactoryConfig() *StorageFactoryConfig {
|
||||||
|
|
||||||
resources := []schema.GroupVersionResource{
|
resources := []schema.GroupVersionResource{
|
||||||
batch.Resource("cronjobs").WithVersion("v1beta1"),
|
|
||||||
apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"),
|
apisstorage.Resource("csistoragecapacities").WithVersion("v1beta1"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -155,9 +155,6 @@ func GetEtcdStorageDataForNamespace(namespace string) map[schema.GroupVersionRes
|
|||||||
gvr("batch", "v1", "cronjobs"): {
|
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": "* * * * *"}}`,
|
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",
|
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"): {
|
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": "* * * * *"}}`,
|
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",
|
ExpectedEtcdPath: "/registry/cronjobs/" + namespace + "/cjv1beta1",
|
||||||
|
ExpectedGVK: gvkP("batch", "v1", "CronJob"),
|
||||||
},
|
},
|
||||||
// --
|
// --
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user