From 04c428cb2f7af7151f5f8ed9bf14e3f140be7ba4 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Fri, 27 Sep 2024 14:09:27 +0200
Subject: [PATCH] CKS: add ConfigDrive to cloud-init datasource_list in
 systemvm template (#7650)

* CKS: add ConfigDrive to cloud-init datasource_list in systemvm template

* systemvm template: update debian 11.7.0 iso url

* CKS: get K8S iso by LABEL=CDROM if config drive ISO is attached

* Revert "CKS: add ConfigDrive to cloud-init datasource_list in systemvm template"

This reverts commit b6863a5ce1b9757d7c5bbf3ba9720e2b61410c7d.

* CKS: patch cloud-init in opt/cloud/bin/setup/cksnode.sh

* PR7650: move ConfigDrive before CloudStack in datasource list

* Revert "CKS: patch cloud-init in opt/cloud/bin/setup/cksnode.sh"

This reverts commit 75be03c6aaf58e3939f59c657d84c6495538d3c2.

* CKS: fix ConfigDrive
---
 .../src/main/resources/conf/k8s-control-node-add.yml        | 2 +-
 .../src/main/resources/conf/k8s-control-node.yml            | 2 +-
 .../kubernetes-service/src/main/resources/conf/k8s-node.yml | 2 +-
 .../src/main/resources/script/upgrade-kubernetes.sh         | 2 +-
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh              | 6 ++++++
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml
index 429e2eff098..6819723b3f0 100644
--- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml
+++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml
@@ -66,7 +66,7 @@ write_files:
           break
         fi
         set +e
-        output=`blkid -o device -t TYPE=iso9660`
+        output=`blkid -o device -t LABEL=CDROM`
         set -e
         if [ "$output" != "" ]; then
           while read -r line; do
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml
index 4bc2c2c6d3e..90be8957d44 100644
--- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml
+++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml
@@ -86,7 +86,7 @@ write_files:
           break
         fi
         set +e
-        output=`blkid -o device -t TYPE=iso9660`
+        output=`blkid -o device -t LABEL=CDROM`
         set -e
         if [ "$output" != "" ]; then
           while read -r line; do
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
index ad5bb9d19a6..ac80e8576ff 100644
--- a/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
+++ b/plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
@@ -66,7 +66,7 @@ write_files:
           break
         fi
         set +e
-        output=`blkid -o device -t TYPE=iso9660`
+        output=`blkid -o device -t LABEL=CDROM`
         set -e
         if [ "$output" != "" ]; then
           while read -r line; do
diff --git a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
index c092f53359d..480b002ef17 100755
--- a/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
+++ b/plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
@@ -54,7 +54,7 @@ while true; do
     break
   fi
   set +e
-  output=`blkid -o device -t TYPE=iso9660`
+  output=`blkid -o device -t LABEL=CDROM`
   set -e
   if [ "$output" != "" ]; then
     while read -r line; do
diff --git a/systemvm/debian/opt/cloud/bin/setup/cksnode.sh b/systemvm/debian/opt/cloud/bin/setup/cksnode.sh
index aa5d466c96a..e1541f6d0bd 100755
--- a/systemvm/debian/opt/cloud/bin/setup/cksnode.sh
+++ b/systemvm/debian/opt/cloud/bin/setup/cksnode.sh
@@ -59,6 +59,12 @@ setup_k8s_node() {
 
     rm -f /etc/logrotate.d/cloud
 
+    # Enable cloud-init without any aid from ds-identify
+    echo "policy: enabled" >  /etc/cloud/ds-identify.cfg
+
+    # Add ConfigDrive to datasource_list
+    sed -i "s/datasource_list: .*/datasource_list: ['ConfigDrive', 'CloudStack']/g" /etc/cloud/cloud.cfg.d/cloudstack.cfg
+
     log_it "Starting cloud-init services"
     systemctl enable --now --no-block containerd
     if [ -f /home/cloud/success ]; then