Skip to content

Commit

Permalink
Fixes for SSH provisioning errors
Browse files Browse the repository at this point in the history
Workaround problems with Packer / Ansible SSH interaction, see
kubernetes-sigs#905 for
background and suggested fix
  • Loading branch information
yankcrime committed Oct 5, 2022
1 parent 606e7c0 commit d685177
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
8 changes: 4 additions & 4 deletions images/capi/packer/config/kubernetes.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"crictl_sha256": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-{{user `crictl_arch`}}.tar.gz.sha256",
"crictl_source_type": "pkg",
"crictl_url": "https://github.com/kubernetes-sigs/cri-tools/releases/download/v{{user `crictl_version`}}/crictl-v{{user `crictl_version`}}-linux-{{user `crictl_arch`}}.tar.gz",
"crictl_version": "1.24.2",
"crictl_version": "1.24.3",
"kubeadm_template": "etc/kubeadm.yml",
"kubernetes_container_registry": "k8s.gcr.io",
"kubernetes_deb_gpg_key": "https://packages.cloud.google.com/apt/doc/apt-key.gpg",
"kubernetes_deb_repo": "\"https://apt.kubernetes.io/ kubernetes-xenial\"",
"kubernetes_deb_version": "1.24.2-00",
"kubernetes_deb_version": "1.24.3-00",
"kubernetes_http_source": "https://dl.k8s.io/release",
"kubernetes_load_additional_imgs": "false",
"kubernetes_rpm_gpg_check": "True",
"kubernetes_rpm_gpg_key": "\"https://packages.cloud.google.com/yum/doc/yum-key.gpg https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg\"",
"kubernetes_rpm_repo": "https://packages.cloud.google.com/yum/repos/kubernetes-el7-{{user `kubernetes_rpm_repo_arch`}}",
"kubernetes_rpm_repo_arch": "x86_64",
"kubernetes_rpm_version": "1.24.2-0",
"kubernetes_semver": "v1.24.2",
"kubernetes_rpm_version": "1.24.3-0",
"kubernetes_semver": "v1.24.3",
"kubernetes_series": "v1.24",
"kubernetes_source_type": "pkg",
"systemd_prefix": "/usr/lib/systemd",
Expand Down
8 changes: 4 additions & 4 deletions images/capi/packer/openstack/openstack-ubuntu-2004.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"os_display_name": "Ubuntu 20.04",
"shutdown_command": "shutdown -P now",
"ssh_username": "ubuntu",
"source_image": "c5eb4dd2-a35f-4c7f-8095-c28f2c64b924",
"networks": "dbbcf56d-940d-42e1-a550-3c38c5999dee",
"flavor": "vgpu.mig.1g10gb",
"floating_ip_pool": "public1"
"source_image": "6641b3e4-4b2d-409b-8340-067e50ec1ab7",
"networks": "05cfe5ff-d25d-497e-bf3a-5699bc3cf17f",
"flavor": "chorizo",
"floating_ip_pool": "legacy_internet"
}
13 changes: 6 additions & 7 deletions images/capi/packer/openstack/packer.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,10 @@
},
{
"ansible_env_vars": [
"ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
"ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa -o IdentitiesOnly=yes'"
],
"extra_arguments": [
"--scp-extra-args", "'-O'",
"--extra-vars",
"{{user `ansible_common_vars`}}",
"--extra-vars",
Expand All @@ -62,9 +63,10 @@
},
{
"ansible_env_vars": [
"ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -o IdentitiesOnly=yes'"
"ANSIBLE_SSH_ARGS='{{user `existing_ansible_ssh_args`}} -oHostKeyAlgorithms=+ssh-rsa -oPubkeyAcceptedAlgorithms=+ssh-rsa -o IdentitiesOnly=yes'"
],
"extra_arguments": [
"--scp-extra-args", "'-O'",
"--extra-vars",
"{{user `ansible_common_vars`}}",
"--extra-vars",
Expand Down Expand Up @@ -111,7 +113,6 @@
"ansible_common_vars": "",
"ansible_extra_vars": "ansible_python_interpreter=/usr/bin/python3",
"ansible_user_vars": "",
"boot_media_path": "http://{{ .HTTPIP }}:{{ .HTTPPort }}",
"boot_wait": "10s",
"build_timestamp": "{{timestamp}}",
"containerd_sha256": null,
Expand All @@ -127,7 +128,7 @@
"firmware": "",
"format": "qcow2",
"headless": "true",
"http_directory": "./packer/qemu/linux/{{user `distro_name`}}/http/",
"http_directory": "./packer/openstack/linux/{{user `distro_name`}}/http/",
"kubernetes_cni_deb_version": null,
"kubernetes_cni_http_source": null,
"kubernetes_cni_semver": null,
Expand All @@ -147,10 +148,8 @@
"kubernetes_source_type": null,
"machine_id_mode": "444",
"memory": "2048",
"output_directory": "./output/{{user `build_name`}}-kube-{{user `kubernetes_semver`}}",
"python_path": "",
"qemu_binary": "qemu-system-x86_64",
"ssh_password": "builder",
"ssh_username": "builder"
"ssh_username": "{{user `ssh_username`}}"
}
}

0 comments on commit d685177

Please sign in to comment.