feat: add resource deletion (s3-operator v0.8.0+) (#66)

InseeFrLab · Feb 29, 2024 · cd362ae · cd362ae
1 parent 503105b
commit cd362ae
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/charts/s3-operator/Chart.yaml b/charts/s3-operator/Chart.yaml
@@ -13,9 +13,9 @@ 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.2.0
+version: 0.3.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.7.0"
+appVersion: "0.8.0"
diff --git a/charts/s3-operator/README.md b/charts/s3-operator/README.md
@@ -1,6 +1,6 @@
 # s3-operator
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.7.0](https://img.shields.io/badge/AppVersion-0.7.0-informational?style=flat-square)
+![Version: 0.3.0](https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.8.0](https://img.shields.io/badge/AppVersion-0.8.0-informational?style=flat-square)
 
 A Helm chart for deploying an operator to manage S3 resources (eg buckets, policies)
 
@@ -22,6 +22,9 @@ A Helm chart for deploying an operator to manage S3 resources (eg buckets, polic
 | crds.install | bool | `true` | Install and upgrade CRDs |
 | crds.keep | bool | `true` | Keep CRDs on chart uninstall |
 | kubernetesClusterDomain | string | `"cluster.local"` |  |
+| s3.deletion.bucket | bool | `false` |  |
+| s3.deletion.path | bool | `false` |  |
+| s3.deletion.policy | bool | `false` |  |
 | s3.endpointUrl | string | `"localhost:9000"` |  |
 | s3.existingSecret | string | `"my-s3-operator-auth-secret"` |  |
 

diff --git a/charts/s3-operator/templates/deployment.yaml b/charts/s3-operator/templates/deployment.yaml
@@ -42,6 +42,9 @@ spec:
         - --metrics-bind-address=127.0.0.1:8080
         - --leader-elect
         - --s3-endpoint-url={{ .Values.s3.endpointUrl }}
+        - --bucket-deletion={{ .Values.s3.deletion.bucket }}
+        - --path-deletion={{ .Values.s3.deletion.path }}
+        - --policy-deletion={{ .Values.s3.deletion.policy }}
         {{- if .Values.s3.caCertificateBundlePath }}
         - --s3-ca-certificate-bundle-path={{ .Values.s3.caCertificateBundlePath }}
         {{- end }}

diff --git a/charts/s3-operator/values.yaml b/charts/s3-operator/values.yaml
@@ -25,6 +25,7 @@ controllerManager:
         memory: 64Mi
   replicas: 1
 kubernetesClusterDomain: cluster.local
+
 s3:
   endpointUrl: "localhost:9000"
 
@@ -45,3 +46,9 @@ s3:
   # caCertificateBundlePath: /path/to/ca-bundle.crt
   # caCertificatesBase64:
   # - base64encodedPEMFormatCACertificate
+
+  # Should the operator try to delete the resource from the S3 backend upon CR deletion ?
+  deletion:
+    bucket: false
+    path: false
+    policy: false