From b66af6fe77730e9e1a4033f21513024f722f8497 Mon Sep 17 00:00:00 2001
From: Alexandre Pires <c.alexandre.pires@gmail.com>
Date: Sat, 22 Feb 2025 16:12:39 +0100
Subject: [PATCH] Update Terraform and application configurations; upgrade
 Terraform version, WordPress and Gitea versions, and adjust m3uproxy settings

---
 .github/actions/setup-terraform-env/action.yml     | 2 +-
 terraform/k8sapps/config.tf                        | 4 ++--
 terraform/k8sapps/m3uproxy.tf                      | 8 +++++++-
 terraform/k8sapps/resources/m3uproxy/m3uproxy.json | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/.github/actions/setup-terraform-env/action.yml b/.github/actions/setup-terraform-env/action.yml
index cc2b3c4..17ea03b 100644
--- a/.github/actions/setup-terraform-env/action.yml
+++ b/.github/actions/setup-terraform-env/action.yml
@@ -7,4 +7,4 @@ runs:
     - name: Setup Terraform
       uses: hashicorp/setup-terraform@v1
       with:
-        terraform_version: 1.9.6
+        terraform_version: 1.10.5
diff --git a/terraform/k8sapps/config.tf b/terraform/k8sapps/config.tf
index ba8ccda..b4c68ee 100644
--- a/terraform/k8sapps/config.tf
+++ b/terraform/k8sapps/config.tf
@@ -1,12 +1,12 @@
 locals {
 
   # apps
-  wordpress_version                    = "6.6.2"
+  wordpress_version                    = "6.7.2"
   wordpress_fqdns                      = ["blog.alexpires.me", "www.alexpires.me", "alexpires.me"]
   wordpress_sql_backup_cron_schedule   = "0 2 * * *"
   wordpress_files_backup_cron_schedule = "10 2 * * *"
 
-  gitea_version                    = "1.22.2"
+  gitea_version                    = "1.23.4"
   gitea_fqdn                       = "code.alexpires.me"
   gitea_sql_backup_cron_schedule   = "20 2 * * *"
   gitea_files_backup_cron_schedule = "30 2 * * *"
diff --git a/terraform/k8sapps/m3uproxy.tf b/terraform/k8sapps/m3uproxy.tf
index 054950c..165e9c0 100644
--- a/terraform/k8sapps/m3uproxy.tf
+++ b/terraform/k8sapps/m3uproxy.tf
@@ -113,7 +113,6 @@ resource "kubernetes_config_map" "m3uproxy_config" {
 }
 
 resource "kubernetes_deployment" "proxy_pt" {
-
   metadata {
     name      = "proxy-pt"
     namespace = kubernetes_namespace.m3uproxy.metadata[0].name
@@ -283,6 +282,7 @@ resource "kubernetes_deployment" "proxy_pt" {
   }
 
   lifecycle {
+    ignore_changes = [spec[0].template[0].metadata[0].annotations]
     replace_triggered_by = [
       kubernetes_config_map.wireguard_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" {
diff --git a/terraform/k8sapps/resources/m3uproxy/m3uproxy.json b/terraform/k8sapps/resources/m3uproxy/m3uproxy.json
index 9bfaaf6..2beb724 100644
--- a/terraform/k8sapps/resources/m3uproxy/m3uproxy.json
+++ b/terraform/k8sapps/resources/m3uproxy/m3uproxy.json
@@ -3,7 +3,7 @@
     "playlist": "conf/playlist.json",
     "epg": "https://m3upt.com/epg",
     "default_timeout": 3,
-    "num_workers": 2,
+    "num_workers": 4,
     "scan_time": 43200,
     "security": {
         "geoip": {