[DOP-2371][DOP-2372][DEV-12379][DEV-12380]

ipa.tf

@@ -425,20 +425,21 @@ resource "helm_release" "external-secrets" {
   name             = "external-secrets"
   create_namespace = true
   namespace        = "default"
-  repository       = "https://charts.external-secrets.io/"
+  repository       = var.ipa_repo
   chart            = "external-secrets"
   version          = var.external_secrets_version
   wait             = true
 
   values = [<<EOF
-    image:
-      repository: ${var.image_registry}/ghcr.io/external-secrets/external-secrets
-    webhook:
-     image:
-        repository: ${var.image_registry}/ghcr.io/external-secrets/external-secrets
-    certController:
+    external-secrets:
       image:
         repository: ${var.image_registry}/ghcr.io/external-secrets/external-secrets
+      webhook:
+        image:
+          repository: ${var.image_registry}/ghcr.io/external-secrets/external-secrets
+      certController:
+        image:
+          repository: ${var.image_registry}/ghcr.io/external-secrets/external-secrets
 
   EOF
   ]
@@ -471,44 +472,48 @@ resource "helm_release" "ipa-crds" {
       enabled: true
     pgo: 
       controllerImages:
-        cluster: ${var.image_registry}/registry.crunchydata.com/crunchydata/postgres-operator:ubi8-5.5.0-2
+        cluster: ${var.image_registry}/registry.crunchydata.com/crunchydata/postgres-operator:ubi8-5.7.0-0
       relatedImages:
+        postgres_17:
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-17.0-0
+        postgres_17_gis_3.4:
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-17.0-3.4-0
         postgres_16:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.3-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-16.4-2
         postgres_16_gis_3.4:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.4-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.4-2
         postgres_16_gis_3.3:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.3-3.3-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-16.4-3.3-2
         postgres_15:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.7-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-15.8-2
         postgres_15_gis_3.3:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.7-3.3-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-15.8-3.3-2
         postgres_14:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.12-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-14.13-2
         postgres_14_gis_3.1:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.12-3.1-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.13-3.1-2
         postgres_14_gis_3.2:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.12-3.2-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.13-3.2-2
         postgres_14_gis_3.3:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.12-3.3-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-14.13-3.3-2
         postgres_13:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.15-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres:ubi8-13.16-2
         postgres_13_gis_3.0:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.15-3.0-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.16-3.0-2
         postgres_13_gis_3.1:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.15-3.1-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-gis:ubi8-13.16-3.1-2
         pgadmin:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-26
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-4.30-31
         pgbackrest:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.51-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgbackrest:ubi8-2.53.1-0
         pgbouncer:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.22-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgbouncer:ubi8-1.23-0
         pgexporter:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-0.15.0-7
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-postgres-exporter:ubi8-0.15.0-12
         pgupgrade:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.6.0-0
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-upgrade:ubi8-5.7.0-0
         standalone_pgadmin:
-          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.6-1
+          image: ${var.image_registry}/registry.crunchydata.com/crunchydata/crunchy-pgadmin4:ubi8-8.12-0
   migrations-operator:
     image:
       repository: ${var.image_registry}/indico/migrations-operator

main.tf

@@ -115,6 +115,9 @@ locals {
   argo_app_name           = lower("${var.aws_account}.${var.region}.${var.label}-ipa")
   argo_smoketest_app_name = lower("${var.aws_account}.${var.region}.${var.label}-smoketest")
   argo_cluster_name       = "${var.aws_account}.${var.region}.${var.label}"
+
+  chart_version_parts = split("-", var.ipa_version)
+  chart_suffix = trimprefix(var.ipa_version, local.chart_version_parts[0])
 }
 
 resource "tls_private_key" "pk" {

monitoring.tf

@@ -495,50 +495,47 @@ resource "helm_release" "keda-monitoring" {
   name             = "keda"
   create_namespace = true
   namespace        = "default"
-  repository       = "https://kedacore.github.io/charts"
+  repository       = var.ipa_repo
   chart            = "keda"
   version          = var.keda_version
 
 
   values = [<<EOF
-    image:
-      metricsApiServer:
-        repository: ${var.image_registry}/ghcr.io/kedacore/keda-metrics-apiserver
-      webhooks:
-        repository: ${var.image_registry}/ghcr.io/kedacore/keda-admission-webhooks
-      keda:
-        repository: ${var.image_registry}/ghcr.io/kedacore/keda
-    imagePullSecrets:
-      - name: harbor-pull-secret
-    resources:
-      operator:
-        requests:
-          memory: 512Mi
-        limits:
-          memory: 4Gi
-
-    crds:
-      install: true
-
-    podAnnotations:
-      keda:
-        prometheus.io/scrape: "true"
-        prometheus.io/path: "/metrics"
-        prometheus.io/port: "8080"
-      metricsAdapter: 
-        prometheus.io/scrape: "true"
-        prometheus.io/path: "/metrics"
-        prometheus.io/port: "9022"
-
-    prometheus:
-      metricServer:
-        enabled: true
-        podMonitor:
+    keda:
+      global:
+        image:
+          registry: ${var.image_registry}/ghcr.io
+      imagePullSecrets:
+        - name: harbor-pull-secret
+      resources:
+        operator:
+          requests:
+            memory: 512Mi
+          limits:
+            memory: 4Gi
+
+      crds:
+        install: true
+
+      podAnnotations:
+        keda:
+          prometheus.io/scrape: "true"
+          prometheus.io/path: "/metrics"
+          prometheus.io/port: "8080"
+        metricsAdapter: 
+          prometheus.io/scrape: "true"
+          prometheus.io/path: "/metrics"
+          prometheus.io/port: "9022"
+
+      prometheus:
+        metricServer:
           enabled: true
-      operator:
-        enabled: true
-        podMonitor:
+          podMonitor:
+            enabled: true
+        operator:
           enabled: true
+          podMonitor:
+            enabled: true
  EOF
   ]
 }
@@ -553,56 +550,57 @@ resource "helm_release" "opentelemetry-collector" {
   name             = "opentelemetry-collector"
   create_namespace = true
   namespace        = "default"
-  repository       = "https://open-telemetry.github.io/opentelemetry-helm-charts"
+  repository       = var.ipa_repo
   chart            = "opentelemetry-collector"
-  version          = var.opentelemetry-collector_version
+  version          = var.opentelemetry_collector_version
 
 
   values = [<<EOF
-    enabled: true
-    imagePullSecrets:
-      - name: harbor-pull-secret
-    image:
-      repository: ${var.image_registry}/docker.io/otel/opentelemetry-collector-contrib
-    fullnameOverride: "collector-collector"
-    mode: deployment
-    tolerations:
-    - effect: NoSchedule
-      key: indico.io/monitoring
-      operator: Exists
-    nodeSelector:
-      node_group: monitoring-workers
-    ports:
-      jaeger-compact:
-        enabled: false
-      jaeger-thrift:
-        enabled: false
-      jaeger-grpc:
-        enabled: false
-      zipkin:
-        enabled: false
-
-    config:
-      receivers:
-        jaeger: null
-        prometheus: null
-        zipkin: null
-      exporters:
-        otlp:
-          endpoint: monitoring-tempo.monitoring.svc:4317
-          tls:
-            insecure: true
-      service:
-        pipelines:
-          traces:
-            receivers:
-              - otlp
-            processors:
-              - batch
-            exporters:
-              - otlp
-          metrics: null
-          logs: null
+    opentelemetry-collector:
+      enabled: true
+      imagePullSecrets:
+        - name: harbor-pull-secret
+      image:
+        repository: ${var.image_registry}/docker.io/otel/opentelemetry-collector-contrib
+      fullnameOverride: "collector-collector"
+      mode: deployment
+      tolerations:
+      - effect: NoSchedule
+        key: indico.io/monitoring
+        operator: Exists
+      nodeSelector:
+        node_group: monitoring-workers
+      ports:
+        jaeger-compact:
+          enabled: false
+        jaeger-thrift:
+          enabled: false
+        jaeger-grpc:
+          enabled: false
+        zipkin:
+          enabled: false
+
+      config:
+        receivers:
+          jaeger: null
+          prometheus: null
+          zipkin: null
+        exporters:
+          otlp:
+            endpoint: monitoring-tempo.monitoring.svc:4317
+            tls:
+              insecure: true
+        service:
+          pipelines:
+            traces:
+              receivers:
+                - otlp
+              processors:
+                - batch
+              exporters:
+                - otlp
+            metrics: null
+            logs: null
  EOF
   ]
 }

on_prem_test.tf

@@ -45,7 +45,7 @@ spec:
     spec:
       containers:
       - name: nfs-server
-        image: k8s.gcr.io/volume-nfs:0.8
+        image: ${var.image_registry}/k8s.gcr.io/volume-nfs:0.8
         ports:
         - name: nfs
           containerPort: 2049
@@ -134,21 +134,30 @@ resource "null_resource" "get_nfs_server_ip" {
 resource "helm_release" "nfs-provider" {
   count      = var.on_prem_test == true ? 1 : 0
   name       = "nfs-subdir-external-provisioner"
-  repository = "https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner"
+  repository = var.ipa_repo
   chart      = "nfs-subdir-external-provisioner"
-  version    = "4.0.18"
+  version    = var.nfs_subdir_external_provisioner_version
   namespace  = "default"
   depends_on = [
     module.cluster,
     kubectl_manifest.nfs_server_service,
     data.local_file.nfs_ip
   ]
 
-  // prometheus URL
-  set {
-    name  = "nfs.server"
-    value = data.local_file.nfs_ip[0].content
-  }
+  # // prometheus URL
+  # set {
+  #   name  = "nfs-subdir-external-provisioner.nfs.server"
+  #   value = data.local_file.nfs_ip[0].content
+  # }
+
+  values = [<<EOF
+    nfs-subdir-external-provisioner:
+      nfs:
+        server: ${data.local_file.nfs_ip[0].content}
+      image:
+        repository: ${var.image_registry}/registry.k8s.io/sig-storage/nfs-subdir-external-provisioner
+  EOF
+  ]
 }
 
 resource "null_resource" "update_storage_class" {

tf-smoketest-variables.tf

@@ -87,7 +87,8 @@ resource "kubernetes_config_map" "terraform-variables" {
     hibernation_enabled = "${jsonencode(var.hibernation_enabled)}"
     keda_version = "${jsonencode(var.keda_version)}"
     external_secrets_version = "${jsonencode(var.external_secrets_version)}"
-    opentelemetry_collector_version = "${jsonencode(var.opentelemetry-collector_version)}"
+    opentelemetry_collector_version = "${jsonencode(var.opentelemetry_collector_version)}"
+    nfs_subdir_external_provisioner_version = "${jsonencode(var.nfs_subdir_external_provisioner_version)}"
     include_fsx = "${jsonencode(var.include_fsx)}"
     include_pgbackup = "${jsonencode(var.include_pgbackup)}"
     include_efs = "${jsonencode(var.include_efs)}"