f

replicatedhq · May 17, 2024 · c7a7533 · c7a7533
1 parent 418f0d9
commit c7a7533
Show file tree

Hide file tree

Showing 14 changed files with 74 additions and 6 deletions.
diff --git a/.github/workflows/test-archive-channel.yml b/.github/workflows/test-archive-channel.yml
@@ -36,7 +36,7 @@ jobs:
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           app-slug: replicated-actions-ci # from the Replicated QA team
-          yaml-dir: ./test/kots-install
+          yaml-dir: ./test/kots-install/yaml
           promote-channel: ci-test-archive-channel-${{ github.sha }}
 
       - name: test archive-channel

diff --git a/.github/workflows/test-create-release.yml b/.github/workflows/test-create-release.yml
@@ -48,4 +48,4 @@ jobs:
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           app-slug: replicated-actions-ci # from the Replicated QA team
-          yaml-dir: ./test/kots-install
+          yaml-dir: ./test/kots-install/yaml
diff --git a/.github/workflows/test-kots-install.yml b/.github/workflows/test-kots-install.yml
@@ -37,7 +37,7 @@ jobs:
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           app-slug: ${{ env.APP_SLUG }}
-          yaml-dir: ./test/kots-install
+          yaml-dir: ./test/kots-install/yaml
 
       - name: create-customer
         id: create-customer
@@ -57,14 +57,45 @@ jobs:
           kubernetes-distribution: kind
           timeout-minutes: 5
 
-      - name: test kots-install
-        id: kots-install
+      - name: test kots-install / config string
+        id: kots-install-config-string
         uses: ./kots-install
         with:
           kubeconfig: ${{ steps.create-cluster.outputs.cluster-kubeconfig }}
           app-slug: ${{ env.APP_SLUG }}/${{ steps.create-release.outputs.channel-slug }}
           license-file: ${{ steps.create-customer.outputs.license-file }}
           app-version-label: release__${{ steps.create-release.outputs.release-sequence }}
+          namespace: config-string
+          config-values: |
+            apiVersion: kots.io/v1beta1
+            kind: ConfigValues
+            metadata:
+              name: nginx
+            spec:
+              values:
+                api_token:
+                  value: r8yWQ/cUeLVprKGKZb2gpE5IcQ0Tep1iaNwn7078
+                example_default_value:
+                  default: please change this value
+                  value: testing
+                hidden_text:
+                  value: lPiIJL1RfL4v/YKzHfnx/9HyR2x4t5wnVxSLmzJlmf12HlqlyBoSfnvd0O+mftiT8h0+kumsBqc=
+                readonly_text_left:
+                  value: 8WIAQHZW_G
+                show_text_inputs:
+                  default: "0"
+                  value: "1"
+
+      - name: test kots-install / config file
+        id: kots-install-config-file
+        uses: ./kots-install
+        with:
+          kubeconfig: ${{ steps.create-cluster.outputs.cluster-kubeconfig }}
+          app-slug: ${{ env.APP_SLUG }}/${{ steps.create-release.outputs.channel-slug }}
+          license-file: ${{ steps.create-customer.outputs.license-file }}
+          app-version-label: release__${{ steps.create-release.outputs.release-sequence }}
+          namespace: config-string
+          config-values: ./test/kots-install/config.yaml
 
       - name: remove cluster
         id: remove-cluster

diff --git a/.github/workflows/test-prepare-cluster.yml b/.github/workflows/test-prepare-cluster.yml
@@ -82,8 +82,27 @@ jobs:
         with:
           api-token: ${{ secrets.REPLICATED_API_TOKEN }}
           app-slug: replicated-actions-ci # from the Replicated QA team
-          yaml-dir: ./test/kots-install
+          yaml-dir: ./test/kots-install/yaml
           kubernetes-distribution: kind
+          config-values: |
+            apiVersion: kots.io/v1beta1
+            kind: ConfigValues
+            metadata:
+              name: nginx
+            spec:
+              values:
+                api_token:
+                  value: r8yWQ/cUeLVprKGKZb2gpE5IcQ0Tep1iaNwn7078
+                example_default_value:
+                  default: please change this value
+                  value: testing
+                hidden_text:
+                  value: lPiIJL1RfL4v/YKzHfnx/9HyR2x4t5wnVxSLmzJlmf12HlqlyBoSfnvd0O+mftiT8h0+kumsBqc=
+                readonly_text_left:
+                  value: 8WIAQHZW_G
+                show_text_inputs:
+                  default: "0"
+                  value: "1"
 
       - name: remove cluster
         id: remove-cluster

diff --git a/test/kots-install/config.yaml b/test/kots-install/config.yaml
@@ -0,0 +1,18 @@
+apiVersion: kots.io/v1beta1
+kind: ConfigValues
+metadata:
+  name: nginx
+spec:
+  values:
+    api_token:
+      value: r8yWQ/cUeLVprKGKZb2gpE5IcQ0Tep1iaNwn7078
+    example_default_value:
+      default: please change this value
+      value: testing
+    hidden_text:
+      value: lPiIJL1RfL4v/YKzHfnx/9HyR2x4t5wnVxSLmzJlmf12HlqlyBoSfnvd0O+mftiT8h0+kumsBqc=
+    readonly_text_left:
+      value: 8WIAQHZW_G
+    show_text_inputs:
+      default: "0"
+      value: "1"
diff --git a/test/kots-install/example-configmap.yaml → .../kots-install/yaml/example-configmap.yaml b/test/kots-install/example-configmap.yaml → .../kots-install/yaml/example-configmap.yaml
diff --git a/test/kots-install/example-deployment.yaml → ...kots-install/yaml/example-deployment.yaml b/test/kots-install/example-deployment.yaml → ...kots-install/yaml/example-deployment.yaml
diff --git a/test/kots-install/example-service.yaml → test/kots-install/yaml/example-service.yaml b/test/kots-install/example-service.yaml → test/kots-install/yaml/example-service.yaml
diff --git a/test/kots-install/k8s-app.yaml → test/kots-install/yaml/k8s-app.yaml b/test/kots-install/k8s-app.yaml → test/kots-install/yaml/k8s-app.yaml
diff --git a/test/kots-install/kots-app.yaml → test/kots-install/yaml/kots-app.yaml b/test/kots-install/kots-app.yaml → test/kots-install/yaml/kots-app.yaml
diff --git a/test/kots-install/kots-config.yaml → test/kots-install/yaml/kots-config.yaml b/test/kots-install/kots-config.yaml → test/kots-install/yaml/kots-config.yaml
diff --git a/test/kots-install/kots-lint-config.yaml → test/kots-install/yaml/kots-lint-config.yaml b/test/kots-install/kots-lint-config.yaml → test/kots-install/yaml/kots-lint-config.yaml
diff --git a/test/kots-install/kots-preflight.yaml → test/kots-install/yaml/kots-preflight.yaml b/test/kots-install/kots-preflight.yaml → test/kots-install/yaml/kots-preflight.yaml
diff --git a/test/kots-install/kots-support-bundle.yaml → ...ots-install/yaml/kots-support-bundle.yaml b/test/kots-install/kots-support-bundle.yaml → ...ots-install/yaml/kots-support-bundle.yaml