From f5dea5c8baa2d03a1c2e2522d43a2f8e5a8769ed Mon Sep 17 00:00:00 2001 From: Ben Jackson Date: Tue, 15 Feb 2022 15:33:34 +1100 Subject: [PATCH] Update dbaas-operator chart to suit latest version of dbaas-operator (#32) * chore: update dbaas-operator chart to suit latest version of dbaas-operator * chore: add the enable providers feature flags * chore: add the enable providers feature flags * chore: formatting --- charts/dbaas-operator/Chart.yaml | 4 ++-- charts/dbaas-operator/templates/deployment.yaml | 12 ++++++++++++ charts/dbaas-operator/templates/service.yaml | 14 ++++++++++++++ charts/dbaas-operator/values.yaml | 6 ++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/charts/dbaas-operator/Chart.yaml b/charts/dbaas-operator/Chart.yaml index bc02eba..5f71077 100644 --- a/charts/dbaas-operator/Chart.yaml +++ b/charts/dbaas-operator/Chart.yaml @@ -15,6 +15,6 @@ maintainers: type: application -version: 0.2.1 +version: 0.2.2 -appVersion: v0.1.6 +appVersion: v0.2.2 diff --git a/charts/dbaas-operator/templates/deployment.yaml b/charts/dbaas-operator/templates/deployment.yaml index 92e1388..c4d0552 100644 --- a/charts/dbaas-operator/templates/deployment.yaml +++ b/charts/dbaas-operator/templates/deployment.yaml @@ -41,12 +41,24 @@ spec: {{- toYaml .Values.securityContext | nindent 10 }} image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion}}" imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - containerPort: 5000 + name: backend command: - /manager {{- with .Values.extraArgs }} args: {{- toYaml . | nindent 8 }} {{- end }} + {{- if .Values.enableMariaDBProviders }} + - --enable-mariadb-providers + {{- end }} + {{- if .Values.enableMongoDBProviders }} + - --enable-mongodb-providers + {{- end }} + {{- if .Values.enablePostreSQLProviders }} + - --enable-postgresql-providers + {{- end }} resources: {{- toYaml .Values.resources | nindent 10 }} {{- with .Values.nodeSelector }} diff --git a/charts/dbaas-operator/templates/service.yaml b/charts/dbaas-operator/templates/service.yaml index 2ddff04..3d3cc8f 100644 --- a/charts/dbaas-operator/templates/service.yaml +++ b/charts/dbaas-operator/templates/service.yaml @@ -13,3 +13,17 @@ spec: name: https selector: {{- include "dbaas-operator.selectorLabels" . | nindent 4 }} +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ include "dbaas-operator.fullname" . }}-http + labels: + {{- include "dbaas-operator.labels" . | nindent 4 }} +spec: + ports: + - name: backend + port: 5000 + targetPort: backend + selector: + {{- include "dbaas-operator.selectorLabels" . | nindent 4 }} diff --git a/charts/dbaas-operator/values.yaml b/charts/dbaas-operator/values.yaml index 550a7d4..aa5dab7 100644 --- a/charts/dbaas-operator/values.yaml +++ b/charts/dbaas-operator/values.yaml @@ -74,6 +74,12 @@ extraArgs: - "--metrics-addr=127.0.0.1:8080" - "--enable-leader-election=true" +# enable the providers +# by default mariadb is enabled and the others are disabled +enableMariaDBProviders: true +enableMongoDBProviders: false +enablePostreSQLProviders: false + image: repository: amazeeio/dbaas-operator pullPolicy: IfNotPresent