Merge pull request #89 from ibuildthecloud/master

Various fixes
rancher · Sep 17, 2020 · c011cd1 · c011cd1
2 parents 78ac907 + 086fbf1
commit c011cd1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 11 deletions.
diff --git a/modules/agent/pkg/register/register.go b/modules/agent/pkg/register/register.go
@@ -82,6 +82,7 @@ func tryRegister(ctx context.Context, namespace, clusterID string, config *rest.
 	} else if err != nil {
 		return nil, err
 	} else if err := testClientConfig(ctx, secret.Data[Kubeconfig]); err != nil {
+		logrus.Errorf("Current credential failed, failing back to reregistering: %v", err)
 		secret, err = runRegistration(ctx, k8s.Core().V1(), namespace, clusterID)
 		if err != nil {
 			return nil, fmt.Errorf("looking up secret %s/%s or %s/%s: %w", namespace, BootstrapCredName, namespace, CredName, err)

diff --git a/pkg/bundle/read.go b/pkg/bundle/read.go
@@ -113,7 +113,7 @@ func read(ctx context.Context, name, baseDir string, bundleSpecReader io.Reader,
 	}
 
 	bundle := &localSpec{}
-	if err := yaml.Unmarshal(bytes, &bundle); err != nil {
+	if err := yaml.Unmarshal(bytes, bundle); err != nil {
 		return nil, err
 	}
 	bundle.BundleSpec.Targets = append(bundle.BundleSpec.Targets, bundle.TargetCustomizations...)

diff --git a/pkg/controllers/cleanup/handler.go b/pkg/controllers/cleanup/handler.go
@@ -26,10 +26,6 @@ func Register(ctx context.Context, apply apply.Apply,
 	roleBinding rbaccontrollers.RoleBindingController,
 	clusterRole rbaccontrollers.ClusterRoleController,
 	clusterRoleBinding rbaccontrollers.ClusterRoleBindingController,
-	clusterRegistrationToken fleetcontrollers.ClusterRegistrationTokenController,
-	clusterRegistration fleetcontrollers.ClusterRegistrationController,
-	clusterGroups fleetcontrollers.ClusterGroupController,
-	clusters fleetcontrollers.ClusterController,
 	namespaces corecontrollers.NamespaceController) {
 	h := &handler{
 		apply: apply,

diff --git a/pkg/controllers/clusterregistration/controller.go b/pkg/controllers/clusterregistration/controller.go
@@ -159,11 +159,14 @@ func (h *handler) OnChange(request *fleet.ClusterRegistration, status fleet.Clus
 		} else if secret != nil {
 			status.Granted = true
 			objects = append(objects, secret)
-		} else {
-			h.clusterRegistration.EnqueueAfter(request.Namespace, request.Name, 2*time.Second)
 		}
 	}
 
+	if !status.Granted {
+		// try again 2 seconds later
+		h.clusterRegistration.EnqueueAfter(request.Namespace, request.Name, 2*time.Second)
+	}
+
 	status.ClusterName = cluster.Name
 	return append(objects,
 		&v1.ServiceAccount{

diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go
@@ -161,10 +161,6 @@ func Register(ctx context.Context, systemNamespace string, cfg clientcmd.ClientC
 		appCtx.RBAC.RoleBinding(),
 		appCtx.RBAC.ClusterRole(),
 		appCtx.RBAC.ClusterRoleBinding(),
-		appCtx.ClusterRegistrationToken(),
-		appCtx.ClusterRegistration(),
-		appCtx.ClusterGroup(),
-		appCtx.Cluster(),
 		appCtx.Core.Namespace())
 
 	manageagent.Register(ctx,