From 0308389299f0ca4bae245508bb03de2d3f4f0d7a Mon Sep 17 00:00:00 2001
From: mayurcrewale <110026280+mayurcrewale@users.noreply.github.com>
Date: Mon, 11 Sep 2023 12:11:22 +0530
Subject: [PATCH] update template (#50)

* update template

* Update server-secret.yaml

* Update server-service.yaml

* Update server-configmap.yaml

* Update server-job.yaml

* Update server-pdb.yaml

* Update Chart.yaml

* Revert back to upstream version

* Changed chart action version

* added debug mode

* added debug mode

* modified values.yaml

* modified values.yaml

* updated values.yaml

* template format corrected

* values.yaml restored

---------

Co-authored-by: Mayur Rewale <mayurrewale@OSX-90051.local>
---
 .github/workflows/lint-test.yaml                 |  4 ++--
 charts/temporal/Chart.yaml                       |  2 +-
 charts/temporal/templates/server-deployment.yaml |  4 ++--
 charts/temporal/templates/server-service.yaml    |  7 +++----
 charts/temporal/values.yaml                      | 16 ++++++++++------
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
index 242aef0..4d403f6 100644
--- a/.github/workflows/lint-test.yaml
+++ b/.github/workflows/lint-test.yaml
@@ -21,7 +21,7 @@ jobs:
           python-version: 3.7
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.2.1
+        uses: helm/chart-testing-action@v2.4.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -32,7 +32,7 @@ jobs:
           fi
 
       - name: Run chart-testing (lint)
-        run: ct lint --validate-maintainers=false --lint-conf lintconf.yaml
+        run: ct lint --debug --validate-maintainers=false --lint-conf lintconf.yaml
 
       # Disabled until we update/fix the jenkins, ingress-nginx and vouch charts
       # - name: Create kind cluster
diff --git a/charts/temporal/Chart.yaml b/charts/temporal/Chart.yaml
index 2433c58..9007a95 100644
--- a/charts/temporal/Chart.yaml
+++ b/charts/temporal/Chart.yaml
@@ -49,7 +49,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 0.24.0
+version: 0.24.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.
diff --git a/charts/temporal/templates/server-deployment.yaml b/charts/temporal/templates/server-deployment.yaml
index 82ad556..c49f7cb 100644
--- a/charts/temporal/templates/server-deployment.yaml
+++ b/charts/temporal/templates/server-deployment.yaml
@@ -1,7 +1,6 @@
 {{- if $.Values.server.enabled }}
 {{- range $service := (list "frontend" "history" "matching" "worker") }}
-{{- $serviceValues := index $.Values.server $service -}}
----
+{{- $serviceValues := index $.Values.server $service }}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -186,5 +185,6 @@ spec:
       topologySpreadConstraints:
         {{- toYaml . | nindent 8 }}
     {{- end }}
+---
 {{- end }}
 {{- end }}
diff --git a/charts/temporal/templates/server-service.yaml b/charts/temporal/templates/server-service.yaml
index 914935d..03b4262 100644
--- a/charts/temporal/templates/server-service.yaml
+++ b/charts/temporal/templates/server-service.yaml
@@ -1,5 +1,4 @@
 {{- if $.Values.server.enabled }}
----
 apiVersion: v1
 kind: Service
 metadata:
@@ -30,10 +29,9 @@ spec:
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/component: frontend
 
-
-{{- range $service := (list "frontend" "matching" "history" "worker") }}
-{{- $serviceValues := index $.Values.server $service -}}
 ---
+{{- range $service := (list "frontend" "matching" "history" "worker") }}
+{{- $serviceValues := index $.Values.server $service }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -76,5 +74,6 @@ spec:
     app.kubernetes.io/instance: {{ $.Release.Name }}
     app.kubernetes.io/component: {{ $service }}
 
+---
 {{- end }}
 {{- end }}
diff --git a/charts/temporal/values.yaml b/charts/temporal/values.yaml
index b4f9ac4..7b6682e 100644
--- a/charts/temporal/values.yaml
+++ b/charts/temporal/values.yaml
@@ -301,18 +301,22 @@ web:
     # loadBalancerIP:
 
   ingress:
-    enabled: false
-    # className:
+    enabled: true
+    className: alb
     annotations: {}
-    # kubernetes.io/ingress.class: traefik
-    # ingress.kubernetes.io/ssl-redirect: "false"
+    kubernetes.io/ingress.class: traefik
+    # ingress.kubernetes.io/ssl-redirect: "true"
     # traefik.frontend.rule.type: PathPrefix
+  #   alb.ingress.kubernetes.io/scheme: "internet-facing"                                                                                                                                                                          │
+  # # # │alb.ingress.kubernetes.io/security-groups: "sg-042081a1c69c1d8be"                                                                                                                                                                                    │
+  #   alb.ingress.kubernetes.io/success-codes: "200"
+  
     hosts:
-      - "/"
+      - "csw.integration.opengov.zone"
       # - "domain.com/xyz"
       # - "domain.com"
     tls: []
-    #  - secretName: chart-example-tls
+    #  - secretName: chart-example-tlsuuuu
     #    hosts:
     #      - chart-example.local