Skip to content

Commit

Permalink
add changelog and address comments
Browse files Browse the repository at this point in the history
  • Loading branch information
randmonkey committed Nov 10, 2023
1 parent 37232df commit 350d71b
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 17 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ Adding a new version? You'll need three changes:

### Changed

- `SecretKeyRef` of `ConfigFrom` field in `KongPlugin` and `KongClusterPlugin`
are `Required`. When `ConfigFrom` is specified, the validation of there CRDs
will require `SecretKeyRef` to be present.
[#5103](https://github.com/Kong/kubernetes-ingress-controller/pull/5103)
- CRD Validation Expressions
- `KongPlugin` and `KongClusterPlugin` now enforce only one of `config` and `configFrom`
to be set.
Expand Down
2 changes: 0 additions & 2 deletions config/crd/bases/configuration.konghq.com_kongconsumers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,6 @@ spec:
username:
description: Username is a Kong cluster-unique username of the consumer.
type: string
required:
- username
type: object
x-kubernetes-validations:
- message: Need to provide either username or custom_id
Expand Down
2 changes: 1 addition & 1 deletion pkg/apis/configuration/v1/kongconsumer_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type KongConsumer struct {
metav1.ObjectMeta `json:"metadata,omitempty"`

// Username is a Kong cluster-unique username of the consumer.
Username string `json:"username"`
Username string `json:"username,omitempty"`

// CustomID is a Kong cluster-unique existing ID for the consumer - useful for mapping
// Kong with users in your existing database.
Expand Down
4 changes: 4 additions & 0 deletions pkg/apis/configuration/v1beta1/ingress_rules.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,23 +32,27 @@ type IngressRule struct {
// Port is the port on which to accept TCP or TLS over TCP sessions and
// route. It is a required field. If a Host is not specified, the requested
// are routed based only on Port.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=1
// +kubebuilder:validation:Maximum=65535
// +kubebuilder:validation:Format=int32
Port int `json:"port"`

// Backend defines the referenced service endpoint to which the traffic
// will be forwarded to.
// +kubebuilder:validation:Required
Backend IngressBackend `json:"backend"`
}

// IngressBackend describes all endpoints for a given service and port.
type IngressBackend struct {
// Specifies the name of the referenced service.
// +kubebuilder:validation:Required
// +kubebuilder:validation:MinLength=1
ServiceName string `json:"serviceName"`

// Specifies the port of the referenced service.
// +kubebuilder:validation:Required
// +kubebuilder:validation:Minimum=1
// +kubebuilder:validation:Maximum=65535
// +kubebuilder:validation:Format=int32
Expand Down
2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-dbless-k4k8s-enterprise.yaml

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

2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-dbless-konnect-enterprise.yaml

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

2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-dbless-konnect.yaml

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

2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-dbless.yaml

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

2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-postgres-enterprise.yaml

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

2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-postgres-multiple-gateways.yaml

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

2 changes: 0 additions & 2 deletions test/e2e/manifests/all-in-one-postgres.yaml

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

0 comments on commit 350d71b

Please sign in to comment.