You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2021/10/23 07:47:10 UTC

[camel-k] branch release-1.6.x updated: preparing for next release

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

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


The following commit(s) were added to refs/heads/release-1.6.x by this push:
     new 63578bf  preparing for next release
63578bf is described below

commit 63578bf1ac4a1b8b9742f4968ed6398e043d790e
Author: nicolaferraro <ni...@gmail.com>
AuthorDate: Sat Oct 23 09:46:52 2021 +0200

    preparing for next release
---
 deploy/traits.yaml                             |   2 +-
 docs/modules/ROOT/partials/apis/crds-html.adoc | 224 +++++++++++++------------
 docs/modules/traits/pages/istio.adoc           |   2 +-
 pkg/resources/resources.go                     |   4 +-
 4 files changed, 123 insertions(+), 109 deletions(-)

diff --git a/deploy/traits.yaml b/deploy/traits.yaml
index e1ce66d..92500da 100755
--- a/deploy/traits.yaml
+++ b/deploy/traits.yaml
@@ -346,7 +346,7 @@ traits:
   - Kubernetes
   - Knative
   - OpenShift
-  description: The Istio trait allows to configure properties related to the Istio
+  description: The Istio trait allows configuring properties related to the Istio
     service mesh, such as sidecar injection and outbound IP ranges.
   properties:
   - name: enabled
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 &ndash;</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 &ndash;</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 &ndash;</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/istio.adoc b/docs/modules/traits/pages/istio.adoc
index b8fdef0..7fda913 100755
--- a/docs/modules/traits/pages/istio.adoc
+++ b/docs/modules/traits/pages/istio.adoc
@@ -1,7 +1,7 @@
 = Istio Trait
 
 // Start of autogenerated code - DO NOT EDIT! (description)
-The Istio trait allows to configure properties related to the Istio service mesh,
+The Istio trait allows configuring properties related to the Istio service mesh,
 such as sidecar injection and outbound IP ranges.
 
 
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index dc9c85f..d4a0d28 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -467,9 +467,9 @@ var assets = func() http.FileSystem {
 		"/traits.yaml": &vfsgen۰CompressedFileInfo{
 			name:             "traits.yaml",
 			modTime:          time.Time{},
-			uncompressedSize: 41625,
+			uncompressedSize: 41624,
 
-			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x23\x37\xb6\xd8\xf7\xf9\x15\x28\xde\x54\x8d\xa4\x22\x29\xd9\x9b\xdd\x75\x94\x38\x5b\xf2\xcc\x78\x2d\x7b\x1e\xca\x48\xeb\xad\xd4\xc4\xb5\x04\xbb\x0f\x49\x8c\xd0\x40\x2f\x80\x96\x86\x9b\x9b\xff\x9e\xc2\x39\x78\x35\xd9\xa2\xa8\xf1\xc8\xb1\x52\x77\xf7\x83\x47\x52\x37\x70\x70\x70\xde\xaf\x76\x86\x0b\x67\x4f\x9f\x4d\x98\xe2\x0d\x9c\x32\xbe\x58\x08\x25\xdc\xfa\x19\x63\xad\xe4\x6e\xa1\x4d\x73\xca\x16\x5c\x5a\x [...]
+			compressedContent: []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\x7d\x6b\x73\x23\x37\xb6\xd8\xf7\xf9\x15\x28\xde\x54\x8d\xa4\x22\x29\xd9\x9b\xdd\x75\x94\x38\x5b\xf2\xcc\x78\x2d\x7b\x1e\xca\x48\xeb\xad\xd4\xc4\xb5\x04\xbb\x0f\x49\x8c\xd0\x40\x2f\x80\x96\x86\x9b\x9b\xff\x9e\xc2\x39\x78\x35\xd9\xa2\xa8\xf1\xc8\xb1\x52\x77\xf7\x83\x47\x52\x37\x70\x70\x70\xde\xaf\x76\x86\x0b\x67\x4f\x9f\x4d\x98\xe2\x0d\x9c\x32\xbe\x58\x08\x25\xdc\xfa\x19\x63\xad\xe4\x6e\xa1\x4d\x73\xca\x16\x5c\x5a\x [...]
 		},
 	}
 	fs["/"].(*vfsgen۰DirInfo).entries = []os.FileInfo{