This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new cb67da5 cks: refactor code to be architecture agnostic (#5629)
cb67da5 is described below
commit cb67da5bceb7650613f2a629c1e6450123479ea7
Author: Rohit Yadav <[email protected]>
AuthorDate: Fri Oct 29 23:45:34 2021 +0530
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 <[email protected]>
* fix
Signed-off-by: Abhishek Kumar <[email protected]>
Co-authored-by: Abhishek Kumar <[email protected]>
---
.../src/main/resources/conf/k8s-control-node-add.yml | 4 ++--
.../kubernetes-service/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 bea272b..0891d20 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 df74223..322f080 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 97e4160..28ba43e 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 cbec828..7e0c3c0 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
