fix: Allow specifying external dburl in Helm (#672)

Closes #667

charts/planka/Chart.yaml

@@ -15,13 +15,13 @@ 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.1.19
+version: 0.1.22
 
 # 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.
-appVersion: "1.16.0"
+appVersion: "1.16.1"
 
 dependencies:
   - alias: postgresql

charts/planka/README.md

@@ -46,7 +46,7 @@ helm install planka . --set secretkey=$SECRETKEY \
 --set admin_email="demo@demo.demo"  \
 --set admin_password="demo"  \
 --set admin_name="Demo Demo" \
---set admin_username="demo"
+--set admin_username="demo" \
 --set ingress.enabled=true \
 --set ingress.hosts[0].host=planka.example.dev \
 
@@ -55,7 +55,7 @@ helm install planka . --set secretkey=$SECRETKEY \
 --set admin_email="demo@demo.demo"  \
 --set admin_password="demo"  \
 --set admin_name="Demo Demo" \
---set admin_username="demo"
+--set admin_username="demo" \
 --set ingress.enabled=true \
 --set ingress.hosts[0].host=planka.example.dev \
 --set ingress.tls[0].secretName=planka-tls \
@@ -76,6 +76,7 @@ admin_name: "Demo Demo"
 admin_username: "demo"
 # Admin user
 
+# Ingress
 ingress:
   enabled: true
   hosts:

charts/planka/templates/deployment.yaml

@@ -58,11 +58,16 @@ spec:
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
+          {{- if not .Values.postgresql.enabled }}
+            - name: DATABASE_URL
+              value: {{ required "If the included postgresql deployment is disabled you need to define a Database URL in 'dburl'" .Values.dburl }}
+          {{- else }}
             - name: DATABASE_URL
               valueFrom:
                 secretKeyRef:
                   name: planka-postgresql-svcbind-custom-user
                   key: uri
+          {{- end }}
             - name: BASE_URL
               {{- if .Values.baseUrl }}
               value: {{ .Values.baseUrl }}

charts/planka/templates/hpa.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "planka.fullname" . }}
@@ -17,12 +17,16 @@ spec:
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}

charts/planka/values.yaml

@@ -105,12 +105,14 @@ postgresql:
   serviceBindings:
     enabled: true
 
+## Set this if you disable the built-in postgresql deployment
+dburl:
+
 ## PVC-based data storage configuration
 persistence:
   enabled: false
   # existingClaim: netbox-data
   # storageClass: "-"
-  
   accessMode: ReadWriteOnce
   size: 10Gi
 

client/.env

@@ -1 +1 @@
-REACT_APP_VERSION=1.16.0
+REACT_APP_VERSION=1.16.1

client/src/components/BoardMembershipsStep/BoardMembershipsStep.module.scss

@@ -4,7 +4,6 @@
     max-height: 60vh;
     overflow-x: hidden;
     overflow-y: auto;
-    scrollbar-width: thin;
     width: 100%;
 
     &::-webkit-scrollbar {

client/src/components/Boards/Boards.module.scss

@@ -85,7 +85,6 @@
     height: 56px;
     overflow-x: auto;
     overflow-y: hidden;
-    scrollbar-width: thin;
 
     &:hover {
       height: 38px;

client/src/components/Header/NotificationsStep.module.scss

@@ -49,7 +49,6 @@
     max-height: 60vh;
     overflow-x: hidden;
     overflow-y: auto;
-    scrollbar-width: thin;
 
     &::-webkit-scrollbar {
       width: 5px;

client/src/components/LabelsStep/LabelsStep.module.scss

@@ -25,7 +25,6 @@
     max-height: 60vh;
     overflow-x: hidden;
     overflow-y: auto;
-    scrollbar-width: thin;
 
     &::-webkit-scrollbar {
       width: 5px;

client/src/components/List/List.module.scss

@@ -43,7 +43,6 @@
     max-height: calc(100vh - 268px);
     overflow-x: hidden;
     overflow-y: auto;
-    scrollbar-width: thin;
     width: 290px;
 
     &:hover {

client/src/components/Memberships/AddStep/AddStep.module.scss

@@ -4,7 +4,6 @@
     max-height: 60vh;
     overflow-x: hidden;
     overflow-y: auto;
-    scrollbar-width: thin;
 
     &::-webkit-scrollbar {
       width: 5px;

client/src/sagas/login/services/login.js

@@ -33,10 +33,10 @@ export function* authenticateUsingOidc() {
   const oidcConfig = yield select(selectors.selectOidcConfig);
 
   const state = nanoid();
-  window.sessionStorage.setItem('oidc-state', state);
+  window.localStorage.setItem('oidc-state', state);
 
   const nonce = nanoid();
-  window.sessionStorage.setItem('oidc-nonce', nonce);
+  window.localStorage.setItem('oidc-nonce', nonce);
 
   let redirectUrl = `${oidcConfig.authorizationUrl}`;
   redirectUrl += `&state=${encodeURIComponent(state)}`;
@@ -49,11 +49,11 @@ export function* authenticateUsingOidcCallback() {
   // https://github.com/plankanban/planka/issues/511#issuecomment-1771385639
   const params = new URLSearchParams(window.location.hash.substring(1) || window.location.search);
 
-  const state = window.sessionStorage.getItem('oidc-state');
-  window.sessionStorage.removeItem('oidc-state');
+  const state = window.localStorage.getItem('oidc-state');
+  window.localStorage.removeItem('oidc-state');
 
-  const nonce = window.sessionStorage.getItem('oidc-nonce');
-  window.sessionStorage.removeItem('oidc-nonce');
+  const nonce = window.localStorage.getItem('oidc-nonce');
+  window.localStorage.removeItem('oidc-nonce');
 
   yield put(replace(Paths.LOGIN));
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "planka",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "planka",
-      "version": "1.16.0",
+      "version": "1.16.1",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "planka",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "private": true,
   "homepage": "https://plankanban.github.io/planka",
   "repository": {