Binding bucket logging pvc and path to core and endpoint pods and exporting GUARANTEED_LOGS_PATH as

environment variable

Signed-off-by: Aayush Chouhan <[email protected]>

Author: achouhan09

deploy/internal/deployment-endpoint.yaml

@@ -109,6 +109,7 @@ spec:
             - name: LOCAL_N2N_AGENT
             - name: NOOBAA_ROOT_SECRET
             - name: NODE_EXTRA_CA_CERTS
+            - name: GUARANTEED_LOGS_PATH
             - name: CONTAINER_CPU_REQUEST
               valueFrom:
                 resourceFieldRef:

deploy/internal/statefulset-core.yaml

@@ -100,6 +100,7 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
             - name: POSTGRES_SSL_REQUIRED
             - name: POSTGRES_SSL_UNAUTHORIZED
+            - name: GUARANTEED_LOGS_PATH
             - name: DB_TYPE
               value: postgres
             - name: CONTAINER_PLATFORM

pkg/bundle/deploy.go

@@ -3852,7 +3852,7 @@ data:
     shared_preload_libraries = 'pg_stat_statements'
 `
 
-const Sha256_deploy_internal_deployment_endpoint_yaml = "92e43b6069c5c28ee7c9efe9fc64d641d35f9e12e53773630ebfedd4685aeb88"
+const Sha256_deploy_internal_deployment_endpoint_yaml = "846a11f2ff8035ee4beb2dff72339f4cd946b05827c76489a44e921be2c34f48"
 
 const File_deploy_internal_deployment_endpoint_yaml = `apiVersion: apps/v1
 kind: Deployment
@@ -3965,6 +3965,7 @@ spec:
             - name: LOCAL_N2N_AGENT
             - name: NOOBAA_ROOT_SECRET
             - name: NODE_EXTRA_CA_CERTS
+            - name: GUARANTEED_LOGS_PATH
             - name: CONTAINER_CPU_REQUEST
               valueFrom:
                 resourceFieldRef:
@@ -4899,7 +4900,7 @@ spec:
       noobaa-s3-svc: "true"
 `
 
-const Sha256_deploy_internal_statefulset_core_yaml = "7b00c7a0e22fe28cb0827a696381b78c2bd79812a7dacbaa51cfe243e91f4f99"
+const Sha256_deploy_internal_statefulset_core_yaml = "0e7e90edc6c96f93cbdbdcc6aa6b64f05a98a88b181d94780d9a97fb2fcecd07"
 
 const File_deploy_internal_statefulset_core_yaml = `apiVersion: apps/v1
 kind: StatefulSet
@@ -5003,6 +5004,7 @@ spec:
             - name: POSTGRES_CONNECTION_STRING
             - name: POSTGRES_SSL_REQUIRED
             - name: POSTGRES_SSL_UNAUTHORIZED
+            - name: GUARANTEED_LOGS_PATH
             - name: DB_TYPE
               value: postgres
             - name: CONTAINER_PLATFORM

pkg/system/phase2_creating.go

@@ -427,6 +427,10 @@ func (r *Reconciler) setDesiredCoreEnv(c *corev1.Container) {
 			c.Env[j].Value = r.SecretRootMasterKey
 		case "NODE_EXTRA_CA_CERTS":
 			c.Env[j].Value = r.ApplyCAsToPods
+		case "GUARANTEED_LOGS_PATH":
+			if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
+				c.Env[j].Value = r.BucketLoggingVolumeMount
+			}
 		}
 	}
 }
@@ -484,6 +488,13 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 				}}
 				util.MergeVolumeMountList(&c.VolumeMounts, &secretVolumeMounts)
 			}
+			if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
+				bucketLogVolumeMounts := []corev1.VolumeMount{{
+					Name:      r.BucketLoggingVolume,
+					MountPath: r.BucketLoggingVolumeMount,
+				}}
+				util.MergeVolumeMountList(&c.VolumeMounts, &bucketLogVolumeMounts)
+			}
 		case "noobaa-log-processor":
 			if c.Image != r.NooBaa.Status.ActualImage {
 				coreImageChanged = true
@@ -580,6 +591,18 @@ func (r *Reconciler) SetDesiredCoreApp() error {
 		}}
 		util.MergeVolumeList(&podSpec.Volumes, &secretVolumes)
 	}
+
+	if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
+		bucketLogVolumes := []corev1.Volume{{
+			Name: r.BucketLoggingVolume,
+			VolumeSource: corev1.VolumeSource{
+				PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
+					ClaimName: r.BucketLoggingPVC.Name,
+				},
+			},
+		}}
+		util.MergeVolumeList(&podSpec.Volumes, &bucketLogVolumes)
+	}
 	return nil
 }
 

pkg/system/phase4_configuring.go

@@ -403,9 +403,12 @@ func (r *Reconciler) SetDesiredDeploymentEndpoint() error {
 					} else {
 						c.Env[j].Value = ""
 					}
-
 				case "NODE_EXTRA_CA_CERTS":
 					c.Env[j].Value = r.ApplyCAsToPods
+				case "GUARANTEED_LOGS_PATH":
+					if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
+						c.Env[j].Value = r.BucketLoggingVolumeMount
+					}
 				}
 			}
 
@@ -526,6 +529,24 @@ func (r *Reconciler) setDesiredEndpointMounts(podSpec *corev1.PodSpec, container
 		util.MergeVolumeMountList(&container.VolumeMounts, &secretVolumeMounts)
 	}
 
+	if r.NooBaa.Spec.BucketLogging.LoggingType == nbv1.BucketLoggingTypeGuaranteed {
+		bucketLogVolumes := []corev1.Volume{{
+			Name: r.BucketLoggingVolume,
+			VolumeSource: corev1.VolumeSource{
+				PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
+					ClaimName: r.BucketLoggingPVC.Name,
+				},
+			},
+		}}
+		util.MergeVolumeList(&podSpec.Volumes, &bucketLogVolumes)
+
+		bucketLogVolumeMounts := []corev1.VolumeMount{{
+			Name:      r.BucketLoggingVolume,
+			MountPath: r.BucketLoggingVolumeMount,
+		}}
+		util.MergeVolumeMountList(&container.VolumeMounts, &bucketLogVolumeMounts)
+	}
+
 	r.setDesiredRootMasterKeyMounts(podSpec, container)
 
 	for _, nsStore := range namespaceStoreList.Items {

pkg/system/reconciler.go

@@ -102,6 +102,8 @@ type Reconciler struct {
 	DefaultNsfsPvc            *corev1.PersistentVolumeClaim
 	OBCStorageClass           *storagev1.StorageClass
 	BucketLoggingPVC          *corev1.PersistentVolumeClaim
+	BucketLoggingVolume       string
+	BucketLoggingVolumeMount  string
 	PrometheusRule            *monitoringv1.PrometheusRule
 	ServiceMonitorMgmt        *monitoringv1.ServiceMonitor
 	ServiceMonitorS3          *monitoringv1.ServiceMonitor
@@ -295,6 +297,10 @@ func NewReconciler(
 	// Setting default AWS STS cluster as false
 	r.IsAWSSTSCluster = false
 
+	// Set bucket logging volume mount name and path
+	r.BucketLoggingVolume = r.Request.Name + "-bucket-logging-volume"
+	r.BucketLoggingVolumeMount = "etc/logs/bucket-logs"
+
 	r.DefaultCoreApp = r.CoreApp.Spec.Template.Spec.Containers[0].DeepCopy()
 	r.DefaultDeploymentEndpoint = r.DeploymentEndpoint.Spec.Template.Spec.DeepCopy()