diff --git a/README.md b/README.md index a3e7bccb77f..324b9b1bf5a 100644 --- a/README.md +++ b/README.md @@ -142,7 +142,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.2 +kubectl kustomize github.com/minio/operator\?ref=v6.0.3 ``` Run the following command to verify the status of the Operator: diff --git a/docs/job_crd.adoc b/docs/job_crd.adoc index ca8e323fc6c..3ca5478a102 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-03T04-33-23Z] -:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z] -:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] +: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] [id="{anchor_prefix}-job-min-io-v1alpha1"] diff --git a/docs/policybinding_crd.adoc b/docs/policybinding_crd.adoc index d797e35a065..c4dfe76fd63 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-03T04-33-23Z] -:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z] -:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] +: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] [id="{anchor_prefix}-sts-min-io-v1beta1"] diff --git a/docs/templates/asciidoctor/gv_list.tpl b/docs/templates/asciidoctor/gv_list.tpl index bcd3afa72f3..c368351703b 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-03T04-33-23Z] -:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z] -:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] +: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] {{ range $groupVersions }} {{ template "gvDetails" . }} diff --git a/docs/tenant_crd.adoc b/docs/tenant_crd.adoc index 6dc069032a2..7fd269b8bb6 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-03T04-33-23Z] -:kes-image: https://hub.docker.com/r/minio/kes/tags[minio/kes:2024-06-17T15-47-05Z] -:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] +: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] [id="{anchor_prefix}-minio-min-io-v2"] diff --git a/examples/kustomization/base/tenant.yaml b/examples/kustomization/base/tenant.yaml index c2e15f7bddf..3843a59ab3d 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-03T04-33-23Z + image: quay.io/minio/minio:RELEASE.2024-08-17T01-24-54Z 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 245c362d4c9..bacd4dcb6f1 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-06-17T15-47-05Z + image: minio/kes:2024-08-16T14-39-28Z 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 93aa5fdac98..9c745301968 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-06-17T15-47-05Z + image: "" # minio/kes:2024-08-16T14-39-28Z env: [ ] replicas: 2 kesSecret: diff --git a/helm/operator/Chart.yaml b/helm/operator/Chart.yaml index 54bf6c6f6c8..6c881b70066 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.2 -appVersion: v6.0.2 +version: 6.0.3 +appVersion: v6.0.3 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 610956ecd6e..27f1c5e3fb0 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.2 + operator.min.io/version: v6.0.3 name: miniojobs.job.min.io spec: group: job.min.io @@ -1080,7 +1080,7 @@ spec: x-kubernetes-map-type: atomic type: array mcImage: - default: quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z + default: quay.io/minio/mc:RELEASE.2024-08-17T01-24-54Z 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 51c518e7fb3..b55a9f736bd 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.2 + operator.min.io/version: v6.0.3 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 2043ebee139..2ef71786929 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.2 + operator.min.io/version: v5.0.15 name: policybindings.sts.min.io spec: group: sts.min.io diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml index 7293e27721c..434d72e294d 100644 --- a/helm/operator/values.yaml +++ b/helm/operator/values.yaml @@ -32,14 +32,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.2 tag. + # For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.3 tag. # The container pulls the image if not already present: # # .. code-block:: yaml # # image: # repository: quay.io/minio/operator - # tag: v6.0.2 + # tag: v6.0.3 # pullPolicy: IfNotPresent # # The chart also supports specifying an image based on digest value: @@ -53,20 +53,20 @@ operator: # image: repository: quay.io/minio/operator - tag: v6.0.2 + tag: v6.0.3 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.2 tag. + # For example, the following sets the image to the ``quay.io/minio/operator-sidecar`` repo and the v6.0.3 tag. # The container pulls the image if not already present: # # .. code-block:: yaml # # sidecarImage: # repository: quay.io/minio/operator-sidecar - # tag: v6.0.2 + # tag: v6.0.3 # 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 68f69fb3c25..770b9f82a7b 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.2 -appVersion: v6.0.2 +version: 6.0.3 +appVersion: v6.0.3 keywords: - storage - object-storage diff --git a/helm/tenant/values.yaml b/helm/tenant/values.yaml index 2b72d2d11ca..d2ed263930a 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.2 tag. + # For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.3 tag. # The container pulls the image if not already present: # # .. code-block:: yaml # # image: # repository: quay.io/minio/minio - # tag: RELEASE.2024-08-03T04-33-23Z + # tag: RELEASE.2024-08-17T01-24-54Z # 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-03T04-33-23Z + tag: RELEASE.2024-08-17T01-24-54Z pullPolicy: IfNotPresent ### # @@ -347,14 +347,14 @@ tenant: # # Image from tag (original behavior), for example: # # image: # # repository: quay.io/minio/kes - # # tag: 2024-06-17T15-47-05Z + # # tag: 2024-08-16T14-39-28Z # # 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-06-17T15-47-05Z + # tag: 2024-08-16T14-39-28Z # 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 5e752f2f668..4e97765c7e4 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.2 +// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3 // MinIOJob is a top-level type. A client is created for it type MinIOJob struct { @@ -96,7 +96,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-07-31T15-58-33Z" + // +kubebuilder:default="quay.io/minio/mc:RELEASE.2024-08-17T11-33-50Z" MCImage string `json:"mcImage,omitempty"` // *Optional* + diff --git a/pkg/apis/minio.min.io/v2/constants.go b/pkg/apis/minio.min.io/v2/constants.go index 860cacefb7b..986cc0639cd 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-03T04-33-23Z" +const DefaultMinIOImage = "minio/minio:RELEASE.2024-08-17T01-24-54Z" // 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-06-17T15-47-05Z KES Docker hub image -const DefaultKESImage = "minio/kes:2024-06-17T15-47-05Z" +// DefaultKESImage specifies the 2024-08-16T14-39-28Z KES Docker hub image +const DefaultKESImage = "minio/kes:2024-08-16T14-39-28Z" // 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 50c6e0588a9..fd03c608b88 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.2 +// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3 // +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 c62a51be115..6a0b1d62712 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.2 +// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3 // +kubebuilder:storageversion // +groupName=policybinding.sts.min.io // +versionName=v1beta1 diff --git a/resources/base/crds/job.min.io_miniojobs.yaml b/resources/base/crds/job.min.io_miniojobs.yaml index 610956ecd6e..27f1c5e3fb0 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.2 + operator.min.io/version: v6.0.3 name: miniojobs.job.min.io spec: group: job.min.io @@ -1080,7 +1080,7 @@ spec: x-kubernetes-map-type: atomic type: array mcImage: - default: quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z + default: quay.io/minio/mc:RELEASE.2024-08-17T01-24-54Z 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 51c518e7fb3..b55a9f736bd 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.2 + operator.min.io/version: v6.0.3 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 2043ebee139..2ef71786929 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.2 + operator.min.io/version: v5.0.15 name: policybindings.sts.min.io spec: group: sts.min.io diff --git a/resources/base/deployment.yaml b/resources/base/deployment.yaml index b4f89eec1c7..9d1988ce5da 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.2 + image: minio/operator:v6.0.3 imagePullPolicy: IfNotPresent args: - controller diff --git a/resources/kustomization.yaml b/resources/kustomization.yaml index ae8440290af..bd48fc4326c 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.2 + operator.min.io/version: v6.0.3 commonLabels: app.kubernetes.io/name: operator resources: diff --git a/testing/console-tenant+kes.sh b/testing/console-tenant+kes.sh index 4144744d551..089ea744cac 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-06-17T15-47-05Z"' "${SCRIPT_DIR}/../examples/kustomization/tenant-kes-encryption/tenant.yaml" + yq e -i '.spec.kes.image = "minio/kes:2024-08-16T14-39-28Z"' "${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:"