refactored and update in-cluster CS controller incase of existing dep…

…loyment
GoogleCloudPlatform · Feb 12, 2025 · f8e82a2 · f8e82a2
1 parent 64eb7f8
commit f8e82a2
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 36 deletions.
diff --git a/asmcli/asmcli b/asmcli/asmcli
diff --git a/asmcli/commands/install.sh b/asmcli/commands/install.sh
@@ -92,25 +92,21 @@ apply_kube_yamls() {
   done
 }
 
-install_canonical_controller() {
-  info "Installing ASM CanonicalService controller in asm-system namespace..."
-  retry 3 kubectl apply -f "${CANONICAL_CONTROLLER_MANIFEST}"
-  info "Waiting for deployment..."
-  retry 3 kubectl wait --for=condition=available --timeout=600s \
-      deployment/canonical-service-controller-manager -n asm-system
-  info "...done!"
-}
-
-install_managed_canonical_controller() {
-  info "Installing managed canonical service controller..."
+verify_canonical_controller() {
   local IN_CLUSTER_CSC_DEP; IN_CLUSTER_CSC_DEP="$(kubectl get deployment/canonical-service-controller-manager \
-   -n asm-system --ignore-not-found=true || true)"
+    -n asm-system --ignore-not-found=true || true)"
   if [[ -z "$IN_CLUSTER_CSC_DEP" ]]; then
-    enable_service_mesh_feature
+    info "Checking Managed CanonicalService controller state..."
     check_managed_canonical_controller_state
   else
     warn "Kindly migrate to managed canonical service controller. Refer <DocLink  to be added>"
+    info "Updating ASM CanonicalService controller in asm-system namespace..."
+    retry 3 kubectl apply -f "${CANONICAL_CONTROLLER_MANIFEST}"
+    info "Waiting for deployment..."
+    retry 3 kubectl wait --for=condition=available --timeout=600s \
+      deployment/canonical-service-controller-manager -n asm-system
   fi
+  info "...done!"
 }
 
 install_fleet_api() {
@@ -278,5 +274,5 @@ install_control_plane() {
     if use_fleet_api; then install_fleet_api; else install_control_plane_revision; fi
   fi
 
-  install_managed_canonical_controller
+  verify_canonical_controller
 }
diff --git a/asmcli/commands/validate.sh b/asmcli/commands/validate.sh
@@ -50,9 +50,7 @@ validate_dependencies() {
       if ! is_stackdriver_enabled; then
         enable_stackdriver_kubernetes
       fi
-      if needs_service_mesh_feature; then
-        enable_service_mesh_feature
-      fi
+      enable_service_mesh_feature
       if [[ "${CA}" == "managed_cas" ]]; then
         x_wait_for_gke_hub_api_enablement
         x_enable_workload_certificate_on_fleet "gkehub.googleapis.com"
@@ -64,8 +62,9 @@ validate_dependencies() {
         exit_if_service_mesh_feature_not_enabled
       fi
     fi
+  else
+    enable_service_mesh_feature
   fi
-
   if can_register_cluster; then
     register_cluster
     exit_if_cluster_unregistered