fix bundle for upstream

Author: jcantrill

Makefile

@@ -166,10 +166,9 @@ test-unit:
 test-cluster:
 	go test  -cover -race ./test/... -- -root=$(CURDIR)
 
-MANIFEST_VERSION?="5.0"
+OPENSHIFT_VERSIONS?="v4.7"
 generate-bundle: regenerate $(OPM)
-	MANIFEST_VERSION=${MANIFEST_VERSION} hack/generate-bundle.sh
-
+	MANIFEST_VERSION=${OCP_VERSION} OPENSHIFT_VERSIONS=${OPENSHIFT_VERSIONS} hack/generate-bundle.sh
 .PHONY: generate-bundle
 
 # NOTE: This is the CI e2e entry point.

bundle.Dockerfile

@@ -4,14 +4,14 @@ LABEL operators.operatorframework.io.bundle.mediatype.v1=registry+v1
 LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/
 LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/
 LABEL operators.operatorframework.io.bundle.package.v1=cluster-logging-operator
-LABEL operators.operatorframework.io.bundle.channels.v1=5.0
-LABEL operators.operatorframework.io.bundle.channel.default.v1=5.0
+LABEL operators.operatorframework.io.bundle.channels.v1=5.1
+LABEL operators.operatorframework.io.bundle.channel.default.v1=5.1
 
 COPY bundle/manifests /manifests/
 COPY bundle/metadata /metadata/
 
 LABEL com.redhat.delivery.operator.bundle=true
-LABEL com.redhat.openshift.versions="v5.0"
+LABEL com.redhat.openshift.versions="v4.7"
 
 LABEL \
     com.redhat.component="cluster-logging-operator" \

bundle/manifests/cluster-logging.v5.0.0.clusterserviceversion.yaml renamed to bundle/manifests/cluster-logging.v5.1.0.clusterserviceversion.yaml

@@ -4,7 +4,7 @@ apiVersion: operators.coreos.com/v1alpha1
 kind: ClusterServiceVersion
 metadata:
   # The version value is substituted by the ART pipeline
-  name: clusterlogging.v5.0.0
+  name: clusterlogging.v5.1.0
   namespace: placeholder
   labels:
     "operatorframework.io/arch.amd64": supported
@@ -99,7 +99,7 @@ metadata:
         ]
 spec:
   # The version value is substituted by the ART pipeline
-  version: 5.0.0
+  version: 5.1.0
   displayName: Cluster Logging
   minKubeVersion: 1.18.3
   description: |

bundle/manifests/logging.openshift.io_clusterlogforwarders_crd.yaml

@@ -1,6 +1,6 @@
 annotations:
-  operators.operatorframework.io.bundle.channel.default.v1: "5.0"
-  operators.operatorframework.io.bundle.channels.v1: "5.0"
+  operators.operatorframework.io.bundle.channel.default.v1: "5.1"
+  operators.operatorframework.io.bundle.channels.v1: "5.1"
   operators.operatorframework.io.bundle.manifests.v1: manifests/
   operators.operatorframework.io.bundle.mediatype.v1: registry+v1
   operators.operatorframework.io.bundle.metadata.v1: metadata/

bundle/manifests/logging.openshift.io_clusterloggings_crd.yaml

@@ -11,7 +11,7 @@ $OPM alpha bundle generate --directory manifests/${MANIFEST_VERSION} --package c
 cat >> bundle.Dockerfile <<EOF
 
 LABEL com.redhat.delivery.operator.bundle=true
-LABEL com.redhat.openshift.versions="v${MANIFEST_VERSION}"
+LABEL com.redhat.openshift.versions="${OPENSHIFT_VERSIONS}"
 
 LABEL \\
     com.redhat.component="cluster-logging-operator" \\
@@ -27,4 +27,4 @@ EOF
 find bundle/manifests/ -type f ! \( -name "cluster-logging*" -o -name "*crd.yaml" \) -delete
 
 echo "validating bundle..."
-$OPERATOR_SDK bundle validate --verbose bundle
+$OPERATOR_SDK bundle validate --verbose bundle

bundle/metadata/annotations.yaml

@@ -15,7 +15,7 @@ import (
 var _ = Describe("[LogForwarding] Functional tests for message format", func() {
 
 	var (
-		framework               *functional.FluentdFunctionalFramework
+		framework *functional.FluentdFunctionalFramework
 	)
 
 	BeforeEach(func() {
@@ -104,7 +104,7 @@ var _ = Describe("[LogForwarding] Functional tests for message format", func() {
 		// Template expected as output Log
 		var outputLogTemplate = functional.NewApplicationLogTemplate()
 		outputLogTemplate.Timestamp = nanoTime
-		outputLogTemplate.Message =  fmt.Sprintf("regex:^%s.*$", message)
+		outputLogTemplate.Message = fmt.Sprintf("regex:^%s.*$", message)
 		outputLogTemplate.Level = "info"
 
 		// Write log line as input to fluentd
@@ -132,7 +132,7 @@ var _ = Describe("[LogForwarding] Functional tests for message format", func() {
 		// Template expected as output Log
 		var outputLogTemplate = functional.NewApplicationLogTemplate()
 		outputLogTemplate.Timestamp = nanoTime
-		outputLogTemplate.Message =  fmt.Sprintf("regex:^%s.*$", message)
+		outputLogTemplate.Message = fmt.Sprintf("regex:^%s.*$", message)
 		outputLogTemplate.Level = "*"
 
 		// Write log line as input to fluentd