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

Jump to bottom

Allow unstructured schema for the ProxyDefaults CRD #495

Merged
merged 2 commits into from
Apr 20, 2021
Merged

Allow unstructured schema for the ProxyDefaults CRD #495

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
bbac87e
Allow unstructured schema for the ProxyDefaults CRD
ishustava Apr 20, 2021
db71c50
update changelog
ishustava Apr 20, 2021
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

BUG FIXES:
* CRDs: Fix a bug where the `config` field in `ProxyDefaults` CR was not synced to Consul because
`apiextensions.k8s.io/v1` requires CRD spec to have structured schema. [[GH-495](https://github.com/hashicorp/consul-k8s/pull/495)]

## 0.26.0-beta1 (April 16, 2021)

BREAKING CHANGES:
Expand Down
1 change: 1 addition & 0 deletions api/v1alpha1/proxydefaults_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type ProxyDefaultsSpec struct {
// Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting
// +kubebuilder:validation:Type=object
// +kubebuilder:validation:Schemaless
// +kubebuilder:pruning:PreserveUnknownFields
Config json.RawMessage `json:"config,omitempty"`
// MeshGateway controls the default mesh gateway configuration for this service.
MeshGateway MeshGatewayConfig `json:"meshGateway,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions config/crd/bases/consul.hashicorp.com_proxydefaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ spec:
config:
description: Config is an arbitrary map of configuration values used by Connect proxies. Any values that your proxy allows can be configured globally here. Supports JSON config values. See https://www.consul.io/docs/connect/proxies/envoy#configuration-formatting
type: object
x-kubernetes-preserve-unknown-fields: true
expose:
description: Expose controls the default expose path configuration for Envoy.
properties:
Expand Down