First pass at updating Helm chart.

charts/budibase/Chart.yaml

@@ -17,10 +17,6 @@ version: 0.0.0
 appVersion: 0.0.0
 dependencies:
   - name: couchdb
-    version: 3.3.4
+    version: 4.4.5
     repository: https://apache.github.io/couchdb-helm
     condition: services.couchdb.enabled
-  - name: ingress-nginx
-    version: 4.0.13
-    repository: https://kubernetes.github.io/ingress-nginx
-    condition: ingress.nginx

charts/budibase/templates/alb-ingress.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.ingress.aws }}
+{{- if .Values.awsAlbIngress.enabled }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
@@ -9,22 +9,22 @@ metadata:
     alb.ingress.kubernetes.io/target-type: ip
     alb.ingress.kubernetes.io/success-codes: 200,301
     alb.ingress.kubernetes.io/healthcheck-path: /
-    {{- if .Values.ingress.certificateArn }}
+    {{- if .Values.awsAlbIngress.certificateArn }}
     alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
-    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.ingress.certificateArn }} 
+    alb.ingress.kubernetes.io/certificate-arn: {{ .Values.awsAlbIngress.certificateArn }} 
     {{- end }}
-    {{- if .Values.ingress.sslPolicy }}
-    alb.ingress.kubernetes.io/actions.ssl-policy: {{ .Values.ingress.sslPolicy }}
+    {{- if .Values.awsAlbIngress.sslPolicy }}
+    alb.ingress.kubernetes.io/actions.ssl-policy: {{ .Values.awsAlbIngress.sslPolicy }}
     {{- end }}
-    {{- if .Values.ingress.securityGroups }}
-    alb.ingress.kubernetes.io/security-groups: {{ .Values.ingress.securityGroups }}
+    {{- if .Values.awsAlbIngress.securityGroups }}
+    alb.ingress.kubernetes.io/security-groups: {{ .Values.awsAlbIngress.securityGroups }}
     {{- end }}
 spec:
   rules:
     - http:
         paths:
-        {{- if .Values.ingress.certificateArn }}
+        {{- if .Values.awsAlbIngress.certificateArn }}
         - path: /
           pathType: Prefix
           backend:

charts/budibase/templates/app-service-deployment.yaml

@@ -2,12 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
 {{ if .Values.services.apps.deploymentAnnotations }}
 {{- toYaml .Values.services.apps.deploymentAnnotations | indent 4 -}}
 {{ end }}
-  creationTimestamp: null
   labels:
     io.kompose.service: app-service
 {{ if .Values.services.apps.deploymentLabels }}
@@ -24,12 +21,9 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert
-        kompose.version: 1.21.0 (992df58d8)
 {{ if .Values.services.apps.templateAnnotations }}
 {{- toYaml .Values.services.apps.templateAnnotations | indent 8 -}}
 {{ end }}
-      creationTimestamp: null
       labels:
         io.kompose.service: app-service
 {{ if .Values.services.apps.templateLabels }}
@@ -200,7 +194,7 @@ spec:
         {{ end }}
 
         image: budibase/apps:{{ .Values.globals.appVersion | default .Chart.AppVersion }}
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         {{- if .Values.services.apps.startupProbe }}
         {{- with .Values.services.apps.startupProbe }}
         startupProbe:

charts/budibase/templates/app-service-service.yaml

@@ -1,10 +1,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: app-service
   name: app-service

charts/budibase/templates/couchdb-backup.yaml

@@ -2,10 +2,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     app.kubernetes.io/name: couchdb-backup
   name: couchdb-backup
@@ -18,10 +14,6 @@ spec:
     type: Recreate
   template:
     metadata:
-      annotations:
-        kompose.cmd: kompose convert
-        kompose.version: 1.21.0 (992df58d8)
-      creationTimestamp: null
       labels:
         app.kubernetes.io/name: couchdb-backup
     spec:

charts/budibase/templates/minio-data-persistentvolumeclaim.yaml

@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: minio-data
   name: minio-data

charts/budibase/templates/minio-service-deployment.yaml

@@ -2,10 +2,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: minio-service
   name: minio-service
@@ -18,10 +14,6 @@ spec:
     type: Recreate
   template:
     metadata:
-      annotations:
-        kompose.cmd: kompose convert
-        kompose.version: 1.21.0 (992df58d8)
-      creationTimestamp: null
       labels:
         io.kompose.service: minio-service
     spec:

charts/budibase/templates/minio-service-service.yaml

@@ -2,10 +2,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: minio-service
   name: minio-service

charts/budibase/templates/proxy-service-deployment.yaml

@@ -2,12 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
 {{ if .Values.services.proxy.deploymentAnnotations }}
 {{- toYaml .Values.services.proxy.deploymentAnnotations | indent 4 -}}
 {{ end }}
-  creationTimestamp: null
   labels:
     app.kubernetes.io/name: budibase-proxy
 {{ if .Values.services.proxy.deploymentLabels }}
@@ -24,8 +21,6 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert
-        kompose.version: 1.21.0 (992df58d8)
 {{ if .Values.services.proxy.templateAnnotations }}
 {{- toYaml .Values.services.proxy.templateAnnotations | indent 8 -}}
 {{ end }}

charts/budibase/templates/proxy-service-service.yaml

