From 96639f91a270de1cc068a261a42f2f9c939633f3 Mon Sep 17 00:00:00 2001 From: zxy Date: Thu, 10 Mar 2022 21:03:28 +0800 Subject: [PATCH] upgrade minio operator to v4.4.9 (#841) Signed-off-by: soulseen --- README.md | 2 +- charts/harbor-operator/README.md | 1 + charts/harbor-operator/values.yaml | 2 + docs/installation/kustomization-custom.md | 4 +- manifests/cluster/deployment.yaml | 52 +++++++++++++++-------- manifests/cluster/kustomization.yaml | 2 +- manifests/cluster/patch/annotations.yaml | 2 +- 7 files changed, 43 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 47086a541..c9b9972f1 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ Versions of the underlying components are listed below: | Components | Harbor | MinIO operator | PostgreSQL operator | Redis operator | |---------------|-------------------|----------------|---------------------|----------------| -| Versions | 2.4.x `[1]` | 4.3.2 | 1.6.3 | 1.1.1 | +| Versions | 2.4.x `[1]` | 4.4.9 | 1.6.3 | 1.1.1 | NOTES: diff --git a/charts/harbor-operator/README.md b/charts/harbor-operator/README.md index cc706c48a..c3f61640c 100644 --- a/charts/harbor-operator/README.md +++ b/charts/harbor-operator/README.md @@ -43,6 +43,7 @@ Deploy Harbor Operator | leaderElection.namespace | string | `"kube-system"` | The namespace used to store the ConfigMap for leader election | | logLevel | int | `4` | Set the verbosity of controller. Range of 0 - 6 with 6 being the most verbose. Info level is 4. | | minio-operator.enabled | bool | `false` | Whether to enabled [MinIO Operator](https://github.com/minio/operator) | +| minio-operator.image.tag | string | `"v4.4.9"` | | | nameOverride | string | `""` | | | nodeSelector | object | `{}` | Expects input structure as per specification For example: `[ { "matchExpressions": [ { "key": "kubernetes.io/e2e-az-name", "operator": "In", "values": [ "e2e-az1", "e2e-az2" ] } ] } ]` | | podAnnotations | object | `{}` | Additional annotations to add to the controller Pods | diff --git a/charts/harbor-operator/values.yaml b/charts/harbor-operator/values.yaml index baabae893..21432f175 100644 --- a/charts/harbor-operator/values.yaml +++ b/charts/harbor-operator/values.yaml @@ -258,6 +258,8 @@ redis-operator: minio-operator: # minio-operator.enabled -- Whether to enabled [MinIO Operator](https://github.com/minio/operator) enabled: false + image: + tag: v4.4.9 postgres-operator: # postgres-operator.enabled -- Whether to enabled [Postgres operator](https://github.com/zalando/postgres-operator) diff --git a/docs/installation/kustomization-custom.md b/docs/installation/kustomization-custom.md index a3cda1a44..2327a6f00 100644 --- a/docs/installation/kustomization-custom.md +++ b/docs/installation/kustomization-custom.md @@ -66,7 +66,7 @@ kubectl delete -f https://raw.githubusercontent.com/spotahome/redis-operator/mas ## Deploy Minio operator (Optional) -Follow the installation guide shown [here](https://github.com/minio/operator/tree/v4.3.2#1-install-the-minio-operator) to install the Minio operator. +Follow the installation guide shown [here](https://github.com/minio/operator/tree/v4.4.9#deploy-the-minio-operator-and-create-a-tenant) to install the Minio operator. Or use the Minio kustomization template: @@ -74,7 +74,7 @@ Or use the Minio kustomization template: # Clone the codebase. git clone https://github.com/minio/operator.git && \ cd operator && \ -git checkout tags/v4.3.2 -b minio-v4.3.2 +git checkout tags/v4.4.9 -b minio-v4.4.9 # Apply with the kustomization template that is located the root dir of the codebase. kustomize build | kubectl apply -f - diff --git a/manifests/cluster/deployment.yaml b/manifests/cluster/deployment.yaml index 09ca4b372..4a626418b 100644 --- a/manifests/cluster/deployment.yaml +++ b/manifests/cluster/deployment.yaml @@ -26382,8 +26382,6 @@ spec: properties: bucketDNS: type: boolean - required: - - bucketDNS type: object securityContext: properties: @@ -28325,6 +28323,10 @@ spec: type: object nullable: true type: array + provisionedBuckets: + type: boolean + provisionedUsers: + type: boolean revision: format: int32 type: integer @@ -28392,6 +28394,17 @@ spec: type: object spec: properties: + buckets: + items: + properties: + name: + type: string + objectLock: + type: boolean + region: + type: string + type: object + type: array certConfig: properties: commonName: @@ -28513,6 +28526,18 @@ spec: required: - name type: object + features: + properties: + bucketDNS: + type: boolean + domains: + properties: + minio: + items: + type: string + type: array + type: object + type: object image: type: string imagePullPolicy: @@ -30995,16 +31020,7 @@ spec: type: array type: object prometheusOperator: - properties: - annotations: - additionalProperties: - type: string - type: object - labels: - additionalProperties: - type: string - type: object - type: object + type: boolean readiness: properties: exec: @@ -31076,8 +31092,6 @@ spec: properties: bucketDNS: type: boolean - required: - - bucketDNS type: object serviceAccountName: type: string @@ -32526,6 +32540,10 @@ spec: type: object nullable: true type: array + provisionedBuckets: + type: boolean + provisionedUsers: + type: boolean revision: format: int32 type: integer @@ -37884,7 +37902,7 @@ rules: - apiGroups: - monitoring.coreos.com resources: - - servicemonitors + - prometheuses verbs: - '*' - apiGroups: @@ -38802,7 +38820,7 @@ metadata: annotations: cache.goharbor.io/version: v1.1.1 database.goharbor.io/version: v1.5.0 - storage.goharbor.io/version: v4.3.2 + storage.goharbor.io/version: v4.4.9 labels: control-plane: harbor-operator name: harbor-operator @@ -38927,7 +38945,7 @@ spec: - minio-operator topologyKey: kubernetes.io/hostname containers: - - image: quay.io/minio/operator:v4.3.2 + - image: quay.io/minio/operator:v4.4.9 imagePullPolicy: IfNotPresent name: minio-operator resources: diff --git a/manifests/cluster/kustomization.yaml b/manifests/cluster/kustomization.yaml index c97033e64..29747ff6c 100644 --- a/manifests/cluster/kustomization.yaml +++ b/manifests/cluster/kustomization.yaml @@ -18,7 +18,7 @@ resources: - https://raw.githubusercontent.com/spotahome/redis-operator/master/example/operator/all-redis-operator-resources.yaml?ref=v1.1.1 # redis operator - https://raw.githubusercontent.com/spotahome/redis-operator/master/manifests/databases.spotahome.com_redisfailovers.yaml?ref=v1.1.1 # redis operator crd - github.com/zalando/postgres-operator/manifests?ref=v1.6.3 # postgresql operator - - github.com/minio/operator?ref=v4.3.2 # minIO storage operator + - github.com/minio/operator?ref=v4.4.9 # minIO storage operator # If you have to override the image source, uncomment this patch and also change the image source in the patch/image-source.yaml file. # Then rebuild. diff --git a/manifests/cluster/patch/annotations.yaml b/manifests/cluster/patch/annotations.yaml index 5a57a5ba5..15e689124 100644 --- a/manifests/cluster/patch/annotations.yaml +++ b/manifests/cluster/patch/annotations.yaml @@ -3,4 +3,4 @@ value: cache.goharbor.io/version: v1.1.1 database.goharbor.io/version: v1.5.0 - storage.goharbor.io/version: v4.3.2 \ No newline at end of file + storage.goharbor.io/version: v4.4.9 \ No newline at end of file