fix: ofc dockerconfigjson must be json

filipeforattini · May 5, 2022 · d7be562 · d7be562
1 parent d645487
commit d7be562
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/service-push.yml b/.github/workflows/service-push.yml
@@ -562,7 +562,7 @@ jobs:
             --data-value repository=${{steps.deploy_setup.outputs.deploy_repository}} \
             --data-value tag=${{steps.deploy_setup.outputs.deploy_tag}} \
             --data-value pipelineControl.datetime=${{steps.deploy_setup.outputs.run_started_at}} \
-            --data-value pipelineControl.dockerconfigjson="$(cat ~/.docker/config.json | jq -cR | base64)" \
+            --data-value pipelineControl.dockerconfigjson="$(cat ~/.docker/config.json | jq -cR)" \
               > ./manifests/k8s-to-apply.yml
 
       - name: Debug | Print k8s-to-apply.yml

diff --git a/deploy/as-k8s/service.yml b/deploy/as-k8s/service.yml
@@ -1,11 +1,12 @@
-#@ load("@ytt:data", "data")
 #@ load("@ytt:md5", "md5")
-#@ load("@ytt:sha256", "sha256")
+#@ load("@ytt:data", "data")
 #@ load("@ytt:json", "json")
+#@ load("@ytt:sha256", "sha256")
+#@ load("@ytt:base64", "base64")
 
 #@ configMD5 = md5.sum("data")
 #@ configSHA256 = sha256.sum("data")
-#@ configAsJson = json.encode(data.values)
+#@ configEncoded = base64.encode(json.encode(data.values))
 
 #@ globalLabels = {}
 #@ globalLabels.update({ "ecosystem": data.values.ecosystem })
@@ -56,9 +57,10 @@ metadata:
   #@ secretAnnotations.update(globalAnnotations)
   annotations: #@ secretAnnotations
 data:
-  data: #@ configAsJson
+  data: #@ configEncoded
   config-md5: #@ configMD5
   config-sha256: #@ configSHA256
+  dockerconfigjson: #@ base64.encode(data.values.pipelineControl.dockerconfigjson)
 
 ---
 apiVersion: v1