From 49862ba3470335decccecb27649167025e18c406 Mon Sep 17 00:00:00 2001
From: reyerdam <15647925+reyerdam@users.noreply.github.com>
Date: Sat, 13 Aug 2022 23:54:44 +0200
Subject: [PATCH] helm: (Bugfix) enable objectlocking (#15524)

---
 .../minio/templates/_helper_create_bucket.txt | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/helm/minio/templates/_helper_create_bucket.txt b/helm/minio/templates/_helper_create_bucket.txt
index b45f64759..ced600dfe 100644
--- a/helm/minio/templates/_helper_create_bucket.txt
+++ b/helm/minio/templates/_helper_create_bucket.txt
@@ -65,35 +65,41 @@ createBucket() {
     fi
   fi
 
-  # Create the bucket if it does not exist and set objectlocking if enabled
-  if ! checkBucketExists $BUCKET ; then
+# Create the bucket if it does not exist and set objectlocking if enabled (NOTE: versioning will be not changed if OBJECTLOCKING is set because it enables versioning to the Buckets created)
+if ! checkBucketExists $BUCKET ; then
     if [ ! -z $OBJECTLOCKING ] ; then
       if [ $OBJECTLOCKING = true ] ; then
           echo "Creating bucket with OBJECTLOCKING '$BUCKET'"
           ${MC} mb --with-lock myminio/$BUCKET
       elif [ $OBJECTLOCKING = false ] ; then
-    echo "Creating bucket '$BUCKET'"
-    ${MC} mb myminio/$BUCKET
-    fi
+            echo "Creating bucket '$BUCKET'"
+            ${MC} mb myminio/$BUCKET
+      fi
+  elif [ -z $OBJECTLOCKING ] ; then
+        echo "Creating bucket '$BUCKET'"
+        ${MC} mb myminio/$BUCKET
   else
-    echo "Bucket '$BUCKET' already exists."
+    echo "Bucket '$BUCKET' already exists."  
   fi
   fi
 
 
-  # set versioning for bucket
+  # set versioning for bucket if objectlocking is disabled or not set
+  if [ -z $OBJECTLOCKING ] ; then
   if [ ! -z $VERSIONING ] ; then
-    if [ $VERSIONING = true ] && [ $OBJECTLOCKING = false ] ; then
+    if [ $VERSIONING = true ] ; then
         echo "Enabling versioning for '$BUCKET'"
         ${MC} version enable myminio/$BUCKET
-    elif [ $VERSIONING = false ] && [ $OBJECTLOCKING = false ] ; then
+    elif [ $VERSIONING = false ] ; then
         echo "Suspending versioning for '$BUCKET'"
         ${MC} version suspend myminio/$BUCKET
     fi
+    fi
   else
       echo "Bucket '$BUCKET' versioning unchanged."
   fi
 
+
   # At this point, the bucket should exist, skip checking for existence
   # Set policy on the bucket
   echo "Setting policy of bucket '$BUCKET' to '$POLICY'."
@@ -114,4 +120,4 @@ connectToMinio $scheme
 {{- range .Values.buckets }}
 createBucket {{ tpl .name $global }} {{ .policy }} {{ .purge }} {{ .versioning }} {{ .objectlocking }}
 {{- end }}
-{{- end }}
+{{- end }}
\ No newline at end of file