Merge refs/heads/main into npolshak/add-trust-domain

solo-io · Jul 10, 2024 · bf44f0b · bf44f0b
2 parents 6038c0f + d6967e3
commit bf44f0b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/changelog/v1.18.0-beta7/fix-self-managed.yaml b/changelog/v1.18.0-beta7/fix-self-managed.yaml
@@ -0,0 +1,6 @@
+changelog:
+  - type: FIX
+    issueLink: https://github.com/solo-io/gloo/issues/9740
+    resolvesIssue: false
+    description: >-
+      Allow GatewayParameters with selfManaged to be applied successfully on k8s versions below 1.29.
diff --git a/install/helm/gloo/crds/gateway.gloo.solo.io_gatewayparameters.yaml b/install/helm/gloo/crds/gateway.gloo.solo.io_gatewayparameters.yaml
@@ -1757,6 +1757,7 @@ spec:
                 type: object
               selfManaged:
                 type: object
+                x-kubernetes-preserve-unknown-fields: true
             type: object
             x-kubernetes-validations:
             - message: only one of 'kube' or 'selfManaged' may be set

diff --git a/projects/gateway2/api/v1alpha1/gateway_parameters_types.go b/projects/gateway2/api/v1alpha1/gateway_parameters_types.go
@@ -41,6 +41,7 @@ type GatewayParametersSpec struct {
 	// The proxy will be self-managed and not auto-provisioned.
 	//
 	// +kubebuilder:validation:Optional
+	// +kubebuilder:pruning:PreserveUnknownFields
 	SelfManaged *SelfManagedGateway `json:"selfManaged,omitempty"`
 }