fix: read ephemeral-storage in code (#1477) (#1491)

Signed-off-by: Mateus Oliveira <[email protected]> (cherry picked from commit b51ce21)
openshift · Aug 15, 2024 · 59157e8 · 59157e8
1 parent f0ee960
commit 59157e8
Show file tree

Hide file tree

Showing 10 changed files with 1,923 additions and 7,169 deletions.
diff --git a/api/v1alpha1/oadp_types.go b/api/v1alpha1/oadp_types.go
@@ -128,7 +128,7 @@ type PodConfig struct {
 	// tolerations defines the list of tolerations to be applied to daemonset
 	// +optional
 	Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
-	// resourceAllocations defines the CPU and Memory resource allocations for the Pod
+	// resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
 	// +optional
 	// +nullable
 	ResourceAllocations corev1.ResourceRequirements `json:"resourceAllocations,omitempty"`

diff --git a/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml b/bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
@@ -305,7 +305,7 @@ spec:
                               description: nodeSelector defines the nodeSelector to be supplied to podSpec
                               type: object
                             resourceAllocations:
-                              description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
+                              description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
                               nullable: true
                               properties:
                                 claims:
@@ -546,7 +546,7 @@ spec:
                               description: nodeSelector defines the nodeSelector to be supplied to podSpec
                               type: object
                             resourceAllocations:
-                              description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
+                              description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
                               nullable: true
                               properties:
                                 claims:
@@ -980,7 +980,7 @@ spec:
                               description: nodeSelector defines the nodeSelector to be supplied to podSpec
                               type: object
                             resourceAllocations:
-                              description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
+                              description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
                               nullable: true
                               properties:
                                 claims:

diff --git a/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml b/config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
@@ -305,7 +305,7 @@ spec:
                               description: nodeSelector defines the nodeSelector to be supplied to podSpec
                               type: object
                             resourceAllocations:
-                              description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
+                              description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
                               nullable: true
                               properties:
                                 claims:
@@ -546,7 +546,7 @@ spec:
                               description: nodeSelector defines the nodeSelector to be supplied to podSpec
                               type: object
                             resourceAllocations:
-                              description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
+                              description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
                               nullable: true
                               properties:
                                 claims:
@@ -980,7 +980,7 @@ spec:
                               description: nodeSelector defines the nodeSelector to be supplied to podSpec
                               type: object
                             resourceAllocations:
-                              description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
+                              description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
                               nullable: true
                               properties:
                                 claims:

diff --git a/controllers/nodeagent.go b/controllers/nodeagent.go
@@ -42,9 +42,6 @@ const (
 )
 
 var (
-	fsPvHostPath    = getFsPvHostPath("")
-	pluginsHostPath = getPluginsHostPath("")
-
 	// v1.MountPropagationHostToContainer is a const. Const cannot be pointed to.
 	// we need to declare mountPropagationToHostContainer so that we have an address to point to
 	// for ds.Spec.Template.Spec.Volumes[].Containers[].VolumeMounts[].MountPropagation