Merge branch 'develop' into feature/query-variables

2024-06-29 11:31:06 +12:00 · 2021-12-14 12:31:31 +00:00 · 2021-12-14 12:31:31 +00:00 · 5551dbbc1e
parent aaa5c1841f a5bd89dacc
commit 5551dbbc1e
93 changed files with 1503 additions and 3124 deletions
--- a/.github/workflows/release-charts.yml
+++ b/.github/workflows/release-charts.yml
@ -0,0 +1,36 @@
+name: Budibase Release Helm Charts
+
+on:
+ workflow_dispatch:
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: 'Get Previous tag'
+        id: previoustag
+        uses: "WyriHaximus/github-action-get-previous-tag@v1"
+      
+      - name: Install Helm
+        uses: azure/setup-helm@v1
+        with:
+          version: v3.4.0
+
+      # - run: yarn release:helm
+      #   env:
+      #     BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
+
+      - name: Configure Git
+        run: |
+          git config user.name "Budibase Helm Bot"
+          git config user.email "<>"
+      
+      - name: Run chart-releaser
+        uses: helm/chart-releaser-action@v1.2.1
+        env:
+          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
--- a/.github/workflows/release-selfhost.yml
+++ b/.github/workflows/release-selfhost.yml
@ -1,4 +1,4 @@
-name: Budibase Release Selfhost
+name: Budibase Release Docker Selfhost

 on:
 workflow_dispatch:
@ -42,16 +42,4 @@ jobs:
          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
          BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
-      
-      - uses: azure/setup-helm@v1
-        id: install
-
-      # So, we need to inject the values into this
-      - run: yarn release:helm
-
-      - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.1.0
-        with:
-          charts_dir: docs
-        env:
-          CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
+          
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -56,3 +56,5 @@ jobs:
          DOCKER_USER: ${{ secrets.DOCKER_USERNAME }}
          DOCKER_PASSWORD: ${{ secrets.DOCKER_API_KEY }}
          BUDIBASE_RELEASE_VERSION: ${{ steps.previoustag.outputs.tag }}
+      
+      # Release to pre-prod environment
--- a/hosting/kubernetes/budibase/.helmignore
+++ b/hosting/kubernetes/budibase/.helmignore
--- a/charts/budibase/Chart.yaml
+++ b/charts/budibase/Chart.yaml
@ -0,0 +1,24 @@
+apiVersion: v2
+name: budibase
+description: >-
+  Budibase is an open source low-code platform, helping thousands of teams build
+  apps for their workplace in minutes.
+keywords:
+  - low-code
+  - database
+  - cluster
+sources:
+  - https://github.com/Budibase/budibase
+  - https://budibase.com
+type: application
+version: 0.2.6
+appVersion: 1.0.10
+dependencies:
+  - name: couchdb
+    version: 3.3.4
+    repository: https://apache.github.io/couchdb-helm
+    condition: services.couchdb.enabled
+  - name: ingress-nginx
+    version: 3.35.0
+    repository: https://github.com/kubernetes/ingress-nginx
+    condition: ingress.nginx
--- a/hosting/kubernetes/budibase/README.md
+++ b/hosting/kubernetes/budibase/README.md
--- a/charts/budibase/charts/couchdb-3.3.4.tgz
+++ b/charts/budibase/charts/couchdb-3.3.4.tgz
--- a/hosting/kubernetes/budibase/charts/ingress-nginx-3.35.0.tgz
+++ b/hosting/kubernetes/budibase/charts/ingress-nginx-3.35.0.tgz
--- a/hosting/kubernetes/budibase/templates/NOTES.txt
+++ b/hosting/kubernetes/budibase/templates/NOTES.txt
--- a/hosting/kubernetes/budibase/templates/_helpers.tpl
+++ b/hosting/kubernetes/budibase/templates/_helpers.tpl
--- a/hosting/kubernetes/budibase/templates/alb-ingress.yaml
+++ b/hosting/kubernetes/budibase/templates/alb-ingress.yaml
--- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
@ -73,17 +73,13 @@ spec:
              name: {{ template "budibase.fullname" . }}
              key: objectStoreSecret
        - name: MINIO_URL
-          {{ if .Values.services.objectStore.url }}
          value: {{ .Values.services.objectStore.url }}
-          {{ else }}
-          value: http://minio-service:{{ .Values.services.objectStore.port }}
-          {{ end }}
        - name: PORT
          value: {{ .Values.services.apps.port | quote }}
        - name: MULTI_TENANCY
          value: {{ .Values.globals.multiTenancy | quote }}
        - name: LOG_LEVEL
-          value: {{ .Values.services.apps.logLevel | quote }}
+          value: {{ default "info" .Values.services.apps.logLevel | quote }}
        - name: REDIS_PASSWORD
          value: {{ .Values.services.redis.password }}
        - name: REDIS_URL
@ -110,7 +106,7 @@ spec:
          value: {{ .Values.globals.accountPortalApiKey | quote }}
        - name: COOKIE_DOMAIN
          value: {{ .Values.globals.cookieDomain | quote }}
-        image: budibase/apps
+        image: budibase/apps:{{ .Values.globals.appVersion }}
        imagePullPolicy: Always
        name: bbapps
        ports:
--- a/hosting/kubernetes/budibase/templates/app-service-service.yaml
+++ b/hosting/kubernetes/budibase/templates/app-service-service.yaml
--- a/charts/budibase/templates/couchdb-backup.yaml
+++ b/charts/budibase/templates/couchdb-backup.yaml
@ -0,0 +1,43 @@
+{{- if .Values.services.couchdb.backup.enabled }}
+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
+spec:
+  replicas: 1 
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: couchdb-backup
+  strategy:
+    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:
+      containers:
+      - env:
+        - name: SOURCE
+          value: {{ .Values.services.couchdb.url }}
+        - name: TARGET
+          value: {{ .Values.services.couchdb.backup.target | quote }}
+        - name: RUN_EVERY_SECS
+          value: {{ .Values.services.couchdb.backup.interval | quote }}
+        - name: VERBOSE
+          value: "true"
+        image: redgeoff/replicate-couchdb-cluster
+        imagePullPolicy: Always
+        name: couchdb-backup
+        resources: {}
+status: {}
+{{- end }}
--- a/hosting/kubernetes/budibase/templates/hpa.yaml
+++ b/hosting/kubernetes/budibase/templates/hpa.yaml
--- a/hosting/kubernetes/budibase/templates/ingress.yaml
+++ b/hosting/kubernetes/budibase/templates/ingress.yaml
--- a/hosting/kubernetes/budibase/templates/minio-data-persistentvolumeclaim.yaml
+++ b/hosting/kubernetes/budibase/templates/minio-data-persistentvolumeclaim.yaml
--- a/hosting/kubernetes/budibase/templates/minio-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/minio-service-deployment.yaml
--- a/hosting/kubernetes/budibase/templates/minio-service-service.yaml
+++ b/hosting/kubernetes/budibase/templates/minio-service-service.yaml
--- a/hosting/kubernetes/budibase/templates/proxy-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/proxy-service-deployment.yaml
--- a/hosting/kubernetes/budibase/templates/proxy-service-service.yaml
+++ b/hosting/kubernetes/budibase/templates/proxy-service-service.yaml
--- a/hosting/kubernetes/budibase/templates/redis-data-persistentvolumeclaim.yaml
+++ b/hosting/kubernetes/budibase/templates/redis-data-persistentvolumeclaim.yaml
--- a/hosting/kubernetes/budibase/templates/redis-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/redis-service-deployment.yaml
--- a/hosting/kubernetes/budibase/templates/redis-service-service.yaml
+++ b/hosting/kubernetes/budibase/templates/redis-service-service.yaml
--- a/hosting/kubernetes/budibase/templates/secrets.yaml
+++ b/hosting/kubernetes/budibase/templates/secrets.yaml
--- a/hosting/kubernetes/budibase/templates/service.yaml
+++ b/hosting/kubernetes/budibase/templates/service.yaml
--- a/hosting/kubernetes/budibase/templates/serviceaccount.yaml
+++ b/hosting/kubernetes/budibase/templates/serviceaccount.yaml
--- a/hosting/kubernetes/budibase/templates/tests/test-connection.yaml
+++ b/hosting/kubernetes/budibase/templates/tests/test-connection.yaml
--- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
@ -70,17 +70,13 @@ spec:
              name: {{ template "budibase.fullname" . }}
              key: objectStoreSecret
        - name: MINIO_URL
-          {{ if .Values.services.objectStore.url }}
          value: {{ .Values.services.objectStore.url }}
-          {{ else }}
-          value: http://minio-service:{{ .Values.services.objectStore.port }}
-          {{ end }}
        - name: PORT
          value: {{ .Values.services.worker.port | quote }}
        - name: MULTI_TENANCY
          value: {{ .Values.globals.multiTenancy | quote }}
        - name: LOG_LEVEL
-          value: {{ .Values.services.worker.logLevel | quote }}
+          value: {{ default "info" .Values.services.worker.logLevel | quote }}
        - name: REDIS_PASSWORD
          value: {{ .Values.services.redis.password | quote }}
        - name: REDIS_URL
@ -115,7 +111,7 @@ spec:
          value: {{ .Values.globals.smtp.from | quote }}
        - name: APPS_URL
          value: http://app-service:{{ .Values.services.apps.port }}
-        image: budibase/worker
+        image: budibase/worker:{{ .Values.globals.appVersion }}
        imagePullPolicy: Always
        name: bbworker
        ports:
