todo

Author: Simon Emms

install/kots/manifests/gitpod-installer-job.yaml

@@ -52,8 +52,6 @@ spec:
               value: /run/containerd/io.containerd.runtime.v2.task/k8s.io
             - name: CONTAINERD_SOCKET_AL
               value: /run/containerd/containerd.sock
-            - name: CUSTOM_LABELS_FILES
-              value: /custom-labels/customization.yaml
             - name: GITPOD_OBJECTS
               value: /tmp/gitpod
           command:
@@ -292,7 +290,7 @@ spec:
               fi
 
               echo "Gitpod: Apply the backup labels"
-              yq e -i ".customization += $(yq '.' -o json "${CUSTOM_LABELS_FILES}")" "${CONFIG_FILE}"
+              yq e -i '.customization += load("/custom-labels/customization.yaml")' "${CONFIG_FILE}"
 
               echo "Gitpod: Update platform telemetry value"
               yq eval-all --inplace '.experimental.telemetry.data.platform = "{{repl Distribution }}"' "${CONFIG_FILE}"
@@ -303,6 +301,9 @@ spec:
               echo "Gitpod: ${CONFIG_PATCH_FILE}=${config_patch}"
               yq eval-all --inplace 'select(fileIndex == 0) * select(fileIndex == 1)' "${CONFIG_FILE}" /tmp/patch.yaml
 
+              echo "Gitpod: Escape all keys - this avoids any collisions in the customizations/patch"
+              yq e -i '.' -o json -I 0 "${CONFIG_FILE}"
+
               echo "Gitpod: Generate the Kubernetes objects"
               config=$(cat "${CONFIG_FILE}")
               echo "Gitpod: ${CONFIG_FILE}=${config}"