github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-15 06:43:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #40083 from soltysh/remove_extjobs

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 40405, 38601, 40083, 40730)

Remove extensions/v1beta1.Jobs leftover

It looks like I missed this one file when removing `extensions/v1beta1.Jobs` last time (#38614).

@caesarxuchao ptal, since you were reviewing last time
@kubernetes/sig-api-machinery-misc fyi
This commit is contained in:
Kubernetes Submit Queue 2017-01-31 04:44:43 -08:00 committed by GitHub
commit 3e81148c55
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/registry/extensions/rest/BUILD
View File

@ -23,7 +23,6 @@ go_library(
"//pkg/genericapiserver/registry/rest:go_default_library", "//pkg/genericapiserver/registry/rest:go_default_library",
"//pkg/genericapiserver/server:go_default_library", "//pkg/genericapiserver/server:go_default_library",
"//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library", "//pkg/registry/autoscaling/horizontalpodautoscaler/storage:go_default_library",
"//pkg/registry/batch/job/storage:go_default_library",
"//pkg/registry/extensions/controller/storage:go_default_library", "//pkg/registry/extensions/controller/storage:go_default_library",
"//pkg/registry/extensions/daemonset/storage:go_default_library", "//pkg/registry/extensions/daemonset/storage:go_default_library",
"//pkg/registry/extensions/deployment/storage:go_default_library", "//pkg/registry/extensions/deployment/storage:go_default_library",

6
pkg/registry/extensions/rest/storage_extensions.go
View File

@ -31,7 +31,6 @@ import (
"k8s.io/kubernetes/pkg/genericapiserver/registry/rest" "k8s.io/kubernetes/pkg/genericapiserver/registry/rest"
genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server" genericapiserver "k8s.io/kubernetes/pkg/genericapiserver/server"
horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage" horizontalpodautoscalerstore "k8s.io/kubernetes/pkg/registry/autoscaling/horizontalpodautoscaler/storage"
jobstore "k8s.io/kubernetes/pkg/registry/batch/job/storage"
expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage" expcontrollerstore "k8s.io/kubernetes/pkg/registry/extensions/controller/storage"
daemonstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage" daemonstore "k8s.io/kubernetes/pkg/registry/extensions/daemonset/storage"
deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage" deploymentstore "k8s.io/kubernetes/pkg/registry/extensions/deployment/storage"
@ -88,11 +87,6 @@ func (p RESTStorageProvider) v1beta1Storage(apiResourceConfigSource genericapise
storage["deployments/rollback"] = deploymentStorage.Rollback storage["deployments/rollback"] = deploymentStorage.Rollback
storage["deployments/scale"] = deploymentStorage.Scale storage["deployments/scale"] = deploymentStorage.Scale
} }
if apiResourceConfigSource.ResourceEnabled(version.WithResource("jobs")) {
jobsStorage, jobsStatusStorage := jobstore.NewREST(restOptionsGetter)
storage["jobs"] = jobsStorage
storage["jobs/status"] = jobsStatusStorage
}
if apiResourceConfigSource.ResourceEnabled(version.WithResource("ingresses")) { if apiResourceConfigSource.ResourceEnabled(version.WithResource("ingresses")) {
ingressStorage, ingressStatusStorage := ingressstore.NewREST(restOptionsGetter) ingressStorage, ingressStatusStorage := ingressstore.NewREST(restOptionsGetter)
storage["ingresses"] = ingressStorage storage["ingresses"] = ingressStorage