More tweaks, formatting, use static IP

This commit is contained in:
Sivert V. Sæther 2024-10-21 11:08:14 +02:00
parent 3ce33a2b7c
commit 71d5f6846c
4 changed files with 24 additions and 13 deletions

View File

@ -1,14 +1,20 @@
#!/bin/sh #!/bin/sh
if [ "$2" = "post-start" ]; then if [ "$2" = "post-start" ]; then
lxc-attach "$1" <<EOF lxc-attach "$1" <<EOF
cat /etc/apk/repositories | grep https &> /dev/null
if [ \$? -eq 0 ]; then
echo 'http://dl-cdn.alpinelinux.org/alpine/v3.20/main' > /etc/apk/repositories
echo 'http://dl-cdn.alpinelinux.org/alpine/v3.20/community' >> /etc/apk/repositories
fi
export PATH=/sbin:\$PATH export PATH=/sbin:\$PATH
apk update apk update
apk upgrade apk upgrade
openrc -s sshd status 2>&1 | grep 'does not exist' &> /dev/null openrc -s sshd status 2>&1 | grep 'does not exist' &> /dev/null
if [ $? -eq 0 ]; then if [ \$? -eq 0 ]; then
apk add openssh-server apk add openssh-server
openrc -s sshd start openrc -s sshd start
rc-update add sshd rc-update add sshd
echo 'Welcome to Alpine!' > /etc/motd
fi fi
EOF EOF
fi fi

View File

@ -17,7 +17,7 @@ resource "proxmox_virtual_environment_file" "kube-init" {
} }
resource "proxmox_virtual_environment_container" "kube-masters" { resource "proxmox_virtual_environment_container" "kube-masters" {
hook_script_file_id = "${var.datastore_id}:snippets/kube-init.sh" hook_script_file_id = proxmox_virtual_environment_file.kube-init.id
vm_id = var.vmid + count.index + 10 vm_id = var.vmid + count.index + 10
node_name = var.proxmox_node node_name = var.proxmox_node
count = var.master_count count = var.master_count
@ -37,7 +37,8 @@ resource "proxmox_virtual_environment_container" "kube-masters" {
} }
ip_config { ip_config {
ipv4 { ipv4 {
address = "dhcp" address = "${var.subnet_prefix}.${70 + count.index}/24"
gateway = "${var.subnet_prefix}.1"
} }
} }
} }
@ -50,7 +51,7 @@ resource "proxmox_virtual_environment_container" "kube-masters" {
} }
resource "proxmox_virtual_environment_container" "kube-workers" { resource "proxmox_virtual_environment_container" "kube-workers" {
hook_script_file_id = "${var.datastore_id}:snippets/kube-init.sh" hook_script_file_id = proxmox_virtual_environment_file.kube-init.id
vm_id = var.vmid + 100 + count.index vm_id = var.vmid + 100 + count.index
node_name = var.proxmox_node node_name = var.proxmox_node
count = var.worker_count count = var.worker_count
@ -70,7 +71,8 @@ resource "proxmox_virtual_environment_container" "kube-workers" {
} }
ip_config { ip_config {
ipv4 { ipv4 {
address = "dhcp" address = "${var.subnet_prefix}.${80 + count.index}/24"
gateway = "${var.subnet_prefix}.1"
} }
} }
} }

View File

@ -3,7 +3,7 @@ variable "master_count" {
default = 1 default = 1
} }
variable "worker_count" { variable "worker_count" {
default = 0 default = 2
} }
variable "datastore_id" { variable "datastore_id" {
default = "local" default = "local"
@ -25,3 +25,6 @@ variable "ssh_keys" {
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8lNVARN9YgeHj9UmufdtJFoOJQlJpwwM52OqriUS1x0conCT2bgKBwoaV7Pmyk87tmd8pFZREMlEDch4yMu616WZmmE8chRg4gvd3qRB4TneWxhLoXJcMT3y+EF9Bu3WccQC2T2Q9VWGl2Nxd5ur0jRcQHruW1eOLpsZrQGaOceCLfMY55LynzWMWZgPedgGOlB5cq8NMwJsIcaTwrGXELzykM1cb1KgN9uzKvptxqG0QvxJG66VYpfdlCxIYpliflzO9UnWDg62zCtIC5yeSRk7hMWcyWf9fUVMt//wVH8dmSIx2bSRPBlEdwB/fTzClO27w71FbDMb6MFm2QHc0TranGghZbCkNLXS64kFpDlTgdXOWtXmzsFYGvhprWL5Z8ldEdUeptwe1/Iixwhrqlf9NVk5AOyg7j9LjLPw7voc8TAp0FLn8Ar2dbSVZlFr3a1X35mXj6VbRk51AkbxJbf9wc80FlPcm8sHWd7FSVqHseyoZusoEZPT9XthAoD3TbW0iseUcxBGZdSnjhGH4j5HBsgKUNHsW8LToWryXFh+o8Cm3DWsIIXX18lSP6u38JYsnTDdrO/kuQdEFRbX0C68XPfM5Y0LjlzxmS0+lTSalZWUMF75wMZ8HLs1iTm2kDHWSkweNsGts/YR9jFojQoZo7S5xyb/dq66xhUZIjQ== siv@proggnuc", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC8lNVARN9YgeHj9UmufdtJFoOJQlJpwwM52OqriUS1x0conCT2bgKBwoaV7Pmyk87tmd8pFZREMlEDch4yMu616WZmmE8chRg4gvd3qRB4TneWxhLoXJcMT3y+EF9Bu3WccQC2T2Q9VWGl2Nxd5ur0jRcQHruW1eOLpsZrQGaOceCLfMY55LynzWMWZgPedgGOlB5cq8NMwJsIcaTwrGXELzykM1cb1KgN9uzKvptxqG0QvxJG66VYpfdlCxIYpliflzO9UnWDg62zCtIC5yeSRk7hMWcyWf9fUVMt//wVH8dmSIx2bSRPBlEdwB/fTzClO27w71FbDMb6MFm2QHc0TranGghZbCkNLXS64kFpDlTgdXOWtXmzsFYGvhprWL5Z8ldEdUeptwe1/Iixwhrqlf9NVk5AOyg7j9LjLPw7voc8TAp0FLn8Ar2dbSVZlFr3a1X35mXj6VbRk51AkbxJbf9wc80FlPcm8sHWd7FSVqHseyoZusoEZPT9XthAoD3TbW0iseUcxBGZdSnjhGH4j5HBsgKUNHsW8LToWryXFh+o8Cm3DWsIIXX18lSP6u38JYsnTDdrO/kuQdEFRbX0C68XPfM5Y0LjlzxmS0+lTSalZWUMF75wMZ8HLs1iTm2kDHWSkweNsGts/YR9jFojQoZo7S5xyb/dq66xhUZIjQ== siv@proggnuc",
] ]
} }
variable "subnet_prefix" {
default = "172.31.71"
}