Skip to content

Commit a77467b

Browse files
mguptahubmguptahub
committed
Merge branch 'master' of github.com:makeplane/helm-charts into develop
2 parents 94c76cd + 66b9888 commit a77467b

File tree

8 files changed

+378
-9
lines changed

8 files changed

+378
-9
lines changed

‎charts/plane-enterprise/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ description: Meet Plane. An Enterprise software development tool to manage issue
55

66
type: application
77

8-
version: 1.1.3
9-
appVersion: "1.7.0"
8+
version: 1.1.4
9+
appVersion: "1.8.0"
1010

1111
home: https://plane.so/
1212
icon: https://plane.so/favicon/favicon-32x32.png

‎charts/plane-enterprise/README.md‎

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
Copy the format of constants below, paste it on Terminal to start setting environment variables, set values for each variable, and hit ENTER or RETURN.
1212

1313
```bash
14-
PLANE_VERSION=v1.7.0 # or the last released version
14+
PLANE_VERSION=v1.8.0 # or the last released version
1515
DOMAIN_NAME=<subdomain.domain.tld or domain.tld>
1616
```
1717

@@ -32,7 +32,7 @@
3232
Continue to be on the same Terminal window as you have so far, copy the code below, and paste it on your Terminal screen.
3333

3434
```bash
35-
helm install plane-app plane/plane-enterprise \
35+
helm upgrade --install plane-app plane/plane-enterprise \
3636
--create-namespace \
3737
--namespace plane \
3838
--set license.licenseDomain=${DOMAIN_NAME} \
@@ -65,7 +65,7 @@
6565
```
6666

6767
Make sure you set the minimum required values as below.
68-
- `planeVersion: v1.7.0 <or the last released version>`
68+
- `planeVersion: v1.8.0 <or the last released version>`
6969
- `license.licenseDomain: <The domain you have specified to host Plane>`
7070
- `ingress.enabled: <true | false>`
7171
- `ingress.ingressClass: <nginx or any other ingress class configured in your cluster>`
@@ -76,7 +76,7 @@
7676
After saving the `values.yaml` file, continue to be on the same Terminal window as on the previous steps, copy the code below, and paste it on your Terminal screen.
7777

