Skip to content

Commit 04c428c

Browse files
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 b6863a5. * 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 75be03c. * CKS: fix ConfigDrive
1 parent bf2cede commit 04c428c

File tree

5 files changed

+10
-4
lines changed

5 files changed

+10
-4
lines changed

plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ write_files:
6666
break
6767
fi
6868
set +e
69-
output=`blkid -o device -t TYPE=iso9660`
69+
output=`blkid -o device -t LABEL=CDROM`
7070
set -e
7171
if [ "$output" != "" ]; then
7272
while read -r line; do

plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ write_files:
8686
break
8787
fi
8888
set +e
89-
output=`blkid -o device -t TYPE=iso9660`
89+
output=`blkid -o device -t LABEL=CDROM`
9090
set -e
9191
if [ "$output" != "" ]; then
9292
while read -r line; do

plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ write_files:
6666
break
6767
fi
6868
set +e
69-
output=`blkid -o device -t TYPE=iso9660`
69+
output=`blkid -o device -t LABEL=CDROM`
7070
set -e
7171
if [ "$output" != "" ]; then
7272
while read -r line; do

plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ while true; do
5454
break
5555
fi
5656
set +e
57-
output=`blkid -o device -t TYPE=iso9660`
57+
output=`blkid -o device -t LABEL=CDROM`
5858
set -e
5959
if [ "$output" != "" ]; then
6060
while read -r line; do

systemvm/debian/opt/cloud/bin/setup/cksnode.sh

+6
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ setup_k8s_node() {
5959

6060
rm -f /etc/logrotate.d/cloud
6161

62+
# Enable cloud-init without any aid from ds-identify
63+
echo "policy: enabled" > /etc/cloud/ds-identify.cfg
64+
65+
# Add ConfigDrive to datasource_list
66+
sed -i "s/datasource_list: .*/datasource_list: ['ConfigDrive', 'CloudStack']/g" /etc/cloud/cloud.cfg.d/cloudstack.cfg
67+
6268
log_it "Starting cloud-init services"
6369
systemctl enable --now --no-block containerd
6470
if [ -f /home/cloud/success ]; then

0 commit comments

Comments
 (0)