From 0ec717d1dba95de0ff6c664fce7f5893994a70db Mon Sep 17 00:00:00 2001 From: Greg Kurz Date: Thu, 4 Apr 2024 15:06:22 +0200 Subject: [PATCH 1/2] Introduce `replaces` field in CSV This is now mandated by CVP if the CSV uses the `skipRange` field. Fixes: KATA-2894 Fixes: KATA-2876 Signed-off-by: Greg Kurz (cherry picked from commit 696aef2b492a1f3ab78b33c1a365b904dac80e51, fixed version for 1.5.3) Signed-off-by: Greg Kurz --- .../sandboxed-containers-operator.clusterserviceversion.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml b/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml index 3277a798..6934c4ec 100644 --- a/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml @@ -365,6 +365,7 @@ spec: maturity: beta provider: name: Red Hat + replaces: sandboxed-containers-operator.v1.5.2 version: 1.5.3 webhookdefinitions: - admissionReviewVersions: From b019e4a564ef15aaeaf9ec9729bc549d9525dbc9 Mon Sep 17 00:00:00 2001 From: Cameron Meadors Date: Tue, 2 Apr 2024 14:51:35 -0400 Subject: [PATCH 2/2] Add new annotations to CSV The `features.operators.openshift.io` infrastructure feature annotations, introduced in OpenShift Container Platform 4.14, deprecate the `operators.openshift.io/infrastructure-features` annotations used in earlier versions of OpenShift Container Platform. See [1] Drop the `operators.openshift.io/infrastructure-features` line. [1] https://docs.openshift.com/container-platform/4.14/operators/operator_sdk/osdk-generating-csvs.html#osdk-csv-manual-annotations-deprecated_osdk-generating-csvs Fixes: KATA-2895 Fixes: KATA-2876 Signed-off-by: Cameron Meadors Signed-off-by: Greg Kurz (cherry picked from commit 02086163095a8e97df209f3bbbd3d5d8293842e2, fixed trivial context conflict) Signed-off-by: Greg Kurz --- ...ndboxed-containers-operator.clusterserviceversion.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml b/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml index 6934c4ec..a60fb467 100644 --- a/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/sandboxed-containers-operator.clusterserviceversion.yaml @@ -13,9 +13,15 @@ metadata: } ] capabilities: Seamless Upgrades + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "false" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/tls-profiles: "false" + features.operators.openshift.io/token-auth-aws: "false" + features.operators.openshift.io/token-auth-azure: "false" + features.operators.openshift.io/token-auth-gcp: "false" olm.skipRange: '>=1.1.0 <1.5.3' operatorframework.io/suggested-namespace: openshift-sandboxed-containers-operator - operators.openshift.io/infrastructure-features: '["disconnected", "fips"]' operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]' operators.operatorframework.io/builder: operator-sdk-v1.20.1+git