Skip to content

Commit 89f3427

Browse files
committed
chore(helmbroker): add global values
1 parent 6057875 commit 89f3427

3 files changed

Lines changed: 38 additions & 20 deletions

File tree

charts/helmbroker/templates/helmbroker-certificate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.certManagerEnabled }}
1+
{{- if .Values.global.certManagerEnabled }}
22
apiVersion: cert-manager.io/v1
33
kind: Certificate
44
metadata:
@@ -9,7 +9,7 @@ spec:
99
name: drycc-cluster-issuer
1010
kind: ClusterIssuer
1111
dnsNames:
12-
- drycc-helmbroker.{{ .Values.platformDomain }}
12+
- drycc-helmbroker.{{ .Values.global.platformDomain }}
1313
privateKey:
1414
rotationPolicy: Always
1515
{{- end }}

charts/helmbroker/templates/helmbroker-ingress.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ metadata:
1010
annotations:
1111
kubernetes.io/tls-acme: "true"
1212
spec:
13-
{{- if not (eq .Values.ingressClass "") }}
14-
ingressClassName: "{{ .Values.ingressClass }}"
13+
{{- if not (eq .Values.global.ingressClass "") }}
14+
ingressClassName: "{{ .Values.global.ingressClass }}"
1515
{{ end }}
1616
rules:
17-
- host: drycc-helmbroker.{{ .Values.platformDomain }}
17+
- host: drycc-helmbroker.{{ .Values.global.platformDomain }}
1818
http:
1919
paths:
2020
- pathType: Prefix
21-
{{- if eq .Values.ingressClass "gce" "alb" }}
21+
{{- if eq .Values.global.ingressClass "gce" "alb" }}
2222
path: /*
2323
{{- else }}{{/* Has annotations but ingress class is not "gce" nor "alb" */}}
2424
path: /
@@ -28,9 +28,9 @@ spec:
2828
name: drycc-helmbroker
2929
port:
3030
number: 80
31-
{{- if .Values.certManagerEnabled }}
31+
{{- if .Values.global.certManagerEnabled }}
3232
tls:
3333
- secretName: drycc-helmbroker-certificate-auto
3434
hosts:
35-
- drycc-helmbroker.{{ .Values.platformDomain }}
35+
- drycc-helmbroker.{{ .Values.global.platformDomain }}
3636
{{- end }}

charts/helmbroker/values.yaml

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,33 @@ persistence:
6969
storageClass: ""
7070
volumeName: ""
7171

72-
ingressClass: ""
73-
# A domain name consists of one or more parts.
74-
# Periods (.) are used to separate these parts.
75-
# Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
76-
# It must start and end with a lowercase letter or digit.
77-
clusterDomain: "cluster.local"
78-
# The public resolvable hostname to build your cluster with.
79-
#
80-
# This will be the hostname that is used to build endpoints such as "drycc-helmbroker.$HOSTNAME"
81-
platformDomain: ""
82-
# Whether cert_manager is enabled to automatically generate helmbroker certificates
83-
certManagerEnabled: true
72+
global:
73+
# Set the location of Workflow's rabbitmq instance
74+
# Valid values are:
75+
# - on-cluster: Run Rabbitmq within the Kubernetes cluster
76+
# - off-cluster: Run Rabbitmq outside the Kubernetes cluster (configure in controller section)
77+
rabbitmqLocation: "on-cluster"
78+
# Enable usage of RBAC authorization mode
79+
#
80+
# Valid values are:
81+
# - true: all RBAC-related manifests will be installed (in case your cluster supports RBAC)
82+
# - false: no RBAC-related manifests will be installed
83+
rbac: true
84+
# Please check `kubernetes.io/ingress.class`
85+
# The cert-manager component must be installed
86+
# If you want to use HTTPSEnforced or allowlist functions, you must specify:
87+
# - nginx
88+
# - traefik
89+
# Only the above options have been supported so far
90+
ingressClass: ""
91+
# A domain name consists of one or more parts.
92+
# Periods (.) are used to separate these parts.
93+
# Each part must be 1 to 63 characters in length and can contain lowercase letters, digits, and hyphens (-).
94+
# It must start and end with a lowercase letter or digit.
95+
clusterDomain: "cluster.local"
96+
# The public resolvable hostname to build your cluster with.
97+
#
98+
# This will be the hostname that is used to build endpoints such as "drycc-helmbroker.$HOSTNAME"
99+
platformDomain: ""
100+
# Whether cert_manager is enabled to automatically generate helmbroker certificates
101+
certManagerEnabled: true

0 commit comments

Comments
 (0)