Skip to content

Commit

Permalink
Release v6.0.3 (#2289)
Browse files Browse the repository at this point in the history
Signed-off-by: pjuarezd <pjuarezd@users.noreply.github.com>
  • Loading branch information
pjuarezd committed Aug 26, 2024
1 parent 3f1a37b commit 4624a08
Show file tree
Hide file tree
Showing 25 changed files with 48 additions and 48 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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-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"]
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-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"]
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-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" . }}
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-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"]
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-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
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-06-17T15-47-05Z
image: minio/kes:2024-08-16T14-39-28Z
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-06-17T15-47-05Z
image: "" # minio/kes:2024-08-16T14-39-28Z
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.2
appVersion: v6.0.2
version: 6.0.3
appVersion: v6.0.3
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.2
operator.min.io/version: v6.0.3
name: miniojobs.job.min.io
spec:
group: job.min.io
Expand Down Expand Up @@ -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:
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.2
operator.min.io/version: v6.0.3
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.2
operator.min.io/version: v5.0.15
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 @@ -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:
Expand All @@ -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:
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.2
appVersion: v6.0.2
version: 6.0.3
appVersion: v6.0.3
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.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:
Expand All @@ -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
###
#
Expand Down Expand Up @@ -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
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.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 {
Expand Down Expand Up @@ -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* +
Expand Down
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-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
Expand Down Expand Up @@ -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"
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.2
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3
// +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.2
// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.3
// +kubebuilder:storageversion
// +groupName=policybinding.sts.min.io
// +versionName=v1beta1
Expand Down
4 changes: 2 additions & 2 deletions resources/base/crds/job.min.io_miniojobs.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.2
operator.min.io/version: v6.0.3
name: miniojobs.job.min.io
spec:
group: job.min.io
Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion resources/base/crds/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.2
operator.min.io/version: v6.0.3
name: tenants.minio.min.io
spec:
group: minio.min.io
Expand Down
2 changes: 1 addition & 1 deletion resources/base/crds/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.2
operator.min.io/version: v5.0.15
name: policybindings.sts.min.io
spec:
group: sts.min.io
Expand Down
2 changes: 1 addition & 1 deletion resources/base/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion resources/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion testing/console-tenant+kes.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down

0 comments on commit 4624a08

Please sign in to comment.