Custom annotation (#1242)

helm/rustfs/templates/ingress.yaml

@@ -2,12 +2,9 @@
 {{- $secretName := .Values.ingress.tls.secretName }}
 {{- $ingressAnnotations := dict }}
 {{- if eq .Values.ingress.className "nginx" }}
-  {{- $ingressAnnotations = merge $ingressAnnotations (.Values.ingress.nginxAnnotations | default dict) }}
+{{- $ingressAnnotations = .Values.ingress.nginxAnnotations }}
 {{- else if eq .Values.ingress.className "" }}
-  {{- $ingressAnnotations = merge $ingressAnnotations (.Values.ingress.customAnnoations | default dict) }}
-{{- end }}
-{{- if .Values.ingress.tls.certManager.enabled }}
-  {{- $ingressAnnotations = merge $ingressAnnotations (.Values.ingress.certManagerAnnotations | default dict) }}
+{{- $ingressAnnotations = .Values.ingress.customAnnotations }}
 {{- end }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress

helm/rustfs/values.yaml

@@ -114,13 +114,10 @@ ingress:
     nginx.ingress.kubernetes.io/session-cookie-hash: sha1
     nginx.ingress.kubernetes.io/session-cookie-max-age: "3600"
     nginx.ingress.kubernetes.io/session-cookie-name: rustfs
-  certManagerAnnotations:
-    {} # Specify cert manager issuer annotations,cert-manager.io/issuer or cert-manager.io/cluster-issuer.
-    # cert-manager.io/issuer: "letsencrypt-staging"
   customAnnotations: # Specify custom annotations
     {} # Customize annotations
   hosts:
-    - host: xmg.rustfs.com
+    - host: example.rustfs.com
       paths:
         - path: /
           pathType: Prefix
@@ -128,9 +125,6 @@ ingress:
     enabled: false # Enable tls and access rustfs via https.
     certManager:
       enabled: false # Enable certmanager to generate certificate for rustfs, default false.
-      issuer:
-        name: letsencrypt-staging # Specify cert manager issuer name
-        kind: Issuer # Specify cert manager issuer kind, Issuer or ClusterIssuer.
     secretName: secret-tls
     crt: tls.crt
     key: tls.key