stuff

Author: Simon Emms

install/kots/manifests/gitpod-config-patch.yaml

@@ -10,3 +10,5 @@ metadata:
     component: gitpod-installer
 data:
   gitpod-config-patch.yaml: '{{repl if and (ConfigOptionEquals "advanced_mode_enabled" "1") (ConfigOptionNotEquals "config_patch" "") }}{{repl ConfigOption "config_patch" }}{{repl else }}{{repl printf "{}" | Base64Encode }}{{repl end }}'
+  customization-patch.yaml: |
+    repl{{ ConfigOptionData "customization_patch" | default "" | nindent 4 }}

install/kots/manifests/gitpod-installation-status.yaml

@@ -30,7 +30,7 @@ spec:
       containers:
         - name: installation-status
           # This will normally be the release tag
-          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-move-kots-bash-script.3"
+          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-move-kots-bash-script.6"
           command:
             - /bin/sh
             - -c

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

@@ -28,7 +28,7 @@ spec:
       containers:
         - name: installer
           # This will normally be the release tag
-          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-move-kots-bash-script.3"
+          image: "eu.gcr.io/gitpod-core-dev/build/installer:sje-move-kots-bash-script.6"
           volumeMounts:
             - mountPath: /config-patch
               name: config-patch
@@ -41,6 +41,8 @@ spec:
               value: /tmp/gitpod-config.yaml
             - name: CONFIG_PATCH_FILE
               value: /config-patch/gitpod-config-patch.yaml
+            - name: CUSTOMIZATION_PATCH_FILE
+              value: /config-path/customization-patch.yaml
             - name: CONTAINERD_DIR_K3S
               value: /run/k3s/containerd/io.containerd.runtime.v2.task/k8s.io
             - name: CONTAINERD_SOCKET_K3S

install/kots/manifests/gitpod-kots-config.yaml

@@ -47,7 +47,7 @@ data:
   # TLS certificate settings
   CERT_MANAGER_ENABLED: repl{{ ConfigOption "cert_manager_enabled" | quote }}
   TLS_SELF_SIGNED_ENABLED: repl{{ ConfigOption "tls_self_signed_enabled" | quote }}
-  TLS_USE_CUSTOM_CA_CRT: repl{{ ConfigOptionNotEquals tls_ca_crt" "" | quote }} # Use comparison not value
+  TLS_CUSTOM_CA_CRT_ENABLED: repl{{ ConfigOptionNotEquals "tls_ca_crt" "" | quote }} # Use comparison not value
 
   # User management settings
   USER_MANAGEMENT_BLOCK_ENABLED: repl{{ ConfigOption "user_management_block_enabled" | quote }}
@@ -56,3 +56,4 @@ data:
   # Advanced settings
   ADVANCED_MODE_ENABLED: repl{{ ConfigOption "advanced_mode_enabled" | quote }}
   COMPONENT_PROXY_SERVICE_SERVICETYPE: repl{{ ConfigOption "component_proxy_service_serviceType" | quote }}
+  CUSTOMIZATION_PATCH_ENABLED: repl{{ ConfigOptionNotEquals "customization_patch" "" | quote }} # Use comparison not value

install/kots/manifests/gitpod-registry-secret.yaml

@@ -0,0 +1,12 @@
+# Copyright (c) 2022 Gitpod GmbH. All rights reserved.
+# Licensed under the MIT License. See License-MIT.txt in the project root for license information.
+
+apiVersion: v1
+kind: Secret
+metadata:
+  name: external-container-registry
+  annotations:
+    kots.io/when: '{{repl ConfigOptionEquals "reg_incluster" "0" }}'
+type: kubernetes.io/dockerconfigjson
+data:
+  .dockerconfigjson: '{{repl printf "{\"auths\": {\"%s\": {\"username\": \"%s\", \"password\": %s, \"auth\": \"%s\"}}}" (ConfigOption "reg_server" | default (ConfigOption "reg_url")) (ConfigOption "reg_username") (ConfigOption "reg_password" | toJson) (printf "%s:%s" (ConfigOption "reg_username") (ConfigOption "reg_password") | Base64Encode) | Base64Encode }}'