Merge pull request #510 from iamniting/skip

Add required changes to the makefile
red-hat-storage · Nov 21, 2024 · f415659 · f415659
2 parents 72594e8 + 316cb45
commit f415659
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -182,6 +182,11 @@ checkout-bundle-timestamp:
 .PHONY: bundle
 bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
 	# Dependencies bundle
+	cd config/bundle && $(KUSTOMIZE) edit add annotation --force \
+		'olm.skipRange':"$(SKIP_RANGE)" \
+		'olm.properties':'[{"type": "olm.maxOpenShiftVersion", "value": "$(MAX_OCP_VERSION)"}]' && \
+		$(KUSTOMIZE) edit add patch --name odf-dependencies.v0.0.0 --kind ClusterServiceVersion \
+		--patch '[{"op": "replace", "path": "/spec/replaces", "value": "$(REPLACES)"}]'
 	$(KUSTOMIZE) build config/bundle | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS) \
 		--output-dir bundle/odf-dependencies --package odf-dependencies
 	$(OPERATOR_SDK) bundle validate bundle/odf-dependencies
@@ -194,7 +199,6 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 	cd config/console && $(KUSTOMIZE) edit set image odf-console=$(ODF_CONSOLE_IMG)
 	cd config/manifests/bases && $(KUSTOMIZE) edit add annotation --force \
 		'olm.skipRange':"$(SKIP_RANGE)" \
-	        'operators.operatorframework.io/operator-type':"$(OPERATOR_TYPE)" \
 		'olm.properties':'[{"type": "olm.maxOpenShiftVersion", "value": "$(MAX_OCP_VERSION)"}]' && \
 		$(KUSTOMIZE) edit add patch --name odf-operator.v0.0.0 --kind ClusterServiceVersion \
 		--patch '[{"op": "replace", "path": "/spec/replaces", "value": "$(REPLACES)"}]'

diff --git a/bundle/odf-dependencies/manifests/odf-dependencies.clusterserviceversion.yaml b/bundle/odf-dependencies/manifests/odf-dependencies.clusterserviceversion.yaml
@@ -3,7 +3,9 @@ kind: ClusterServiceVersion
 metadata:
   annotations:
     alm-examples: '[]'
-    createdAt: "2024-11-14T03:00:40Z"
+    createdAt: "2024-11-21T08:59:44Z"
+    olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
+    olm.skipRange: ""
     operatorframework.io/suggested-namespace: openshift-storage
     operators.operatorframework.io/builder: operator-sdk-v1.31.0
     operators.operatorframework.io/operator-type: non-standalone

diff --git a/catalog/odf-dependencies.yaml b/catalog/odf-dependencies.yaml
@@ -3,6 +3,8 @@ image: quay.io/ocs-dev/odf-dependencies-bundle:latest
 name: odf-dependencies.v4.18.0
 package: odf-dependencies
 properties:
+- type: olm.maxOpenShiftVersion
+  value: "4.19"
 - type: olm.package
   value:
     packageName: odf-dependencies
@@ -41,7 +43,7 @@ properties:
     versionRange: '>=4.17.0 <=4.18.0'
 - type: olm.bundle.object
   value:
