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

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. ```

Merge pull request #51159 from janetkuo/fed-apps-ds
c040fdd3 · Kubernetes Submit Queue · GitHub · 432790df · 1e80b79d · c040fdd3
Commit c040fdd3 authored Aug 24, 2017 by Kubernetes Submit Queue Committed by GitHub Aug 24, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

BUILD federation/cmd/federation-apiserver/app/BUILD +1 -0

server.go federation/cmd/federation-apiserver/app/server.go +7 -0

No files found.
--- a/federation/cmd/federation-apiserver/app/BUILD
+++ b/federation/cmd/federation-apiserver/app/BUILD
@@ -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",

--- a/federation/cmd/federation-apiserver/app/server.go
+++ b/federation/cmd/federation-apiserver/app/server.go
@@ -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
 }