7878
```bash
79-
helm install plane-app plane/plane-enterprise \
79+
helm upgrade --install plane-app plane/plane-enterprise \
8080
--create-namespace \
8181
--namespace plane \
8282
-f values.yaml \
@@ -100,7 +100,7 @@
100100
101101
| Setting | Default | Required | Description |
102102
|---|:---:|:---:|---|
103-
| planeVersion | v1.7.0 | Yes | Specifies the version of Plane to be deployed. Copy this from prime.plane.so. |
103+
| planeVersion | v1.8.0 | Yes | Specifies the version of Plane to be deployed. Copy this from prime.plane.so. |
104104
| license.licenseDomain | plane.example.com | Yes | The fully-qualified domain name (FQDN) in the format `sudomain.domain.tld` or `domain.tld` that the license is bound to. It is also attached to your `ingress` host to access Plane. |
105105
106106
### Postgres
@@ -234,6 +234,37 @@
234234
| env.sentry_dsn | | | (optional) API service deployment comes with some of the preconfigured integration. Sentry is one among those. Here user can set the Sentry provided DSN for this integration.|
235235
| env.sentry_environment | | | (optional) API service deployment comes with some of the preconfigured integration. Sentry is one among those. Here user can set the Sentry environment name (as configured in Sentry) for this integration.|
236236
| services.api.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service |
237+
238+
### Silo Deployment
239+
240+
| Setting | Default | Required | Description |
241+
|---|:---:|:---:|---|
242+
| services.silo.replicas | 1 | Yes | Kubernetes helps you with scaling up/down the deployments. You can run 1 or more pods for each deployment. This key helps you setting up number of replicas you want to run for this deployment. It must be >=1 |
243+
| services.silo.memoryLimit | 1000Mi | | Every deployment in kubernetes can be set to use maximum memory they are allowed to use. This key sets the memory limit for this deployment to use.|
244+
| services.silo.cpuLimit | 500m | | Every deployment in kubernetes can be set to use maximum cpu they are allowed to use. This key sets the cpu limit for this deployment to use.|
245+
| services.silo.image| registry.plane.tools/plane/silo-enterprise | | This deployment needs a preconfigured docker image to function. Docker image name is provided by the owner and must not be changed for this deployment |
246+
| services.silo.pullPolicy | Always | | Using this key, user can set the pull policy for the deployment of `silo`. |
247+
| services.silo.assign_cluster_ip | false | | Set it to `true` if you want to assign `ClusterIP` to the service |
248+
| services.silo.connectors.slack.enabled | false | | Slack Integration |
249+
| services.silo.connectors.slack.client_id | "" | required if `services.silo.connectors.slack.enabled` is `true` | Slack Client ID |
250+
| services.silo.connectors.slack.client_secret | "" | required if `services.silo.connectors.slack.enabled` is `true` | Slack Client Secret |
251+
| services.silo.connectors.github.enabled | false | | Github App Integration |
252+
| services.silo.connectors.github.client_id | "" | required if `services.silo.connectors.github.enabled` is `true` | Github Client ID |
253+
| services.silo.connectors.github.client_secret | "" | required if `services.silo.connectors.github.enabled` is `true` | Github Client Secret |
254+
| services.silo.connectors.github.app_name | "" | required if `services.silo.connectors.github.enabled` is `true` | Github App Name |
255+
| services.silo.connectors.github.app_id | "" | required if `services.silo.connectors.github.enabled` is `true` | Github App ID |
256+
| services.silo.connectors.github.private_key | "" | required if `services.silo.connectors.github.enabled` is `true` | Github Private Key |
257+
| services.silo.connectors.gitlab.enabled | false | | Gitlab App Integration |
258+
| services.silo.connectors.gitlab.client_id | "" | required if `services.silo.connectors.gitlab.enabled` is `true` | Gitlab Client ID |
259+
| services.silo.connectors.gitlab.client_secret | "" | required if `services.silo.connectors.gitlab.enabled` is `true` | Gitlab Client Secret |
260+
| env.silo_envs.mq_prefetch_count | 10 | | Prefetch count for RabbitMQ |
261+
| env.silo_envs.batch_size | 60 | | Batch size for Silo |
262+
| env.silo_envs.request_interval | 400 | | Request interval for Silo |
263+
| env.silo_envs.sentry_dsn | | | Sentry DSN |
264+
| env.silo_envs.sentry_environment | | | Sentry Environment |
265+
| env.silo_envs.sentry_traces_sample_rate | | | Sentry Traces Sample Rate |
266+
| env.silo_envs.hmac_secret_key | &lt;random-32-bit-string&gt; | | HMAC Secret Key |
267+
237268
238269
### Worker Deployment
239270

‎charts/plane-enterprise/questions.yml‎

Lines changed: 118 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ questions:
2020
- variable: planeVersion
2121
label: Plane Version (Docker Image Tag)
2222
type: string
23-
default: v1.7.0
23+
default: v1.8.0
2424
required: true
2525
group: "Docker Registry"
2626
subquestions:
@@ -49,6 +49,11 @@ questions:
4949
type: string
5050
required: true
5151
default: "registry.plane.tools/plane/monitor-enterprise"
52+
- variable: services.silo.image
53+
label: Silo Docker Image
54+
type: string
55+
required: true
56+
default: "registry.plane.tools/plane/silo-enterprise"
5257
- variable: services.api.image
5358
label: Backend Docker Image
5459
type: string
@@ -189,6 +194,118 @@ questions:
189194
label: "Sentry Traces Sample Rate"
190195
type: string
191196

197+
- variable: services.silo.enabled
198+
label: "Install Silo Service"
199+
type: boolean
200+
default: true
201+
group: "Silo Setup"
202+
show_subquestion_if: true
203+
subquestions:
204+
- variable: services.silo.replicas
205+
label: "Default Replica Count"
206+
type: int
207+
default: 1
208+
- variable: services.silo.memory_limit
209+
label: "Memory Limit"
210+
type: string
211+
default: 1000Mi
212+
- variable: services.silo.cpu_limit
213+
label: "CPU Limit"
214+
type: string
215+
default: 500m
216+
- variable: env.silo_envs.mq_prefetch_count
217+
label: "MQ Prefetch Count"
218+
type: int
219+
default: 10
220+
- variable: env.silo_envs.batch_size
221+
label: "Batch Size"
222+
type: int
223+
default: 60
224+
- variable: env.silo_envs.request_interval
225+
label: "Request Interval"
226+
type: int
227+
default: 400
228+
- variable: env.silo_envs.sentry_dsn
229+
label: "Silo Sentry DSN"
230+
type: string
231+
default: ""
232+
- variable: env.silo_envs.sentry_environment
233+
label: "Silo Sentry Environment"
234+
type: string
235+
default: "development"
236+
- variable: env.silo_envs.sentry_traces_sample_rate
237+
label: "Silo Sentry Traces Sample Rate"
238+
type: number
239+
default: 0.1
240+
- variable: env.silo_envs.hmac_secret_key
241+
label: "Silo HMAC Secret Key"
242+
type: string
243+
default: ""
244+
- variable: env.silo_envs.cors_allowed_origins
245+
label: "Silo CORS Allowed Origins"
246+
type: string
247+
default: ""
248+
249+
- variable: services.silo.connectors.slack.enabled
250+
label: "Slack Integration"
251+
type: boolean
252+
default: false
253+
group: "Silo Connectors"
254+
show_subquestion_if: true
255+
subquestions:
256+
- variable: services.silo.connectors.slack.client_id
257+
label: "Slack Client ID"
258+
type: string
259+
default: ""
260+
- variable: services.silo.connectors.slack.client_secret
261+
label: "Slack Client Secret"
262+
type: string
263+
default: ""
264+
265+
- variable: services.silo.connectors.github.enabled
266+
label: "Github App Integration"
267+
type: boolean
268+
default: false
269+
group: "Silo Connectors"
270+
show_subquestion_if: true
271+
subquestions:
272+
- variable: services.silo.connectors.github.client_id
273+
label: "Github Client ID"
274+
type: string
275+
default: ""
276+
- variable: services.silo.connectors.github.client_secret
277+
label: "Github Client Secret"
278+
type: string
279+
default: ""
280+
- variable: services.silo.connectors.github.app_name
281+
label: "Github App Name"
282+
type: string
283+
default: ""
284+
- variable: services.silo.connectors.github.app_id
285+
label: "Github App ID"
286+
type: string
287+
default: ""
288+
- variable: services.silo.connectors.github.private_key
289+
label: "Github Private Key"
290+
type: string
291+
default: ""
292+
293+
- variable: services.silo.connectors.gitlab.enabled
294+
label: "Gitlab App Integration"
295+
type: boolean
296+
default: false
297+
group: "Silo Connectors"
298+
show_subquestion_if: true
299+
subquestions:
300+
- variable: services.silo.connectors.gitlab.client_id
301+
label: "Gitlab Client ID"
302+
type: string
303+
default: ""
304+
- variable: services.silo.connectors.gitlab.client_secret
305+
label: "Gitlab Client Secret"
306+
type: string
307+
default: ""
308+
192309
- variable: services.monitor.pullPolicy
193310
label: "Monitor Pull Policy"
194311
type: enum

‎charts/plane-enterprise/templates/config-secrets/silo.yaml‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{{- if .Values.services.silo.enabled }}
2+
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
namespace: {{ .Release.Namespace }}
7+
name: {{ .Release.Name }}-silo-vars
8+
data:
9+
PORT: "3000"
10+
BATCH_SIZE: {{ .Values.env.silo_envs.batch_size | default 100 | quote }}
11+
MQ_PREFETCH_COUNT: {{ .Values.env.silo_envs.mq_prefetch_count | default 1 | quote }}
12+
REQUEST_INTERVAL: {{ .Values.env.silo_envs.request_interval | default 400 | quote }}
13+
SILO_BASE_PATH: "/silo"
14+
15+
{{- if .Values.env.silo_envs.hmac_secret_key }}
16+
SILO_HMAC_SECRET_KEY: {{ .Values.env.silo_envs.hmac_secret_key | quote }}
17+
{{- else if (lookup "v1" "ConfigMap" .Release.Namespace (printf "%s-silo-vars" .Release.Name)) }}
18+
SILO_HMAC_SECRET_KEY: {{ (lookup "v1" "ConfigMap" .Release.Namespace (printf "%s-silo-vars" .Release.Name)).data.SILO_HMAC_SECRET_KEY | default (randAlphaNum 32) | quote }}
19+
{{- else }}
20+
SILO_HMAC_SECRET_KEY: {{ randAlphaNum 32 | quote }}
21+
{{- end }}
22+
23+
{{- if eq .Values.env.silo_envs.cors_allowed_origins "*"}}
24+
CORS_ALLOWED_ORIGINS: "*"
25+
{{- else if .Values.env.silo_envs.cors_allowed_origins }}
26+
CORS_ALLOWED_ORIGINS: "http://{{ .Values.license.licenseDomain }},https://{{ .Values.license.licenseDomain }},{{ .Values.env.silo_envs.cors_allowed_origins }}"
27+
{{- else}}
28+
CORS_ALLOWED_ORIGINS: "http://{{ .Values.license.licenseDomain }},https://{{ .Values.license.licenseDomain }}"
29+
{{- end }}
30+
31+
APP_BASE_URL: "https://{{ .Values.license.licenseDomain }}"
32+
API_BASE_URL: "http://{{ .Release.Name }}-api.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}:8000/"
33+
SILO_API_BASE_URL: "https://{{ .Values.license.licenseDomain }}"
34+
35+
{{- if .Values.services.rabbitmq.local_setup }}
36+
AMQP_URL: "amqp://{{ .Values.services.rabbitmq.default_user}}:{{ .Values.services.rabbitmq.default_password}}@{{ .Release.Name }}-rabbitmq.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}/"
37+
{{- else if .Values.services.rabbitmq.external_rabbitmq_url }}
38+
AMQP_URL: {{ .Values.services.rabbitmq.external_rabbitmq_url}}
39+
{{- else }}
40+
AMQP_URL: ""
41+
{{- end }}
42+
43+
PAYMENT_SERVER_BASE_URL: "http://{{ .Release.Name }}-monitor.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}:8080/"
44+
FEATURE_FLAG_SERVER_BASE_URL: "http://{{ .Release.Name }}-monitor.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}:8080/"
45+
46+
{{- if .Values.services.postgres.local_setup }}
47+
DATABASE_URL: "postgresql://{{ .Values.env.pgdb_username }}:{{ .Values.env.pgdb_password }}@{{ .Release.Name }}-pgdb.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}/{{ .Values.env.pgdb_name }}"
48+
{{- else if .Values.env.pgdb_remote_url }}
49+
DATABASE_URL: {{ .Values.env.pgdb_remote_url}}
50+
{{ else }}
51+
DATABASE_URL: ""
52+
{{ end }}
53+
54+
{{- if .Values.services.redis.local_setup }}
55+
REDIS_URL: "redis://{{ .Release.Name }}-redis.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}:6379/"
56+
{{- else if .Values.env.remote_redis_url }}
57+
REDIS_URL: {{ .Values.env.remote_redis_url | default "" | quote }}
58+
{{- end }}
59+
60+
61+
SENTRY_DSN: {{ .Values.env.silo_envs.sentry_dsn | default "" | quote }}
62+
SENTRY_ENVIRONMENT: {{ .Values.env.silo_envs.sentry_environment | default "development" | quote }}
63+
SENTRY_TRACES_SAMPLE_RATE: {{ .Values.env.silo_envs.sentry_traces_sample_rate | default "0.1" | quote }}
64+
65+
# Secrets for Slack Integration
66+
{{- if .Values.services.silo.connectors.slack.enabled }}
67+
SLACK_CLIENT_ID: {{ .Values.services.silo.connectors.slack.client_id | default "" | quote }}
68+
SLACK_CLIENT_SECRET: {{ .Values.services.silo.connectors.slack.client_secret | default "" | quote }}
69+
{{- end}}
70+
71+
# Secrets for Github Integration
72+
{{- if .Values.services.silo.connectors.github.enabled }}
73+
GITHUB_CLIENT_ID: {{ .Values.services.silo.connectors.github.client_id | default "" | quote }}
74+
GITHUB_CLIENT_SECRET: {{ .Values.services.silo.connectors.github.client_secret | default "" | quote }}
75+
GITHUB_APP_NAME: {{ .Values.services.silo.connectors.github.app_name | default "" | quote }}
76+
GITHUB_APP_ID: {{ .Values.services.silo.connectors.github.app_id | default "" | quote }}
77+
GITHUB_PRIVATE_KEY: {{ .Values.services.silo.connectors.github.private_key | default "" | quote }}
78+
{{- end}}
79+
80+
# Secrets for Gitlab Integration
81+
{{- if .Values.services.silo.connectors.gitlab.enabled }}
82+
GITLAB_CLIENT_ID: {{ .Values.services.silo.connectors.gitlab.client_id | default "" | quote }}
83+
GITLAB_CLIENT_SECRET: {{ .Values.services.silo.connectors.gitlab.client_secret | default "" | quote }}
84+
{{- end}}
85+
---
86+
{{- end }}

‎charts/plane-enterprise/templates/ingress.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ spec:
6666
name: {{ .Release.Name }}-api
6767
path: /graphql/
6868
pathType: Prefix
69+
- backend:
70+
service:
71+
port:
72+
number: 3000
73+
name: {{ .Release.Name }}-silo
74+
path: /silo/
75+
pathType: Prefix
6976
{{- if and .Values.services.minio.local_setup .Values.env.docstore_bucket }}
7077
- backend:
7178
service:

‎charts/plane-enterprise/templates/workloads/rabbitmq.stateful.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,13 @@ spec:
5252
- mountPath: /var/lib/rabbitmq
5353
name: pvc-{{ .Release.Name }}-rabbitmq-vol
5454
subPath: ''
55+
readinessProbe:
56+
exec:
57+
command: ["rabbitmq-diagnostics", "check_port_connectivity"]
58+
initialDelaySeconds: 5
59+
periodSeconds: 30
60+
timeoutSeconds: 30
61+
failureThreshold: 50
5562
serviceAccount: {{ .Release.Name }}-srv-account
5663
serviceAccountName: {{ .Release.Name }}-srv-account
5764
volumeClaimTemplates:

0 commit comments

Comments
 (0)