Merge pull request #2987 from Budibase/feature/k8s-templates

Feature/k8s templates
2021-10-12 22:05:47 +01:00 · 2021-10-12 22:05:47 +01:00 · d1db72fbf6
parent a71ea88855 fcd8ba18df
commit d1db72fbf6
9 changed files with 86 additions and 37 deletions
--- a/docs/budibase-0.2.0.tgz
+++ b/docs/budibase-0.2.0.tgz
--- a/docs/index.yaml
+++ b/docs/index.yaml
@ -1,9 +1,35 @@
 apiVersion: v1
 entries:
  budibase:
+  - apiVersion: v2
+    appVersion: 0.9.163
+    created: "2021-10-12T21:58:00.515555+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-08-18T18:41:52.640176+01:00"
+    created: "2021-10-12T21:58:00.512062+01:00"
    dependencies:
    - condition: services.couchdb.enabled
      name: couchdb
@ -28,7 +54,7 @@ entries:
    version: 0.1.1
  - apiVersion: v2
    appVersion: 0.9.56
-    created: "2021-08-18T18:41:52.635603+01:00"
+    created: "2021-10-12T21:58:00.507257+01:00"
    dependencies:
    - condition: services.couchdb.enabled
      name: couchdb
@ -51,4 +77,4 @@ entries:
    urls:
    - https://budibase.github.io/budibase/budibase-0.1.0.tgz
    version: 0.1.0
-generated: "2021-08-18T18:41:52.629415+01:00"
+generated: "2021-10-12T21:58:00.503447+01:00"
--- a/hosting/kubernetes/budibase/templates/.helmignore
+++ b/hosting/kubernetes/budibase/templates/.helmignore
--- a/hosting/kubernetes/budibase/Chart.yaml
+++ b/hosting/kubernetes/budibase/Chart.yaml
@ -22,13 +22,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.1
+version: 0.2.0

 # 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.56"
+appVersion: "0.9.163"

 dependencies:
  - name: couchdb
@ -37,5 +37,5 @@ dependencies:
    condition: services.couchdb.enabled
  - name: ingress-nginx
    version: 3.35.0 
-    repository: https://kubernetes.github.io/ingress-nginx
-    condition: services.ingress.nginx
+    repository: https://github.com/kubernetes/ingress-nginx
+    condition: ingress.nginx
--- a/hosting/kubernetes/budibase/templates/alb-ingress.yaml
+++ b/hosting/kubernetes/budibase/templates/alb-ingress.yaml
@ -7,6 +7,8 @@ metadata:
    kubernetes.io/ingress.class: alb
    alb.ingress.kubernetes.io/scheme: internet-facing
    alb.ingress.kubernetes.io/target-type: ip
+    alb.ingress.kubernetes.io/success-codes: 200,301
+    alb.ingress.kubernetes.io/healthcheck-path: /
    {{- if .Values.ingress.certificateArn }}
    alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
    alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
--- a/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/app-service-deployment.yaml
@ -14,7 +14,7 @@ spec:
    matchLabels:
      io.kompose.service: app-service
  strategy:
-    type: Recreate
+    type: RollingUpdate
  template:
    metadata:
      annotations:
@ -73,13 +73,11 @@ 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: "1"
        - name: REDIS_PASSWORD
          value: {{ .Values.services.redis.password }}
        - name: REDIS_URL
@ -92,14 +90,20 @@ spec:
          value: {{ .Values.globals.selfHosted | quote }}
        - name: SENTRY_DSN
          value: {{ .Values.globals.sentryDSN }}
+        - name: POSTHOG_TOKEN
+          value: {{ .Values.globals.posthogToken }}
        - name: WORKER_URL
-          value: worker-service:{{ .Values.services.worker.port }}
-        - name: COOKIE_DOMAIN
-          value: {{ .Values.globals.cookieDomain | quote }}
+          value: http://worker-service:{{ .Values.services.worker.port }}
+        - name: PLATFORM_URL
+          value: {{ .Values.globals.platformUrl | quote }}
+        - name: USE_QUOTAS
+          value: "1" 
        - name: ACCOUNT_PORTAL_URL
          value: {{ .Values.globals.accountPortalUrl | quote }}
        - name: ACCOUNT_PORTAL_API_KEY
          value: {{ .Values.globals.accountPortalApiKey | quote }}
+        - name: COOKIE_DOMAIN
+          value: {{ .Values.globals.cookieDomain | quote }}
        image: budibase/apps
        imagePullPolicy: Always
        name: bbapps
--- a/hosting/kubernetes/budibase/templates/proxy-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/proxy-service-deployment.yaml
@ -14,7 +14,7 @@ spec:
    matchLabels:
      app.kubernetes.io/name: budibase-proxy
  strategy:
-    type: Recreate
+    type: RollingUpdate
  template:
    metadata:
      annotations:
@ -26,7 +26,7 @@ spec:
    spec:
      containers:
      - image: budibase/proxy
-        imagePullPolicy: ""
+        imagePullPolicy: Always
        name: proxy-service
        ports:
        - containerPort: {{ .Values.services.proxy.port }}
--- a/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
+++ b/hosting/kubernetes/budibase/templates/worker-service-deployment.yaml
@ -15,7 +15,7 @@ spec:
    matchLabels:
      io.kompose.service: worker-service
  strategy:
-    type: Recreate
+    type: RollingUpdate
  template:
    metadata:
      annotations:
@ -70,13 +70,11 @@ 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: "1"
        - name: REDIS_PASSWORD
          value: {{ .Values.services.redis.password | quote }}
        - name: REDIS_URL
@ -91,8 +89,22 @@ spec:
          value: {{ .Values.globals.accountPortalUrl | quote }}
        - name: ACCOUNT_PORTAL_API_KEY
          value: {{ .Values.globals.accountPortalApiKey | quote }}
+        - name: PLATFORM_URL
+          value: {{ .Values.globals.platformUrl | quote }}
        - name: COOKIE_DOMAIN
          value: {{ .Values.globals.cookieDomain | quote }}
+        - name: SMTP_FALLBACK_ENABLED
+          value: {{ .Values.globals.smtp.enabled | quote }}
+        - name: SMTP_USER
+          value: {{ .Values.globals.smtp.user | quote }}
+        - name: SMTP_PASSWORD
+          value: {{ .Values.globals.smtp.password | quote }}
+        - name: SMTP_HOST
+          value: {{ .Values.globals.smtp.host | quote }}
+        - name: SMTP_PORT
+          value: {{ .Values.globals.smtp.port | quote }}
+        - name: SMTP_FROM_ADDRESS
+          value: {{ .Values.globals.smtp.from | quote }}
        image: budibase/worker
        imagePullPolicy: Always
        name: bbworker
--- a/hosting/kubernetes/budibase/values.yaml
+++ b/hosting/kubernetes/budibase/values.yaml
@ -40,7 +40,8 @@ service:
  port: 10000

 ingress:
-  enabled: true
+  enabled: false
+  aws: false
  nginx: true 
  certificateArn: ""  
  className: ""
@ -84,20 +85,24 @@ affinity: {}

 globals:
  budibaseEnv: PRODUCTION
-  enableAnalytics: false
-  posthogToken: ""
+  enableAnalytics: true
  sentryDSN: ""
+  posthogToken: ""
  logLevel: info
-  selfHosted: 1
-  accountPortalUrL: ""
+  selfHosted: ""
+  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
@ -118,9 +123,9 @@ services:
  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
+    # 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