changes applied

vmware-tanzu · Jun 2, 2022 · a2b1a3d · a2b1a3d
1 parent 7872d35
commit a2b1a3d
Show file tree

Hide file tree

Showing 2 changed files with 221 additions and 256 deletions.
diff --git a/agent/reconciler/host_reconciler.go b/agent/reconciler/host_reconciler.go
@@ -104,20 +104,6 @@ func (r *HostReconciler) reconcileNormal(ctx context.Context, byoHost *infrastru
 		return ctrl.Result{}, nil
 	}
 
-	if r.UseInstallerController && !conditions.IsTrue(byoHost, infrastructurev1beta1.K8sComponentsInstallationSucceeded) {
-		if byoHost.Spec.InstallationSecret == nil {
-			logger.Info("InstallationSecret not ready")
-			conditions.MarkFalse(byoHost, infrastructurev1beta1.K8sComponentsInstallationSucceeded, infrastructurev1beta1.K8sInstallationSecretUnavailableReason, clusterv1.ConditionSeverityInfo, "")
-			return ctrl.Result{}, nil
-		}
-		err := r.executeInstallerController(ctx, byoHost)
-		if err != nil {
-			return ctrl.Result{}, err
-		}
-		r.Recorder.Event(byoHost, corev1.EventTypeNormal, "InstallScriptExecutionSucceeded", "install script executed")
-		conditions.MarkTrue(byoHost, infrastructurev1beta1.K8sComponentsInstallationSucceeded)
-	}
-
 	if byoHost.Spec.BootstrapSecret == nil {
 		logger.Info("BootstrapDataSecret not ready")
 		conditions.MarkFalse(byoHost, infrastructurev1beta1.K8sNodeBootstrapSucceeded, infrastructurev1beta1.BootstrapDataSecretUnavailableReason, clusterv1.ConditionSeverityInfo, "")
@@ -134,7 +120,19 @@ func (r *HostReconciler) reconcileNormal(ctx context.Context, byoHost *infrastru
 
 		if r.SkipK8sInstallation {
 			logger.Info("Skipping installation of k8s components")
-		} else if !r.UseInstallerController {
+		} else if r.UseInstallerController {
+			if byoHost.Spec.InstallationSecret == nil {
+				logger.Info("InstallationSecret not ready")
+				conditions.MarkFalse(byoHost, infrastructurev1beta1.K8sComponentsInstallationSucceeded, infrastructurev1beta1.K8sInstallationSecretUnavailableReason, clusterv1.ConditionSeverityInfo, "")
+				return ctrl.Result{}, nil
+			}
+			err := r.executeInstallerController(ctx, byoHost)
+			if err != nil {
+				return ctrl.Result{}, err
+			}
+			r.Recorder.Event(byoHost, corev1.EventTypeNormal, "InstallScriptExecutionSucceeded", "install script executed")
+			conditions.MarkTrue(byoHost, infrastructurev1beta1.K8sComponentsInstallationSucceeded)
+		} else {
 			err = r.installK8sComponents(ctx, byoHost)
 			if err != nil {
 				logger.Error(err, "error in installing k8s components")