Skip to content

Commit b51ce21

Browse files
author
Mateus Oliveira
authored
fix: read ephemeral-storage in code (#1477)
Signed-off-by: Mateus Oliveira <msouzaol@redhat.com>
1 parent b8fb9dd commit b51ce21

File tree

10 files changed

+1919
-7166
lines changed

10 files changed

+1919
-7166
lines changed

api/v1alpha1/oadp_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ type PodConfig struct {
131131
// tolerations defines the list of tolerations to be applied to daemonset
132132
// +optional
133133
Tolerations []corev1.Toleration `json:"tolerations,omitempty"`
134-
// resourceAllocations defines the CPU and Memory resource allocations for the Pod
134+
// resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
135135
// +optional
136136
// +nullable
137137
ResourceAllocations corev1.ResourceRequirements `json:"resourceAllocations,omitempty"`

bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ spec:
305305
description: nodeSelector defines the nodeSelector to be supplied to podSpec
306306
type: object
307307
resourceAllocations:
308-
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
308+
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
309309
nullable: true
310310
properties:
311311
claims:
@@ -546,7 +546,7 @@ spec:
546546
description: nodeSelector defines the nodeSelector to be supplied to podSpec
547547
type: object
548548
resourceAllocations:
549-
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
549+
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
550550
nullable: true
551551
properties:
552552
claims:
@@ -980,7 +980,7 @@ spec:
980980
description: nodeSelector defines the nodeSelector to be supplied to podSpec
981981
type: object
982982
resourceAllocations:
983-
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
983+
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
984984
nullable: true
985985
properties:
986986
claims:

config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ spec:
305305
description: nodeSelector defines the nodeSelector to be supplied to podSpec
306306
type: object
307307
resourceAllocations:
308-
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
308+
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
309309
nullable: true
310310
properties:
311311
claims:
@@ -546,7 +546,7 @@ spec:
546546
description: nodeSelector defines the nodeSelector to be supplied to podSpec
547547
type: object
548548
resourceAllocations:
549-
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
549+
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
550550
nullable: true
551551
properties:
552552
claims:
@@ -980,7 +980,7 @@ spec:
980980
description: nodeSelector defines the nodeSelector to be supplied to podSpec
981981
type: object
982982
resourceAllocations:
983-
description: resourceAllocations defines the CPU and Memory resource allocations for the Pod
983+
description: resourceAllocations defines the CPU, Memory and ephemeral-storage resource allocations for the Pod
984984
nullable: true
985985
properties:
986986
claims:

controllers/nodeagent.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,6 @@ const (
4242
)
4343

4444
var (
45-
fsPvHostPath = getFsPvHostPath("")
46-
pluginsHostPath = getPluginsHostPath("")
47-
4845
// v1.MountPropagationHostToContainer is a const. Const cannot be pointed to.
4946
// we need to declare mountPropagationToHostContainer so that we have an address to point to
5047
// for ds.Spec.Template.Spec.Volumes[].Containers[].VolumeMounts[].MountPropagation

0 commit comments

Comments
 (0)