fix(PL-2554): fix chart default values

nestoca · Mar 21, 2024 · df0a2f8 · df0a2f8
1 parent 3651286
commit df0a2f8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 16 deletions.
diff --git a/chart/templates/secret.yaml b/chart/templates/secret.yaml
@@ -1,4 +1,5 @@
 {{- and (required ".Values.env.PLUGIN_TOKEN is required" .Values.env.PLUGIN_TOKEN) "" -}}
+{{- and (required ".Values.env.CATALOG_URL is required" .Values.env.CATALOG_URL) "" -}}
 {{- if eq .Values.secretType "secret" }}
 apiVersion: v1
 kind: Secret

diff --git a/chart/tests/with-github-app-and-sealed-secrets/expected.yaml b/chart/tests/with-github-app-and-sealed-secrets/expected.yaml
@@ -103,12 +103,9 @@ metadata:
 spec:
   encryptedData:
     CATALOG_DIR: /tmp/catalog
-    CATALOG_REVISION: ""
     CATALOG_URL: https://github.com/example/foobar.git
     GH_APP_ID: "123456"
     GH_APP_INSTALLATION_ID: "789101112"
-    GH_TOKEN: ""
-    GH_USER: ""
     GRACE_PERIOD: 10s
     PLUGIN_TOKEN: '@very!l0ngands3curet0ken'
     PORT: :8080

diff --git a/chart/tests/with-github-app/expected.yaml b/chart/tests/with-github-app/expected.yaml
@@ -6,12 +6,9 @@ metadata:
   name: my-release-joy-generator-config
 stringData:
   CATALOG_DIR: /tmp/catalog
-  CATALOG_REVISION: ""
   CATALOG_URL: https://github.com/example/foobar.git
   GH_APP_ID: "123"
   GH_APP_INSTALLATION_ID: "666"
-  GH_TOKEN: ""
-  GH_USER: ""
   GRACE_PERIOD: 10s
   PLUGIN_TOKEN: '@very!l0ngands3curet0ken'
   PORT: :8080

diff --git a/chart/tests/with-github-token/expected.yaml b/chart/tests/with-github-token/expected.yaml
@@ -6,10 +6,7 @@ metadata:
   name: my-release-joy-generator-config
 stringData:
   CATALOG_DIR: /tmp/catalog
-  CATALOG_REVISION: ""
   CATALOG_URL: https://github.com/example/foobar.git
-  GH_APP_ID: ""
-  GH_APP_INSTALLATION_ID: ""
   GH_TOKEN: "12312312312312"
   GH_USER: username
   GRACE_PERIOD: 10s

diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,14 +5,15 @@
 env:
   PORT: :8080
   GRACE_PERIOD: 10s
-  PLUGIN_TOKEN: ""
-  CATALOG_URL: ""
   CATALOG_DIR: /tmp/catalog
-  CATALOG_REVISION: ""
-  GH_USER: ""
-  GH_TOKEN: ""
-  GH_APP_ID: ""
-  GH_APP_INSTALLATION_ID: ""
+
+  # PLUGIN_TOKEN: ""
+  # CATALOG_URL: ""
+  # CATALOG_REVISION: ""
+  # GH_USER: ""
+  # GH_TOKEN: ""
+  # GH_APP_ID: ""
+  # GH_APP_INSTALLATION_ID: ""
 
 # Configuration settings for the joy-generator instance
 applicationConfig: