Remove all such cert usage(across all services) if service is already deployed in k8s

freeleaps/helm-pkg/authentication/templates/authentication/certificate.yaml

@@ -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 }}

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:

freeleaps/helm-pkg/chat/templates/chat/certificate.yaml

@@ -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 }}

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 }}

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 }}

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'

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'

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

freeleaps/helm-pkg/content/templates/content/certificate.yaml

@@ -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 }}

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:

freeleaps/helm-pkg/devops/templates/devops/certificate.yaml

@@ -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 }}

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:

freeleaps/helm-pkg/devsvc/templates/devsvc/certificate.yaml

@@ -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 }}

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:

freeleaps/helm-pkg/freeleaps/templates/freeleaps/certificate.yaml

@@ -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 }}

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 }}

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 }}

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'

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
+    freeleapsEnv: prod
-    certPath: ''
     redisIsCluster: 'true'
     metricsEnabled: 'true'
     probesEnabled: 'true'

freeleaps/helm-pkg/freeleaps/values.yaml

@@ -92,7 +92,6 @@ freeleaps:
     # FREELEAPS_ENV
     freeleapsEnv: ""
     # CERT_PATH
-    certPath: ""
     # REDIS_IS_CLUSTER
     redisIsCluster: "false"
     # METRICS_ENABLED

freeleaps/helm-pkg/frontend/templates/frontend/certificate.yaml

@@ -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 }}

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:

freeleaps/helm-pkg/notification/templates/notification/certificate.yaml

@@ -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 }}

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:

freeleaps/helm-pkg/payment/templates/payment/certificate.yaml

@@ -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 }}

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 }}