--- a/hosting/kubernetes/budibase/templates/worker-service-service.yaml
+++ b/hosting/kubernetes/budibase/templates/worker-service-service.yaml
--- a/charts/budibase/values.yaml
+++ b/charts/budibase/values.yaml
@ -0,0 +1,305 @@
+# Default values for budibase.
+# 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: ""
+
+serviceAccount:
+  # Specifies whether a service account should be created
+  create: true
+  # Annotations to add to the service account
+  annotations: {}
+  # The name of the service account to use.
+  # If not set and create is true, a name is generated using the fullname template
+  name: ""
+
+podAnnotations: {}
+
+podSecurityContext:
+  {}
+  # fsGroup: 2000
+
+securityContext:
+  {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+service:
+  type: ClusterIP
+  port: 10000
+
+ingress:
+  enabled: false
+  aws: false
+  nginx: true
+  certificateArn: ""
+  className: ""
+  annotations:
+    kubernetes.io/ingress.class: nginx
+  hosts:
+    - host: # change if using custom domain
+      paths:
+        - path: /
+          pathType: Prefix
+          backend:
+            service:
+              name: proxy-service
+              port:
+                number: 10000
+
+resources:
+  {}
+  # We usually recommend not to specify default resources and to leave this as a conscious
+  # choice for the user. This also increases chances charts run on environments with little
+  # resources, such as Minikube. If you do want to specify resources, uncomment the following
+  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
+  # limits:
+  #   cpu: 100m
+  #   memory: 128Mi
+  # requests:
+  #   cpu: 100m
+  #   memory: 128Mi
+
+autoscaling:
+  enabled: false
+  minReplicas: 1
+  maxReplicas: 100
+  targetCPUUtilizationPercentage: 80
+  # targetMemoryUtilizationPercentage: 80
+
+nodeSelector: {}
+
+tolerations: []
+
+affinity: {}
+
+globals:
+  appVersion: "latest"
+  budibaseEnv: PRODUCTION
+  enableAnalytics: true
+  sentryDSN: ""
+  posthogToken: ""
+  logLevel: info
+  selfHosted: "1" # set to 0 for budibase cloud environment, set to 1 for self-hosted setup
+  multiTenancy: "0" # set to 0 to disable multiple orgs, set to 1 to enable multiple orgs
+  accountPortalUrl: ""
+  accountPortalApiKey: ""
+  cookieDomain: ""
+  platformUrl: ""
+
+  createSecrets: true # creates an internal API key, JWT secrets and redis password for you
+
+  # if createSecrets is set to false, you can hard-code your secrets here
+  internalApiKey: ""
+  jwtSecret: ""
+
+  smtp:
+    enabled: false
+
+services:
+  budibaseVersion: latest
+  dns: cluster.local
+
+  proxy:
+    port: 10000
+    replicaCount: 1
+
+  apps:
+    port: 4002
+    replicaCount: 1
+    logLevel: info
+
+  worker:
+    port: 4001
+    replicaCount: 1
+
+  couchdb:
+    enabled: true
+    # url: "" # only change if pointing to existing couch server
+    # user: "" # only change if pointing to existing couch server
+    # password: "" # only change if pointing to existing couch server
+    port: 5984
+    backup:
+      enabled: false
+      # target couchDB instance to back up to
+      target: ""
+      # backup interval in seconds
+      interval: ""
+
+  redis:
+    enabled: true # disable if using external redis
+    port: 6379
+    replicaCount: 1
+    url: "" # only change if pointing to existing redis cluster and enabled: false
+    password: "budibase" # recommended to override if using built-in redis
+    storage: 100Mi
+
+  objectStore:
+    minio: true
+    browser: true
+    port: 9000
+    replicaCount: 1
+    accessKey: "" # AWS_ACCESS_KEY if using S3 or existing minio access key
+    secretKey: "" # AWS_SECRET_ACCESS_KEY if using S3 or existing minio secret
+    region: "" # AWS_REGION if using S3 or existing minio secret
+    url: "http://minio-service:9000" # only change if pointing to existing minio cluster or S3 and minio: false
+    storage: 100Mi
+
+# Override values in couchDB subchart
+couchdb:
+  ## clusterSize is the initial size of the CouchDB cluster.
+  clusterSize: 3
+  allowAdminParty: false
+
+  # Secret Management
+  createAdminSecret: true
+
+  # 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
+  ## communicate with each other for clustering and ingress on port 5984
+  networkPolicy:
+    enabled: true
+
+  # Use a service account
+  serviceAccount:
+    enabled: true
+    create: true
+  # name:
+  # imagePullSecrets:
+  # - name: myimagepullsecret
+
+  ## The storage volume used by each Pod in the StatefulSet. If a
+  ## persistentVolume is not enabled, the Pods will use `emptyDir` ephemeral
+  ## local storage. Setting the storageClass attribute to "-" disables dynamic
+  ## provisioning of Persistent Volumes; leaving it unset will invoke the default
+  ## provisioner.
+  persistentVolume:
+    enabled: false
+    accessModes:
+      - ReadWriteOnce
+    size: 10Gi
+    storageClass: ""
+
+  ## The CouchDB image
+  image:
+    repository: couchdb
+    tag: 3.1.0
+    pullPolicy: IfNotPresent
+
+  ## Experimental integration with Lucene-powered fulltext search
+  enableSearch: true
+  searchImage:
+    repository: kocolosk/couchdb-search
+    tag: 0.2.0
+    pullPolicy: IfNotPresent
+
+  initImage:
+    repository: busybox
+    tag: latest
+    pullPolicy: Always
+
+  ## CouchDB is happy to spin up cluster nodes in parallel, but if you encounter
+  ## problems you can try setting podManagementPolicy to the StatefulSet default
+  ## `OrderedReady`
+  podManagementPolicy: Parallel
+
+  ## Optional pod annotations
+  annotations: {}
+
+  ## Optional tolerations
+  tolerations: []
+
+  service:
+    # annotations:
+    enabled: true
+    type: ClusterIP
+    externalPort: 5984
+
+  ## An Ingress resource can provide name-based virtual hosting and TLS
+  ## termination among other things for CouchDB deployments which are accessed
+  ## from outside the Kubernetes cluster.
+  ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/
+  ingress:
+    enabled: false
+    hosts:
+      - chart-example.local
+    path: /
+    annotations: []
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    tls:
+      # Secrets must be manually created in the namespace.
+      # - secretName: chart-example-tls
+      #   hosts:
+      #     - chart-example.local
+
+  ## Optional resource requests and limits for the CouchDB container
+  ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
+  resources:
+    {}
+    # requests:
+    #  cpu: 100m
+    #  memory: 128Mi
+    # limits:
+    #  cpu: 56
+    #  memory: 256Gi
+
+  ## erlangFlags is a map that is passed to the Erlang VM as flags using the
+  ## ERL_FLAGS env. `name` and `setcookie` flags are minimally required to
+  ## establish connectivity between cluster nodes.
+  ## ref: http://erlang.org/doc/man/erl.html#init_flags
+  erlangFlags:
+    name: couchdb
+    setcookie: monster
+
+  ## couchdbConfig will override default CouchDB configuration settings.
+  ## The contents of this map are reformatted into a .ini file laid down
+  ## by a ConfigMap object.
+  ## ref: http://docs.couchdb.org/en/latest/config/index.html
+  couchdbConfig:
+    couchdb:
+      uuid: budibase-couchdb # REQUIRED: Unique identifier for this CouchDB server instance
+    # cluster:
+    #   q: 8 # Create 8 shards for each database
+    chttpd:
+      bind_address: any
+      # chttpd.require_valid_user disables all the anonymous requests to the port
+      # 5984 when is set to true.
+      require_valid_user: false
+
+  # Kubernetes local cluster domain.
+  # This is used to generate FQDNs for peers when joining the CouchDB cluster.
+  dns:
+    clusterDomainSuffix: cluster.local
+
+  ## Configure liveness and readiness probe values
+  ## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
+  livenessProbe:
+    enabled: true
+    failureThreshold: 3
+    initialDelaySeconds: 0
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 1
+  readinessProbe:
+    enabled: true
+    failureThreshold: 3
+    initialDelaySeconds: 0
+    periodSeconds: 10
+    successThreshold: 1
+    timeoutSeconds: 1
--- a/docs/budibase-0.1.0.tgz
+++ b/docs/budibase-0.1.0.tgz
--- a/docs/budibase-0.1.1.tgz
+++ b/docs/budibase-0.1.1.tgz
--- a/docs/budibase-0.2.0.tgz
+++ b/docs/budibase-0.2.0.tgz
--- a/docs/budibase-0.2.1.tgz
+++ b/docs/budibase-0.2.1.tgz
--- a/docs/budibase-0.2.2.tgz
+++ b/docs/budibase-0.2.2.tgz
--- a/docs/index.html
+++ b/docs/index.html
@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title>Budibase Helm Chart Repo</title>
-  </head>
-  <body>
-    <h1>Budibase Charts Repo</h1>
-    <p>Point Helm at this repo to see charts.</p>
-  </body>
-</html>
--- a/docs/index.yaml
+++ b/docs/index.yaml
@ -1,132 +0,0 @@
-apiVersion: v1
-entries:
-  budibase:
-  - apiVersion: v2
-    appVersion: 0.9.169
-    created: "2021-10-20T14:27:23.521358+01:00"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 57f365d799fcaace4658883cb8ec961a7905383a68acf065af4f6e57f9878ff8
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.2.tgz
-    version: 0.2.2
-  - apiVersion: v2
-    appVersion: 0.9.163
-    created: "2021-10-20T14:27:23.5153+01:00"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: ebac6d8631cc38b266c3689508b5123f5afc395f23bdb02738be26c7cae0b0b5
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.1.tgz
-    version: 0.2.1
-  - apiVersion: v2
-    appVersion: 0.9.163
-    created: "2021-10-20T14:27:23.510041+01:00"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - condition: ingress.nginx
-      name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: f369536c0eac1f6959d51e8ce6d74a87a7a9df29ae84fb9cbed0a273ab77429b
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.2.0.tgz
-    version: 0.2.0
-  - apiVersion: v2
-    appVersion: 0.9.56
-    created: "2021-10-20T14:27:23.504543+01:00"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 8dc4f2ed4d98cad5adf25936aefea680042d3e4e17832f846b961fd8708ad192
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.1.1.tgz
-    version: 0.1.1
-  - apiVersion: v2
-    appVersion: 0.9.56
-    created: "2021-10-20T14:27:23.496847+01:00"
-    dependencies:
-    - condition: services.couchdb.enabled
-      name: couchdb
-      repository: https://apache.github.io/couchdb-helm
-      version: 3.3.4
-    - name: ingress-nginx
-      repository: https://github.com/kubernetes/ingress-nginx
-      version: 3.35.0
-    description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-    digest: 08031b0803cce0eff64472e569d454d9176119c8207aa9873a9c95ee66cc7d3f
-    keywords:
-    - low-code
-    - database
-    - cluster
-    name: budibase
-    sources:
-    - https://github.com/Budibase/budibase
-    - https://budibase.com
-    type: application
-    urls:
-    - https://budibase.github.io/budibase/budibase-0.1.0.tgz
-    version: 0.1.0
-generated: "2021-10-20T14:27:23.491132+01:00"
--- a/hosting/.env
+++ b/hosting/.env
@ -0,0 +1 @@
+hosting.properties
--- a/hosting/kubernetes/budibase/Chart.yaml
+++ b/hosting/kubernetes/budibase/Chart.yaml
@ -1,41 +0,0 @@
-apiVersion: v2
-name: budibase
-description: Budibase is an open source low-code platform, helping thousands of teams build apps for their workplace in minutes.
-keywords:
- low-code
- database
- cluster
-sources:
- https://github.com/Budibase/budibase
- https://budibase.com
-
-# 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.2
-
-# 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: "0.9.169"
-
-dependencies:
-  - name: couchdb
-    version: 3.3.4
-    repository: https://apache.github.io/couchdb-helm
-    condition: services.couchdb.enabled
-  - name: ingress-nginx
-    version: 3.35.0 
-    repository: https://github.com/kubernetes/ingress-nginx
-    condition: ingress.nginx
--- a/hosting/kubernetes/budibase/charts/couchdb/Chart.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/Chart.yaml
@ -1,19 +0,0 @@
-apiVersion: v1
-appVersion: 3.1.0
-description: A database featuring seamless multi-master sync, that scales from big
-  data to mobile, with an intuitive HTTP/JSON API and designed for reliability.
-home: https://couchdb.apache.org/
-icon: http://couchdb.apache.org/CouchDB-visual-identity/logo/CouchDB-couch-symbol.svg
-keywords:
- couchdb
- database
- nosql
-maintainers:
- email: kocolosk@apache.org
-  name: kocolosk
- email: willholley@apache.org
-  name: willholley
-name: couchdb
-sources:
- https://github.com/apache/couchdb-docker
-version: 3.3.4
--- a/hosting/kubernetes/budibase/charts/couchdb/README.md
+++ b/hosting/kubernetes/budibase/charts/couchdb/README.md
@ -1,244 +0,0 @@
-# CouchDB
-
-Apache CouchDB is a database featuring seamless multi-master sync, that scales
-from big data to mobile, with an intuitive HTTP/JSON API and designed for
-reliability.
-
-This chart deploys a CouchDB cluster as a StatefulSet. It creates a ClusterIP
-Service in front of the Deployment for load balancing by default, but can also
-be configured to deploy other Service types or an Ingress Controller. The
-default persistence mechanism is simply the ephemeral local filesystem, but
-production deployments should set `persistentVolume.enabled` to `true` to attach
-storage volumes to each Pod in the Deployment.
-
-## TL;DR
-
-```bash
-$ helm repo add couchdb https://apache.github.io/couchdb-helm
-$ helm install couchdb/couchdb \
-  --set allowAdminParty=true \
-  --set couchdbConfig.couchdb.uuid=$(curl https://www.uuidgenerator.net/api/version4 2>/dev/null | tr -d -)
-```
-
-## Prerequisites
-
- Kubernetes 1.9+ with Beta APIs enabled
- Ingress requires Kubernetes 1.14+
-
-## Installing the Chart
-
-To install the chart with the release name `my-release`:
-
-Add the CouchDB Helm repository:
-
-```bash
-$ helm repo add couchdb https://apache.github.io/couchdb-helm
-```
-
-Afterwards install the chart replacing the UUID
-`decafbaddecafbaddecafbaddecafbad` with a custom one:
-
-```bash
-$ helm install \
-  --name my-release \
-  --set couchdbConfig.couchdb.uuid=decafbaddecafbaddecafbaddecafbad \
-  couchdb/couchdb
-```
-
-This will create a Secret containing the admin credentials for the cluster.
-Those credentials can be retrieved as follows:
-
-```bash
-$ kubectl get secret my-release-couchdb -o go-template='{{ .data.adminPassword }}' | base64 --decode
-```
-
-If you prefer to configure the admin credentials directly you can create a
-Secret containing `adminUsername`, `adminPassword` and `cookieAuthSecret` keys:
-
-```bash
-$  kubectl create secret generic my-release-couchdb --from-literal=adminUsername=foo --from-literal=adminPassword=bar --from-literal=cookieAuthSecret=baz
-```
-
-If you want to set the `adminHash` directly to achieve consistent salts between 
-different nodes you need to addionally add the key `password.ini` to the secret:
-
-```bash
-$  kubectl create secret generic my-release-couchdb \
-   --from-literal=adminUsername=foo \
-   --from-literal=cookieAuthSecret=baz \
-   --from-file=./my-password.ini 
-```
-
-With the following contents in `my-password.ini`:
-
-```
-[admins]
-foo = <pbkdf2-hash>
-```
-
-and then install the chart while overriding the `createAdminSecret` setting:
-
-```bash
-$ helm install \
-  --name my-release \
-  --set createAdminSecret=false \
-  --set couchdbConfig.couchdb.uuid=decafbaddecafbaddecafbaddecafbad \
-  couchdb/couchdb
-```
-
-This Helm chart deploys CouchDB on the Kubernetes cluster in a default
-configuration. The [configuration](#configuration) section lists
-the parameters that can be configured during installation.
-
-> **Tip**: List all releases using `helm list`
-
-## Uninstalling the Chart
-
-To uninstall/delete the `my-release` Deployment:
-
-```bash
-$ helm delete my-release
-```
-
-The command removes all the Kubernetes components associated with the chart and
-deletes the release.
-
-## Upgrading an existing Release to a new major version
-
-A major chart version change (like v0.2.3 -> v1.0.0) indicates that there is an
-incompatible breaking change needing manual actions.
-
-### Upgrade to 3.0.0
-
-Since version 3.0.0 setting the CouchDB server instance UUID is mandatory.
-Therefore you need to generate a UUID and supply it as a value during the
-upgrade as follows:
-
-```bash
-$ helm upgrade <release-name> \
-  --reuse-values \
-  --set couchdbConfig.couchdb.uuid=<UUID> \
-  couchdb/couchdb
-```
-
-## Migrating from stable/couchdb
-
-This chart replaces the `stable/couchdb` chart previously hosted by Helm and continues the
-version semantics. You can upgrade directly from `stable/couchdb` to this chart using:
-
-```bash
-$ helm repo add couchdb https://apache.github.io/couchdb-helm
-$ helm upgrade my-release couchdb/couchdb
-```
-
-## Configuration
-
-The following table lists the most commonly configured parameters of the
-CouchDB chart and their default values:
-
-|           Parameter             |             Description                               |                Default                 |
-|---------------------------------|-------------------------------------------------------|----------------------------------------|
-| `clusterSize`                   | The initial number of nodes in the CouchDB cluster    | 3                                      |
-| `couchdbConfig`                 | Map allowing override elements of server .ini config  | *See below*                            |
-| `allowAdminParty`               | If enabled, start cluster without admin account       | false (requires creating a Secret)     |
-| `createAdminSecret`             | If enabled, create an admin account and cookie secret | true                                   |
-| `schedulerName`                 | Name of the k8s scheduler (other than default)        | `nil`                                  |
-| `erlangFlags`                   | Map of flags supplied to the underlying Erlang VM     | name: couchdb, setcookie: monster
-| `persistentVolume.enabled`      | Boolean determining whether to attach a PV to each node | false
-| `persistentVolume.size`         | If enabled, the size of the persistent volume to attach                          | 10Gi
-| `enableSearch`                  | Adds a sidecar for Lucene-powered text search         | false                                  |
-
-You can set the values of the `couchdbConfig` map according to the
-[official configuration][4]. The following shows the map's default values and
-required options to set:
-
-|           Parameter             |             Description                                            |                Default                 |
-|---------------------------------|--------------------------------------------------------------------|----------------------------------------|
-| `couchdb.uuid`                  | UUID for this CouchDB server instance ([Required in a cluster][5]) |                                        |
-| `chttpd.bind_address`           | listens on all interfaces when set to any                          | any                                    |
-| `chttpd.require_valid_user`     | disables all the anonymous requests to the port 5984 when true     | false                                  |
-
-A variety of other parameters are also configurable. See the comments in the
-`values.yaml` file for further details:
-
-|           Parameter                  |                Default                 |
-|--------------------------------------|----------------------------------------|
-| `adminUsername`                      | admin                                  |
-| `adminPassword`                      | auto-generated                         |
-| `adminHash`                          |                                        |
-| `cookieAuthSecret`                   | auto-generated                         |
-| `image.repository`                   | couchdb                                |
-| `image.tag`                          | 3.1.0                                  |
-| `image.pullPolicy`                   | IfNotPresent                           |
-| `searchImage.repository`             | kocolosk/couchdb-search                |
-| `searchImage.tag`                    | 0.1.0                                  |
-| `searchImage.pullPolicy`             | IfNotPresent                           |
-| `initImage.repository`               | busybox                                |
-| `initImage.tag`                      | latest                                 |
-| `initImage.pullPolicy`               | Always                                 |
-| `ingress.enabled`                    | false                                  |
-| `ingress.hosts`                      | chart-example.local                    |
-| `ingress.annotations`                |                                        |
-| `ingress.path`                       | /                                      |
-| `ingress.tls`                        |                                        |
-| `persistentVolume.accessModes`       | ReadWriteOnce                          |
-| `persistentVolume.storageClass`      | Default for the Kube cluster           |
-| `podManagementPolicy`                | Parallel                               |
-| `affinity`                           |                                        |
-| `annotations`                        |                                        |
-| `tolerations`                        |                                        |
-| `resources`                          |                                        |
-| `service.annotations`                |                                        |
-| `service.enabled`                    | true                                   |
-| `service.type`                       | ClusterIP                              |
-| `service.externalPort`               | 5984                                   |
-| `dns.clusterDomainSuffix`            | cluster.local                          |
-| `networkPolicy.enabled`              | true                                   |
-| `serviceAccount.enabled`             | true                                   |
-| `serviceAccount.create`              | true                                   |
-| `serviceAccount.imagePullSecrets`    |                                        |
-| `sidecars`                           | {}                                     |
-| `livenessProbe.enabled`              | true                                   |
-| `livenessProbe.failureThreshold`     | 3                                      |
-| `livenessProbe.initialDelaySeconds`  | 0                                      |
-| `livenessProbe.periodSeconds`        | 10                                     |
-| `livenessProbe.successThreshold`     | 1                                      |
-| `livenessProbe.timeoutSeconds`       | 1                                      |
-| `readinessProbe.enabled`             | true                                   |
-| `readinessProbe.failureThreshold`    | 3                                      |
-| `readinessProbe.initialDelaySeconds` | 0                                      |
-| `readinessProbe.periodSeconds`       | 10                                     |
-| `readinessProbe.successThreshold`    | 1                                      |
-| `readinessProbe.timeoutSeconds`      | 1                                      |
-
-## Feedback, Issues, Contributing
-
-General feedback is welcome at our [user][1] or [developer][2] mailing lists.
-
-Apache CouchDB has a [CONTRIBUTING][3] file with details on how to get started
-with issue reporting or contributing to the upkeep of this project. In short,
-use GitHub Issues, do not report anything on Docker's website.
-
-## Non-Apache CouchDB Development Team Contributors
-
- [@natarajaya](https://github.com/natarajaya)
- [@satchpx](https://github.com/satchpx)
- [@spanato](https://github.com/spanato)
- [@jpds](https://github.com/jpds)
- [@sebastien-prudhomme](https://github.com/sebastien-prudhomme)
- [@stepanstipl](https://github.com/sebastien-stepanstipl)
- [@amatas](https://github.com/amatas)
- [@Chimney42](https://github.com/Chimney42)
- [@mattjmcnaughton](https://github.com/mattjmcnaughton)
- [@mainephd](https://github.com/mainephd)
- [@AdamDang](https://github.com/AdamDang)
- [@mrtyler](https://github.com/mrtyler)
- [@kevinwlau](https://github.com/kevinwlau)
- [@jeyenzo](https://github.com/jeyenzo)
- [@Pinpin31.](https://github.com/Pinpin31)
-
-[1]: http://mail-archives.apache.org/mod_mbox/couchdb-user/
-[2]: http://mail-archives.apache.org/mod_mbox/couchdb-dev/
-[3]: https://github.com/apache/couchdb/blob/master/CONTRIBUTING.md
-[4]: https://docs.couchdb.org/en/stable/config/index.html
-[5]: https://docs.couchdb.org/en/latest/setup/cluster.html#preparing-couchdb-nodes-to-be-joined-into-a-cluster
--- a/hosting/kubernetes/budibase/charts/couchdb/ci/required-values.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/ci/required-values.yaml
@ -1,3 +0,0 @@
-couchdbConfig:
-  couchdb:
-    uuid: "decafbaddecafbaddecafbaddecafbad"
--- a/hosting/kubernetes/budibase/charts/couchdb/ci/sidecar.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/ci/sidecar.yaml
@ -1,9 +0,0 @@
-sidecars:
-  - name: foo
-    image: "busybox"
-    imagePullPolicy: IfNotPresent
-    resources:
-      requests:
-        cpu: "0.1"
-        memory: 10Mi
-    command: ['while true; do echo "foo"; sleep 5; done;']
--- a/hosting/kubernetes/budibase/charts/couchdb/password.ini
+++ b/hosting/kubernetes/budibase/charts/couchdb/password.ini
@ -1,2 +0,0 @@
-[admins]
-{{ .Values.adminUsername }} = {{ .Values.adminHash }}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/NOTES.txt
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/NOTES.txt
@ -1,20 +0,0 @@
-Apache CouchDB is starting. Check the status of the Pods using:
-
-  kubectl get pods --namespace {{ .Release.Namespace }} -l "app={{ template "couchdb.name" . }},release={{ .Release.Name }}"
-
-Once all of the Pods are fully Ready, execute the following command to create
-some required system databases:
-
-  kubectl exec --namespace {{ .Release.Namespace }} {{ if not .Values.allowAdminParty }}-it {{ end }}{{ template "couchdb.fullname" . }}-0 -c couchdb -- \
-    curl -s \
-    http://127.0.0.1:5984/_cluster_setup \
-    -X POST \
-    -H "Content-Type: application/json" \
-{{- if .Values.allowAdminParty }}
-    -d '{"action": "finish_cluster"}'
-{{- else }}
-    -d '{"action": "finish_cluster"}' \
-    -u <adminUsername>
-{{- end }}
-
-Then it's time to relax.
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/_helpers.tpl
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/_helpers.tpl
@ -1,81 +0,0 @@
-{{/* vim: set filetype=mustache: */}}
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "couchdb.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-
-{{/*
-Create a default fully qualified app name.
-We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
-*/}}
-{{- define "couchdb.fullname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- printf "%s-%s" .Values.fullnameOverride .Chart.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-In the event that we create both a headless service and a traditional one,
-ensure that the latter gets a unique name.
-*/}}
-{{- define "couchdb.svcname" -}}
-{{- if .Values.fullnameOverride -}}
-{{- printf "%s-svc-%s" .Values.fullnameOverride .Chart.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-svc-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Create a random string if the supplied key does not exist
-*/}}
-{{- define "couchdb.defaultsecret" -}}
-{{- if . -}}
-{{- . | b64enc | quote -}}
-{{- else -}}
-{{- randAlphaNum 20 | b64enc | quote -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Labels used to define Pods in the CouchDB statefulset
-*/}}
-{{- define "couchdb.ss.selector" -}}
-app: {{ template "couchdb.name" . }}
-release: {{ .Release.Name }}
-{{- end -}}
-
-{{/*
-Generates a comma delimited list of nodes in the cluster
-*/}}
-{{- define "couchdb.seedlist" -}}
-{{- $nodeCount :=  min 5 .Values.clusterSize | int }}
-  {{- range $index0 := until $nodeCount -}}
-    {{- $index1 := $index0 | add1 -}}
-    {{ $.Values.erlangFlags.name }}@{{ template "couchdb.fullname" $ }}-{{ $index0 }}.{{ template "couchdb.fullname" $ }}.{{ $.Release.Namespace }}.svc.{{ $.Values.dns.clusterDomainSuffix }}{{ if ne $index1 $nodeCount }},{{ end }}
-  {{- end -}}
-{{- end -}}
-
-{{/*
-If serviceAccount.name is specified, use that, else use the couchdb instance name
-*/}}
-{{- define "couchdb.serviceAccount" -}}
-{{- if .Values.serviceAccount.name -}}
-{{- .Values.serviceAccount.name }}
-{{- else -}}
-{{- template "couchdb.fullname" . -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Fail if couchdbConfig.couchdb.uuid is undefined
-*/}}
-{{- define "couchdb.uuid" -}}
-{{- required "A value for couchdbConfig.couchdb.uuid must be set" (.Values.couchdbConfig.couchdb | default dict).uuid -}}
-{{- end -}} 
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/configmap.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/configmap.yaml
@ -1,23 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "couchdb.fullname" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    heritage: {{ .Release.Service | quote }}
-    release: {{ .Release.Name | quote }}
-data:
-  inifile: |
-    {{ $couchdbConfig := dict "couchdb" (dict "uuid" (include "couchdb.uuid" .)) -}}
-    {{- $couchdbConfig := merge $couchdbConfig .Values.couchdbConfig -}}
-    {{- range $section, $settings := $couchdbConfig -}}
-    {{ printf "[%s]" $section }}
-    {{ range $key, $value := $settings -}}
-    {{ printf "%s = %s" $key ($value | toString) }}
-    {{ end }}
-    {{ end }}
-
-  seedlistinifile: |
-    [cluster]
-    seedlist = {{ template "couchdb.seedlist" . }}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/headless.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/headless.yaml
@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "couchdb.fullname" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  clusterIP: None
-  publishNotReadyAddresses: true
-  ports:
-    - name: couchdb
-      port: 5984
-  selector:
-{{ include "couchdb.ss.selector" . | indent 4 }}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/ingress.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/ingress.yaml
@ -1,33 +0,0 @@
-{{- if .Values.ingress.enabled -}}
-{{- $serviceName := include "couchdb.fullname" . -}}
-{{- $servicePort := .Values.service.externalPort -}}
-{{- $path := .Values.ingress.path | quote -}}
-apiVersion: networking.k8s.io/v1beta1
-kind: Ingress
-metadata:
-  name: {{ template "couchdb.fullname" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    {{- range $key, $value := .Values.ingress.annotations }}
-      {{ $key }}: {{ $value | quote }}
-    {{- end }}
-spec:
-  rules:
-    {{- range $host := .Values.ingress.hosts }}
-    - host: {{ $host }}
-      http:
-        paths:
-          - path: {{ $path }}
-            backend:
-              serviceName: {{ $serviceName }}
-              servicePort: {{ $servicePort }}
-    {{- end -}}
-  {{- if .Values.ingress.tls }}
-  tls:
-{{ toYaml .Values.ingress.tls | indent 4 }}
-  {{- end -}}
-{{- end -}}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/networkpolicy.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/networkpolicy.yaml
@ -1,31 +0,0 @@
-
-{{- if .Values.networkPolicy.enabled }}
-kind: NetworkPolicy
-apiVersion: networking.k8s.io/v1
-metadata:
-  name: {{ template "couchdb.fullname" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  podSelector:
-    matchLabels:
-{{ include "couchdb.ss.selector" . | indent 6 }}
-  ingress:
-    - ports:
-        - protocol: TCP
-          port: 5984
-    - ports:
-        - protocol: TCP
-          port: 9100
-        - protocol: TCP
-          port: 4369
-      from:
-        - podSelector:
-            matchLabels:
-{{ include "couchdb.ss.selector" . | indent 14 }}
-  policyTypes:
-    - Ingress
-{{- end }}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/secrets.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/secrets.yaml
@ -1,19 +0,0 @@
-{{- if .Values.createAdminSecret -}}
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ template "couchdb.fullname" . }}
-  labels:
-    app: {{ template "couchdb.fullname" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-type: Opaque
-data:
-  adminUsername: {{ template "couchdb.defaultsecret" .Values.adminUsername }}
-  adminPassword: {{ template "couchdb.defaultsecret" .Values.adminPassword }}
-  cookieAuthSecret: {{ template "couchdb.defaultsecret" .Values.cookieAuthSecret }}
-{{- if  .Values.adminHash  }}
-  password.ini: {{ tpl (.Files.Get "password.ini") . | b64enc }}
-{{- end -}}
-{{- end -}}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/service.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/service.yaml
@ -1,23 +0,0 @@
-{{- if .Values.service.enabled -}}
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ template "couchdb.svcname" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- if .Values.service.annotations }}
-  annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
-{{- end }}
-spec:
-  ports:
-    - port: {{ .Values.service.externalPort }}
-      protocol: TCP
-      targetPort: 5984
-  type: {{ .Values.service.type }}
-  selector:
-{{ include "couchdb.ss.selector" . | indent 4 }}
-{{- end -}}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/serviceaccount.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/serviceaccount.yaml
@ -1,15 +0,0 @@
-{{- if .Values.serviceAccount.create }}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: {{ template "couchdb.serviceAccount" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-{{- if .Values.serviceAccount.imagePullSecrets }}
-imagePullSecrets:
-{{ toYaml .Values.serviceAccount.imagePullSecrets }}
-{{- end }}
-{{- end }}
--- a/hosting/kubernetes/budibase/charts/couchdb/templates/statefulset.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/templates/statefulset.yaml
@ -1,202 +0,0 @@
-apiVersion:  apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ template "couchdb.fullname" . }}
-  labels:
-    app: {{ template "couchdb.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.clusterSize }}
-  serviceName: {{ template "couchdb.fullname" . }}
-  podManagementPolicy: {{ .Values.podManagementPolicy }}
-  selector:
-    matchLabels:
-{{ include "couchdb.ss.selector" . | indent 6 }}
-  template:
-    metadata:
-      labels:
-{{ include "couchdb.ss.selector" . | indent 8 }}
-{{- with .Values.annotations }}
-      annotations:
-        checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
-{{ toYaml . | indent 8 }}
-{{- end }}
-    spec:
-      {{- if .Values.schedulerName }}
-      schedulerName: "{{ .Values.schedulerName }}"
-      {{- end }}
-      {{- if .Values.serviceAccount.enabled }}
-      serviceAccountName: {{ template "couchdb.serviceAccount" . }}
-      {{- end }}
-      initContainers:
-        - name: init-copy
-          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
-          imagePullPolicy: {{ .Values.initImage.pullPolicy }}
-          command: ['sh','-c','cp /tmp/chart.ini /default.d; cp /tmp/seedlist.ini /default.d; ls -lrt /default.d;']
-          volumeMounts:
-          - name: config
-            mountPath: /tmp/
-          - name: config-storage
-            mountPath: /default.d
-{{- if .Values.adminHash }}
-        - name: admin-hash-copy
-          image: "{{ .Values.initImage.repository }}:{{ .Values.initImage.tag }}"
-          imagePullPolicy: {{ .Values.initImage.pullPolicy }}
-          command: ['sh','-c','cp /tmp/password.ini /local.d/ ;']
-          volumeMounts:
-            - name: admin-password
-              mountPath: /tmp/password.ini
-              subPath: "password.ini"
-            - name: local-config-storage
-              mountPath: /local.d
-{{- end }}
-      containers:
-        - name: couchdb
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          ports:
-            - name: couchdb
-              containerPort: 5984
-            - name: epmd
-              containerPort: 4369
-            - containerPort: 9100
-          env:
-{{- if not .Values.allowAdminParty }}
-            - name: COUCHDB_USER
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "couchdb.fullname" . }}
-                  key: adminUsername
-            - name: COUCHDB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "couchdb.fullname" . }}
-                  key: adminPassword
-            - name: COUCHDB_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: {{ template "couchdb.fullname" . }}
-                  key: cookieAuthSecret
-{{- end }}
-            - name: ERL_FLAGS
-              value: "{{ range $k, $v := .Values.erlangFlags }} -{{ $k }} {{ $v }} {{ end }}"
-{{- if .Values.livenessProbe.enabled }}
-          livenessProbe:
-{{- if .Values.couchdbConfig.chttpd.require_valid_user }}
-            exec:
-              command:
-                - sh
-                - -c
-                - curl -G --silent --fail -u ${COUCHDB_USER}:${COUCHDB_PASSWORD} http://localhost:5984/_up
-{{- else }}
-            httpGet:
-              path: /_up
-              port: 5984
-{{- end }}
-            failureThreshold: {{ .Values.livenessProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.livenessProbe.periodSeconds }}
-            successThreshold: {{ .Values.livenessProbe.successThreshold }}
-            timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }}
-{{- end }}
-{{- if .Values.readinessProbe.enabled }}
-          readinessProbe:
-{{- if .Values.couchdbConfig.chttpd.require_valid_user }}
-            exec:
-              command:
-                - sh
-                - -c
-                - curl -G --silent --fail -u ${COUCHDB_USER}:${COUCHDB_PASSWORD} http://localhost:5984/_up
-{{- else }}
-            httpGet:
-              path: /_up
-              port: 5984
-{{- end }}
-            failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
-            initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-            periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-            successThreshold: {{ .Values.readinessProbe.successThreshold }}
-            timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-{{- end }}
-          resources:
-{{ toYaml .Values.resources | indent 12 }}
-          volumeMounts:
-          - name: config-storage
-            mountPath: /opt/couchdb/etc/default.d
-{{- if .Values.adminHash }}
-          - name: local-config-storage
-            mountPath: /opt/couchdb/etc/local.d
-{{- end }}
-          - name: database-storage
-            mountPath: /opt/couchdb/data
-{{- if .Values.enableSearch }}
-        - name: clouseau
-          image: "{{ .Values.searchImage.repository }}:{{ .Values.searchImage.tag }}"
-          imagePullPolicy: {{ .Values.searchImage.pullPolicy }}
-          volumeMounts:
-          - name: database-storage
-            mountPath: /opt/couchdb-search/data
-{{- end }}
-{{- if .Values.sidecars }}
-{{ toYaml .Values.sidecars | indent 8}}
-{{- end }}
-{{- if .Values.nodeSelector }}
-      nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
-{{- end }}
-{{- with .Values.tolerations }}
-      tolerations:
-{{ toYaml . | indent 8 }}
-{{- end }}
-{{- with .Values.affinity }}
-      affinity:
-{{ toYaml . | indent 8 }}
-{{- end }}
-      volumes:
-        - name: config-storage
-          emptyDir: {}
-        - name: config
-          configMap:
-            name: {{ template "couchdb.fullname" . }}
-            items:
-              - key: inifile
-                path: chart.ini
-              - key: seedlistinifile
-                path: seedlist.ini
-
-{{- if .Values.adminHash }}
-        - name: local-config-storage
-          emptyDir: {}
-        - name: admin-password
-          secret:
-            secretName: {{ template "couchdb.fullname" . }}
-{{- end -}}
-
-{{- if not .Values.persistentVolume.enabled }}
-        - name: database-storage
-          emptyDir: {}
-{{- else }}
-  volumeClaimTemplates:
-    - metadata:
-        name: database-storage
-        labels:
-          app: {{ template "couchdb.name" . }}
-          release: {{ .Release.Name }}
-      spec:
-        accessModes:
-        {{- range .Values.persistentVolume.accessModes }}
-          - {{ . | quote }}
-        {{- end }}
-        resources:
-          requests:
-            storage: {{ .Values.persistentVolume.size | quote }}
-      {{- if .Values.persistentVolume.storageClass }}
-      {{- if (eq "-" .Values.persistentVolume.storageClass) }}
-        storageClassName: ""
-      {{- else }}
-        storageClassName: "{{ .Values.persistentVolume.storageClass }}"
-      {{- end }}
-      {{- end }}
-{{- end }}
--- a/hosting/kubernetes/budibase/charts/couchdb/values.yaml
+++ b/hosting/kubernetes/budibase/charts/couchdb/values.yaml
@ -1,201 +0,0 @@
-## clusterSize is the initial size of the CouchDB cluster.
-clusterSize: 3
-
-## If allowAdminParty is enabled the cluster will start up without any database
-## administrator account; i.e., all users will be granted administrative
-## access. Otherwise, the system will look for a Secret called
-## <ReleaseName>-couchdb containing `adminUsername`, `adminPassword` and
-## `cookieAuthSecret` keys. See the `createAdminSecret` flag.
-## ref: https://kubernetes.io/docs/concepts/configuration/secret/
-allowAdminParty: false
-
-## If createAdminSecret is enabled a Secret called <ReleaseName>-couchdb will
-## be created containing auto-generated credentials. Users who prefer to set
-## these values themselves have a couple of options:
-##
-## 1) The `adminUsername`, `adminPassword`, `adminHash`, and `cookieAuthSecret`
-##    can be defined directly in the chart's values. Note that all of a chart's
-##    values are currently stored in plaintext in a ConfigMap in the tiller
-##    namespace.
-##
-## 2) This flag can be disabled and a Secret with the required keys can be
-##    created ahead of time.
-createAdminSecret: true
-
-# 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
-## communicate with each other for clustering and ingress on port 5984
-networkPolicy:
-  enabled: true
-
-## Use an alternate scheduler, e.g. "stork".
-## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
-##
-# schedulerName:
-
-# Use a service account
-serviceAccount:
-  enabled: true
-  create: true
-# name:
-# imagePullSecrets:
-# - name: myimagepullsecret
-
-## The storage volume used by each Pod in the StatefulSet. If a
-## persistentVolume is not enabled, the Pods will use `emptyDir` ephemeral
-## local storage. Setting the storageClass attribute to "-" disables dynamic
-## provisioning of Persistent Volumes; leaving it unset will invoke the default
-## provisioner.
-persistentVolume:
-  enabled: false
-  accessModes:
-    - ReadWriteOnce
-  size: 10Gi
-  storageClass: ""
-
-## The CouchDB image
-image:
-  repository: couchdb
-  tag: 3.1.0
-  pullPolicy: IfNotPresent
-
-## Experimental integration with Lucene-powered fulltext search
-searchImage:
-  repository: kocolosk/couchdb-search
-  tag: 0.2.0
-  pullPolicy: IfNotPresent
-
-## Flip this to flag to include the Search container in each Pod
-enableSearch: true
-
-initImage:
-  repository: busybox
-  tag: latest
-  pullPolicy: Always
-
-## CouchDB is happy to spin up cluster nodes in parallel, but if you encounter
-## problems you can try setting podManagementPolicy to the StatefulSet default
-## `OrderedReady`
-podManagementPolicy: Parallel
-
-## To better tolerate Node failures, we can prevent Kubernetes scheduler from
-## assigning more than one Pod of CouchDB StatefulSet per Node using podAntiAffinity.
-affinity: {}
-  # podAntiAffinity:
-  #   requiredDuringSchedulingIgnoredDuringExecution:
-  #     - labelSelector:
-  #         matchExpressions:
-  #           - key: "app"
-  #             operator: In
-  #             values:
-  #             - couchdb
-  #       topologyKey: "kubernetes.io/hostname"
-
-## Optional pod annotations
-annotations: {}
-
-## Optional tolerations
-tolerations: []
-
-## A StatefulSet requires a headless Service to establish the stable network
-## identities of the Pods, and that Service is created automatically by this
-## chart without any additional configuration. The Service block below refers
-## to a second Service that governs how clients connect to the CouchDB cluster.
-service:
-  # annotations:
-  enabled: true
-  type: ClusterIP
-  externalPort: 5984
-
-## An Ingress resource can provide name-based virtual hosting and TLS
-## termination among other things for CouchDB deployments which are accessed
-## from outside the Kubernetes cluster.
-## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/
-ingress:
-  enabled: false
-  hosts:
-    - chart-example.local
-  path: /
-  annotations: []
-    # kubernetes.io/ingress.class: nginx
-    # kubernetes.io/tls-acme: "true"
-  tls:
-    # Secrets must be manually created in the namespace.
-    # - secretName: chart-example-tls
-    #   hosts:
-    #     - chart-example.local
-
-## Optional resource requests and limits for the CouchDB container
-## ref: http://kubernetes.io/docs/user-guide/compute-resources/
-resources:
-  {}
-  # requests:
-  #  cpu: 100m
-  #  memory: 128Mi
-  # limits:
-  #  cpu: 56
-  #  memory: 256Gi
-
-## erlangFlags is a map that is passed to the Erlang VM as flags using the
-## ERL_FLAGS env. `name` and `setcookie` flags are minimally required to
-## establish connectivity between cluster nodes.
-## ref: http://erlang.org/doc/man/erl.html#init_flags
-erlangFlags:
-  name: couchdb
-  setcookie: monster
-
-## couchdbConfig will override default CouchDB configuration settings.
-## The contents of this map are reformatted into a .ini file laid down
-## by a ConfigMap object.
-## ref: http://docs.couchdb.org/en/latest/config/index.html
-couchdbConfig:
-  couchdb:
-   uuid: budibase-couchdb # REQUIRED: Unique identifier for this CouchDB server instance
-  # cluster:
-  #   q: 8 # Create 8 shards for each database
-  chttpd:
-    bind_address: any
-    # chttpd.require_valid_user disables all the anonymous requests to the port
-    # 5984 when is set to true.
-    require_valid_user: false
-
-# Kubernetes local cluster domain.
-# This is used to generate FQDNs for peers when joining the CouchDB cluster.
-dns:
-  clusterDomainSuffix: cluster.local
-
-## Configure liveness and readiness probe values
-## Ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-probes/#configure-probes
-livenessProbe:
-  enabled: true
-  failureThreshold: 3
-  initialDelaySeconds: 0
-  periodSeconds: 10
-  successThreshold: 1
-  timeoutSeconds: 1
-readinessProbe:
-  enabled: true
-  failureThreshold: 3
-  initialDelaySeconds: 0
-  periodSeconds: 10
-  successThreshold: 1
-  timeoutSeconds: 1
-
-# Configure arbitrary sidecar containers for CouchDB pods created by the
-# StatefulSet
-sidecars: {}
-  # - name: foo
-  #   image: "busybox"
-  #   imagePullPolicy: IfNotPresent
-  #   resources:
-  #     requests:
-  #       cpu: "0.1"
-  #       memory: 10Mi
-  #   command: ['echo "foo";']
-  #   volumeMounts:
-  #     - name: database-storage
-  #       mountPath: /opt/couchdb/data/
--- a/hosting/kubernetes/budibase/values.yaml
+++ b/hosting/kubernetes/budibase/values.yaml
@ -1,153 +0,0 @@
-# Default values for budibase.
-# This is a YAML-formatted file.
-# Declare variables to be passed into your templates.
-
-replicaCount: 1
-
-image:
-  pullPolicy: IfNotPresent
-  # Overrides the image tag whose default is the chart appVersion.
-  tag: ""
-
-imagePullSecrets: []
-nameOverride: ""
-# fullnameOverride: ""
-
-serviceAccount:
-  # Specifies whether a service account should be created
-  create: true
-  # Annotations to add to the service account
-  annotations: {}
-  # The name of the service account to use.
-  # If not set and create is true, a name is generated using the fullname template
-  name: ""
-
-podAnnotations: {}
-
-podSecurityContext:
-  {}
-  # fsGroup: 2000
-
-securityContext:
-  {}
-  # capabilities:
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
-
-service:
-  type: ClusterIP
-  port: 10000
-
-ingress:
-  enabled: false
-  aws: false
-  nginx: true
-  certificateArn: ""
-  className: ""
-  annotations:
-    kubernetes.io/ingress.class: nginx
-  hosts:
-    - host: # change if using custom domain
-      paths:
-        - path: /
-          pathType: Prefix
-          backend:
-            service:
-              name: proxy-service
-              port:
-                number: 10000
-
-resources:
-  {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  # limits:
-  #   cpu: 100m
-  #   memory: 128Mi
-  # requests:
-  #   cpu: 100m
-  #   memory: 128Mi
-
-autoscaling:
-  enabled: false
-  minReplicas: 1
-  maxReplicas: 100
-  targetCPUUtilizationPercentage: 80
-  # targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}
-
-globals:
-  budibaseEnv: PRODUCTION
-  enableAnalytics: true
-  sentryDSN: ""
-  posthogToken: ""
-  logLevel: info
-  selfHosted: "1" # set to 0 for budibase cloud environment, set to 1 for self-hosted setup
-  multiTenancy: "0" # set to 0 to disable multiple orgs, set to 1 to enable multiple orgs
-  accountPortalUrl: ""
-  accountPortalApiKey: ""
-  cookieDomain: ""
-  platformUrl: ""
-
-  createSecrets: true # creates an internal API key, JWT secrets and redis password for you
-
-  # if createSecrets is set to false, you can hard-code your secrets here
-  internalApiKey: ""
-  jwtSecret: ""
-
-  smtp:
-    enabled: false
-
-services:
-  dns: cluster.local
-
-  proxy:
-    port: 10000
-    replicaCount: 1
-
-  apps:
-    port: 4002
-    replicaCount: 1
-    logLevel: info
-
-  worker:
-    port: 4001
-    replicaCount: 1
-
-  couchdb:
-    enabled: true
-    replicaCount: 3
-    # url: "" # only change if pointing to existing couch server
-    # user: "" # only change if pointing to existing couch server
-    # password: "" # only change if pointing to existing couch server
-    port: 5984
-    storage: 100Mi
-
-  redis:
-    enabled: true # disable if using external redis
-    port: 6379
-    replicaCount: 1
-    url: "" # only change if pointing to existing redis cluster and enabled: false
-    password: "budibase" # recommended to override if using built-in redis
-    storage: 100Mi
-
-  objectStore:
-    minio: true
-    browser: true
-    port: 9000
-    replicaCount: 1
-    accessKey: "" # AWS_ACCESS_KEY if using S3 or existing minio access key
-    secretKey: "" # AWS_SECRET_ACCESS_KEY if using S3 or existing minio secret
-    region: "" # AWS_REGION if using S3 or existing minio secret
-    url: "" # only change if pointing to existing minio cluster and minio: false
-    storage: 100Mi
--- a/index.yaml
+++ b/index.yaml
@ -0,0 +1,3 @@
+apiVersion: v1
+entries: {}
+generated: "2021-12-13T12:46:40.291206+01:00"
--- a/lerna.json
+++ b/lerna.json
@ -1,5 +1,5 @@
 {
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "npmClient": "yarn",
  "packages": [
    "packages/*"
--- a/package.json
+++ b/package.json
@ -8,6 +8,7 @@
    "eslint-plugin-cypress": "^2.11.3",
    "eslint-plugin-svelte3": "^3.2.0",
    "husky": "^7.0.1",
+    "js-yaml": "^4.1.0",
    "kill-port": "^1.6.1",
    "lerna": "3.14.1",
    "prettier": "^2.3.1",
@ -49,7 +50,7 @@
    "build:docker:airgap": "node hosting/scripts/airgapped/airgappedDockerBuild",
    "build:digitalocean": "cd hosting/digitalocean && ./build.sh && cd -",
    "build:docs": "lerna run build:docs",
-    "release:helm": "./scripts/release_helm_chart.sh",
+    "release:helm": "node scripts/releaseHelmChart",
    "env:multi:enable": "lerna run env:multi:enable",
    "env:multi:disable": "lerna run env:multi:disable",
    "env:selfhost:enable": "lerna run env:selfhost:enable",
--- a/packages/auth/package.json
+++ b/packages/auth/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/auth",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "description": "Authentication middlewares for budibase builder and apps",
  "main": "src/index.js",
  "author": "Budibase",
--- a/packages/auth/src/db/utils.js
+++ b/packages/auth/src/db/utils.js
@ -3,10 +3,15 @@ const Replication = require("./Replication")
 const { DEFAULT_TENANT_ID, Configs } = require("../constants")
 const env = require("../environment")
 const { StaticDatabases, SEPARATOR, DocumentTypes } = require("./constants")
-const { getTenantId, getTenantIDFromAppID } = require("../tenancy")
+const {
+  getTenantId,
+  getTenantIDFromAppID,
+  getGlobalDBName,
+} = require("../tenancy")
 const fetch = require("node-fetch")
 const { getCouch } = require("./index")
 const { getAppMetadata } = require("../cache/appMetadata")
+const { checkSlashesInUrl } = require("../helpers")

 const NO_APP_ERROR = "No app provided"

@ -194,6 +199,11 @@ exports.getCouchUrl = () => {
  return `${protocol}://${env.COUCH_DB_USERNAME}:${env.COUCH_DB_PASSWORD}@${rest}`
 }

+exports.getStartEndKeyURL = (base, baseKey, tenantId = null) => {
+  const tenancy = tenantId ? `${SEPARATOR}${tenantId}` : ""
+  return `${base}?startkey="${baseKey}${tenancy}"&endkey="${baseKey}${tenancy}${UNICODE_MAX}"`
+}
+
 /**
 * if in production this will use the CouchDB _all_dbs call to retrieve a list of databases. If testing
 * when using Pouch it will use the pouchdb-all-dbs package.
@ -203,12 +213,34 @@ exports.getAllDbs = async () => {
  if (env.isTest()) {
    return getCouch().allDbs()
  }
-  const response = await fetch(`${exports.getCouchUrl()}/_all_dbs`)
-  if (response.status === 200) {
-    return response.json()
-  } else {
-    throw "Cannot connect to CouchDB instance"
+  let dbs = []
+  async function addDbs(url) {
+    const response = await fetch(checkSlashesInUrl(encodeURI(url)))
+    if (response.status === 200) {
+      let json = await response.json()
+      dbs = dbs.concat(json)
+    } else {
+      throw "Cannot connect to CouchDB instance"
+    }
  }
+  let couchUrl = `${exports.getCouchUrl()}/_all_dbs`
+  if (env.MULTI_TENANCY) {
+    let tenantId = getTenantId()
+    // get prod apps
+    await addDbs(
+      exports.getStartEndKeyURL(couchUrl, DocumentTypes.APP, tenantId)
+    )
+    // get dev apps
+    await addDbs(
+      exports.getStartEndKeyURL(couchUrl, DocumentTypes.APP_DEV, tenantId)
+    )
+    // add global db name
+    dbs.push(getGlobalDBName(tenantId))
+  } else {
+    // just get all DBs in self host
+    await addDbs(couchUrl)
+  }
+  return dbs
 }

 /**
@ -389,7 +421,7 @@ const getScopedFullConfig = async function (db, { type, user, workspace }) {
 }

 const getPlatformUrl = async settings => {
-  let platformUrl = env.PLATFORM_URL
+  let platformUrl = env.PLATFORM_URL || "http://localhost:10000"

  if (!env.SELF_HOSTED && env.MULTI_TENANCY) {
    // cloud and multi tenant - add the tenant to the default platform url
@ -404,7 +436,7 @@ const getPlatformUrl = async settings => {
    }
  }

-  return platformUrl ? platformUrl : "http://localhost:10000"
+  return platformUrl
 }

 async function getScopedConfig(db, params) {
--- a/packages/auth/src/helpers.js
+++ b/packages/auth/src/helpers.js
@ -0,0 +1,9 @@
+/**
+ * Makes sure that a URL has the correct number of slashes, while maintaining the
+ * http(s):// double slashes.
+ * @param {string} url The URL to test and remove any extra double slashes.
+ * @return {string} The updated url.
+ */
+exports.checkSlashesInUrl = url => {
+  return url.replace(/(https?:\/\/)|(\/)+/g, "$1$2")
+}
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/bbui",
  "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "license": "MPL-2.0",
  "svelte": "src/index.js",
  "module": "dist/bbui.es.js",
--- a/packages/bbui/src/Tabs/Tabs.svelte
+++ b/packages/bbui/src/Tabs/Tabs.svelte
@ -27,6 +27,7 @@
      dispatch("select", thisSelected)
    } else if ($tab.title !== thisSelected) {
      thisSelected = $tab.title
+      selected = $tab.title
      dispatch("select", thisSelected)
    }
    if ($tab.title !== thisSelected) {
--- a/packages/builder/cypress/integration/createAutomation.spec.js
+++ b/packages/builder/cypress/integration/createAutomation.spec.js
@ -35,19 +35,20 @@ context("Create a automation", () => {
    cy.contains("dog").click()
    cy.get(".spectrum-Textfield-input")
    .first()
-    .type("goodboy")
+    .type("{{ trigger.row.name }}", { parseSpecialCharSequences: false })
    cy.get(".spectrum-Textfield-input")
      .eq(1)
      .type("11")
+    cy.contains("Finish and test automation").click()

-    cy.contains("Run test").click()
    cy.get(".modal-inner-wrapper").within(() => {
      cy.wait(1000)
      cy.get(".spectrum-Picker-label").click()
      cy.contains("dog").click()
+      cy.wait(1000)
      cy.get(".spectrum-Textfield-input")
        .first()
-        .type("goodboy")
+        .type("automationGoodboy")
      cy.get(".spectrum-Textfield-input")
        .eq(1)
        .type("11")
@ -57,6 +58,9 @@ context("Create a automation", () => {
      cy.get(".spectrum-Textfield-input")
        .eq(3)
        .type("123456")
+      cy.contains("Test").click()
    })
+    cy.contains("Data").click()
+    cy.contains("automationGoodboy")
  })
 })
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/builder",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "license": "GPL-3.0",
  "private": true,
  "scripts": {
@ -65,10 +65,10 @@
    }
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.8",
-    "@budibase/client": "^1.0.8",
+    "@budibase/bbui": "^1.0.19-alpha.2",
+    "@budibase/client": "^1.0.19-alpha.2",
    "@budibase/colorpicker": "1.1.2",
-    "@budibase/string-templates": "^1.0.8",
+    "@budibase/string-templates": "^1.0.19-alpha.2",
    "@sentry/browser": "5.19.1",
    "@spectrum-css/page": "^3.0.1",
    "@spectrum-css/vars": "^3.0.1",
--- a/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
+++ b/packages/builder/src/components/automation/AutomationBuilder/FlowChart/TestDataModal.svelte
@ -25,7 +25,7 @@

  // Check the schema to see if required fields have been entered
  $: isError = !trigger.schema.outputs.required.every(
-    required => testData[required]
+    required => testData[required] || required !== "row"
  )

  function parseTestJSON(e) {
--- a/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
+++ b/packages/builder/src/components/automation/SetupPanel/AutomationBlockSetup.svelte
@ -244,7 +244,7 @@
            value={inputData[key]}
          />
        </CodeEditorModal>
-      {:else if value.type === "string" || value.type === "number"}
+      {:else if value.type === "string" || value.type === "number" || value.type === "integer"}
        {#if isTestModal}
          <ModalBindableInput
            title={value.title}
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditDatasourcePopover.svelte
@ -1,6 +1,6 @@
 <script>
  import { goto } from "@roxi/routify"
-  import { datasources, tables } from "stores/backend"
+  import { datasources, queries, tables } from "stores/backend"
  import { notifications } from "@budibase/bbui"
  import { ActionMenu, MenuItem, Icon } from "@budibase/bbui"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
@ -12,7 +12,13 @@
  let updateDatasourceDialog

  async function deleteDatasource() {
-    const wasSelectedSource = $datasources.selected
+    let wasSelectedSource = $datasources.selected
+    if (!wasSelectedSource && $queries.selected) {
+      const queryId = $queries.selected
+      wasSelectedSource = $datasources.list.find(ds =>
+        queryId.includes(ds._id)
+      )?._id
+    }
    const wasSelectedTable = $tables.selected
    await datasources.delete(datasource)
    notifications.success("Datasource deleted")
--- a/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/popovers/EditQueryPopover.svelte
@ -1,14 +1,20 @@
 <script>
+  import { goto } from "@roxi/routify"
  import { ActionMenu, MenuItem, Icon, notifications } from "@budibase/bbui"
  import ConfirmDialog from "components/common/ConfirmDialog.svelte"
-  import { queries } from "stores/backend"
+  import { datasources, queries } from "stores/backend"

  export let query

  let confirmDeleteDialog

  async function deleteQuery() {
+    const wasSelectedQuery = $queries.selected
+    const selectedDatasource = $datasources.selected
    await queries.delete(query)
+    if (wasSelectedQuery === query._id) {
+      $goto(`./datasource/${selectedDatasource}`)
+    }
    notifications.success("Query deleted")
  }

--- a/packages/builder/src/components/integration/KeyValueBuilder.svelte
+++ b/packages/builder/src/components/integration/KeyValueBuilder.svelte
@ -30,13 +30,12 @@
  export let menuItems

  let fields = Object.entries(object).map(([name, value]) => ({ name, value }))
-  let fieldActivity = []
+  let fieldActivity = buildFieldActivity(activity)

  $: object = fields.reduce(
    (acc, next) => ({ ...acc, [next.name]: next.value }),
    {}
  )
-  $: fieldActivity = buildFieldActivity(activity)

  function buildFieldActivity(obj) {
    if (!obj || typeof obj !== "object") {
@ -46,9 +45,7 @@
    for (let [key, value] of Object.entries(obj)) {
      const field = fields.find(el => el.name === key)
      const idx = fields.indexOf(field)
-      if (idx !== -1) {
-        array[idx] = value
-      }
+      array[idx] = idx !== -1 ? value : true
    }
    return array
  }
@ -112,11 +109,7 @@
        />
      {/if}
      {#if toggle}
-        <Toggle
-          bind:value={fieldActivity[idx]}
-          on:change={changed}
-          default={true}
-        />
+        <Toggle bind:value={fieldActivity[idx]} on:change={changed} />
      {/if}
      {#if !readOnly}
        <Icon hoverable name="Close" on:click={() => deleteEntry(idx)} />
--- a/packages/builder/src/helpers/data/utils.js
+++ b/packages/builder/src/helpers/data/utils.js
@ -108,3 +108,14 @@ export function customQueryIconColor(datasource, query) {
      return
  }
 }
+
+export function flipHeaderState(headersActivity) {
+  if (!headersActivity) {
+    return {}
+  }
+  const enabled = {}
+  Object.entries(headersActivity).forEach(([key, value]) => {
+    enabled[key] = !value
+  })
+  return enabled
+}
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/index.svelte
@ -21,24 +21,20 @@
  import { cloneDeep } from "lodash/fp"

  import ImportRestQueriesModal from "components/backend/DatasourceNavigator/modals/ImportRestQueriesModal.svelte"
+  import { onMount } from "svelte"
  let importQueriesModal

-  let baseDatasource, changed
+  let changed
+  let datasource
  const querySchema = {
    name: {},
    queryVerb: { displayName: "Method" },
  }

-  $: datasource = $datasources.list.find(ds => ds._id === $datasources.selected)
+  $: baseDatasource = $datasources.list.find(
+    ds => ds._id === $datasources.selected
+  )
  $: integration = datasource && $integrations[datasource.source]
-  $: {
-    if (
-      datasource &&
-      (!baseDatasource || baseDatasource.source !== datasource.source)
-    ) {
-      baseDatasource = cloneDeep(datasource)
-    }
-  }
  $: queryList = $queries.list.filter(
    query => query.datasourceId === datasource?._id
  )
@ -69,6 +65,10 @@
    queries.select(query)
    $goto(`./${query._id}`)
  }
+
+  onMount(() => {
+    datasource = cloneDeep(baseDatasource)
+  })
 </script>

 <Modal bind:this={importQueriesModal}>
@ -90,7 +90,7 @@
            height="26"
            width="26"
          />
-          <Heading size="M">{baseDatasource.name}</Heading>
+          <Heading size="M">{datasource.name}</Heading>
        </header>
        <Body size="M">{integration.description}</Body>
      </Layout>
--- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[selectedDatasource]/rest/[query]/index.svelte
@ -33,6 +33,7 @@
    buildQueryString,
    keyValueToQueryParameters,
    queryParametersToKeyValue,
+    flipHeaderState,
  } from "helpers/data/utils"
  import {
    RestBodyTypes as bodyTypes,
@ -48,18 +49,16 @@
    bindings = {}
  let url = ""
  let saveId
-  let response, schema, isGet
+  let response, schema, enabledHeaders
  let datasourceType, integrationInfo, queryConfig, responseSuccess
  let authConfigId
  let dynamicVariables

-  $: datasource = $datasources.list.find(ds => ds._id === query?.datasourceId)
  $: datasourceType = datasource?.source
  $: integrationInfo = $integrations[datasourceType]
  $: queryConfig = integrationInfo?.query
  $: url = buildUrl(url, breakQs)
  $: checkQueryName(url)
-  $: isGet = query?.queryVerb === "read"
  $: responseSuccess =
    response?.info?.code >= 200 && response?.info?.code <= 206
  $: authConfigs = buildAuthConfigs(datasource)
@ -70,7 +69,11 @@
      $queries.list.find(q => q._id === $queries.selected) || {
        datasourceId: $params.selectedDatasource,
        parameters: [],
-        fields: {},
+        fields: {
+          // only init the objects, everything else is optional strings
+          disabledHeaders: {},
+          headers: {},
+        },
        queryVerb: "read",
      }
    )
@ -115,6 +118,7 @@
    newQuery.fields.path = url.split("?")[0]
    newQuery.fields.queryString = queryString
    newQuery.fields.authConfigId = authConfigId
+    newQuery.fields.disabledHeaders = flipHeaderState(enabledHeaders)
    newQuery.schema = fieldsToSchema(schema)
    newQuery.parameters = keyValueToQueryParameters(bindings)
    return newQuery
@ -158,7 +162,7 @@
    if (id) {
      // find the matching config on the datasource
      const matchedConfig = datasource?.config?.authConfigs?.filter(
-        c => c._id === authConfigId
+        c => c._id === id
      )[0]
      // clear the id if the config is not found (deleted)
      // i.e. just show 'None' in the dropdown
@ -169,14 +173,32 @@
    return id
  }

-  onMount(() => {
+  onMount(async () => {
    query = getSelectedQuery()
+    // clear any unsaved changes to the datasource
+    await datasources.init()
+    datasource = $datasources.list.find(ds => ds._id === query?.datasourceId)
+    const datasourceUrl = datasource?.config.url
    const qs = query?.fields.queryString
    breakQs = breakQueryString(qs)
+    if (datasourceUrl && !query.fields.path?.startsWith(datasourceUrl)) {
+      const path = query.fields.path
+      query.fields.path = `${datasource.config.url}/${path ? path : ""}`
+    }
    url = buildUrl(query.fields.path, breakQs)
    schema = schemaToFields(query.schema)
    bindings = queryParametersToKeyValue(query.parameters)
    authConfigId = getAuthConfigId()
+    if (!query.fields.disabledHeaders) {
+      query.fields.disabledHeaders = {}
+    }
+    // make sure the disabled headers are set (migration)
+    for (let header of Object.keys(query.fields.headers)) {
+      if (!query.fields.disabledHeaders[header]) {
+        query.fields.disabledHeaders[header] = false
+      }
+    }
+    enabledHeaders = flipHeaderState(query.fields.disabledHeaders)
    if (query && !query.transformer) {
      query.transformer = "return data"
    }
@ -230,7 +252,7 @@
  ]
 </script>

-{#if query}
+{#if query && queryConfig}
  <div class="inner">
    <div class="top">
      <Layout gap="S">
@ -278,7 +300,7 @@
          <Tab title="Headers">
            <KeyValueBuilder
              bind:object={query.fields.headers}
-              bind:activity={query.fields.enabledHeaders}
+              bind:activity={enabledHeaders}
              toggle
              name="header"
              headings
@ -287,7 +309,7 @@
          <Tab title="Body">
            <RadioGroup
              bind:value={query.fields.bodyType}
-              options={isGet ? [bodyTypes[0]] : bodyTypes}
+              options={bodyTypes}
              direction="horizontal"
              getOptionLabel={option => option.name}
              getOptionValue={option => option.value}
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/cli",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "description": "Budibase CLI, for developers, self hosting and migrations.",
  "main": "src/index.js",
  "bin": {
--- a/packages/client/package.json
+++ b/packages/client/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/client",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "license": "MPL-2.0",
  "module": "dist/budibase-client.js",
  "main": "dist/budibase-client.js",
@ -19,9 +19,9 @@
    "dev:builder": "rollup -cw"
  },
  "dependencies": {
-    "@budibase/bbui": "^1.0.8",
+    "@budibase/bbui": "^1.0.19-alpha.2",
    "@budibase/standard-components": "^0.9.139",
-    "@budibase/string-templates": "^1.0.8",
+    "@budibase/string-templates": "^1.0.19-alpha.2",
    "regexparam": "^1.3.0",
    "shortid": "^2.2.15",
    "svelte-spa-router": "^3.0.5"
--- a/packages/client/yarn.lock
+++ b/packages/client/yarn.lock
--- a/packages/server/package.json
+++ b/packages/server/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/server",
  "email": "hi@budibase.com",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "description": "Budibase Web Server",
  "main": "src/index.ts",
  "repository": {
@ -70,9 +70,9 @@
  "license": "GPL-3.0",
  "dependencies": {
    "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/auth": "^1.0.8",
-    "@budibase/client": "^1.0.8",
-    "@budibase/string-templates": "^1.0.8",
+    "@budibase/auth": "^1.0.19-alpha.2",
+    "@budibase/client": "^1.0.19-alpha.2",
+    "@budibase/string-templates": "^1.0.19-alpha.2",
    "@bull-board/api": "^3.7.0",
    "@bull-board/koa": "^3.7.0",
    "@elastic/elasticsearch": "7.10.0",
--- a/packages/server/src/api/controllers/query/import/sources/base/index.ts
+++ b/packages/server/src/api/controllers/query/import/sources/base/index.ts
@ -1,4 +1,4 @@
-import { Query, QueryParameter } from "../../../../../../definitions/common"
+import { Query, QueryParameter } from "../../../../../../definitions/datasource"

 export interface ImportInfo {
  url: string
--- a/packages/server/src/api/controllers/query/import/sources/openapi2.ts
+++ b/packages/server/src/api/controllers/query/import/sources/openapi2.ts
@ -1,5 +1,5 @@
 import { ImportInfo } from "./base"
-import { Query, QueryParameter } from "../../../../../definitions/common"
+import { Query, QueryParameter } from "../../../../../definitions/datasource"
 import { OpenAPIV2 } from "openapi-types"
 import { OpenAPISource } from "./base/openapi"

--- a/packages/server/src/api/controllers/webhook.js
+++ b/packages/server/src/api/controllers/webhook.js
@ -65,6 +65,10 @@ exports.buildSchema = async ctx => {
    let automation = await db.get(webhook.action.target)
    const autoOutputs = automation.definition.trigger.schema.outputs
    let properties = webhook.bodySchema.properties
+    // reset webhook outputs
+    autoOutputs.properties = {
+      body: autoOutputs.properties.body,
+    }
    for (let prop of Object.keys(properties)) {
      autoOutputs.properties[prop] = {
        type: properties[prop].type,
--- a/packages/server/src/definitions/common.ts
+++ b/packages/server/src/definitions/common.ts
@ -1,6 +1,6 @@
-import { SourceNames } from "./datasource"
+export { Query, Datasource } from "./datasource"

-interface Base {
+export interface Base {
  _id?: string
  _rev?: string
 }
@ -93,39 +93,3 @@ export interface Automation extends Base {
    trigger?: AutomationStep
  }
 }
-
-export interface Datasource extends Base {
-  type: string
-  name: string
-  source: SourceNames
-  // the config is defined by the schema
-  config: {
-    [key: string]: string | number | boolean
-  }
-  plus: boolean
-  entities?: {
-    [key: string]: Table
-  }
-}
-
-export interface QueryParameter {
-  name: string
-  default: string
-}
-
-export interface Query {
-  _id?: string
-  datasourceId: string
-  name: string
-  parameters: QueryParameter[]
-  fields: {
-    headers: object
-    queryString: string | null
-    path: string
-    requestBody: string | undefined
-  }
-  transformer: string | null
-  schema: any
-  readable: boolean
-  queryVerb: string
-}
--- a/packages/server/src/definitions/datasource.ts
+++ b/packages/server/src/definitions/datasource.ts
@ -1,4 +1,4 @@
-import { Row, Table } from "./common"
+import { Row, Table, Base } from "./common"

 export enum Operation {
  CREATE = "CREATE",
@ -181,3 +181,75 @@ export interface SqlQuery {
 export interface QueryOptions {
  disableReturning?: boolean
 }
+
+export interface Datasource extends Base {
+  type: string
+  name: string
+  source: SourceNames
+  // the config is defined by the schema
+  config: {
+    [key: string]: string | number | boolean
+  }
+  plus: boolean
+  entities?: {
+    [key: string]: Table
+  }
+}
+
+export enum AuthType {
+  BASIC = "basic",
+  BEARER = "bearer",
+}
+
+interface AuthConfig {
+  _id: string
+  name: string
+  type: AuthType
+  config: BasicAuthConfig | BearerAuthConfig
+}
+
+export interface BasicAuthConfig {
+  username: string
+  password: string
+}
+
+export interface BearerAuthConfig {
+  token: string
+}
+
+export interface QueryParameter {
+  name: string
+  default: string
+}
+
+export interface RestQueryFields {
+  path: string
+  queryString?: string
+  headers: { [key: string]: any }
+  disabledHeaders: { [key: string]: any }
+  requestBody: any
+  bodyType: string
+  json: object
+  method: string
+  authConfigId: string
+}
+
+export interface RestConfig {
+  url: string
+  defaultHeaders: {
+    [key: string]: any
+  }
+  authConfigs: AuthConfig[]
+}
+
+export interface Query {
+  _id?: string
+  datasourceId: string
+  name: string
+  parameters: QueryParameter[]
+  fields: RestQueryFields | any
+  transformer: string | null
+  schema: any
+  readable: boolean
+  queryVerb: string
+}
--- a/packages/server/src/integrations/mysql.ts
+++ b/packages/server/src/integrations/mysql.ts
@ -143,7 +143,7 @@ module MySQLModule {
        const schema: TableSchema = {}
        const descResp = await internalQuery(
          this.client,
-          { sql: `DESCRIBE ${tableName};` },
+          { sql: `DESCRIBE \`${tableName}\`;` },
          false
        )
        for (let column of descResp) {
--- a/packages/server/src/integrations/rest.ts
+++ b/packages/server/src/integrations/rest.ts
@ -2,6 +2,11 @@ import {
  Integration,
  DatasourceFieldTypes,
  QueryTypes,
+  RestConfig,
+  RestQueryFields as RestQuery,
+  AuthType,
+  BasicAuthConfig,
+  BearerAuthConfig
 } from "../definitions/datasource"
 import { IntegrationBase } from "./base/IntegrationBase"

@ -13,27 +18,6 @@ const BodyTypes = {
  TEXT: "text",
 }

-enum AuthType {
-  BASIC = "basic",
-  BEARER = "bearer",
-}
-
-interface AuthConfig {
-  _id: string
-  name: string
-  type: AuthType
-  config: BasicAuthConfig | BearerAuthConfig
-}
-
-interface BasicAuthConfig {
-  username: string
-  password: string
-}
-
-interface BearerAuthConfig {
-  token: string
-}
-
 const coreFields = {
  path: {
    type: DatasourceFieldTypes.STRING,
@ -62,26 +46,6 @@ module RestModule {
  const { formatBytes } = require("../utilities")
  const { performance } = require("perf_hooks")

-  interface RestQuery {
-    path: string
-    queryString?: string
-    headers: { [key: string]: any }
-    enabledHeaders: { [key: string]: any }
-    requestBody: any
-    bodyType: string
-    json: object
-    method: string
-    authConfigId: string
-  }
-
-  interface RestConfig {
-    url: string
-    defaultHeaders: {
-      [key: string]: any
-    }
-    authConfigs: AuthConfig[]
-  }
-
  const SCHEMA: Integration = {
    docs: "https://github.com/node-fetch/node-fetch",
    description:
@ -176,7 +140,10 @@ module RestModule {

    getUrl(path: string, queryString: string): string {
      const main = `${path}?${queryString}`
-      let complete = !this.config.url ? main : `${this.config.url}/${main}`
+      let complete = main
+      if (this.config.url && !main.startsWith(this.config.url)) {
+        complete = !this.config.url ? main : `${this.config.url}/${main}`
+      }
      if (!complete.startsWith("http")) {
        complete = `http://${complete}`
      }
@ -213,8 +180,7 @@ module RestModule {
    }

    async _req(query: RestQuery) {
-      const { path = "", queryString = "", headers = {}, method = "GET", enabledHeaders, bodyType, requestBody, authConfigId } = query
-
+      const { path = "", queryString = "", headers = {}, method = "GET", disabledHeaders, bodyType, requestBody, authConfigId } = query
      const authHeaders = this.getAuthHeaders(authConfigId)

      this.headers = {
@ -223,9 +189,9 @@ module RestModule {
        ...authHeaders,
      }

-      if (enabledHeaders) {
+      if (disabledHeaders) {
        for (let headerKey of Object.keys(this.headers)) {
-          if (!enabledHeaders[headerKey]) {
+          if (disabledHeaders[headerKey]) {
            delete this.headers[headerKey]
          }
        }
--- a/packages/server/yarn.lock
+++ b/packages/server/yarn.lock
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@ -1,6 +1,6 @@
 {
  "name": "@budibase/string-templates",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "description": "Handlebars wrapper for Budibase templating.",
  "main": "src/index.cjs",
  "module": "dist/bundle.mjs",
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@ -1,7 +1,7 @@
 {
  "name": "@budibase/worker",
  "email": "hi@budibase.com",
-  "version": "1.0.8",
+  "version": "1.0.19-alpha.2",
  "description": "Budibase background service",
  "main": "src/index.js",
  "repository": {
@ -29,8 +29,8 @@
  "author": "Budibase",
  "license": "GPL-3.0",
  "dependencies": {
-    "@budibase/auth": "^1.0.8",
-    "@budibase/string-templates": "^1.0.8",
+    "@budibase/auth": "^1.0.19-alpha.2",
+    "@budibase/string-templates": "^1.0.19-alpha.2",
    "@koa/router": "^8.0.0",
    "@sentry/node": "^6.0.0",
    "@techpass/passport-openidconnect": "^0.3.0",
--- a/packages/worker/yarn.lock
+++ b/packages/worker/yarn.lock
--- a/scripts/releaseHelmChart.js
+++ b/scripts/releaseHelmChart.js
@ -0,0 +1,35 @@
+const yaml = require("js-yaml") 
+const fs = require("fs")
+const path = require("path")
+
+const UpgradeTypes = {
+	MAJOR: "major",
+	MINOR: "minor",
+	PATCH: "patch"
+}
+
+const CHART_PATH = path.join(__dirname, "../", "charts", "budibase", "Chart.yaml")
+const UPGRADE_VERSION = process.env.BUDIBASE_RELEASE_VERSION
+const UPGRADE_TYPE = process.env.HELM_CHART_UPGRADE_TYPE || UpgradeTypes.PATCH
+
+if (!UPGRADE_VERSION) {
+	throw new Error("BUDIBASE_RELEASE_VERSION env var must be set.")
+}
+
+try {
+	const chartFile = fs.readFileSync(CHART_PATH, "utf-8")
+	const chart = yaml.load(chartFile)
+
+	// Upgrade app version in chart to match budibase release version
+	chart.appVersion = UPGRADE_VERSION
+
+	// semantically version the chart
+	const [major, minor, patch] = chart.version.split(".")
+	const newPatch = parseInt(patch) + 1
+	chart.version = [major, minor, newPatch].join(".")
+	const updatedChartYaml = yaml.dump(chart)
+	fs.writeFileSync(CHART_PATH, updatedChartYaml)
+} catch (err) {
+	console.error("Error releasing helm chart")
+	throw err
+}
--- a/scripts/release_helm_chart.sh
+++ b/scripts/release_helm_chart.sh
@ -1,3 +0,0 @@
-cd docs
-helm package ../hosting/kubernetes/budibase
-helm repo index . --url https://budibase.github.io/budibase
--- a/yarn.lock
+++ b/yarn.lock
@ -1082,6 +1082,11 @@ argparse@^1.0.7:
  dependencies:
    sprintf-js "~1.0.2"

+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
 arr-diff@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
@ -3260,6 +3265,13 @@ js-yaml@^3.13.1:
    argparse "^1.0.7"
    esprima "^4.0.0"

+js-yaml@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
 jsbn@~0.1.0:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"