-    data: eyJhcGlWZXJzaW9uIjoib3BlcmF0b3JzLmNvcmVvcy5jb20vdjFhbHBoYTEiLCJraW5kIjoiQ2x1c3RlclNlcnZpY2VWZXJzaW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiYWxtLWV4YW1wbGVzIjoiW10iLCJjcmVhdGVkQXQiOiIyMDI0LTExLTE0VDAzOjAwOjQwWiIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL3N1Z2dlc3RlZC1uYW1lc3BhY2UiOiJvcGVuc2hpZnQtc3RvcmFnZSIsIm9wZXJhdG9ycy5vcGVyYXRvcmZyYW1ld29yay5pby9idWlsZGVyIjoib3BlcmF0b3Itc2RrLXYxLjMxLjAiLCJvcGVyYXRvcnMub3BlcmF0b3JmcmFtZXdvcmsuaW8vb3BlcmF0b3ItdHlwZSI6Im5vbi1zdGFuZGFsb25lIiwib3BlcmF0b3JzLm9wZXJhdG9yZnJhbWV3b3JrLmlvL3Byb2plY3RfbGF5b3V0IjoiZ28ua3ViZWJ1aWxkZXIuaW8vdjMifSwibGFiZWxzIjp7Im9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2guYW1kNjQiOiJzdXBwb3J0ZWQiLCJvcGVyYXRvcmZyYW1ld29yay5pby9hcmNoLnBwYzY0bGUiOiJzdXBwb3J0ZWQiLCJvcGVyYXRvcmZyYW1ld29yay5pby9hcmNoLnMzOTB4Ijoic3VwcG9ydGVkIn0sIm5hbWUiOiJvZGYtZGVwZW5kZW5jaWVzLnY0LjE4LjAiLCJuYW1lc3BhY2UiOiJwbGFjZWhvbGRlciJ9LCJzcGVjIjp7ImFwaXNlcnZpY2VkZWZpbml0aW9ucyI6e30sImN1c3RvbXJlc291cmNlZGVmaW5pdGlvbnMiOnt9LCJkZXNjcmlwdGlvbiI6ImRlcGxveXMgZGVwZW5kZW5jaWVzLlxuIiwiZGlzcGxheU5hbWUiOiJEYXRhIEZvdW5kYXRpb24gRGVwZW5kZW5jaWVzIiwiaWNvbiI6W3siYmFzZTY0ZGF0YSI6IlBITjJaeUJwWkQwaVRHRjVaWEpmTVNJZ1pHRjBZUzF1WVcxbFBTSk1ZWGxsY2lBeElpQjRiV3h1Y3owaWFIUjBjRG92TDNkM2R5NTNNeTV2Y21jdk1qQXdNQzl6ZG1jaUlIWnBaWGRDYjNnOUlqQWdNQ0F4T1RJZ01UUTFJajQ4WkdWbWN6NDhjM1I1YkdVK0xtTnNjeTB4ZTJacGJHdzZJMlV3TUR0OVBDOXpkSGxzWlQ0OEwyUmxabk0rUEhScGRHeGxQbEpsWkVoaGRDMU1iMmR2TFVoaGRDMURiMnh2Y2p3dmRHbDBiR1UrUEhCaGRHZ2daRDBpVFRFMU55NDNOeXcyTWk0Mk1XRXhOQ3d4TkN3d0xEQXNNU3d1TXpFc015NDBNbU13TERFMExqZzRMVEU0TGpFc01UY3VORFl0TXpBdU5qRXNNVGN1TkRaRE56Z3VPRE1zT0RNdU5Ea3NOREl1TlRNc05UTXVNallzTkRJdU5UTXNORFJoTmk0ME15dzJMalF6TERBc01Dd3hMQzR5TWkweExqazBiQzB6TGpZMkxEa3VNRFpoTVRndU5EVXNNVGd1TkRVc01Dd3dMREF0TVM0MU1TdzNMak16WXpBc01UZ3VNVEVzTkRFc05EVXVORGdzT0RjdU56UXNORFV1TkRnc01qQXVOamtzTUN3ek5pNDBNeTAzTGpjMkxETTJMalF6TFRJeExqYzNMREF0TVM0d09Dd3dMVEV1T1RRdE1TNDNNeTB4TUM0eE0xb2lMejQ4Y0dGMGFDQmpiR0Z6Y3owaVkyeHpMVEVpSUdROUlrMHhNamN1TkRjc09ETXVORGxqTVRJdU5URXNNQ3d6TUM0Mk1TMHlMalU0TERNd0xqWXhMVEUzTGpRMllURTBMREUwTERBc01Dd3dMUzR6TVMwekxqUXliQzAzTGpRMUxUTXlMak0yWXkweExqY3lMVGN1TVRJdE15NHlNeTB4TUM0ek5TMHhOUzQzTXkweE5pNDJRekV5TkM0NE9TdzRMalk1TERFd015NDNOaTQxTERrM0xqVXhMalVzT1RFdU5qa3VOU3c1TUN3NExEZ3pMakEyTERoakxUWXVOamdzTUMweE1TNDJOQzAxTGpZdE1UY3VPRGt0TlM0MkxUWXNNQzA1TGpreExEUXVNRGt0TVRJdU9UTXNNVEl1TlN3d0xEQXRPQzQwTVN3eU15NDNNaTA1TGpRNUxESTNMakUyUVRZdU5ETXNOaTQwTXl3d0xEQXNNQ3cwTWk0MU15dzBOR013TERrdU1qSXNNell1TXl3ek9TNDBOU3c0TkM0NU5Dd3pPUzQwTlUweE5qQXNOekl1TURkak1TNDNNeXc0TGpFNUxERXVOek1zT1M0d05Td3hMamN6TERFd0xqRXpMREFzTVRRdE1UVXVOelFzTWpFdU56Y3RNell1TkRNc01qRXVOemRETnpndU5UUXNNVEEwTERNM0xqVTRMRGMyTGpZc016Y3VOVGdzTlRndU5EbGhNVGd1TkRVc01UZ3VORFVzTUN3d0xERXNNUzQxTVMwM0xqTXpRekl5TGpJM0xEVXlMQzQxTERVMUxDNDFMRGMwTGpJeVl6QXNNekV1TkRnc056UXVOVGtzTnpBdU1qZ3NNVE16TGpZMUxEY3dMakk0TERRMUxqSTRMREFzTlRZdU55MHlNQzQwT0N3MU5pNDNMVE0yTGpZMUxEQXRNVEl1TnpJdE1URXRNamN1TVRZdE16QXVPRE10TXpVdU56Z2lMejQ4TDNOMlp6ND0iLCJtZWRpYXR5cGUiOiJpbWFnZS9zdmcreG1sIn1dLCJpbnN0YWxsIjp7InNwZWMiOnsiZGVwbG95bWVudHMiOltdfSwic3RyYXRlZ3kiOiJkZXBsb3ltZW50In0sImluc3RhbGxNb2RlcyI6W3sic3VwcG9ydGVkIjp0cnVlLCJ0eXBlIjoiT3duTmFtZXNwYWNlIn0seyJzdXBwb3J0ZWQiOnRydWUsInR5cGUiOiJTaW5nbGVOYW1lc3BhY2UifSx7InN1cHBvcnRlZCI6ZmFsc2UsInR5cGUiOiJNdWx0aU5hbWVzcGFjZSJ9LHsic3VwcG9ydGVkIjpmYWxzZSwidHlwZSI6IkFsbE5hbWVzcGFjZXMifV0sImxpbmtzIjpbeyJuYW1lIjoiU291cmNlIENvZGUiLCJ1cmwiOiJodHRwczovL2dpdGh1Yi5jb20vcmVkLWhhdC1zdG9yYWdlL29kZi1vcGVyYXRvciJ9XSwibWFpbnRhaW5lcnMiOlt7ImVtYWlsIjoib2NzLXN1cHBvcnRAcmVkaGF0LmNvbSIsIm5hbWUiOiJSZWQgSGF0IFN1cHBvcnQifV0sIm1hdHVyaXR5IjoiYWxwaGEiLCJtaW5LdWJlVmVyc2lvbiI6IjEuMTYuMCIsInByb3ZpZGVyIjp7Im5hbWUiOiJSZWQgSGF0In0sInZlcnNpb24iOiI0LjE4LjAifX0=
+    data: eyJhcGlWZXJzaW9uIjoib3BlcmF0b3JzLmNvcmVvcy5jb20vdjFhbHBoYTEiLCJraW5kIjoiQ2x1c3RlclNlcnZpY2VWZXJzaW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiYWxtLWV4YW1wbGVzIjoiW10iLCJjcmVhdGVkQXQiOiIyMDI0LTExLTIxVDA4OjU5OjQ0WiIsIm9sbS5wcm9wZXJ0aWVzIjoiW3tcInR5cGVcIjogXCJvbG0ubWF4T3BlblNoaWZ0VmVyc2lvblwiLCBcInZhbHVlXCI6IFwiNC4xOVwifV0iLCJvbG0uc2tpcFJhbmdlIjoiIiwib3BlcmF0b3JmcmFtZXdvcmsuaW8vc3VnZ2VzdGVkLW5hbWVzcGFjZSI6Im9wZW5zaGlmdC1zdG9yYWdlIiwib3BlcmF0b3JzLm9wZXJhdG9yZnJhbWV3b3JrLmlvL2J1aWxkZXIiOiJvcGVyYXRvci1zZGstdjEuMzEuMCIsIm9wZXJhdG9ycy5vcGVyYXRvcmZyYW1ld29yay5pby9vcGVyYXRvci10eXBlIjoibm9uLXN0YW5kYWxvbmUiLCJvcGVyYXRvcnMub3BlcmF0b3JmcmFtZXdvcmsuaW8vcHJvamVjdF9sYXlvdXQiOiJnby5rdWJlYnVpbGRlci5pby92MyJ9LCJsYWJlbHMiOnsib3BlcmF0b3JmcmFtZXdvcmsuaW8vYXJjaC5hbWQ2NCI6InN1cHBvcnRlZCIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2gucHBjNjRsZSI6InN1cHBvcnRlZCIsIm9wZXJhdG9yZnJhbWV3b3JrLmlvL2FyY2guczM5MHgiOiJzdXBwb3J0ZWQifSwibmFtZSI6Im9kZi1kZXBlbmRlbmNpZXMudjQuMTguMCIsIm5hbWVzcGFjZSI6InBsYWNlaG9sZGVyIn0sInNwZWMiOnsiYXBpc2VydmljZWRlZmluaXRpb25zIjp7fSwiY3VzdG9tcmVzb3VyY2VkZWZpbml0aW9ucyI6e30sImRlc2NyaXB0aW9uIjoiZGVwbG95cyBkZXBlbmRlbmNpZXMuXG4iLCJkaXNwbGF5TmFtZSI6IkRhdGEgRm91bmRhdGlvbiBEZXBlbmRlbmNpZXMiLCJpY29uIjpbeyJiYXNlNjRkYXRhIjoiUEhOMlp5QnBaRDBpVEdGNVpYSmZNU0lnWkdGMFlTMXVZVzFsUFNKTVlYbGxjaUF4SWlCNGJXeHVjejBpYUhSMGNEb3ZMM2QzZHk1M015NXZjbWN2TWpBd01DOXpkbWNpSUhacFpYZENiM2c5SWpBZ01DQXhPVElnTVRRMUlqNDhaR1ZtY3o0OGMzUjViR1UrTG1Oc2N5MHhlMlpwYkd3NkkyVXdNRHQ5UEM5emRIbHNaVDQ4TDJSbFpuTStQSFJwZEd4bFBsSmxaRWhoZEMxTWIyZHZMVWhoZEMxRGIyeHZjand2ZEdsMGJHVStQSEJoZEdnZ1pEMGlUVEUxTnk0M055dzJNaTQyTVdFeE5Dd3hOQ3d3TERBc01Td3VNekVzTXk0ME1tTXdMREUwTGpnNExURTRMakVzTVRjdU5EWXRNekF1TmpFc01UY3VORFpETnpndU9ETXNPRE11TkRrc05ESXVOVE1zTlRNdU1qWXNOREl1TlRNc05EUmhOaTQwTXl3MkxqUXpMREFzTUN3eExDNHlNaTB4TGprMGJDMHpMalkyTERrdU1EWmhNVGd1TkRVc01UZ3VORFVzTUN3d0xEQXRNUzQxTVN3M0xqTXpZekFzTVRndU1URXNOREVzTkRVdU5EZ3NPRGN1TnpRc05EVXVORGdzTWpBdU5qa3NNQ3d6Tmk0ME15MDNMamMyTERNMkxqUXpMVEl4TGpjM0xEQXRNUzR3T0N3d0xURXVPVFF0TVM0M015MHhNQzR4TTFvaUx6NDhjR0YwYUNCamJHRnpjejBpWTJ4ekxURWlJR1E5SWsweE1qY3VORGNzT0RNdU5EbGpNVEl1TlRFc01Dd3pNQzQyTVMweUxqVTRMRE13TGpZeExURTNMalEyWVRFMExERTBMREFzTUN3d0xTNHpNUzB6TGpReWJDMDNMalExTFRNeUxqTTJZeTB4TGpjeUxUY3VNVEl0TXk0eU15MHhNQzR6TlMweE5TNDNNeTB4Tmk0MlF6RXlOQzQ0T1N3NExqWTVMREV3TXk0M05pNDFMRGszTGpVeExqVXNPVEV1TmprdU5TdzVNQ3c0TERnekxqQTJMRGhqTFRZdU5qZ3NNQzB4TVM0Mk5DMDFMall0TVRjdU9Ea3ROUzQyTFRZc01DMDVMamt4TERRdU1Ea3RNVEl1T1RNc01USXVOU3d3TERBdE9DNDBNU3d5TXk0M01pMDVMalE1TERJM0xqRTJRVFl1TkRNc05pNDBNeXd3TERBc01DdzBNaTQxTXl3ME5HTXdMRGt1TWpJc016WXVNeXd6T1M0ME5TdzROQzQ1TkN3ek9TNDBOVTB4TmpBc056SXVNRGRqTVM0M015dzRMakU1TERFdU56TXNPUzR3TlN3eExqY3pMREV3TGpFekxEQXNNVFF0TVRVdU56UXNNakV1TnpjdE16WXVORE1zTWpFdU56ZEROemd1TlRRc01UQTBMRE0zTGpVNExEYzJMallzTXpjdU5UZ3NOVGd1TkRsaE1UZ3VORFVzTVRndU5EVXNNQ3d3TERFc01TNDFNUzAzTGpNelF6SXlMakkzTERVeUxDNDFMRFUxTEM0MUxEYzBMakl5WXpBc016RXVORGdzTnpRdU5Ua3NOekF1TWpnc01UTXpMalkxTERjd0xqSTRMRFExTGpJNExEQXNOVFl1TnkweU1DNDBPQ3cxTmk0M0xUTTJMalkxTERBdE1USXVOekl0TVRFdE1qY3VNVFl0TXpBdU9ETXRNelV1TnpnaUx6NDhMM04yWno0PSIsIm1lZGlhdHlwZSI6ImltYWdlL3N2Zyt4bWwifV0sImluc3RhbGwiOnsic3BlYyI6eyJkZXBsb3ltZW50cyI6W119LCJzdHJhdGVneSI6ImRlcGxveW1lbnQifSwiaW5zdGFsbE1vZGVzIjpbeyJzdXBwb3J0ZWQiOnRydWUsInR5cGUiOiJPd25OYW1lc3BhY2UifSx7InN1cHBvcnRlZCI6dHJ1ZSwidHlwZSI6IlNpbmdsZU5hbWVzcGFjZSJ9LHsic3VwcG9ydGVkIjpmYWxzZSwidHlwZSI6Ik11bHRpTmFtZXNwYWNlIn0seyJzdXBwb3J0ZWQiOmZhbHNlLCJ0eXBlIjoiQWxsTmFtZXNwYWNlcyJ9XSwibGlua3MiOlt7Im5hbWUiOiJTb3VyY2UgQ29kZSIsInVybCI6Imh0dHBzOi8vZ2l0aHViLmNvbS9yZWQtaGF0LXN0b3JhZ2Uvb2RmLW9wZXJhdG9yIn1dLCJtYWludGFpbmVycyI6W3siZW1haWwiOiJvY3Mtc3VwcG9ydEByZWRoYXQuY29tIiwibmFtZSI6IlJlZCBIYXQgU3VwcG9ydCJ9XSwibWF0dXJpdHkiOiJhbHBoYSIsIm1pbkt1YmVWZXJzaW9uIjoiMS4xNi4wIiwicHJvdmlkZXIiOnsibmFtZSI6IlJlZCBIYXQifSwidmVyc2lvbiI6IjQuMTguMCJ9fQ==
 relatedImages:
 - image: quay.io/ocs-dev/odf-dependencies-bundle:latest
   name: ""

