FEAT: Use packer copy file

Fred78290 · Oct 9, 2024 · b97d113 · b97d113
1 parent e9d3600
commit b97d113
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 29 deletions.
diff --git a/bin/plateform/cloudstack/image.sh b/bin/plateform/cloudstack/image.sh
@@ -197,6 +197,9 @@ function cloudmonkey() {
 #===========================================================================================================================================
 #
 #===========================================================================================================================================
+pushd ${CURDIR} > /dev/null
+PREPARE_SCRIPT=${PWD}/prepare-image.sh
+popd > /dev/null
 
 if [ ${KUBERNETES_VERSION:0:1} != "v" ]; then
 	KUBERNETES_VERSION="v${KUBERNETES_VERSION}"
@@ -285,12 +288,6 @@ timezone: ${TZ}
 package_update: false
 package_upgrade: false
 ssh_pwauth: true
-write_files:
-- encoding: gzip+base64
-  content: $(cat ${CURDIR}/prepare-image.sh | gzip -c9 | base64 -w 0)
-  owner: root:adm
-  path: /usr/local/bin/prepare-image.sh
-  permissions: '0755'
 users:
   - name: ${KUBERNETES_USER}
     groups: users, admin
@@ -358,7 +355,7 @@ INIT_SCRIPT="/usr/local/bin/prepare-image.sh --container-runtime ${CONTAINER_ENG
 
 pushd ${CACHE}/packer/
 export PACKER_LOG=1
-packer build -var INIT_SCRIPT="${INIT_SCRIPT}" template.json
+packer build -var INIT_SCRIPT="${INIT_SCRIPT}" -var PREPARE_SCRIPT="${PREPARE_SCRIPT}" template.json
 popd
 
 echo_blue_bold "Created image ${TARGET_IMAGE} with kubernetes version ${KUBERNETES_VERSION}"

diff --git a/bin/plateform/lxd/image.sh b/bin/plateform/lxd/image.sh
@@ -97,6 +97,13 @@ while true ; do
 	esac
 done
 
+#===========================================================================================================================================
+#
+#===========================================================================================================================================
+pushd ${CURDIR} > /dev/null
+PREPARE_SCRIPT=${PWD}/prepare-image.sh
+popd > /dev/null
+
 if [ ${KUBERNETES_VERSION:0:1} != "v" ]; then
 	KUBERNETES_VERSION="v${KUBERNETES_VERSION}"
 fi
@@ -165,12 +172,12 @@ config:
     package_update: false
     package_upgrade: false
     ssh_pwauth: true
-    write_files:
-    - encoding: gzip+base64
-      content: $(cat ${CURDIR}/prepare-image.sh | gzip -c9 | base64 -w 0)
-      owner: root:adm
-      path: /usr/local/bin/prepare-image.sh
-      permissions: '0755'
+#    write_files:
+#    - encoding: gzip+base64
+#      content: $(cat ${CURDIR}/prepare-image.sh | gzip -c9 | base64 -w 0)
+#      owner: root:adm
+#      path: /usr/local/bin/prepare-image.sh
+#      permissions: '0755'
     users:
     - name: ${KUBERNETES_USER}
       groups: users, admin
@@ -191,8 +198,6 @@ config:
       preserve_sources_list: true
 EOF
 
-ls -l ${CACHE}/packer/profile/config.yaml
-
 lxc profile edit ${LXD_REMOTE}${TARGET_IMAGE}-profile < ${CACHE}/packer/profile/config.yaml
 
 if [ ${LXD_CONTAINER_TYPE} == "virtual-machine" ]; then
@@ -227,7 +232,7 @@ INIT_SCRIPT="/usr/local/bin/prepare-image.sh --container-runtime ${CONTAINER_ENG
 
 pushd ${CACHE}/packer/
 export PACKER_LOG=1
-packer build -var INIT_SCRIPT="${INIT_SCRIPT}" template.json
+packer build -var INIT_SCRIPT="${INIT_SCRIPT}" -var PREPARE_SCRIPT="${PREPARE_SCRIPT}" template.json
 popd
 
 echo_blue_bold "Created image ${TARGET_IMAGE} with kubernetes version ${KUBERNETES_VERSION}"

diff --git a/bin/plateform/multipass/image.sh b/bin/plateform/multipass/image.sh
@@ -87,6 +87,13 @@ while true ; do
 	esac
 done
 
+#===========================================================================================================================================
+#
+#===========================================================================================================================================
+pushd ${CURDIR} > /dev/null
+PREPARE_SCRIPT=${PWD}/prepare-image.sh
+popd > /dev/null
+
 if [ ${KUBERNETES_VERSION:0:1} != "v" ]; then
 	KUBERNETES_VERSION="v${KUBERNETES_VERSION}"
 fi
@@ -114,12 +121,6 @@ timezone: ${TZ}
 package_update: false
 package_upgrade: false
 ssh_pwauth: true
-write_files:
-- encoding: gzip+base64
-  content: $(cat ${CURDIR}/prepare-image.sh | gzip -c9 | base64 -w 0)
-  owner: root:adm
-  path: /usr/local/bin/prepare-image.sh
-  permissions: '0755'
 users:
   - name: ${KUBERNETES_USER}
     groups: users, admin
@@ -193,6 +194,7 @@ packer build \
 	-var SSH_PRIVATE_KEY="${SSH_PRIVATE_KEY}" \
 	-var ISO_CHECKSUM="sha256:${ISO_CHECKSUM}" \
 	-var ISO_FILE="${ISO_FILE}" \
+	-var PREPARE_SCRIPT="${PREPARE_SCRIPT}" \
 	-var INIT_SCRIPT="${INIT_SCRIPT}" \
 	template.json
 

diff --git a/bin/plateform/openstack/image.sh b/bin/plateform/openstack/image.sh
@@ -90,6 +90,13 @@ while true ; do
 	esac
 done
 
+#===========================================================================================================================================
+#
+#===========================================================================================================================================
+pushd ${CURDIR} > /dev/null
+PREPARE_SCRIPT=${PWD}/prepare-image.sh
+popd > /dev/null
+
 if [ ${KUBERNETES_VERSION:0:1} != "v" ]; then
 	KUBERNETES_VERSION="v${KUBERNETES_VERSION}"
 fi
@@ -139,12 +146,6 @@ timezone: ${TZ}
 package_update: false
 package_upgrade: false
 ssh_pwauth: true
-write_files:
-- encoding: gzip+base64
-  content: $(cat ${CURDIR}/prepare-image.sh | gzip -c9 | base64 -w 0)
-  owner: root:adm
-  path: /usr/local/bin/prepare-image.sh
-  permissions: '0755'
 users:
   - name: ${KUBERNETES_USER}
     groups: users, admin
@@ -206,7 +207,7 @@ INIT_SCRIPT="/usr/local/bin/prepare-image.sh --container-runtime ${CONTAINER_ENG
 
 pushd ${CACHE}/packer/
 export PACKER_LOG=1
-packer build -var INIT_SCRIPT="${INIT_SCRIPT}" template.json
+packer build -var INIT_SCRIPT="${INIT_SCRIPT}" -var PREPARE_SCRIPT="${PREPARE_SCRIPT}" template.json
 popd
 
 echo_blue_bold "Created image ${TARGET_IMAGE} with kubernetes version ${KUBERNETES_VERSION}"

diff --git a/templates/packer/template.json b/templates/packer/template.json
@@ -30,6 +30,20 @@
 		}
 	],
 	"provisioners": [
+		{
+			"type": "file",
+			"source": "{{ user `PREPARE_SCRIPT` }}",
+			"destination": "/tmp/prepare-image.sh"
+		},
+		{
+			"type": "shell",
+			"execute_command": "sudo sh -xc '{{ .Vars }} {{ .Path }}'",
+			"inline": [
+				"cp /tmp/prepare-image.sh /usr/local/bin/prepare-image.sh",
+				"chown root:adm /usr/local/bin/prepare-image.sh",
+				"chmod +x /usr/local/bin/prepare-image.sh"
+			]
+		},
 		{
 			"type": "shell",
 			"execute_command": "sudo sh -xc '{{ .Vars }} {{ .Path }}'",