@@ -1,18 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     app.kubernetes.io/name: budibase-proxy
   name: proxy-service
 spec:
   ports:
-  - name: {{ .Values.services.proxy.port | quote }}
-    port: {{ .Values.services.proxy.port }}
-    targetPort: {{ .Values.services.proxy.port }}
+    - name: { { .Values.services.proxy.port | quote } }
+      port: { { .Values.services.proxy.port } }
+      targetPort: { { .Values.services.proxy.port } }
   selector:
     app.kubernetes.io/name: budibase-proxy
 status:

charts/budibase/templates/redis-data-persistentvolumeclaim.yaml

@@ -2,7 +2,6 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  creationTimestamp: null
   labels:
     io.kompose.service: redis-data
   name: redis-data

charts/budibase/templates/redis-service-deployment.yaml

@@ -2,10 +2,6 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: redis-service
   name: redis-service
@@ -18,10 +14,6 @@ spec:
     type: Recreate
   template:
     metadata:
-      annotations:
-        kompose.cmd: kompose convert
-        kompose.version: 1.21.0 (992df58d8)
-      creationTimestamp: null
       labels:
         io.kompose.service: redis-service
     spec:

charts/budibase/templates/redis-service-service.yaml

@@ -2,10 +2,6 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: redis-service
   name: redis-service

charts/budibase/templates/worker-service-deployment.yaml

@@ -2,12 +2,9 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
 {{ if .Values.services.worker.deploymentAnnotations }}
 {{- toYaml .Values.services.worker.deploymentAnnotations | indent 4 -}}
 {{ end }}
-  creationTimestamp: null
   labels:
     io.kompose.service: worker-service
 {{ if .Values.services.worker.deploymentLabels }}
@@ -24,12 +21,9 @@ spec:
   template:
     metadata:
       annotations:
-        kompose.cmd: kompose convert
-        kompose.version: 1.21.0 (992df58d8)
 {{ if .Values.services.worker.templateAnnotations }}
 {{- toYaml .Values.services.worker.templateAnnotations | indent 8 -}}
 {{ end }}
-      creationTimestamp: null
       labels:
         io.kompose.service: worker-service
 {{ if .Values.services.worker.templateLabels }}

charts/budibase/templates/worker-service-service.yaml

@@ -1,18 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  annotations:
-    kompose.cmd: kompose convert
-    kompose.version: 1.21.0 (992df58d8)
-  creationTimestamp: null
   labels:
     io.kompose.service: worker-service
   name: worker-service
 spec:
   ports:
-  - name: {{ .Values.services.worker.port | quote }}
-    port: {{ .Values.services.worker.port }}
-    targetPort: {{ .Values.services.worker.port }}
+    - name: { { .Values.services.worker.port | quote } }
+      port: { { .Values.services.worker.port } }
+      targetPort: { { .Values.services.worker.port } }
   selector:
     io.kompose.service: worker-service
 status:

charts/budibase/values.yaml

@@ -2,11 +2,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-image:
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
 imagePullSecrets: []
 nameOverride: ""
 # fullnameOverride: ""
@@ -41,14 +36,10 @@ service:
 
 ingress:
   enabled: true
-  aws: false
-  nginx: true
-  certificateArn: ""
   className: ""
   annotations:
-    kubernetes.io/ingress.class: nginx
-    nginx.ingress.kubernetes.io/client-max-body-size: 150M
-    nginx.ingress.kubernetes.io/proxy-body-size: 50m
+    # nginx.ingress.kubernetes.io/client-max-body-size: 150M
+    # nginx.ingress.kubernetes.io/proxy-body-size: 50m
   hosts:
     - host: # change if using custom domain
       paths:
@@ -60,6 +51,10 @@ ingress:
               port:
                 number: 10000
 
+awsAlbIngress:
+  enabled: false
+  certificateArn: ""
+
 autoscaling:
   enabled: false
   minReplicas: 1
@@ -111,7 +106,6 @@ globals:
 #  globalAgentNoProxy:
 
 services:
-  budibaseVersion: latest
   dns: cluster.local
   # tlsRejectUnauthorized: 0
 
@@ -145,10 +139,6 @@ services:
         scheme: HTTP
       failureThreshold: 3
       periodSeconds: 5
-  #    annotations:
-  #      co.elastic.logs/module: nginx
-  #      co.elastic.logs/fileset.stdout: access
-  #      co.elastic.logs/fileset.stderr: error
 
   apps:
     port: 4002
@@ -280,7 +270,6 @@ couchdb:
 
   # adminUsername: budibase
   # adminPassword: budibase
-  # adminHash: -pbkdf2-this_is_not_necessarily_secure_either
   # cookieAuthSecret: admin
 
   ## When enabled, will deploy a networkpolicy that allows CouchDB pods to
@@ -310,16 +299,12 @@ couchdb:
 
   ## The CouchDB image
   image:
-    repository: couchdb
-    tag: 3.1.1
+    repository: budibase/couchdb
+    tag: 3.2.1
     pullPolicy: IfNotPresent
 
   ## Experimental integration with Lucene-powered fulltext search
-  enableSearch: true
-  searchImage:
-    repository: kocolosk/couchdb-search
-    tag: 0.2.0
-    pullPolicy: IfNotPresent
+  enableSearch: false
 
   initImage:
     repository: busybox