Adjust max length for log path. Small refactor of generateRepoHostLogPath function.

Author: dsessler7

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

@@ -1429,7 +1429,7 @@ spec:
                               running in Backup Job Pods.
                             properties:
                               path:
-                                maxLength: 4096
+                                maxLength: 256
                                 type: string
                             type: object
                           priorityClassName:
@@ -1596,7 +1596,7 @@ spec:
                           running in postgres instance pods.
                         properties:
                           path:
-                            maxLength: 4096
+                            maxLength: 256
                             type: string
                         type: object
                       manual:
@@ -2572,7 +2572,7 @@ spec:
                               running in the repo host pod.
                             properties:
                               path:
-                                maxLength: 4096
+                                maxLength: 256
                                 type: string
                             type: object
                           priorityClassName:
@@ -20275,7 +20275,7 @@ spec:
                               running in Backup Job Pods.
                             properties:
                               path:
-                                maxLength: 4096
+                                maxLength: 256
                                 type: string
                             type: object
                           priorityClassName:
@@ -20442,7 +20442,7 @@ spec:
                           running in postgres instance pods.
                         properties:
                           path:
-                            maxLength: 4096
+                            maxLength: 256
                             type: string
                         type: object
                       manual:
@@ -21418,7 +21418,7 @@ spec:
                               running in the repo host pod.
                             properties:
                               path:
-                                maxLength: 4096
+                                maxLength: 256
                                 type: string
                             type: object
                           priorityClassName:

internal/pgbackrest/config.go

@@ -811,20 +811,17 @@ func serverConfig(cluster *v1beta1.PostgresCluster) iniSectionSet {
 //
 // This function assumes that the backups/pgbackrest spec is present in cluster.
 func generateRepoHostLogPath(cluster *v1beta1.PostgresCluster) string {
-	var pgBackRestLogPath string
 	for _, repo := range cluster.Spec.Backups.PGBackRest.Repos {
 		if repo.Volume != nil {
 			// If the user has set a log path in the spec, use it.
 			// Otherwise, default to /pgbackrest/repo#/log
 			if cluster.Spec.Backups.PGBackRest.RepoHost != nil &&
 				cluster.Spec.Backups.PGBackRest.RepoHost.Log != nil &&
 				cluster.Spec.Backups.PGBackRest.RepoHost.Log.Path != "" {
-				pgBackRestLogPath = cluster.Spec.Backups.PGBackRest.RepoHost.Log.Path
-			} else {
-				pgBackRestLogPath = fmt.Sprintf(naming.PGBackRestRepoLogPath, repo.Name)
+				return cluster.Spec.Backups.PGBackRest.RepoHost.Log.Path
 			}
-			break
+			return fmt.Sprintf(naming.PGBackRestRepoLogPath, repo.Name)
 		}
 	}
-	return pgBackRestLogPath
+	return ""
 }

pkg/apis/postgres-operator.crunchydata.com/v1beta1/shared_types.go

@@ -386,7 +386,7 @@ func (in *AdditionalVolume) AsVolume(name string) corev1.Volume {
 
 // LoggingConfiguration provides logging configuration for various components
 type LoggingConfiguration struct {
-	// +kubebuilder:validation:MaxLength=4096
+	// +kubebuilder:validation:MaxLength=256
 	// +optional
 	Path string `json:"path,omitempty"`
 }