Merge branch 'main' into selectorLabels

christianhuth · Aug 29, 2024 · ae95f10 · ae95f10
2 parents 997a716 + 7a6856d
commit ae95f10
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 3 deletions.
diff --git a/charts/baserow/README.md b/charts/baserow/README.md
diff --git a/charts/baserow/templates/asgi/asgi-deployment.yaml b/charts/baserow/templates/asgi/asgi-deployment.yaml
@@ -132,6 +132,9 @@ spec:
             - name: media
               mountPath: {{ .Values.backend.config.media.root | quote }}
           {{- end }}
+      {{- if .Values.backend.asgi.priorityClassName }}
+      priorityClassName: {{ .Values.backend.asgi.priorityClassName }}
+      {{- end }}
       {{- with .Values.backend.asgi.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/baserow/templates/celery/celery-deployment.yaml b/charts/baserow/templates/celery/celery-deployment.yaml
@@ -268,6 +268,9 @@ spec:
             - name: media
               mountPath: {{ .Values.backend.config.media.root | quote }}
           {{- end }}
+      {{- if .Values.backend.celery.priorityClassName }}
+      priorityClassName: {{ .Values.backend.celery.priorityClassName }}
+      {{- end }}
       {{- with .Values.backend.celery.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/baserow/templates/frontend/frontend-deployment.yaml b/charts/baserow/templates/frontend/frontend-deployment.yaml
@@ -74,6 +74,9 @@ spec:
           securityContext:
             {{- toYaml . | nindent 12 }}
           {{- end }}
+      {{- if .Values.frontend.priorityClassName }}
+      priorityClassName: {{ .Values.frontend.priorityClassName }}
+      {{- end }}
       {{- with .Values.frontend.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/baserow/templates/wsgi/wsgi-deployment.yaml b/charts/baserow/templates/wsgi/wsgi-deployment.yaml
@@ -134,6 +134,9 @@ spec:
             - name: media
               mountPath: {{ .Values.backend.config.media.root | quote }}
           {{- end }}
+      {{- if .Values.backend.wsgi.priorityClassName }}
+      priorityClassName: {{ .Values.backend.wsgi.priorityClassName }}
+      {{- end }}
       {{- with .Values.backend.wsgi.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

diff --git a/charts/baserow/values.schema.json b/charts/baserow/values.schema.json
@@ -71,6 +71,9 @@
                                 }
                             }
                         },
+                        "priorityClassName": {
+                            "type": "string"
+                        },
                         "replicaCount": {
                             "type": "integer"
                         },
@@ -193,6 +196,9 @@
                                 }
                             }
                         },
+                        "priorityClassName": {
+                            "type": "string"
+                        },
                         "replicaCount": {
                             "type": "integer"
                         },
@@ -598,6 +604,9 @@
                                 }
                             }
                         },
+                        "priorityClassName": {
+                            "type": "string"
+                        },
                         "replicaCount": {
                             "type": "integer"
                         },
@@ -841,6 +850,9 @@
                         }
                     }
                 },
+                "priorityClassName": {
+                    "type": "string"
+                },
                 "replicaCount": {
                     "type": "integer"
                 },

diff --git a/charts/baserow/values.yaml b/charts/baserow/values.yaml
@@ -26,6 +26,9 @@ frontend:
     runAsGroup: 9999
     runAsUser: 9999
 
+  # -- Pod priority class name
+  priorityClassName: ""
+
   # -- Number of replicas
   replicaCount: 1
 
@@ -150,6 +153,9 @@ backend:
       runAsGroup: 9999
       runAsUser: 9999
 
+    # -- Pod priority class name
+    priorityClassName: ""
+
     # -- Number of replicas
     replicaCount: 1
 
@@ -239,6 +245,9 @@ backend:
       runAsGroup: 9999
       runAsUser: 9999
 
+    # -- Pod priority class name
+    priorityClassName: ""
+
     # -- Number of replicas
     replicaCount: 1
 
@@ -476,6 +485,9 @@ backend:
       runAsGroup: 9999
       runAsUser: 9999
 
+    # -- Pod priority class name
+    priorityClassName: ""
+
     # -- Number of replicas
     replicaCount: 1
 

diff --git a/charts/polr/Chart.yaml b/charts/polr/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: polr
 description: Polr is a quick, modern, and open-source link shortener
 type: application
-version: 1.10.1
+version: 1.11.0
 appVersion: "2.3.0"
 home: https://github.com/christianhuth/helm-charts
 icon: http://docs.polrproject.org/en/latest/logo.png
@@ -15,11 +15,11 @@ sources:
 dependencies:
   - name: mysql
     repository: https://charts.bitnami.com/bitnami
-    version: 9.19.1
+    version: 9.22.0
 annotations:
   artifacthub.io/changes: |
     - kind: changed
-      description: URL and name of Helm repository
+      description: bumped chart version of mysql to 9.22.0
   artifacthub.io/screenshots: |
     - title: Polr converts some long links into shorter ones.
       url: https://selfhostedweb.org/wp-content/uploads/2017/02/shortit-1024x346.png