From 1e80b79d534c490ba0792dd4dc6300587c0044e3 Mon Sep 17 00:00:00 2001 From: Janet Kuo Date: Tue, 22 Aug 2017 17:16:07 -0700 Subject: [PATCH] Enable apps/v1beta2 Deployment, ReplicaSet, DaemonSet in federation --- federation/cmd/federation-apiserver/app/BUILD | 1 + federation/cmd/federation-apiserver/app/server.go | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/federation/cmd/federation-apiserver/app/BUILD b/federation/cmd/federation-apiserver/app/BUILD index 1b7fd40efb3..1b43b5d4833 100644 --- 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", diff --git a/federation/cmd/federation-apiserver/app/server.go b/federation/cmd/federation-apiserver/app/server.go index fd169f7471b..9f25c9a8bcd 100644 --- 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 }