From 90d9656c71e797988caa519a1bcf4359cdd2b8b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Tue, 2 Apr 2024 15:15:23 +0200 Subject: [PATCH 1/3] chore: update feature annotations for lvms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakob Möller --- .../lvms-operator.clusterserviceversion.yaml | 10 ++++++++++ config/manifests/bases/clusterserviceversion.yaml.in | 12 +++++++++++- .../bases/lvms-operator.clusterserviceversion.yaml | 12 +++++++++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/bundle/manifests/lvms-operator.clusterserviceversion.yaml b/bundle/manifests/lvms-operator.clusterserviceversion.yaml index ead63e69e..aeebfc24a 100644 --- a/bundle/manifests/lvms-operator.clusterserviceversion.yaml +++ b/bundle/manifests/lvms-operator.clusterserviceversion.yaml @@ -32,6 +32,16 @@ metadata: containerImage: quay.io/ocs-dev/lvm-operator:latest description: Logical volume manager storage provides dynamically provisioned local storage for container workloads + features.operators.openshift.io/cnf: "false" + features.operators.openshift.io/cni: "false" + features.operators.openshift.io/csi: "true" + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "true" + 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: "" operatorframework.io/cluster-monitoring: "true" operatorframework.io/initialization-resource: |- diff --git a/config/manifests/bases/clusterserviceversion.yaml.in b/config/manifests/bases/clusterserviceversion.yaml.in index e57dc75d2..141309bb5 100644 --- a/config/manifests/bases/clusterserviceversion.yaml.in +++ b/config/manifests/bases/clusterserviceversion.yaml.in @@ -43,7 +43,17 @@ metadata: } } } - operators.openshift.io/infrastructure-features: '["disconnected"]' + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/cnf: "false" + features.operators.openshift.io/cni: "false" + features.operators.openshift.io/csi: "true" + 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" + operators.openshift.io/infrastructure-features: '["csi", "disconnected"]' operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]' operators.operatorframework.io/internal-objects: '["logicalvolumes.topolvm.io", "lvmvolumegroups.lvm.topolvm.io", "lvmvolumegroupnodestatuses.lvm.topolvm.io"]' labels: diff --git a/config/manifests/bases/lvms-operator.clusterserviceversion.yaml b/config/manifests/bases/lvms-operator.clusterserviceversion.yaml index 89c542604..4f2354645 100644 --- a/config/manifests/bases/lvms-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/lvms-operator.clusterserviceversion.yaml @@ -43,7 +43,17 @@ metadata: } } } - operators.openshift.io/infrastructure-features: '["disconnected"]' + features.operators.openshift.io/disconnected: "true" + features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/proxy-aware: "false" + features.operators.openshift.io/cnf: "false" + features.operators.openshift.io/cni: "false" + features.operators.openshift.io/csi: "true" + 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" + operators.openshift.io/infrastructure-features: '["csi", "disconnected"]' operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]' operators.operatorframework.io/internal-objects: '["logicalvolumes.topolvm.io", "lvmvolumegroups.lvm.topolvm.io", "lvmvolumegroupnodestatuses.lvm.topolvm.io"]' labels: From 32f63ed71a3d99f7a964f71e11de580054b29eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Wed, 27 Mar 2024 12:34:31 +0100 Subject: [PATCH 2/3] fix: fixup envtest version to <1.21 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakob Möller --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c9d4e81f8..2db2f0fd4 100644 --- a/Makefile +++ b/Makefile @@ -217,7 +217,7 @@ kustomize: ## Download kustomize locally if necessary. ENVTEST = $(shell pwd)/bin/setup-envtest envtest: ## Download envtest-setup locally if necessary. - $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest) + $(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@bf15e44028f908c790721fc8fe67c7bf2d06a611) JSONNET = $(shell pwd)/bin/jsonnet jsonnet: ## Download jsonnet locally if necessary. From da7c829a8553ad970b50f22d6fa6a193562d0c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20M=C3=B6ller?= Date: Tue, 2 Apr 2024 15:19:38 +0200 Subject: [PATCH 3/3] chore: move fips-compliant state to false from cherry pick MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jakob Möller --- bundle/manifests/lvms-operator.clusterserviceversion.yaml | 4 ++-- config/manifests/bases/clusterserviceversion.yaml.in | 2 +- .../manifests/bases/lvms-operator.clusterserviceversion.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bundle/manifests/lvms-operator.clusterserviceversion.yaml b/bundle/manifests/lvms-operator.clusterserviceversion.yaml index aeebfc24a..bdc6b4115 100644 --- a/bundle/manifests/lvms-operator.clusterserviceversion.yaml +++ b/bundle/manifests/lvms-operator.clusterserviceversion.yaml @@ -36,7 +36,7 @@ metadata: features.operators.openshift.io/cni: "false" features.operators.openshift.io/csi: "true" features.operators.openshift.io/disconnected: "true" - features.operators.openshift.io/fips-compliant: "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" @@ -78,7 +78,7 @@ metadata: } } } - operators.openshift.io/infrastructure-features: '["disconnected"]' + operators.openshift.io/infrastructure-features: '["csi", "disconnected"]' operators.openshift.io/valid-subscription: '["OpenShift Container Platform", "OpenShift Platform Plus"]' operators.operatorframework.io/builder: operator-sdk-v1.23.0 diff --git a/config/manifests/bases/clusterserviceversion.yaml.in b/config/manifests/bases/clusterserviceversion.yaml.in index 141309bb5..36eb77ab3 100644 --- a/config/manifests/bases/clusterserviceversion.yaml.in +++ b/config/manifests/bases/clusterserviceversion.yaml.in @@ -44,7 +44,7 @@ metadata: } } features.operators.openshift.io/disconnected: "true" - features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/fips-compliant: "false" features.operators.openshift.io/proxy-aware: "false" features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "false" diff --git a/config/manifests/bases/lvms-operator.clusterserviceversion.yaml b/config/manifests/bases/lvms-operator.clusterserviceversion.yaml index 4f2354645..6ef7b8bdf 100644 --- a/config/manifests/bases/lvms-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/lvms-operator.clusterserviceversion.yaml @@ -44,7 +44,7 @@ metadata: } } features.operators.openshift.io/disconnected: "true" - features.operators.openshift.io/fips-compliant: "true" + features.operators.openshift.io/fips-compliant: "false" features.operators.openshift.io/proxy-aware: "false" features.operators.openshift.io/cnf: "false" features.operators.openshift.io/cni: "false"