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

fix: chart and CI correctness fixes

Author: aa-replicated

.github/workflows/pr.yml

@@ -43,7 +43,9 @@ jobs:
           context: .
           push: true
           platforms: linux/amd64
-          tags: ghcr.io/aa-replicated/gameshelf:pr-${{ github.event.pull_request.number }}
+          tags: |
+            ghcr.io/aa-replicated/gameshelf:pr-${{ github.event.pull_request.number }}
+            ghcr.io/aa-replicated/gameshelf:pr-${{ github.event.pull_request.number }}-${{ github.run_number }}
 
       - name: Package Helm chart
         run: |

.github/workflows/release.yml

@@ -60,15 +60,15 @@ jobs:
 
       - name: Create Replicated release
         id: create-release
-        uses: replicatedhq/replicated-actions/create-release@v1.20.0
+        uses: replicatedhq/replicated-actions/create-release@v1
         with:
           app-slug: gameshelf
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           yaml-dir: release/
           version: ${{ env.VERSION }}
 
       - name: Promote to Unstable
-        uses: replicatedhq/replicated-actions/promote-release@v1.20.0
+        uses: replicatedhq/replicated-actions/promote-release@v1
         with:
           app-slug: gameshelf
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}

chart/gameshelf/templates/preflight.yaml

@@ -25,13 +25,14 @@ stringData:
             exclude: {{ .Values.postgresql.enabled }}
         - http:
             collectorName: replicated-app-reachability
+            exclude: {{ .Values.preflight.excludeReachability }}
             get:
               url: {{ .Values.preflight.requiredEndpoint }}
               timeout: 10s
       analyzers:
         - textAnalyze:
             checkName: External Database Connectivity
-            fileName: db-connection-check/check.log
+            fileName: db-connection-check.log
             regex: "CONNECTION_OK"
             exclude: {{ .Values.postgresql.enabled }}
             outcomes:
@@ -44,6 +45,7 @@ stringData:
         - http:
             checkName: Replicated App Reachability
             collectorName: replicated-app-reachability
+            exclude: {{ .Values.preflight.excludeReachability }}
             outcomes:
               - pass:
                   when: "statusCode == 200"

chart/gameshelf/templates/support-bundle.yaml

@@ -44,7 +44,7 @@ stringData:
         - logs:
             collectorName: replicated-sdk
             selector:
-              - app=replicated
+              - app.kubernetes.io/name=replicated
             namespace: {{ .Release.Namespace }}
             limits:
               maxLines: 5000
@@ -68,7 +68,7 @@ stringData:
                   message: "GameShelf health endpoint is not responding or returning an unhealthy status. Check the gameshelf-app logs for startup errors or crashes."
         - textAnalyze:
             checkName: Database Connection Errors
-            fileName: gameshelf-app/*.log
+            fileName: "*/gameshelf.log"
             regex: "connection refused|no such host|dial tcp.*connect: connection refused"
             outcomes:
               - fail:

chart/gameshelf/values.yaml

@@ -121,6 +121,7 @@ preflight:
   minCPU: 2
   minMemory: 4Gi
   requiredEndpoint: "https://replicated.app"
+  excludeReachability: false
 
 replicated:
   enabled: true

helmchart.yaml

@@ -7,9 +7,9 @@ spec:
     name: gameshelf
     chartVersion: "0.0.0"
   values:
-    replicated:
-      integrationLicenseID: repl{{ LicenseFieldValue `licenseID` }}
     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` }}
@@ -20,6 +20,9 @@ spec:
     postgresql:
       image:
         registry: ""
+      volumePermissions:
+        image:
+          registry: ""
     redis:
       image:
         registry: ""