[camel-k] 03/04: Fix - failing upgrade e2e test

[nf...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git

commit 34d2cf5d47fa78acd8708733387185ccf606106e
Author: phantomjinx <p....@phantomjinx.co.uk>
AuthorDate: Fri Jul 16 21:51:35 2021 +0100

    Fix - failing upgrade e2e test
    
    *  clusterserviceversion.yaml
     * Snapshot suffix violates semver restrictions of operator-sdk
    
    * Makefile
     * Restore overriding of VERSION & IMAGE_NAME for use with kustomize install
     * Restricts the add_license.sh to stop the patch created by the e2e test
       receiving a licence header and failing to be applied correctly
    
    * next_shapshot.sh
     * updates script to replace call to get_version.sh which no longer exists
---
 config/manifests/bases/camel-k.clusterserviceversion.yaml | 2 +-
 pkg/resources/resources.go                                | 2 +-
 script/Makefile                                           | 6 +++---
 script/next_snapshot.sh                                   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml
index d7a1cff..7bba062 100644
--- a/config/manifests/bases/camel-k.clusterserviceversion.yaml
+++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml
@@ -30,7 +30,7 @@ metadata:
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v2
     repository: https://github.com/apache/camel-k
     support: Camel
-  name: camel-k.v1.6.0-snapshot
+  name: camel-k.v1.6.0
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index 9786e33..f1acd00 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -144,7 +144,7 @@ var assets = func() http.FileSystem {
 			modTime:          time.Time{},
 			uncompressedSize: 2397,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xac\xcb\x2e\x10\xdb\xc9\x02\x05\x16\xea\x49\x4d\x9c\xc6\x68\x6a\x1b\x96\xb7\xc1\x9e\x0a\x9a\x1a\x4b\x44\x28\x8e\x4a\x52\xf6\xaa\x5f\x5f\x50\xb6\x1c\xdb\x9b\xa6\x3d\x04\x58\x9e\x2c\xcd\xcc\x9b\xf7\x66\x9e\xe8\x18\xc3\xf7\x3b\x51\x8c\x47\x25\xc9\x38\xca\xe1\x19\xbe\x24\xa4\xb5\x90\x25\x21\xe3\x8d\xdf\x09\x4b\xb8\xe7\xc6\xe4\xc2\x2b\x36\xf8\x90\x66\xf7\x1f\xd1\x98\x9c\x2c\xd8\x [...]
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x55\xc1\x6e\xe3\x36\x10\xbd\xeb\x2b\x1e\xac\xcb\x2e\x10\xdb\xc9\x1e\x8a\x85\x7a\x52\x13\xa7\x31\x9a\xda\x86\xe5\x6d\xb0\xa7\x82\xa6\xc6\x12\x11\x8a\xa3\x92\x94\xbd\xea\xd7\x17\x94\x2d\xc7\xf6\xa6\x69\x0f\x01\x96\x27\x4b\x33\xf3\xe6\xbd\x99\x27\x3a\xc6\xf0\xfd\x4e\x14\xe3\x51\x49\x32\x8e\x72\x78\x86\x2f\x09\x69\x2d\x64\x49\xc8\x78\xe3\x77\xc2\x12\xee\xb9\x31\xb9\xf0\x8a\x0d\x3e\xa4\xd9\xfd\x47\x34\x26\x27\x0b\x36\x [...]
 		},
 		"/manager/operator-service-account.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "operator-service-account.yaml",
diff --git a/script/Makefile b/script/Makefile
index dc143d6..b4b3a1b 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 VERSIONFILE := pkg/util/defaults/defaults.go
-VERSION := 1.6.0-SNAPSHOT
+VERSION ?= 1.6.0-SNAPSHOT
 OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION))
 LAST_RELEASED_VERSION := 1.5.0
 RUNTIME_VERSION := 1.8.0
@@ -23,7 +23,7 @@ KANIKO_VERSION := 0.17.1
 INSTALL_DEFAULT_KAMELETS := true
 BASE_IMAGE := adoptopenjdk/openjdk11:slim
 LOCAL_REPOSITORY := /tmp/artifacts/m2
-IMAGE_NAME := docker.io/apache/camel-k
+IMAGE_NAME ?= docker.io/apache/camel-k
 METADATA_IMAGE_NAME := $(IMAGE_NAME)-metadata
 RELEASE_GIT_REMOTE := upstream
 GIT_COMMIT := $(shell git rev-list -1 HEAD)
@@ -367,7 +367,7 @@ $(BUNDLE_CAMEL_APIS):
 	@# operator-sdk generate ... cannot execute across separate modules so need to temporarily move api
 	operator-sdk generate kustomize manifests --apis-dir $(addprefix api_, $@) -q
 	@# Adds the licence header to the csv file.
-	./script/add_license.sh config/manifests ./script/headers/yaml.txt
+	./script/add_license.sh config/manifests/bases ./script/headers/yaml.txt
 	./script/add_createdAt.sh config/manifests/bases
 	@# Clean up temporary working api directories
 	rm -rf api_*
diff --git a/script/next_snapshot.sh b/script/next_snapshot.sh
index c2d64f2..80e541c 100755
--- a/script/next_snapshot.sh
+++ b/script/next_snapshot.sh
@@ -20,7 +20,7 @@ set -e
 location=$(dirname $0)
 global_version_file=$location/../version/version.go
 
-version=$($location/get_version.sh)
+version=$(cd $location && make get-version)
 version_num=$(echo $version | sed -E "s/([0-9.]*)-SNAPSHOT/\1/g")
 next_version_num=$(echo $version_num | awk 'BEGIN { FS = "." } ; {print $1"."$2"."++$3}')
 next_version="$next_version_num-SNAPSHOT"