From 326a112906912d2237bf56dd807dff3119b4698e Mon Sep 17 00:00:00 2001 From: Eguzki Astiz Lezaun Date: Wed, 4 Oct 2023 14:04:49 +0200 Subject: [PATCH 1/3] ocp version management: min OCP 4.11 max OCP 4.14 --- bundle.Dockerfile | 2 ++ bundle/metadata/annotations.yaml | 1 + .../manifests/bases/3scale-operator.clusterserviceversion.yaml | 1 + 3 files changed, 4 insertions(+) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index 8c812a233..a4bfc0811 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -10,6 +10,8 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 +LABEL com.redhat.openshift.versions: v4.11-v4.14 + COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 7d7cbc95e..df5c05bf5 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -9,3 +9,4 @@ annotations: operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v2 operators.operatorframework.io.test.config.v1: tests/scorecard/ operators.operatorframework.io.test.mediatype.v1: scorecard+v1 + com.redhat.openshift.versions: v4.11-v4.14 diff --git a/config/manifests/bases/3scale-operator.clusterserviceversion.yaml b/config/manifests/bases/3scale-operator.clusterserviceversion.yaml index 4533a416d..e926dd374 100644 --- a/config/manifests/bases/3scale-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/3scale-operator.clusterserviceversion.yaml @@ -8,6 +8,7 @@ metadata: certified: "false" containerImage: quay.io/3scale/3scale-operator:master createdAt: "2019-05-30T22:40:00Z" + olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.14"}]' description: 3scale Operator to provision 3scale and publish/manage API operators.openshift.io/infrastructure-features: '["Disconnected"]' operators.openshift.io/valid-subscription: '["Red Hat Integration", "Red Hat 3scale API Management"]' From 538dad99717a3b1a350578ddd00f8d41be37872b Mon Sep 17 00:00:00 2001 From: Eguzki Astiz Lezaun Date: Fri, 6 Oct 2023 11:47:54 +0200 Subject: [PATCH 2/3] fixup! ocp version management: min OCP 4.11 max OCP 4.14 --- bundle.Dockerfile | 3 +-- bundle/manifests/3scale-operator.clusterserviceversion.yaml | 2 ++ .../manifests/bases/3scale-operator.clusterserviceversion.yaml | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bundle.Dockerfile b/bundle.Dockerfile index a4bfc0811..6c97c553c 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -10,8 +10,7 @@ LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v2 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 -LABEL com.redhat.openshift.versions: v4.11-v4.14 - +LABEL com.redhat.openshift.versions=v4.11-v4.14 COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ COPY bundle/tests/scorecard /tests/scorecard/ diff --git a/bundle/manifests/3scale-operator.clusterserviceversion.yaml b/bundle/manifests/3scale-operator.clusterserviceversion.yaml index a9a3fcca2..80d0a165f 100644 --- a/bundle/manifests/3scale-operator.clusterserviceversion.yaml +++ b/bundle/manifests/3scale-operator.clusterserviceversion.yaml @@ -202,9 +202,11 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" + com.redhat.openshift.versions: v4.11-v4.14 containerImage: quay.io/3scale/3scale-operator:master createdAt: "2019-05-30T22:40:00Z" description: 3scale Operator to provision 3scale and publish/manage API + olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.14"}]' operators.openshift.io/infrastructure-features: '["Disconnected"]' operators.openshift.io/valid-subscription: '["Red Hat Integration", "Red Hat 3scale API Management"]' operators.operatorframework.io/builder: operator-sdk-v1.2.0 diff --git a/config/manifests/bases/3scale-operator.clusterserviceversion.yaml b/config/manifests/bases/3scale-operator.clusterserviceversion.yaml index e926dd374..9194d2546 100644 --- a/config/manifests/bases/3scale-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/3scale-operator.clusterserviceversion.yaml @@ -6,10 +6,11 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" + com.redhat.openshift.versions: v4.11-v4.14 containerImage: quay.io/3scale/3scale-operator:master createdAt: "2019-05-30T22:40:00Z" - olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.14"}]' description: 3scale Operator to provision 3scale and publish/manage API + olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.14"}]' operators.openshift.io/infrastructure-features: '["Disconnected"]' operators.openshift.io/valid-subscription: '["Red Hat Integration", "Red Hat 3scale API Management"]' operators.operatorframework.io/builder: operator-sdk-v1.2.0 From 8c2628f9b0ab626c3a7e9224c339de5652287683 Mon Sep 17 00:00:00 2001 From: Eguzki Astiz Lezaun Date: Fri, 6 Oct 2023 12:59:00 +0200 Subject: [PATCH 3/3] fixup! fixup! ocp version management: min OCP 4.11 max OCP 4.14 --- bundle/manifests/3scale-operator.clusterserviceversion.yaml | 1 - .../manifests/bases/3scale-operator.clusterserviceversion.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/bundle/manifests/3scale-operator.clusterserviceversion.yaml b/bundle/manifests/3scale-operator.clusterserviceversion.yaml index 80d0a165f..d16d80a58 100644 --- a/bundle/manifests/3scale-operator.clusterserviceversion.yaml +++ b/bundle/manifests/3scale-operator.clusterserviceversion.yaml @@ -202,7 +202,6 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - com.redhat.openshift.versions: v4.11-v4.14 containerImage: quay.io/3scale/3scale-operator:master createdAt: "2019-05-30T22:40:00Z" description: 3scale Operator to provision 3scale and publish/manage API diff --git a/config/manifests/bases/3scale-operator.clusterserviceversion.yaml b/config/manifests/bases/3scale-operator.clusterserviceversion.yaml index 9194d2546..cc58aa30f 100644 --- a/config/manifests/bases/3scale-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/3scale-operator.clusterserviceversion.yaml @@ -6,7 +6,6 @@ metadata: capabilities: Deep Insights categories: Integration & Delivery certified: "false" - com.redhat.openshift.versions: v4.11-v4.14 containerImage: quay.io/3scale/3scale-operator:master createdAt: "2019-05-30T22:40:00Z" description: 3scale Operator to provision 3scale and publish/manage API