fix: properly process pull secret string

ludwig-mueller · ludwig-mueller · commit ae48a58495dd · 2025-10-08T21:02:42.000+02:00
diff --git a/solutions/standard-openshift/ansible/templates-ansible/deploy-openshift-cluster/playbook-configure-ocp-cluster.yml.tftpl b/solutions/standard-openshift/ansible/templates-ansible/deploy-openshift-cluster/playbook-configure-ocp-cluster.yml.tftpl
@@ -26,7 +26,7 @@
     powervs_zone: "${POWERVS_ZONE}"
     vpc_name: "${VPC_NAME}"
     vpc_region: "${VPC_REGION}"
-    pull_secret: '${PULL_SECRET_FILE}'
+    pull_secret: '${PULL_SECRET}'
     ssh_key: "${SSH_KEY}"
     base_path: "/tmp"
     base_url: "https://mirror.openshift.com/pub/openshift-v4"
diff --git a/solutions/standard-openshift/main.tf b/solutions/standard-openshift/main.tf
@@ -105,7 +105,7 @@ module "ocp_cluster_install_configuration" {
     POWERVS_ZONE : var.powervs_zone,
     VPC_NAME : module.standard.vpc_names[0],
     VPC_REGION : local.vpc_region,
-    PULL_SECRET_FILE : jsonencode(var.openshift_pull_secret),
+    PULL_SECRET : trimspace(var.openshift_pull_secret),
     SSH_KEY : var.ssh_public_key,
   }
 

Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ module "ocp_cluster_install_configuration" {`
`105`	`105`	`POWERVS_ZONE : var.powervs_zone,`
`106`	`106`	`VPC_NAME : module.standard.vpc_names[0],`
`107`	`107`	`VPC_REGION : local.vpc_region,`
`108`		`- PULL_SECRET_FILE : jsonencode(var.openshift_pull_secret),`
	`108`	`+ PULL_SECRET : trimspace(var.openshift_pull_secret),`
`109`	`109`	`SSH_KEY : var.ssh_public_key,`
`110`	`110`	`}`
`111`	`111`