From d10bebf03089ee372fb3ae251feebf097ebc886a Mon Sep 17 00:00:00 2001 From: Benjamin Chastanier Date: Tue, 9 Nov 2021 09:43:57 +0100 Subject: [PATCH] chore: update Pleco to v0.9.17 --- lib/common/bootstrap/charts/pleco/Chart.yaml | 4 ++-- .../charts/pleco/templates/deployment.yaml | 20 +++++++++++++++++++ lib/common/bootstrap/charts/pleco/values.yaml | 17 ++++++++++++++-- lib/helm-freeze.yaml | 2 +- 4 files changed, 38 insertions(+), 5 deletions(-) diff --git a/lib/common/bootstrap/charts/pleco/Chart.yaml b/lib/common/bootstrap/charts/pleco/Chart.yaml index 1229a638..ecb40994 100644 --- a/lib/common/bootstrap/charts/pleco/Chart.yaml +++ b/lib/common/bootstrap/charts/pleco/Chart.yaml @@ -1,9 +1,9 @@ apiVersion: v2 -appVersion: 0.9.14 +appVersion: 0.9.17 description: Automatically removes Cloud managed services and Kubernetes resources based on tags with TTL home: https://github.com/Qovery/pleco icon: https://github.com/Qovery/pleco/raw/main/assets/pleco_logo.png name: pleco type: application -version: 0.9.14 +version: 0.9.17 diff --git a/lib/common/bootstrap/charts/pleco/templates/deployment.yaml b/lib/common/bootstrap/charts/pleco/templates/deployment.yaml index 564873c6..6ecea8a8 100644 --- a/lib/common/bootstrap/charts/pleco/templates/deployment.yaml +++ b/lib/common/bootstrap/charts/pleco/templates/deployment.yaml @@ -121,6 +121,26 @@ spec: - --enable-sg {{ end }} {{- end }} + +# Digital Ocean features + {{ if eq .Values.cloudProvider "do" }} + {{ if .Values.doFeatures.doRegions }} + - --do-regions + - "{{ join "," .Values.doFeatures.doRegions }}" + {{ end }} + {{ if eq .Values.doFeatures.cluster true }} + - --enable-cluster + {{ end }} + {{ if eq .Values.doFeatures.lb true }} + - --enable-lb + {{ end }} + {{ if eq .Values.doFeatures.db true }} + - --enable-db + {{ end }} + {{ if eq .Values.doFeatures.volume true }} + - --enable-volume + {{ end }} + {{- end }} env: - name: "AWS_EXECUTION_ENV" value: "pleco_{{ .Values.image.plecoImageTag }}_{{ .Values.environmentVariables.PLECO_IDENTIFIER }}" diff --git a/lib/common/bootstrap/charts/pleco/values.yaml b/lib/common/bootstrap/charts/pleco/values.yaml index 9e6cfaa5..d685fffe 100644 --- a/lib/common/bootstrap/charts/pleco/values.yaml +++ b/lib/common/bootstrap/charts/pleco/values.yaml @@ -3,7 +3,7 @@ replicaCount: 1 image: repository: qoveryrd/pleco pullPolicy: IfNotPresent - plecoImageTag: "0.9.14" + plecoImageTag: "0.9.17" cloudProvider: "" @@ -18,6 +18,11 @@ environmentVariables: # SCW_ACCESS_KEY: "" # SCW_SECRET_KEY: "" # SCW_VOLUME_TIMEOUT: "" + # Digital Ocean + # DO_API_TOKEN: "" + # DO_SPACES_KEY: "" + # DO_SPACES_SECRET: "" + # DO_VOLUME_TIMEOUT: "" enabledFeatures: @@ -49,12 +54,20 @@ scwFeatures: # - fr-par-1 # - nl-ams-1 cr: false - cluster: flase + cluster: false lb: false db: false volume: false sg: false +doFeatures: + doRegions: [ ] + # - nyc3 + cluster: flase + lb: false + db: false + volume: false + imagePullSecrets: [] nameOverride: "" fullnameOverride: "" diff --git a/lib/helm-freeze.yaml b/lib/helm-freeze.yaml index c554afb4..eb5419be 100644 --- a/lib/helm-freeze.yaml +++ b/lib/helm-freeze.yaml @@ -68,7 +68,7 @@ charts: dest: services no_sync: true - name: pleco - version: 0.9.14 + version: 0.9.17 repo_name: pleco - name: do-k8s-token-rotate version: 0.1.3