Merge pull request #597 from tchughesiv/RHPAM-3471

[RHPAM-3471] remove offending label & increment csv version
kiegroup · Feb 18, 2021 · 1e51dac · 1e51dac
2 parents 4fba75e + 5c8aecd
commit 1e51dac
Show file tree

Hide file tree

Showing 11 changed files with 1,407 additions and 3 deletions.
diff --git a/...og/dev/7.10.0-2/manifests/businessautomation-operator.7.10.0-2.clusterserviceversion.yaml b/...og/dev/7.10.0-2/manifests/businessautomation-operator.7.10.0-2.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/dev/7.10.0-2/manifests/kieapp.crd.yaml b/deploy/olm-catalog/dev/7.10.0-2/manifests/kieapp.crd.yaml
@@ -0,0 +1 @@
+../../../../crds/kieapp.crd.yaml
diff --git a/deploy/olm-catalog/dev/7.10.0-2/metadata/annotations.yaml b/deploy/olm-catalog/dev/7.10.0-2/metadata/annotations.yaml
@@ -0,0 +1,10 @@
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: businessautomation-operator
+  operators.operatorframework.io.metrics.builder: operator-sdk-v0.19.2
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go
diff --git a/...g/prod/7.10.0-2/manifests/businessautomation-operator.7.10.0-2.clusterserviceversion.yaml b/...g/prod/7.10.0-2/manifests/businessautomation-operator.7.10.0-2.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/prod/7.10.0-2/manifests/kieapp.crd.yaml b/deploy/olm-catalog/prod/7.10.0-2/manifests/kieapp.crd.yaml
@@ -0,0 +1 @@
+../../../../crds/kieapp.crd.yaml
diff --git a/deploy/olm-catalog/prod/7.10.0-2/metadata/annotations.yaml b/deploy/olm-catalog/prod/7.10.0-2/metadata/annotations.yaml
@@ -0,0 +1,10 @@
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: businessautomation-operator
+  operators.operatorframework.io.metrics.builder: operator-sdk-v0.19.2
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go
diff --git a/...g/test/7.10.0-2/manifests/businessautomation-operator.7.10.0-2.clusterserviceversion.yaml b/...g/test/7.10.0-2/manifests/businessautomation-operator.7.10.0-2.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/test/7.10.0-2/manifests/kieapp.crd.yaml b/deploy/olm-catalog/test/7.10.0-2/manifests/kieapp.crd.yaml
@@ -0,0 +1 @@
+../../../../crds/kieapp.crd.yaml
diff --git a/deploy/olm-catalog/test/7.10.0-2/metadata/annotations.yaml b/deploy/olm-catalog/test/7.10.0-2/metadata/annotations.yaml
@@ -0,0 +1,10 @@
+annotations:
+  operators.operatorframework.io.bundle.channel.default.v1: stable
+  operators.operatorframework.io.bundle.channels.v1: stable
+  operators.operatorframework.io.bundle.manifests.v1: manifests/
+  operators.operatorframework.io.bundle.mediatype.v1: registry+v1
+  operators.operatorframework.io.bundle.metadata.v1: metadata/
+  operators.operatorframework.io.bundle.package.v1: businessautomation-operator
+  operators.operatorframework.io.metrics.builder: operator-sdk-v0.19.2
+  operators.operatorframework.io.metrics.mediatype.v1: metrics+v1
+  operators.operatorframework.io.metrics.project_layout: go
diff --git a/pkg/controller/kieapp/defaults/defaults.go b/pkg/controller/kieapp/defaults/defaults.go
@@ -177,7 +177,7 @@ func setLabels(cr *api.KieApp, labels map[string]string, subcomponent string, su
 	labels[constants.LabelRHproductName] = constants.ProductName
 	labels[constants.LabelRHproductVersion] = cr.Status.Applied.Version
 	labels[constants.LabelRHcomponentName] = "PAM"
-	labels[constants.LabelRHsubcomponentName] = subcomponent
+	// labels[constants.LabelRHsubcomponentName] = subcomponent
 	labels[constants.LabelRHcomponentVersion] = cr.Status.Applied.Version
 	labels[constants.LabelRHsubcomponentType] = subcomponentType
 	labels[constants.LabelRHcompany] = "Red_Hat"

diff --git a/version/version.go b/version/version.go
@@ -8,9 +8,9 @@ var (
 	// Version - current version
 	Version = constants.CurrentVersion
 	// CsvVersion - csv release
-	CsvVersion = Version + "-1"
+	CsvVersion = Version + "-2"
 	// PriorVersion - prior version
 	PriorVersion = constants.PriorVersion1
 	// CsvPriorVersion - prior csv release
-	CsvPriorVersion = PriorVersion + "-1"
+	CsvPriorVersion = Version + "-1"
 )