Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: adding ingressClassName field to the Ingress trait #5797

Merged
merged 1 commit into from
Aug 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/keda/duck/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions addons/strimzi/duck/v1beta2/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions docs/modules/ROOT/partials/apis/camel-k-crds.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -7198,6 +7198,14 @@ It's enabled by default whenever a Service is added to the integration (through



|`ingressClassName` +
string
|


The Ingress class name as defined by the Ingress spec
See https://kubernetes.io/docs/concepts/services-networking/ingress/

|`annotations` +
map[string]string
|
Expand Down
5 changes: 5 additions & 0 deletions docs/modules/traits/pages/ingress.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,11 @@ The following configuration options are available:
| bool
| Can be used to enable or disable a trait. All traits share this common property.

| ingress.ingress-class-name
| string
| The Ingress class name as defined by the Ingress spec
See https://kubernetes.io/docs/concepts/services-networking/ingress/

| ingress.annotations
| map[string]string
| The annotations added to the ingress.
Expand Down
25,288 changes: 13,076 additions & 12,212 deletions helm/camel-k/crds/camel-k-crds.yaml

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions pkg/apis/camel/v1/trait/ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ import networkingv1 "k8s.io/api/networking/v1"
// +camel-k:trait=ingress.
type IngressTrait struct {
Trait `property:",squash" json:",inline"`
// The Ingress class name as defined by the Ingress spec
// See https://kubernetes.io/docs/concepts/services-networking/ingress/
IngressClassName string `property:"ingress-class-name" json:"ingressClassName,omitempty"`
// The annotations added to the ingress.
// This can be used to set controller specific annotations, e.g., when using the NGINX Ingress controller:
// See https://github.com/kubernetes/ingress-nginx/blob/main/docs/user-guide/nginx-configuration/annotations.md
Expand Down
1 change: 1 addition & 0 deletions pkg/apis/camel/v1/trait/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/apis/camel/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pkg/apis/camel/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

412 changes: 201 additions & 211 deletions pkg/resources/config/crd/bases/camel.apache.org_builds.yaml

Large diffs are not rendered by default.

33 changes: 18 additions & 15 deletions pkg/resources/config/crd/bases/camel.apache.org_camelcatalogs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
# limitations under the License.
# ---------------------------------------------------------------------------


---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: camelcatalogs.camel.apache.org
spec:
group: camel.apache.org
Expand Down Expand Up @@ -61,19 +63,14 @@ spec:
statically generated.
properties:
apiVersion:
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
Expand Down Expand Up @@ -374,9 +371,9 @@ spec:
type: string
capabilities:
additionalProperties:
description: |-
Capability is a particular feature which requires a well known set of dependencies and other properties
which are specified in the runtime catalog.
description: Capability is a particular feature which requires
a well known set of dependencies and other properties which
are specified in the runtime catalog.
properties:
buildTimeProperties:
description: Set of required Camel build time properties
Expand Down Expand Up @@ -542,3 +539,9 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading