github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #51159 from janetkuo/fed-apps-ds

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 50713, 47660, 51198, 51159, 51195)

Enable apps/v1beta2 Deployment, ReplicaSet, DaemonSet in federation

Fixes #50641
@kubernetes/sig-apps-pr-reviews @kubernetes/sig-federation-pr-reviews 

**Release note**:
```release-note
Federation now supports apps/v1beta2. 
```
This commit is contained in:
Kubernetes Submit Queue 2017-08-24 11:17:11 -07:00 committed by GitHub
commit c040fdd363
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
federation/cmd/federation-apiserver/app/BUILD
View File

@ -66,6 +66,7 @@ go_library(
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/spf13/cobra:go_default_library",
"//vendor/github.com/spf13/pflag:go_default_library",
"//vendor/k8s.io/api/apps/v1beta2:go_default_library",
"//vendor/k8s.io/api/autoscaling/v1:go_default_library",
"//vendor/k8s.io/api/batch/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",

7
federation/cmd/federation-apiserver/app/server.go
View File

@ -30,6 +30,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
appsv1beta2 "k8s.io/api/apps/v1beta2"
apiv1 "k8s.io/api/core/v1"
extensionsapiv1beta1 "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/runtime/schema"
@ -286,6 +287,12 @@ func defaultResourceConfig() *serverstorage.ResourceConfig {
extensionsapiv1beta1.SchemeGroupVersion.WithResource("ingresses"),
extensionsapiv1beta1.SchemeGroupVersion.WithResource("replicasets"),
)
// All apps resources except these are disabled by default.
rc.EnableResources(
appsv1beta2.SchemeGroupVersion.WithResource("daemonsets"),
appsv1beta2.SchemeGroupVersion.WithResource("deployments"),
appsv1beta2.SchemeGroupVersion.WithResource("replicasets"),
)
return rc
}