[kots] Add new config to upload dockerConfigJson file

Signed-off-by: Tarun Pothulapati <[email protected]>

Author: Pothulapati

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

@@ -79,6 +79,16 @@ spec:
               fi
 
               echo "Gitpod: Generate the base Installer config"
+              echo "Gitpod: Create a Helm template directory"
+              rm -Rf "${GITPOD_OBJECTS}"
+              mkdir -p "${GITPOD_OBJECTS}/templates"
+              cat <<EOF >> "${GITPOD_OBJECTS}/Chart.yaml"
+              apiVersion: v2
+              name: gitpod-kots
+              description: Always ready-to-code
+              version: "1.0.0"
+              appVersion: "$(/app/installer version | yq e '.version' -)"
+              EOF
               /app/installer init > "${CONFIG_FILE}"
 
               echo "Gitpod: auto-detecting ShiftFS support on host machine"
@@ -174,8 +184,7 @@ spec:
                 kubectl create secret docker-registry container-registry \
                   --namespace "{{repl Namespace }}" \
                   --from-file=.dockerconfigjson=/tmp/container-registry-secret \
-                  -o yaml --dry-run=client | \
-                  kubectl replace --namespace "{{repl Namespace }}" --force -f -
+                  -o yaml --dry-run=client >  "${GITPOD_OBJECTS}/templates/gitpod.yaml"
 
                 yq e -i ".containerRegistry.inCluster = false" "${CONFIG_FILE}"
                 yq e -i ".containerRegistry.external.url = \"{{repl ConfigOption "reg_url" }}\"" "${CONFIG_FILE}"
@@ -298,19 +307,8 @@ spec:
               config=$(cat "${CONFIG_FILE}")
               echo "Gitpod: ${CONFIG_FILE}=${config}"
 
-              echo "Gitpod: Create a Helm template directory"
-              rm -Rf "${GITPOD_OBJECTS}"
-              mkdir -p "${GITPOD_OBJECTS}/templates"
-              cat <<EOF >> "${GITPOD_OBJECTS}/Chart.yaml"
-              apiVersion: v2
-              name: gitpod-kots
-              description: Always ready-to-code
-              version: "1.0.0"
-              appVersion: "$(/app/installer version | yq e '.version' -)"
-              EOF
-
               echo "Gitpod: render Kubernetes manifests"
-              /app/installer render -c "${CONFIG_FILE}" --namespace {{repl Namespace }} --use-experimental-config > "${GITPOD_OBJECTS}/templates/gitpod.yaml"
+              /app/installer render -c "${CONFIG_FILE}" --namespace {{repl Namespace }} --use-experimental-config >> "${GITPOD_OBJECTS}/templates/gitpod.yaml"
 
               if [ '{{repl ConfigOptionEquals "reg_incluster" "1" }}' = "true" ];
               then
@@ -329,6 +327,33 @@ spec:
                   "${GITPOD_OBJECTS}/templates/gitpod.yaml"
               fi
 
+              # figure out the secret to use
+              if [ '{{repl ConfigOptionEquals "reg_incluster" "0" }}' = "true" ];
+              then
+                export REGISTRY_SECRET_NAME="container-registry"
+              else
+                export REGISTRY_SECRET_NAME="builtin-registry-auth"
+              fi
+
+              if [ '{{repl ConfigOptionNotEquals "reg_docker_config" "" }}' = "true" ];
+              then
+                echo "Gitpod: Add given extra docker config json file to ${REGISTRY_SECRET_NAME}"
+
+                yq eval-all '(select(.kind == "Secret" and .metadata.name == env(REGISTRY_SECRET_NAME)) | .data.".dockerconfigjson")' \
+                  "${GITPOD_OBJECTS}/templates/gitpod.yaml" \
+                  | base64 -d \
+                  > /tmp/currentconfig.json
+
+                DOCKER_CONFIG='{{repl ConfigOptionData "reg_docker_config" | Base64Encode }}'
+                echo "${DOCKER_CONFIG}" | base64 -d  > /tmp/userconfig.json
+
+                export REGISTRY_SECRET=$(jq -s '.[0] * .[1]' /tmp/userconfig.json /tmp/currentconfig.json | base64 -w 0)
+
+                echo "Gitpod: update the in-cluster registry secret"
+                yq eval-all --inplace '(select(.kind == "Secret" and .metadata.name == env(REGISTRY_SECRET_NAME)) | .data.".dockerconfigjson") |= env(REGISTRY_SECRET)' \
+                  "${GITPOD_OBJECTS}/templates/gitpod.yaml"
+              fi
+
               echo "Gitpod: Escape any Golang template values"
               sed -i -r 's/(.*\{\{.*)/{{`\1`}}/' "${GITPOD_OBJECTS}/templates/gitpod.yaml"
 

install/kots/manifests/kots-config.yaml

@@ -44,6 +44,11 @@ spec:
             - name: s3
               title: S3
 
+        - name: reg_docker_config
+          title: Registry credentials
+          type: file
+          help_text: docker [config json file](https://docs.docker.com/engine/reference/commandline/cli/#sample-configuration-file) used to access private registries, containing images specifically for the workspace image builds.
+
         # S3 help_text
         - name: reg_incluster_storage_s3_region
           title: Storage region