From e76da4ea1871dba913677b6beaf48956f77976a1 Mon Sep 17 00:00:00 2001 From: Nicolas Date: Fri, 29 Aug 2025 10:03:35 +0800 Subject: [PATCH] Remove all such cert usage(across all services) if service is already deployed in k8s --- .../templates/authentication/certificate.yaml | 27 ------------------- .../templates/authentication/ingress.yaml | 11 +------- .../chat/templates/chat/certificate.yaml | 27 ------------------- .../chat/templates/chat/chat-config.yaml | 1 - .../helm-pkg/chat/templates/chat/ingress.yaml | 10 ------- freeleaps/helm-pkg/chat/values.alpha.yaml | 1 - freeleaps/helm-pkg/chat/values.prod.yaml | 1 - freeleaps/helm-pkg/chat/values.yaml | 2 -- .../templates/content/certificate.yaml | 27 ------------------- .../content/templates/content/ingress.yaml | 11 +------- .../devops/templates/devops/certificate.yaml | 27 ------------------- .../devops/templates/devops/ingress.yaml | 11 +------- .../devsvc/templates/devsvc/certificate.yaml | 27 ------------------- .../devsvc/templates/devsvc/ingress.yaml | 11 +------- .../templates/freeleaps/certificate.yaml | 27 ------------------- .../templates/freeleaps/freeleaps-config.yaml | 1 - .../templates/freeleaps/ingress.yaml | 13 +++------ .../helm-pkg/freeleaps/values.alpha.yaml | 1 - freeleaps/helm-pkg/freeleaps/values.prod.yaml | 3 +-- freeleaps/helm-pkg/freeleaps/values.yaml | 1 - .../templates/frontend/certificate.yaml | 27 ------------------- .../frontend/templates/frontend/ingress.yaml | 11 +------- .../templates/notification/certificate.yaml | 27 ------------------- .../templates/notification/ingress.yaml | 11 +------- .../templates/payment/certificate.yaml | 27 ------------------- .../payment/templates/payment/ingress.yaml | 10 ------- 26 files changed, 10 insertions(+), 343 deletions(-) delete mode 100644 freeleaps/helm-pkg/authentication/templates/authentication/certificate.yaml delete mode 100644 freeleaps/helm-pkg/chat/templates/chat/certificate.yaml delete mode 100644 freeleaps/helm-pkg/content/templates/content/certificate.yaml delete mode 100644 freeleaps/helm-pkg/devops/templates/devops/certificate.yaml delete mode 100644 freeleaps/helm-pkg/devsvc/templates/devsvc/certificate.yaml delete mode 100644 freeleaps/helm-pkg/freeleaps/templates/freeleaps/certificate.yaml delete mode 100644 freeleaps/helm-pkg/frontend/templates/frontend/certificate.yaml delete mode 100644 freeleaps/helm-pkg/notification/templates/notification/certificate.yaml delete mode 100644 freeleaps/helm-pkg/payment/templates/payment/certificate.yaml diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/certificate.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/certificate.yaml deleted file mode 100644 index 5d9bb8e6..00000000 --- a/freeleaps/helm-pkg/authentication/templates/authentication/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.authentication.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/authentication/templates/authentication/ingress.yaml b/freeleaps/helm-pkg/authentication/templates/authentication/ingress.yaml index c685a5f8..0f0a418b 100644 --- a/freeleaps/helm-pkg/authentication/templates/authentication/ingress.yaml +++ b/freeleaps/helm-pkg/authentication/templates/authentication/ingress.yaml @@ -18,16 +18,7 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: diff --git a/freeleaps/helm-pkg/chat/templates/chat/certificate.yaml b/freeleaps/helm-pkg/chat/templates/chat/certificate.yaml deleted file mode 100644 index 5067d104..00000000 --- a/freeleaps/helm-pkg/chat/templates/chat/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.chat.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml b/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml index 42d898b8..7923c835 100644 --- a/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml +++ b/freeleaps/helm-pkg/chat/templates/chat/chat-config.yaml @@ -25,7 +25,6 @@ data: FREELEAPS_AILAB_ENDPOINT: {{ .Values.chat.configs.freeleapsAilabEndpoint | b64enc | quote }} FREELEAPS_NOTIFICATION_ENDPOINT: {{ .Values.chat.configs.freeleapsNotificationEndpoint | b64enc | quote }} FREELEAPS_ENV: {{ .Values.chat.configs.freeleapsEnv | b64enc | quote }} - CERT_PATH: {{ .Values.chat.configs.certPath | b64enc | quote }} REDIS_IS_CLUSTER: {{ .Values.chat.configs.redisIsCluster | b64enc | quote }} METRICS_ENABLED: {{ .Values.chat.configs.metricsEnabled | default false | toString | b64enc }} PROBES_ENABLED: {{ .Values.chat.configs.probesEnabled | default false | toString | b64enc }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/chat/templates/chat/ingress.yaml b/freeleaps/helm-pkg/chat/templates/chat/ingress.yaml index 8fed2b70..8736c1ca 100644 --- a/freeleaps/helm-pkg/chat/templates/chat/ingress.yaml +++ b/freeleaps/helm-pkg/chat/templates/chat/ingress.yaml @@ -17,16 +17,6 @@ metadata: spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} -{{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} {{- end }} rules: - host: {{ $ingress.host }} diff --git a/freeleaps/helm-pkg/chat/values.alpha.yaml b/freeleaps/helm-pkg/chat/values.alpha.yaml index 7020f3f7..eaadc826 100644 --- a/freeleaps/helm-pkg/chat/values.alpha.yaml +++ b/freeleaps/helm-pkg/chat/values.alpha.yaml @@ -97,7 +97,6 @@ chat: freeleapsNotificationEndpoint: http://notification-service.freeleaps-alpha.svc.freeleaps.cluster:8003/api/notification/ freeleapsAilabEndpoint: '' freeleapsEnv: alpha - certPath: '' redisIsCluster: 'false' metricsEnabled: 'true' probesEnabled: 'true' diff --git a/freeleaps/helm-pkg/chat/values.prod.yaml b/freeleaps/helm-pkg/chat/values.prod.yaml index a148f676..aa1046f7 100644 --- a/freeleaps/helm-pkg/chat/values.prod.yaml +++ b/freeleaps/helm-pkg/chat/values.prod.yaml @@ -88,7 +88,6 @@ chat: freeleapsNotificationEndpoint: http://notification-service.freeleaps-prod.svc.freeleaps.cluster:8003/api/notification/ freeleapsAilabEndpoint: '' freeleapsEnv: chat - certPath: '' redisIsCluster: 'true' metricsEnabled: 'false' probesEnabled: 'true' diff --git a/freeleaps/helm-pkg/chat/values.yaml b/freeleaps/helm-pkg/chat/values.yaml index dbc37753..d0ee2178 100644 --- a/freeleaps/helm-pkg/chat/values.yaml +++ b/freeleaps/helm-pkg/chat/values.yaml @@ -106,8 +106,6 @@ chat: freeleapsAilabEndpoint: "" # FREELEAPS_ENV freeleapsEnv: "" - # CERT_PATH - certPath: "" # REDIS_IS_CLUSTER redisIsCluster: "false" # METRICS_ENABLED diff --git a/freeleaps/helm-pkg/content/templates/content/certificate.yaml b/freeleaps/helm-pkg/content/templates/content/certificate.yaml deleted file mode 100644 index b6d55726..00000000 --- a/freeleaps/helm-pkg/content/templates/content/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.content.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/content/templates/content/ingress.yaml b/freeleaps/helm-pkg/content/templates/content/ingress.yaml index 9b0cc918..ce572b4e 100644 --- a/freeleaps/helm-pkg/content/templates/content/ingress.yaml +++ b/freeleaps/helm-pkg/content/templates/content/ingress.yaml @@ -18,16 +18,7 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: diff --git a/freeleaps/helm-pkg/devops/templates/devops/certificate.yaml b/freeleaps/helm-pkg/devops/templates/devops/certificate.yaml deleted file mode 100644 index 39615558..00000000 --- a/freeleaps/helm-pkg/devops/templates/devops/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.devops.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/devops/templates/devops/ingress.yaml b/freeleaps/helm-pkg/devops/templates/devops/ingress.yaml index ed4f246d..4531312b 100644 --- a/freeleaps/helm-pkg/devops/templates/devops/ingress.yaml +++ b/freeleaps/helm-pkg/devops/templates/devops/ingress.yaml @@ -18,16 +18,7 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/certificate.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/certificate.yaml deleted file mode 100644 index e70aff83..00000000 --- a/freeleaps/helm-pkg/devsvc/templates/devsvc/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.devsvc.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/devsvc/templates/devsvc/ingress.yaml b/freeleaps/helm-pkg/devsvc/templates/devsvc/ingress.yaml index d98161b7..846601b4 100644 --- a/freeleaps/helm-pkg/devsvc/templates/devsvc/ingress.yaml +++ b/freeleaps/helm-pkg/devsvc/templates/devsvc/ingress.yaml @@ -18,16 +18,7 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/certificate.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/certificate.yaml deleted file mode 100644 index 9833932b..00000000 --- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.freeleaps.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml index 0c710e3b..907029ec 100644 --- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml +++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/freeleaps-config.yaml @@ -26,7 +26,6 @@ data: FREELEAPS_AILAB_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsAilabEndpoint | b64enc | quote }} FREELEAPS_NOTIFICATION_ENDPOINT: {{ .Values.freeleaps.configs.freeleapsNotificationEndpoint | b64enc | quote }} FREELEAPS_ENV: {{ .Values.freeleaps.configs.freeleapsEnv | b64enc | quote }} - CERT_PATH: {{ .Values.freeleaps.configs.certPath | b64enc | quote }} REDIS_IS_CLUSTER: {{ .Values.freeleaps.configs.redisIsCluster | b64enc | quote }} METRICS_ENABLED: {{ .Values.freeleaps.configs.metricsEnabled | default false | toString | b64enc }} PROBES_ENABLED: {{ .Values.freeleaps.configs.probesEnabled | default false | toString | b64enc }} diff --git a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/ingress.yaml b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/ingress.yaml index d92ecf12..3fe2682a 100644 --- a/freeleaps/helm-pkg/freeleaps/templates/freeleaps/ingress.yaml +++ b/freeleaps/helm-pkg/freeleaps/templates/freeleaps/ingress.yaml @@ -2,6 +2,7 @@ {{ $appVersion := .Chart.AppVersion | quote }} {{ $releaseIngress := .Release.Service }} {{ $releaseName := .Release.Name }} +{{- if ne .Values.freeleaps.configs.freeleapsEnv "prod" }} {{- range $ingress := .Values.freeleaps.ingresses }} --- apiVersion: networking.k8s.io/v1 @@ -18,19 +19,11 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: paths: {{- toYaml $ingress.rules | nindent 10 }} +{{- end }} {{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml index 6454253c..73f11480 100644 --- a/freeleaps/helm-pkg/freeleaps/values.alpha.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.alpha.yaml @@ -77,7 +77,6 @@ freeleaps: freeleapsNotificationEndpoint: http://notification-service.freeleaps-alpha.svc.freeleaps.cluster:8003/api/notification/ freeleapsAilabEndpoint: '' freeleapsEnv: alpha - certPath: '' redisIsCluster: 'false' metricsEnabled: 'false' probesEnabled: 'true' diff --git a/freeleaps/helm-pkg/freeleaps/values.prod.yaml b/freeleaps/helm-pkg/freeleaps/values.prod.yaml index 54422f07..f8b8faf8 100644 --- a/freeleaps/helm-pkg/freeleaps/values.prod.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.prod.yaml @@ -67,8 +67,7 @@ freeleaps: freeleapsAuthenticationEndpoint: http://authentication-service.freeleaps-prod.svc.freeleaps.cluster:8004/api/auth/ freeleapsNotificationEndpoint: http://notification-service.freeleaps-prod.svc.freeleaps.cluster:8003/api/notification/ freeleapsAilabEndpoint: '' - freeleapsEnv: alpha - certPath: '' + freeleapsEnv: prod redisIsCluster: 'true' metricsEnabled: 'true' probesEnabled: 'true' diff --git a/freeleaps/helm-pkg/freeleaps/values.yaml b/freeleaps/helm-pkg/freeleaps/values.yaml index a5ac4af8..d819fa3f 100644 --- a/freeleaps/helm-pkg/freeleaps/values.yaml +++ b/freeleaps/helm-pkg/freeleaps/values.yaml @@ -92,7 +92,6 @@ freeleaps: # FREELEAPS_ENV freeleapsEnv: "" # CERT_PATH - certPath: "" # REDIS_IS_CLUSTER redisIsCluster: "false" # METRICS_ENABLED diff --git a/freeleaps/helm-pkg/frontend/templates/frontend/certificate.yaml b/freeleaps/helm-pkg/frontend/templates/frontend/certificate.yaml deleted file mode 100644 index 40ef77e3..00000000 --- a/freeleaps/helm-pkg/frontend/templates/frontend/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.frontend.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/frontend/templates/frontend/ingress.yaml b/freeleaps/helm-pkg/frontend/templates/frontend/ingress.yaml index c113116e..09be3161 100644 --- a/freeleaps/helm-pkg/frontend/templates/frontend/ingress.yaml +++ b/freeleaps/helm-pkg/frontend/templates/frontend/ingress.yaml @@ -22,16 +22,7 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: diff --git a/freeleaps/helm-pkg/notification/templates/notification/certificate.yaml b/freeleaps/helm-pkg/notification/templates/notification/certificate.yaml deleted file mode 100644 index b970313f..00000000 --- a/freeleaps/helm-pkg/notification/templates/notification/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.notification.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/notification/templates/notification/ingress.yaml b/freeleaps/helm-pkg/notification/templates/notification/ingress.yaml index ac0c7cc1..aefc071a 100644 --- a/freeleaps/helm-pkg/notification/templates/notification/ingress.yaml +++ b/freeleaps/helm-pkg/notification/templates/notification/ingress.yaml @@ -18,16 +18,7 @@ spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} {{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} + rules: - host: {{ $ingress.host }} http: diff --git a/freeleaps/helm-pkg/payment/templates/payment/certificate.yaml b/freeleaps/helm-pkg/payment/templates/payment/certificate.yaml deleted file mode 100644 index 6619165c..00000000 --- a/freeleaps/helm-pkg/payment/templates/payment/certificate.yaml +++ /dev/null @@ -1,27 +0,0 @@ -{{ $namespace := .Release.Namespace }} -{{ $appVersion := .Chart.AppVersion | quote }} -{{ $releaseCertificate := .Release.Service }} -{{ $releaseName := .Release.Name }} -{{- range $ingress := .Values.payment.ingresses }} -{{- if not $ingress.tls.exists }} ---- -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: {{ $ingress.name }} - namespace: {{ $namespace }} - labels: - app.kubernetes.io/version: {{ $appVersion }} - app.kubernetes.io/name: {{ $ingress.name | quote }} - app.kubernetes.io/managed-by: {{ $releaseCertificate }} - app.kubernetes.io/instance: {{ $releaseName }} -spec: - commonName: {{ $ingress.host }} - dnsNames: - - {{ $ingress.host }} - issuerRef: - name: {{ $ingress.tls.issuerRef.name }} - kind: {{ $ingress.tls.issuerRef.kind }} - secretName: {{ $ingress.tls.name }} -{{- end }} -{{- end }} \ No newline at end of file diff --git a/freeleaps/helm-pkg/payment/templates/payment/ingress.yaml b/freeleaps/helm-pkg/payment/templates/payment/ingress.yaml index 0ea04b1c..b10111a6 100644 --- a/freeleaps/helm-pkg/payment/templates/payment/ingress.yaml +++ b/freeleaps/helm-pkg/payment/templates/payment/ingress.yaml @@ -17,16 +17,6 @@ metadata: spec: {{- if $ingress.class }} ingressClassName: {{ $ingress.class }} -{{- end }} -{{- if $ingress.tls }} - tls: - - hosts: - - {{ $ingress.host }} -{{- if $ingress.tls.exists }} - secretName: {{ $ingress.tls.secretRef.name }} -{{- else }} - secretName: {{ $ingress.tls.name }} -{{- end }} {{- end }} rules: - host: {{ $ingress.host }}