Fix k3s binary perms

Signed-off-by: Atanas Dinov <[email protected]>
suse-edge · Mar 27, 2024 · 1d570fc · 1d570fc
1 parent de7244b
commit 1d570fc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/pkg/combustion/kubernetes_test.go b/pkg/combustion/kubernetes_test.go
@@ -211,7 +211,7 @@ func TestConfigureKubernetes_SuccessfulSingleNodeK3sCluster(t *testing.T) {
 	assert.Contains(t, contents, "export INSTALL_K3S_SKIP_DOWNLOAD=true")
 	assert.Contains(t, contents, "export INSTALL_K3S_SKIP_START=true")
 	assert.Contains(t, contents, "export INSTALL_K3S_BIN_DIR=/opt/bin")
-	assert.Contains(t, contents, "chmod +x $ARTEFACTS_DIR/kubernetes/install/cool-k3s-binary")
+	assert.Contains(t, contents, "chmod +x $INSTALL_K3S_BIN_DIR/k3s")
 	assert.Contains(t, contents, "cp $ARTEFACTS_DIR/kubernetes/install/cool-k3s-binary $INSTALL_K3S_BIN_DIR/k3s")
 	assert.Contains(t, contents, "sh $ARTEFACTS_DIR/kubernetes/install-kubernetes.sh")
 
@@ -308,7 +308,7 @@ func TestConfigureKubernetes_SuccessfulMultiNodeK3sCluster(t *testing.T) {
 	assert.Contains(t, contents, "export INSTALL_K3S_SKIP_DOWNLOAD=true")
 	assert.Contains(t, contents, "export INSTALL_K3S_SKIP_START=true")
 	assert.Contains(t, contents, "export INSTALL_K3S_BIN_DIR=/opt/bin")
-	assert.Contains(t, contents, "chmod +x $ARTEFACTS_DIR/kubernetes/install/cool-k3s-binary")
+	assert.Contains(t, contents, "chmod +x $INSTALL_K3S_BIN_DIR/k3s")
 	assert.Contains(t, contents, "cp $ARTEFACTS_DIR/kubernetes/install/cool-k3s-binary $INSTALL_K3S_BIN_DIR/k3s")
 	assert.Contains(t, contents, "sh $ARTEFACTS_DIR/kubernetes/install-kubernetes.sh")
 

diff --git a/pkg/combustion/templates/k3s-multi-node-installer.sh.tpl b/pkg/combustion/templates/k3s-multi-node-installer.sh.tpl
@@ -54,7 +54,7 @@ export INSTALL_K3S_SKIP_START=true
 export INSTALL_K3S_BIN_DIR=/opt/bin
 
 mkdir -p $INSTALL_K3S_BIN_DIR
-chmod +x {{ .binaryPath }}
 cp {{ .binaryPath }} $INSTALL_K3S_BIN_DIR/k3s
+chmod +x $INSTALL_K3S_BIN_DIR/k3s
 
 sh {{ .installScript }}
diff --git a/pkg/combustion/templates/k3s-single-node-installer.sh.tpl b/pkg/combustion/templates/k3s-single-node-installer.sh.tpl
@@ -29,7 +29,7 @@ export INSTALL_K3S_SKIP_START=true
 export INSTALL_K3S_BIN_DIR=/opt/bin
 
 mkdir -p $INSTALL_K3S_BIN_DIR
-chmod +x {{ .binaryPath }}
 cp {{ .binaryPath }} $INSTALL_K3S_BIN_DIR/k3s
+chmod +x $INSTALL_K3S_BIN_DIR/k3s
 
 sh {{ .installScript }}