diff --git a/charts/brokencrystals/Chart.yaml b/charts/brokencrystals/Chart.yaml index 1df27f55..4f8f02c9 100644 --- a/charts/brokencrystals/Chart.yaml +++ b/charts/brokencrystals/Chart.yaml @@ -4,7 +4,7 @@ description: | Benchmark application that uses modern technologies and implements a set of common security vulnerabilities type: application -version: 0.0.67 +version: 0.0.68 keywords: - brokencrystals - brkn diff --git a/charts/brokencrystals/templates/ingress.yaml b/charts/brokencrystals/templates/ingress.yaml index eca56389..c73bf9cb 100644 --- a/charts/brokencrystals/templates/ingress.yaml +++ b/charts/brokencrystals/templates/ingress.yaml @@ -1,4 +1,3 @@ -{{- if .Values.ingress.url }} --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -8,15 +7,15 @@ metadata: annotations: nginx.ingress.kubernetes.io/proxy-ssl-protocols: "TLSv1.1 TLSv1.2" nginx.ingress.kubernetes.io/ssl-redirect: "false" - {{- if eq .Values.ingress.cert "" }} + {{ if eq .Values.ingress.cert "" }} cert-manager.io/cluster-issuer: letsencrypt-cf-prod - {{- end }} + {{ end }} spec: ingressClassName: nginx tls: - hosts: - {{ .Values.ingress.url }} - secretName: {{- if eq .Values.ingress.cert "" }}{{ include "brokencrystals.fullname" . }}-brokencrystals-secret{{ else }}{{ .Values.ingress.cert }}{{- end }} + secretName: {{ if eq .Values.ingress.cert "" }}{{ include "brokencrystals.fullname" . }}-brokencrystals-secret{{ else }}{{ .Values.ingress.cert }}{{ end }} rules: - host: {{ .Values.ingress.url }} http: @@ -28,9 +27,7 @@ spec: name: {{ .Release.Name }} port: number: 80 -{{- end }} -{{- if .Values.ingress.url }} --- apiVersion: networking.k8s.io/v1 kind: Ingress @@ -40,15 +37,15 @@ metadata: annotations: nginx.ingress.kubernetes.io/ssl-redirect: "false" nginx.ingress.kubernetes.io/proxy-ssl-protocols: "TLSv1.1 TLSv1.2" - {{- if eq .Values.ingress.cert "" }} + {{ if eq .Values.ingress.cert "" }} cert-manager.io/cluster-issuer: letsencrypt-cf-prod - {{- end }} + {{ end }} spec: ingressClassName: nginx tls: - hosts: - auth{{ .Values.ingress.authlevel }}{{ .Values.ingress.url }} - secretName: {{- if eq .Values.ingress.cert "" }}{{ include "brokencrystals.fullname" . }}-brokencrystals-keycloak-secret{{ else }}{{ .Values.ingress.cert }}{{- end }} + secretName: {{ if eq .Values.ingress.cert "" }}{{ include "brokencrystals.fullname" . }}-brokencrystals-keycloak-secret{{ else }}{{ .Values.ingress.cert }}{{ end }} rules: - host: auth{{ .Values.ingress.authlevel }}{{ .Values.ingress.url }} http: @@ -60,4 +57,3 @@ spec: name: {{ .Release.Name }}-keycloak port: number: 8080 -{{- end }} diff --git a/charts/brokencrystals/values.yaml b/charts/brokencrystals/values.yaml index c1a852fa..f38238c3 100644 --- a/charts/brokencrystals/values.yaml +++ b/charts/brokencrystals/values.yaml @@ -1,5 +1,5 @@ ingress: - url: + url: k3s.brokencrystals.nexploit.app cert: "" authlevel: "." images: