Merge pull request #44 from aa-replicated/demo/tier4

fix: EC3 image handling, preflight, and chart correctness

Author: aa-replicated

chart/gameshelf/templates/deployment.yaml

@@ -25,7 +25,9 @@ spec:
       {{- end }}
       containers:
         - name: gameshelf
-          {{- if .Values.imageProxy.host }}
+          {{- if .Values.image.registry }}
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- else if .Values.imageProxy.host }}
           image: "{{ .Values.imageProxy.host }}/proxy/{{ .Values.imageProxy.appSlug }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           {{- else }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"

chart/gameshelf/templates/preflight.yaml

@@ -25,7 +25,6 @@ stringData:
             exclude: {{ .Values.postgresql.enabled }}
         - http:
             collectorName: replicated-app-reachability
-            exclude: {{ .Values.preflight.excludeReachability }}
             get:
               url: {{ .Values.preflight.requiredEndpoint }}
               timeout: 10s
@@ -45,14 +44,13 @@ stringData:
         - http:
             checkName: Replicated App Reachability
             collectorName: replicated-app-reachability
-            exclude: {{ .Values.preflight.excludeReachability }}
             outcomes:
               - pass:
                   when: "statusCode == 200"
                   message: Successfully reached replicated.app. License validation will work correctly.
-              - fail:
+              - warn:
                   when: "error"
-                  message: "Cannot reach replicated.app. Outbound internet access on port 443 is required for license validation. Check firewall or proxy settings."
+                  message: "Cannot reach replicated.app. Outbound internet access on port 443 is required for online license validation. Air-gapped installs can ignore this warning."
               - warn:
                   message: "Received an unexpected response from replicated.app. License validation may be affected."
         - nodeResources:

chart/gameshelf/values.yaml

@@ -14,6 +14,7 @@ imageProxy:
   appSlug: gameshelf
 
 image:
+  registry: ""  # When set, used directly as registry (EC installs set this via helmchart.yaml)
   repository: ghcr.io/aa-replicated/gameshelf
   tag: ""
   pullPolicy: Always
@@ -121,7 +122,6 @@ preflight:
   minCPU: 2
   minMemory: 4Gi
   requiredEndpoint: "https://replicated.app"
-  excludeReachability: false
 
 replicated:
   enabled: true

helmchart.yaml

@@ -8,24 +8,22 @@ spec:
     chartVersion: "0.0.0"
   values:
     adminSecret: repl{{ ConfigOption `admin_secret`}}
-    preflight:
-      excludeReachability: repl{{ and IsEmbeddedCluster (not IsOnline) }}
     siteName: repl{{ ConfigOption `site_name`}}
     siteColor: repl{{ ConfigOption `site_color`}}
     customBrandingEnabled: repl{{ LicenseFieldValue `custom_branding_enabled` }}
-    imageProxy:
-      host: ""
     image:
+      registry: 'repl{{ ReplicatedImageRegistry "proxy.replicated.com/proxy/gameshelf/ghcr.io/aa-replicated/gameshelf" }}'
+      repository: 'repl{{ ReplicatedImageRepository "proxy.replicated.com/proxy/gameshelf/ghcr.io/aa-replicated/gameshelf" }}'
       pullPolicy: IfNotPresent
     postgresql:
       image:
-        registry: ""
+        registry: 'repl{{ ReplicatedImageRegistry "proxy.replicated.com/proxy/gameshelf/index.docker.io" }}'
       volumePermissions:
         image:
-          registry: ""
+          registry: 'repl{{ ReplicatedImageRegistry "proxy.replicated.com/proxy/gameshelf/index.docker.io" }}'
     redis:
       image:
-        registry: ""
+        registry: 'repl{{ ReplicatedImageRegistry "proxy.replicated.com/proxy/gameshelf/index.docker.io" }}'
   builder:
     postgresql:
       image: