Merge branch 'no_pdb_for_single_server' of https://github.com/jiuker/…

…operator into no_pdb_for_single_server
minio · Sep 18, 2023 · c9405c9 · c9405c9
2 parents 112aa76 + 10a179f
commit c9405c9
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 284 deletions.
diff --git a/bundles/certified-operators/5.0.9/manifests/minio-operator.clusterserviceversion.yaml b/bundles/certified-operators/5.0.9/manifests/minio-operator.clusterserviceversion.yaml
@@ -89,7 +89,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.22.2
     operators.operatorframework.io/project_layout: unknown
     repository: https://github.com/minio/operator
-    containerImage: quay.io/minio/operator:v5.0.9
+    containerImage: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
   name: minio-operator.v5.0.9
   namespace: minio-operator
 spec:
@@ -561,7 +561,7 @@ spec:
                   - args:
                       - ui
                       - --certs-dir=/tmp/certs
-                    image: quay.io/minio/operator:v5.0.9
+                    image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
                     imagePullPolicy: IfNotPresent
                     name: console
                     ports:
@@ -570,7 +570,6 @@ spec:
                       - containerPort: 9443
                         name: https
                     resources: {}
-                    securityContext: {}
                     volumeMounts:
                       - mountPath: /tmp/certs
                         name: tls-certificates
@@ -636,15 +635,14 @@ spec:
                         value: "on"
                       - name: OPERATOR_STS_ENABLED
                         value: "off"
-                    image: quay.io/minio/operator:v5.0.9
+                    image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
                     imagePullPolicy: IfNotPresent
                     name: minio-operator
                     resources:
                       requests:
                         cpu: 200m
                         ephemeral-storage: 500Mi
                         memory: 256Mi
-                    securityContext: {}
                     volumeMounts:
                       - mountPath: /tmp/service-ca
                         name: openshift-service-ca
@@ -756,9 +754,9 @@ spec:
   relatedImages:
     - image: quay.io/minio/minio@sha256:6fce70c2fd719603cb538e25ec3f58d77c12c1f5141e46240a850065c7ce4470
       name: minio-6fce70c2fd719603cb538e25ec3f58d77c12c1f5141e46240a850065c7ce4470-annotation
-    - image: minio/operator@sha256:3cde156eab8bdbd012350b21817e360f3d2e330f4c10ff8742cf85bd5c85fed0
+    - image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
       name: console
-    - image: minio/operator@sha256:3cde156eab8bdbd012350b21817e360f3d2e330f4c10ff8742cf85bd5c85fed0
+    - image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
       name: minio-operator
   version: 5.0.9
   replaces: minio-operator.v5.0.8
diff --git a/bundles/community-operators/5.0.9/manifests/minio-operator.clusterserviceversion.yaml b/bundles/community-operators/5.0.9/manifests/minio-operator.clusterserviceversion.yaml
@@ -89,7 +89,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.22.2
     operators.operatorframework.io/project_layout: unknown
     repository: https://github.com/minio/operator
-    containerImage: quay.io/minio/operator:v5.0.9
+    containerImage: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
   name: minio-operator.v5.0.9
   namespace: minio-operator
 spec:
@@ -561,7 +561,7 @@ spec:
                   - args:
                       - ui
                       - --certs-dir=/tmp/certs
-                    image: quay.io/minio/operator:v5.0.9
+                    image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
                     imagePullPolicy: IfNotPresent
                     name: console
                     ports:
@@ -570,7 +570,6 @@ spec:
                       - containerPort: 9443
                         name: https
                     resources: {}
-                    securityContext: {}
                     volumeMounts:
                       - mountPath: /tmp/certs
                         name: tls-certificates
@@ -636,15 +635,14 @@ spec:
                         value: "on"
                       - name: OPERATOR_STS_ENABLED
                         value: "off"
-                    image: quay.io/minio/operator:v5.0.9
+                    image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
                     imagePullPolicy: IfNotPresent
                     name: minio-operator
                     resources:
                       requests:
                         cpu: 200m
                         ephemeral-storage: 500Mi
                         memory: 256Mi
-                    securityContext: {}
                     volumeMounts:
                       - mountPath: /tmp/service-ca
                         name: openshift-service-ca
@@ -754,9 +752,9 @@ spec:
     name: MinIO Inc
     url: https://min.io
   relatedImages:
-    - image: minio/operator@sha256:3cde156eab8bdbd012350b21817e360f3d2e330f4c10ff8742cf85bd5c85fed0
+    - image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
       name: console
-    - image: minio/operator@sha256:3cde156eab8bdbd012350b21817e360f3d2e330f4c10ff8742cf85bd5c85fed0
+    - image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
       name: minio-operator
     - image: quay.io/minio/minio@sha256:6fce70c2fd719603cb538e25ec3f58d77c12c1f5141e46240a850065c7ce4470
       name: minio-6fce70c2fd719603cb538e25ec3f58d77c12c1f5141e46240a850065c7ce4470-annotation

diff --git a/bundles/redhat-marketplace/5.0.9/manifests/minio-operator-rhmp.clusterserviceversion.yaml b/bundles/redhat-marketplace/5.0.9/manifests/minio-operator-rhmp.clusterserviceversion.yaml
@@ -91,7 +91,7 @@ metadata:
     operators.operatorframework.io/builder: operator-sdk-v1.22.2
     operators.operatorframework.io/project_layout: unknown
     repository: https://github.com/minio/operator
-    containerImage: quay.io/minio/operator:v5.0.9
+    containerImage: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
   name: minio-operator-rhmp.v5.0.9
   namespace: minio-operator
 spec:
