diff --git a/.github/actions/gh-go-mod-generate-sbom b/.github/actions/gh-go-mod-generate-sbom index d4aee0cf51..171199f37b 160000 --- a/.github/actions/gh-go-mod-generate-sbom +++ b/.github/actions/gh-go-mod-generate-sbom @@ -1 +1 @@ -Subproject commit d4aee0cf5133055dbd98899978246c10c18c440f +Subproject commit 171199f37bbd0f611db19484319e87d2ee441f97 diff --git a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc index 89c648300b..2dd82a59f9 100644 --- a/docs/modules/ROOT/partials/apis/camel-k-crds.adoc +++ b/docs/modules/ROOT/partials/apis/camel-k-crds.adoc @@ -7228,6 +7228,20 @@ bool To automatically add an ingress whenever the integration uses an HTTP endpoint consumer. +|`tlsHosts` + +[]string +| + + +To configure tls hosts + +|`tlsSecretName` + +string +| + + +To configure tls secret name + |=== diff --git a/docs/modules/traits/pages/ingress.adoc b/docs/modules/traits/pages/ingress.adoc index bf26cee14c..8ed29dff9c 100755 --- a/docs/modules/traits/pages/ingress.adoc +++ b/docs/modules/traits/pages/ingress.adoc @@ -53,6 +53,14 @@ One of `Exact`, `Prefix`, `ImplementationSpecific` (default to `Prefix`). | bool | To automatically add an ingress whenever the integration uses an HTTP endpoint consumer. +| ingress.tls-hosts +| []string +| To configure tls hosts + +| ingress.tls-secret-name +| string +| To configure tls secret name + |=== // End of autogenerated code - DO NOT EDIT! (configuration) diff --git a/helm/camel-k/crds/crd-integration-platform.yaml b/helm/camel-k/crds/crd-integration-platform.yaml index 3107e80cbd..9bc5fb4702 100644 --- a/helm/camel-k/crds/crd-integration-platform.yaml +++ b/helm/camel-k/crds/crd-integration-platform.yaml @@ -1166,6 +1166,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait @@ -3180,6 +3188,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/helm/camel-k/crds/crd-integration-profile.yaml b/helm/camel-k/crds/crd-integration-profile.yaml index 2c24920a10..a5f9689e59 100644 --- a/helm/camel-k/crds/crd-integration-profile.yaml +++ b/helm/camel-k/crds/crd-integration-profile.yaml @@ -1043,6 +1043,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait @@ -2940,6 +2948,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/helm/camel-k/crds/crd-integration.yaml b/helm/camel-k/crds/crd-integration.yaml index 26fe736411..41ef39a36a 100644 --- a/helm/camel-k/crds/crd-integration.yaml +++ b/helm/camel-k/crds/crd-integration.yaml @@ -7107,6 +7107,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/helm/camel-k/crds/crd-kamelet-binding.yaml b/helm/camel-k/crds/crd-kamelet-binding.yaml index 202a701edc..9f420d5280 100644 --- a/helm/camel-k/crds/crd-kamelet-binding.yaml +++ b/helm/camel-k/crds/crd-kamelet-binding.yaml @@ -7391,6 +7391,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/helm/camel-k/crds/crd-pipe.yaml b/helm/camel-k/crds/crd-pipe.yaml index c2648f8c8b..89703a6cc0 100644 --- a/helm/camel-k/crds/crd-pipe.yaml +++ b/helm/camel-k/crds/crd-pipe.yaml @@ -7389,6 +7389,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go index a8db3093a2..c428ad5dfd 100644 --- a/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go +++ b/pkg/apis/camel/v1/trait/zz_generated.deepcopy.go @@ -453,6 +453,11 @@ func (in *IngressTrait) DeepCopyInto(out *IngressTrait) { *out = new(bool) **out = **in } + if in.TLSHosts != nil { + in, out := &in.TLSHosts, &out.TLSHosts + *out = make([]string, len(*in)) + copy(*out, *in) + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new IngressTrait. diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml index 3107e80cbd..9bc5fb4702 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationplatforms.yaml @@ -1166,6 +1166,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait @@ -3180,6 +3188,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml index 2c24920a10..a5f9689e59 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrationprofiles.yaml @@ -1043,6 +1043,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait @@ -2940,6 +2948,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml index 26fe736411..41ef39a36a 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_integrations.yaml @@ -7107,6 +7107,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml index 202a701edc..9f420d5280 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_kameletbindings.yaml @@ -7391,6 +7391,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait diff --git a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml index c2648f8c8b..89703a6cc0 100644 --- a/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml +++ b/pkg/resources/config/crd/bases/camel.apache.org_pipes.yaml @@ -7389,6 +7389,14 @@ spec: - Prefix - ImplementationSpecific type: string + tlsHosts: + description: To configure tls hosts + items: + type: string + type: array + tlsSecretName: + description: To configure tls secret name + type: string type: object istio: description: The configuration of Istio trait