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

rabbitmq ingress in CE and EE Helm charts #35

Merged
merged 5 commits into from
Sep 6, 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
2 changes: 1 addition & 1 deletion charts/plane-ce/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Meet Plane. An open-source software development tool to manage issu

type: application

version: 1.0.23
version: 1.0.24
appVersion: "0.22.0"

home: https://plane.so
Expand Down
5 changes: 5 additions & 0 deletions charts/plane-ce/questions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,11 @@ questions:
type: string
default: "plane-minio.example.com"
show_if: "minio.local_setup=true"
- variable: ingress.rabbitmqHost
label: "Rabbitmq Host"
type: string
default: "plane-rabbitmq.example.com"
show_if: "rabbitmq.local_setup=true"
- variable: ingress.ingressClass
label: "Ingress Classname"
type: string
Expand Down
3 changes: 3 additions & 0 deletions charts/plane-ce/templates/certs/certs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ spec:
{{- if and .Values.minio.local_setup .Values.ingress.minioHost }}
- {{ .Values.ingress.minioHost | quote }}
{{- end }}
{{- if and .Values.rabbitmq.local_setup .Values.ingress.rabbitmqHost }}
- {{ .Values.ingress.rabbitmqHost | quote }}
{{- end }}
issuerRef:
name: {{ .Release.Name }}-cert-issuer
secretName: {{ .Release.Name }}-ssl-cert
Expand Down
17 changes: 16 additions & 1 deletion charts/plane-ce/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,28 @@ spec:
path: /
pathType: Prefix
{{- end }}
{{- if and .Values.rabbitmq.local_setup .Values.ingress.rabbitmqHost }}
- host: {{ .Values.ingress.rabbitmqHost }}
http:
paths:
- backend:
service:
port:
number: 15672
name: {{ .Release.Name }}-rabbitmq
path: /
pathType: Prefix
{{- end }}
{{- if .Values.ssl.generateCerts }}
tls:
- hosts:
- {{ .Values.ingress.appHost | quote }}
{{- if and .Values.minio.local_setup .Values.ingress.minioHost }}
- {{ .Values.ingress.minioHost | quote }}
{{ end }}
{{- end }}
{{- if and .Values.rabbitmq.local_setup .Values.ingress.rabbitmqHost }}
- {{ .Values.ingress.rabbitmqHost | quote }}
{{- end }}
secretName: {{ .Release.Name }}-ssl-cert
{{- end }}

Expand Down
1 change: 1 addition & 0 deletions charts/plane-ce/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ ingress:
enabled: true
appHost: "plane.example.com"
minioHost: "plane-minio.example.com"
rabbitmqHost: "plane-rabbitmq.example.com"
ingressClass: "nginx"
ingress_annotations: {
"nginx.ingress.kubernetes.io/proxy-body-size": "5m",
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-enterprise/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ description: Meet Plane. An Enterprise software development tool to manage issue

type: application

version: 1.0.9
version: 1.0.10
appVersion: "1.2.1"

home: https://plane.so/
Expand Down
7 changes: 6 additions & 1 deletion charts/plane-enterprise/questions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ questions:
type: string
default: "uploads"
- variable: env.doc_upload_size_limit
label: "FIle Upload Size Limit"
label: "File Upload Size Limit"
type: string
default: "5242880"

Expand All @@ -395,6 +395,11 @@ questions:
type: string
default: "plane-minio.example.com"
show_if: "services.minio.local_setup=true"
- variable: ingress.rabbitmqHost
label: "Rabbitmq Host"
type: string
default: "plane-rabbitmq.example.com"
show_if: "services.rabbitmq.local_setup=true"
- variable: ingress.ingressClass
label: "Ingress Classname"
type: string
Expand Down
3 changes: 3 additions & 0 deletions charts/plane-enterprise/templates/certs/certs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ spec:
{{- if and .Values.services.minio.local_setup .Values.ingress.minioHost }}
- {{ .Values.ingress.minioHost | quote }}
{{- end }}
{{- if and .Values.services.rabbitmq.local_setup .Values.ingress.rabbitmqHost }}
- {{ .Values.ingress.rabbitmqHost | quote }}
{{- end }}
issuerRef:
name: {{ .Release.Name }}-cert-issuer
secretName: {{ .Release.Name }}-ssl-cert
Expand Down
15 changes: 15 additions & 0 deletions charts/plane-enterprise/templates/ingress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,28 @@ spec:
path: /
pathType: Prefix
{{- end }}
{{- if and .Values.services.rabbitmq.local_setup .Values.ingress.rabbitmqHost }}
- host: {{ .Values.ingress.rabbitmqHost}}
http:
paths:
- backend:
service:
port:
number: 15672
name: {{ .Release.Name }}-rabbitmq
path: /
pathType: Prefix
{{- end }}
{{- if .Values.ssl.generateCerts }}
tls:
- hosts:
- {{ .Values.license.licenseDomain | quote }}
{{- if and .Values.services.minio.local_setup .Values.ingress.minioHost }}
- {{ .Values.ingress.minioHost | quote }}
{{ end }}
{{- if and .Values.services.rabbitmq.local_setup .Values.ingress.rabbitmqHost }}
- {{ .Values.ingress.rabbitmqHost | quote }}
{{ end }}
secretName: {{ .Release.Name }}-ssl-cert
{{- end }}

Expand Down
1 change: 1 addition & 0 deletions charts/plane-enterprise/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ license:
ingress:
enabled: true
minioHost: ''
rabbitmqHost: ''
ingressClass: 'nginx'
ingress_annotations: {
"nginx.ingress.kubernetes.io/proxy-body-size": "5m",
Expand Down