From 704a939c65d64444f84d44b59e63255f81eb5922 Mon Sep 17 00:00:00 2001 From: David Jumani Date: Mon, 14 Mar 2022 22:37:34 +0530 Subject: [PATCH] cks: Fix missing .service files when bootstraping in cks (#6076) * cks: Run 'systemctl daemon-reload' before setting up k8s * add wait till service files exists --- .../src/main/resources/conf/k8s-control-node-add.yml | 9 ++++++--- .../src/main/resources/conf/k8s-control-node.yml | 9 ++++++--- .../src/main/resources/conf/k8s-node.yml | 9 ++++++--- 3 files changed, 18 insertions(+), 9 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 3156f378674..89138a58d08 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 @@ -220,15 +220,15 @@ write_files: owner: root:root content: | #!/bin/bash -e - + export registryConfig="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"{{registry.url.endpoint}}\"]\n \\ endpoint = [\"{{registry.url}}\"]" export registryCredentials="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.configs.\"{{registry.url.endpoint}}\".auth]\n\tusername = \"{{registry.username}}\" \n\tpassword = \"{{registry.password}}\" \n\tidentitytoken = \"{{registry.token}}\"" - + echo "creating config file for containerd" containerd config default > /etc/containerd/config.toml sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry\]/a '"${registryCredentials}"'' /etc/containerd/config.toml sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry.mirrors\]/a '"${registryConfig}"'' /etc/containerd/config.toml - + echo "Restarting containerd service" systemctl restart containerd @@ -263,7 +263,10 @@ runcmd: - chown -R cloud:cloud /home/cloud/.ssh - containerd config default > /etc/containerd/config.toml - sed -i '/\[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options\]/a '"\\ SystemdCgroup=true"'' /etc/containerd/config.toml + - systemctl daemon-reload - systemctl restart containerd + - until [ -f /etc/systemd/system/deploy-kube-system.service ]; do sleep 5; done + - until [ -f /etc/systemd/system/setup-kube-system.service ]; do sleep 5; done - [ systemctl, start, setup-kube-system ] - [ systemctl, start, deploy-kube-system ] 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 4dcaf496072..d7a63048a65 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 @@ -277,15 +277,15 @@ write_files: owner: root:root content: | #!/bin/bash -e - + export registryConfig="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"{{registry.url.endpoint}}\"]\n \\ endpoint = [\"{{registry.url}}\"]" export registryCredentials="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.configs.\"{{registry.url.endpoint}}\".auth]\n\tusername = \"{{registry.username}}\" \n\tpassword = \"{{registry.password}}\" \n\tidentitytoken = \"{{registry.token}}\"" - + echo "creating config file for containerd" containerd config default > /etc/containerd/config.toml sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry\]/a '"${registryCredentials}"'' /etc/containerd/config.toml sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry.mirrors\]/a '"${registryConfig}"'' /etc/containerd/config.toml - + echo "Restarting containerd service" systemctl restart containerd @@ -321,7 +321,10 @@ runcmd: - chown -R cloud:cloud /home/cloud/.ssh - containerd config default > /etc/containerd/config.toml - sed -i '/\[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options\]/a '"\\ SystemdCgroup=true"'' /etc/containerd/config.toml + - systemctl daemon-reload - systemctl restart containerd + - until [ -f /etc/systemd/system/deploy-kube-system.service ]; do sleep 5; done + - until [ -f /etc/systemd/system/setup-kube-system.service ]; do sleep 5; done - [ systemctl, start, setup-kube-system ] - [ systemctl, start, deploy-kube-system ] 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 eedc1d0c8c8..d253f3e2780 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 @@ -220,15 +220,15 @@ write_files: owner: root:root content: | #!/bin/bash -e - + export registryConfig="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.mirrors.\"{{registry.url.endpoint}}\"]\n \\ endpoint = [\"{{registry.url}}\"]" export registryCredentials="\\ [plugins.\"io.containerd.grpc.v1.cri\".registry.configs.\"{{registry.url.endpoint}}\".auth]\n\tusername = \"{{registry.username}}\" \n\tpassword = \"{{registry.password}}\" \n\tidentitytoken = \"{{registry.token}}\"" - + echo "creating config file for containerd" containerd config default > /etc/containerd/config.toml sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry\]/a '"${registryCredentials}"'' /etc/containerd/config.toml sed -i '/\[plugins."io.containerd.grpc.v1.cri".registry.mirrors\]/a '"${registryConfig}"'' /etc/containerd/config.toml - + echo "Restarting containerd service" systemctl restart containerd @@ -263,6 +263,9 @@ runcmd: - chown -R cloud:cloud /home/cloud/.ssh - containerd config default > /etc/containerd/config.toml - sed -i '/\[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options\]/a '"\\ SystemdCgroup=true"'' /etc/containerd/config.toml + - systemctl daemon-reload - systemctl restart containerd + - until [ -f /etc/systemd/system/deploy-kube-system.service ]; do sleep 5; done + - until [ -f /etc/systemd/system/setup-kube-system.service ]; do sleep 5; done - [ systemctl, start, setup-kube-system ] - [ systemctl, start, deploy-kube-system ]