Skip to content

Commit

Permalink
Merge pull request #64 from makeplane/develop
Browse files Browse the repository at this point in the history
Promoting develop to master
  • Loading branch information
mguptahub authored Dec 5, 2024
2 parents de76a63 + 66357c9 commit e736f62
Show file tree
Hide file tree
Showing 32 changed files with 294 additions and 210 deletions.
4 changes: 2 additions & 2 deletions charts/plane-ce/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ description: Meet Plane. An open-source software development tool to manage issu

type: application

version: 1.0.26
appVersion: "0.23.0"
version: 1.0.27
appVersion: "0.24.0"

home: https://plane.so
icon: https://plane.so/favicon/favicon-32x32.png
Expand Down
48 changes: 30 additions & 18 deletions charts/plane-ce/README.md

Large diffs are not rendered by default.

108 changes: 63 additions & 45 deletions charts/plane-ce/questions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ questions:
- variable: dockerRegistry.password
label: "Password/Token"
type: password

- variable: planeVersion
label: Plane Version (Docker Image Tag)
type: string
Expand All @@ -34,10 +35,10 @@ questions:
label: "Image Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- "Always"
- "IfNotPresent"
- "Never"
default: "Always"
- variable: web.replicas
label: "Default Replica Count"
type: int
Expand All @@ -54,7 +55,6 @@ questions:
label: "Assign Cluster IP"
type: boolean
default: false


- variable: space.image
label: Space Docker Image
Expand All @@ -67,10 +67,10 @@ questions:
label: "Image Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- "Always"
- "IfNotPresent"
- "Never"
default: "Always"
- variable: space.replicas
label: "Default Replica Count"
type: int
Expand Down Expand Up @@ -99,10 +99,10 @@ questions:
label: "Image Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- "Always"
- "IfNotPresent"
- "Never"
default: "Always"
- variable: admin.replicas
label: "Default Replica Count"
type: int
Expand Down Expand Up @@ -132,10 +132,10 @@ questions:
label: "Image Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- "Always"
- "IfNotPresent"
- "Never"
default: "Always"
- variable: live.replicas
label: "Default Replica Count"
type: int
Expand All @@ -152,7 +152,6 @@ questions:
label: "Assign Cluster IP"
type: boolean
default: false

- variable: env.live_sentry_dsn
label: "Live Sentry DSN"
type: string
Expand All @@ -178,10 +177,10 @@ questions:
label: "Image Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- "Always"
- "IfNotPresent"
- "Never"
default: "Always"
- variable: api.replicas
label: "Default Replica Count"
type: int
Expand Down Expand Up @@ -215,7 +214,6 @@ questions:
type: string
required: true
default: "60gp0byfz2dvffa45cxl20p1scy9xbpf6d8c5y0geejgkyp1b5"
subquestions:

- variable: worker.replicas
label: "Default Replica Count"
Expand Down Expand Up @@ -253,6 +251,14 @@ questions:
default: true
group: "Redis Setup"
subquestions:
- variable: redis.pullPolicy
label: "Redis Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- variable: redis.image
label: "Docker Image"
type: string
Expand All @@ -265,8 +271,7 @@ questions:
show_if: "redis.local_setup=true"
- variable: redis.storageClass
label: "Storage Class"
type: string
default: "longhorn"
type: storageclass
show_if: "redis.local_setup=true"
- variable: redis.volumeSize
label: "Volume Size"
Expand All @@ -291,24 +296,27 @@ questions:
group: "Postgres Setup"
# show_subquestion_if: true
subquestions:
- variable: postgres.pullPolicy
label: "Postgres Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- variable: postgres.image
label: "Docker Image"
type: string
default: "postgres:15.5-alpine"
default: "postgres:15.7-alpine"
show_if: "postgres.local_setup=true"
- variable: postgres.servicePort
label: Service Port
type: int
default: 5432
show_if: "postgres.local_setup=true"
- variable: postgres.cliConnectPort
label: CLI Connect Port
type: int
show_if: "postgres.local_setup=true"
- variable: postgres.storageClass
label: "Storage Class"
type: string
default: "longhorn"
type: storageclass
show_if: "postgres.local_setup=true"
- variable: postgres.volumeSize
label: "Volume Size"
Expand Down Expand Up @@ -356,9 +364,9 @@ questions:
label: "Image Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
show_if: "rabbitmq.local_setup=true"
- variable: rabbitmq.servicePort
Expand All @@ -378,8 +386,7 @@ questions:
show_if: "rabbitmq.local_setup=true"
- variable: rabbitmq.storageClass
label: "Storage Class"
type: string
default: "longhorn"
type: storageclass
show_if: "rabbitmq.local_setup=true"
- variable: rabbitmq.volumeSize
label: "Volume Size"
Expand Down Expand Up @@ -407,11 +414,24 @@ questions:
default: true
group: "Storage Setup"
subquestions:
- variable: minio.pullPolicy
label: "Minio Pull Policy"
type: enum
options:
- "Always"
- "IfNotPresent"
- "Never"
default: "IfNotPresent"
- variable: minio.image
label: "Docker Image"
type: string
default: "minio/minio:latest"
show_if: "minio.local_setup=true"
- variable: minio.image_mc
label: "MinIO Client Docker Image"
type: string
default: "minio/mc:latest"
show_if: "minio.local_setup=true"
- variable: minio.root_user
label: "Root User"
type: string
Expand All @@ -424,8 +444,7 @@ questions:
show_if: "minio.local_setup=true"
- variable: minio.storageClass
label: "Storage Class"
type: string
default: "longhorn"
type: storageclass
show_if: "minio.local_setup=true"
- variable: minio.volumeSize
label: "Volume Size"
Expand Down Expand Up @@ -481,12 +500,12 @@ questions:
- variable: ingress.minioHost
label: "Minio Host"
type: string
default: "plane-minio.example.com"
default: ""
show_if: "minio.local_setup=true"
- variable: ingress.rabbitmqHost
label: "Rabbitmq Host"
type: string
default: "plane-rabbitmq.example.com"
default: ""
show_if: "rabbitmq.local_setup=true"
- variable: ingress.ingressClass
label: "Ingress Classname"
Expand All @@ -506,9 +525,9 @@ questions:
label: "SSL Issuer"
type: enum
options:
- "http"
- "cloudflare"
- "digitalocean"
- "http"
- "cloudflare"
- "digitalocean"
default: "http"
- variable: ssl.server
label: "Let's Encrypt Server URL"
Expand All @@ -528,4 +547,3 @@ questions:
label: "Enable to generate certificates"
type: boolean
default: false

