This is an automated email from the ASF dual-hosted git repository. pcongiusti pushed a commit to branch release-1.12.x in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.12.x by this push: new 10a7fc95b chore: preparing for next release 10a7fc95b is described below commit 10a7fc95b72be1b07a550eaa5a64d1ad85ac8080 Author: Pasquale Congiusti <pasquale.congiu...@gmail.com> AuthorDate: Mon May 29 15:27:47 2023 +0200 chore: preparing for next release --- .../duck/client/internalclientset/fake/register.go | 14 +++++----- .../client/internalclientset/scheme/register.go | 14 +++++----- config/manager/operator-deployment.yaml | 6 ++--- .../bases/camel-k.clusterserviceversion.yaml | 2 +- helm/camel-k/Chart.yaml | 2 +- helm/camel-k/values.yaml | 2 +- .../camel/clientset/versioned/fake/register.go | 14 +++++----- .../camel/clientset/versioned/scheme/register.go | 14 +++++----- pkg/resources/resources.go | 31 +++++++++++++++++----- pkg/util/defaults/defaults.go | 4 +-- ...7.1-SNAPSHOT.yaml => camel-catalog-1.17.1.yaml} | 6 ++--- script/Makefile | 6 ++--- script/get_catalog.sh | 2 +- script/maven-settings.xml | 2 +- .../{maven-settings.xml => maven-settings.xml.bak} | 2 +- 15 files changed, 69 insertions(+), 52 deletions(-) diff --git a/addons/strimzi/duck/client/internalclientset/fake/register.go b/addons/strimzi/duck/client/internalclientset/fake/register.go index b03a9f805..04aa54821 100644 --- a/addons/strimzi/duck/client/internalclientset/fake/register.go +++ b/addons/strimzi/duck/client/internalclientset/fake/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/addons/strimzi/duck/client/internalclientset/scheme/register.go b/addons/strimzi/duck/client/internalclientset/scheme/register.go index bb376affd..7c58dd36c 100644 --- a/addons/strimzi/duck/client/internalclientset/scheme/register.go +++ b/addons/strimzi/duck/client/internalclientset/scheme/register.go @@ -38,14 +38,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/config/manager/operator-deployment.yaml b/config/manager/operator-deployment.yaml index e41f060f7..33c38e688 100644 --- a/config/manager/operator-deployment.yaml +++ b/config/manager/operator-deployment.yaml @@ -25,7 +25,7 @@ metadata: name: camel-k-operator app.kubernetes.io/component: operator app.kubernetes.io/name: camel-k - app.kubernetes.io/version: "1.12.1-SNAPSHOT" + app.kubernetes.io/version: "1.12.1" spec: replicas: 1 strategy: @@ -41,12 +41,12 @@ spec: app: "camel-k" app.kubernetes.io/component: operator app.kubernetes.io/name: camel-k - app.kubernetes.io/version: "1.12.1-SNAPSHOT" + app.kubernetes.io/version: "1.12.1" spec: serviceAccountName: camel-k-operator containers: - name: camel-k-operator - image: docker.io/apache/camel-k:1.12.1-SNAPSHOT + image: docker.io/apache/camel-k:1.12.1 imagePullPolicy: IfNotPresent command: - kamel diff --git a/config/manifests/bases/camel-k.clusterserviceversion.yaml b/config/manifests/bases/camel-k.clusterserviceversion.yaml index 9c47b3d03..b230ae600 100644 --- a/config/manifests/bases/camel-k.clusterserviceversion.yaml +++ b/config/manifests/bases/camel-k.clusterserviceversion.yaml @@ -22,7 +22,7 @@ metadata: capabilities: Full Lifecycle categories: Integration & Delivery certified: "false" - containerImage: docker.io/apache/camel-k:1.12.1-SNAPSHOT + containerImage: docker.io/apache/camel-k:1.12.1 createdAt: 2023-02-27T08:47:56Z description: Apache Camel K is a lightweight integration platform, born on Kubernetes, with serverless superpowers. diff --git a/helm/camel-k/Chart.yaml b/helm/camel-k/Chart.yaml index eec9cbd4c..96b7f3255 100644 --- a/helm/camel-k/Chart.yaml +++ b/helm/camel-k/Chart.yaml @@ -35,7 +35,7 @@ version: 0.13.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. -appVersion: 1.12.1-SNAPSHOT +appVersion: 1.12.1 icon: https://github.com/apache/camel/raw/main/docs/img/logo64-d.png home: https://camel.apache.org/camel-k/latest/ diff --git a/helm/camel-k/values.yaml b/helm/camel-k/values.yaml index 88c19dc88..25d498def 100644 --- a/helm/camel-k/values.yaml +++ b/helm/camel-k/values.yaml @@ -23,7 +23,7 @@ nameOverride: "" fullnameOverride: "" operator: - image: docker.io/apache/camel-k:1.12.1-SNAPSHOT + image: docker.io/apache/camel-k:1.12.1 global: "false" resources: {} securityContext: {} diff --git a/pkg/client/camel/clientset/versioned/fake/register.go b/pkg/client/camel/clientset/versioned/fake/register.go index 449936a90..327b4c8f0 100644 --- a/pkg/client/camel/clientset/versioned/fake/register.go +++ b/pkg/client/camel/clientset/versioned/fake/register.go @@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/client/camel/clientset/versioned/scheme/register.go b/pkg/client/camel/clientset/versioned/scheme/register.go index 6c3443318..40ca6f0dc 100644 --- a/pkg/client/camel/clientset/versioned/scheme/register.go +++ b/pkg/client/camel/clientset/versioned/scheme/register.go @@ -40,14 +40,14 @@ var localSchemeBuilder = runtime.SchemeBuilder{ // AddToScheme adds all types of this clientset into the given scheme. This allows composition // of clientsets, like in: // -// import ( -// "k8s.io/client-go/kubernetes" -// clientsetscheme "k8s.io/client-go/kubernetes/scheme" -// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" -// ) +// import ( +// "k8s.io/client-go/kubernetes" +// clientsetscheme "k8s.io/client-go/kubernetes/scheme" +// aggregatorclientsetscheme "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/scheme" +// ) // -// kclientset, _ := kubernetes.NewForConfig(c) -// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// kclientset, _ := kubernetes.NewForConfig(c) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index 09543f257..857c48315 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -167,12 +167,24 @@ var assets = func() http.FileSystem { name: "manager", modTime: time.Time{}, }, + "/manager/bundle": &vfsgen۰DirInfo{ + name: "bundle", + modTime: time.Time{}, + }, + "/manager/bundle/manifests": &vfsgen۰DirInfo{ + name: "manifests", + modTime: time.Time{}, + }, + "/manager/bundle/metadata": &vfsgen۰DirInfo{ + name: "metadata", + modTime: time.Time{}, + }, "/manager/operator-deployment.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-deployment.yaml", modTime: time.Time{}, - uncompressedSize: 2752, + uncompressedSize: 2725, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\x98\x61\x4f\x2b\xe7\xe4\x0c\x4c\xd6\xca\xc6\x20\xcc\x66\xb4\xa7\xa8\x69\x17\x76\x8b\x76\xb7\xd3\xdd\x86\x25\xbf\x3e\x6a\x83\x19\x60\x3e\x92\x89\x46\x8a\x4f\xd8\x55\xf5\xea\xd5\x7b\xd5\x36\x21\x86\xef\x77\x05\x21\xbe\x0a\x4e\xca\x52\x01\xa7\xe1\x2a\x42\xd2\x30\x5e\x11\x72\xbd\x76\x3b\x66\x08\xf7\xba\x55\x05\x73\x42\x2b\x7c\x48\xf2\xfb\x8f\x68\x55\x41\x06\x5a\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x56\x4d\x8f\xe2\x46\x10\xbd\xfb\x57\x3c\xe1\xcb\xae\x34\x03\xc3\x9c\x56\xce\xc9\x19\x98\x2c\xca\x04\x10\x66\x33\xda\x53\xd4\xb4\x0b\xdc\xa2\xdd\xed\x74\x97\x61\xc9\xaf\x8f\xda\x60\x06\x98\x8f\xec\x46\x23\xad\x4f\xd8\x55\xf5\xea\xbd\x57\xd5\x36\x31\xae\xdf\xef\x8a\x62\x3c\x28\x49\xc6\x53\x0e\xb6\xe0\x82\x90\x56\x42\x16\x84\xcc\x2e\x79\x2b\x1c\xe1\xde\xd6\x26\x17\xac\xac\xc1\x87\x34\xbb\xff\x88\xda\xe4\xe4\x60\x0d\x [...] }, "/manager/operator-service-account.yaml": &vfsgen۰CompressedFileInfo{ name: "operator-service-account.yaml", @@ -601,12 +613,12 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xc1\x8e\xdb\x36\x14\xbc\xf3\x2b\x06\xd6\x25\x01\xd6\x72\xdb\x53\xe1\x9e\xdc\xcd\x6e\x2b\x34\xb0\x81\x95\xd3\x20\xc7\x67\xe9\x59\x7a\x58\x8a\x54\x1f\xa9\x55\xb6\x5f\x5f\x90\x96\xbb\x0e\xda\x63\x78\xb1\x05\x8d\xe6\xcd\xbc\x19\x16\x58\x7f\xbf\x63\x0a\x7c\x94\x86\x5d\xe0\x16\xd1\x23\xf6\x8c\xdd\x48\x4d\xcf\xa8\xfd\x39\xce\xa4\x8c\x47\x3f\xb9\x96\xa2\x78\x87\x77\xbb\xfa\xf1\x3d\x26\xd7\xb2\xc2\x3b\x86\x57\x0c\x5e\x [...] }, - "/camel-catalog-1.17.1-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{ - name: "camel-catalog-1.17.1-SNAPSHOT.yaml", + "/camel-catalog-1.17.1.yaml": &vfsgen۰CompressedFileInfo{ + name: "camel-catalog-1.17.1.yaml", modTime: time.Time{}, - uncompressedSize: 91015, + uncompressedSize: 90988, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x26\xba\x3b\x7d\xbe\xdd\xef\xca\x3b\x72\x94\x38\xb1\x13\x27\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xb9\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x32\x08\xf1\xfe\x5e\xbc\x0c\x3e\xf1\x88\x65\x8a\xc5\x81\x16\x81\xde\xb2\xe0\x2c\xa7\xd1\x96\x05\x4b\xb1\xd6\xf7\x54\xb2\xe0\x5c\x14\x59\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\xbd\x4b\x77\xdb\xb8\xb2\x36\x3c\xcf\xaf\xe0\xea\x4c\xce\x59\xdf\x26\xba\x3b\x7d\xbe\xdd\xef\xca\x3b\x72\x94\x38\xb1\x13\x27\x4e\xe4\x9d\xce\xde\x93\x5e\x10\x09\x49\xb0\x48\x82\x06\x40\x59\xce\xaf\x7f\x17\x40\xf0\x2a\xb9\x78\x71\xc1\xc7\x03\x93\x22\x0a\x4f\xa1\x1e\x80\xb8\xb3\xf0\x32\x08\xf1\xfe\x5e\xbc\x0c\x3e\xf1\x88\x65\x8a\xc5\x81\x16\x81\xde\xb2\xe0\x2c\xa7\xd1\x96\x05\x4b\xb1\xd6\xf7\x54\xb2\xe0\x5c\x14\x59\x [...] }, "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", @@ -619,7 +631,7 @@ var assets = func() http.FileSystem { fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/addons"].(os.FileInfo), fs["/builder"].(os.FileInfo), - fs["/camel-catalog-1.17.1-SNAPSHOT.yaml"].(os.FileInfo), + fs["/camel-catalog-1.17.1.yaml"].(os.FileInfo), fs["/crd"].(os.FileInfo), fs["/manager"].(os.FileInfo), fs["/prometheus"].(os.FileInfo), @@ -657,6 +669,7 @@ var assets = func() http.FileSystem { fs["/crd/bases/camel.apache.org_kamelets.yaml"].(os.FileInfo), } fs["/manager"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ + fs["/manager/bundle"].(os.FileInfo), fs["/manager/operator-deployment.yaml"].(os.FileInfo), fs["/manager/operator-service-account.yaml"].(os.FileInfo), fs["/manager/patch-image-pull-policy-always.yaml"].(os.FileInfo), @@ -668,6 +681,10 @@ var assets = func() http.FileSystem { fs["/manager/patch-toleration.yaml"].(os.FileInfo), fs["/manager/patch-watch-namespace-global.yaml"].(os.FileInfo), } + fs["/manager/bundle"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ + fs["/manager/bundle/manifests"].(os.FileInfo), + fs["/manager/bundle/metadata"].(os.FileInfo), + } fs["/prometheus"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/prometheus/operator-pod-monitor.yaml"].(os.FileInfo), fs["/prometheus/operator-prometheus-rule.yaml"].(os.FileInfo), diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index 74f741891..83e65e0f7 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -23,10 +23,10 @@ package defaults const ( // Version -- - Version = "1.12.1-SNAPSHOT" + Version = "1.12.1" // DefaultRuntimeVersion -- - DefaultRuntimeVersion = "1.17.1-SNAPSHOT" + DefaultRuntimeVersion = "1.17.1" // BuildahVersion -- BuildahVersion = "1.23.3" diff --git a/resources/camel-catalog-1.17.1-SNAPSHOT.yaml b/resources/camel-catalog-1.17.1.yaml similarity index 99% rename from resources/camel-catalog-1.17.1-SNAPSHOT.yaml rename to resources/camel-catalog-1.17.1.yaml index 34bd4be53..5d5e13616 100644 --- a/resources/camel-catalog-1.17.1-SNAPSHOT.yaml +++ b/resources/camel-catalog-1.17.1.yaml @@ -18,15 +18,15 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-1.17.1-snapshot + name: camel-catalog-1.17.1 labels: app: camel-k camel.apache.org/catalog.loader.version: 3.20.1 camel.apache.org/catalog.version: 3.20.1 - camel.apache.org/runtime.version: 1.17.1-SNAPSHOT + camel.apache.org/runtime.version: 1.17.1 spec: runtime: - version: 1.17.1-SNAPSHOT + version: 1.17.1 provider: quarkus applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint metadata: diff --git a/script/Makefile b/script/Makefile index 3f37dce97..4fd53dd58 100644 --- a/script/Makefile +++ b/script/Makefile @@ -20,10 +20,10 @@ SHELL := /bin/bash VERSIONFILE := pkg/util/defaults/defaults.go -VERSION ?= 1.12.1-SNAPSHOT +VERSION ?= 1.12.1 LAST_RELEASED_IMAGE_NAME := camel-k-operator LAST_RELEASED_VERSION ?= 1.12.0 -RUNTIME_VERSION := 1.17.1-SNAPSHOT +RUNTIME_VERSION := 1.17.1 BUILDAH_VERSION := 1.23.3 KANIKO_VERSION := 0.17.1 CONTROLLER_GEN_VERSION := v0.6.1 @@ -79,7 +79,7 @@ OPM := opm # Used to push pre-release artifacts STAGING_IMAGE_NAME := docker.io/camelk/camel-k -STAGING_RUNTIME_REPO := +STAGING_RUNTIME_REPO := https://repository.apache.org/content/repositories/orgapachecamel-1565 # Kamelets options INSTALL_DEFAULT_KAMELETS ?= true diff --git a/script/get_catalog.sh b/script/get_catalog.sh index 0a4b5ded1..85d4d7b33 100755 --- a/script/get_catalog.sh +++ b/script/get_catalog.sh @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -set -ex +set -e location=$(dirname $0) rootdir=$location/../ diff --git a/script/maven-settings.xml b/script/maven-settings.xml index a392fc02e..632b3df1a 100644 --- a/script/maven-settings.xml +++ b/script/maven-settings.xml @@ -41,7 +41,7 @@ under the License. <repository> <id>apache-staging</id> <name>Apache Staging Repository</name> - <url>https://repository.apache.org/content/repositories/orgapachecamel-1528/</url> + <url>https://repository.apache.org/content/repositories/orgapachecamel-1565</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy> diff --git a/script/maven-settings.xml b/script/maven-settings.xml.bak similarity index 98% copy from script/maven-settings.xml copy to script/maven-settings.xml.bak index a392fc02e..632b3df1a 100644 --- a/script/maven-settings.xml +++ b/script/maven-settings.xml.bak @@ -41,7 +41,7 @@ under the License. <repository> <id>apache-staging</id> <name>Apache Staging Repository</name> - <url>https://repository.apache.org/content/repositories/orgapachecamel-1528/</url> + <url>https://repository.apache.org/content/repositories/orgapachecamel-1565</url> <releases> <enabled>true</enabled> <updatePolicy>never</updatePolicy>