Move user controllers to agent

pkg/agent/cluster/controllers.go

@@ -0,0 +1,35 @@
+package cluster
+
+import (
+	"context"
+
+	clusterController "github.com/rancher/rancher/pkg/controllers/user"
+	"github.com/rancher/types/config"
+	"github.com/sirupsen/logrus"
+	"k8s.io/client-go/rest"
+)
+
+func RunControllers() error {
+	logrus.Info("Starting user controllers")
+	c, err := rest.InClusterConfig()
+	if err != nil {
+		return err
+	}
+
+	userOnly, err := config.NewUserOnlyContext(*c)
+	if err != nil {
+		return err
+	}
+
+	err = clusterController.RegisterUserOnly(context.Background(), userOnly)
+	if err != nil {
+		return err
+	}
+
+	err = userOnly.Start(context.Background())
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

pkg/agent/main.go

@@ -171,6 +171,10 @@ func run() error {
 		}
 
 		if isCluster() {
+			err = cluster.RunControllers()
+			if err != nil {
+				logrus.Fatal(err)
+			}
 			return nil
 		}
 

pkg/controllers/user/controllers.go

@@ -27,6 +27,7 @@ import (
 	"github.com/rancher/rancher/pkg/controllers/user/targetworkloadservice"
 	"github.com/rancher/rancher/pkg/controllers/user/workload"
 	"github.com/rancher/types/config"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	// init upgrade implement
 	_ "github.com/rancher/rancher/pkg/controllers/user/alert/upgrade"
@@ -57,12 +58,19 @@ func Register(ctx context.Context, cluster *config.UserContext, kubeConfigGetter
 	resourcequota.Register(ctx, cluster)
 
 	userOnlyContext := cluster.UserOnlyContext()
-	dnsrecord.Register(ctx, userOnlyContext)
-	externalservice.Register(ctx, userOnlyContext)
 	ingress.Register(ctx, userOnlyContext, cluster)
-	ingresshostgen.Register(userOnlyContext)
-	targetworkloadservice.Register(ctx, userOnlyContext)
-	workload.Register(ctx, userOnlyContext)
+
+	c, err := cluster.Management.Management.Clusters("").Get(cluster.ClusterName, metav1.GetOptions{})
+	if err != nil {
+		return err
+	}
+
+	if c.Spec.Internal {
+		err = RegisterUserOnly(ctx, userOnlyContext)
+		if err != nil {
+			return err
+		}
+	}
 
 	return nil
 }
@@ -73,3 +81,12 @@ func RegisterFollower(ctx context.Context, cluster *config.UserContext, kubeConf
 	cluster.RBAC.RoleBindings("").Controller()
 	return nil
 }
+
+func RegisterUserOnly(ctx context.Context, cluster *config.UserOnlyContext) error {
+	dnsrecord.Register(ctx, cluster)
+	externalservice.Register(ctx, cluster)
+	ingresshostgen.Register(cluster)
+	targetworkloadservice.Register(ctx, cluster)
+	workload.Register(ctx, cluster)
+	return nil
+}

vendor.conf

@@ -37,7 +37,7 @@ github.com/smartystreets/go-aws-auth          8ef1316913ee4f44bc48c2456e44a5c1c6
 github.com/mcuadros/go-version                6d5863ca60fa6fe914b5fd43ed8533d7567c5b0b
 
 github.com/rancher/rdns-server                bf662911db6acce4d6a85d2878653f68413b9176
-github.com/rancher/types                      52df5bbb83f3271986a9f781778d1657cc288d3d
+github.com/rancher/types                      006bf1d436540f6725b95988c2bdd21c7f891c3c
 
 
 github.com/rancher/norman                     ad4865987ce75d8d012441478e193eaaa1e1078f