bump version to 1.7.0 and add bump csv script (#129)

Author: Daniel-Fan

Makefile

@@ -69,7 +69,7 @@ endif
 # Current Operator image name
 OPERATOR_IMAGE_NAME ?= ibm-namespace-scope-operator
 # Current Operator version
-OPERATOR_VERSION ?= 1.6.0
+OPERATOR_VERSION ?= 1.7.0
 
 # Options for 'bundle-build'
 CHANNELS ?= beta

bundle-restricted/manifests/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml

@@ -23,13 +23,13 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     containerImage: quay.io/opencloudio/ibm-namespace-scope-operator:latest
-    createdAt: "2020-11-2T15:38:33Z"
-    olm.skipRange: '<1.6.0'
+    createdAt: "2021-10-12T10:48:58Z"
+    olm.skipRange: '<1.7.0'
     operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/IBM/ibm-namespace-scope-operator
     support: IBM
-  name: ibm-namespace-scope-operator-restricted.v1.6.0
+  name: ibm-namespace-scope-operator-restricted.v1.7.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -157,7 +157,7 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: quay.io/opencloudio/ibm-namespace-scope-operator:1.6.0
+  - image: quay.io/opencloudio/ibm-namespace-scope-operator:1.7.0
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
-  replaces: ibm-namespace-scope-operator-restricted.v1.5.0
-  version: 1.6.0
+  replaces: ibm-namespace-scope-operator-restricted.v1.6.0
+  version: 1.7.0

bundle/manifests/ibm-namespace-scope-operator.clusterserviceversion.yaml

@@ -23,13 +23,13 @@ metadata:
       ]
     capabilities: Seamless Upgrades
     containerImage: quay.io/opencloudio/ibm-namespace-scope-operator:latest
-    createdAt: "2020-11-2T15:38:33Z"
-    olm.skipRange: '<1.6.0'
+    createdAt: "2021-10-12T10:48:58Z"
+    olm.skipRange: '<1.7.0'
     operators.operatorframework.io/builder: operator-sdk-v1.10.0+git
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/IBM/ibm-namespace-scope-operator
     support: IBM
-  name: ibm-namespace-scope-operator.v1.6.0
+  name: ibm-namespace-scope-operator.v1.7.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -157,7 +157,7 @@ spec:
   provider:
     name: IBM
   relatedImages:
-  - image: quay.io/opencloudio/ibm-namespace-scope-operator:1.6.0
+  - image: quay.io/opencloudio/ibm-namespace-scope-operator:1.7.0
     name: IBM_NAMESPACE_SCOPE_OPERATOR_IMAGE
-  replaces: ibm-namespace-scope-operator.v1.5.0
-  version: 1.6.0
+  replaces: ibm-namespace-scope-operator.v1.6.0
+  version: 1.7.0

common/scripts/next-csv.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+#
+# Copyright 2021 IBM Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# This script needs to inputs
+# The CSV version that is currently in dev
+
+CURRENT_DEV_CSV=$1
+NEW_DEV_CSV=$2
+PREVIOUS_DEV_CSV=$3
+
+if [ -z "$NEW_DEV_CSV" ]; then
+	let NEW_DEV_CSV_Z=$(echo $CURRENT_DEV_CSV | cut -d '.' -f3)+1
+	NEW_DEV_CSV=$(echo $CURRENT_DEV_CSV | gsed "s/\.[0-9][0-9]*$/\.$NEW_DEV_CSV_Z/")
+fi
+if [ -z "$PREVIOUS_DEV_CSV" ]; then
+	let PREVIOUS_DEV_CSV_Z=$(echo $CURRENT_DEV_CSV | cut -d '.' -f3)-1
+	PREVIOUS_DEV_CSV=$(echo $CURRENT_DEV_CSV | gsed "s/\.[0-9][0-9]*$/\.$PREVIOUS_DEV_CSV_Z/")
+fi
+
+CSV_PATH=bundle/manifests
+RESTRICTED_CSV_PATH=bundle-restricted/manifests
+
+# Update New CSV
+# replace old CSV value with new one
+sed -i "s/$CURRENT_DEV_CSV/$NEW_DEV_CSV/g" $CSV_PATH/ibm-namespace-scope-operator.clusterserviceversion.yaml
+sed -i "s/$CURRENT_DEV_CSV/$NEW_DEV_CSV/g" $RESTRICTED_CSV_PATH/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
+TIME_STAMP="$(date '+%Y-%m-%dT%H:%M:%S'Z)"
+sed -i "s/2[0-9]*-[0-9]*-[0-9]*T[0-9]*:[0-9]*:[0-9]*Z/$TIME_STAMP/g" $CSV_PATH/ibm-namespace-scope-operator.clusterserviceversion.yaml
+sed -i "s/2[0-9]*-[0-9]*-[0-9]*T[0-9]*:[0-9]*:[0-9]*Z/$TIME_STAMP/g" $RESTRICTED_CSV_PATH/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
+
+echo "Updated New file with new CSV version"
+sed -i "s/$PREVIOUS_DEV_CSV/$CURRENT_DEV_CSV/g" $CSV_PATH/ibm-namespace-scope-operator.clusterserviceversion.yaml
+sed -i "s/$PREVIOUS_DEV_CSV/$CURRENT_DEV_CSV/g" $RESTRICTED_CSV_PATH/ibm-namespace-scope-operator-restricted.clusterserviceversion.yaml
+echo "Updated the replaces version line"
+
+#Update version.go to new dev version
+sed -i "s/$CURRENT_DEV_CSV/$NEW_DEV_CSV/" version/version.go
+sed -i "s/$CURRENT_DEV_CSV/$NEW_DEV_CSV/" Makefile
+echo "Updated the version.go with new version"

version/version.go

@@ -17,5 +17,5 @@
 package version
 
 var (
-	Version = "1.6.0"
+	Version = "1.7.0"
 )