diff --git a/README.md b/README.md index 889709d0674..a3e7bccb77f 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.1 +kubectl kustomize github.com/minio/operator\?ref=v6.0.2 ``` Run the following command to verify the status of the Operator: diff --git a/docs/job_crd.adoc b/docs/job_crd.adoc index 44f1c8d3652..ca8e323fc6c 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-07-16T23-46-41Z] +: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-07-16T23-46-41Z] +:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] [id="{anchor_prefix}-job-min-io-v1alpha1"] diff --git a/docs/policybinding_crd.adoc b/docs/policybinding_crd.adoc index 64f0910863d..d797e35a065 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-07-16T23-46-41Z] +: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-07-16T23-46-41Z] +:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] [id="{anchor_prefix}-sts-min-io-v1beta1"] diff --git a/docs/templates/asciidoctor/gv_list.tpl b/docs/templates/asciidoctor/gv_list.tpl index aeff635c044..bcd3afa72f3 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-07-16T23-46-41Z] +: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-07-16T23-46-41Z] +:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] {{ range $groupVersions }} {{ template "gvDetails" . }} diff --git a/docs/tenant_crd.adoc b/docs/tenant_crd.adoc index 3a15459b8f9..6dc069032a2 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-07-16T23-46-41Z] +: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-07-16T23-46-41Z] +:mc-image: https://hub.docker.com/r/minio/mc/tags[minio/mc:RELEASE.2024-08-03T04-33-23Z] [id="{anchor_prefix}-minio-min-io-v2"] @@ -1063,6 +1063,9 @@ If `requestAutoCert` is set to `false` *and* `externalCertSecret` is omitted, th See the https://min.io/docs/minio/kubernetes/upstream/operations/install-deploy-manage/deploy-minio-tenant.html#create-tenant-security-section[MinIO Operator CRD] reference for examples and more complete documentation on configuring TLS for MinIO Tenants. +|*`certExpiryAlertThreshold`* __integer__ +|CertExpiryAlertThreshold is the minimum number of days to expiry before an alert for an expiring certificate is fired. + |*`liveness`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.23/#probe-v1-core[$$Probe$$]__ |Liveness Probe for container liveness. Container will be restarted if the probe fails. diff --git a/examples/kustomization/base/tenant.yaml b/examples/kustomization/base/tenant.yaml index 4d7dea2d713..c2e15f7bddf 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-07-16T23-46-41Z + image: quay.io/minio/minio:RELEASE.2024-08-03T04-33-23Z imagePullSecret: { } ## Mount path where PV will be mounted inside container(s). mountPath: /export @@ -227,80 +227,8 @@ spec: # The minimum number of days to expiry before an alert for an expiring certificate is fired. # In the below example, if a given certificate will expire in 7 days then expiration events will only be triggered 1 day before expiry # certExpiryAlertThreshold: 1 - ## Prometheus setup for MinIO Tenant. - # prometheus: - # image: "" # defaults to quay.io/prometheus/prometheus:RELEASE.2024-07-16T23-46-41Z - # env: [ ] - # sidecarimage: "" # defaults to alpine - # initimage: "" # defaults to busybox:1.33.1 - # diskCapacityGB: 1 - # storageClassName: standard - # annotations: { } - # labels: { } - # nodeSelector: { } - # affinity: - # nodeAffinity: { } - # podAffinity: { } - # podAntiAffinity: { } - # resources: { } - # serviceAccountName: "" - # securityContext: - # runAsUser: 1000 - # runAsGroup: 1000 - # runAsNonRoot: true - # fsGroup: 1000 ## Prometheus Operator's Service Monitor for MinIO Tenant Pods. # prometheusOperator: # labels: # app: minio-sm ## Audit Logs will be deprecated soon, commenting out for now!. - ## LogSearch API setup for MinIO Tenant. - # log: - # image: "" # defaults to minio/operator:v6.0.1 - # env: [ ] - # resources: { } - # nodeSelector: { } - # affinity: - # nodeAffinity: { } - # podAffinity: { } - # podAntiAffinity: { } - # tolerations: [ ] - # annotations: { } - # labels: { } - # audit: - # diskCapacityGB: 1 - # ## Postgres setup for LogSearch API - # db: - # image: "" # defaults to library/postgres - # env: [ ] - # initimage: "" # defaults to busybox:1.33.1 - # volumeClaimTemplate: - # metadata: { } - # spec: - # storageClassName: standard - # accessModes: - # - ReadWriteOnce - # resources: - # requests: - # storage: 1Gi - # resources: { } - # nodeSelector: { } - # affinity: - # nodeAffinity: { } - # podAffinity: { } - # podAntiAffinity: { } - # tolerations: [ ] - # annotations: { } - # labels: { } - # serviceAccountName: "" - # securityContext: - # runAsUser: 999 - # runAsGroup: 999 - # runAsNonRoot: true - # fsGroup: 999 - # serviceAccountName: "" - # securityContext: - # runAsUser: 1000 - # runAsGroup: 1000 - # runAsNonRoot: true - # fsGroup: 1000 diff --git a/helm/operator/Chart.yaml b/helm/operator/Chart.yaml index 2502bf89fc8..54bf6c6f6c8 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.1 -appVersion: v6.0.1 +version: 6.0.2 +appVersion: v6.0.2 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 a5e69c1ef2f..610956ecd6e 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.1 + operator.min.io/version: v6.0.2 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-16T23-46-41Z + default: quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z 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 315c662de86..51c518e7fb3 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.1 + operator.min.io/version: v6.0.2 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 f41e8c7d585..2043ebee139 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.1 + operator.min.io/version: v6.0.2 name: policybindings.sts.min.io spec: group: sts.min.io diff --git a/helm/operator/values.yaml b/helm/operator/values.yaml index 19820eee68f..7293e27721c 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.1 tag. + # For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.2 tag. # The container pulls the image if not already present: # # .. code-block:: yaml # # image: # repository: quay.io/minio/operator - # tag: v6.0.1 + # tag: v6.0.2 # 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.1 + tag: v6.0.2 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.1 tag. + # For example, the following sets the image to the ``quay.io/minio/operator-sidecar`` repo and the v6.0.2 tag. # The container pulls the image if not already present: # # .. code-block:: yaml # # sidecarImage: # repository: quay.io/minio/operator-sidecar - # tag: v6.0.1 + # tag: v6.0.2 # 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 8e0f67cb9f3..68f69fb3c25 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.1 -appVersion: v6.0.1 +version: 6.0.2 +appVersion: v6.0.2 keywords: - storage - object-storage diff --git a/helm/tenant/values.yaml b/helm/tenant/values.yaml index a40d8e9c922..fd81ff3a0e5 100644 --- a/helm/tenant/values.yaml +++ b/helm/tenant/values.yaml @@ -1,5 +1,5 @@ ### -# WARNING: '.secrets' is deprecated since v6.0.1 and will be removed in next minor release (i.e. v5.1.0). +# WARNING: '.secrets' is deprecated since v6.0.2 and will be removed in next minor release (i.e. v5.1.0). # WARNING: Please use '.tenant.configSecret' instead. # Root key for dynamically creating a secret for use with configuring root MinIO User # Specify the ``name`` and then a list of environment variables. @@ -48,14 +48,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.1 tag. + # For example, the following sets the image to the ``quay.io/minio/operator`` repo and the v6.0.2 tag. # The container pulls the image if not already present: # # .. code-block:: yaml # # image: # repository: quay.io/minio/minio - # tag: RELEASE.2024-07-16T23-46-41Z + # tag: RELEASE.2024-08-03T04-33-23Z # pullPolicy: IfNotPresent # # The chart also supports specifying an image based on digest value: @@ -70,7 +70,7 @@ tenant: # image: repository: quay.io/minio/minio - tag: RELEASE.2024-07-16T23-46-41Z + tag: RELEASE.2024-08-03T04-33-23Z pullPolicy: IfNotPresent ### # diff --git a/pkg/apis/job.min.io/v1alpha1/types.go b/pkg/apis/job.min.io/v1alpha1/types.go index f593c536a84..5e752f2f668 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.1 +// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.2 // 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-16T23-46-41Z" + // +kubebuilder:default="quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z" 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 db10e0a99c1..860cacefb7b 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-07-16T23-46-41Z" +const DefaultMinIOImage = "minio/minio:RELEASE.2024-08-03T04-33-23Z" // DefaultMinIOUpdateURL specifies the default MinIO URL where binaries are // pulled from during MinIO upgrades @@ -134,7 +134,7 @@ const ConsoleAdminPolicyName = "consoleAdmin" // KES Related Constants -// DefaultKESImage specifies the RELEASE.2024-07-16T23-46-41Z KES Docker hub image +// DefaultKESImage specifies the 2024-06-17T15-47-05Z KES Docker hub image const DefaultKESImage = "minio/kes:2024-06-17T15-47-05Z" // KESInstanceLabel is applied to the KES pods of a Tenant cluster diff --git a/pkg/apis/minio.min.io/v2/types.go b/pkg/apis/minio.min.io/v2/types.go index d1e8b939dcf..50c6e0588a9 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.1 +// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.2 // +kubebuilder:storageversion type Tenant struct { metav1.TypeMeta `json:",inline"` diff --git a/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go b/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go index e0594920f0d..f126817ac5a 100644 --- a/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go +++ b/pkg/apis/minio.min.io/v2/zz_generated.deepcopy.go @@ -687,6 +687,11 @@ func (in *TenantSpec) DeepCopyInto(out *TenantSpec) { *out = new(bool) **out = **in } + if in.CertExpiryAlertThreshold != nil { + in, out := &in.CertExpiryAlertThreshold, &out.CertExpiryAlertThreshold + *out = new(int32) + **out = **in + } if in.Liveness != nil { in, out := &in.Liveness, &out.Liveness *out = new(v1.Probe) diff --git a/pkg/apis/sts.min.io/v1beta1/types.go b/pkg/apis/sts.min.io/v1beta1/types.go index f4645a56df3..c62a51be115 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.1 +// +kubebuilder:metadata:annotations=operator.min.io/version=v6.0.2 // +kubebuilder:storageversion // +groupName=policybinding.sts.min.io // +versionName=v1beta1 diff --git a/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go b/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go index de533712c4c..abc30b5c57d 100644 --- a/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go +++ b/pkg/client/applyconfiguration/minio.min.io/v2/tenantspec.go @@ -39,6 +39,7 @@ type TenantSpecApplyConfiguration struct { Mountpath *string `json:"mountPath,omitempty"` Subpath *string `json:"subPath,omitempty"` RequestAutoCert *bool `json:"requestAutoCert,omitempty"` + CertExpiryAlertThreshold *int32 `json:"certExpiryAlertThreshold,omitempty"` Liveness *v1.Probe `json:"liveness,omitempty"` Readiness *v1.Probe `json:"readiness,omitempty"` Startup *v1.Probe `json:"startup,omitempty"` @@ -186,6 +187,14 @@ func (b *TenantSpecApplyConfiguration) WithRequestAutoCert(value bool) *TenantSp return b } +// WithCertExpiryAlertThreshold sets the CertExpiryAlertThreshold 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 CertExpiryAlertThreshold field is set to the value of the last call. +func (b *TenantSpecApplyConfiguration) WithCertExpiryAlertThreshold(value int32) *TenantSpecApplyConfiguration { + b.CertExpiryAlertThreshold = &value + return b +} + // WithLiveness sets the Liveness 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 Liveness field is set to the value of the last call. diff --git a/pkg/utils/miniojob/types.go b/pkg/utils/miniojob/types.go index f01ce1d8183..70dd7d1a110 100644 --- a/pkg/utils/miniojob/types.go +++ b/pkg/utils/miniojob/types.go @@ -33,7 +33,7 @@ import ( const ( // DefaultMCImage - job mc image - DefaultMCImage = "quay.io/minio/mc:latest" + DefaultMCImage = "quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z" // MinioJobName - job name MinioJobName = "job.min.io/job-name" // MinioJobCRName - job cr name diff --git a/resources/base/crds/job.min.io_miniojobs.yaml b/resources/base/crds/job.min.io_miniojobs.yaml index a5e69c1ef2f..610956ecd6e 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.1 + operator.min.io/version: v6.0.2 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-16T23-46-41Z + default: quay.io/minio/mc:RELEASE.2024-07-31T15-58-33Z 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 315c662de86..51c518e7fb3 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.1 + operator.min.io/version: v6.0.2 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 f41e8c7d585..2043ebee139 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.1 + operator.min.io/version: v6.0.2 name: policybindings.sts.min.io spec: group: sts.min.io diff --git a/resources/base/deployment.yaml b/resources/base/deployment.yaml index d2478dc323e..b4f89eec1c7 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.1 + image: minio/operator:v6.0.2 imagePullPolicy: IfNotPresent args: - controller diff --git a/resources/kustomization.yaml b/resources/kustomization.yaml index a02fc8d128a..ae8440290af 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.1 + operator.min.io/version: v6.0.2 commonLabels: app.kubernetes.io/name: operator resources: diff --git a/testing/tenant-logs/kustomization.yaml b/testing/tenant-logs/kustomization.yaml deleted file mode 100644 index 320e519c7f7..00000000000 --- a/testing/tenant-logs/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- ../../examples/kustomization/tenant-lite - -patches: -- path: tenant.yaml diff --git a/testing/tenant-logs/tenant.yaml b/testing/tenant-logs/tenant.yaml deleted file mode 100644 index ec9f8bfafe7..00000000000 --- a/testing/tenant-logs/tenant.yaml +++ /dev/null @@ -1,30 +0,0 @@ -apiVersion: minio.min.io/v2 -kind: Tenant -metadata: - name: myminio - namespace: minio-tenant -spec: - log: - image: minio/operator:noop - audit: - diskCapacityGB: 1 - ## Postgres setup for LogSearch API - db: - volumeClaimTemplate: - spec: - storageClassName: standard - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 1Gi - securityContext: - runAsUser: 999 - runAsGroup: 999 - runAsNonRoot: true - fsGroup: 999 - securityContext: - runAsUser: 1000 - runAsGroup: 1000 - runAsNonRoot: true - fsGroup: 1000 diff --git a/testing/tenant-prometheus/kustomization.yaml b/testing/tenant-prometheus/kustomization.yaml deleted file mode 100644 index 320e519c7f7..00000000000 --- a/testing/tenant-prometheus/kustomization.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -resources: -- ../../examples/kustomization/tenant-lite - -patches: -- path: tenant.yaml diff --git a/testing/tenant-prometheus/tenant.yaml b/testing/tenant-prometheus/tenant.yaml deleted file mode 100644 index 6fec0fe484b..00000000000 --- a/testing/tenant-prometheus/tenant.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: minio.min.io/v2 -kind: Tenant -metadata: - name: myminio - namespace: minio-tenant -spec: - prometheus: - image: "" # defaults to quay.io/prometheus/prometheus:latest - env: [ ] - sidecarimage: "" # defaults to alpine - initimage: "" # defaults to busybox:1.33.1 - diskCapacityGB: 1 - storageClassName: standard - annotations: { } - labels: { } - nodeSelector: { } - affinity: - nodeAffinity: { } - podAffinity: { } - podAntiAffinity: { } - resources: { } - serviceAccountName: "" - securityContext: - runAsUser: 1000 - runAsGroup: 1000 - runAsNonRoot: true - fsGroup: 1000