@@ -563,7 +563,7 @@ spec:
                   - args:
                       - ui
                       - --certs-dir=/tmp/certs
-                    image: quay.io/minio/operator:v5.0.9
+                    image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
                     imagePullPolicy: IfNotPresent
                     name: console
                     ports:
@@ -572,7 +572,6 @@ spec:
                       - containerPort: 9443
                         name: https
                     resources: {}
-                    securityContext: {}
                     volumeMounts:
                       - mountPath: /tmp/certs
                         name: tls-certificates
@@ -638,15 +637,14 @@ spec:
                         value: "on"
                       - name: OPERATOR_STS_ENABLED
                         value: "off"
-                    image: quay.io/minio/operator:v5.0.9
+                    image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
                     imagePullPolicy: IfNotPresent
                     name: minio-operator
                     resources:
                       requests:
                         cpu: 200m
                         ephemeral-storage: 500Mi
                         memory: 256Mi
-                    securityContext: {}
                     volumeMounts:
                       - mountPath: /tmp/service-ca
                         name: openshift-service-ca
@@ -758,9 +756,9 @@ spec:
   relatedImages:
     - image: quay.io/minio/minio@sha256:6fce70c2fd719603cb538e25ec3f58d77c12c1f5141e46240a850065c7ce4470
       name: minio-6fce70c2fd719603cb538e25ec3f58d77c12c1f5141e46240a850065c7ce4470-annotation
-    - image: minio/operator@sha256:3cde156eab8bdbd012350b21817e360f3d2e330f4c10ff8742cf85bd5c85fed0
+    - image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
       name: console
-    - image: minio/operator@sha256:3cde156eab8bdbd012350b21817e360f3d2e330f4c10ff8742cf85bd5c85fed0
+    - image: quay.io/minio/operator@sha256:57116c38ab9193ff2b105e3a98491f9bf9e6b733f26fae73445c80bb4fc57aa2
       name: minio-operator
   version: 5.0.9
   replaces: minio-operator-rhmp.v5.0.8
diff --git a/go.mod b/go.mod
@@ -41,27 +41,27 @@ require (
 	github.com/unrolled/secure v1.13.0
 	golang.org/x/crypto v0.11.0
 	golang.org/x/net v0.13.0
-	golang.org/x/oauth2 v0.5.0
+	golang.org/x/oauth2 v0.8.0
 	// Added to include security fix for
 	// https://github.com/golang/go/issues/56152
 	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/time v0.3.0
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v0.26.1
-	k8s.io/apimachinery v0.26.1
-	k8s.io/client-go v0.26.1
-	k8s.io/code-generator v0.27.0-alpha.2
-	k8s.io/klog/v2 v2.80.1
+	k8s.io/api v0.28.1
+	k8s.io/apimachinery v0.28.1
+	k8s.io/client-go v0.28.1
+	k8s.io/code-generator v0.28.0
+	k8s.io/klog/v2 v2.100.1
 	k8s.io/kubectl v0.25.4
-	k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
+	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3
 )
 
 require (
 	github.com/go-test/deep v1.1.0
 	github.com/minio/kes-go v0.1.0
 	golang.org/x/mod v0.10.0
-	sigs.k8s.io/controller-runtime v0.13.1
+	sigs.k8s.io/controller-runtime v0.16.2
 )
 
 require (
@@ -91,16 +91,16 @@ require (
 	github.com/fatih/structs v1.1.0 // indirect
 	github.com/gdamore/encoding v1.0.0 // indirect
 	github.com/gdamore/tcell/v2 v2.5.4 // indirect
-	github.com/go-logr/logr v1.2.3 // indirect
+	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-openapi/analysis v0.21.4 // indirect
 	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/google/gnostic v0.6.9 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
@@ -151,10 +151,10 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/posener/complete v1.2.3 // indirect
 	github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
-	github.com/prometheus/client_golang v1.14.0 // indirect
-	github.com/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.39.0 // indirect
-	github.com/prometheus/procfs v0.9.0 // indirect
+	github.com/prometheus/client_golang v1.16.0 // indirect
+	github.com/prometheus/client_model v0.4.0 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.10.1 // indirect
 	github.com/prometheus/prom2json v1.3.2 // indirect
 	github.com/rivo/tview v0.0.0-20230130130022-4a1b7a76c01c // indirect
 	github.com/rivo/uniseg v0.4.4 // indirect
@@ -169,28 +169,29 @@ require (
 	github.com/tklauser/numcpus v0.6.0 // indirect
 	github.com/vbatts/tar-split v0.11.2 // indirect
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
-	go.etcd.io/etcd/api/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
-	go.etcd.io/etcd/client/v3 v3.5.7 // indirect
+	go.etcd.io/etcd/api/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
+	go.etcd.io/etcd/client/v3 v3.5.9 // indirect
 	go.mongodb.org/mongo-driver v1.12.0 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	go.uber.org/zap v1.24.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/sync v0.2.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
 	golang.org/x/term v0.10.0 // indirect
-	golang.org/x/tools v0.6.0 // indirect
+	golang.org/x/tools v0.9.3 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20230216225411-c8e22ba71e44 // indirect
-	google.golang.org/grpc v1.53.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
+	google.golang.org/grpc v1.54.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/h2non/filetype.v1 v1.0.5 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.25.4 // indirect
+	k8s.io/apiextensions-apiserver v0.28.0 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kube-openapi v0.0.0-20230123231816-1cb3ae25d79a // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )