Merge pull request #739 from spolti/RHPAM-4158-7.71.0-2

[RHPAM-4158] - CRD conflicts when installing different version of
kiegroup · Feb 23, 2022 · da7c3d4 · da7c3d4
2 parents 601ea04 + 297391e
commit da7c3d4
Show file tree

Hide file tree

Showing 10 changed files with 18,851 additions and 2 deletions.
diff --git a/...olm-catalog/dev/7.12.0-2/manifests/businessautomation-operator.clusterserviceversion.yaml b/...olm-catalog/dev/7.12.0-2/manifests/businessautomation-operator.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/dev/7.12.0-2/manifests/kieapp.crd.yaml b/deploy/olm-catalog/dev/7.12.0-2/manifests/kieapp.crd.yaml
diff --git a/deploy/olm-catalog/dev/7.12.0-2/metadata/annotations.yaml b/deploy/olm-catalog/dev/7.12.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/...lm-catalog/prod/7.12.0-2/manifests/businessautomation-operator.clusterserviceversion.yaml b/...lm-catalog/prod/7.12.0-2/manifests/businessautomation-operator.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/prod/7.12.0-2/manifests/kieapp.crd.yaml b/deploy/olm-catalog/prod/7.12.0-2/manifests/kieapp.crd.yaml
diff --git a/deploy/olm-catalog/prod/7.12.0-2/metadata/annotations.yaml b/deploy/olm-catalog/prod/7.12.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/...lm-catalog/test/7.12.0-2/manifests/businessautomation-operator.clusterserviceversion.yaml b/...lm-catalog/test/7.12.0-2/manifests/businessautomation-operator.clusterserviceversion.yaml
diff --git a/deploy/olm-catalog/test/7.12.0-2/manifests/kieapp.crd.yaml b/deploy/olm-catalog/test/7.12.0-2/manifests/kieapp.crd.yaml
diff --git a/deploy/olm-catalog/test/7.12.0-2/metadata/annotations.yaml b/deploy/olm-catalog/test/7.12.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/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.PriorVersion
 	// CsvPriorVersion - prior csv release
-	CsvPriorVersion = PriorVersion + "-3"
+	CsvPriorVersion = Version + "-1"
 )