Re-initialize dynamic client to drop CRD cache

see: kubernetes-sigs/controller-runtime#321

pkg/templates/canal/canal.go

@@ -119,6 +119,12 @@ func Deploy(ctx *util.Context) error {
 		}
 	}
 
+	// HACK: re-init dynamic client in order to re-init RestMapper, to drop caches
+	err = util.HackIssue321InitDynamicClient(ctx)
+	if err != nil {
+		return errors.Wrap(err, "failed to re-init dynamic client")
+	}
+
 	// ClusterRoles
 	crGenerators := []func() *rbacv1.ClusterRole{
 		calicoClusterRole,

pkg/templates/machinecontroller/deployment.go

@@ -128,7 +128,9 @@ func Deploy(ctx *util.Context) error {
 		}
 	}
 
-	return nil
+	// HACK: re-init dynamic client in order to re-init RestMapper, to drop caches
+	err = util.HackIssue321InitDynamicClient(ctx)
+	return errors.Wrap(err, "failed to re-init dynamic client")
 }
 
 // WaitForMachineController waits for machine-controller-webhook to become running

pkg/util/kubeconfig.go

@@ -60,10 +60,18 @@ func BuildKubernetesClientset(ctx *Context) error {
 		return errors.Wrap(err, "unable to build apiextension-apiserver clientset")
 	}
 
-	ctx.DynamicClient, err = client.New(ctx.RESTConfig, client.Options{})
-	if err != nil {
-		return errors.Wrap(err, "unable to build dynamic client")
+	err = HackIssue321InitDynamicClient(ctx)
+	return errors.Wrap(err, "unable to build dynamic client")
+}
+
+// HackIssue321InitDynamicClient initialize controller-runtime/client
+// name comes from: https://github.com/kubernetes-sigs/controller-runtime/issues/321
+func HackIssue321InitDynamicClient(ctx *Context) error {
+	if ctx.RESTConfig == nil {
+		return errors.New("rest config is not initialized")
 	}
 
-	return nil
+	var err error
+	ctx.DynamicClient, err = client.New(ctx.RESTConfig, client.Options{})
+	return errors.Wrap(err, "unable to build dynamic client")
 }