Skip to content

Commit cb67da5

Browse files
yadvrshwstppr
andauthored
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 <rohit.yadav@shapeblue.com> * fix Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> Co-authored-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
1 parent 817c7c3 commit cb67da5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ write_files:
9393
### Binaries available offline ###
9494
echo "Installing binaries from ${BINARIES_DIR}"
9595
mkdir -p /opt/cni/bin
96-
tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz
96+
tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz
9797
9898
mkdir -p /opt/bin
99-
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz
99+
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz
100100
101101
mkdir -p /opt/bin
102102
cd /opt/bin

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ write_files:
113113
### Binaries available offline ###
114114
echo "Installing binaries from ${BINARIES_DIR}"
115115
mkdir -p /opt/cni/bin
116-
tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz
116+
tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz
117117
118118
mkdir -p /opt/bin
119-
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz
119+
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz
120120
121121
mkdir -p /opt/bin
122122
cd /opt/bin

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ write_files:
9393
### Binaries available offline ###
9494
echo "Installing binaries from ${BINARIES_DIR}"
9595
mkdir -p /opt/cni/bin
96-
tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz
96+
tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz
9797
9898
mkdir -p /opt/bin
99-
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz
99+
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz
100100
101101
mkdir -p /opt/bin
102102
cd /opt/bin

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ if [ -d "$BINARIES_DIR" ]; then
107107
cp "${BINARIES_DIR}/autoscaler.yaml" /opt/autoscaler/autoscaler_tmpl.yaml
108108
fi
109109

110-
tar -f "${BINARIES_DIR}/cni/cni-plugins-amd64.tgz" -C /opt/cni/bin -xz
111-
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-amd64.tar.gz" -C /opt/bin -xz
110+
tar -f "${BINARIES_DIR}/cni/cni-plugins-"*64.tgz -C /opt/cni/bin -xz
111+
tar -f "${BINARIES_DIR}/cri-tools/crictl-linux-"*64.tar.gz -C /opt/bin -xz
112112

113113
if [ "${IS_MAIN_CONTROL}" == 'true' ]; then
114114
set +e

0 commit comments

Comments
 (0)