Skip to content

Commit

Permalink
kubernetes: bump to minio-operator 6.0.4
Browse files Browse the repository at this point in the history
Signed-off-by: Weifeng Wang <[email protected]>
  • Loading branch information
qclaogui committed Oct 11, 2024
1 parent 1fc5d81 commit 99efd26
Show file tree
Hide file tree
Showing 6 changed files with 40 additions and 39 deletions.
2 changes: 1 addition & 1 deletion kubernetes/common/minio-operator/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ kind: Kustomization
helmCharts:
- name: operator
repo: https://operator.min.io
version: 6.0.3
version: 6.0.4
releaseName: operator
namespace: minio-system
includeCRDs: false
Expand Down
45 changes: 25 additions & 20 deletions kubernetes/common/minio-operator/manifests/k8s-all-in-one.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,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
Expand Down Expand Up @@ -1083,8 +1083,10 @@ spec:
type: object
x-kubernetes-map-type: atomic
type: array
insecure:
type: boolean
mcImage:
default: quay.io/minio/mc:RELEASE.2024-08-17T01-24-54Z
default: quay.io/minio/mc:RELEASE.2024-10-02T08-27-28Z
type: string
securityContext:
properties:
Expand Down Expand Up @@ -1209,7 +1211,7 @@ kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
operator.min.io/version: v5.0.15
operator.min.io/version: v6.0.4
name: policybindings.sts.min.io
spec:
group: sts.min.io
Expand Down Expand Up @@ -1342,7 +1344,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
Expand Down Expand Up @@ -7015,8 +7017,8 @@ kind: ServiceAccount
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
name: minio-operator
namespace: minio-system
---
Expand All @@ -7025,8 +7027,8 @@ kind: ClusterRole
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
name: minio-operator-role
rules:
- apiGroups:
Expand Down Expand Up @@ -7181,8 +7183,11 @@ rules:
- monitoring.coreos.com
resources:
- prometheuses
- prometheusagents
verbs:
- '*'
- get
- update
- list
- apiGroups:
- coordination.k8s.io
resources:
Expand All @@ -7209,8 +7214,8 @@ kind: ClusterRoleBinding
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
name: minio-operator-binding
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand All @@ -7226,8 +7231,8 @@ kind: Service
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
name: operator
namespace: minio-system
spec:
Expand All @@ -7245,8 +7250,8 @@ kind: Service
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
name: sts
namespace: minio-system
spec:
Expand All @@ -7263,8 +7268,8 @@ kind: Deployment
metadata:
labels:
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
name: minio-operator
namespace: minio-system
spec:
Expand All @@ -7279,8 +7284,8 @@ spec:
app.kubernetes.io/instance: operator
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: operator
app.kubernetes.io/version: v6.0.3
helm.sh/chart: operator-6.0.3
app.kubernetes.io/version: v6.0.4
helm.sh/chart: operator-6.0.4
spec:
affinity:
podAntiAffinity:
Expand All @@ -7300,7 +7305,7 @@ spec:
value: "on"
- name: OPERATOR_STS_AUTO_TLS_ENABLED
value: "off"
image: quay.io/minio/operator:v6.0.3
image: quay.io/minio/operator:v6.0.4
imagePullPolicy: IfNotPresent
name: operator
resources:
Expand Down
14 changes: 5 additions & 9 deletions kubernetes/common/minio-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@ operator:
# .. code-block:: yaml
#
# env:
# - name: MINIO_OPERATOR_DEPLOYMENT_NAME
# valueFrom:
# fieldRef:
# fieldPath: metadata.labels['app.kubernetes.io/name']
# - name: CLUSTER_DOMAIN
# value: "cluster.domain"
# - name: WATCHED_NAMESPACE
Expand All @@ -32,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.2 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.2
# tag: v6.0.4
# pullPolicy: IfNotPresent
#
# The chart also supports specifying an image based on digest value:
Expand All @@ -53,20 +49,20 @@ operator:
#
image:
repository: quay.io/minio/operator
tag: v6.0.2
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.2 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.2
# tag: v6.0.4
# pullPolicy: IfNotPresent
#
# The chart also supports specifying an image based on digest value:
Expand Down
4 changes: 1 addition & 3 deletions kubernetes/common/minio-tenant/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@ namespace: minio-system
helmCharts:
- name: tenant
repo: https://operator.min.io
version: 6.0.3
version: 6.0.4
releaseName: tenant
namespace: minio-system
includeCRDs: false
valuesFile: values-k3d-k3s.yaml
resources:
- configs/add-sm-minio.yaml
- configs/codelab-tls-certificate.yaml

secretGenerator:
- name: user-lgtmp
options:
Expand All @@ -22,7 +21,6 @@ secretGenerator:
literals:
- CONSOLE_ACCESS_KEY=lgtmp
- CONSOLE_SECRET_KEY=VD538OYxSEiGD4I9mmFfqFMCGq1vIiGm

generators:
- |-
apiVersion: builtin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
features:
bucketDNS: false
enableSFTP: false
image: quay.io/minio/minio:RELEASE.2024-08-17T01-24-54Z
image: quay.io/minio/minio:RELEASE.2024-10-02T17-50-41Z
imagePullPolicy: IfNotPresent
mountPath: /export
podManagementPolicy: Parallel
Expand Down
12 changes: 7 additions & 5 deletions kubernetes/common/minio-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.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:
Expand All @@ -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
###
#
Expand Down Expand Up @@ -68,6 +68,8 @@ tenant:
name: myminio-env-configuration
accessKey: minio
secretKey: minio123
#existingSecret: true

###
# If this variable is set to true, then enable the usage of an existing Kubernetes secret to set environment variables for the Tenant.
# The existing Kubernetes secret name must be placed under .tenant.configuration.name e.g. existing-minio-env-configuration
Expand Down Expand Up @@ -347,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
Expand Down

0 comments on commit 99efd26

Please sign in to comment.