diff --git a/config/bundle/kustomization.yaml b/config/bundle/kustomization.yaml
@@ -1,2 +1,12 @@
 resources:
 - csv.yaml
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+commonAnnotations:
+  olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
+  olm.skipRange: ""
+patches:
+- patch: '[{"op": "replace", "path": "/spec/replaces", "value": ""}]'
+  target:
+    kind: ClusterServiceVersion
+    name: odf-dependencies.v0.0.0
diff --git a/config/manifests/bases/kustomization.yaml b/config/manifests/bases/kustomization.yaml
@@ -8,7 +8,6 @@ patchesStrategicMerge:
 commonAnnotations:
   olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.19"}]'
   olm.skipRange: ""
-  operators.operatorframework.io/operator-type: standalone
 patches:
 - patch: '[{"op": "replace", "path": "/spec/replaces", "value": ""}]'
   target:

diff --git a/config/manifests/bases/odf-operator.clusterserviceversion.yaml b/config/manifests/bases/odf-operator.clusterserviceversion.yaml
@@ -28,6 +28,7 @@ metadata:
     operators.openshift.io/infrastructure-features: '["disconnected"]'
     operators.openshift.io/valid-subscription: '["OpenShift Platform Plus","OpenShift
       Data Foundation Essentials","OpenShift Data Foundation Advanced"]'
