bundle: fix generation and add OpenShift related fixes

Signed-off-by: Tuomas Katila <tuomas.katila@intel.com>

Author: tkatila

Makefile

@@ -33,10 +33,10 @@ IMAGE_TAG_BASE ?= intel/intel-network-operator
 
 # BUNDLE_IMG defines the image:tag used for the bundle.
 # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=<some-registry>/<project-name-bundle>:<tag>)
-BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(VERSION)
+BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:v$(TAG)
 
 # BUNDLE_GEN_FLAGS are the flags passed to the operator-sdk generate bundle command
-BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
+BUNDLE_GEN_FLAGS ?= -q --overwrite --version $(TAG) $(BUNDLE_METADATA_OPTS)
 
 # USE_IMAGE_DIGESTS defines if images are resolved via tags or digests
 # You can enable this value if you would like to use SHA Based Digests
@@ -342,7 +342,7 @@ endif
 
 .PHONY: bundle
 bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
-	$(OPERATOR_SDK) generate kustomize manifests -q
+	$(OPERATOR_SDK) generate kustomize manifests -q --input-dir config/operator/manifests --output-dir config/operator/manifests
 	cd config/operator/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
 	$(KUSTOMIZE) build config/operator/manifests | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
 	$(OPERATOR_SDK) bundle validate ./bundle

config/operator/manifests/bases/network-operator.clusterserviceversion.yaml

@@ -4,7 +4,6 @@ resources:
 - bases/network-operator.clusterserviceversion.yaml
 - ../default
 - ../samples
-- ../scorecard
 
 # [WEBHOOK] To enable webhooks, uncomment all the sections with [WEBHOOK] prefix.
 # Do NOT uncomment sections with prefix [CERTMANAGER], as OLM does not support cert-manager.

config/operator/manifests/kustomization.yaml

@@ -1,7 +1,7 @@
 apiVersion: intel.com/v1alpha1
 kind: NetworkClusterPolicy
 metadata:
-  name: netconf-gaudi-scale-out-l3
+  name: netconf-gaudi-scale-out-l3-metrics
 spec:
   configurationType: gaudi-so
   gaudiScaleOut:

config/operator/samples/gaudi-l3-metrics.yaml

@@ -1,7 +1,7 @@
 apiVersion: intel.com/v1alpha1
 kind: NetworkClusterPolicy
 metadata:
-  name: netconf-gaudi-scale-out-l3
+  name: netconf-gaudi-scale-out-l3-pfc-lldpad
 spec:
   configurationType: gaudi-so
   gaudiScaleOut:

config/operator/samples/gaudi-l3-pfc-lldpad-enabled.yaml

@@ -0,0 +1,5 @@
+resources:
+- gaudi-l2.yaml
+- gaudi-l3-metrics.yaml
+- gaudi-l3-pfc-lldpad-enabled.yaml
+- gaudi-l3.yaml