diff --git a/bundles/certified-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml b/bundles/certified-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml index 33c1a9f6852..1d1c6986677 100644 --- a/bundles/certified-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml +++ b/bundles/certified-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -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.11 + containerImage: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator.v5.0.11 namespace: minio-operator spec: @@ -562,7 +562,7 @@ spec: - args: - ui - --certs-dir=/tmp/certs - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: console ports: @@ -571,7 +571,6 @@ spec: - containerPort: 9443 name: https resources: {} - securityContext: {} volumeMounts: - mountPath: /tmp/certs name: tls-certificates @@ -641,7 +640,7 @@ spec: value: "on" - name: OPERATOR_STS_ENABLED value: "on" - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: minio-operator resources: @@ -649,7 +648,6 @@ spec: cpu: 200m ephemeral-storage: 500Mi memory: 256Mi - securityContext: {} volumeMounts: - mountPath: /tmp/service-ca name: openshift-service-ca @@ -759,11 +757,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: minio-operator.v5.0.9 diff --git a/bundles/certified-operators/5.0.11/metadata/annotations.yaml b/bundles/certified-operators/5.0.11/metadata/annotations.yaml index eb5623e0117..2a015c4d0eb 100644 --- a/bundles/certified-operators/5.0.11/metadata/annotations.yaml +++ b/bundles/certified-operators/5.0.11/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: minio-operator operators.operatorframework.io.bundle.channels.v1: stable # Annotations to specify OCP versions compatibility. - com.redhat.openshift.versions: v4.8-v4.13 + com.redhat.openshift.versions: v4.8-v4.14 # Annotation to add default bundle channel as potential is declared operators.operatorframework.io.bundle.channel.default.v1: stable operatorframework.io/suggested-namespace: minio-operator diff --git a/bundles/community-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml b/bundles/community-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml index 2e400febe84..bd3c098d0b6 100644 --- a/bundles/community-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml +++ b/bundles/community-operators/5.0.11/manifests/minio-operator.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -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.11 + containerImage: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator.v5.0.11 namespace: minio-operator spec: @@ -562,7 +562,7 @@ spec: - args: - ui - --certs-dir=/tmp/certs - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: console ports: @@ -571,7 +571,6 @@ spec: - containerPort: 9443 name: https resources: {} - securityContext: {} volumeMounts: - mountPath: /tmp/certs name: tls-certificates @@ -641,7 +640,7 @@ spec: value: "on" - name: OPERATOR_STS_ENABLED value: "on" - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: minio-operator resources: @@ -649,7 +648,6 @@ spec: cpu: 200m ephemeral-storage: 500Mi memory: 256Mi - securityContext: {} volumeMounts: - mountPath: /tmp/service-ca name: openshift-service-ca @@ -759,11 +757,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: "null" diff --git a/bundles/community-operators/5.0.11/metadata/annotations.yaml b/bundles/community-operators/5.0.11/metadata/annotations.yaml index eb5623e0117..2a015c4d0eb 100644 --- a/bundles/community-operators/5.0.11/metadata/annotations.yaml +++ b/bundles/community-operators/5.0.11/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: minio-operator operators.operatorframework.io.bundle.channels.v1: stable # Annotations to specify OCP versions compatibility. - com.redhat.openshift.versions: v4.8-v4.13 + com.redhat.openshift.versions: v4.8-v4.14 # Annotation to add default bundle channel as potential is declared operators.operatorframework.io.bundle.channel.default.v1: stable operatorframework.io/suggested-namespace: minio-operator diff --git a/bundles/redhat-marketplace/5.0.11/manifests/minio-operator-rhmp.clusterserviceversion.yaml b/bundles/redhat-marketplace/5.0.11/manifests/minio-operator-rhmp.clusterserviceversion.yaml index a0fca9e5e29..99ae0fc3799 100644 --- a/bundles/redhat-marketplace/5.0.11/manifests/minio-operator-rhmp.clusterserviceversion.yaml +++ b/bundles/redhat-marketplace/5.0.11/manifests/minio-operator-rhmp.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -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.11 + containerImage: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator-rhmp.v5.0.11 namespace: minio-operator spec: @@ -564,7 +564,7 @@ spec: - args: - ui - --certs-dir=/tmp/certs - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: console ports: @@ -573,7 +573,6 @@ spec: - containerPort: 9443 name: https resources: {} - securityContext: {} volumeMounts: - mountPath: /tmp/certs name: tls-certificates @@ -643,7 +642,7 @@ spec: value: "on" - name: OPERATOR_STS_ENABLED value: "on" - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: minio-operator resources: @@ -651,7 +650,6 @@ spec: cpu: 200m ephemeral-storage: 500Mi memory: 256Mi - securityContext: {} volumeMounts: - mountPath: /tmp/service-ca name: openshift-service-ca @@ -761,11 +759,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: minio-operator-rhmp.v5.0.9 diff --git a/bundles/redhat-marketplace/5.0.11/metadata/annotations.yaml b/bundles/redhat-marketplace/5.0.11/metadata/annotations.yaml index e00c3b7426c..c9166a34c2b 100644 --- a/bundles/redhat-marketplace/5.0.11/metadata/annotations.yaml +++ b/bundles/redhat-marketplace/5.0.11/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: minio-operator-rhmp operators.operatorframework.io.bundle.channels.v1: stable # Annotations to specify OCP versions compatibility. - com.redhat.openshift.versions: v4.8-v4.13 + com.redhat.openshift.versions: v4.8-v4.14 # Annotation to add default bundle channel as potential is declared operators.operatorframework.io.bundle.channel.default.v1: stable operatorframework.io/suggested-namespace: minio-operator diff --git a/certified-operators/manifests/minio-operator.clusterserviceversion.yaml b/certified-operators/manifests/minio-operator.clusterserviceversion.yaml index 33c1a9f6852..cb98693f63f 100644 --- a/certified-operators/manifests/minio-operator.clusterserviceversion.yaml +++ b/certified-operators/manifests/minio-operator.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -562,7 +562,7 @@ spec: - args: - ui - --certs-dir=/tmp/certs - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: console ports: @@ -641,7 +641,7 @@ spec: value: "on" - name: OPERATOR_STS_ENABLED value: "on" - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: minio-operator resources: @@ -759,11 +759,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: minio-operator.v5.0.9 diff --git a/community-operators/manifests/minio-operator.clusterserviceversion.yaml b/community-operators/manifests/minio-operator.clusterserviceversion.yaml index 2e400febe84..0c643208299 100644 --- a/community-operators/manifests/minio-operator.clusterserviceversion.yaml +++ b/community-operators/manifests/minio-operator.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -562,7 +562,7 @@ spec: - args: - ui - --certs-dir=/tmp/certs - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: console ports: @@ -641,7 +641,7 @@ spec: value: "on" - name: OPERATOR_STS_ENABLED value: "on" - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: minio-operator resources: @@ -759,11 +759,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: "null" diff --git a/manifests/minio-operator-rhmp.clusterserviceversion.yaml b/manifests/minio-operator-rhmp.clusterserviceversion.yaml index a0fca9e5e29..f4e46102598 100644 --- a/manifests/minio-operator-rhmp.clusterserviceversion.yaml +++ b/manifests/minio-operator-rhmp.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -761,11 +761,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: minio-operator-rhmp.v5.0.9 diff --git a/metadata/annotations.yaml b/metadata/annotations.yaml index e00c3b7426c..c9166a34c2b 100644 --- a/metadata/annotations.yaml +++ b/metadata/annotations.yaml @@ -6,7 +6,7 @@ annotations: operators.operatorframework.io.bundle.package.v1: minio-operator-rhmp operators.operatorframework.io.bundle.channels.v1: stable # Annotations to specify OCP versions compatibility. - com.redhat.openshift.versions: v4.8-v4.13 + com.redhat.openshift.versions: v4.8-v4.14 # Annotation to add default bundle channel as potential is declared operators.operatorframework.io.bundle.channel.default.v1: stable operatorframework.io/suggested-namespace: minio-operator diff --git a/olm-post-script.sh b/olm-post-script.sh index 5c4a92361c8..49f7045f92a 100755 --- a/olm-post-script.sh +++ b/olm-post-script.sh @@ -37,12 +37,18 @@ for catalog in "${redhatCatalogs[@]}"; do echo "operatorImageDigest: ${operatorImageDigest} @ ${digest}" yq -i ".metadata.annotations.containerImage |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml - # Operator Image in Digest mode: sha256:xxx + # Operator Image in Digest mode: sha256:xxx published catalogs yq -i ".spec.install.spec.deployments[0].spec.template.spec.containers[0].image |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml yq -i ".spec.install.spec.deployments[1].spec.template.spec.containers[0].image |= (\"${operatorImageDigest}\")" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml yq -i "(.spec.relatedImages[] | select( .name == \"minio-operator\")).image |= \"${operatorImageDigest}\"" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml yq -i "(.spec.relatedImages[] | select( .name == \"console\")).image |= \"${operatorImageDigest}\"" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml -# yq eval-all -i ". as \$item ireduce ({}; . * \$item )" bundles/$catalog/$RELEASE/manifests/$package.clusterserviceversion.yaml resources/templates/olm-template.yaml + + # Operator Image in Digest mode: sha256:xxx local test manifests + yq -i ".spec.install.spec.deployments[0].spec.template.spec.containers[0].image |= (\"${operatorImageDigest}\")" $catalog/manifests/$package.clusterserviceversion.yaml + yq -i ".spec.install.spec.deployments[1].spec.template.spec.containers[0].image |= (\"${operatorImageDigest}\")" $catalog/manifests/$package.clusterserviceversion.yaml + yq -i "(.spec.relatedImages[] | select( .name == \"minio-operator\")).image |= \"${operatorImageDigest}\"" $catalog/manifests/$package.clusterserviceversion.yaml + yq -i "(.spec.relatedImages[] | select( .name == \"console\")).image |= \"${operatorImageDigest}\"" $catalog/manifests/$package.clusterserviceversion.yaml + # https://connect.redhat.com/support/technology-partner/#/case/03206318 # If no securityContext is specified, the OLM will choose one that fits within diff --git a/olm.sh b/olm.sh index bc1d14da229..bd360b98dad 100755 --- a/olm.sh +++ b/olm.sh @@ -101,7 +101,7 @@ for catalog in "${redhatCatalogs[@]}"; do # as well as the default. { echo " # Annotations to specify OCP versions compatibility." - echo " com.redhat.openshift.versions: v4.8-v4.13" + echo " com.redhat.openshift.versions: v4.8-v4.14" echo " # Annotation to add default bundle channel as potential is declared" echo " operators.operatorframework.io.bundle.channel.default.v1: stable" echo " operatorframework.io/suggested-namespace: minio-operator" diff --git a/redhat-marketplace/manifests/minio-operator-rhmp.clusterserviceversion.yaml b/redhat-marketplace/manifests/minio-operator-rhmp.clusterserviceversion.yaml index a0fca9e5e29..35b15112a38 100644 --- a/redhat-marketplace/manifests/minio-operator-rhmp.clusterserviceversion.yaml +++ b/redhat-marketplace/manifests/minio-operator-rhmp.clusterserviceversion.yaml @@ -32,7 +32,7 @@ metadata: "bucketDNS": false, "domains": {} }, - "image": "quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb", + "image": "quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3", "imagePullSecret": {}, "mountPath": "/export", "podManagementPolicy": "Parallel", @@ -564,7 +564,7 @@ spec: - args: - ui - --certs-dir=/tmp/certs - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: console ports: @@ -643,7 +643,7 @@ spec: value: "on" - name: OPERATOR_STS_ENABLED value: "on" - image: quay.io/minio/operator:v5.0.11 + image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff imagePullPolicy: IfNotPresent name: minio-operator resources: @@ -761,11 +761,11 @@ spec: name: MinIO Inc url: https://min.io relatedImages: - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: console - - image: minio/operator@sha256:58c5114003fdc38877db2dc6ca45bc4b16572cc3e40c2fcc20702c5ccaa01caa + - image: quay.io/minio/operator@sha256:3ab501c476f269c4e4fc84017543ff7f6c8209ed474d77de472311472ba2e2ff name: minio-operator - - image: quay.io/minio/minio@sha256:7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb - name: minio-7c98dbaba9132bb804c73baeb43f70db20a0c746277c88a9c9c9d3dc188127bb-annotation + - image: quay.io/minio/minio@sha256:91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3 + name: minio-91866cdaad4cc11d2f86056b234f33f3768a44adc600ea37c225708c83076bc3-annotation version: 5.0.11 replaces: minio-operator-rhmp.v5.0.9 diff --git a/testing/deploy-openshift-4.14.1.sh b/testing/deploy-openshift-4.14.1.sh new file mode 100755 index 00000000000..d4d694a28d8 --- /dev/null +++ b/testing/deploy-openshift-4.14.1.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# Copyright (C) 2023, MinIO, Inc. +# +# This code is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License, version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License, version 3, +# along with this program. If not, see + +# This script requires: kubectl, kind + +SCRIPT_DIR=$(dirname "$0") +export SCRIPT_DIR + +source "${SCRIPT_DIR}/openshift-common.sh" + +function main() { + + install_binaries + + setup_crc "4.14.1" + + create_marketplace_catalog "certified-operators" + + install_operator "certified-operators" + + #destroy_crc +} + +time main "$@" diff --git a/testing/deploy-openshift-ownnamespace-4.14.1.sh b/testing/deploy-openshift-ownnamespace-4.14.1.sh new file mode 100755 index 00000000000..235fc4bd3fc --- /dev/null +++ b/testing/deploy-openshift-ownnamespace-4.14.1.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env bash +# Copyright (C) 2023, MinIO, Inc. +# +# This code is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License, version 3, +# as published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License, version 3, +# along with this program. If not, see + +# This script requires: kubectl, kind + +SCRIPT_DIR=$(dirname "$0") +export SCRIPT_DIR + +source "${SCRIPT_DIR}/openshift-common.sh" + +function main() { + + install_binaries + + setup_crc "4.14.1" + + create_marketplace_catalog "certified-operators" + + install_operator "certified-operators" "minio-operator" + + #destroy_crc +} + +time main "$@" diff --git a/testing/openshift-common.sh b/testing/openshift-common.sh index 45584e70ca9..e8e98ec357d 100644 --- a/testing/openshift-common.sh +++ b/testing/openshift-common.sh @@ -13,7 +13,6 @@ # You should have received a copy of the GNU Affero General Public License, version 3, # along with this program. If not, see -#OPERATOR_SDK_VERSION=v1.22.2 ARCH=$(go env GOARCH) OS=$(uname | awk '{print tolower($0)}') # shellcheck disable=SC2155 @@ -59,16 +58,22 @@ function setup_crc() { # crc_libvirt_4.13.6_amd64 bundle_version="$1" + virtualization="libvirt" + if [ -z "$bundle_version" ]; then - bundle_version="4.13.6" + die "missing bundle version" + fi + if [ "$OS" == "darwin" ]; then + virtualization="vfkit" fi - bundle="crc_libvirt_${bundle_version}_amd64.crcbundle" + bundle="crc_${virtualization}_${bundle_version}_${ARCH}.crcbundle" + bundle_url="https://mirror.openshift.com/pub/openshift-v4/clients/crc/bundles/openshift/4.14.1/${bundle}" echo -e "\e[34mConfiguring crc\e[0m" export PATH="$TMP_BIN_DIR:$PATH" crc config set consent-telemetry no crc config set skip-check-root-user true crc config set kubeadmin-password "crclocal" - crc setup + crc setup -b $bundle_url crc start -b $bundle -c 12 -m 20480 eval $(crc oc-env) eval $(crc podman-env)