init commit

Author: argeiger

solutions/deploy/cloud-pak-deployer/main.tf

@@ -25,6 +25,7 @@ locals {
   yaml_files = {
     job_uninstall_cpd = "job-uninstall-cpd.yaml.tftpl"
   }
+  image_secret_map = var.cloud_pak_deployer_secret != null ? { name = "cpd-docker-cfg" } : {}
 }
 
 # Generate configuration file
@@ -208,9 +209,14 @@ resource "kubernetes_job_v1" "cloud_pak_deployer_job" {
         }
       }
       spec {
-        image_pull_secrets {
-          name = var.cloud_pak_deployer_secret != null ? "cpd-docker-cfg" : ""
+        dynamic "image_pull_secrets" {
+          for_each = local.image_secret_map
+
+          content {
+            name = image_pull_secrets.value
+          }
         }
+
         container {
           name                       = local.cloud_pak_deployer.job_name
           image                      = local.cloud_pak_deployer.image

solutions/deploy/cloud-pak-deployer/versions.tf

@@ -3,7 +3,7 @@ terraform {
   required_providers {
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.34.0"
+      version = "2.35.0"
     }
     local = {
       source  = "hashicorp/local"

solutions/deploy/main.tf

@@ -71,6 +71,7 @@ module "cloud_pak_deployer" {
     }
   )
   cloud_pak_deployer_image = var.cloud_pak_deployer_image != null ? var.cloud_pak_deployer_image : module.build_cpd_image[0].container_registry_output_image
+
   cloud_pak_deployer_secret = var.cloud_pak_deployer_secret != null ? var.cloud_pak_deployer_secret : (var.cloud_pak_deployer_image == null ?
   { username : "iamapikey", password : var.ibmcloud_api_key, server : module.build_cpd_image[0].container_registry_server } : null)
 

solutions/deploy/versions.tf

@@ -11,7 +11,7 @@ terraform {
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
-      version = "2.34.0"
+      version = "2.35.0"
     }
     null = {
       source  = "hashicorp/null"