Merge pull request #426 from junior/three-two

Complete Stack - Version Update - Easter release
oracle-quickstart · Mar 31, 2024 · 3c9e2b1 · 3c9e2b1
2 parents 0424fa5 + e1093b7
commit 3c9e2b1
Show file tree

Hide file tree

Showing 13 changed files with 248 additions and 251 deletions.
diff --git a/deploy/complete/helm-chart/setup/requirements.yaml b/deploy/complete/helm-chart/setup/requirements.yaml
@@ -5,27 +5,27 @@
 dependencies:
   # Prometheus
   - name: prometheus
-    version: 20.0.1
+    version: 25.18.0
     condition: prometheus.enabled
     repository: https://prometheus-community.github.io/helm-charts
   # Grafana
   - name: grafana
-    version: 6.52.4
+    version: 7.3.7
     condition: grafana.enabled
     repository: https://grafana.github.io/helm-charts
   # HPA Metrics
   - name: metrics-server
-    version: 3.8.4
+    version: 3.12.0
     condition: metrics-server.enabled
     repository: https://kubernetes-sigs.github.io/metrics-server
   # Ingress Controller
   - name: ingress-nginx
-    version: 4.5.2
+    version: 4.10.0
     condition: ingress-nginx.enabled
     repository: https://kubernetes.github.io/ingress-nginx
   # cert-manager
   - name: cert-manager
-    version: 1.11.0
+    version: 1.14.4
     condition: cert-manager.enabled
     repository: https://charts.jetstack.io
   # jenkins

diff --git a/deploy/complete/terraform/.terraform.lock.hcl b/deploy/complete/terraform/.terraform.lock.hcl
diff --git a/deploy/complete/terraform/VERSION b/deploy/complete/terraform/VERSION
@@ -1 +1 @@
-3.1.2
+3.2.0
diff --git a/deploy/complete/terraform/mushop-oci-services.tf b/deploy/complete/terraform/mushop-oci-services.tf
@@ -107,6 +107,21 @@ resource "kubernetes_service_account" "wallet_extractor_sa" {
     name      = "wallet-extractor-sa"
     namespace = kubernetes_namespace.mushop_namespace.id
   }
+  secret {
+    name = "wallet-extractor-sa-token"
+  }
+
+  count = var.mushop_mock_mode_all ? 0 : 1
+}
+resource "kubernetes_secret" "wallet_extractor_sa" {
+  metadata {
+    name      = "wallet-extractor-sa-token"
+    namespace = kubernetes_namespace.mushop_namespace.id
+    annotations = {
+      "kubernetes.io/service-account.name" = kubernetes_service_account.wallet_extractor_sa.0.metadata.0.name
+    }
+  }
+  type = "kubernetes.io/service-account-token"
 
   count = var.mushop_mock_mode_all ? 0 : 1
 }
@@ -141,7 +156,7 @@ resource "kubernetes_job" "wallet_extractor_job" {
           args    = ["kubectl create secret generic oadb-wallet --from-file=/wallet"]
           volume_mount {
             mount_path = "/var/run/secrets/kubernetes.io/serviceaccount"
-            name       = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
+            name       = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
             read_only  = true
           }
           volume_mount {
@@ -151,9 +166,9 @@ resource "kubernetes_job" "wallet_extractor_job" {
           }
         }
         volume {
-          name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
+          name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
           secret {
-            secret_name = kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
+            secret_name = kubernetes_secret.wallet_extractor_sa.0.metadata.0.name # kubernetes_service_account.wallet_extractor_sa[0].default_secret_name
           }
         }
         volume {