Skip to content

Commit 994933e

Browse files
authored
chore: support minio RELEASE.2025-10-15T17-29-55Z (#2279)
1 parent 6e55d5c commit 994933e

File tree

7 files changed

+50
-27
lines changed

7 files changed

+50
-27
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ addons-cluster/mariadb/ @yinmin @leon-inf @apecloud/kb-reviewers @apecloud/kb-ad
5252
addons/milvus/ @leon-inf @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
5353
addons-cluster/milvus/ @leon-inf @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
5454

55-
addons/minio/ @fengluodb @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
56-
addons-cluster/minio/ @fengluodb @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
55+
addons/minio/ @ldming @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
56+
addons-cluster/minio/ @ldming @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
5757

5858
addons/mogdb/ @yabinji @shanshanying @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers
5959
addons-cluster/mogdb/ @yabinji @shanshanying @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ KubeBlocks add-ons.
2121
| loki | loki-1.0.0 | Loki is a horizontally-scalable, highly-available, multi-tenant log aggregation system inspired by Prometheus. It is designed to be very cost effective and easy to operate. | Chen-speculation |
2222
| mariadb | mariadb-10.6.15 | MariaDB is a high performance open source relational database management system that is widely used for web and application servers | yinmin |
2323
| milvus | milvus-2.5.13<br>milvus-v2.3.2 | A cloud-native vector database, storage for next generation AI applications. | leon-inf |
24-
| minio | minio-2024.6.29 | High Performance, Kubernetes Native Object Storage | fengluodb |
24+
| minio | minio-2024.6.29<br>minio-2025.10.15 | High Performance, Kubernetes Native Object Storage | ldming |
2525
| mogdb | mogdb-5.0.5 | A Helm chart for Kubernetes | yabinji shanshanying |
2626
| mongodb | mongodb-4.4.29<br>mongodb-5.0.29<br>mongodb-6.0.21<br>mongodb-7.0.18<br>mongodb-8.0.8<br>mongodb-shard-4.4.29<br>mongodb-shard-5.0.29<br>mongodb-shard-6.0.21<br>mongodb-shard-7.0.18<br>mongodb-shard-8.0.8<br>mongos-4.4.29<br>mongos-5.0.29<br>mongos-6.0.21<br>mongos-7.0.18<br>mongos-8.0.8 | MongoDB is a document database designed for ease of application development and scaling. | xuriwuyun |
2727
| mysql | mysql-5.7.44<br>mysql-8.0.30<br>mysql-8.0.31<br>mysql-8.0.32<br>mysql-8.0.33<br>mysql-8.0.34<br>mysql-8.0.35<br>mysql-8.0.36<br>mysql-8.0.37<br>mysql-8.0.38<br>mysql-8.0.39<br>mysql-8.4.0<br>mysql-8.4.1<br>mysql-8.4.2<br>mysql-8.4.3<br>mysql-8.4.7<br>mysql-mgr-8.0.30<br>mysql-mgr-8.0.31<br>mysql-mgr-8.0.32<br>mysql-mgr-8.0.33<br>mysql-mgr-8.0.34<br>mysql-mgr-8.0.35<br>mysql-mgr-8.0.36<br>mysql-mgr-8.0.37<br>mysql-mgr-8.0.38<br>mysql-mgr-8.0.39<br>mysql-mgr-8.4.0<br>mysql-mgr-8.4.1<br>mysql-mgr-8.4.2<br>mysql-orc-5.7.44<br>mysql-orc-8.0.30<br>mysql-orc-8.0.31<br>mysql-orc-8.0.32<br>mysql-orc-8.0.33<br>mysql-orc-8.0.34<br>mysql-orc-8.0.35<br>mysql-orc-8.0.36<br>mysql-orc-8.0.37<br>mysql-orc-8.0.38<br>mysql-orc-8.0.39<br>mysql-proxysql-2.4.4 | MySQL is a widely used, open-source relational database management system (RDBMS) | xuriwuyun |

addons/minio/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ sources:
1717
- https://github.com/minio/minio
1818

1919
maintainers:
20-
- name: fengluodb
20+
- name: ldming
2121
url: https://github.com/apecloud/kubeblocks/
2222

2323
annotations:

addons/minio/templates/_helpers.tpl

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,3 +93,20 @@ Define minio config template name
9393
{{- define "minio.configTplName" -}}
9494
minio-config-template
9595
{{- end -}}
96+
97+
{{/*
98+
Get MinIO default service version
99+
*/}}
100+
{{- define "minio.defaultServiceVersion" -}}
101+
{{- $defaultVersion := "" -}}
102+
{{- range .Values.versions -}}
103+
{{- if .isDefault -}}
104+
{{- $defaultVersion = .serviceVersion -}}
105+
{{- break -}}
106+
{{- end -}}
107+
{{- end -}}
108+
{{- if not $defaultVersion -}}
109+
{{- $defaultVersion = (index .Values.versions 0).serviceVersion -}}
110+
{{- end -}}
111+
{{- $defaultVersion -}}
112+
{{- end -}}

addons/minio/templates/cmpd.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ spec:
1010
provider: kubeblocks
1111
description: Minio is a High Performance Object Storage.
1212
serviceKind: minio
13-
serviceVersion: {{ .Values.defaultServiceVersion.minio }}
13+
serviceVersion: {{ include "minio.defaultServiceVersion" . }}
1414
minReadySeconds: 10
1515
replicasLimit:
1616
minReplicas: 2
@@ -122,7 +122,9 @@ spec:
122122
- /bin/sh
123123
- -c
124124
- |
125-
if mc config host add minio http://127.0.0.1:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD &>/dev/null; then
125+
# Set alias and check MinIO readiness using mc command
126+
mc alias set local http://127.0.0.1:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD >/dev/null 2>&1
127+
if mc admin info local >/dev/null 2>&1; then
126128
echo -n "readwrite"
127129
else
128130
echo -n "notready"

addons/minio/templates/cmpv.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,17 @@ metadata:
99
spec:
1010
compatibilityRules:
1111
- releases:
12-
- 2024.6.29
12+
{{- range .Values.versions }}
13+
- {{ .serviceVersion }}
14+
{{- end }}
1315
compDefs:
1416
- {{ include "minio.cmpdRegexpPattern" . }}
1517
releases:
16-
- name: 2024.6.29
17-
serviceVersion: 2024.6.29
18+
{{- range .Values.versions }}
19+
- name: {{ .serviceVersion }}
20+
serviceVersion: {{ .serviceVersion }}
1821
images:
19-
minio: &minioImage {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:RELEASE.2024-06-29T01-20-47Z
20-
roleProbe: *minioImage
21-
init: {{ .Values.image.registry | default "docker.io" }}/apecloud/kubeblocks-tools:1.0.0
22+
minio: {{ $.Values.image.registry | default "docker.io" }}/{{ $.Values.image.repository }}:{{ .tag }}
23+
roleProbe: {{ $.Values.image.registry | default "docker.io" }}/{{ $.Values.image.repository }}:{{ .tag }}
24+
init: {{ $.Values.image.registry | default "docker.io" }}/apecloud/kubeblocks-tools:1.0.0
25+
{{- end }}

addons/minio/values.yaml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ nameOverride: ""
77
fullnameOverride: ""
88

99
## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the
10+
## Note: from RELEASE.2025-10-15T17-29-55Z, minio changed to source code only distribution,
11+
## so we use the image hosted on coollabsio/minio. If you want to use the old version,
12+
## please set the image.repository to minio/minio.
13+
## Ref: https://github.com/minio/minio?tab=readme-ov-file#source-only-distribution
1014
##
1115
image:
1216
registry: docker.io
13-
repository: minio/minio
14-
tag: RELEASE.2024-06-29T01-20-47Z
17+
repository: coollabsio/minio
1518
pullPolicy: IfNotPresent
1619

17-
## @param define default serviceVersion
18-
defaultServiceVersion:
19-
minio: 2024.6.29
20-
21-
## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio
22-
## client used to create a default bucket).
23-
##
24-
mcImage:
25-
# if the value of mcImage.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default
26-
registry: ""
27-
repository: minio/mc
28-
tag: RELEASE.2024-04-18T16-45-29Z
29-
pullPolicy: IfNotPresent
20+
## @param versions MinIO versions configuration
21+
## Array of versions with specific image tags and service versions
22+
versions:
23+
- version: "2024.6.29"
24+
tag: "RELEASE.2024-06-29T01-20-47Z"
25+
serviceVersion: "2024.6.29"
26+
- version: "2025.10.15"
27+
tag: "RELEASE.2025-10-15T17-29-55Z"
28+
serviceVersion: "2025.10.15"
29+
isDefault: true
3030

3131
## Internal port number for MinIO S3 API container
3232
## Change service.port to change external port number

0 commit comments

Comments
 (0)