Browse Source

Remove ability to automatically create buckets after release creation for now

Waqar Ahmed 5 năm trước cách đây
mục cha
commit
531c840450

+ 0 - 21
test/minio/8.0.5/README.md

@@ -154,12 +154,6 @@ The following table lists the configurable parameters of the MinIO chart and the
 | `resources.requests.memory`                      | Memory resource requests                                                                                                                | Memory: `4Gi`                    |
 | `tls.enabled`                                    | Enable TLS for MinIO server                                                                                                             | `false`                          |
 | `tls.certSecret`                                 | Kubernetes Secret with `public.crt` and `private.key` files.                                                                            | `""`                             |
-| `defaultBucket.enabled`                          | If set to true, a bucket will be created after MinIO install                                                                            | `false`                          |
-| `defaultBucket.name`                             | Bucket name                                                                                                                             | `bucket`                         |
-| `defaultBucket.policy`                           | Bucket policy                                                                                                                           | `none`                           |
-| `defaultBucket.purge`                            | Purge the bucket if already exists                                                                                                      | `false`                          |
-| `defaultBucket.versioning`                       | Enable / Suspend versioning for bucket                                                                                                  | `nil`                            |
-| `buckets`                                        | List of buckets to create after MinIO install                                                                                           | `[]`                             |
 | `environment`                                    | Set MinIO server relevant environment variables in `values.yaml` file. MinIO containers will be passed these variables when they start. | `MINIO_STORAGE_CLASS_STANDARD: EC:4"` |
 
 Some of the parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/).
