Skip to content

Commit

Permalink
fix(trait): kamelet implicit secrets
Browse files Browse the repository at this point in the history
  • Loading branch information
squakez committed Feb 1, 2024
1 parent 30718c6 commit a790439
Show file tree
Hide file tree
Showing 23 changed files with 321 additions and 86 deletions.
6 changes: 6 additions & 0 deletions config/crd/bases/camel.apache.org_integrationkits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@ spec:
description: The builder trait is internally used to determine
the best strategy to build and configure IntegrationKits.
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to use
for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down
36 changes: 32 additions & 4 deletions config/crd/bases/camel.apache.org_integrationplatforms.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to use
for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down Expand Up @@ -1453,14 +1459,14 @@ spec:
type: string
type: array
configsAsProperties:
description: Will include any property file (suffix `.properties`)
description: Include any property file (suffix `.properties`)
listed in configmaps/secrets provided in the `configs` parameter
as a runtime property file (default `true`).
type: boolean
configsAsPropertyFiles:
description: 'Deprecated: use camel.properties or include
your properties in an explicit property file backed by a
configmap or secret. Will let the operator to treat configmaps
configmap or secret. Let the operator to treat configmaps
or secret as plain properties file with their key/value
list (ie .spec.data["camel.my-property"] = my-value) (default
`true`).'
Expand Down Expand Up @@ -1489,6 +1495,14 @@ spec:
items:
type: string
type: array
scanKameletsImplicitLabelSecrets:
description: 'Deprecated: include your properties in an explicit
property file backed by a secret. Let the operator to scan
for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
These secrets are mounted to the application and treated
as plain properties file with their key/value list (ie .spec.data["camel.my-property"]
= my-value) (default `true`).'
type: boolean
volumes:
description: 'A list of Persistent Volume Claims to be mounted.
Syntax: [pvcname:/container/path]'
Expand Down Expand Up @@ -2377,6 +2391,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to use
for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down Expand Up @@ -3320,14 +3340,14 @@ spec:
type: string
type: array
configsAsProperties:
description: Will include any property file (suffix `.properties`)
description: Include any property file (suffix `.properties`)
listed in configmaps/secrets provided in the `configs` parameter
as a runtime property file (default `true`).
type: boolean
configsAsPropertyFiles:
description: 'Deprecated: use camel.properties or include
your properties in an explicit property file backed by a
configmap or secret. Will let the operator to treat configmaps
configmap or secret. Let the operator to treat configmaps
or secret as plain properties file with their key/value
list (ie .spec.data["camel.my-property"] = my-value) (default
`true`).'
Expand Down Expand Up @@ -3356,6 +3376,14 @@ spec:
items:
type: string
type: array
scanKameletsImplicitLabelSecrets:
description: 'Deprecated: include your properties in an explicit
property file backed by a secret. Let the operator to scan
for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
These secrets are mounted to the application and treated
as plain properties file with their key/value list (ie .spec.data["camel.my-property"]
= my-value) (default `true`).'
type: boolean
volumes:
description: 'A list of Persistent Volume Claims to be mounted.
Syntax: [pvcname:/container/path]'
Expand Down
18 changes: 16 additions & 2 deletions config/crd/bases/camel.apache.org_integrations.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6417,6 +6417,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to use
for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down Expand Up @@ -7360,14 +7366,14 @@ spec:
type: string
type: array
configsAsProperties:
description: Will include any property file (suffix `.properties`)
description: Include any property file (suffix `.properties`)
listed in configmaps/secrets provided in the `configs` parameter
as a runtime property file (default `true`).
type: boolean
configsAsPropertyFiles:
description: 'Deprecated: use camel.properties or include
your properties in an explicit property file backed by a
configmap or secret. Will let the operator to treat configmaps
configmap or secret. Let the operator to treat configmaps
or secret as plain properties file with their key/value
list (ie .spec.data["camel.my-property"] = my-value) (default
`true`).'
Expand Down Expand Up @@ -7396,6 +7402,14 @@ spec:
items:
type: string
type: array
scanKameletsImplicitLabelSecrets:
description: 'Deprecated: include your properties in an explicit
property file backed by a secret. Let the operator to scan
for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
These secrets are mounted to the application and treated
as plain properties file with their key/value list (ie .spec.data["camel.my-property"]
= my-value) (default `true`).'
type: boolean
volumes:
description: 'A list of Persistent Volume Claims to be mounted.
Syntax: [pvcname:/container/path]'
Expand Down
20 changes: 18 additions & 2 deletions config/crd/bases/camel.apache.org_kameletbindings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6699,6 +6699,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to
use for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down Expand Up @@ -7657,14 +7663,14 @@ spec:
type: string
type: array
configsAsProperties:
description: Will include any property file (suffix `.properties`)
description: Include any property file (suffix `.properties`)
listed in configmaps/secrets provided in the `configs`
parameter as a runtime property file (default `true`).
type: boolean
configsAsPropertyFiles:
description: 'Deprecated: use camel.properties or include
your properties in an explicit property file backed
by a configmap or secret. Will let the operator to treat
by a configmap or secret. Let the operator to treat
configmaps or secret as plain properties file with their
key/value list (ie .spec.data["camel.my-property"] =
my-value) (default `true`).'
Expand Down Expand Up @@ -7693,6 +7699,16 @@ spec:
items:
type: string
type: array
scanKameletsImplicitLabelSecrets:
description: 'Deprecated: include your properties in an
explicit property file backed by a secret. Let the operator
to scan for secret labeled with `camel.apache.org/kamelet`
and `camel.apache.org/kamelet.configuration`. These
secrets are mounted to the application and treated as
plain properties file with their key/value list (ie
.spec.data["camel.my-property"] = my-value) (default
`true`).'
type: boolean
volumes:
description: 'A list of Persistent Volume Claims to be
mounted. Syntax: [pvcname:/container/path]'
Expand Down
20 changes: 18 additions & 2 deletions config/crd/bases/camel.apache.org_pipes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6697,6 +6697,12 @@ spec:
builder:
description: The configuration of Builder trait
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to
use for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down Expand Up @@ -7655,14 +7661,14 @@ spec:
type: string
type: array
configsAsProperties:
description: Will include any property file (suffix `.properties`)
description: Include any property file (suffix `.properties`)
listed in configmaps/secrets provided in the `configs`
parameter as a runtime property file (default `true`).
type: boolean
configsAsPropertyFiles:
description: 'Deprecated: use camel.properties or include
your properties in an explicit property file backed
by a configmap or secret. Will let the operator to treat
by a configmap or secret. Let the operator to treat
configmaps or secret as plain properties file with their
key/value list (ie .spec.data["camel.my-property"] =
my-value) (default `true`).'
Expand Down Expand Up @@ -7691,6 +7697,16 @@ spec:
items:
type: string
type: array
scanKameletsImplicitLabelSecrets:
description: 'Deprecated: include your properties in an
explicit property file backed by a secret. Let the operator
to scan for secret labeled with `camel.apache.org/kamelet`
and `camel.apache.org/kamelet.configuration`. These
secrets are mounted to the application and treated as
plain properties file with their key/value list (ie
.spec.data["camel.my-property"] = my-value) (default
`true`).'
type: boolean
volumes:
description: 'A list of Persistent Volume Claims to be
mounted. Syntax: [pvcname:/container/path]'
Expand Down
21 changes: 19 additions & 2 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -5953,6 +5953,13 @@ map[string]string
Defines a set of nodes the builder pod is eligible to be scheduled on, based on labels on the node.
|`annotations` +
map[string]string
|
When using `pod` strategy, annotation to use for the builder pod.
|===
Expand Down Expand Up @@ -7377,17 +7384,27 @@ bool
Deprecated: use camel.properties or include your properties in an explicit property file backed by a configmap or secret.
Will let the operator to treat configmaps or secret as plain properties file with their key/value list
Let the operator to treat configmaps or secret as plain properties file with their key/value list
(ie .spec.data["camel.my-property"] = my-value) (default `true`).
|`configsAsProperties` +
bool
|
Will include any property file (suffix `.properties`) listed in configmaps/secrets provided in the `configs`
Include any property file (suffix `.properties`) listed in configmaps/secrets provided in the `configs`
parameter as a runtime property file (default `true`).
|`scanKameletsImplicitLabelSecrets` +
bool
|
Deprecated: include your properties in an explicit property file backed by a secret.
Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
These secrets are mounted to the application and treated as plain properties file with their key/value list
(ie .spec.data["camel.my-property"] = my-value) (default `true`).
|===
Expand Down
4 changes: 4 additions & 0 deletions docs/modules/traits/pages/builder.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ if you need to execute them. Useful only with `pod` strategy.
| map[string]string
| Defines a set of nodes the builder pod is eligible to be scheduled on, based on labels on the node.

| builder.annotations
| map[string]string
| When using `pod` strategy, annotation to use for the builder pod.

|===

// End of autogenerated code - DO NOT EDIT! (configuration)
Expand Down
11 changes: 9 additions & 2 deletions docs/modules/traits/pages/mount.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,21 @@ Syntax: [configmap\|secret]:name[/key][@path], where name represents the resourc
| mount.configs-as-property-files
| bool
| Deprecated: use camel.properties or include your properties in an explicit property file backed by a configmap or secret.
Will let the operator to treat configmaps or secret as plain properties file with their key/value list
Let the operator to treat configmaps or secret as plain properties file with their key/value list
(ie .spec.data["camel.my-property"] = my-value) (default `true`).

| mount.configs-as-properties
| bool
| Will include any property file (suffix `.properties`) listed in configmaps/secrets provided in the `configs`
| Include any property file (suffix `.properties`) listed in configmaps/secrets provided in the `configs`
parameter as a runtime property file (default `true`).

| mount.scan-kamelets-implicit-label-secrets
| bool
| Deprecated: include your properties in an explicit property file backed by a secret.
Let the operator to scan for secret labeled with `camel.apache.org/kamelet` and `camel.apache.org/kamelet.configuration`.
These secrets are mounted to the application and treated as plain properties file with their key/value list
(ie .spec.data["camel.my-property"] = my-value) (default `true`).

|===

// End of autogenerated code - DO NOT EDIT! (configuration)
6 changes: 6 additions & 0 deletions helm/camel-k/crds/crd-integration-kit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,12 @@ spec:
description: The builder trait is internally used to determine
the best strategy to build and configure IntegrationKits.
properties:
annotations:
additionalProperties:
type: string
description: When using `pod` strategy, annotation to use
for the builder pod.
type: object
baseImage:
description: Specify a base image
type: string
Expand Down
Loading

0 comments on commit a790439

Please sign in to comment.