Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
+10 −4
Open

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

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
b6863a5
CKS: add ConfigDrive to cloud-init datasource_list in systemvm template
weizhouapache Jun 19, 2023
7be3ffe
systemvm template: update debian 11.7.0 iso url
weizhouapache Jun 19, 2023
726a0a7
CKS: get K8S iso by LABEL=CDROM if config drive ISO is attached
weizhouapache Jun 19, 2023
c7b233d
Merge branch '4.18' into 4.18-add-ConfigDrive-datasource
weizhouapache Aug 11, 2023
1ea3f82
Merge remote-tracking branch 'apache/4.18' into HEAD
weizhouapache Aug 11, 2023
91dca14
Revert "CKS: add ConfigDrive to cloud-init datasource_list in systemv…
weizhouapache Aug 11, 2023
75be03c
CKS: patch cloud-init in opt/cloud/bin/setup/cksnode.sh
weizhouapache Aug 11, 2023
35ba3bc
Merge remote-tracking branch 'apache/4.18' into 4.18-add-ConfigDrive-…
weizhouapache Aug 15, 2023
b3d0f04
PR7650: move ConfigDrive before CloudStack in datasource list
weizhouapache Aug 15, 2023
74d34bf
Revert "CKS: patch cloud-init in opt/cloud/bin/setup/cksnode.sh"
weizhouapache Feb 15, 2024
dd2ebf4
CKS: fix ConfigDrive
weizhouapache Feb 15, 2024
98bcfe4
Merge remote-tracking branch 'apache/4.18' into 4.18-add-ConfigDrive-…
weizhouapache Feb 15, 2024
7fce265
Merge remote-tracking branch 'apache/main' into 4.18-add-ConfigDrive-…
weizhouapache Mar 12, 2024
eb1b7b7
Merge branch 'main' into 4.18-add-ConfigDrive-datasource
weizhouapache Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node-add.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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
Expand Down
2 changes: 1 addition & 1 deletion plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-control-node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,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
Expand Down
2 changes: 1 addition & 1 deletion plugins/integrations/kubernetes-service/src/main/resources/conf/k8s-node.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,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
Expand Down
2 changes: 1 addition & 1 deletion plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 8 additions & 1 deletion systemvm/debian/opt/cloud/bin/setup/cksnode.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ setup_k8s_node() {

rm -f /etc/logrotate.d/cloud

log_it "Patching cloud-init and configuration"
if [ -f /usr/lib/cloud-init/ds-identify ];then
# see PR https://github.com/canonical/cloud-init/pull/4281
sed -i 's/dscheck_CloudStack() {/&\n if [ "$DI_VIRT" = "vmware" ] || [ "$DI_VIRT" = "xen" ]; then return $DS_MAYBE; fi/g' /usr/lib/cloud-init/ds-identify
fi
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
Expand All @@ -71,4 +78,4 @@ setup_k8s_node() {
fi
}

setup_k8s_node
setup_k8s_node
Loading