Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Parameterise inttest ingress to be able to deploy on different servers #616

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ spec:
name: inttests-{{ .Values.branch }}
env:
- name: CONTEXTROOT
value: {{ .Values.branch }}/maven-repo/inttests
value: {{ .Values.branch }}/maven-repo/{{ .Values.ingress.pathSuffix }}
ports:
- containerPort: 80
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,24 @@ kind: Ingress
metadata:
name: inttests-{{ .Values.branch }}
namespace: {{ .Values.namespace }}
{{- with .Values.ingress.annotations }}
annotations:
kubernetes.io/ingress.class: "public-iks-k8s-nginx"
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingress.ingressClassName }}
{{- with .Values.ingress.tls }}
tls:
- hosts:
- development.galasa.dev
secretName: galasa-wildcard-cert
{{- toYaml . | nindent 4 }}
{{- end }}
rules:
- host: development.galasa.dev
- host: {{ .Values.ingress.externalHostname }}
http:
paths:
- backend:
service:
name: inttests-{{ .Values.branch }}
port:
number: 80
path: /{{ .Values.branch }}/maven-repo/{{ .Values.ingressPathSuffix }}
path: /{{ .Values.branch }}/maven-repo/{{ .Values.ingress.pathSuffix }}
pathType: Prefix
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,13 @@ namespace: galasa-development
branch: main
imageName: ghcr.io/galasa-dev/inttests-maven-artefacts
imageTag: main
ingressPathSuffix: inttests

ingress:
externalHostname: development.galasa.dev
ingressClassName: public-iks-k8s-nginx
pathSuffix: inttests
annotations: {}
tls:
- hosts:
- development.galasa.dev
secretName: galasa-wildcard-cert
Loading