diff --git a/Makefile b/Makefile index 3a7f6abb..a9cb6774 100644 --- a/Makefile +++ b/Makefile @@ -330,7 +330,7 @@ ifeq ($(BUNDLE_MODE), ocp) endif $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS) # Workaround for: https://issues.redhat.com/browse/OCPBUGS-34901 - yq -i '.spec.customresourcedefinitions.owned |= pick([1, 0])' bundle/manifests/cryostat-operator.clusterserviceversion.yaml + yq -i '.spec.customresourcedefinitions.owned |= reverse' bundle/manifests/cryostat-operator.clusterserviceversion.yaml $(OPERATOR_SDK) bundle validate ./bundle .PHONY: bundle-build diff --git a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml index f13bb43c..fc35c4c4 100644 --- a/bundle/manifests/cryostat-operator.clusterserviceversion.yaml +++ b/bundle/manifests/cryostat-operator.clusterserviceversion.yaml @@ -4,29 +4,6 @@ metadata: annotations: alm-examples: |- [ - { - "apiVersion": "operator.cryostat.io/v1beta1", - "kind": "Cryostat", - "metadata": { - "name": "cryostat-sample" - }, - "spec": { - "enableCertManager": true, - "eventTemplates": [], - "minimal": false, - "reportOptions": { - "replicas": 0 - }, - "storageOptions": { - "pvc": { - "annotations": {}, - "labels": {}, - "spec": {} - } - }, - "trustedCertSecrets": [] - } - }, { "apiVersion": "operator.cryostat.io/v1beta2", "kind": "Cryostat", @@ -53,7 +30,7 @@ metadata: capabilities: Seamless Upgrades categories: Monitoring, Developer Tools containerImage: quay.io/cryostat/cryostat-operator:4.0.0-dev - createdAt: "2024-06-07T17:42:53Z" + createdAt: "2024-06-07T18:04:27Z" description: JVM monitoring and profiling tool operatorframework.io/initialization-resource: |- { diff --git a/config/samples/kustomization.yaml b/config/samples/kustomization.yaml index 08962986..d054dcd4 100644 --- a/config/samples/kustomization.yaml +++ b/config/samples/kustomization.yaml @@ -1,5 +1,5 @@ ## Append samples you want in your CSV to this file as resources ## resources: -- operator_v1beta1_cryostat.yaml +# - operator_v1beta1_cryostat.yaml - operator_v1beta2_cryostat.yaml # +kubebuilder:scaffold:manifestskustomizesamples