Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: enhancements to support full-stack-testing charts #3

Merged
merged 1 commit into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions charts/acme-cluster-issuer/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
appVersion: 1.10.1
description: 'Deploys a production/staging pair of ACME cert-manager cluster issuer
into a Kubernetes cluster. Cert-Manager must already be installed and running prior
to this chart being installed. '
name: acme-cluster-issuer
description: |
Deploys a production/staging pair of ACME cert-manager cluster issuer into a Kubernetes cluster. Cert-Manager must
already be installed and running prior to this chart being installed.
type: application
version: 0.2.1
appVersion: "1.10.1"
version: 0.3.0
30 changes: 26 additions & 4 deletions charts/acme-cluster-issuer/templates/production.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,43 @@
apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
name: {{ .Values.issuers.production.name }}
name: {{ tpl .Values.issuers.production.name $ }}
namespace: cert-manager
{{- with .Values.issuers.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
acme:
server: https://acme-v02.api.letsencrypt.org/directory
email: {{ .Values.issuers.production.email }}
privateKeySecretRef:
name: {{ .Values.issuers.production.name }}
name: {{ tpl .Values.issuers.production.name $ }}
solvers:
{{- if .Values.solvers.http01.enabled }}
- http01:
{{- if .Values.solvers.http01.solverType | eq "ingress" }}
ingress:
{{- with .Values.solvers.http01.ingress }}
name: {{ .name }}
class: {{ .class }}
{{- with .name }}
name: {{ . }}
{{- end }}
{{- with .class }}
class: {{ . }}
{{- end }}
{{- with $.Values.global.ingressClassName }}
ingressClassName: {{ . }}
{{- end }}
serviceType: {{ .serviceType }}
{{- end }}
{{- end }}
{{- if .Values.solvers.http01.solverType | eq "gatewayHTTPRoute" }}
gatewayHTTPRoute:
{{- with .Values.solvers.http01.gatewayHTTPRoute }}
parentRefs:
- name: {{ .name }}
namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
kind: Gateway
{{- end }}
{{- end }}
{{- end }}
30 changes: 26 additions & 4 deletions charts/acme-cluster-issuer/templates/staging.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,43 @@
apiVersion: cert-manager.io/v1
kind: ClusterIssuer
metadata:
name: {{ .Values.issuers.staging.name }}
name: {{ tpl .Values.issuers.staging.name $ }}
namespace: cert-manager
{{- with .Values.issuers.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
spec:
acme:
server: https://acme-staging-v02.api.letsencrypt.org/directory
email: {{ .Values.issuers.staging.email }}
privateKeySecretRef:
name: {{ .Values.issuers.staging.name }}
name: {{ tpl .Values.issuers.staging.name $ }}
solvers:
{{- if .Values.solvers.http01.enabled }}
- http01:
{{- if .Values.solvers.http01.solverType | eq "ingress" }}
ingress:
{{- with .Values.solvers.http01.ingress }}
name: {{ .name }}
class: {{ .class }}
{{- with .name }}
name: {{ . }}
{{- end }}
{{- with .class }}
class: {{ . }}
{{- end }}
{{- with $.Values.global.ingressClassName }}
ingressClassName: {{ . }}
{{- end }}
serviceType: {{ .serviceType }}
{{- end }}
{{- end }}
{{- if .Values.solvers.http01.solverType | eq "gatewayHTTPRoute" }}
gatewayHTTPRoute:
{{- with .Values.solvers.http01.gatewayHTTPRoute }}
parentRefs:
- name: {{ .name }}
namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }}
kind: Gateway
{{- end }}
{{- end }}
{{- end }}
10 changes: 9 additions & 1 deletion charts/acme-cluster-issuer/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
global:
namespaceOverride: ""
ingressClassName: ""

issuers:
annotations:
staging:
name: letsencrypt-staging
email: ""
Expand All @@ -9,8 +14,11 @@ issuers:
solvers:
http01:
enabled: true
solverType: "ingress" # "ingress" or "gatewayHTTPRoute"
ingress:
name: ""
class: ""
serviceType: "NodePort"

gatewayHTTPRoute:
name: ""
namespace: ""