Merge pull request #1596 from giantswarm/ssh_defaults

k8s-ci-robot · web-flow · commit 09aedcd7e36c · 2024-10-14T15:50:21.000+01:00
Set random ssh password for builder
diff --git a/images/capi/packer/nutanix/packer.json b/images/capi/packer/nutanix/packer.json
@@ -157,7 +157,7 @@
     "scp_extra_vars": "",
     "source_image_delete": "false",
     "source_image_force": "false",
-    "ssh_password": "builder",
+    "ssh_password": "{{ uuid }}",
     "ssh_username": "builder",
     "vm_force_delete": "false"
   }
diff --git a/images/capi/packer/ova/packer-common.json b/images/capi/packer/ova/packer-common.json
@@ -23,7 +23,7 @@
   "remote_type": "",
   "remote_username": "",
   "skip_compaction": "false",
-  "ssh_password": "builder",
+  "ssh_password": "{{ uuid }}",
   "ssh_proxy_host": "",
   "ssh_proxy_port": "",
   "ssh_timeout": "60m",
diff --git a/images/capi/packer/proxmox/packer.json b/images/capi/packer/proxmox/packer.json
@@ -200,7 +200,7 @@
     "node": "{{env `PROXMOX_NODE`}}",
     "proxmox_url": "{{env `PROXMOX_URL`}}",
     "sockets": "2",
-    "ssh_password": "builder",
+    "ssh_password": "{{ uuid }}",
     "ssh_username": "builder",
     "storage_pool": "{{env `PROXMOX_STORAGE_POOL`}}",
     "storage_pool_type": "lvm",
diff --git a/images/capi/packer/qemu/packer.json b/images/capi/packer/qemu/packer.json
@@ -201,7 +201,7 @@
     "output_directory": "./output/{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
     "python_path": "",
     "qemu_binary": "qemu-system-x86_64",
-    "ssh_password": "builder",
+    "ssh_password": "{{ uuid }}",
     "ssh_username": "builder",
     "vm_name": "{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
     "vnc_bind_address": "127.0.0.1"
diff --git a/images/capi/packer/raw/packer.json b/images/capi/packer/raw/packer.json
@@ -177,7 +177,7 @@
     "output_directory": "./output/{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
     "python_path": "",
     "qemu_binary": "qemu-system-x86_64",
-    "ssh_password": "builder",
+    "ssh_password": "{{ uuid }}",
     "ssh_username": "builder",
     "vm_name": "{{user `build_name`}}-kube-{{user `kubernetes_semver`}}"
   }

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@`
`157`	`157`	`"scp_extra_vars": "",`
`158`	`158`	`"source_image_delete": "false",`
`159`	`159`	`"source_image_force": "false",`
`160`		`- "ssh_password": "builder",`
	`160`	`+ "ssh_password": "{{ uuid }}",`
`161`	`161`	`"ssh_username": "builder",`
`162`	`162`	`"vm_force_delete": "false"`
`163`	`163`	`}`
Original file line number	Diff line number	Diff line change
`@@ -177,7 +177,7 @@`
`177`	`177`	"output_directory": "./output/{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
`178`	`178`	`"python_path": "",`
`179`	`179`	`"qemu_binary": "qemu-system-x86_64",`
`180`		`- "ssh_password": "builder",`
	`180`	`+ "ssh_password": "{{ uuid }}",`
`181`	`181`	`"ssh_username": "builder",`
`182`	`182`	"vm_name": "{{user `build_name`}}-kube-{{user `kubernetes_semver`}}"
`183`	`183`	`}`