CMP-3381: Bump version to 1.3.6

Author: rhmdnd

bundle-hack/update_csv.go

@@ -85,25 +85,24 @@ func addRequiredAnnotations(csv map[string]interface{}){
 	fmt.Println("Added required annotations")
 }
 
-func replaceVersion(version string, csv map[string]interface{}) {
+func replaceVersion(oldVersion, newVersion string, csv map[string]interface{}) {
 	spec, ok := csv["spec"].(map[string]interface{})
 	metadata, ok := csv["metadata"].(map[string]interface{})
 	if !ok {
 		log.Fatal("Error: 'spec' does not exist in the CSV content")
 	}
 
-	manifestVersion := spec["version"].(string)
-	fmt.Println(fmt.Sprintf("Updating version references from %s to %s", manifestVersion, version))
+	fmt.Println(fmt.Sprintf("Updating version references from %s to %s", oldVersion, newVersion))
 
-	spec["version"] = version
-	spec["replaces"] = "file-integrity-operator.v" + manifestVersion
+	spec["version"] = newVersion
+	spec["replaces"] = "file-integrity-operator.v" + oldVersion
 
-	metadata["name"] = strings.Replace(metadata["name"].(string), manifestVersion, version, 1)
+	metadata["name"] = strings.Replace(metadata["name"].(string), oldVersion, newVersion, 1)
 
 	annotations := metadata["annotations"].(map[string]interface{})
-	annotations["olm.skipRange"] = strings.Replace(annotations["olm.skipRange"].(string), manifestVersion, version, 1)
+	annotations["olm.skipRange"] = strings.Replace(annotations["olm.skipRange"].(string), oldVersion, newVersion, 1)
 
-	fmt.Println(fmt.Sprintf("Updated version references from %s to %s", manifestVersion, version))
+	fmt.Println(fmt.Sprintf("Updated version references from %s to %s", oldVersion, newVersion))
 }
 
 func replaceIcon(csv map[string]interface{}) {
@@ -170,20 +169,21 @@ func main() {
 	var csv map[string]interface{}
 
 	manifestsDir := os.Args[1]
-	version := os.Args[2]
+	oldVersion := os.Args[2]
+	newVersion := os.Args[3]
 
 	csvFilename := getInputCSVFilePath(manifestsDir)
 	fmt.Println(fmt.Sprintf("Found manifest in %s", csvFilename))
 
 	readCSV(csvFilename, &csv)
 
 	addRequiredAnnotations(csv)
-	replaceVersion(version, csv)
+	replaceVersion(oldVersion, newVersion, csv)
 	replaceIcon(csv)
 	replaceImages(csv)
 	removeRelated(csv)
 
-	outputCSVFilename := getOutputCSVFilePath(manifestsDir, version)
+	outputCSVFilename := getOutputCSVFilePath(manifestsDir, newVersion)
 	replaceCSV(csvFilename, outputCSVFilename, csv)
-	fmt.Println(fmt.Sprintf("Replaced CSV manifest for %s", version))
+	fmt.Println(fmt.Sprintf("Replaced CSV manifest for %s", newVersion))
 }

bundle.openshift.Dockerfile

@@ -3,15 +3,16 @@ FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.22 as builder
 COPY . .
 WORKDIR bundle-hack
 
-ARG FIO_VERSION="1.3.5-dev"
+ARG FIO_OLD_VERSION="1.3.5"
+ARG FIO_NEW_VERSION="1.3.6"
 
-RUN go run ./update_csv.go ../bundle/manifests ${FIO_VERSION}
+RUN go run ./update_csv.go ../bundle/manifests ${FIO_OLD_VERSION} ${FIO_NEW_VERSION}
 RUN ./update_bundle_annotations.sh
 
 FROM scratch
 
 LABEL name=openshift-file-integrity-operator-bundle
-LABEL version=${FIO_VERSION}
+LABEL version=${FIO_NEW_VERSION}
 LABEL summary='OpenShift File Integrity Operator'
 LABEL maintainer='Infrastructure Security and Compliance Team <[email protected]>'
 

bundle/manifests/file-integrity-operator.clusterserviceversion.yaml

@@ -20,7 +20,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Monitoring,Security
     createdAt: "2024-11-21T18:02:08Z"
-    olm.skipRange: '>=1.0.0 <1.3.5-dev'
+    olm.skipRange: '>=1.0.0 <1.3.6'
     operatorframework.io/cluster-monitoring: "true"
     operatorframework.io/suggested-namespace: openshift-file-integrity
     operators.openshift.io/infrastructure-features: '["disconnected", "fips"]'
@@ -35,7 +35,7 @@ metadata:
     operatorframework.io/arch.s390x: supported
     operatorframework.io/os.linux: supported
     operatorframework.io/os.zos: supported
-  name: file-integrity-operator.v1.3.5-dev
+  name: file-integrity-operator.v1.3.6
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -319,4 +319,5 @@ spec:
   relatedImages:
   - image: quay.io/file-integrity-operator/file-integrity-operator:latest
     name: operator
-  version: 1.3.5-dev
+  version: 1.3.6
+  replaces: file-integrity-operator.v1.3.5

catalog/preamble.json

@@ -13,8 +13,8 @@
     "package": "file-integrity-operator",
     "entries": [
         {
-            "name": "file-integrity-operator.v1.3.5-dev",
-            "skipRange": ">=1.0.0 <1.3.5-dev"
+            "name": "file-integrity-operator.v1.3.6",
+            "skipRange": ">=1.0.0 <1.3.6"
         }
     ]
 }

version.Makefile

@@ -2,4 +2,4 @@
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 
-VERSION?=1.3.5-dev
+VERSION?=1.3.6

version/version.go

@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "1.3.5-dev"
+	Version = "1.3.6"
 )