Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 6.0.4 #2329

Merged
merged 3 commits into from
Oct 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ for [kustomize](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/kusto
use that to install MiniO Operator.

```sh
kubectl kustomize github.com/minio/operator\?ref=v6.0.3 | kubectl apply -f -
kubectl kustomize github.com/minio/operator\?ref=v6.0.4 | kubectl apply -f -
```

Run the following command to verify the status of the Operator:
Expand Down
6 changes: 3 additions & 3 deletions docs/job_crd.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-17T01-24-54Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-08-16T14-39-28Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-17T01-24-54Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]


[id="{anchor_prefix}-job-min-io-v1alpha1"]
Expand Down
4 changes: 2 additions & 2 deletions docs/minio-job.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ kind: MinIOJob
metadata:
name: minio-test-job
spec:
# mcImage: quay.io/minio/mc:latest
# mcImage: quay.io/minio/mc:RELEASE.2024-10-02T08-27-28Z
serviceAccountName: mc-job-sa
securityContext: {}
containerSecurityContext: {}
Expand Down Expand Up @@ -133,7 +133,7 @@ spec:
```
The MinioJob is a Kubernetes Job that runs mc commands. It uses the MinIO client (mc) to interact with the MinIO server.
## mcImage
Optional, defaults to `quay.io/minio/mc:latest`
Optional, defaults to `quay.io/minio/mc:RELEASE.2024-10-02T08-27-28Z`
The `mcImage` field specifies the Docker image that will be used to run the mc commands.
## serviceAccountName
The `serviceAccountName` field specifies the name of the Kubernetes ServiceAccount that will be used to run the mc commands. In this case, the ServiceAccount is `mc-job-sa`.
Expand Down
6 changes: 3 additions & 3 deletions docs/policybinding_crd.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-17T01-24-54Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-08-16T14-39-28Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-17T01-24-54Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]


[id="{anchor_prefix}-sts-min-io-v1beta1"]
Expand Down
6 changes: 3 additions & 3 deletions docs/templates/asciidoctor/gv_list.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-17T01-24-54Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-08-16T14-39-28Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-17T01-24-54Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]

{{ range $groupVersions }}
{{ template "gvDetails" . }}
Expand Down
6 changes: 3 additions & 3 deletions docs/tenant_crd.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
[id="{p}-api-reference"]
== API Reference

:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-08-17T01-24-54Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-08-16T14-39-28Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-17T01-24-54Z]
:minio-image: https://hub.docker.com/r/minio/minio/tags[minio/minio:RELEASE.2024-10-02T17-50-41Z]
:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-09-11T07-22-50Z]
:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-10-02T08-27-28Z]


[id="{anchor_prefix}-minio-min-io-v2"]
Expand Down
2 changes: 1 addition & 1 deletion examples/kustomization/base/tenant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ spec:
## https://github.com/minio/minio/tree/master/docs/tls/kubernetes#2-create-kubernetes-secret
externalClientCertSecrets: [ ]
## Registry location and Tag to download MinIO Server image
image: quay.io/minio/minio:RELEASE.2024-08-17T01-24-54Z
image: quay.io/minio/minio:RELEASE.2024-10-02T17-50-41Z
imagePullSecret: { }
## Mount path where PV will be mounted inside container(s).
mountPath: /export
Expand Down
2 changes: 1 addition & 1 deletion examples/kustomization/tenant-certmanager-kes/tenant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
externalCertSecret:
name: tenant-certmanager-2-tls
type: cert-manager.io/v1
image: minio/kes:2024-08-16T14-39-28Z
image: minio/kes:2024-09-11T07-22-50Z
imagePullPolicy: IfNotPresent
kesSecret:
name: kes-configuration
Expand Down
2 changes: 1 addition & 1 deletion examples/kustomization/tenant-kes-encryption/tenant.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ spec:
## Define configuration for KES (stateless and distributed key-management system)
## Refer https://github.com/minio/kes
kes:
image: "" # minio/kes:2024-08-16T14-39-28Z
image: "" # minio/kes:2024-09-11T07-22-50Z
env: [ ]
replicas: 2
kesSecret:
Expand Down
4 changes: 2 additions & 2 deletions helm/operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
description: A Helm chart for MinIO Operator
name: operator
version: 6.0.3
appVersion: v6.0.3
version: 6.0.4
appVersion: v6.0.4
keywords:
- storage
- object-storage
Expand Down
4 changes: 2 additions & 2 deletions helm/operator/templates/job.min.io_jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v6.0.3
operator.min.io/version: v6.0.4
name: miniojobs.job.min.io
spec:
group: job.min.io
Expand Down Expand Up @@ -1082,7 +1082,7 @@ spec:
insecure:
type: boolean
mcImage:
default: quay.io/minio/mc:RELEASE.2024-08-17T11-33-50Z
default: quay.io/minio/mc:RELEASE.2024-10-02T08-27-28Z
type: string
securityContext:
properties:
Expand Down
2 changes: 1 addition & 1 deletion helm/operator/templates/minio.min.io_tenants.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v6.0.3
operator.min.io/version: v6.0.4
name: tenants.minio.min.io
spec:
group: minio.min.io
Expand Down
2 changes: 1 addition & 1 deletion helm/operator/templates/sts.min.io_policybindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v6.0.3
operator.min.io/version: v6.0.4
name: policybindings.sts.min.io
spec:
group: sts.min.io
Expand Down
10 changes: 5 additions & 5 deletions helm/operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ operator:
###
# Specify the Operator container image to use for the deployment.
# ``image.tag``
# For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.3 tag.
# For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.4 tag.
# The container pulls the image if not already present:
#
# .. code-block:: yaml
#
# image:
# repository: quay.io/minio/operator
# tag: v6.0.3
# tag: v6.0.4
# pullPolicy: IfNotPresent
#
# The chart also supports specifying an image based on digest value:
Expand All @@ -49,20 +49,20 @@ operator:
#
image:
repository: quay.io/minio/operator
tag: v6.0.3
tag: v6.0.4
pullPolicy: IfNotPresent
###
# Specify the sidecar container image to deploy on tenant pods for init container and sidecar.
# Only need to change this if want to use a different version that the default, or want to set a custom registry.
# ``sidecarImage.tag``
# For example, the following sets the image to the ``quay.io/minio/operator-sidecar`` repo and the v6.0.3 tag.
# For example, the following sets the image to the ``quay.io/minio/operator-sidecar`` repo and the v6.0.4 tag.
# The container pulls the image if not already present:
#
# .. code-block:: yaml
#
# sidecarImage:
# repository: quay.io/minio/operator-sidecar
# tag: v6.0.3
# tag: v6.0.4
# pullPolicy: IfNotPresent
#
# The chart also supports specifying an image based on digest value:
Expand Down
4 changes: 2 additions & 2 deletions helm/tenant/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: v2
description: A Helm chart for MinIO Operator
name: tenant
version: 6.0.3
appVersion: v6.0.3
version: 6.0.4
appVersion: v6.0.4
keywords:
- storage
- object-storage
Expand Down
10 changes: 5 additions & 5 deletions helm/tenant/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ tenant:
###
# Specify the Operator container image to use for the deployment.
# ``image.tag``
# For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.3 tag.
# For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.4 tag.
# The container pulls the image if not already present:
#
# .. code-block:: yaml
#
# image:
# repository: quay.io/minio/minio
# tag: RELEASE.2024-08-17T01-24-54Z
# tag: RELEASE.2024-10-02T17-50-41Z
# pullPolicy: IfNotPresent
#
# The chart also supports specifying an image based on digest value:
Expand All @@ -30,7 +30,7 @@ tenant:
#
image:
repository: quay.io/minio/minio
tag: RELEASE.2024-08-17T01-24-54Z
tag: RELEASE.2024-10-02T17-50-41Z
pullPolicy: IfNotPresent
###
#
Expand Down Expand Up @@ -349,14 +349,14 @@ tenant:
# # Image from tag (original behavior), for example:
# # image:
# # repository: quay.io/minio/kes
# # tag: 2024-08-16T14-39-28Z
# # tag: 2024-09-11T07-22-50Z
# # Image from digest (added after original behavior), for example:
# # image:
# # repository: quay.io/minio/kes@sha256
# # digest: fb15af611149892f357a8a99d1bcd8bf5dae713bd64c15e6eb27fbdb88fc208b
# image:
# repository: quay.io/minio/kes
# tag: 2024-08-16T14-39-28Z
# tag: 2024-09-11T07-22-50Z
# pullPolicy: IfNotPresent
# env: [ ]
# replicas: 2
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/job.min.io/v1alpha1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const (
// +kubebuilder:resource:scope=Namespaced,shortName=miniojob,singular=miniojob
// +kubebuilder:printcolumn:name="Phase",type=string,JSONPath=`.status.phase`
// +kubebuilder:printcolumn:name="Message",type=string,JSONPath=`.status.message`
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.4

// MinIOJob is a top-level type. A client is created for it
type MinIOJob struct {
Expand Down Expand Up @@ -100,7 +100,7 @@ type MinIOJobSpec struct {

// The Docker image to use when deploying `mc` pods. Defaults to {mc-image}. +
// +optional
// +kubebuilder:default="quay.io/minio/mc:RELEASE.2024-08-17T11-33-50Z"
// +kubebuilder:default="quay.io/minio/mc:RELEASE.2024-10-02T08-27-28Z"
MCImage string `json:"mcImage,omitempty"`

// *Optional* +
Expand Down
5 changes: 5 additions & 0 deletions pkg/apis/job.min.io/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions pkg/apis/minio.min.io/v2/constants.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ const MinIOVolumeMountPath = "/export"
const MinIOVolumeSubPath = ""

// DefaultMinIOImage specifies the default MinIO Docker hub image
const DefaultMinIOImage = "minio/minio:RELEASE.2024-08-17T01-24-54Z"
const DefaultMinIOImage = "minio/minio:RELEASE.2024-10-02T17-50-41Z"

// DefaultMinIOUpdateURL specifies the default MinIO URL where binaries are
// pulled from during MinIO upgrades
Expand Down Expand Up @@ -134,8 +134,8 @@ const ConsoleAdminPolicyName = "consoleAdmin"

// KES Related Constants

// DefaultKESImage specifies the 2024-08-16T14-39-28Z KES Docker hub image
const DefaultKESImage = "minio/kes:2024-08-16T14-39-28Z"
// DefaultKESImage specifies the 2024-09-11T07-22-50Z KES Docker hub image
const DefaultKESImage = "minio/kes:2024-09-11T07-22-50Z"

// KESInstanceLabel is applied to the KES pods of a Tenant cluster
const KESInstanceLabel = "v1.min.io/kes"
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/minio.min.io/v2/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.currentState"
// +kubebuilder:printcolumn:name="Health",type="string",JSONPath=".status.healthStatus"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.4
// +kubebuilder:storageversion
type Tenant struct {
metav1.TypeMeta `json:",inline"`
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/sts.min.io/v1beta1/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
// +kubebuilder:resource:scope=Namespaced,shortName=policybinding,singular=policybinding
// +kubebuilder:printcolumn:name="State",type="string",JSONPath=".status.currentState"
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.4
// +kubebuilder:storageversion
// +groupName=policybinding.sts.min.io
// +versionName=v1beta1
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/utils/miniojob/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (

const (
// DefaultMCImage - job mc image
DefaultMCImage = "quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z"
DefaultMCImage = "quay.io/minio/mc:RELEASE.2024-10-02T08-27-28Z"
// MinioJobName - job name
MinioJobName = "job.min.io/job-name"
// MinioJobCRName - job cr name
Expand Down
13 changes: 8 additions & 5 deletions release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ MINIO_RELEASE=$(get_latest_release minio/minio)
KES_RELEASE=$(get_latest_release minio/kes)
MC_RELEASE=$(get_latest_release minio/mc)

MINIO_CURRENT_RELEASE=$(sed -nr 's/.*(minio\/minio\:)([v]?.*)"/\2/p' pkg/apis/minio.min.io/v2/constants.go)
KES_CURRENT_RELEASE=$(sed -nr 's/.*(minio\/kes\:)([v]?.*)"/\2/p' pkg/apis/minio.min.io/v2/constants.go)

MC_CURRENT_RELEASE=$(sed -nr 's/.*(minio\/mc\:)([v]?.*)"/\2/p' pkg/utils/miniojob/types.go)

files=(
Expand All @@ -35,6 +35,7 @@ files=(
"docs/tenant_crd.adoc"
"docs/policybinding_crd.adoc"
"docs/job_crd.adoc"
"docs/minio-job.md"
"docs/templates/asciidoctor/gv_list.tpl"
"examples/kustomization/base/tenant.yaml"
"examples/kustomization/tenant-certmanager-kes/tenant.yaml"
Expand All @@ -47,25 +48,27 @@ files=(
"pkg/controller/operator.go"
"resources/base/deployment.yaml"
"testing/console-tenant+kes.sh"
"pkg/utils/miniojob/types.go"
)

CURRENT_RELEASE=$(get_latest_release minio/operator)
CURRENT_RELEASE="${CURRENT_RELEASE:1}"

echo "MinIO: $MINIO_RELEASE"
echo "Upgrade: $CURRENT_RELEASE => $RELEASE"
echo "MinIO: $MINIO_RELEASE => $MINIO_RELEASE"
echo "KES: $KES_CURRENT_RELEASE => $KES_RELEASE"
echo "MC: $MC_CURRENT_RELEASE => $MC_RELEASE"

if [ -z "$MINIO_RELEASE" ]; then
echo "\$MINIO_RELEASE is empty"
exit 0
fi

for file in "${files[@]}"; do
sed -i -e "s/${KES_CURRENT_RELEASE}/${KES_RELEASE}/g" "$file"
sed -i -e "s/${MC_CURRENT_RELEASE}/${MC_RELEASE}/g" "$file"
sed -i -e "s/${CURRENT_RELEASE}/${RELEASE}/g" "$file"
sed -i -e "s/RELEASE\.[0-9][0-9][0-9][0-9]-[0-9][0-9]-[0-9][0-9]T[0-9][0-9]-[0-9][0-9]-[0-9][0-9]Z/${MINIO_RELEASE}/g" "$file"
sed -i -e "s/${KES_CURRENT_RELEASE}/${KES_RELEASE}/g" "$file"
sed -i -e "s/${MC_CURRENT_RELEASE}/${MC_RELEASE}/g" "$file"
sed -i -e "s/${MINIO_CURRENT_RELEASE}/${MINIO_RELEASE}/g" "$file"
done

annotations_files=(
Expand Down
Loading
Loading