upgrade proxmox provider and some other tf [ci skip]
This commit is contained in:
parent
d06f296c51
commit
c58c577a9c
7 changed files with 116 additions and 116 deletions
|
|
@ -45,17 +45,17 @@ resource "proxmox_vm_qemu" "cloudinit-vm" {
|
|||
os_type = "cloud-init"
|
||||
|
||||
# Cloud-Init configuration
|
||||
cicustom = "vendor=local:snippets/${var.cisnippet_name}"
|
||||
ciupgrade = true
|
||||
nameserver = "1.1.1.1 8.8.8.8"
|
||||
ipconfig0 = "ip=dhcp,ip6=dhcp"
|
||||
skip_ipv6 = true
|
||||
ciuser = "root"
|
||||
cipassword = "root"
|
||||
sshkeys = var.ssh_keys
|
||||
searchdomain = "viktorbarzin.lan"
|
||||
onboot = true # start on node boot
|
||||
qemu_os = "l26"
|
||||
cicustom = "vendor=local:snippets/${var.cisnippet_name}"
|
||||
ciupgrade = true
|
||||
nameserver = "1.1.1.1 8.8.8.8"
|
||||
ipconfig0 = "ip=dhcp,ip6=dhcp"
|
||||
skip_ipv6 = true
|
||||
ciuser = "root"
|
||||
cipassword = "root"
|
||||
sshkeys = var.ssh_keys
|
||||
searchdomain = "viktorbarzin.lan"
|
||||
start_at_node_boot = true # start on node boot
|
||||
qemu_os = "l26"
|
||||
|
||||
cpu {
|
||||
cores = var.vm_cpus
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ terraform {
|
|||
required_providers {
|
||||
proxmox = {
|
||||
source = "telmate/proxmox"
|
||||
version = "3.0.2-rc04"
|
||||
version = "3.0.2-rc07"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,24 +117,24 @@ resource "kubernetes_ingress_v1" "proxied-ingress" {
|
|||
"nginx.ingress.kubernetes.io/limit-burst-multiplier" : 50
|
||||
"nginx.ingress.kubernetes.io/limit-rate-after" : 100
|
||||
"nginx.ingress.kubernetes.io/configuration-snippet" = <<-EOF
|
||||
limit_req_status 429;
|
||||
limit_conn_status 429;
|
||||
${var.rybbit_site_id != null ? <<-JS
|
||||
# Rybbit Analytics
|
||||
# Only modify HTML
|
||||
sub_filter_types text/html;
|
||||
sub_filter_once off;
|
||||
limit_req_status 429;
|
||||
limit_conn_status 429;
|
||||
${var.rybbit_site_id != null ? <<-JS
|
||||
# Rybbit Analytics
|
||||
# Only modify HTML
|
||||
sub_filter_types text/html;
|
||||
sub_filter_once off;
|
||||
|
||||
# Disable compression so sub_filter works
|
||||
proxy_set_header Accept-Encoding "";
|
||||
# Disable compression so sub_filter works
|
||||
proxy_set_header Accept-Encoding "";
|
||||
|
||||
# Inject analytics before </head>
|
||||
sub_filter '</head>' '
|
||||
<script src="https://rybbit.viktorbarzin.me/api/script.js"
|
||||
data-site-id="${var.rybbit_site_id}"
|
||||
defer></script>
|
||||
</head>';
|
||||
JS
|
||||
# Inject analytics before </head>
|
||||
sub_filter '</head>' '
|
||||
<script src="https://rybbit.viktorbarzin.me/api/script.js"
|
||||
data-site-id="${var.rybbit_site_id}"
|
||||
defer></script>
|
||||
</head>';
|
||||
JS
|
||||
: ""
|
||||
}
|
||||
${var.additional_configuration_snippet}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ terraform {
|
|||
required_providers {
|
||||
kubernetes = {
|
||||
source = "hashicorp/kubernetes"
|
||||
version = ">= 2.7.1"
|
||||
version = "3.0.1"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue