Release 6.0.4 (#2329)

* Update release.sh * Match specific project version to replace (mc, kes, minio) * Set new mc version in pkg/utils/miniojob/types.go
minio · Oct 7, 2024 · c5b838c · c5b838c
1 parent b37ed12
commit c5b838c
Show file tree

Hide file tree

Showing 30 changed files with 73 additions and 56 deletions.
diff --git a/README.md b/README.md
@@ -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:

diff --git a/docs/job_crd.adoc b/docs/job_crd.adoc
@@ -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"]

diff --git a/docs/minio-job.md b/docs/minio-job.md
@@ -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: {}
@@ -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`.

diff --git a/docs/policybinding_crd.adoc b/docs/policybinding_crd.adoc
@@ -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"]

diff --git a/docs/templates/asciidoctor/gv_list.tpl b/docs/templates/asciidoctor/gv_list.tpl
@@ -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" . }}

diff --git a/docs/tenant_crd.adoc b/docs/tenant_crd.adoc
@@ -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"]

diff --git a/examples/kustomization/base/tenant.yaml b/examples/kustomization/base/tenant.yaml
@@ -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

diff --git a/examples/kustomization/tenant-certmanager-kes/tenant.yaml b/examples/kustomization/tenant-certmanager-kes/tenant.yaml
@@ -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

diff --git a/examples/kustomization/tenant-kes-encryption/tenant.yaml b/examples/kustomization/tenant-kes-encryption/tenant.yaml
@@ -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:

diff --git a/helm/operator/Chart.yaml b/helm/operator/Chart.yaml
@@ -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

diff --git a/helm/operator/templates/job.min.io_jobs.yaml b/helm/operator/templates/job.min.io_jobs.yaml
@@ -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
@@ -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:

diff --git a/helm/operator/templates/minio.min.io_tenants.yaml b/helm/operator/templates/minio.min.io_tenants.yaml
@@ -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

diff --git a/helm/operator/templates/sts.min.io_policybindings.yaml b/helm/operator/templates/sts.min.io_policybindings.yaml
@@ -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

diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml
@@ -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:
@@ -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:

diff --git a/helm/tenant/Chart.yaml b/helm/tenant/Chart.yaml
@@ -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

diff --git a/helm/tenant/values.yaml b/helm/tenant/values.yaml
@@ -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:
@@ -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
   ###
   #
@@ -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

diff --git a/pkg/apis/job.min.io/v1alpha1/types.go b/pkg/apis/job.min.io/v1alpha1/types.go
@@ -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 {
@@ -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* +

diff --git a/pkg/apis/job.min.io/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/job.min.io/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/minio.min.io/v2/constants.go b/pkg/apis/minio.min.io/v2/constants.go
@@ -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
@@ -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"

diff --git a/pkg/apis/minio.min.io/v2/types.go b/pkg/apis/minio.min.io/v2/types.go
@@ -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"`

diff --git a/pkg/apis/sts.min.io/v1beta1/types.go b/pkg/apis/sts.min.io/v1beta1/types.go
@@ -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

diff --git a/pkg/client/applyconfiguration/job.min.io/v1alpha1/miniojobspec.go b/pkg/client/applyconfiguration/job.min.io/v1alpha1/miniojobspec.go
diff --git a/pkg/utils/miniojob/types.go b/pkg/utils/miniojob/types.go
@@ -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

diff --git a/release.sh b/release.sh
@@ -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=(
@@ -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"
@@ -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=(