[controller] Add resource CSIDriver with new provisioner, remove reso…

…urce CSIDriver with old provisioner, and implement additional kubelet restart (#163) Signed-off-by: v.oleynikov <[email protected]> Signed-off-by: Aleksandr Zimin <[email protected]> Co-authored-by: Aleksandr Zimin <[email protected]>
deckhouse · Aug 15, 2024 · 33261de · 33261de
1 parent 94c9ba6
commit 33261de
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/hooks/migrate_csi_endpoint.sh b/hooks/migrate_csi_endpoint.sh
@@ -122,6 +122,12 @@ run_trigger() {
  exit 1
  fi
 
+ if kubectl delete csidriver ${OLD_DRIVER_NAME} > /dev/null 2>&1; then
+ echo "CSIDriver ${OLD_DRIVER_NAME} deleted"
+ else
+ echo "CSIDriver ${OLD_DRIVER_NAME} does not exist. Skipping deletion"
+ fi
+
  values::set sdsReplicatedVolume.internal.csiMigrationHook.completed "true"
  exit 0
 }

diff --git a/templates/linstor-csi/csidriver.yaml b/templates/linstor-csi/csidriver.yaml
@@ -0,0 +1,13 @@
+apiVersion: storage.k8s.io/v1
+kind: CSIDriver
+metadata:
+ name: replicated.csi.storage.deckhouse.io
+spec:
+ attachRequired: true
+ fsGroupPolicy: ReadWriteOnceWithFSType
+ podInfoOnMount: true
+ requiresRepublish: false
+ seLinuxMount: true
+ storageCapacity: true
+ volumeLifecycleModes:
+ - Persistent
diff --git a/templates/nodegroupconfiguration-restart-kubelet.yaml b/templates/nodegroupconfiguration-restart-kubelet.yaml
@@ -38,6 +38,13 @@ spec:
  if [ "$is_kubelet_restart_needed" = "true" ]; then
  echo "Kubelet restart is needed. Restarting kubelet."
  systemctl restart kubelet
+
+ echo "Sleeping for 180 seconds before restarting kubelet again."
+ sleep 180
+
+ echo "Restarting kubelet again."
+ systemctl restart kubelet
+
  bb-kubectl --kubeconfig $kubeconfig label node "$(hostname -s)" "$LABEL_KEY"-
  else
  echo "Kubelet restart is not needed. Exiting."