From 74fad131b42949bbbdd033c4f51129408d2a564c Mon Sep 17 00:00:00 2001 From: Abhay Krishna Arunachalam Date: Thu, 2 Mar 2023 19:27:50 -0800 Subject: [PATCH 12/18] Add EKS-A specific inline Goss vars to all supported providers Signed-off-by: Abhay Krishna Arunachalam --- images/capi/packer/ami/packer.json | 7 ++++++- images/capi/packer/nutanix/packer.json | 7 ++++++- images/capi/packer/qemu/packer.json | 7 ++++++- images/capi/packer/raw/packer.json | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/images/capi/packer/ami/packer.json b/images/capi/packer/ami/packer.json index d64b22278..738d50f55 100644 --- a/images/capi/packer/ami/packer.json +++ b/images/capi/packer/ami/packer.json @@ -145,7 +145,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", - "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}" + "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}", + "etcdadm_version": "{{ user `etcdadm_version` }}", + "etcd_version": "{{ user `etcd_version` }}", + "etcd_sha256": "{{ user `etcd_sha256` }}", + "pause_image": "{{ user `pause_image` }}", + "kubernetes_cni_host_device_sha256": "{{ user `kubernetes_cni_host_device_sha256` }}" }, "version": "{{user `goss_version`}}" } diff --git a/images/capi/packer/nutanix/packer.json b/images/capi/packer/nutanix/packer.json index 80e296c69..d22fbea27 100644 --- a/images/capi/packer/nutanix/packer.json +++ b/images/capi/packer/nutanix/packer.json @@ -97,7 +97,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", - "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}" + "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}", + "etcdadm_version": "{{ user `etcdadm_version` }}", + "etcd_version": "{{ user `etcd_version` }}", + "etcd_sha256": "{{ user `etcd_sha256` }}", + "pause_image": "{{ user `pause_image` }}", + "kubernetes_cni_host_device_sha256": "{{ user `kubernetes_cni_host_device_sha256` }}" }, "version": "{{user `goss_version`}}" } diff --git a/images/capi/packer/qemu/packer.json b/images/capi/packer/qemu/packer.json index 5fdd85550..78b9f1fac 100644 --- a/images/capi/packer/qemu/packer.json +++ b/images/capi/packer/qemu/packer.json @@ -138,7 +138,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", - "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}" + "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}", + "etcdadm_version": "{{ user `etcdadm_version` }}", + "etcd_version": "{{ user `etcd_version` }}", + "etcd_sha256": "{{ user `etcd_sha256` }}", + "pause_image": "{{ user `pause_image` }}", + "kubernetes_cni_host_device_sha256": "{{ user `kubernetes_cni_host_device_sha256` }}" }, "version": "{{user `goss_version`}}" } diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json index e790e67d5..dc494a1e8 100644 --- a/images/capi/packer/raw/packer.json +++ b/images/capi/packer/raw/packer.json @@ -123,7 +123,12 @@ "kubernetes_deb_version": "{{ user `kubernetes_deb_version` }}", "kubernetes_rpm_version": "{{ split (user `kubernetes_rpm_version`) \"-\" 0 }}", "kubernetes_source_type": "{{user `kubernetes_source_type`}}", - "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}" + "kubernetes_version": "{{user `kubernetes_semver` | replace \"v\" \"\" 1}}", + "etcdadm_version": "{{ user `etcdadm_version` }}", + "etcd_version": "{{ user `etcd_version` }}", + "etcd_sha256": "{{ user `etcd_sha256` }}", + "pause_image": "{{ user `pause_image` }}", + "kubernetes_cni_host_device_sha256": "{{ user `kubernetes_cni_host_device_sha256` }}" }, "version": "{{user `goss_version`}}" } -- 2.39.1