Make all ContourConfiguration CRD fields optional (#4451)

Removes all kubebuilder defaults from ContourConfiguration fields and switches them to pointers with the `omitempty` JSON tag to make them all fully optional. Defaults are then applied internally by Contour. Signed-off-by: Steve Kriss <krisss@vmware.com>
projectcontour · Apr 11, 2022 · a4478d6 · a4478d6
1 parent 1e2beab
commit a4478d6
Show file tree

Hide file tree

Showing 25 changed files with 1,940 additions and 3,315 deletions.
diff --git a/apis/projectcontour/v1alpha1/contourconfig.go b/apis/projectcontour/v1alpha1/contourconfig.go
diff --git a/apis/projectcontour/v1alpha1/helpers.go b/apis/projectcontour/v1alpha1/helpers.go
@@ -62,8 +62,8 @@ func (e *EnvoyConfig) Validate() error {
 }
 
 // endpointsInConfict returns error if different protocol are configured to use single port.
-func endpointsInConfict(health HealthConfig, metrics MetricsConfig) error {
-	if metrics.TLS != nil && health.Address == metrics.Address && health.Port == metrics.Port {
+func endpointsInConfict(health *HealthConfig, metrics *MetricsConfig) error {
+	if health != nil && metrics != nil && metrics.TLS != nil && health.Address == metrics.Address && health.Port == metrics.Port {
 		return fmt.Errorf("cannot use single port for health over HTTP and metrics over HTTPS")
 	}
 	return nil

diff --git a/apis/projectcontour/v1alpha1/zz_generated.deepcopy.go b/apis/projectcontour/v1alpha1/zz_generated.deepcopy.go
diff --git a/changelogs/unreleased/4451-skriss-minor.md b/changelogs/unreleased/4451-skriss-minor.md
@@ -0,0 +1,5 @@
+## All ContourConfiguration CRD fields are now optional
+
+To better manage configuration defaults, all `ContourConfiguration` CRD fields are now optional without defaults.
+Instead, Contour itself will apply defaults to any relevant fields that have not been specified by the user when it starts up, similarly to how processing of the Contour `ConfigMap` works today.
+The default values that Contour uses are documented in the `ContourConfiguration` CRD's API documentation.