+    operators.operatorframework.io/operator-type: standalone
     repository: https://github.com/red-hat-storage/odf-operator
     support: Red Hat
     vendors.odf.openshift.io/kind: '["storagecluster.ocs.openshift.io/v1", "flashsystemcluster.odf.ibm.com/v1alpha1"]'

diff --git a/hack/make-bundle-vars.mk b/hack/make-bundle-vars.mk
@@ -30,13 +30,6 @@ BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL)
 # OPM_RENDER_OPTS will be used while rendering bundle images
 OPM_RENDER_OPTS ?=
 
-# Each CSV has the option to specify an annotation 'operators.operatorframework.io/operator-type',
-# which is an annotation that is (only!) read by the OLM Console UI to determine the visibility of
-# the Operator package/bundle in the Operator Hub UI.
-#
-# Current supported values are 'standalone' (visible) and 'non-standalone' (not visible)
-OPERATOR_TYPE ?= standalone
-
 # Each CSV has a replaces parameter that indicates which Operator it replaces.
 # This builds a graph of CSVs that can be queried by OLM, and updates can be
 # shared between channels. Channels can be thought of as entry points into

diff --git a/hack/make-tools.mk b/hack/make-tools.mk
@@ -11,7 +11,7 @@ controller-gen: ## Download controller-gen locally if necessary.
 
 KUSTOMIZE = $(BIN_DIR)/kustomize
 kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected].5)
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/[email protected].7)
 
 GINKGO = $(BIN_DIR)/ginkgo
 ginkgo: ## Download ginkgo locally if necessary.