Make template compatible with Proxmox 8.2.4, fix issues across template #94
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
oreze
commented
Jul 9, 2024
| *.tfvars | ||
|
|
||
| # Exclude example.tfvars from being ignored | ||
| !example.tfvars |
There was a problem hiding this comment.
wanted to exclude all .tfvars files from being checked, just in case
oreze
commented
Jul 9, 2024
| @@ -27,27 +27,37 @@ resource "proxmox_vm_qemu" "ubuntu_vm" { | |||
| scsihw = "virtio-scsi-single" | |||
| hotplug = "network,disk,usb,memory,cpu" | |||
| numa = true | |||
| automatic_reboot = false | |||
| automatic_reboot = true | |||
There was a problem hiding this comment.
there were a problems with modify operations without this property set to true
oreze
commented
Jul 9, 2024
|
|
||
| dynamic "disk" { | ||
| for_each = var.add_worker_node_data_disk ? [var.worker_node_data_disk_size] : [] | ||
| disks { |
There was a problem hiding this comment.
new disks structure in updated provider
oreze
commented
Jul 9, 2024
| } | ||
| } | ||
| } | ||
| ide { |
There was a problem hiding this comment.
previous config missed cloudinit drive, therefore VMs were not initialized properly
oreze
commented
Jul 9, 2024
| @@ -42,6 +42,16 @@ if ! command -v docker &> /dev/null; then | |||
| exit 1 | |||
| fi | |||
|
|
|||
| # Check and add DPkg::Lock::Timeout=600 to apt-get install if not already present | |||
There was a problem hiding this comment.
Added simple script adding lock timeout, otherwise script would fail sometimes
oreze
commented
Jul 9, 2024
| @@ -16,7 +16,7 @@ module "k8s_control_plane_nodes" { | |||
| vm_net_subnet_cidr = var.internal_net_subnet_cidr | |||
| vm_host_number = 10 | |||
| vm_user = var.vm_user | |||
| vm_tags = "${var.env_name};terraform;k8s-control-plane" | |||
| vm_tags = "${var.env_name};terraform;k8s_control_plane" | |||
There was a problem hiding this comment.
new naming convention, - is forbidden
oreze
commented
Jul 9, 2024
| @@ -80,7 +80,7 @@ resource "null_resource" "setup_kubespray" { | |||
| provisioner "remote-exec" { | |||
| inline = [ | |||
| local.setup_kubespray_script_content, | |||
| "echo ${var.ssh_private_key} | base64 -d > ${local.kubespray_data_dir}/id_rsa", | |||
| "echo \"${var.ssh_private_key}\" | base64 -d > ${local.kubespray_data_dir}/id_rsa", | |||
There was a problem hiding this comment.
added missing "key" quotes, fails without it
fix, chore: upgrade providers, add proxmox >8.1 compatibility, fix breaking changes, adjust disk sizes and names of the templates
fix: add missing cloudinit drive, enable automatic_reboot on modify operation
fix: update docker script to wait if apt-get is locked
fix: add missing quotes around ssh_private_key in kubespray setup
chore: bump kubespray_image, kube_version, argocd_version versions, add explicit sesnitive properties to ssh keys variables
oreze
force-pushed
the
fix/make-compatible-with-proxmox-8.4-and-fix-scripts
branch
from
dc3f471
to
ae1a1e0
Compare
khanh-ph
approved these changes
Aug 24, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
List of changes:
Basically, I've just upgraded providers, fixed some compatibility and other issues. It worked for me with Proxmox 8.2.4 with ubuntu 24.04 template.
I had to fix docker install script, it failed a few times because of apt-get lock, change in
setup_kubespray.shscript should be reverted after merging this PR: docker/docker-install#431Supersededs #90