Remove comments from Chart.yaml

iterative · Aug 9, 2023 · ace3116 · ace3116
1 parent 44def65
commit ace3116
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 36 deletions.
diff --git a/charts/studio/Chart.yaml b/charts/studio/Chart.yaml
@@ -1,23 +1,8 @@
 apiVersion: v2
 name: studio
 description: A Helm chart for Kubernetes
-# A chart can be either an 'application' or a 'library' chart.
-#
-# Application charts are a collection of templates that can be packaged into versioned archives
-# to be deployed.
-#
-# Library charts provide useful utilities or functions for the chart developer. They're included as
-# a dependency of application charts to inject those utilities and functions into the rendering
-# pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-# This is the chart version. This version number should be incremented each time you make changes
-# to the chart and its templates, including the app version.
-# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.19
-# This is the version number of the application being deployed. This version number should be
-# incremented each time you make changes to the application. Versions are not expected to
-# follow Semantic Versioning. They should reflect the version the application is using.
-# It is recommended to use it with quotes.
+version: 0.2.20
 appVersion: "v2.21.0"
 maintainers:
   - name: iterative

diff --git a/charts/studio/README.md b/charts/studio/README.md
@@ -1,6 +1,6 @@
 # studio
 
-![Version: 0.2.19](https://img.shields.io/badge/Version-0.2.19-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.21.0](https://img.shields.io/badge/AppVersion-v2.21.0-informational?style=flat-square)
+![Version: 0.2.20](https://img.shields.io/badge/Version-0.2.20-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v2.21.0](https://img.shields.io/badge/AppVersion-v2.21.0-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -21,11 +21,11 @@ A Helm chart for Kubernetes
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| global.basePath | string | `""` | Studio: Base path (prefix) |
+| global.basePath | string | `"/custompath"` | Studio: Base path (prefix) |
 | global.blobvault.accessKeyId | string | `""` | Blobvault S3 access key ID |
 | global.blobvault.bucket | string | `""` | Blobvault S3 bucket name |
 | global.blobvault.endpointUrl | string | `""` | Blobvault S3 endpoint URL |
-| global.blobvault.persistentVolume | object | `{"accessModes":["ReadWriteOnce"],"size":"30Gi","storageClassName":""}` | Blobvault local backing store settings. |
+| global.blobvault.persistentVolume | object | `{"accessModes":["ReadWriteOnce"],"size":"30Gi","storageClassName":""}` | Blobvault local backing store settings. Not used when `global.blobvault.bucket` is set. |
 | global.blobvault.persistentVolume.accessModes | list | ReadWriteOnce | Blobvault local backing store access mode. |
 | global.blobvault.persistentVolume.size | string | `"30Gi"` | Blobvault local backing store size. |
 | global.blobvault.persistentVolume.storageClassName | string | default storage class in the cluster. | Blobvault local backing store storage class. |

diff --git a/charts/studio/templates/configmap-studio-blobvault-nginx.yaml b/charts/studio/templates/configmap-studio-blobvault-nginx.yaml
@@ -85,3 +85,14 @@ data:
             try_files $uri $uri/ =404;
         }
     }
+    server {
+
+      access_log  /dev/null  main;
+      error_log  /dev/null info;
+
+      listen 8080;
+      server_name _;
+      location / {
+            return 200 'Ok';
+      }
+    }
diff --git a/charts/studio/templates/deployment-studio-backend.yaml b/charts/studio/templates/deployment-studio-backend.yaml
@@ -42,7 +42,7 @@ spec:
           args:
             - |
               ./manage.py migrate
-          {{- if .Release.IsUpgrade }}
+          {{- if and .Release.IsUpgrade (not .Values.ci) }}
               ./manage.py migrate phonenumber --fake-initial
               ./manage.py migrate
           {{- end }}

diff --git a/charts/studio/templates/deployment-studio-blobvault-nginx.yaml b/charts/studio/templates/deployment-studio-blobvault-nginx.yaml
@@ -43,13 +43,12 @@ spec:
               protocol: TCP
           livenessProbe:
             tcpSocket:
-              port: http
-            initialDelaySeconds: 5
+              port: 8080
             periodSeconds: 10
           readinessProbe:
-            tcpSocket:
-              port: http
-            initialDelaySeconds: 5
+            httpGet:
+              path: /
+              port: 8080
             periodSeconds: 10
           volumeMounts:
             - name: studio-blobvault-nginx-config

diff --git a/charts/studio/templates/ingress-blobvault.yaml b/charts/studio/templates/ingress-blobvault.yaml
@@ -19,7 +19,6 @@ metadata:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "-1"
     argocd.argoproj.io/hook: PostSync
-{{/*    nginx.ingress.kubernetes.io/rewrite-target: /$2*/}}
   {{- with .Values.global.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}

diff --git a/charts/studio/templates/ingress-studio-api.yaml b/charts/studio/templates/ingress-studio-api.yaml
@@ -20,9 +20,6 @@ metadata:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "-1"
     argocd.argoproj.io/hook: PostSync
-    {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
-    {{- end }}
   {{- with .Values.global.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -42,7 +39,7 @@ spec:
     - http:
         paths:
           {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}
-          - path: /{{ include "studio.basePath" . }}/(api(?:/|$).*)
+          - path: /{{ include "studio.basePath" . }}/api
           {{- else }}
           - path: /api
           {{- end }}

diff --git a/charts/studio/templates/ingress-studio-ui.yaml b/charts/studio/templates/ingress-studio-ui.yaml
@@ -39,7 +39,7 @@ spec:
     - http:
         paths:
           {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}
-          - path: /{{ include "studio.basePath" . }}((?:/|$).*)
+          - path: /{{ include "studio.basePath" . }}
           {{- else }}
           - path: /
           {{- end }}

diff --git a/charts/studio/templates/ingress-studio-webhook.yaml b/charts/studio/templates/ingress-studio-webhook.yaml
@@ -20,9 +20,6 @@ metadata:
     helm.sh/hook: post-install,post-upgrade
     helm.sh/hook-weight: "-1"
     argocd.argoproj.io/hook: PostSync
-    {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}
-    nginx.ingress.kubernetes.io/rewrite-target: /$1
-    {{- end }}
   {{- with .Values.global.ingress.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
@@ -42,7 +39,7 @@ spec:
     - http:
         paths:
           {{- if and .Values.global.basePath (not (eq .Values.global.basePath "/")) }}
-          - path: /{{ include "studio.basePath" . }}/(webhook(?:/|$).*)
+          - path: /{{ include "studio.basePath" . }}/webhook
           {{- else }}
           - path: /webhook
           {{- end }}

diff --git a/charts/studio/values.yaml b/charts/studio/values.yaml
@@ -9,7 +9,7 @@ global:
   # -- Studio: Hostname for accessing Studio (no http(s) scheme)
   host: "studio.example.com"
   # -- Studio: Base path (prefix)
-  basePath: ""
+  basePath: "/custompath"
   # -- Studio: Maximum number of views
   maxViews: "100"
   # -- Studio: Maximum number of teams