Reword pgbackrest log.path validation rules.

Author: dsessler7

config/crd/bases/postgres-operator.crunchydata.com_postgresclusters.yaml

@@ -4589,18 +4589,18 @@ spec:
                     x-kubernetes-validations:
                     - message: pgbackrest sidecar log path is restricted to an existing
                         additional volume
-                      rule: '!has(self.log) || !has(self.log.path) || self.log.path.startsWith("/volumes/")'
+                      rule: '!self.?log.path.hasValue() || self.log.path.startsWith("/volumes/")'
                     - message: repo host log path is restricted to an existing additional
                         volume
-                      rule: '!has(self.repoHost) || !has(self.repoHost.log) || !has(self.repoHost.log.path)
-                        || self.repoHost.volumes.additional.exists(x, self.repoHost.log.path.startsWith("/volumes/"+x.name))'
+                      rule: '!self.?repoHost.log.path.hasValue() || self.repoHost.volumes.additional.exists(x,
+                        self.repoHost.log.path.startsWith("/volumes/"+x.name))'
                     - message: backup jobs log path is restricted to an existing additional
                         volume
-                      rule: '!has(self.jobs) || !has(self.jobs.log) || !has(self.jobs.log.path)
-                        || self.jobs.volumes.additional.exists(x, self.jobs.log.path.startsWith("/volumes/"+x.name))'
+                      rule: '!self.?jobs.log.path.hasValue() || self.jobs.volumes.additional.exists(x,
+                        self.jobs.log.path.startsWith("/volumes/"+x.name))'
                     - message: pgbackrest log-path must be set via the various log.path
                         fields in the spec
-                      rule: '!has(self.global) || !(''log-path'' in self.global)'
+                      rule: '!self.?global["log-path"].hasValue()'
                   snapshots:
                     description: VolumeSnapshot configuration
                     properties:

pkg/apis/postgres-operator.crunchydata.com/v1/pgbackrest_types.go

@@ -9,10 +9,10 @@ import (
 )
 
 // PGBackRestArchive defines a pgBackRest archive configuration
-// +kubebuilder:validation:XValidation:rule=`!has(self.log) || !has(self.log.path) || self.log.path.startsWith("/volumes/")`,message=`pgbackrest sidecar log path is restricted to an existing additional volume`
-// +kubebuilder:validation:XValidation:rule=`!has(self.repoHost) || !has(self.repoHost.log) || !has(self.repoHost.log.path) || self.repoHost.volumes.additional.exists(x, self.repoHost.log.path.startsWith("/volumes/"+x.name))`,message=`repo host log path is restricted to an existing additional volume`
-// +kubebuilder:validation:XValidation:rule=`!has(self.jobs) || !has(self.jobs.log) || !has(self.jobs.log.path) || self.jobs.volumes.additional.exists(x, self.jobs.log.path.startsWith("/volumes/"+x.name))`,message=`backup jobs log path is restricted to an existing additional volume`
-// +kubebuilder:validation:XValidation:rule=`!has(self.global) || !('log-path' in self.global)`,message=`pgbackrest log-path must be set via the various log.path fields in the spec`
+// +kubebuilder:validation:XValidation:rule=`!self.?log.path.hasValue() || self.log.path.startsWith("/volumes/")`,message=`pgbackrest sidecar log path is restricted to an existing additional volume`
+// +kubebuilder:validation:XValidation:rule=`!self.?repoHost.log.path.hasValue() || self.repoHost.volumes.additional.exists(x, self.repoHost.log.path.startsWith("/volumes/"+x.name))`,message=`repo host log path is restricted to an existing additional volume`
+// +kubebuilder:validation:XValidation:rule=`!self.?jobs.log.path.hasValue() || self.jobs.volumes.additional.exists(x, self.jobs.log.path.startsWith("/volumes/"+x.name))`,message=`backup jobs log path is restricted to an existing additional volume`
+// +kubebuilder:validation:XValidation:rule=`!self.?global["log-path"].hasValue()`,message=`pgbackrest log-path must be set via the various log.path fields in the spec`
 type PGBackRestArchive struct {
 	v1beta1.PGBackRestArchive `json:",inline"`
 }