Merge pull request #25 from makeplane/develop

Merging various updates/fixes from Develop to Master
makeplane · Aug 14, 2024 · 101c3bf · 101c3bf
2 parents ef57e5b + d925651
commit 101c3bf
Show file tree

Hide file tree

Showing 20 changed files with 193 additions and 82 deletions.
diff --git a/.coderabbit.yaml b/.coderabbit.yaml
@@ -0,0 +1,15 @@
+# yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json
+language: "en-US"
+early_access: false
+reviews:
+  profile: "chill"
+  request_changes_workflow: false
+  high_level_summary: true
+  poem: true
+  review_status: true
+  collapse_walkthrough: false
+  auto_review:
+    enabled: true
+    drafts: false
+chat:
+  auto_reply: true
diff --git a/charts/plane-ce/Chart.yaml b/charts/plane-ce/Chart.yaml
@@ -5,8 +5,8 @@ description: Meet Plane. An open-source software development tool to manage issu
 
 type: application
 
-version: 1.0.20
-appVersion: "0.21.0"
+version: 1.0.21
+appVersion: "0.22.0"
 
 home: https://plane.so
 icon: https://plane.so/favicon/favicon-32x32.png

diff --git a/charts/plane-ce/README.md b/charts/plane-ce/README.md
@@ -201,7 +201,7 @@ If you are planning to use 3rd party ingress providers, here is the available ro
 |---    |:---:|---|
 | plane.example.com | /  | <http://plane-web.plane-ce:3000> |
 | plane.example.com | /spaces/*  | <http://plane-space.plane-ce:3000> |
-| plane.example.com | /god-mode/* | <http://plane-admin.plane-ce:8000> |
+| plane.example.com | /god-mode/* | <http://plane-admin.plane-ce:3000> |
 | plane.example.com | /api/*  |  <http://plane-api.plane-ce:8000> |
 | plane.example.com | /auth/* | <http://plane-api.plane-ce:8000> |
 | plane.example.com | /uploads/* | <http://plane-minio.plane-ce:9000> |

diff --git a/charts/plane-ce/questions.yml b/charts/plane-ce/questions.yml
@@ -16,42 +16,32 @@ questions:
   - variable: dockerRegistry.password
     label: "Password/Token"
     type: password
-
 - variable: planeVersion
   label: Plane Version (Docker Image Tag)
   type: string
   default: stable
   required: true
-  group: "Docker Images"
-  subquestions:
-  - variable: web.image
-    label: Frontend Docker Image
-    type: string
-    required: true
-    default: "makeplane/plane-frontend"
-  - variable: space.image
-    label: Space Docker Image
-    type: string
-    required: true
-    default: "makeplane/plane-space"
-  - variable: admin.image
-    label: Admin Docker Image
-    type: string
-    required: true
-    default: "makeplane/plane-admin"
-  - variable: api.image
-    label: Backend Docker Image
-    type: string
-    required: true
-    default: "makeplane/plane-backend"
-    description: "Used by API, Worker, Beat-Worker"
+  group: "Docker Registry"
 
-- variable: web.replicas
-  label: "Default Replica Count"
-  type: int
-  default: 1
+- variable: web.image
+  label: Frontend Docker Image
+  type: string
+  required: true
+  default: "makeplane/plane-frontend"
   group: "Web Setup"
   subquestions:
+  - variable: web.pullPolicy
+    label: "Image Pull Policy"
+    type: enum
+    options:
+      - "Always"
+      - "IfNotPresent"
+      - "Never"
+    default: "IfNotPresent"
+  - variable: web.replicas
+    label: "Default Replica Count"
+    type: int
+    default: 1
   - variable: web.memoryLimit
     label: "Memory Limit"
     type: string
@@ -61,12 +51,26 @@ questions:
     type: string
     default: 500m
 
-- variable: space.replicas
-  label: "Default Replica Count"
-  type: int
-  default: 1
+
+- variable: space.image
+  label: Space Docker Image
+  type: string
+  required: true
+  default: "makeplane/plane-space"
   group: "Spaces Setup"
   subquestions:
+  - variable: space.pullPolicy
+    label: "Image Pull Policy"
+    type: enum
+    options:
+      - "Always"
+      - "IfNotPresent"
+      - "Never"
+    default: "IfNotPresent"
+  - variable: space.replicas
+    label: "Default Replica Count"
+    type: int
+    default: 1
   - variable: space.memoryLimit
     label: "Memory Limit"
     type: string
@@ -76,12 +80,25 @@ questions:
     type: string
     default: 500m
 
-- variable: admin.replicas
-  label: "Default Replica Count"
-  type: int
-  default: 1
+- variable: admin.image
+  label: Admin Docker Image
+  type: string
+  required: true
+  default: "makeplane/plane-admin"
   group: "Admin Setup"
   subquestions:
+  - variable: admin.pullPolicy
+    label: "Image Pull Policy"
+    type: enum
+    options:
+      - "Always"
+      - "IfNotPresent"
+      - "Never"
+    default: "IfNotPresent"
+  - variable: admin.replicas
+    label: "Default Replica Count"
+    type: int
+    default: 1
   - variable: admin.memoryLimit
     label: "Memory Limit"
     type: string
@@ -91,12 +108,26 @@ questions:
     type: string
     default: 500m
 
-- variable: api.replicas
-  label: "Default Replica Count"
-  type: int
-  default: 1
+- variable: api.image
+  label: Backend Docker Image
+  type: string
+  required: true
+  default: "makeplane/plane-backend"
+  description: "Used by API, Worker, Beat-Worker"
   group: "API Setup"
   subquestions:
+  - variable: api.pullPolicy
+    label: "Image Pull Policy"
+    type: enum
+    options:
+      - "Always"
+      - "IfNotPresent"
+      - "Never"
+    default: "IfNotPresent"
+  - variable: api.replicas
+    label: "Default Replica Count"
+    type: int
+    default: 1
   - variable: api.memoryLimit
     label: "Memory Limit"
     type: string
@@ -105,10 +136,6 @@ questions:
     label: "CPU Limit"
     type: string
     default: 500m
-  - variable: env.gunicorn_api_workers
-    label: "Workers"
-    type: int
-    default: 1
   - variable: env.cors_allowed_origins
     label: "CORS Allowed Origins"
     type: string
@@ -288,6 +315,11 @@ questions:
     type: string
     default: ""
     show_if: "minio.local_setup=false"
+  - variable: env.aws_s3_endpoint_url
+    label: "AWS S3 Endpoint URL"
+    type: string
+    default: ""
+    show_if: "minio.local_setup=false"
   - variable: env.docstore_bucket
     label: "Bucket Name"
     type: string
@@ -297,7 +329,6 @@ questions:
     type: string
     default: "5242880"
 
-
 - variable: ingress.enabled
   label: "Install Ingress"
   type: boolean
@@ -318,7 +349,6 @@ questions:
   - variable: ingress.ingressClass
     label: "Ingress Classname"
     type: string
-    required: true
     default: "nginx"
     show_if: "ingress.enabled=true"
 

diff --git a/charts/plane-ce/templates/config-secrets/app-env.yaml b/charts/plane-ce/templates/config-secrets/app-env.yaml
@@ -19,7 +19,7 @@ data:
     SENTRY_ENVIRONMENT: {{ .Values.env.sentry_environment | default "" | quote}}
     DEBUG: "0"
     DOCKERIZED: "1"
-    GUNICORN_WORKERS: {{ .Values.env.gunicorn_api_workers | default 1 | quote }}
+    GUNICORN_WORKERS: "1"
 
     {{- if .Values.ingress.appHost }}
     WEB_URL: "http://{{ .Values.ingress.appHost }}"
@@ -41,15 +41,15 @@ data:
     {{- end }}
 
     {{- if .Values.redis.local_setup }}
-    REDIS_URL: "redis://{{ .Release.Name }}-redis.{{ .Release.Namespace }}.svc.cluster.local:6379/"
+    REDIS_URL: "redis://{{ .Release.Name }}-redis.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}:6379/"
     {{- else }}
     REDIS_URL: {{ .Values.env.remote_redis_url | default "" | quote }}
     {{- end }}
 
-    {{ if .Values.postgres.local_setup }}
-    DATABASE_URL: "postgresql://{{ .Values.env.pgdb_username }}:{{ .Values.env.pgdb_password }}@{{ .Release.Name }}-pgdb.{{ .Release.Namespace }}.svc.cluster.local/{{ .Values.env.pgdb_name }}"
-    {{ else if .Values.env.pgdb_remote_url }}
+    {{- if .Values.postgres.local_setup }}
+    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 }}"
+    {{- else if .Values.env.pgdb_remote_url }}
     DATABASE_URL: {{ .Values.env.pgdb_remote_url}}
-    {{ else }}
+    {{- else }}
     DATABASE_URL: ""
     {{ end }}
diff --git a/.../templates/config-secrets/doc-strore.yaml → ...e/templates/config-secrets/doc-store.yaml b/.../templates/config-secrets/doc-strore.yaml → ...e/templates/config-secrets/doc-store.yaml
@@ -32,6 +32,10 @@ data:
   USE_MINIO: "0"
   AWS_ACCESS_KEY_ID: {{ .Values.env.aws_access_key | default "" | quote }}
   AWS_REGION: {{ .Values.env.aws_region | default "" | quote  }}
-  # AWS_S3_ENDPOINT_URL=${AWS_S3_ENDPOINT_URL:-http://plane-minio:9000}
+
+  {{- if .Values.env.aws_s3_endpoint_url }}
+  AWS_S3_ENDPOINT_URL: {{ .Values.env.aws_s3_endpoint_url | quote }}
+  {{- end }}
+
   {{ end }}
 ---
diff --git a/charts/plane-ce/templates/ingress.yaml b/charts/plane-ce/templates/ingress.yaml
@@ -12,7 +12,7 @@ metadata:
     {{- end }}
   {{- end }}
 spec:
-  ingressClassName: {{ .Values.ingress.ingressClass }}
+  ingressClassName: {{ .Values.ingress.ingressClass | quote }}
   rules:
     - host: {{ .Values.ingress.appHost }}
       http:

diff --git a/charts/plane-ce/templates/workloads/admin.deployment.yaml b/charts/plane-ce/templates/workloads/admin.deployment.yaml
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}-admin
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.admin.pullPolicy | default "IfNotPresent" }}
         image: {{ .Values.admin.image | default "makeplane/plane-frontend" }}:{{ .Values.planeVersion }}
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/api.deployment.yaml b/charts/plane-ce/templates/workloads/api.deployment.yaml
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}-api
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.api.pullPolicy | default "IfNotPresent" }}
         image: {{ .Values.api.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/beat-worker.deployment.yaml b/charts/plane-ce/templates/workloads/beat-worker.deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}-beat-worker
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.beatworker.pullPolicy | default "IfNotPresent" }}
         image: {{ .Values.beatworker.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/migrator.job.yaml b/charts/plane-ce/templates/workloads/migrator.job.yaml
@@ -18,7 +18,7 @@ spec:
         image: {{ .Values.api.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
         command: 
           - ./bin/docker-entrypoint-migrator.sh
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.api.pullPolicy | default "IfNotPresent" }}
         envFrom:
           - configMapRef:
               name: {{ .Release.Name }}-app-vars

diff --git a/charts/plane-ce/templates/workloads/minio.stateful.yaml b/charts/plane-ce/templates/workloads/minio.stateful.yaml
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
       - image: {{ .Values.minio.image }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.minio.pullPolicy | default "IfNotPresent" }}
         name: {{ .Release.Name }}-minio
         stdin: true
         tty: true
@@ -95,15 +95,15 @@ spec:
       initContainers:
         - name: init
           image: busybox
-          command: ['sh', '-c', "until nslookup  {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.cluster.local; do echo waiting for  {{ .Release.Name }}-minio; sleep 2; done"]
+          command: ['sh', '-c', "until nslookup  {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}; do echo waiting for  {{ .Release.Name }}-minio; sleep 2; done"]
       containers:
         - command:
             - /bin/sh
           args:
             - '-c'
             - >-
               /usr/bin/mc config host add plane-app-minio
-              http://{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.cluster.local:9000 "$AWS_ACCESS_KEY_ID" "$AWS_SECRET_ACCESS_KEY"; 
+              http://{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}:9000 "$AWS_ACCESS_KEY_ID" "$AWS_SECRET_ACCESS_KEY"; 
               /usr/bin/mc mb plane-app-minio/$AWS_S3_BUCKET_NAME; 
               /usr/bin/mc anonymous set download plane-app-minio/$AWS_S3_BUCKET_NAME; exit 0;
           envFrom:
@@ -114,7 +114,7 @@ spec:
                 name: {{ .Release.Name }}-doc-store-secrets
                 optional: false
           image: minio/mc
-          imagePullPolicy: Always
+          imagePullPolicy: {{ .Values.minio.pullPolicy }}
           name: {{ .Release.Name }}-minio-bucket
       serviceAccount: {{ .Release.Name }}-srv-account
       serviceAccountName: {{ .Release.Name }}-srv-account

diff --git a/charts/plane-ce/templates/workloads/postgres.stateful.yaml b/charts/plane-ce/templates/workloads/postgres.stateful.yaml
@@ -59,7 +59,7 @@ spec:
     spec:
       containers:
       - image: {{ .Values.postgres.image }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.postgres.pullPolicy | default "IfNotPresent" }}
         name: {{ .Release.Name }}-pgdb
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/redis.stateful.yaml b/charts/plane-ce/templates/workloads/redis.stateful.yaml
@@ -37,7 +37,7 @@ spec:
     spec:
       containers:
       - image: {{ .Values.redis.image }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.redis.pullPolicy | default "IfNotPresent" }}
         name: {{ .Release.Name }}-redis
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/space.deployment.yaml b/charts/plane-ce/templates/workloads/space.deployment.yaml
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}-space
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.space.pullPolicy | default "IfNotPresent" }}
         image: {{ .Values.space.images | default "makeplane/plane-space" }}:{{ .Values.planeVersion }}
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/web.deployment.yaml b/charts/plane-ce/templates/workloads/web.deployment.yaml
@@ -38,7 +38,7 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}-web
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.web.pullPolicy | default "IfNotPresent" }}
         image: {{ .Values.web.image | default "makeplane/plane-frontend" }}:{{ .Values.planeVersion }}
         stdin: true
         tty: true

diff --git a/charts/plane-ce/templates/workloads/worker.deployment.yaml b/charts/plane-ce/templates/workloads/worker.deployment.yaml
@@ -18,7 +18,7 @@ spec:
     spec:
       containers:
       - name: {{ .Release.Name }}-worker
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.worker.pullPolicy | default "IfNotPresent" }}
         image: {{ .Values.worker.image | default "makeplane/plane-backend" }}:{{ .Values.planeVersion }}
         stdin: true
         tty: true