Merge pull request #12 from adamrushuk/disable-cert-manager-option

Added option to omit letsencrypt / cert-manager annotations
adamrushuk · Oct 18, 2020 · 63f6804 · 63f6804
2 parents f02ea1a + 821e577
commit 63f6804
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/charts/sonatype-nexus/Chart.yaml b/charts/sonatype-nexus/Chart.yaml
@@ -3,7 +3,7 @@ name: sonatype-nexus
 description: Sonatype Nexus is an open source repository manager
 type: application
 # This is the chart version
-version: 0.2.6
+version: 0.2.7
 # This is the version number of the application being deployed
 appVersion: 3.27.0
 keywords:

diff --git a/charts/sonatype-nexus/templates/cluster-issuer-prod.yml b/charts/sonatype-nexus/templates/cluster-issuer-prod.yml
@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enabled -}}
+{{- if .Values.ingress.certmanagerEnabled -}}
 apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:

diff --git a/charts/sonatype-nexus/templates/cluster-issuer-staging.yml b/charts/sonatype-nexus/templates/cluster-issuer-staging.yml
@@ -1,4 +1,4 @@
-{{- if .Values.ingress.enabled -}}
+{{- if .Values.ingress.certmanagerEnabled -}}
 apiVersion: cert-manager.io/v1alpha2
 kind: ClusterIssuer
 metadata:

diff --git a/charts/sonatype-nexus/templates/ingress.yaml b/charts/sonatype-nexus/templates/ingress.yaml
@@ -15,7 +15,7 @@ metadata:
     kubernetes.io/ingress.class: nginx
   {{- if eq .Values.ingress.letsencryptEnvironment "prod" }}
     cert-manager.io/cluster-issuer: letsencrypt-prod
-  {{- else }}
+  {{- else if eq .Values.ingress.letsencryptEnvironment "staging" }}
     cert-manager.io/cluster-issuer: letsencrypt-staging
   {{- end }}
     # fixes "413 Request Entity Too Large" error when pushing docker images

diff --git a/charts/sonatype-nexus/values.yaml b/charts/sonatype-nexus/values.yaml
@@ -32,10 +32,11 @@ image:
 
 ingress:
   enabled: false
+  certmanagerEnabled: false
   # use "staging" environment during testing to avoid rate limiting
   # https://letsencrypt.org/docs/staging-environment/#rate-limits
   # "staging" or "prod"
-  letsencryptEnvironment: "staging"
+  letsencryptEnvironment: ""
   annotations:
     nginx.org/hsts: "false"
   tls: