This is an automated email from the ASF dual-hosted git repository.
astefanutti 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 0170e91 fix(cli): kamel run -v should configure the mount trait
0170e91 is described below
commit 0170e914db70bf4101c7d7c730d873f75c4586b1
Author: Antonin Stefanutti <anto...@stefanutti.fr>
AuthorDate: Fri Feb 4 10:00:28 2022 +0100
fix(cli): kamel run -v should configure the mount trait
---
config/crd/bases/camel.apache.org_integrations.yaml | 6 +++---
config/crd/bases/camel.apache.org_kameletbindings.yaml | 7 +++----
helm/camel-k/crds/crd-integration.yaml | 6 +++---
helm/camel-k/crds/crd-kamelet-binding.yaml | 7 +++----
pkg/apis/camel/v1/integration_types.go | 6 +++---
pkg/cmd/run.go | 2 +-
pkg/resources/resources.go | 8 ++++----
7 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/config/crd/bases/camel.apache.org_integrations.yaml
b/config/crd/bases/camel.apache.org_integrations.yaml
index ca8e48f..e9f141b 100644
--- a/config/crd/bases/camel.apache.org_integrations.yaml
+++ b/config/crd/bases/camel.apache.org_integrations.yaml
@@ -73,9 +73,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait (camel.properties)
to manage
- properties Use container trait (container.configs) to manage
configs
- Use container trait (container.resources) to manage
resources Use
- container trait (container.volumes) to manage volumes'
+ properties Use container trait (mount.configs) to manage
configs
+ Use container trait (mount.resources) to manage resources
Use container
+ trait (mount.volumes) to manage volumes'
items:
description: ConfigurationSpec --
properties:
diff --git a/config/crd/bases/camel.apache.org_kameletbindings.yaml
b/config/crd/bases/camel.apache.org_kameletbindings.yaml
index a3569e8..cb61dec 100644
--- a/config/crd/bases/camel.apache.org_kameletbindings.yaml
+++ b/config/crd/bases/camel.apache.org_kameletbindings.yaml
@@ -78,10 +78,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait
(camel.properties) to
- manage properties Use container trait
(container.configs) to
- manage configs Use container trait (container.resources)
to
- manage resources Use container trait (container.volumes)
to
- manage volumes'
+ manage properties Use container trait (mount.configs) to
manage
+ configs Use container trait (mount.resources) to manage
resources
+ Use container trait (mount.volumes) to manage volumes'
items:
description: ConfigurationSpec --
properties:
diff --git a/helm/camel-k/crds/crd-integration.yaml
b/helm/camel-k/crds/crd-integration.yaml
index ca8e48f..e9f141b 100644
--- a/helm/camel-k/crds/crd-integration.yaml
+++ b/helm/camel-k/crds/crd-integration.yaml
@@ -73,9 +73,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait (camel.properties)
to manage
- properties Use container trait (container.configs) to manage
configs
- Use container trait (container.resources) to manage
resources Use
- container trait (container.volumes) to manage volumes'
+ properties Use container trait (mount.configs) to manage
configs
+ Use container trait (mount.resources) to manage resources
Use container
+ trait (mount.volumes) to manage volumes'
items:
description: ConfigurationSpec --
properties:
diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml
b/helm/camel-k/crds/crd-kamelet-binding.yaml
index a3569e8..cb61dec 100644
--- a/helm/camel-k/crds/crd-kamelet-binding.yaml
+++ b/helm/camel-k/crds/crd-kamelet-binding.yaml
@@ -78,10 +78,9 @@ spec:
properties:
configuration:
description: 'Deprecated: Use camel trait
(camel.properties) to
- manage properties Use container trait
(container.configs) to
- manage configs Use container trait (container.resources)
to
- manage resources Use container trait (container.volumes)
to
- manage volumes'
+ manage properties Use container trait (mount.configs) to
manage
+ configs Use container trait (mount.resources) to manage
resources
+ Use container trait (mount.volumes) to manage volumes'
items:
description: ConfigurationSpec --
properties:
diff --git a/pkg/apis/camel/v1/integration_types.go
b/pkg/apis/camel/v1/integration_types.go
index 3abe342..e2ae0e9 100644
--- a/pkg/apis/camel/v1/integration_types.go
+++ b/pkg/apis/camel/v1/integration_types.go
@@ -43,9 +43,9 @@ type IntegrationSpec struct {
PodTemplate *PodSpecTemplate `json:"template,omitempty"`
// Deprecated:
// Use camel trait (camel.properties) to manage properties
- // Use container trait (container.configs) to manage configs
- // Use container trait (container.resources) to manage resources
- // Use container trait (container.volumes) to manage volumes
+ // Use container trait (mount.configs) to manage configs
+ // Use container trait (mount.resources) to manage resources
+ // Use container trait (mount.volumes) to manage volumes
Configuration []ConfigurationSpec `json:"configuration,omitempty"`
Repositories []string `json:"repositories,omitempty"`
ServiceAccountName string
`json:"serviceAccountName,omitempty"`
diff --git a/pkg/cmd/run.go b/pkg/cmd/run.go
index 516099d..9f91312 100644
--- a/pkg/cmd/run.go
+++ b/pkg/cmd/run.go
@@ -632,7 +632,7 @@ func (o *runCmdOptions) createOrUpdateIntegration(cmd
*cobra.Command, c client.C
integration.Spec.AddConfiguration("secret", item)
}
for _, item := range o.Volumes {
- o.Traits = append(o.Traits, fmt.Sprintf("container.volumes=%s",
item))
+ o.Traits = append(o.Traits, fmt.Sprintf("mount.volumes=%s",
item))
}
for _, item := range o.EnvVars {
o.Traits = append(o.Traits, fmt.Sprintf("environment.vars=%s",
item))
diff --git a/pkg/resources/resources.go b/pkg/resources/resources.go
index a52a917..f1d33bd 100644
--- a/pkg/resources/resources.go
+++ b/pkg/resources/resources.go
@@ -145,16 +145,16 @@ var assets = func() http.FileSystem {
"/crd/bases/camel.apache.org_integrations.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_integrations.yaml",
modTime: time.Time{},
- uncompressedSize: 389782,
+ uncompressedSize: 389770,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1b\x37\xb6\x28\xfa\x3d\xbf\x02\x25\xa7\x8e\xa4\x1d\x91\xb2\x93\xd9\x73\xf7\xf8\x4e\x9d\x94\x46\x92\x33\xba\xb1\x65\x95\xa5\x24\x27\xe5\x64\x67\xc0\x6e\x90\xc4\x51\x37\xd0\x03\xa0\x29\xf1\xdc\xdc\xff\x7e\x0b\x0b\x40\x3f\xf8\xea\x85\x96\xe8\x78\xa6\x1a\x53\x35\x31\x29\xf6\x6a\x3c\x16\xd6\xfb\xf1\x82\x8c\x9e\x6f\x7c\xf1\x82\xbc\xe5\x09\x13\x9a\xa5\xc4\x48\x62\xe6\x8c\x9c\x15\x34\x99\x33\x72\x2b\xa7\xe6\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x6b\x73\x1b\x37\xb6\x28\xfa\x3d\xbf\x02\x25\xa7\x8e\xa4\x1d\x91\xb2\x93\xd9\x73\xf7\xf8\x4e\x9d\x94\x46\x92\x33\xba\xb1\x65\x95\xa5\x24\x27\xe5\x64\x67\xc0\x6e\x90\xc4\x51\x37\xd0\x03\xa0\x29\xf1\xdc\xdc\xff\x7e\x0b\x0b\x40\x3f\xf8\xea\x85\x96\xe8\x78\xa6\x1a\x53\x35\x31\x29\xf6\x6a\x3c\x16\xd6\xfb\xf1\x82\x8c\x9e\x6f\x7c\xf1\x82\xbc\xe5\x09\x13\x9a\xa5\xc4\x48\x62\xe6\x8c\x9c\x15\x34\x99\x33\x72\x2b\xa7\xe6\x
[...]
},
"/crd/bases/camel.apache.org_kameletbindings.yaml":
&vfsgen۰CompressedFileInfo{
name:
"camel.apache.org_kameletbindings.yaml",
modTime: time.Time{},
- uncompressedSize: 456736,
+ uncompressedSize: 456702,
- compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1c\x37\x96\x2f\xf8\xbf\x3e\x05\x82\x72\x5c\x92\xe3\xaa\xa2\x64\x77\xf7\x4e\x6b\x3b\xae\x83\x4d\x51\x36\xd7\x12\x55\x21\xd2\xf6\x75\xc8\x1e\x37\x2a\x13\x55\x85\x61\x26\x90\x03\x20\x8b\xac\x5e\xed\x77\xdf\xc0\x01\x90\x8f\x7a\x11\x27\x8b\xa4\xe5\xee\xc4\x44\x4c\x9b\x14\xf3\x24\x12\x8f\xf3\xfa\x9d\xc7\x73\x32\x7c\xb8\xf1\xec\x39\x79\xcb\x13\x26\x34\x4b\x89\x91\xc4\xcc\x19\x39\x2d\x68\x32\x67\xe4\x4a\x4e\x
[...]
+ compressedContent:
[]byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xec\xbd\x7b\x73\x1c\x37\x96\x2f\xf8\xbf\x3e\x05\x82\x72\x5c\x92\xe3\xaa\xa2\x64\x77\xf7\x4e\x6b\x3b\xae\x83\x4d\x51\x36\xd7\x12\x55\x21\xd2\xf6\x75\xc8\x1e\x37\x2a\x13\x55\x85\x61\x26\x90\x03\x20\x8b\xac\x5e\xed\x77\xdf\xc0\x01\x90\x8f\x7a\x11\x27\x8b\xa4\xe5\xee\xc4\x44\x4c\x9b\x14\xf3\x24\x12\x8f\xf3\xfa\x9d\xc7\x73\x32\x7c\xb8\xf1\xec\x39\x79\xcb\x13\x26\x34\x4b\x89\x91\xc4\xcc\x19\x39\x2d\x68\x32\x67\xe4\x4a\x4e\x
[...]
},
"/crd/bases/camel.apache.org_kamelets.yaml":
&vfsgen۰CompressedFileInfo{
name: "camel.apache.org_kamelets.yaml",
