diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index de1050eac..189f4517f 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -52,8 +52,8 @@ addons-cluster/mariadb/ @yinmin @leon-inf @apecloud/kb-reviewers @apecloud/kb-ad addons/milvus/ @leon-inf @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers addons-cluster/milvus/ @leon-inf @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers -addons/minio/ @fengluodb @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers -addons-cluster/minio/ @fengluodb @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers +addons/minio/ @ldming @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers +addons-cluster/minio/ @ldming @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers addons/mogdb/ @yabinji @shanshanying @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers addons-cluster/mogdb/ @yabinji @shanshanying @leon-inf @apecloud/kb-reviewers @apecloud/kb-addon-reviewers diff --git a/README.md b/README.md index 23e736000..bb7501649 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ KubeBlocks add-ons. | 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 | | 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 | | milvus | milvus-2.5.13
milvus-v2.3.2 | A cloud-native vector database, storage for next generation AI applications. | leon-inf | -| minio | minio-2024.6.29 | High Performance, Kubernetes Native Object Storage | fengluodb | +| minio | minio-2024.6.29
minio-2025.10.15 | High Performance, Kubernetes Native Object Storage | ldming | | mogdb | mogdb-5.0.5 | A Helm chart for Kubernetes | yabinji shanshanying | | mongodb | mongodb-4.4.29
mongodb-5.0.29
mongodb-6.0.21
mongodb-7.0.18
mongodb-8.0.8
mongodb-shard-4.4.29
mongodb-shard-5.0.29
mongodb-shard-6.0.21
mongodb-shard-7.0.18
mongodb-shard-8.0.8
mongos-4.4.29
mongos-5.0.29
mongos-6.0.21
mongos-7.0.18
mongos-8.0.8 | MongoDB is a document database designed for ease of application development and scaling. | xuriwuyun | | mysql | mysql-5.7.44
mysql-8.0.30
mysql-8.0.31
mysql-8.0.32
mysql-8.0.33
mysql-8.0.34
mysql-8.0.35
mysql-8.0.36
mysql-8.0.37
mysql-8.0.38
mysql-8.0.39
mysql-8.4.0
mysql-8.4.1
mysql-8.4.2
mysql-8.4.3
mysql-8.4.7
mysql-mgr-8.0.30
mysql-mgr-8.0.31
mysql-mgr-8.0.32
mysql-mgr-8.0.33
mysql-mgr-8.0.34
mysql-mgr-8.0.35
mysql-mgr-8.0.36
mysql-mgr-8.0.37
mysql-mgr-8.0.38
mysql-mgr-8.0.39
mysql-mgr-8.4.0
mysql-mgr-8.4.1
mysql-mgr-8.4.2
mysql-orc-5.7.44
mysql-orc-8.0.30
mysql-orc-8.0.31
mysql-orc-8.0.32
mysql-orc-8.0.33
mysql-orc-8.0.34
mysql-orc-8.0.35
mysql-orc-8.0.36
mysql-orc-8.0.37
mysql-orc-8.0.38
mysql-orc-8.0.39
mysql-proxysql-2.4.4 | MySQL is a widely used, open-source relational database management system (RDBMS) | xuriwuyun | diff --git a/addons/minio/Chart.yaml b/addons/minio/Chart.yaml index 45f7ad65e..766481ed1 100644 --- a/addons/minio/Chart.yaml +++ b/addons/minio/Chart.yaml @@ -17,7 +17,7 @@ sources: - https://github.com/minio/minio maintainers: - - name: fengluodb + - name: ldming url: https://github.com/apecloud/kubeblocks/ annotations: diff --git a/addons/minio/templates/_helpers.tpl b/addons/minio/templates/_helpers.tpl index 450fef6e8..76f0c4416 100644 --- a/addons/minio/templates/_helpers.tpl +++ b/addons/minio/templates/_helpers.tpl @@ -93,3 +93,20 @@ Define minio config template name {{- define "minio.configTplName" -}} minio-config-template {{- end -}} + +{{/* +Get MinIO default service version +*/}} +{{- define "minio.defaultServiceVersion" -}} +{{- $defaultVersion := "" -}} +{{- range .Values.versions -}} + {{- if .isDefault -}} + {{- $defaultVersion = .serviceVersion -}} + {{- break -}} + {{- end -}} +{{- end -}} +{{- if not $defaultVersion -}} + {{- $defaultVersion = (index .Values.versions 0).serviceVersion -}} +{{- end -}} +{{- $defaultVersion -}} +{{- end -}} diff --git a/addons/minio/templates/cmpd.yaml b/addons/minio/templates/cmpd.yaml index 56a42918c..f315e240d 100644 --- a/addons/minio/templates/cmpd.yaml +++ b/addons/minio/templates/cmpd.yaml @@ -10,7 +10,7 @@ spec: provider: kubeblocks description: Minio is a High Performance Object Storage. serviceKind: minio - serviceVersion: {{ .Values.defaultServiceVersion.minio }} + serviceVersion: {{ include "minio.defaultServiceVersion" . }} minReadySeconds: 10 replicasLimit: minReplicas: 2 @@ -122,7 +122,9 @@ spec: - /bin/sh - -c - | - if mc config host add minio http://127.0.0.1:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD &>/dev/null; then + # Set alias and check MinIO readiness using mc command + mc alias set local http://127.0.0.1:9000 $MINIO_ROOT_USER $MINIO_ROOT_PASSWORD >/dev/null 2>&1 + if mc admin info local >/dev/null 2>&1; then echo -n "readwrite" else echo -n "notready" diff --git a/addons/minio/templates/cmpv.yaml b/addons/minio/templates/cmpv.yaml index f3a19b981..0fd107454 100644 --- a/addons/minio/templates/cmpv.yaml +++ b/addons/minio/templates/cmpv.yaml @@ -9,13 +9,17 @@ metadata: spec: compatibilityRules: - releases: - - 2024.6.29 + {{- range .Values.versions }} + - {{ .serviceVersion }} + {{- end }} compDefs: - {{ include "minio.cmpdRegexpPattern" . }} releases: - - name: 2024.6.29 - serviceVersion: 2024.6.29 + {{- range .Values.versions }} + - name: {{ .serviceVersion }} + serviceVersion: {{ .serviceVersion }} images: - minio: &minioImage {{ .Values.image.registry | default "docker.io" }}/{{ .Values.image.repository }}:RELEASE.2024-06-29T01-20-47Z - roleProbe: *minioImage - init: {{ .Values.image.registry | default "docker.io" }}/apecloud/kubeblocks-tools:1.0.0 + minio: {{ $.Values.image.registry | default "docker.io" }}/{{ $.Values.image.repository }}:{{ .tag }} + roleProbe: {{ $.Values.image.registry | default "docker.io" }}/{{ $.Values.image.repository }}:{{ .tag }} + init: {{ $.Values.image.registry | default "docker.io" }}/apecloud/kubeblocks-tools:1.0.0 + {{- end }} diff --git a/addons/minio/values.yaml b/addons/minio/values.yaml index 69862072d..19d7e3ad0 100644 --- a/addons/minio/values.yaml +++ b/addons/minio/values.yaml @@ -7,26 +7,26 @@ nameOverride: "" fullnameOverride: "" ## Set default image, imageTag, and imagePullPolicy. mode is used to indicate the +## Note: from RELEASE.2025-10-15T17-29-55Z, minio changed to source code only distribution, +## so we use the image hosted on coollabsio/minio. If you want to use the old version, +## please set the image.repository to minio/minio. +## Ref: https://github.com/minio/minio?tab=readme-ov-file#source-only-distribution ## image: registry: docker.io - repository: minio/minio - tag: RELEASE.2024-06-29T01-20-47Z + repository: coollabsio/minio pullPolicy: IfNotPresent -## @param define default serviceVersion -defaultServiceVersion: - minio: 2024.6.29 - -## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio -## client used to create a default bucket). -## -mcImage: - # if the value of mcImage.registry is not specified using `--set`, it will be set to the value of 'image.registry' by default - registry: "" - repository: minio/mc - tag: RELEASE.2024-04-18T16-45-29Z - pullPolicy: IfNotPresent +## @param versions MinIO versions configuration +## Array of versions with specific image tags and service versions +versions: + - version: "2024.6.29" + tag: "RELEASE.2024-06-29T01-20-47Z" + serviceVersion: "2024.6.29" + - version: "2025.10.15" + tag: "RELEASE.2025-10-15T17-29-55Z" + serviceVersion: "2025.10.15" + isDefault: true ## Internal port number for MinIO S3 API container ## Change service.port to change external port number