Skip to content

Commit

Permalink
update template (#50)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
mayurcrewale and Mayur Rewale committed Sep 11, 2023
1 parent 3ec45a2 commit 0308389
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 15 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/lint-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion charts/temporal/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions charts/temporal/templates/server-deployment.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -186,5 +185,6 @@ spec:
topologySpreadConstraints:
{{- toYaml . | nindent 8 }}
{{- end }}
---
{{- end }}
{{- end }}
7 changes: 3 additions & 4 deletions charts/temporal/templates/server-service.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{- if $.Values.server.enabled }}
---
apiVersion: v1
kind: Service
metadata:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -76,5 +74,6 @@ spec:
app.kubernetes.io/instance: {{ $.Release.Name }}
app.kubernetes.io/component: {{ $service }}

---
{{- end }}
{{- end }}
16 changes: 10 additions & 6 deletions charts/temporal/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 0308389

Please sign in to comment.