Update Terraform and application configurations; upgrade Terraform version, WordPress and Gitea versions, and adjust m3uproxy settings

This commit is contained in:
2025-02-22 16:12:39 +01:00
parent 22361df07d
commit b66af6fe77
4 changed files with 11 additions and 5 deletions
@@ -7,4 +7,4 @@ runs:
- name: Setup Terraform - name: Setup Terraform
uses: hashicorp/setup-terraform@v1 uses: hashicorp/setup-terraform@v1
with: with:
terraform_version: 1.9.6 terraform_version: 1.10.5
+2 -2
View File
@@ -1,12 +1,12 @@
locals { locals {
# apps # apps
wordpress_version = "6.6.2" wordpress_version = "6.7.2"
wordpress_fqdns = ["blog.alexpires.me", "www.alexpires.me", "alexpires.me"] wordpress_fqdns = ["blog.alexpires.me", "www.alexpires.me", "alexpires.me"]
wordpress_sql_backup_cron_schedule = "0 2 * * *" wordpress_sql_backup_cron_schedule = "0 2 * * *"
wordpress_files_backup_cron_schedule = "10 2 * * *" wordpress_files_backup_cron_schedule = "10 2 * * *"
gitea_version = "1.22.2" gitea_version = "1.23.4"
gitea_fqdn = "code.alexpires.me" gitea_fqdn = "code.alexpires.me"
gitea_sql_backup_cron_schedule = "20 2 * * *" gitea_sql_backup_cron_schedule = "20 2 * * *"
gitea_files_backup_cron_schedule = "30 2 * * *" gitea_files_backup_cron_schedule = "30 2 * * *"
+7 -1
View File
@@ -113,7 +113,6 @@ resource "kubernetes_config_map" "m3uproxy_config" {
} }
resource "kubernetes_deployment" "proxy_pt" { resource "kubernetes_deployment" "proxy_pt" {
metadata { metadata {
name = "proxy-pt" name = "proxy-pt"
namespace = kubernetes_namespace.m3uproxy.metadata[0].name namespace = kubernetes_namespace.m3uproxy.metadata[0].name
@@ -283,6 +282,7 @@ resource "kubernetes_deployment" "proxy_pt" {
} }
lifecycle { lifecycle {
ignore_changes = [spec[0].template[0].metadata[0].annotations]
replace_triggered_by = [ replace_triggered_by = [
kubernetes_config_map.wireguard_config, kubernetes_config_map.wireguard_config,
kubernetes_config_map.squid_config kubernetes_config_map.squid_config
@@ -416,6 +416,12 @@ resource "kubernetes_deployment" "m3uproxy" {
} }
} }
} }
lifecycle {
ignore_changes = [spec[0].template[0].metadata[0].annotations]
replace_triggered_by = [
kubernetes_config_map.m3uproxy_config
]
}
} }
resource "kubernetes_cron_job_v1" "geoip_update" { resource "kubernetes_cron_job_v1" "geoip_update" {
@@ -3,7 +3,7 @@
"playlist": "conf/playlist.json", "playlist": "conf/playlist.json",
"epg": "https://m3upt.com/epg", "epg": "https://m3upt.com/epg",
"default_timeout": 3, "default_timeout": 3,
"num_workers": 2, "num_workers": 4,
"scan_time": 43200, "scan_time": 43200,
"security": { "security": {
"geoip": { "geoip": {