Skip to content

Commit 2581b25

Browse files
author
jiuker
committed
Merge branch 'master' into feat-support-metrics-scrope
# Conflicts: # go.mod # go.sum # helm/operator/templates/minio.min.io_tenants.yaml # helm/operator/templates/sts.min.io_policybindings.yaml # resources/base/crds/minio.min.io_tenants.yaml # resources/base/crds/sts.min.io_policybindings.yaml
2 parents 337badb + dc1bcb3 commit 2581b25

File tree

36 files changed

+6163
-14271
lines changed

36 files changed

+6163
-14271
lines changed

.github/workflows/kubernetes-tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ jobs:
479479
# Runs a set of commands using the runners shell
480480
- name: Deploy a MinIO Tenant on Kind
481481
run: |
482-
curl -sLO "https://dl.k8s.io/release/v1.28.12/bin/linux/amd64/kubectl" -o kubectl
482+
curl -sLO "https://dl.k8s.io/release/v1.29.10/bin/linux/amd64/kubectl" -o kubectl
483483
chmod +x kubectl
484484
mv kubectl /usr/local/bin
485485
"${GITHUB_WORKSPACE}/testing/check-helm.sh"
@@ -518,7 +518,7 @@ jobs:
518518
env:
519519
TEST_FLOOR: true
520520
run: |
521-
curl -sLO "https://dl.k8s.io/release/v1.28.12/bin/linux/amd64/kubectl" -o kubectl
521+
curl -sLO "https://dl.k8s.io/release/v1.29.10/bin/linux/amd64/kubectl" -o kubectl
522522
chmod +x kubectl
523523
mv kubectl /usr/local/bin
524524
"${GITHUB_WORKSPACE}/testing/check-helm.sh"

CREDITS

Lines changed: 5780 additions & 13974 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,10 @@ a Kubernetes cluster.
3636

3737
## Prerequisites
3838

39-
### Kubernetes 1.28.0 or Later
39+
### Kubernetes 1.29.0 or Later
4040

41-
Starting with Operator v6.0.0, MinIO requires Kubernetes version 1.28.0 or later. You must upgrade your Kubernetes
42-
cluster to 1.28.0 or later to use Operator
43-
v6.0.0+.
41+
Starting with Operator v7.0.0, MinIO requires Kubernetes version 1.29.0 or later. You must upgrade your Kubernetes
42+
cluster to 1.29.0 or later to use Operator v7.0.0+.
4443

4544
This procedure assumes the host machine has [`kubectl`](https://kubernetes.io/docs/tasks/tools) installed and configured
4645
with access to the target Kubernetes cluster.
@@ -141,7 +140,7 @@ for [kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kusto
141140
use that to install MiniO Operator.
142141

143142
```sh
144-
kubectl kustomize github.com/minio/operator\?ref=v6.0.4 | kubectl apply -f -
143+
kubectl kustomize github.com/minio/operator\?ref=v7.0.0 | kubectl apply -f -
145144
```
146145

147146
Run the following command to verify the status of the Operator:

cmd/operator/controller.go

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@
1515
package main
1616

1717
import (
18+
"flag"
19+
"strconv"
20+
1821
"github.com/minio/cli"
1922
"github.com/minio/operator/pkg/controller"
2023
)
@@ -30,9 +33,17 @@ var controllerCmd = cli.Command{
3033
Name: "kubeconfig",
3134
Usage: "Load configuration from `KUBECONFIG`",
3235
},
36+
cli.IntFlag{
37+
Name: "v",
38+
Usage: "logging level",
39+
},
3340
},
3441
}
3542

3643
func startController(ctx *cli.Context) {
44+
if ctx.Int("v") > 0 {
45+
flag.Set("v", strconv.Itoa(ctx.Int("v")))
46+
flag.Parse()
47+
}
3748
controller.StartOperator(ctx.String("kubeconfig"))
3849
}

docs/notes/v7.0.0.md

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# MinIO Operator v7.0.0 release notes
2+
3+
## About this release
4+
5+
MinIO Operator is the recommended production-ready way to manage MinIO deployments in Kubernetes. This version includes a new base version requirements, deprecations, bugfixes and more.
6+
7+
## What’s new?
8+
9+
Operator 7.0.0 is now available. This release requires Kubernetes version 1.29.0 or later.
10+
If your cluster does not use Kubernetes version 1.29.0 or later, you must upgrade your cluster to before installing or upgrading to Operator v7.0.0+.
11+
12+
Some breaking changes motivates a major release, here is the list of breaking changes:
13+
14+
* remove minioJob
15+
* remove Pod Distribution Budget (PDB)
16+
17+
Additionally several bugfixes are included in this version:
18+
19+
* Add storageLabels value to tenant chart in https://github.com/minio/operator/pull/2335
20+
* Allow custom (non-propagating) stateful set metadata in https://github.com/minio/operator/pull/2337
21+
* feat:add portName to container in https://github.com/minio/operator/pull/2347
22+
* fix: incorrect error log `Waiting for MinIO to be ready: %!s(<nil>)` in https://github.com/minio/operator/pull/2345
23+
* Fix base example url in https://github.com/minio/operator/pull/2349
24+
* Fix storageClassName references in tenant.pool.volumeClaimtemplates in https://github.com/minio/operator/pull/2362
25+
* Add initContainers to tenant Helm Chart in https://github.com/minio/operator/pull/2366

docs/policybinding_crd.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[id="{p}-api-reference"]
55
== API Reference
66

7-
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
8-
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
7+
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-11-07T00-52-20Z]
8+
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-11-25T13-44-31Z]
99
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]
1010

1111

docs/templates/asciidoctor/gv_list.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
[id="{p}-api-reference"]
88
== API Reference
99

10-
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
11-
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
10+
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-11-07T00-52-20Z]
11+
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-11-25T13-44-31Z]
1212
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]
1313

1414
{{ range $groupVersions }}

docs/tenant_crd.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
[id="{p}-api-reference"]
55
== API Reference
66

7-
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
8-
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
7+
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-11-07T00-52-20Z]
8+
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-11-25T13-44-31Z]
99
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]
1010

1111

examples/kustomization/base/tenant.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ spec:
144144
## https://github.com/minio/minio/tree/master/docs/tls/kubernetes#2-create-kubernetes-secret
145145
externalClientCertSecrets: [ ]
146146
## Registry location and Tag to download MinIO Server image
147-
image: quay.io/minio/minio:RELEASE.2024-10-02T17-50-41Z
147+
image: quay.io/minio/minio:RELEASE.2024-11-07T00-52-20Z
148148
imagePullSecret: { }
149149
## Mount path where PV will be mounted inside container(s).
150150
mountPath: /export

examples/kustomization/tenant-certmanager-kes/tenant.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ spec:
1414
externalCertSecret:
1515
name: tenant-certmanager-2-tls
1616
type: cert-manager.io/v1
17-
image: minio/kes:2024-09-11T07-22-50Z
17+
image: minio/kes:2024-11-25T13-44-31Z
1818
imagePullPolicy: IfNotPresent
1919
kesSecret:
2020
name: kes-configuration

0 commit comments

Comments
 (0)