feat: add new pleco version with s3 support

lib/aws/bootstrap/helm-pleco.j2.tf

@@ -1,3 +1,23 @@
+locals {
+  pleco_config = <<PLECO
+enabledFeatures:
+  disableDryRun: true
+  checkInterval: 120
+  kubernetes: "in"
+  awsRegions:
+    - eu-west-3
+    - us-east-2
+  rds: true
+  documentdb: true
+  elasticache: true
+  eks: true
+  elb: true
+  ebs: true
+  vpc: false
+  s3: true
+PLECO
+}
+
 resource "helm_release" "pleco" {
   count = var.test_cluster == "false" ? 0 : 1
 
@@ -7,42 +27,14 @@ resource "helm_release" "pleco" {
   atomic = true
   max_history = 50
 
+  values = [local.pleco_config]
+
   // make a fake arg to avoid TF to validate update on failure because of the atomic option
   set {
     name = "fake"
     value = timestamp()
   }
 
-  set {
-    name = "enabledFeatures.awsRegions"
-    value = "{eu-west-3,us-east-2}"
-  }
-
-  set {
-    name = "enabledFeatures.rds"
-    value = "true"
-  }
-
-  set {
-    name = "enabledFeatures.documentdb"
-    value = "true"
-  }
-
-  set {
-    name = "enabledFeatures.elasticache"
-    value = "true"
-  }
-
-  set {
-    name = "enabledFeatures.eks"
-    value = "true"
-  }
-
-  set {
-    name = "enabledFeatures.disableDryRun"
-    value = "true"
-  }
-
   set {
     name = "environmentVariables.AWS_ACCESS_KEY_ID"
     value = "{{ aws_access_key }}"

lib/common/bootstrap/charts/pleco/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: 0.4.1
+appVersion: 0.5.0
 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.4.1
+version: 0.5.0

lib/common/bootstrap/charts/pleco/templates/deployment.yaml

@@ -63,12 +63,18 @@ spec:
             {{ if eq .Values.enabledFeatures.eks true}}
             - --enable-eks
             {{ end }}
+            {{ if eq .Values.enabledFeatures.vpc true}}
+            - --enable-vpc
+            {{ end }}
+            {{ if eq .Values.enabledFeatures.s3 true}}
+            - --enable-s3
+            {{ end }}
             {{ if or (eq .Values.enabledFeatures.elb true) (eq .Values.enabledFeatures.eks true)}}
             - --enable-elb
             {{ end }}
             {{ if or (eq .Values.enabledFeatures.ebs true) (eq .Values.enabledFeatures.eks true)}}
             - --enable-ebs
-          {{ end }}
+            {{ end }}
           env:
             {{ range $key, $value := .Values.environmentVariables -}}
             - name: "{{ $key }}"
@@ -76,7 +82,7 @@ spec:
                 secretKeyRef:
                   name: {{ $kubefullname }}
                   key: {{ $key }}
-            {{ end }}
+          {{ end }}
           resources:
       {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

lib/common/bootstrap/charts/pleco/values.yaml

@@ -3,7 +3,7 @@ replicaCount: 1
 image:
   repository: qoveryrd/pleco
   pullPolicy: IfNotPresent
-  plecoImageTag: "0.4.1"
+  plecoImageTag: "0.5.0"
 
 environmentVariables:
   LOG_LEVEL: "info"
@@ -26,6 +26,8 @@ enabledFeatures:
   eks: false
   elb: false
   ebs: false
+  vpc: false
+  s3: false
 
 imagePullSecrets: []
 nameOverride: ""

lib/helm-freeze.yaml

@@ -58,7 +58,7 @@ charts:
     version: 12.0.1
     dest: services
   - name: pleco
-    version: 0.4.1
+    version: 0.5.0
     repo_name: pleco
   - name: do-k8s-token-rotate
     version: 0.1.3