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
The following commit(s) were added to refs/heads/main by this push: new 3094a52 preparing for next release 3094a52 is described below commit 3094a522c167ee65d4bae50995ecca977a817cd9 Author: nicolaferraro <ni.ferr...@gmail.com> AuthorDate: Wed Nov 10 12:05:04 2021 +0100 preparing for next release --- config/manager/patch-image-pull-policy-always.yaml | 17 ++ config/rbac/patch-role-to-clusterrole.yaml | 17 ++ .../patch-rolebinding-to-clusterrolebinding.yaml | 17 ++ config/scorecard/bases/config.yaml | 17 ++ config/scorecard/patches/basic.config.yaml | 17 ++ config/scorecard/patches/olm.config.yaml | 17 ++ docs/modules/ROOT/partials/apis/crds-html.adoc | 224 +++++++++++---------- docs/modules/traits/pages/container.adoc | 2 + docs/modules/traits/pages/jolokia.adoc | 1 + docs/modules/traits/pages/route.adoc | 1 + pkg/resources/resources.go | 68 ++----- pkg/util/defaults/defaults.go | 2 +- ...0.0-SNAPSHOT.yaml => camel-catalog-1.10.0.yaml} | 16 +- resources/traits.yaml | 10 +- script/Makefile | 6 +- 15 files changed, 259 insertions(+), 173 deletions(-) diff --git a/config/manager/patch-image-pull-policy-always.yaml b/config/manager/patch-image-pull-policy-always.yaml index 4ee2b00..e03b90d 100644 --- a/config/manager/patch-image-pull-policy-always.yaml +++ b/config/manager/patch-image-pull-policy-always.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# --------------------------------------------------------------------------- + apiVersion: apps/v1 kind: Deployment metadata: diff --git a/config/rbac/patch-role-to-clusterrole.yaml b/config/rbac/patch-role-to-clusterrole.yaml index c4e0064..24f6db0 100644 --- a/config/rbac/patch-role-to-clusterrole.yaml +++ b/config/rbac/patch-role-to-clusterrole.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# --------------------------------------------------------------------------- + - op: replace path: /kind value: ClusterRole diff --git a/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml b/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml index 830703b..d0d3001 100644 --- a/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml +++ b/config/rbac/patch-rolebinding-to-clusterrolebinding.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# --------------------------------------------------------------------------- + - op: replace path: /kind value: ClusterRoleBinding diff --git a/config/scorecard/bases/config.yaml b/config/scorecard/bases/config.yaml index c770478..09ea47c 100644 --- a/config/scorecard/bases/config.yaml +++ b/config/scorecard/bases/config.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# --------------------------------------------------------------------------- + apiVersion: scorecard.operatorframework.io/v1alpha3 kind: Configuration metadata: diff --git a/config/scorecard/patches/basic.config.yaml b/config/scorecard/patches/basic.config.yaml index e7fa305..d2278cf 100644 --- a/config/scorecard/patches/basic.config.yaml +++ b/config/scorecard/patches/basic.config.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# --------------------------------------------------------------------------- + - op: add path: /stages/0/tests/- value: diff --git a/config/scorecard/patches/olm.config.yaml b/config/scorecard/patches/olm.config.yaml index 44fbf37..675960e 100644 --- a/config/scorecard/patches/olm.config.yaml +++ b/config/scorecard/patches/olm.config.yaml @@ -1,3 +1,20 @@ +# --------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You 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. +# --------------------------------------------------------------------------- + - op: add path: /stages/0/tests/- value: diff --git a/docs/modules/ROOT/partials/apis/crds-html.adoc b/docs/modules/ROOT/partials/apis/crds-html.adoc index fe51e82..4adc586 100644 --- a/docs/modules/ROOT/partials/apis/crds-html.adoc +++ b/docs/modules/ROOT/partials/apis/crds-html.adoc @@ -90,6 +90,20 @@ BuildSpec </em> </td> <td> +<p>The sequence of Build tasks to be performed as part of the Build execution.</p> +</td> +</tr> +<tr> +<td> +<code>strategy</code><br/> +<em> +<a href="#camel.apache.org/v1.BuildStrategy"> +BuildStrategy +</a> +</em> +</td> +<td> +<p>The strategy that should be used to perform the Build.</p> </td> </tr> <tr> @@ -935,7 +949,7 @@ string </em> </td> <td> -<p>A human readable message indicating details about the transition.</p> +<p>A human-readable message indicating details about the transition.</p> </td> </tr> </tbody> @@ -985,6 +999,20 @@ string </em> </td> <td> +<p>The sequence of Build tasks to be performed as part of the Build execution.</p> +</td> +</tr> +<tr> +<td> +<code>strategy</code><br/> +<em> +<a href="#camel.apache.org/v1.BuildStrategy"> +BuildStrategy +</a> +</em> +</td> +<td> +<p>The strategy that should be used to perform the Build.</p> </td> </tr> <tr> @@ -1112,16 +1140,6 @@ Kubernetes meta/v1.Time </tr> <tr> <td> -<code>platform</code><br/> -<em> -string -</em> -</td> -<td> -</td> -</tr> -<tr> -<td> <code>conditions</code><br/> <em> <a href="#camel.apache.org/v1.BuildCondition"> @@ -1146,6 +1164,16 @@ string </tr> </tbody> </table> +<h3 id="camel.apache.org/v1.BuildStrategy">BuildStrategy +(<code>string</code> alias)</h3> +<p> +(<em>Appears on:</em> +<a href="#camel.apache.org/v1.BuildSpec">BuildSpec</a>, +<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>) +</p> +<div> +<p>BuildStrategy specifies how the Build should be executed</p> +</div> <h3 id="camel.apache.org/v1.BuildahTask">BuildahTask </h3> <p> @@ -2195,7 +2223,7 @@ string </em> </td> <td> -<p>A human readable message indicating details about the transition.</p> +<p>A human-readable message indicating details about the transition.</p> </td> </tr> </tbody> @@ -2297,7 +2325,7 @@ string </em> </td> <td> -<p>A human readable message indicating details about the transition.</p> +<p>A human-readable message indicating details about the transition.</p> </td> </tr> </tbody> @@ -2583,8 +2611,8 @@ string <td> <code>buildStrategy</code><br/> <em> -<a href="#camel.apache.org/v1.IntegrationPlatformBuildStrategy"> -IntegrationPlatformBuildStrategy +<a href="#camel.apache.org/v1.BuildStrategy"> +BuildStrategy </a> </em> </td> @@ -2639,8 +2667,8 @@ string <td> <code>registry</code><br/> <em> -<a href="#camel.apache.org/v1.IntegrationPlatformRegistrySpec"> -IntegrationPlatformRegistrySpec +<a href="#camel.apache.org/v1.RegistrySpec"> +RegistrySpec </a> </em> </td> @@ -2703,15 +2731,6 @@ bool </tr> </tbody> </table> -<h3 id="camel.apache.org/v1.IntegrationPlatformBuildStrategy">IntegrationPlatformBuildStrategy -(<code>string</code> alias)</h3> -<p> -(<em>Appears on:</em> -<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>) -</p> -<div> -<p>IntegrationPlatformBuildStrategy enumerates all implemented build strategies</p> -</div> <h3 id="camel.apache.org/v1.IntegrationPlatformCluster">IntegrationPlatformCluster (<code>string</code> alias)</h3> <p> @@ -2809,7 +2828,7 @@ string </em> </td> <td> -<p>A human readable message indicating details about the transition.</p> +<p>A human-readable message indicating details about the transition.</p> </td> </tr> </tbody> @@ -2892,76 +2911,6 @@ string <div> <p>IntegrationPlatformPhase –</p> </div> -<h3 id="camel.apache.org/v1.IntegrationPlatformRegistrySpec">IntegrationPlatformRegistrySpec -</h3> -<p> -(<em>Appears on:</em> -<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>, -<a href="#camel.apache.org/v1.PublishTask">PublishTask</a>) -</p> -<div> -<p>IntegrationPlatformRegistrySpec –</p> -</div> -<table> -<thead> -<tr> -<th>Field</th> -<th>Description</th> -</tr> -</thead> -<tbody> -<tr> -<td> -<code>insecure</code><br/> -<em> -bool -</em> -</td> -<td> -</td> -</tr> -<tr> -<td> -<code>address</code><br/> -<em> -string -</em> -</td> -<td> -</td> -</tr> -<tr> -<td> -<code>secret</code><br/> -<em> -string -</em> -</td> -<td> -</td> -</tr> -<tr> -<td> -<code>ca</code><br/> -<em> -string -</em> -</td> -<td> -</td> -</tr> -<tr> -<td> -<code>organization</code><br/> -<em> -string -</em> -</td> -<td> -</td> -</tr> -</tbody> -</table> <h3 id="camel.apache.org/v1.IntegrationPlatformResourcesSpec">IntegrationPlatformResourcesSpec </h3> <p> @@ -3833,11 +3782,6 @@ Kubernetes meta/v1.Duration </tr> </tbody> </table> -<h3 id="camel.apache.org/v1.PlatformInjectable">PlatformInjectable -</h3> -<div> -<p>PlatformInjectable –</p> -</div> <h3 id="camel.apache.org/v1.PodSpec">PodSpec </h3> <p> @@ -4171,8 +4115,8 @@ string <td> <code>registry</code><br/> <em> -<a href="#camel.apache.org/v1.IntegrationPlatformRegistrySpec"> -IntegrationPlatformRegistrySpec +<a href="#camel.apache.org/v1.RegistrySpec"> +RegistrySpec </a> </em> </td> @@ -4199,6 +4143,76 @@ IntegrationPlatformRegistrySpec It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.</p> </div> +<h3 id="camel.apache.org/v1.RegistrySpec">RegistrySpec +</h3> +<p> +(<em>Appears on:</em> +<a href="#camel.apache.org/v1.IntegrationPlatformBuildSpec">IntegrationPlatformBuildSpec</a>, +<a href="#camel.apache.org/v1.PublishTask">PublishTask</a>) +</p> +<div> +<p>RegistrySpec provides the configuration for the container registry</p> +</div> +<table> +<thead> +<tr> +<th>Field</th> +<th>Description</th> +</tr> +</thead> +<tbody> +<tr> +<td> +<code>insecure</code><br/> +<em> +bool +</em> +</td> +<td> +</td> +</tr> +<tr> +<td> +<code>address</code><br/> +<em> +string +</em> +</td> +<td> +</td> +</tr> +<tr> +<td> +<code>secret</code><br/> +<em> +string +</em> +</td> +<td> +</td> +</tr> +<tr> +<td> +<code>ca</code><br/> +<em> +string +</em> +</td> +<td> +</td> +</tr> +<tr> +<td> +<code>organization</code><br/> +<em> +string +</em> +</td> +<td> +</td> +</tr> +</tbody> +</table> <h3 id="camel.apache.org/v1.Repository">Repository </h3> <p> @@ -6540,7 +6554,7 @@ string </em> </td> <td> -<p>A human readable message indicating details about the transition.</p> +<p>A human-readable message indicating details about the transition.</p> </td> </tr> </tbody> diff --git a/docs/modules/traits/pages/container.adoc b/docs/modules/traits/pages/container.adoc index fa48ab3..a214ccf 100755 --- a/docs/modules/traits/pages/container.adoc +++ b/docs/modules/traits/pages/container.adoc @@ -5,6 +5,8 @@ The Container trait can be used to configure properties of the container where t It also provides configuration for Services associated to the container. +nolint: tagliatelle + This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. WARNING: The container trait is a *platform trait*: disabling it may compromise the platform functionality. diff --git a/docs/modules/traits/pages/jolokia.adoc b/docs/modules/traits/pages/jolokia.adoc index 0f0499f..0671161 100755 --- a/docs/modules/traits/pages/jolokia.adoc +++ b/docs/modules/traits/pages/jolokia.adoc @@ -5,6 +5,7 @@ The Jolokia trait activates and configures the Jolokia Java agent. See https://jolokia.org/reference/html/agents.html +nolint: tagliatelle This trait is available in the following profiles: **Kubernetes, Knative, OpenShift**. diff --git a/docs/modules/traits/pages/route.adoc b/docs/modules/traits/pages/route.adoc index 493586c..42b3874 100755 --- a/docs/modules/traits/pages/route.adoc +++ b/docs/modules/traits/pages/route.adoc @@ -11,6 +11,7 @@ The recommended approach to set the key and certificates is to use `secrets` to following parameters to reference them: `tls-certificate-secret`, `tls-key-secret`, `tls-ca-certificate-secret`, `tls-destination-ca-certificate-secret` See the examples section at the end of this page to see the setup options. +nolint: tagliatelle This trait is available in the following profiles: **OpenShift**. diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go index b8af443..a2cfa3d 100644 --- a/pkg/resources/resources.go +++ b/pkg/resources/resources.go @@ -184,9 +184,9 @@ var assets = func() http.FileSystem { "/manager/patch-image-pull-policy-always.yaml": &vfsgen۰CompressedFileInfo{ name: "patch-image-pull-policy-always.yaml", modTime: time.Time{}, - uncompressedSize: 185, + uncompressedSize: 1124, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\x8c\x31\x0a\xc3\x30\x10\x04\x7b\xbd\xe2\x3e\x60\x42\x5a\x75\x81\x3c\xc0\x55\xfa\x45\x5e\x82\xf0\x49\x3a\xa4\x4b\x82\x7f\x1f\x54\x38\x5d\xa6\x5a\x66\x61\x60\xf9\xc1\x3e\x72\xab\x51\x60\x36\x2e\xef\x6b\xd8\x73\xdd\xa2\xdc\x69\xda\x8e\xc2\xea\xa1\xd0\xb1\xc1\x11\x83\x48\x45\x61\x94\x84\x42\x5d\xf6\xa5\x19\x3b\xbc\xf5\x30\x8c\x69\xde\xce\x62\x0a\xe7\xdc\x22\xa7\x9d\xa4\x56\x1d\xb9\xb2\x8f\xd3\x88\x2c\xff\x72\xf2\x23\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x6f\xeb\x38\x0c\xbc\xeb\x57\x0c\xe2\x4b\x0b\xe4\x63\x77\x8f\xd9\x93\xb7\x4d\xb0\xc6\x16\x49\x51\xa7\x5b\xf4\xc8\xd8\x8c\x4d\x54\x96\xf4\x24\xb9\x6e\xfe\xfd\x83\x9c\xa4\x1f\x78\x78\xb7\xf2\x64\x4b\xd4\x70\x86\x43\x66\x98\x7d\x5f\xa8\x0c\x77\x52\xb1\x09\x5c\x23\x5a\xc4\x96\x91\x3b\xaa\x5a\x46\x69\x0f\x71\x20\xcf\x58\xdb\xde\xd4\x14\xc5\x1a\x5c\xe5\xe5\xfa\x1a\xbd\xa9\xd9\xc3\x1a\x86\xf5\xe8\xac\x67\x95\xa1\x [...] }, "/manager/patch-node-selector.yaml": &vfsgen۰CompressedFileInfo{ name: "patch-node-selector.yaml", @@ -375,17 +375,19 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x95\x41\x8f\xdb\x36\x10\x85\xef\xfa\x15\x0f\xd6\x25\x29\xd6\x76\xdb\x53\xe1\x9e\xdc\x64\xb7\x35\x1a\xd8\xc0\xca\x69\x90\x23\x45\x8e\xe5\xe9\x52\x1c\x96\xa4\xec\x75\x7f\x7d\x41\xda\x6e\xbc\xf1\x2e\x90\x43\xd0\x54\x17\x0f\xa9\xd1\x9b\xef\x71\xc6\x52\x8d\xf1\xd7\xbb\xaa\x1a\xef\x58\x93\x8b\x64\x90\x04\x69\x4b\x98\x7b\xa5\xb7\x84\x46\x36\x69\xaf\x02\xe1\x4e\x06\x67\x54\x62\x71\x78\x35\x6f\xee\x5e\x63\x70\x86\x02\xc4\x [...] }, - "/rbac/patch-role-to-clusterrole.yaml": &vfsgen۰FileInfo{ - name: "patch-role-to-clusterrole.yaml", - modTime: time.Time{}, - content: []byte("\x2d\x20\x6f\x70\x3a\x20\x72\x65\x70\x6c\x61\x63\x65\x0a\x20\x20\x70\x61\x74\x68\x3a\x20\x2f\x6b\x69\x6e\x64\x0a\x20\x20\x76\x61\x6c\x75\x65\x3a\x20\x43\x6c\x75\x73\x74\x65\x72\x52\x6f\x6c\x65\x0a"), + "/rbac/patch-role-to-clusterrole.yaml": &vfsgen۰CompressedFileInfo{ + name: "patch-role-to-clusterrole.yaml", + modTime: time.Time{}, + uncompressedSize: 988, + + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4f\x6f\xda\x4e\x10\xbd\xef\xa7\x78\xc2\x97\x44\x22\xf0\xd3\xef\x48\x4f\x94\x80\x6a\x35\x32\x12\x26\x8d\x72\x5c\xec\xc1\x1e\x65\xbd\xb3\xdd\x5d\xc7\xe1\xdb\x57\x6b\xa0\x49\xd4\x6b\xe6\x66\x79\xfc\xfe\xcc\x7b\xce\x70\xf7\x75\xa3\x32\x3c\x70\x45\x36\x50\x8d\x28\x88\x2d\x61\xe9\x74\xd5\x12\x4a\x39\xc6\x41\x7b\xc2\x46\x7a\x5b\xeb\xc8\x62\x71\xb3\x2c\x37\xb7\xe8\x6d\x4d\x1e\x62\x09\xe2\xd1\x89\x27\x95\xa1\x12\x1b\x [...] }, "/rbac/patch-rolebinding-to-clusterrolebinding.yaml": &vfsgen۰CompressedFileInfo{ name: "patch-rolebinding-to-clusterrolebinding.yaml", modTime: time.Time{}, - uncompressedSize: 174, + uncompressedSize: 1113, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\x74\xcd\xcd\x0d\xc2\x30\x10\x44\xe1\xbb\xab\x98\x06\x90\x39\xfb\x08\x1d\xa4\x83\x25\x3b\x10\xc3\x62\x5b\xfe\xa1\x7e\x24\x88\x94\x93\x0b\xf8\xde\x3b\x21\x97\x80\xca\x62\xb2\xd2\x01\x45\xfa\x16\xe0\x5f\x31\xa9\x03\x3e\x62\x83\x01\x57\x1b\xad\xb3\x2e\xd9\x78\x89\x49\x63\x7a\xb8\x89\xab\xd9\xb8\xf0\x3e\xf7\x3b\x14\xd5\x03\xb5\x71\x7b\x72\xed\xcd\x9f\x7d\x92\x37\x5b\xf9\x27\x77\xfc\x3b\x6c\xd9\x94\xd5\x7d\x03\x00\x00\xff\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\xcf\x6f\xe2\x3a\x10\xbe\xe7\xaf\xf8\x44\x2e\xad\x44\xa1\x7a\x47\xde\x89\x52\xd0\x8b\x5e\x05\x12\xa1\x5b\xf5\x68\xe2\x21\x99\xad\xe3\xf1\xda\x4e\x53\xfe\xfb\x95\x03\x6c\x5b\xad\x7a\xab\x6f\x88\xf9\x7e\xcd\x37\xc9\x71\xf3\x7d\x2f\xcb\xf1\xc0\x15\xd9\x40\x1a\x51\x10\x1b\xc2\xdc\xa9\xaa\x21\x94\x72\x88\xbd\xf2\x84\x95\x74\x56\xab\xc8\x62\x71\x35\x2f\x57\xd7\xe8\xac\x26\x0f\xb1\x04\xf1\x68\xc5\x53\x96\xa3\x12\x1b\x [...] }, "/rbac/user-cluster-role.yaml": &vfsgen۰CompressedFileInfo{ name: "user-cluster-role.yaml", @@ -529,25 +531,25 @@ var assets = func() http.FileSystem { compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xac\x53\x4d\x8f\xdb\x36\x14\xbc\xf3\x57\x0c\xac\x4b\x02\xac\xe5\xb6\xa7\xc2\x3d\xb9\x9b\xdd\x56\x68\x60\x03\x2b\xa7\x41\x8e\xcf\xd4\xb3\xf4\x60\x8a\x4f\x25\xa9\x55\xb6\xbf\xbe\xa0\x2c\x67\x37\xe8\x35\xbc\xf8\x43\xa3\x79\x33\x6f\x86\x05\xd6\x3f\xee\x98\x02\x1f\xc5\xb2\x8f\xdc\x20\x29\x52\xc7\xd8\x0d\x64\x3b\x46\xad\xe7\x34\x51\x60\x3c\xea\xe8\x1b\x4a\xa2\x1e\xef\x76\xf5\xe3\x7b\x8c\xbe\xe1\x00\xf5\x0c\x0d\xe8\x35\xb0\x [...] }, - "/camel-catalog-1.10.0-SNAPSHOT.yaml": &vfsgen۰CompressedFileInfo{ - name: "camel-catalog-1.10.0-SNAPSHOT.yaml", + "/camel-catalog-1.10.0.yaml": &vfsgen۰CompressedFileInfo{ + name: "camel-catalog-1.10.0.yaml", modTime: time.Time{}, - uncompressedSize: 89871, + uncompressedSize: 89844, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x38\xb6\xee\xdc\xbf\x82\xab\x32\x39\x67\xdd\x16\xba\x2a\xd5\xf7\xd4\x5d\x75\x47\xb6\x1c\x27\x76\x6c\xc7\x89\xdc\x49\xba\x27\xb5\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\x7f\x16\x40\xf0\x29\x65\xf3\xe1\x0d\xb7\x06\xe2\x03\x1b\xdf\xc6\xfe\xf0\x20\xde\x78\x13\xcc\xf0\x7e\x27\x6f\x82\x6b\x1e\xb2\x54\xb1\x28\xd0\x22\xd0\x1b\x16\x9c\x66\x34\xdc\xb0\x60\x21\x56\xfa\x89\x4a\x16\x5c\x88\x3c\x8d\xa8\xe6\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xc4\x7d\x4b\x77\xdb\x38\xb6\xee\x3c\xbf\x82\xab\x32\x39\x67\xdd\x26\xba\x2a\xd5\xf7\xd4\x5d\x75\x47\x8e\x12\x27\x76\xec\xc4\x89\xdc\x49\xba\x27\xb5\x20\x12\x92\x60\x91\x04\x0d\x80\xb2\x9c\x5f\x7f\x16\x40\xf0\x29\x65\xf3\xe1\x0d\xb7\x06\xe2\x03\x1b\xdf\xc6\xfe\xf0\x20\xde\x78\x19\x84\x78\xbf\x17\x2f\x83\x2b\x1e\xb1\x4c\xb1\x38\xd0\x22\xd0\x5b\x16\x9c\xe5\x34\xda\xb2\x60\x29\xd6\xfa\x81\x4a\x16\x9c\x8b\x22\x8b\xa9\xe6\x [...] }, "/traits.yaml": &vfsgen۰CompressedFileInfo{ name: "traits.yaml", modTime: time.Time{}, - uncompressedSize: 46832, + uncompressedSize: 46896, - compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x73\x1c\xb7\xb1\xe0\xef\xfe\x2b\x50\x7c\x57\x25\x92\xb5\xbb\x94\x9d\x97\x3c\x1f\xef\x74\x29\x5a\x92\x13\xda\xfa\xe0\x49\xb2\x73\x29\x9f\x2b\x8b\x9d\xe9\xdd\x85\x38\x0b\x4c\x00\x0c\xa9\xcd\xbd\xfb\xdf\xaf\xd0\xdd\xf8\x98\xd9\x5d\x72\x29\x91\x7e\xe1\xd5\x4b\x7e\xb0\x48\x0e\x80\x46\xa3\xd1\xdf\xdd\xf0\x56\x2a\xef\x4e\xbf\x1a\x0b\x2d\x57\x70\x2a\xe4\x7c\xae\xb4\xf2\xeb\xaf\x84\x68\x1b\xe9\xe7\xc6\xae\x4e\xc5\x [...] + compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\xfd\x73\x1c\xb7\xb1\xe0\xef\xfe\x2b\x50\x7c\x57\x25\x92\xb5\xbb\x94\x9d\x97\x3c\x1f\xef\x74\x29\x5a\x92\x13\xda\xfa\xe0\x49\xb2\x73\x29\x9f\x2b\x8b\x9d\xe9\xdd\x85\x38\x0b\x4c\x00\x0c\xa9\xcd\xbd\xfb\xdf\xaf\xd0\xdd\xf8\x98\xd9\x5d\x72\x29\x91\x7e\xe1\xd5\x4b\x7e\xb0\x48\x0e\x80\x46\xa3\xd1\xdf\xdd\xf0\x56\x2a\xef\x4e\xbf\x1a\x0b\x2d\x57\x70\x2a\xe4\x7c\xae\xb4\xf2\xeb\xaf\x84\x68\x1b\xe9\xe7\xc6\xae\x4e\xc5\x [...] }, } fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{ fs["/addons"].(os.FileInfo), fs["/builder"].(os.FileInfo), - fs["/camel-catalog-1.10.0-SNAPSHOT.yaml"].(os.FileInfo), + fs["/camel-catalog-1.10.0.yaml"].(os.FileInfo), fs["/crd"].(os.FileInfo), fs["/manager"].(os.FileInfo), fs["/prometheus"].(os.FileInfo), @@ -674,11 +676,6 @@ func (fs vfsgen۰FS) Open(path string) (http.File, error) { vfsgen۰CompressedFileInfo: f, gr: gr, }, nil - case *vfsgen۰FileInfo: - return &vfsgen۰File{ - vfsgen۰FileInfo: f, - Reader: bytes.NewReader(f.content), - }, nil case *vfsgen۰DirInfo: return &vfsgen۰Dir{ vfsgen۰DirInfo: f, @@ -760,37 +757,6 @@ func (f *vfsgen۰CompressedFile) Close() error { return f.gr.Close() } -// vfsgen۰FileInfo is a static definition of an uncompressed file (because it's not worth gzip compressing). -type vfsgen۰FileInfo struct { - name string - modTime time.Time - content []byte -} - -func (f *vfsgen۰FileInfo) Readdir(count int) ([]os.FileInfo, error) { - return nil, fmt.Errorf("cannot Readdir from file %s", f.name) -} -func (f *vfsgen۰FileInfo) Stat() (os.FileInfo, error) { return f, nil } - -func (f *vfsgen۰FileInfo) NotWorthGzipCompressing() {} - -func (f *vfsgen۰FileInfo) Name() string { return f.name } -func (f *vfsgen۰FileInfo) Size() int64 { return int64(len(f.content)) } -func (f *vfsgen۰FileInfo) Mode() os.FileMode { return 0444 } -func (f *vfsgen۰FileInfo) ModTime() time.Time { return f.modTime } -func (f *vfsgen۰FileInfo) IsDir() bool { return false } -func (f *vfsgen۰FileInfo) Sys() interface{} { return nil } - -// vfsgen۰File is an opened file instance. -type vfsgen۰File struct { - *vfsgen۰FileInfo - *bytes.Reader -} - -func (f *vfsgen۰File) Close() error { - return nil -} - // vfsgen۰DirInfo is a static definition of a directory. type vfsgen۰DirInfo struct { name string diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index afe478f..f9b26ba 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -26,7 +26,7 @@ const ( Version = "1.7.0-SNAPSHOT" // DefaultRuntimeVersion -- - DefaultRuntimeVersion = "1.10.0-SNAPSHOT" + DefaultRuntimeVersion = "1.10.0" // BuildahVersion -- BuildahVersion = "1.14.0" diff --git a/resources/camel-catalog-1.10.0-SNAPSHOT.yaml b/resources/camel-catalog-1.10.0.yaml similarity index 99% rename from resources/camel-catalog-1.10.0-SNAPSHOT.yaml rename to resources/camel-catalog-1.10.0.yaml index 681a47d..157d93e 100644 --- a/resources/camel-catalog-1.10.0-SNAPSHOT.yaml +++ b/resources/camel-catalog-1.10.0.yaml @@ -18,21 +18,21 @@ apiVersion: camel.apache.org/v1 kind: CamelCatalog metadata: - name: camel-catalog-1.10.0-snapshot + name: camel-catalog-1.10.0 labels: app: camel-k - camel.apache.org/catalog.loader.version: 3.11.2 - camel.apache.org/catalog.version: 3.11.2 - camel.apache.org/runtime.version: 1.10.0-SNAPSHOT + camel.apache.org/catalog.loader.version: 3.12.0 + camel.apache.org/catalog.version: 3.12.0 + camel.apache.org/runtime.version: 1.10.0 spec: runtime: - version: 1.10.0-SNAPSHOT + version: 1.10.0 provider: quarkus applicationClass: io.quarkus.bootstrap.runner.QuarkusEntryPoint metadata: - camel-quarkus.version: 2.3.0 - camel.version: 3.11.2 - quarkus.version: 2.3.0.Final + camel-quarkus.version: 2.4.0 + camel.version: 3.12.0 + quarkus.version: 2.4.0.Final dependencies: - groupId: org.apache.camel.k artifactId: camel-k-runtime diff --git a/resources/traits.yaml b/resources/traits.yaml index 47ffab4..a19f164 100755 --- a/resources/traits.yaml +++ b/resources/traits.yaml @@ -82,9 +82,9 @@ traits: - Kubernetes - Knative - OpenShift - description: The Container trait can be used to configure properties of the container + description: 'The Container trait can be used to configure properties of the container where the integration will run. It also provides configuration for Services associated - to the container. + to the container. nolint: tagliatelle' properties: - name: enabled type: bool @@ -463,8 +463,8 @@ traits: - Kubernetes - Knative - OpenShift - description: The Jolokia trait activates and configures the Jolokia Java agent. - See https://jolokia.org/reference/html/agents.html + description: 'The Jolokia trait activates and configures the Jolokia Java agent. + See https://jolokia.org/reference/html/agents.html nolint: tagliatelle' properties: - name: enabled type: bool @@ -940,7 +940,7 @@ traits: the key and certificates is to use `secrets` to store their contents and use the following parameters to reference them: `tls-certificate-secret`, `tls-key-secret`, `tls-ca-certificate-secret`, `tls-destination-ca-certificate-secret` See the examples - section at the end of this page to see the setup options.' + section at the end of this page to see the setup options. nolint: tagliatelle' properties: - name: enabled type: bool diff --git a/script/Makefile b/script/Makefile index efe62d9..0bd532a 100644 --- a/script/Makefile +++ b/script/Makefile @@ -17,7 +17,7 @@ VERSIONFILE := pkg/util/defaults/defaults.go VERSION ?= 1.7.0-SNAPSHOT OPERATOR_VERSION := $(subst -SNAPSHOT,,$(VERSION)) LAST_RELEASED_VERSION := 1.6.1 -RUNTIME_VERSION := 1.10.0-SNAPSHOT +RUNTIME_VERSION := 1.10.0 BUILDAH_VERSION := 1.14.0 KANIKO_VERSION := 0.17.1 INSTALL_DEFAULT_KAMELETS := true @@ -54,12 +54,12 @@ PACKAGE := camel-k # 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-1374 # Define here the repo containing the default Kamelet catalog (if any) KAMELET_CATALOG_REPO := https://github.com/apache/camel-kamelets.git # Optional branch for the default Kamelet catalog (change this to a tag before release) -KAMELET_CATALOG_REPO_BRANCH := main +KAMELET_CATALOG_REPO_BRANCH := v0.5.0 # When packaging artifacts into the docker image, you can "copy" them from local maven # or "download" them from Apache Snapshots and Maven Central