diff --git a/charts/minio/1.4.25/.helmignore b/charts/minio/1.4.25/.helmignore deleted file mode 100644 index a9fe727881..0000000000 --- a/charts/minio/1.4.25/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -# OWNERS file for Kubernetes -OWNERS \ No newline at end of file diff --git a/charts/minio/1.4.25/Chart.yaml b/charts/minio/1.4.25/Chart.yaml deleted file mode 100644 index b60ba616cf..0000000000 --- a/charts/minio/1.4.25/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -appVersion: '2022-02-18' -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -description: High Performance, Kubernetes Native Object Storage -home: https://min.io -icon: https://min.io/resources/img/logo/MINIO_wordmark.png -keywords: -- storage -- object-storage -- S3 -name: minio -sources: -- https://github.com/minio/minio -- https://github.com/minio/charts -upstream_version: 8.0.5 -version: 1.4.25 diff --git a/charts/minio/1.4.25/README.md b/charts/minio/1.4.25/README.md deleted file mode 100755 index e1eaee7605..0000000000 --- a/charts/minio/1.4.25/README.md +++ /dev/null @@ -1,48 +0,0 @@ -MinIO -===== - -[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. - -MinIO supports [distributed mode](https://docs.minio.io/docs/distributed-minio-quickstart-guide). In distributed mode, you can pool multiple drives (even on different machines) into a single object storage server. - -For more detailed documentation please visit [here](https://docs.minio.io/) - -Introduction ------------- - -This chart bootstraps MinIO deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - - -Configuration -------------- - -The following table lists the configurable parameters of the MinIO chart and their default values. - -| Parameter | Description | Default | -|:-------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------| -| `image.repository` | Image repository | `minio/minio` | -| `image.tag` | MinIO image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/). | `RELEASE.2020-11-06T23-17-07Z` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `extraArgs` | Additional command line arguments to pass to the MinIO server | `[]` | -| `accessKey` | Default access key (5 to 20 characters) | random 20 chars | -| `secretKey` | Default secret key (8 to 40 characters) | random 40 chars | -| `persistence.enabled` | Use persistent volume to store data | `true` | -| `persistence.size` | Size of persistent volume claim | `500Gi` | -| `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | -| `persistence.storageClass` | Storage class name of PVC | `nil` | -| `persistence.accessMode` | ReadWriteOnce or ReadOnly | `ReadWriteOnce` | -| `persistence.subPath` | Mount a sub directory of the persistent volume if set | `""` | -| `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 parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/). - -Pass environment variables to MinIO containers ----------------------------------------------- - -To pass environment variables to MinIO containers when deploying via Helm chart, use the below command line format - -```bash -$ helm install --set environment.MINIO_BROWSER=on,environment.MINIO_DOMAIN=domain-name minio/minio -``` - -You can add as many environment variables as required, using the above format. Just add `environment.=` under `set` flag. diff --git a/charts/minio/1.4.25/app-readme.md b/charts/minio/1.4.25/app-readme.md deleted file mode 100644 index 246e247c39..0000000000 --- a/charts/minio/1.4.25/app-readme.md +++ /dev/null @@ -1 +0,0 @@ -[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. diff --git a/charts/minio/1.4.25/charts/common-2112.0.0.tgz b/charts/minio/1.4.25/charts/common-2112.0.0.tgz deleted file mode 100644 index 62c214e1c8..0000000000 Binary files a/charts/minio/1.4.25/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/charts/minio/1.4.25/default_values.yaml b/charts/minio/1.4.25/default_values.yaml deleted file mode 100644 index 7afa31dc0d..0000000000 --- a/charts/minio/1.4.25/default_values.yaml +++ /dev/null @@ -1,22 +0,0 @@ -## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the -## -image: - repository: minio/minio - tag: RELEASE.2020-11-19T23-48-16Z - pullPolicy: IfNotPresent - -## Additional arguments to pass to minio binary -extraArgs: [] - -updateStrategy: RollingUpdate - -service: - nodePort: 9000 - -environment: - ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html - -appVolumeMounts: - export: - emptyDir: true - mountPath: "/export" diff --git a/charts/minio/1.4.25/ix_values.yaml b/charts/minio/1.4.25/ix_values.yaml deleted file mode 100644 index ed873b0f48..0000000000 --- a/charts/minio/1.4.25/ix_values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -image: - pullPolicy: IfNotPresent - repository: minio/minio - tag: RELEASE.2022-02-18T01-50-10Z diff --git a/charts/minio/1.4.25/migrations/migrate_from_1.0.0 b/charts/minio/1.4.25/migrations/migrate_from_1.0.0 deleted file mode 100755 index d9772faa1d..0000000000 --- a/charts/minio/1.4.25/migrations/migrate_from_1.0.0 +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python3 -import json -import os -import sys - - -def migrate(values): - if values.get('appVolumeMounts'): - return values - - values.update({ - 'appVolumeMounts': { - 'export': { - 'hostPathEnabled': values['minioHostPathEnabled'], - **({'hostPath': values['minioHostPath']} if values.get('minioHostPath') else {}) - }, - }, - }) - return values - - -if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) - - if os.path.exists(sys.argv[1]): - with open(sys.argv[1], 'r') as f: - print(json.dumps(migrate(json.loads(f.read())))) diff --git a/charts/minio/1.4.25/questions.yaml b/charts/minio/1.4.25/questions.yaml deleted file mode 100644 index 0f3ec5beff..0000000000 --- a/charts/minio/1.4.25/questions.yaml +++ /dev/null @@ -1,251 +0,0 @@ -groups: - - name: "Container Images" - description: "Image to be used for container" - - name: "Workload Configuration" - description: "Configure workload deployment" - - name: "Minio Configuration" - description: "Configure Minio credentials" - - name: "Storage" - description: "Configure Storage for Nextcloud" - - name: "Advanced DNS Settings" - description: "Configure DNS settings" - -portals: - web_portal: - protocols: - - "$kubernetes-resource_configmap_minio-config_protocol" - host: - - "$node_ip" - ports: - - "$variable-service.consolePort" - -questions: - - - variable: dnsConfig - label: "DNS Configuration" - group: "Advanced DNS Settings" - schema: - type: dict - attrs: - - variable: options - label: "DNS Options" - schema: - type: list - items: - - variable: optionsEntry - label: "Option Entry Configuration" - schema: - type: dict - attrs: - - variable: name - label: "Option Name" - schema: - type: string - required: true - - variable: value - label: "Option Value" - schema: - type: string - required: true - - - variable: updateStrategy - label: "Minio update strategy" - group: "Workload Configuration" - schema: - type: string - default: "RollingUpdate" - enum: - - value: "RollingUpdate" - description: "Create new pods and then kill old ones" - - value: "Recreate" - description: "Kill existing pods before creating new ones" - - - variable: distributedMode - label: "Enable Distributed Mode" - description: "Run Minio instance to connect to a distributed minio cluster" - group: "Minio Configuration" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: distributedIps - label: "Distributed Minio Instance URI(s)" - schema: - type: list - required: true - default: [] - items: - - variable: ip - label: "Distributed Minio Instance URI" - schema: - type: string - empty: false - - - - variable: extraArgs - label: "Minio Extra Arguments" - group: "Minio Configuration" - schema: - type: list - default: [] - items: - - variable: arg - label: "Argument" - schema: - type: string - - - variable: accessKey - label: "Root User" - group: "Minio Configuration" - description: "Enter the S3 Root User" - schema: - type: string - private: true - required: true - min_length: 5 - max_length: 20 - - - variable: secretKey - label: "Root Password" - group: "Minio Configuration" - description: "Enter the S3 Root Password" - schema: - type: string - private: true - required: true - min_length: 8 - max_length: 40 - - - variable: environmentVariables - label: "Minio image environment" - group: "Minio Configuration" - schema: - type: list - default: [] - items: - - variable: environmentVariable - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - - variable: service - description: "Minio Service Configuration" - label: "Minio Service Configuration" - group: "Minio Configuration" - schema: - type: dict - required: true - attrs: - - variable: nodePort - label: "Node Port to use for Minio API" - schema: - type: int - min: 9000 - max: 65535 - default: 9000 - required: true - - variable: consolePort - label: "Node Port to use for Minio UI Access" - schema: - type: int - min: 9000 - max: 65535 - default: 9002 - required: true - - - variable: minioDomain - label: "Minio Domain Name" - description: "This is only required if TLS is configured for Minio" - group: "Minio Configuration" - schema: - type: string - default: null - "null": true - show_if: [["certificate", "!=", null]] - - - variable: certificate - description: "Minio Certificate" - label: "Minio Certificate" - group: "Minio Configuration" - schema: - type: int - $ref: - - "definitions/certificate" - - - variable: appVolumeMounts - label: "Minio Storage" - group: "Storage" - schema: - type: dict - show_if: [["distributedMode", "=", false]] - attrs: - - variable: export - label: "Data Volume" - schema: - type: dict - attrs: - - variable: datasetName - label: "Minio Data Volume Name" - schema: - type: string - hidden: true - $ref: - - "normalize/ixVolume" - show_if: [["hostPathEnabled", "=", false]] - default: "ix-minio" - editable: false - - variable: mountPath - label: "Minio Data Mount Path" - description: "Path where the volume will be mounted inside the pod" - schema: - type: path - hidden: true - editable: false - default: "/export" - - variable: hostPathEnabled - label: "Enable Host Path for Minio Data Volume" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: hostPath - label: "Host Path for Minio Data Volume" - schema: - type: hostpath - required: true - - - variable: extraAppVolumeMounts - label: "Extra Host Path Volumes" - group: "Storage" - schema: - type: list - items: - - variable: extraAppVolume - label: "Host Path Volume" - description: "Add an extra host path volume for Minio application" - schema: - type: dict - attrs: - - variable: mountPath - label: "Mount Path in Pod" - description: "Path where the volume will be mounted inside the pod" - schema: - type: path - required: true - - variable: hostPath - label: "Host Path" - description: "Host path" - schema: - type: hostpath - required: true diff --git a/charts/minio/1.4.25/requirements.lock b/charts/minio/1.4.25/requirements.lock deleted file mode 100644 index 7d9c01b810..0000000000 --- a/charts/minio/1.4.25/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/charts/minio/1.4.25/templates/NOTES.txt b/charts/minio/1.4.25/templates/NOTES.txt deleted file mode 100644 index 88e8e93ef8..0000000000 --- a/charts/minio/1.4.25/templates/NOTES.txt +++ /dev/null @@ -1,2 +0,0 @@ -Minio can be accessed from the following URL: -http://$node_ip:{{ .Values.service.nodePort }}/ diff --git a/charts/minio/1.4.25/templates/_cert.tpl b/charts/minio/1.4.25/templates/_cert.tpl deleted file mode 100644 index f34777f65a..0000000000 --- a/charts/minio/1.4.25/templates/_cert.tpl +++ /dev/null @@ -1,33 +0,0 @@ -{{/* -Formats volumeMount for Minio tls keys and trusted certs -*/}} -{{- define "minio.tlsKeysVolumeMount" -}} -{{- if eq (include "minio.certAvailable" .) "true" -}} -- name: cert-secret-volume - mountPath: "/etc/minio/certs" -- name: trusted-cert-secret-volume - mountPath: "/etc/minio/certs/CAs" -{{- end }} -{{- end -}} - -{{/* -Formats volume for Minio tls keys and trusted certs -*/}} -{{- define "minio.tlsKeysVolume" -}} -{{- if eq (include "minio.certAvailable" .) "true" -}} -- name: cert-secret-volume - secret: - secretName: {{ include "minio.secretName" . }} - items: - - key: certPublicKey - path: public.crt - - key: certPrivateKey - path: private.key -- name: trusted-cert-secret-volume - secret: - secretName: {{ include "minio.secretName" . }} - items: - - key: certPublicKey - path: public.crt -{{- end }} -{{- end -}} diff --git a/charts/minio/1.4.25/templates/_helpers.tpl b/charts/minio/1.4.25/templates/_helpers.tpl deleted file mode 100644 index 55b50755aa..0000000000 --- a/charts/minio/1.4.25/templates/_helpers.tpl +++ /dev/null @@ -1,77 +0,0 @@ -{{/* -Determine secret name. -*/}} -{{- define "minio.secretName" -}} -{{- include "common.names.fullname" . -}} -{{- end -}} - - -{{/* -Retrieve true/false if minio certificate is configured -*/}} -{{- define "minio.certAvailable" -}} -{{- if .Values.certificate -}} -{{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} -{{- template "common.resources.cert_present" $values -}} -{{- else -}} -{{- false -}} -{{- end -}} -{{- end -}} - - -{{/* -Retrieve public key of minio certificate -*/}} -{{- define "minio.cert.publicKey" -}} -{{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate "publicKey" true) -}} -{{ include "common.resources.cert" $values }} -{{- end -}} - - -{{/* -Retrieve private key of minio certificate -*/}} -{{- define "minio.cert.privateKey" -}} -{{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} -{{ include "common.resources.cert" $values }} -{{- end -}} - - -{{/* -Retrieve scheme/protocol for minio -*/}} -{{- define "minio.scheme" -}} -{{- if eq (include "minio.certAvailable" .) "true" -}} -{{- print "https" -}} -{{- else -}} -{{- print "http" -}} -{{- end -}} -{{- end -}} - - -{{/* -Retrieve command for minio application -*/}} -{{- define "minio.commandArgs" -}} -{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}} -{{- if .Values.distributedMode -}} -{{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}} -{{- else -}} -{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}} -{{- end -}} -{{- end -}} - - -{{/* -Enable host networking -*/}} -{{- define "minio.hostNetworking" -}} -{{- if .Values.distributedMode -}} -{{- print "true" -}} -{{- else -}} -{{- print "false" -}} -{{- end -}} -{{- end -}} diff --git a/charts/minio/1.4.25/templates/configmap.yaml b/charts/minio/1.4.25/templates/configmap.yaml deleted file mode 100644 index 98a62a3890..0000000000 --- a/charts/minio/1.4.25/templates/configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: minio-config -data: - protocol: {{ include "minio.scheme" . }} diff --git a/charts/minio/1.4.25/templates/deployment.yaml b/charts/minio/1.4.25/templates/deployment.yaml deleted file mode 100644 index e4534846ff..0000000000 --- a/charts/minio/1.4.25/templates/deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} -kind: Deployment -metadata: - name: {{ template "common.names.fullname" . }} - labels: - app: {{ template "common.names.name" . }} - chart: {{ template "common.names.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - rollme: {{ randAlphaNum 5 | quote }} -spec: - replicas: {{ (default 1 .Values.replicas) }} - strategy: - type: {{ (default "Recreate" .Values.updateStrategy ) }} - selector: - matchLabels: - app: {{ template "common.names.name" . }} - release: {{ .Release.Name }} - template: - metadata: - name: {{ template "common.names.fullname" . }} - labels: - app: {{ template "common.names.name" . }} - release: {{ .Release.Name }} - {{- include "common.labels.selectorLabels" . | nindent 8 }} - annotations: {{ include "common.annotations" . | nindent 8 }} - spec: - serviceAccountName: {{ include "common.names.serviceAccountName" . | quote }} - hostNetwork: {{ include "minio.hostNetworking" . }} - containers: - - name: {{ .Chart.Name }} - {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} - volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} - {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }} - {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - - name: extrappvolume-{{ $index }} - mountPath: {{ $hostPathConfiguration.mountPath }} - {{ end }} - command: - - "/bin/sh" - - "-ce" - - {{ include "minio.commandArgs" . }} - ports: - - name: api - containerPort: 9000 - - name: console - containerPort: 9001 - env: - {{ $secretName := (include "minio.secretName" .) }} - {{ $envList := (default list .Values.environmentVariables) }} - {{ if and (eq (include "minio.certAvailable" .) "true") .Values.minioDomain }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.consolePort | int))) }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.nodePort | int))) }} - {{ end }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} - {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} -{{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} - volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} - {{- include "minio.tlsKeysVolume" . | nindent 8 }} - {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - - name: extrappvolume-{{ $index }} - hostPath: - path: {{ $hostPathConfiguration.hostPath }} - {{ end }} diff --git a/charts/minio/1.4.25/templates/secrets.yaml b/charts/minio/1.4.25/templates/secrets.yaml deleted file mode 100644 index 4085fd585b..0000000000 --- a/charts/minio/1.4.25/templates/secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "minio.secretName" . }} - labels: {{ include "common.labels" . | nindent 4 }} -type: Opaque -data: - accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} - secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} - {{ if eq (include "minio.certAvailable" .) "true" }} - certPublicKey: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }} - certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }} - {{ end }} diff --git a/charts/minio/1.4.25/templates/service.yaml b/charts/minio/1.4.25/templates/service.yaml deleted file mode 100644 index fd2e6ba676..0000000000 --- a/charts/minio/1.4.25/templates/service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{ $svc := .Values.service }} -{{ $selectors := list }} -{{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }} -{{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }} -{{ $ports := list }} -{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }} -{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }} -{{ $params := . }} -{{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }} -{{ $_1 := set .Values "extraSelectorLabels" $selectors }} -{{ include "common.classes.service" $params }} diff --git a/charts/minio/1.4.25/templates/serviceaccount.yaml b/charts/minio/1.4.25/templates/serviceaccount.yaml deleted file mode 100644 index 12bd3f4a39..0000000000 --- a/charts/minio/1.4.25/templates/serviceaccount.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.serviceaccount" . }} diff --git a/charts/minio/1.4.25/test_values.yaml b/charts/minio/1.4.25/test_values.yaml deleted file mode 100644 index c0071ac67a..0000000000 --- a/charts/minio/1.4.25/test_values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -appVolumeMounts: - export: - emptyDir: true - mountPath: /export -distributedIps: [] -distributedMode: false -dnsConfig: - options: [] -emptyDirVolumes: true -environmentVariables: [] -extraAppVolumeMounts: [] -extraArgs: [] -image: - pullPolicy: IfNotPresent - repository: minio/minio - tag: RELEASE.2022-02-18T01-50-10Z -minioDomain: null -service: - consolePort: 32325 - nodePort: 32324 -updateStrategy: RollingUpdate diff --git a/charts/minio/1.4.25/values.yaml b/charts/minio/1.4.25/values.yaml deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/test/minio/1.4.25/.helmignore b/test/minio/1.4.25/.helmignore deleted file mode 100644 index a9fe727881..0000000000 --- a/test/minio/1.4.25/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*~ -# Various IDEs -.project -.idea/ -*.tmproj -# OWNERS file for Kubernetes -OWNERS \ No newline at end of file diff --git a/test/minio/1.4.25/Chart.yaml b/test/minio/1.4.25/Chart.yaml deleted file mode 100644 index b60ba616cf..0000000000 --- a/test/minio/1.4.25/Chart.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -appVersion: '2022-02-18' -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -description: High Performance, Kubernetes Native Object Storage -home: https://min.io -icon: https://min.io/resources/img/logo/MINIO_wordmark.png -keywords: -- storage -- object-storage -- S3 -name: minio -sources: -- https://github.com/minio/minio -- https://github.com/minio/charts -upstream_version: 8.0.5 -version: 1.4.25 diff --git a/test/minio/1.4.25/README.md b/test/minio/1.4.25/README.md deleted file mode 100755 index e1eaee7605..0000000000 --- a/test/minio/1.4.25/README.md +++ /dev/null @@ -1,48 +0,0 @@ -MinIO -===== - -[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. - -MinIO supports [distributed mode](https://docs.minio.io/docs/distributed-minio-quickstart-guide). In distributed mode, you can pool multiple drives (even on different machines) into a single object storage server. - -For more detailed documentation please visit [here](https://docs.minio.io/) - -Introduction ------------- - -This chart bootstraps MinIO deployment on a [Kubernetes](http://kubernetes.io) cluster using the [Helm](https://helm.sh) package manager. - - -Configuration -------------- - -The following table lists the configurable parameters of the MinIO chart and their default values. - -| Parameter | Description | Default | -|:-------------------------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------|:---------------------------------| -| `image.repository` | Image repository | `minio/minio` | -| `image.tag` | MinIO image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/). | `RELEASE.2020-11-06T23-17-07Z` | -| `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `extraArgs` | Additional command line arguments to pass to the MinIO server | `[]` | -| `accessKey` | Default access key (5 to 20 characters) | random 20 chars | -| `secretKey` | Default secret key (8 to 40 characters) | random 40 chars | -| `persistence.enabled` | Use persistent volume to store data | `true` | -| `persistence.size` | Size of persistent volume claim | `500Gi` | -| `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | -| `persistence.storageClass` | Storage class name of PVC | `nil` | -| `persistence.accessMode` | ReadWriteOnce or ReadOnly | `ReadWriteOnce` | -| `persistence.subPath` | Mount a sub directory of the persistent volume if set | `""` | -| `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 parameters above map to the env variables defined in the [MinIO DockerHub image](https://hub.docker.com/r/minio/minio/). - -Pass environment variables to MinIO containers ----------------------------------------------- - -To pass environment variables to MinIO containers when deploying via Helm chart, use the below command line format - -```bash -$ helm install --set environment.MINIO_BROWSER=on,environment.MINIO_DOMAIN=domain-name minio/minio -``` - -You can add as many environment variables as required, using the above format. Just add `environment.=` under `set` flag. diff --git a/test/minio/1.4.25/app-readme.md b/test/minio/1.4.25/app-readme.md deleted file mode 100644 index 246e247c39..0000000000 --- a/test/minio/1.4.25/app-readme.md +++ /dev/null @@ -1 +0,0 @@ -[MinIO](https://min.io) is a High Performance Object Storage released under Apache License v2.0. It is API compatible with Amazon S3 cloud storage service. Use MinIO to build high performance infrastructure for machine learning, analytics and application data workloads. diff --git a/test/minio/1.4.25/charts/common-2112.0.0.tgz b/test/minio/1.4.25/charts/common-2112.0.0.tgz deleted file mode 100644 index 62c214e1c8..0000000000 Binary files a/test/minio/1.4.25/charts/common-2112.0.0.tgz and /dev/null differ diff --git a/test/minio/1.4.25/default_values.yaml b/test/minio/1.4.25/default_values.yaml deleted file mode 100644 index 7afa31dc0d..0000000000 --- a/test/minio/1.4.25/default_values.yaml +++ /dev/null @@ -1,22 +0,0 @@ -## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the -## -image: - repository: minio/minio - tag: RELEASE.2020-11-19T23-48-16Z - pullPolicy: IfNotPresent - -## Additional arguments to pass to minio binary -extraArgs: [] - -updateStrategy: RollingUpdate - -service: - nodePort: 9000 - -environment: - ## Please refer for comprehensive list https://docs.minio.io/docs/minio-server-configuration-guide.html - -appVolumeMounts: - export: - emptyDir: true - mountPath: "/export" diff --git a/test/minio/1.4.25/ix_values.yaml b/test/minio/1.4.25/ix_values.yaml deleted file mode 100644 index ed873b0f48..0000000000 --- a/test/minio/1.4.25/ix_values.yaml +++ /dev/null @@ -1,4 +0,0 @@ -image: - pullPolicy: IfNotPresent - repository: minio/minio - tag: RELEASE.2022-02-18T01-50-10Z diff --git a/test/minio/1.4.25/migrations/migrate_from_1.0.0 b/test/minio/1.4.25/migrations/migrate_from_1.0.0 deleted file mode 100755 index d9772faa1d..0000000000 --- a/test/minio/1.4.25/migrations/migrate_from_1.0.0 +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/python3 -import json -import os -import sys - - -def migrate(values): - if values.get('appVolumeMounts'): - return values - - values.update({ - 'appVolumeMounts': { - 'export': { - 'hostPathEnabled': values['minioHostPathEnabled'], - **({'hostPath': values['minioHostPath']} if values.get('minioHostPath') else {}) - }, - }, - }) - return values - - -if __name__ == '__main__': - if len(sys.argv) != 2: - exit(1) - - if os.path.exists(sys.argv[1]): - with open(sys.argv[1], 'r') as f: - print(json.dumps(migrate(json.loads(f.read())))) diff --git a/test/minio/1.4.25/questions.yaml b/test/minio/1.4.25/questions.yaml deleted file mode 100644 index 0f3ec5beff..0000000000 --- a/test/minio/1.4.25/questions.yaml +++ /dev/null @@ -1,251 +0,0 @@ -groups: - - name: "Container Images" - description: "Image to be used for container" - - name: "Workload Configuration" - description: "Configure workload deployment" - - name: "Minio Configuration" - description: "Configure Minio credentials" - - name: "Storage" - description: "Configure Storage for Nextcloud" - - name: "Advanced DNS Settings" - description: "Configure DNS settings" - -portals: - web_portal: - protocols: - - "$kubernetes-resource_configmap_minio-config_protocol" - host: - - "$node_ip" - ports: - - "$variable-service.consolePort" - -questions: - - - variable: dnsConfig - label: "DNS Configuration" - group: "Advanced DNS Settings" - schema: - type: dict - attrs: - - variable: options - label: "DNS Options" - schema: - type: list - items: - - variable: optionsEntry - label: "Option Entry Configuration" - schema: - type: dict - attrs: - - variable: name - label: "Option Name" - schema: - type: string - required: true - - variable: value - label: "Option Value" - schema: - type: string - required: true - - - variable: updateStrategy - label: "Minio update strategy" - group: "Workload Configuration" - schema: - type: string - default: "RollingUpdate" - enum: - - value: "RollingUpdate" - description: "Create new pods and then kill old ones" - - value: "Recreate" - description: "Kill existing pods before creating new ones" - - - variable: distributedMode - label: "Enable Distributed Mode" - description: "Run Minio instance to connect to a distributed minio cluster" - group: "Minio Configuration" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: distributedIps - label: "Distributed Minio Instance URI(s)" - schema: - type: list - required: true - default: [] - items: - - variable: ip - label: "Distributed Minio Instance URI" - schema: - type: string - empty: false - - - - variable: extraArgs - label: "Minio Extra Arguments" - group: "Minio Configuration" - schema: - type: list - default: [] - items: - - variable: arg - label: "Argument" - schema: - type: string - - - variable: accessKey - label: "Root User" - group: "Minio Configuration" - description: "Enter the S3 Root User" - schema: - type: string - private: true - required: true - min_length: 5 - max_length: 20 - - - variable: secretKey - label: "Root Password" - group: "Minio Configuration" - description: "Enter the S3 Root Password" - schema: - type: string - private: true - required: true - min_length: 8 - max_length: 40 - - - variable: environmentVariables - label: "Minio image environment" - group: "Minio Configuration" - schema: - type: list - default: [] - items: - - variable: environmentVariable - label: "Environment Variable" - schema: - type: dict - attrs: - - variable: name - label: "Name" - schema: - type: string - - variable: value - label: "Value" - schema: - type: string - - - variable: service - description: "Minio Service Configuration" - label: "Minio Service Configuration" - group: "Minio Configuration" - schema: - type: dict - required: true - attrs: - - variable: nodePort - label: "Node Port to use for Minio API" - schema: - type: int - min: 9000 - max: 65535 - default: 9000 - required: true - - variable: consolePort - label: "Node Port to use for Minio UI Access" - schema: - type: int - min: 9000 - max: 65535 - default: 9002 - required: true - - - variable: minioDomain - label: "Minio Domain Name" - description: "This is only required if TLS is configured for Minio" - group: "Minio Configuration" - schema: - type: string - default: null - "null": true - show_if: [["certificate", "!=", null]] - - - variable: certificate - description: "Minio Certificate" - label: "Minio Certificate" - group: "Minio Configuration" - schema: - type: int - $ref: - - "definitions/certificate" - - - variable: appVolumeMounts - label: "Minio Storage" - group: "Storage" - schema: - type: dict - show_if: [["distributedMode", "=", false]] - attrs: - - variable: export - label: "Data Volume" - schema: - type: dict - attrs: - - variable: datasetName - label: "Minio Data Volume Name" - schema: - type: string - hidden: true - $ref: - - "normalize/ixVolume" - show_if: [["hostPathEnabled", "=", false]] - default: "ix-minio" - editable: false - - variable: mountPath - label: "Minio Data Mount Path" - description: "Path where the volume will be mounted inside the pod" - schema: - type: path - hidden: true - editable: false - default: "/export" - - variable: hostPathEnabled - label: "Enable Host Path for Minio Data Volume" - schema: - type: boolean - default: false - show_subquestions_if: true - subquestions: - - variable: hostPath - label: "Host Path for Minio Data Volume" - schema: - type: hostpath - required: true - - - variable: extraAppVolumeMounts - label: "Extra Host Path Volumes" - group: "Storage" - schema: - type: list - items: - - variable: extraAppVolume - label: "Host Path Volume" - description: "Add an extra host path volume for Minio application" - schema: - type: dict - attrs: - - variable: mountPath - label: "Mount Path in Pod" - description: "Path where the volume will be mounted inside the pod" - schema: - type: path - required: true - - variable: hostPath - label: "Host Path" - description: "Host path" - schema: - type: hostpath - required: true diff --git a/test/minio/1.4.25/requirements.lock b/test/minio/1.4.25/requirements.lock deleted file mode 100644 index 7d9c01b810..0000000000 --- a/test/minio/1.4.25/requirements.lock +++ /dev/null @@ -1,6 +0,0 @@ -dependencies: -- name: common - repository: file://../../../library/common/2112.0.0 - version: 2112.0.0 -digest: sha256:47115d9b91afe42c8537dcf0fd8224f2f7d1c775f9ff860efa68a6b57d17d1c0 -generated: "2021-12-06T21:24:36.62541+05:00" diff --git a/test/minio/1.4.25/templates/NOTES.txt b/test/minio/1.4.25/templates/NOTES.txt deleted file mode 100644 index 88e8e93ef8..0000000000 --- a/test/minio/1.4.25/templates/NOTES.txt +++ /dev/null @@ -1,2 +0,0 @@ -Minio can be accessed from the following URL: -http://$node_ip:{{ .Values.service.nodePort }}/ diff --git a/test/minio/1.4.25/templates/_cert.tpl b/test/minio/1.4.25/templates/_cert.tpl deleted file mode 100644 index f34777f65a..0000000000 --- a/test/minio/1.4.25/templates/_cert.tpl +++ /dev/null @@ -1,33 +0,0 @@ -{{/* -Formats volumeMount for Minio tls keys and trusted certs -*/}} -{{- define "minio.tlsKeysVolumeMount" -}} -{{- if eq (include "minio.certAvailable" .) "true" -}} -- name: cert-secret-volume - mountPath: "/etc/minio/certs" -- name: trusted-cert-secret-volume - mountPath: "/etc/minio/certs/CAs" -{{- end }} -{{- end -}} - -{{/* -Formats volume for Minio tls keys and trusted certs -*/}} -{{- define "minio.tlsKeysVolume" -}} -{{- if eq (include "minio.certAvailable" .) "true" -}} -- name: cert-secret-volume - secret: - secretName: {{ include "minio.secretName" . }} - items: - - key: certPublicKey - path: public.crt - - key: certPrivateKey - path: private.key -- name: trusted-cert-secret-volume - secret: - secretName: {{ include "minio.secretName" . }} - items: - - key: certPublicKey - path: public.crt -{{- end }} -{{- end -}} diff --git a/test/minio/1.4.25/templates/_helpers.tpl b/test/minio/1.4.25/templates/_helpers.tpl deleted file mode 100644 index 55b50755aa..0000000000 --- a/test/minio/1.4.25/templates/_helpers.tpl +++ /dev/null @@ -1,77 +0,0 @@ -{{/* -Determine secret name. -*/}} -{{- define "minio.secretName" -}} -{{- include "common.names.fullname" . -}} -{{- end -}} - - -{{/* -Retrieve true/false if minio certificate is configured -*/}} -{{- define "minio.certAvailable" -}} -{{- if .Values.certificate -}} -{{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} -{{- template "common.resources.cert_present" $values -}} -{{- else -}} -{{- false -}} -{{- end -}} -{{- end -}} - - -{{/* -Retrieve public key of minio certificate -*/}} -{{- define "minio.cert.publicKey" -}} -{{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate "publicKey" true) -}} -{{ include "common.resources.cert" $values }} -{{- end -}} - - -{{/* -Retrieve private key of minio certificate -*/}} -{{- define "minio.cert.privateKey" -}} -{{- $values := (. | mustDeepCopy) -}} -{{- $_ := set $values "commonCertOptions" (dict "certKeyName" $values.Values.certificate) -}} -{{ include "common.resources.cert" $values }} -{{- end -}} - - -{{/* -Retrieve scheme/protocol for minio -*/}} -{{- define "minio.scheme" -}} -{{- if eq (include "minio.certAvailable" .) "true" -}} -{{- print "https" -}} -{{- else -}} -{{- print "http" -}} -{{- end -}} -{{- end -}} - - -{{/* -Retrieve command for minio application -*/}} -{{- define "minio.commandArgs" -}} -{{- $arg := "/usr/bin/docker-entrypoint.sh minio -S /etc/minio/certs server --console-address=':9001'" -}} -{{- if .Values.distributedMode -}} -{{- cat $arg (join " " (concat (.Values.distributedIps | default list) (.Values.extraArgs | default list))) -}} -{{- else -}} -{{- cat $arg ((concat (list "/export") (.Values.extraArgs | default list)) | join " ") -}} -{{- end -}} -{{- end -}} - - -{{/* -Enable host networking -*/}} -{{- define "minio.hostNetworking" -}} -{{- if .Values.distributedMode -}} -{{- print "true" -}} -{{- else -}} -{{- print "false" -}} -{{- end -}} -{{- end -}} diff --git a/test/minio/1.4.25/templates/configmap.yaml b/test/minio/1.4.25/templates/configmap.yaml deleted file mode 100644 index 98a62a3890..0000000000 --- a/test/minio/1.4.25/templates/configmap.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: minio-config -data: - protocol: {{ include "minio.scheme" . }} diff --git a/test/minio/1.4.25/templates/deployment.yaml b/test/minio/1.4.25/templates/deployment.yaml deleted file mode 100644 index e4534846ff..0000000000 --- a/test/minio/1.4.25/templates/deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: {{ template "common.capabilities.deployment.apiVersion" . }} -kind: Deployment -metadata: - name: {{ template "common.names.fullname" . }} - labels: - app: {{ template "common.names.name" . }} - chart: {{ template "common.names.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - annotations: - rollme: {{ randAlphaNum 5 | quote }} -spec: - replicas: {{ (default 1 .Values.replicas) }} - strategy: - type: {{ (default "Recreate" .Values.updateStrategy ) }} - selector: - matchLabels: - app: {{ template "common.names.name" . }} - release: {{ .Release.Name }} - template: - metadata: - name: {{ template "common.names.fullname" . }} - labels: - app: {{ template "common.names.name" . }} - release: {{ .Release.Name }} - {{- include "common.labels.selectorLabels" . | nindent 8 }} - annotations: {{ include "common.annotations" . | nindent 8 }} - spec: - serviceAccountName: {{ include "common.names.serviceAccountName" . | quote }} - hostNetwork: {{ include "minio.hostNetworking" . }} - containers: - - name: {{ .Chart.Name }} - {{ include "common.containers.imageConfig" .Values.image | nindent 10 }} - volumeMounts: {{ include "common.storage.configureAppVolumeMountsInContainer" .Values | nindent 12 }} - {{- include "minio.tlsKeysVolumeMount" . | nindent 12 }} - {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - - name: extrappvolume-{{ $index }} - mountPath: {{ $hostPathConfiguration.mountPath }} - {{ end }} - command: - - "/bin/sh" - - "-ce" - - {{ include "minio.commandArgs" . }} - ports: - - name: api - containerPort: 9000 - - name: console - containerPort: 9001 - env: - {{ $secretName := (include "minio.secretName" .) }} - {{ $envList := (default list .Values.environmentVariables) }} - {{ if and (eq (include "minio.certAvailable" .) "true") .Values.minioDomain }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_BROWSER_REDIRECT_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.consolePort | int))) }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_SERVER_URL" "value" (printf "%s://%s:%d" (include "minio.scheme" .) .Values.minioDomain (.Values.service.nodePort | int))) }} - {{ end }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_USER" "valueFromSecret" true "secretName" $secretName "secretKey" "accesskey") }} - {{ $envList = mustAppend $envList (dict "name" "MINIO_ROOT_PASSWORD" "valueFromSecret" true "secretName" $secretName "secretKey" "secretkey") }} - {{ include "common.containers.environmentVariables" (dict "environmentVariables" $envList) | nindent 12 }} -{{ include "common.networking.dnsConfiguration" .Values | nindent 6 }} - volumes: {{ include "common.storage.configureAppVolumes" .Values | nindent 8 }} - {{- include "minio.tlsKeysVolume" . | nindent 8 }} - {{ range $index, $hostPathConfiguration := .Values.extraAppVolumeMounts }} - - name: extrappvolume-{{ $index }} - hostPath: - path: {{ $hostPathConfiguration.hostPath }} - {{ end }} diff --git a/test/minio/1.4.25/templates/secrets.yaml b/test/minio/1.4.25/templates/secrets.yaml deleted file mode 100644 index 4085fd585b..0000000000 --- a/test/minio/1.4.25/templates/secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ template "minio.secretName" . }} - labels: {{ include "common.labels" . | nindent 4 }} -type: Opaque -data: - accesskey: {{ if .Values.accessKey }}{{ .Values.accessKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 20 | b64enc | quote }}{{ end }} - secretkey: {{ if .Values.secretKey }}{{ .Values.secretKey | toString | b64enc | quote }}{{ else }}{{ randAlphaNum 40 | b64enc | quote }}{{ end }} - {{ if eq (include "minio.certAvailable" .) "true" }} - certPublicKey: {{ (include "minio.cert.publicKey" .) | toString | b64enc | quote }} - certPrivateKey: {{ (include "minio.cert.privateKey" .) | toString | b64enc | quote }} - {{ end }} diff --git a/test/minio/1.4.25/templates/service.yaml b/test/minio/1.4.25/templates/service.yaml deleted file mode 100644 index fd2e6ba676..0000000000 --- a/test/minio/1.4.25/templates/service.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{ $svc := .Values.service }} -{{ $selectors := list }} -{{ $selectors = mustAppend $selectors (dict "key" "app" "value" (include "common.names.name" .) ) }} -{{ $selectors = mustAppend $selectors (dict "key" "release" "value" .Release.Name ) }} -{{ $ports := list }} -{{ $ports = mustAppend $ports (dict "name" "api" "port" $svc.nodePort "nodePort" $svc.nodePort "targetPort" 9000) }} -{{ $ports = mustAppend $ports (dict "name" "console" "port" $svc.consolePort "nodePort" $svc.consolePort "targetPort" 9001) }} -{{ $params := . }} -{{ $_ := set $params "commonService" (dict "type" "NodePort" "ports" $ports ) }} -{{ $_1 := set .Values "extraSelectorLabels" $selectors }} -{{ include "common.classes.service" $params }} diff --git a/test/minio/1.4.25/templates/serviceaccount.yaml b/test/minio/1.4.25/templates/serviceaccount.yaml deleted file mode 100644 index 12bd3f4a39..0000000000 --- a/test/minio/1.4.25/templates/serviceaccount.yaml +++ /dev/null @@ -1 +0,0 @@ -{{ include "common.serviceaccount" . }} diff --git a/test/minio/1.4.25/test_values.yaml b/test/minio/1.4.25/test_values.yaml deleted file mode 100644 index c0071ac67a..0000000000 --- a/test/minio/1.4.25/test_values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -appVolumeMounts: - export: - emptyDir: true - mountPath: /export -distributedIps: [] -distributedMode: false -dnsConfig: - options: [] -emptyDirVolumes: true -environmentVariables: [] -extraAppVolumeMounts: [] -extraArgs: [] -image: - pullPolicy: IfNotPresent - repository: minio/minio - tag: RELEASE.2022-02-18T01-50-10Z -minioDomain: null -service: - consolePort: 32325 - nodePort: 32324 -updateStrategy: RollingUpdate diff --git a/test/minio/1.4.25/values.yaml b/test/minio/1.4.25/values.yaml deleted file mode 100644 index e69de29bb2..0000000000