2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/admin.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-admin
imagePullPolicy: {{ .Values.admin.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.admin.pullPolicy | default "Always" }}
image: {{ .Values.admin.image | default "makeplane/plane-frontend" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/api.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-api
imagePullPolicy: {{ .Values.api.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.api.pullPolicy | default "Always" }}
image: {{ .Values.api.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-beat-worker
imagePullPolicy: {{ .Values.beatworker.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.beatworker.pullPolicy | default "Always" }}
image: {{ .Values.beatworker.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/live.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-live
imagePullPolicy: Always
imagePullPolicy: {{ .Values.live.pullPolicy | default "Always" }}
image: {{ .Values.live.image | default "makeplane/plane-live" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/migrator.job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
image: {{ .Values.api.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
command:
- ./bin/docker-entrypoint-migrator.sh
imagePullPolicy: {{ .Values.api.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.api.pullPolicy | default "Always" }}
envFrom:
- configMapRef:
name: {{ .Release.Name }}-app-vars
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/minio.stateful.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ spec:
- secretRef:
name: {{ .Release.Name }}-doc-store-secrets
optional: false
image: minio/mc
image: {{ .Values.minio.image_mc }}
imagePullPolicy: {{ .Values.minio.pullPolicy }}
name: {{ .Release.Name }}-minio-bucket
serviceAccount: {{ .Release.Name }}-srv-account
Expand Down
24 changes: 0 additions & 24 deletions charts/plane-ce/templates/workloads/postgres.stateful.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,30 +19,6 @@ spec:
selector:
app.name: {{ .Release.Namespace }}-{{ .Release.Name }}-pgdb
---
{{- if and .Values.postgres.cliConnectPort .Values.postgres.cliConnectPort | int }}
apiVersion: v1
kind: Service
metadata:
namespace: {{ .Release.Namespace }}
name: {{ .Release.Name }}-pgdb-cli-connect
spec:
externalTrafficPolicy: Cluster
internalTrafficPolicy: Cluster
ipFamilies:
- IPv4
ipFamilyPolicy: SingleStack
ports:
- name: pg-{{ .Values.postgres.cliConnectPort | default 30000 }}
nodePort: {{ .Values.postgres.cliConnectPort | default 30000 }}
port: 5432
protocol: TCP
targetPort: 5432
selector:
app.name: {{ .Release.Namespace }}-{{ .Release.Name }}-pgdb
sessionAffinity: None
type: NodePort
---
{{- end }}

apiVersion: apps/v1
kind: StatefulSet
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/space.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-space
imagePullPolicy: {{ .Values.space.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.space.pullPolicy | default "Always" }}
image: {{ .Values.space.images | default "makeplane/plane-space" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/web.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-web
imagePullPolicy: {{ .Values.web.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.web.pullPolicy | default "Always" }}
image: {{ .Values.web.image | default "makeplane/plane-frontend" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
2 changes: 1 addition & 1 deletion charts/plane-ce/templates/workloads/worker.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
spec:
containers:
- name: {{ .Release.Name }}-worker
imagePullPolicy: {{ .Values.worker.pullPolicy | default "IfNotPresent" }}
imagePullPolicy: {{ .Values.worker.pullPolicy | default "Always" }}
image: {{ .Values.worker.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
stdin: true
tty: true
Expand Down
Loading

0 comments on commit e736f62

Please sign in to comment.