Update ovnKubernetesConfig.policyAuditConfig Default

We need to initialize `ovnKubernetesConfig.policyAuditConfig` so that the proper defaults are populated when a CNO config object is created It would be better to do this using the `+kubebuilder:default` flag however it is broken for this case as described in this [upstream issue](kubernetes-sigs/controller-tools#622) Signed-off-by: astoycos <astoycos@redhat.com>
astoycos · Sep 22, 2021 · aeb12f5 · aeb12f5
1 parent 21ac9e0
commit aeb12f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/operator/v1/0000_70_cluster-network-operator_01.crd.yaml b/operator/v1/0000_70_cluster-network-operator_01.crd.yaml
@@ -237,7 +237,7 @@ spec:
                           format: int32
                           minimum: 0
                         policyAuditConfig:
-                          description: policyAuditConfig is the configuration for network policy audit events. If unset, reported defaults are used.
+                          description: 'policyAuditConfig is the configuration for network policy audit events. If unset, reported defaults are used. This config is replaced during a strategic merge patch TODO(astoycos): once https://github.com/kubernetes-sigs/controller-tools/issues/622 is resolved convert back to using kubebuilder'
                           type: object
                           properties:
                             destination:

diff --git a/operator/v1/0000_70_cluster-network-operator_01.crd.yaml.patched b/operator/v1/0000_70_cluster-network-operator_01.crd.yaml.patched
diff --git a/operator/v1/types_network.go b/operator/v1/types_network.go
@@ -372,6 +372,9 @@ type OVNKubernetesConfig struct {
 	IPsecConfig *IPsecConfig `json:"ipsecConfig,omitempty"`
 	// policyAuditConfig is the configuration for network policy audit events. If unset,
 	// reported defaults are used.
+	// This config is replaced during a strategic merge patch
+	// TODO(astoycos): once https://github.com/kubernetes-sigs/controller-tools/issues/622
+	// is resolved convert back to using kubebuilder
 	// +optional
 	PolicyAuditConfig *PolicyAuditConfig `json:"policyAuditConfig,omitempty"`
 }

diff --git a/operator/v1/zz_generated.swagger_doc_generated.go b/operator/v1/zz_generated.swagger_doc_generated.go