Skip to content

[oadp-1.4] OADP-4379: read ephemeral-storage in code #1491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Aug 15, 2024
Merged

[oadp-1.4] OADP-4379: read ephemeral-storage in code #1491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/v1alpha1/oadp_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`
Expand Down
6 changes: 3 additions & 3 deletions bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
6 changes: 3 additions & 3 deletions config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions controllers/nodeagent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading