update secret format

smarunich · smarunich · commit 4765001b1802 · 2022-12-05T09:25:29.000-05:00
diff --git a/modules/tsb/cp/main.tf b/modules/tsb/cp/main.tf
@@ -132,12 +132,17 @@ resource "kubernetes_secret_v1" "cr_pull_secret" {
   }
 
   data = {
-    "docker-server"    = var.registry
-    "docker-username"  = var.registry_username
-    "docker-password"  = var.registry_password
+    ".dockerconfigjson" = jsonencode({
+      auths = {
+        "${var.registry}" = {
+          "username" = var.registry_username
+          "password" = var.registry_password
+        }
+      }
+    })
   }
 
-  type       = "kubernetes.io/generic"
+  type       = "kubernetes.io/dockerconfigjson"
   depends_on = [helm_release.controlplane]
 }
 

Original file line number	Diff line number	Diff line change
`@@ -132,12 +132,17 @@ resource "kubernetes_secret_v1" "cr_pull_secret" {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`data = {`
`135`		`- "docker-server" = var.registry`
`136`		`- "docker-username" = var.registry_username`
`137`		`- "docker-password" = var.registry_password`
	`135`	`+ ".dockerconfigjson" = jsonencode({`
	`136`	`+ auths = {`
	`137`	`+ "${var.registry}" = {`
	`138`	`+ "username" = var.registry_username`
	`139`	`+ "password" = var.registry_password`
	`140`	`+ }`
	`141`	`+ }`
	`142`	`+ })`
`138`	`143`	`}`
`139`	`144`
`140`		`- type = "kubernetes.io/generic"`
	`145`	`+ type = "kubernetes.io/dockerconfigjson"`
`141`	`146`	`depends_on = [helm_release.controlplane]`
`142`	`147`	`}`
`143`	`148`