logrotate: add logrotate functionality for csi

1) Make main container and csi addons container log to a file(dependency on klog) 2) Add a log-rotate sidecar container, so it can rotate the logs 3) Added other volume and volumemounts as needed 4) Added the privileged option for controllerplugin 5) Add resources to the logrotate container 6) make the api change in the merge function Signed-off-by: parth-gr <[email protected]>
ceph · Aug 14, 2024 · 86b1cb3 · 86b1cb3
1 parent 0648b5e
commit 86b1cb3
Show file tree

Hide file tree

Showing 6 changed files with 266 additions and 29 deletions.
diff --git a/api/v1alpha1/driver_types.go b/api/v1alpha1/driver_types.go
@@ -33,8 +33,10 @@ const (
 	MonthlyPeriod PeriodicityType = "monthly"
 )
 
+// +kubebuilder:validation:XValidation:message="Atleast any one of MaxLogSize or Periodicity should be set",rule="(has(self.MaxLogSize)) || (has(self.Periodicity))"
 type LogRotationSpec struct {
 	// MaxFiles is the number of logrtoate files
+	// Default to 7
 	//+kubebuilder:validation:Optional
 	MaxFiles int `json:"maxFiles,omitempty"`
 
@@ -48,6 +50,7 @@ type LogRotationSpec struct {
 	Periodicity PeriodicityType `json:"periodicity,omitempty"`
 
 	// LogHostPath is the prefix directory path for the csi log files
+	// Default to /var/lib/cephcsi
 	//+kubebuilder:validation:Optional
 	LogHostPath string `json:"logHostPath,omitempty"`
 }

diff --git a/config/crd/bases/csi.ceph.io_drivers.yaml b/config/crd/bases/csi.ceph.io_drivers.yaml
@@ -3542,11 +3542,14 @@ spec:
                     description: log rotation for csi pods
                     properties:
                       logHostPath:
-                        description: LogHostPath is the prefix directory path for
-                          the csi log files
+                        description: |-
+                          LogHostPath is the prefix directory path for the csi log files
+                          Default to /var/lib/cephcsi
                         type: string
                       maxFiles:
-                        description: MaxFiles is the number of logrtoate files
+                        description: |-
+                          MaxFiles is the number of logrtoate files
+                          Default to 7
                         type: integer
                       maxLogSize:
                         anyOf:
@@ -3565,6 +3568,10 @@ spec:
                         - monthly
                         type: string
                     type: object
+                    x-kubernetes-validations:
+                    - message: Atleast any one of MaxLogSize or Periodicity should
+                        be set
+                      rule: (has(self.MaxLogSize)) || (has(self.Periodicity))
                   verbosity:
                     description: |-
                       Log verbosity level for driver pods,

diff --git a/config/crd/bases/csi.ceph.io_operatorconfigs.yaml b/config/crd/bases/csi.ceph.io_operatorconfigs.yaml
@@ -3581,11 +3581,14 @@ spec:
                         description: log rotation for csi pods
                         properties:
                           logHostPath:
-                            description: LogHostPath is the prefix directory path
-                              for the csi log files
+                            description: |-
+                              LogHostPath is the prefix directory path for the csi log files
+                              Default to /var/lib/cephcsi
                             type: string
                           maxFiles:
-                            description: MaxFiles is the number of logrtoate files
+                            description: |-
+                              MaxFiles is the number of logrtoate files
+                              Default to 7
                             type: integer
                           maxLogSize:
                             anyOf:
@@ -3605,6 +3608,10 @@ spec:
                             - monthly
                             type: string
                         type: object
+                        x-kubernetes-validations:
+                        - message: Atleast any one of MaxLogSize or Periodicity should
+                            be set
+                          rule: (has(self.MaxLogSize)) || (has(self.Periodicity))
                       verbosity:
                         description: |-
                           Log verbosity level for driver pods,

diff --git a/internal/controller/defaults.go b/internal/controller/defaults.go
@@ -38,8 +38,10 @@ var imageDefaults = map[string]string{
 }
 
 const (
-	defaultGRrpcTimeout   = 150
-	defaultKubeletDirPath = "/var/lib/kubelet"
+	defaultGRrpcTimeout      = 150
+	defaultKubeletDirPath    = "/var/lib/kubelet"
+	defaultLogHostPath       = "/var/lib/cephcsi"
+	defaultLogRotateMaxFiles = 7
 )
 
 var defaultLeaderElection = csiv1a1.LeaderElectionSpec{