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.

Sign up for GitHub

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

Fix incorrect CRD field names #1017

Merged
merged 2 commits into from
Feb 3, 2022
Merged

Fix incorrect CRD field names #1017

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2facee
Fix incorrect CRD field names
lkysow Feb 3, 2022
5a4cf86
changelog
lkysow Feb 3, 2022
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
## UNRELEASED

BREAKING CHANGES:
* Helm
* Rename fields of IngressGateway CRD to fix incorrect names (`gatewayTLSConfig` => `tls`, `gatewayServiceTLSConfig` => `tls`, `gatewayTLSSDSConfig` => `sds`). [[GH-1017](https://github.com/hashicorp/consul-k8s/pull/1017)]

## 0.40.0 (January 27, 2022)

BREAKING CHANGES:
Expand Down
10 changes: 5 additions & 5 deletions charts/consul/templates/crd-ingressgateways.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@ spec:
description: IngressListener manages the configuration for a listener
on a specific port.
properties:
gatewayTLSConfig:
tls:
description: TLS config for this listener.
properties:
enabled:
description: Indicates that TLS should be enabled for this
gateway service.
type: boolean
gatewayTLSSDSConfig:
sds:
description: SDS allows configuring TLS certificate from
an SDS service.
properties:
Expand Down Expand Up @@ -103,11 +103,11 @@ spec:
description: IngressService manages configuration for services
that are exposed to ingress traffic.
properties:
gatewayServiceTLSConfig:
tls:
description: TLS allows specifying some TLS configuration
per listener.
properties:
gatewayTLSSDSConfig:
sds:
description: SDS allows configuring TLS certificate
from an SDS service.
properties:
Expand Down Expand Up @@ -212,7 +212,7 @@ spec:
description: Indicates that TLS should be enabled for this gateway
service.
type: boolean
gatewayTLSSDSConfig:
sds:
description: SDS allows configuring TLS certificate from an SDS
service.
properties:
Expand Down
8 changes: 4 additions & 4 deletions control-plane/api/v1alpha1/ingressgateway_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ type GatewayTLSConfig struct {
Enabled bool `json:"enabled"`

// SDS allows configuring TLS certificate from an SDS service.
SDS *GatewayTLSSDSConfig `json:"gatewayTLSSDSConfig,omitempty"`
SDS *GatewayTLSSDSConfig `json:"sds,omitempty"`
}

type GatewayServiceTLSConfig struct {
// SDS allows configuring TLS certificate from an SDS service.
SDS *GatewayTLSSDSConfig `json:"gatewayTLSSDSConfig,omitempty"`
SDS *GatewayTLSSDSConfig `json:"sds,omitempty"`
}

type GatewayTLSSDSConfig struct {
Expand All @@ -89,7 +89,7 @@ type IngressListener struct {
Protocol string `json:"protocol,omitempty"`

// TLS config for this listener.
TLS *GatewayTLSConfig `json:"gatewayTLSConfig,omitempty"`
TLS *GatewayTLSConfig `json:"tls,omitempty"`

// Services declares the set of services to which the listener forwards
// traffic.
Expand Down Expand Up @@ -134,7 +134,7 @@ type IngressService struct {
Partition string `json:"partition,omitempty"`

// TLS allows specifying some TLS configuration per listener.
TLS *GatewayServiceTLSConfig `json:"gatewayServiceTLSConfig,omitempty"`
TLS *GatewayServiceTLSConfig `json:"tls,omitempty"`

// Allow HTTP header manipulation to be configured.
RequestHeaders *HTTPHeaderModifiers `json:"requestHeaders,omitempty"`
Expand Down
10 changes: 5 additions & 5 deletions control-plane/config/crd/bases/consul.hashicorp.com_ingressgateways.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ spec:
description: IngressListener manages the configuration for a listener
on a specific port.
properties:
gatewayTLSConfig:
tls:
description: TLS config for this listener.
properties:
enabled:
description: Indicates that TLS should be enabled for this
gateway service.
type: boolean
gatewayTLSSDSConfig:
sds:
description: SDS allows configuring TLS certificate from
an SDS service.
properties:
Expand Down Expand Up @@ -97,11 +97,11 @@ spec:
description: IngressService manages configuration for services
that are exposed to ingress traffic.
properties:
gatewayServiceTLSConfig:
tls:
description: TLS allows specifying some TLS configuration
per listener.
properties:
gatewayTLSSDSConfig:
sds:
description: SDS allows configuring TLS certificate
from an SDS service.
properties:
Expand Down Expand Up @@ -206,7 +206,7 @@ spec:
description: Indicates that TLS should be enabled for this gateway
service.
type: boolean
gatewayTLSSDSConfig:
sds:
description: SDS allows configuring TLS certificate from an SDS
service.
properties:
Expand Down