@@ -276,18 +270,3 @@ $ helm install --set environment.MINIO_BROWSER=on,environment.MINIO_DOMAIN=domai
 ```
 
 You can add as many environment variables as required, using the above format. Just add `environment.<VARIABLE_NAME>=<value>` under `set` flag.
-
-Create buckets after install
----------------------------
-
-Install the chart, specifying the buckets you want to create after install:
-
-```bash
-$ helm install --set buckets[0].name=bucket1,buckets[0].policy=none,buckets[0].purge=false minio/minio
-```
-
-Description of the configuration parameters used above -
-
-- `buckets[].name` - name of the bucket to create, must be a string with length > 0
-- `buckets[].policy` - can be one of none|download|upload|public
-- `buckets[].purge` - purge if bucket exists already

+ 0 - 107
test/minio/8.0.5/templates/_helper_create_bucket.txt

@@ -1,107 +0,0 @@
-#!/bin/sh
-set -e ; # Have script exit in the event of a failed command.
-
-MC_CONFIG_DIR="/etc/minio/mc/"
-MC="/usr/bin/mc --insecure --config-dir ${MC_CONFIG_DIR}"
-
-# connectToMinio
-# Use a check-sleep-check loop to wait for Minio service to be available
-connectToMinio() {
-  SCHEME=$1
-  ATTEMPTS=0 ; LIMIT=29 ; # Allow 30 attempts
-  set -e ; # fail if we can't read the keys.
-  ACCESS=$(cat /config/accesskey) ; SECRET=$(cat /config/secretkey) ;
-  set +e ; # The connections to minio are allowed to fail.
-  echo "Connecting to Minio server: $SCHEME://$MINIO_ENDPOINT:$MINIO_PORT" ;
-  MC_COMMAND="${MC} config host add myminio $SCHEME://$MINIO_ENDPOINT:$MINIO_PORT $ACCESS $SECRET" ;
-  $MC_COMMAND ;
-  STATUS=$? ;
-  until [ $STATUS = 0 ]
-  do
-    ATTEMPTS=`expr $ATTEMPTS + 1` ;
-    echo \"Failed attempts: $ATTEMPTS\" ;
-    if [ $ATTEMPTS -gt $LIMIT ]; then
-      exit 1 ;
-    fi ;
-    sleep 2 ; # 1 second intervals between attempts
-    $MC_COMMAND ;
-    STATUS=$? ;
-  done ;
-  set -e ; # reset `e` as active
-  return 0
-}
-
-# checkBucketExists ($bucket)
-# Check if the bucket exists, by using the exit code of `mc ls`
-checkBucketExists() {
-  BUCKET=$1
-  CMD=$(${MC} ls myminio/$BUCKET > /dev/null 2>&1)
-  return $?
-}
-
-# createBucket ($bucket, $policy, $purge)
-# Ensure bucket exists, purging if asked to
-createBucket() {
-  BUCKET=$1
-  POLICY=$2
-  PURGE=$3
-  VERSIONING=$4
-
-  # Purge the bucket, if set & exists
-  # Since PURGE is user input, check explicitly for `true`
-  if [ $PURGE = true ]; then
-    if checkBucketExists $BUCKET ; then
-      echo "Purging bucket '$BUCKET'."
-      set +e ; # don't exit if this fails
-      ${MC} rm -r --force myminio/$BUCKET
-      set -e ; # reset `e` as active
-    else
-      echo "Bucket '$BUCKET' does not exist, skipping purge."
-    fi
-  fi
-
-  # Create the bucket if it does not exist
-  if ! checkBucketExists $BUCKET ; then
-    echo "Creating bucket '$BUCKET'"
-    ${MC} mb myminio/$BUCKET
-  else
-    echo "Bucket '$BUCKET' already exists."
-  fi
-
-
-  # set versioning for bucket
-  if [ ! -z $VERSIONING ] ; then
-    if [ $VERSIONING = true ] ; then
-        echo "Enabling versioning for '$BUCKET'"
-        ${MC} version enable myminio/$BUCKET
-    elif [ $VERSIONING = false ] ; then
-        echo "Suspending versioning for '$BUCKET'"
-        ${MC} version suspend myminio/$BUCKET
-    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'."
-  ${MC} policy set $POLICY myminio/$BUCKET
-}
-
-# Try connecting to Minio instance
-{{- if .Values.tls.enabled }}
-scheme=https
-{{- else }}
-scheme=http
-{{- end }}
-connectToMinio $scheme
-
-{{- if or .Values.defaultBucket.enabled }}
-# Create the bucket
-createBucket {{ .Values.defaultBucket.name }} {{ .Values.defaultBucket.policy }} {{ .Values.defaultBucket.purge }} {{ .Values.defaultBucket.versioning }}
-{{ else if .Values.buckets }}
-# Create the buckets
-{{- range .Values.buckets }}
-createBucket {{ .name }} {{ .policy }} {{ .purge }} {{ .versioning }}
-{{- end }}
-{{- end }}

+ 0 - 12
test/minio/8.0.5/templates/configmap.yaml

@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ template "minio.fullname" . }}
-  labels:
-    app: {{ template "minio.name" . }}
-    chart: {{ template "minio.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-data:
-  initialize: |-
-{{ include (print $.Template.BasePath "/_helper_create_bucket.txt") . | indent 4 }}

+ 0 - 56
test/minio/8.0.5/templates/post-install-create-bucket-job.yaml

@@ -1,56 +0,0 @@
-{{- if or .Values.defaultBucket.enabled .Values.buckets }}
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ template "minio.fullname" . }}-make-bucket-job
-  labels:
-    app: {{ template "minio.name" . }}-make-bucket-job
-    chart: {{ template "minio.chart" . }}
-    release: {{ .Release.Name }}
-    heritage: {{ .Release.Service }}
-  annotations:
-    "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded,before-hook-creation
-spec:
-  template:
-    metadata:
-      labels:
-        app: {{ template "minio.name" . }}-job
-        release: {{ .Release.Name }}
-    spec:
-      restartPolicy: OnFailure
-      volumes:
-        - name: minio-configuration
-          projected:
-            sources:
-            - configMap:
-                name: {{ template "minio.fullname" . }}
-            - secret:
-                name: {{ template "minio.secretName" . }}
-        {{- if .Values.tls.enabled }}
-        - name: cert-secret-volume-mc
-          secret:
-            secretName: {{ .Values.tls.certSecret }}
-            items:
-            - key: {{ .Values.tls.publicCrt }}
-              path: CAs/public.crt
-        {{ end }}
-      serviceAccountName: {{ include "minio.serviceAccountName" . | quote }}
-      containers:
-      - name: minio-mc
-        image: "minio/mc:latest"
-        imagePullPolicy: IfNotPresent
-        command: ["/bin/sh", "/config/initialize"]
-        env:
-          - name: MINIO_ENDPOINT
-            value: {{ template "minio.fullname" . }}
-          - name: MINIO_PORT
-            value: {{ .Values.service.port | quote }}
-        volumeMounts:
-          - name: minio-configuration
-            mountPath: /config
-          {{- if .Values.tls.enabled }}
-          - name: cert-secret-volume-mc
-            mountPath: /etc/minio/mc/certs
-          {{ end }}
-{{- end }}

+ 0 - 24
test/minio/8.0.5/values.yaml

@@ -122,30 +122,6 @@ resources:
   requests:
     memory: 4Gi
 
-## Create a bucket after minio install
-##
-defaultBucket:
-  enabled: false
-  ## If enabled, must be a string with length > 0
-  name: bucket
-  ## Can be one of none|download|upload|public
-  policy: none
-  ## Purge if bucket exists already
-  purge: false
-  ## set versioning for bucket true|false
-  # versioning: false
-
-## Create multiple buckets after minio install
-## Enabling `defaultBucket` will take priority over this list
-##
-buckets: []
-  # - name: bucket1
-  #   policy: none
-  #   purge: false
-  # - name: bucket2
-  #   policy: none
-  #   purge: false
-
 ## Use this field to add environment variables relevant to Minio server. These fields will be passed on to Minio container(s)
 ## when Chart is deployed
 environment: