From c5b838c475609921935bd4f335fdbc4b6846be14 Mon Sep 17 00:00:00 2001 From: Pedro Juarez Date: Mon, 7 Oct 2024 10:58:05 -0700 Subject: [PATCH] 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 --- README.md | 2 +- docs/job_crd.adoc | 6 +++--- docs/minio-job.md | 4 ++-- docs/policybinding_crd.adoc | 6 +++--- docs/templates/asciidoctor/gv_list.tpl | 6 +++--- docs/tenant_crd.adoc | 6 +++--- examples/kustomization/base/tenant.yaml | 2 +- .../tenant-certmanager-kes/tenant.yaml | 2 +- .../kustomization/tenant-kes-encryption/tenant.yaml | 2 +- helm/operator/Chart.yaml | 4 ++-- helm/operator/templates/job.min.io_jobs.yaml | 4 ++-- helm/operator/templates/minio.min.io_tenants.yaml | 2 +- .../templates/sts.min.io_policybindings.yaml | 2 +- helm/operator/values.yaml | 10 +++++----- helm/tenant/Chart.yaml | 4 ++-- helm/tenant/values.yaml | 10 +++++----- pkg/apis/job.min.io/v1alpha1/types.go | 4 ++-- .../job.min.io/v1alpha1/zz_generated.deepcopy.go | 5 +++++ pkg/apis/minio.min.io/v2/constants.go | 6 +++--- pkg/apis/minio.min.io/v2/types.go | 2 +- pkg/apis/sts.min.io/v1beta1/types.go | 2 +- .../job.min.io/v1alpha1/miniojobspec.go | 9 +++++++++ pkg/utils/miniojob/types.go | 2 +- release.sh | 13 ++++++++----- resources/base/crds/job.min.io_miniojobs.yaml | 4 ++-- resources/base/crds/minio.min.io_tenants.yaml | 2 +- resources/base/crds/sts.min.io_policybindings.yaml | 2 +- resources/base/deployment.yaml | 2 +- resources/kustomization.yaml | 2 +- testing/console-tenant+kes.sh | 2 +- 30 files changed, 73 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index 6f89a66fe95..a318855cee8 100644 --- 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 index c296987541c..0f1a0b7cfcb 100644 --- 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 index cbae1896758..f8931b8a17c 100644 --- 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 index c4dfe76fd63..7d0655b3f67 100644 --- 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 index c368351703b..7a849bfb9dc 100644 --- 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 index 7fd269b8bb6..1359765e8cf 100644 --- 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 index 3843a59ab3d..80198d275a1 100644 --- 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 index bacd4dcb6f1..a3d019868cb 100644 --- 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 index 9c745301968..109e883c121 100644 --- 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 index 6c881b70066..98f4b2eb643 100644 --- 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 index c0fdc3ca210..64f9bafe2e5 100644 --- 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 index b55a9f736bd..d4a1f9fc5e4 100644 --- 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 index 10db901028c..c1a3ac2446b 100644 --- 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 index 169e6e11975..a86506cf552 100644 --- 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 index 770b9f82a7b..49d5d12b045 100644 --- 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 index f5946c662b7..62ad7d0d838 100644 --- 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 index 0046c0865b2..08ea2da170b 100644 --- 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 index 02d9e9bb18a..a8c7e5f0f95 100644 --- a/pkg/apis/job.min.io/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/job.min.io/v1alpha1/zz_generated.deepcopy.go @@ -169,6 +169,11 @@ func (in *MinIOJobList) DeepCopyObject() runtime.Object { func (in *MinIOJobSpec) DeepCopyInto(out *MinIOJobSpec) { *out = *in out.TenantRef = in.TenantRef + if in.Insecure != nil { + in, out := &in.Insecure, &out.Insecure + *out = new(bool) + **out = **in + } if in.Commands != nil { in, out := &in.Commands, &out.Commands *out = make([]CommandSpec, len(*in)) diff --git a/pkg/apis/minio.min.io/v2/constants.go b/pkg/apis/minio.min.io/v2/constants.go index 986cc0639cd..61463b31b01 100644 --- 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 index fd03c608b88..9aade94a34f 100644 --- 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 index 6a0b1d62712..3d64b83cf64 100644 --- 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 index f1a15605888..292bc8880ee 100644 --- a/pkg/client/applyconfiguration/job.min.io/v1alpha1/miniojobspec.go +++ b/pkg/client/applyconfiguration/job.min.io/v1alpha1/miniojobspec.go @@ -30,6 +30,7 @@ type MinIOJobSpecApplyConfiguration struct { TenantRef *TenantRefApplyConfiguration `json:"tenant,omitempty"` Execution *jobminiov1alpha1.Execution `json:"execution,omitempty"` FailureStrategy *jobminiov1alpha1.FailureStrategy `json:"failureStrategy,omitempty"` + Insecure *bool `json:"insecure,omitempty"` Commands []CommandSpecApplyConfiguration `json:"commands,omitempty"` MCImage *string `json:"mcImage,omitempty"` ImagePullPolicy *v1.PullPolicy `json:"imagePullPolicy,omitempty"` @@ -76,6 +77,14 @@ func (b *MinIOJobSpecApplyConfiguration) WithFailureStrategy(value jobminiov1alp return b } +// WithInsecure sets the Insecure field in the declarative configuration to the given value +// and returns the receiver, so that objects can be built by chaining "With" function invocations. +// If called multiple times, the Insecure field is set to the value of the last call. +func (b *MinIOJobSpecApplyConfiguration) WithInsecure(value bool) *MinIOJobSpecApplyConfiguration { + b.Insecure = &value + return b +} + // WithCommands adds the given value to the Commands field in the declarative configuration // and returns the receiver, so that objects can be build by chaining "With" function invocations. // If called multiple times, values provided by each call will be appended to the Commands field. diff --git a/pkg/utils/miniojob/types.go b/pkg/utils/miniojob/types.go index fdce2472b59..31c7ef936d5 100644 --- 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 index 49fdd95e694..0c60ce45f02 100755 --- 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,14 +48,16 @@ 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" @@ -62,10 +65,10 @@ if [ -z "$MINIO_RELEASE" ]; then 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=( diff --git a/resources/base/crds/job.min.io_miniojobs.yaml b/resources/base/crds/job.min.io_miniojobs.yaml index c0fdc3ca210..64f9bafe2e5 100644 --- a/resources/base/crds/job.min.io_miniojobs.yaml +++ b/resources/base/crds/job.min.io_miniojobs.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/resources/base/crds/minio.min.io_tenants.yaml b/resources/base/crds/minio.min.io_tenants.yaml index b55a9f736bd..d4a1f9fc5e4 100644 --- a/resources/base/crds/minio.min.io_tenants.yaml +++ b/resources/base/crds/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/resources/base/crds/sts.min.io_policybindings.yaml b/resources/base/crds/sts.min.io_policybindings.yaml index 10db901028c..c1a3ac2446b 100644 --- a/resources/base/crds/sts.min.io_policybindings.yaml +++ b/resources/base/crds/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/resources/base/deployment.yaml b/resources/base/deployment.yaml index 9d1988ce5da..1beac815e95 100644 --- a/resources/base/deployment.yaml +++ b/resources/base/deployment.yaml @@ -23,7 +23,7 @@ spec: serviceAccountName: minio-operator containers: - name: minio-operator - image: minio/operator:v6.0.3 + image: minio/operator:v6.0.4 imagePullPolicy: IfNotPresent args: - controller diff --git a/resources/kustomization.yaml b/resources/kustomization.yaml index bd48fc4326c..8a3328ff7fb 100644 --- a/resources/kustomization.yaml +++ b/resources/kustomization.yaml @@ -5,7 +5,7 @@ commonAnnotations: operator.min.io/authors: "MinIO, Inc." operator.min.io/license: "AGPLv3" operator.min.io/support: "https://subnet.min.io" - operator.min.io/version: v6.0.3 + operator.min.io/version: v6.0.4 commonLabels: app.kubernetes.io/name: operator resources: diff --git a/testing/console-tenant+kes.sh b/testing/console-tenant+kes.sh index 089ea744cac..2392d4df652 100755 --- a/testing/console-tenant+kes.sh +++ b/testing/console-tenant+kes.sh @@ -97,7 +97,7 @@ function test_kes_tenant() { sed -i -e 's/ROLE_ID/'"$ROLE_ID"'/g' "${SCRIPT_DIR}/kes-config.yaml" sed -i -e 's/SECRET_ID/'"$SECRET_ID"'/g' "${SCRIPT_DIR}/kes-config.yaml" cp "${SCRIPT_DIR}/kes-config.yaml" "${SCRIPT_DIR}/../examples/kustomization/tenant-kes-encryption/kes-configuration-secret.yaml" - yq e -i '.spec.kes.image = "minio/kes:2024-08-16T14-39-28Z"' "${SCRIPT_DIR}/../examples/kustomization/tenant-kes-encryption/tenant.yaml" + yq e -i '.spec.kes.image = "minio/kes:2024-09-11T07-22-50Z"' "${SCRIPT_DIR}/../examples/kustomization/tenant-kes-encryption/tenant.yaml" kubectl apply -k "${SCRIPT_DIR}/../examples/kustomization/tenant-kes-encryption" echo "Check Tenant Status in tenant-kms-encrypted namespace for myminio:"