Remove InfluxDB provisioning (#126)

Flagsmith · Apr 19, 2023 · 3b54e53 · 3b54e53
1 parent 142e232
commit 3b54e53
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 95 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -29,7 +29,6 @@ jobs:
         # See https://github.com/Flagsmith/flagsmith-charts/issues/105
         run: |
           helm repo add stable https://charts.helm.sh/stable
-          helm repo add influxdb2 https://helm.influxdata.com/
           helm repo add kiwigrid https://kiwigrid.github.io
 
       - name: Run chart-releaser

diff --git a/charts/flagsmith/Chart.lock b/charts/flagsmith/Chart.lock
@@ -2,11 +2,8 @@ dependencies:
 - name: postgresql
   repository: https://charts.helm.sh/stable
   version: 8.6.4
-- name: influxdb2
-  repository: https://helm.influxdata.com/
-  version: 2.0.0
 - name: graphite
   repository: https://kiwigrid.github.io
   version: 0.7.3
-digest: sha256:08185ea3318322a875104ec4b2daca39b264587868ea3ebc5053c1bf6dd7576f
-generated: "2022-10-25T21:11:00.806235474+01:00"
+digest: sha256:8bc448a10024c967f8c9f7572ac0971c66d4ae91addfbb1edd3ce84a0a89907f
+generated: "2023-04-19T12:21:04.196+01:00"
diff --git a/charts/flagsmith/Chart.yaml b/charts/flagsmith/Chart.yaml
@@ -9,11 +9,6 @@ dependencies:
     repository: https://charts.helm.sh/stable
     version: 8.6.4
     condition: postgresql.enabled
-  - name: influxdb2
-    repository: https://helm.influxdata.com/
-    # pinned due to issue https://github.com/influxdata/helm-charts/issues/350
-    version: 2.0.0
-    condition: influxdb2.enabled
   - name: graphite
     repository: https://kiwigrid.github.io
     version: 0.7.3

diff --git a/charts/flagsmith/ci/e2e-test-values.yaml b/charts/flagsmith/ci/e2e-test-values.yaml
@@ -3,13 +3,9 @@ _destructiveTests:
 
 frontend:
   extraEnv:
-    SLACK_TOKEN: "${SLACK_TOKEN}"
+    SLACK_TOKEN: '${SLACK_TOKEN}'
 
 api:
   extraEnv:
     EMAIL_BACKEND: 'django.core.mail.backends.console.EmailBackend'
     FE_E2E_TEST_USER_EMAIL: [email protected]
-influxdb2:
-  # Needed to set this for the tests to not fail. Possibly related to
-  # https://github.com/Flagsmith/flagsmith/issues/340
-  enabled: false
diff --git a/charts/flagsmith/ci/influxdb-test-values.yaml b/charts/flagsmith/ci/influxdb-test-values.yaml
diff --git a/charts/flagsmith/templates/_api_environment.yaml b/charts/flagsmith/templates/_api_environment.yaml
@@ -13,19 +13,7 @@
     secretKeyRef:
       name: {{ template "flagsmith.fullname" . }}
       key: DJANGO_SECRET_KEY
-{{- if .Values.influxdb2.enabled }}
-- name: INFLUXDB_URL
-  value: http://{{- template "flagsmith.influxdb.hostname" . -}}:80
-- name: INFLUXDB_BUCKET
-  value: {{ .Values.influxdb2.adminUser.bucket }}
-- name: INFLUXDB_ORG
-  value: {{ .Values.influxdb2.adminUser.organization }}
-- name: INFLUXDB_TOKEN
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "flagsmith.influxdb.fullname" . }}-auth
-      key: admin-token
-{{- else if .Values.influxdbExternal.enabled }}
+{{- if .Values.influxdbExternal.enabled }}
 - name: INFLUXDB_URL
   value: {{ .Values.influxdbExternal.url | required "Must specify a URL for an external InfluxDB" }}
 - name: INFLUXDB_BUCKET

diff --git a/charts/flagsmith/templates/_helpers.tpl b/charts/flagsmith/templates/_helpers.tpl
@@ -170,38 +170,6 @@ PgBouncer hostname
 {{- printf "%s-%s" .Release.Name "pgbouncer" -}}.{{ .Release.Namespace }}.svc.cluster.local
 {{- end -}}
 
-{{/*
-Expand the name of the chart.
-*/}}
-{{- define "flagsmith.influxdb.name" -}}
-{{- default "influxdb2" .Values.influxdb2.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).
-If release name contains chart name it will be used as a full name.
-*/}}
-{{- define "flagsmith.influxdb.fullname" -}}
-{{- if .Values.influxdb2.fullnameOverride -}}
-{{- .Values.influxdb2.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- $name := default "influxdb2" .Values.influxdb2.nameOverride -}}
-{{- if contains $name .Release.Name -}}
-{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
-{{- end -}}
-{{- end -}}
-
-{{/*
-Influxdb hostname
-*/}}
-{{- define "flagsmith.influxdb.hostname" -}}
-{{ template "flagsmith.influxdb.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local
-{{- 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).
@@ -238,8 +206,6 @@ Frontend environment
   value: {{ .Values._destructiveTests.testToken | quote }}
 - name: FLAGSMITH_API
   value: {{ include "flagsmith.fullname" . }}-api.{{ .Release.Namespace }}:{{ .Values.service.api.port }}/api/v1/
-- name: ENABLE_INFLUXDB_FEATURES
-  value: {{ .Values.influxdb2.enabled | ternary "true" "false" | squote }}
 {{- end }}
 {{- range $envName, $envValue := .Values.frontend.extraEnv }}
 - name: {{ $envName }}

diff --git a/charts/flagsmith/values.yaml b/charts/flagsmith/values.yaml
@@ -230,27 +230,6 @@ pgbouncer:
     successThreshold: 1
     timeoutSeconds: 2
 
-influxdb2:
-  enabled: false
-  adminUser:
-    organization: 'influxdata'
-    bucket: 'default'
-    user: 'admin'
-    retention_policy: '0s'
-    ## Leave empty to generate a random password and token.
-    ## Or fill any of these values to use fixed values.
-    password: ''
-    token: ''
-  persistence:
-    enabled: false
-    # storageClass: "-"
-    # accessMode: ReadWriteOnce
-    # size: 50Gi
-  resources: {}
-  nodeSelector: {}
-  tolerations: []
-  affinity: {}
-
 influxdbExternal:
   enabled: false
   url: null