From cb67da5bceb7650613f2a629c1e6450123479ea7 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 29 Oct 2021 23:45:34 +0530 Subject: [PATCH] cks: refactor code to be architecture agnostic (#5629) * cks: refactor code to be architecture agnostic This makes the CKS setup/install/upgrades architecture agnostic and works on both amd64 and arm64 platforms. Signed-off-by: Rohit Yadav * fix Signed-off-by: Abhishek Kumar Co-authored-by: Abhishek Kumar --- .../src/main/resources/conf/k8s-control-node-add.yml | 4 ++-- .../src/main/resources/conf/k8s-control-node.yml | 4 ++-- .../kubernetes-service/src/main/resources/conf/k8s-node.yml | 4 ++-- .../src/main/resources/script/upgrade-kubernetes.sh | 4 ++-- 4 files changed, 8 insertions(+), 8 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 bea272b691f..0891d2015b3 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 @@ -93,10 +93,10 @@ write_files: ### Binaries available offline ### echo "Installing binaries from ${BINARIES_DIR}" mkdir -p /opt/cni/bin - tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz + tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz mkdir -p /opt/bin - tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz + tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz mkdir -p /opt/bin cd /opt/bin 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 df742231a43..322f08099cf 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 @@ -113,10 +113,10 @@ write_files: ### Binaries available offline ### echo "Installing binaries from ${BINARIES_DIR}" mkdir -p /opt/cni/bin - tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz + tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz mkdir -p /opt/bin - tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz + tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz mkdir -p /opt/bin cd /opt/bin 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 97e4160d414..28ba43e7584 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 @@ -93,10 +93,10 @@ write_files: ### Binaries available offline ### echo "Installing binaries from ${BINARIES_DIR}" mkdir -p /opt/cni/bin - tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz + tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz mkdir -p /opt/bin - tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz + tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz mkdir -p /opt/bin cd /opt/bin 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 cbec8282c3a..7e0c3c00a8a 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 @@ -107,8 +107,8 @@ if [ -d "$BINARIES_DIR" ]; then cp "${BINARIES_DIR}/autoscaler.yaml" /opt/autoscaler/autoscaler_tmpl.yaml fi - tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz - tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz + tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz + tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz if [ "${IS_MAIN_CONTROL}" == 'true' ]; then set +e