Use infra domain and test charts

Signed-off-by: Alexander Dobrodey <[email protected]>
vinivia · Dec 6, 2023 · 101bc9c · 101bc9c
1 parent c496083
commit 101bc9c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 42 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -6,50 +6,49 @@ on:
       - main
 
 jobs:
-#  test:
-#    runs-on: ubuntu-latest
-#    steps:
-#      - name: Checkout
-#        uses: actions/checkout@v2
-#        with:
-#          fetch-depth: 0
-#      - name: Set up Helm
-#        uses: azure/setup-helm@v3
-#        with:
-#          version: v3.10.0
-#      - name: lint
-#        run: |
-#          for x in ./stable/*; do
-#            pushd $x
-#            helm dependency update .
-#            helm lint . \
-#              --set global.org=core \
-#              --set global.serviceName=test \
-#              --with-subcharts \
-#              --strict
-#            popd
-#          done
-#      - name: validate
-#        run: |
-#          for x in ./stable/*; do
-#            if [[ "$x" != "./stable/k8s-common" ]]; then
-#              pushd $x
-#              helm template . \
-#                --debug \
-#                --generate-name \
-#                --namespace test \
-#                --dependency-update \
-#                --set global.org=core \
-#                --set global.serviceName=test \
-#                --values values.yaml
-#            popd
-#            fi
-#          done
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Set up Helm
+        uses: azure/setup-helm@v3
+        with:
+          version: v3.10.0
+      - name: lint
+        run: |
+          for x in ./stable/*; do
+            pushd $x
+            helm dependency update .
+            helm lint . \
+              --set global.org=core \
+              --set global.serviceName=test \
+              --with-subcharts \
+              --strict
+            popd
+          done
+      - name: validate
+        run: |
+          for x in ./stable/*; do
+            pushd $x
+            helm template . \
+              --debug \
+              --generate-name \
+              --namespace test \
+              --dependency-update \
+              --set global.org=core \
+              --set global.serviceName=test \
+              --values values.yaml
+            popd
+          done
+
   release:
     permissions:
       contents: write
     runs-on: ubuntu-latest
-#    needs: test
+    needs: test
     steps:
       - name: Checkout
         uses: actions/checkout@v3

diff --git a/global/k8s-common/templates/_ingress.tpl b/global/k8s-common/templates/_ingress.tpl
@@ -116,7 +116,7 @@ This solution should be changed in the future.
 {{ required "global.serviceName is missing" .Values.global.serviceName }}.
 {{- required "global.org is missing" .Values.global.org }}
 {{- if not .Values.global.production -}}-{{ .Values.global.environmentType }}{{- end -}}
-.aws.
+.infra.
 {{- required "global.domain is missing" .Values.global.domain }}
 {{- end -}}
 
@@ -129,7 +129,7 @@ This solution should be changed in the future.
 {{- required "global.serviceName is missing" .Values.global.serviceName }}.
 {{- required "global.org is missing" .Values.global.org }}
 {{- if not .Values.global.production -}}-{{ .Values.global.environmentType }}{{- end -}}
-.aws.
+.infra.
 {{- required "global.domain is missing" .Values.global.domain }}
 {{- end -}}
 {{- end -}}