OADP-4379: read ephemeral-storage in code

[mateusoliveira43]

Why the changes were made

Users were able to set ephemeral-storage values in DPA, but OADP code would never read the values. This PR fixes this behavior.

How to test the changes made

Create OADP with make deploy-olm and create DPA with ephemeral-storage values. Check if values are passed to Velero and node-agent containers.

[openshift-ci-robot]

@mateusoliveira43: This pull request references OADP-4379 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

In response to this:

Why the changes were made

Users were able to set storage and ephemeral-storage values in DPA, but OADP code would never read the values. This PR fixes this behavior.

How to test the changes made

Create OADP with make deploy-olm and create DPA with storage and ephemeral-storage values. Check if values are passed to Velero and node-agent containers.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[openshift-ci]

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

[openshift-ci-robot]

@mateusoliveira43: This pull request references OADP-4379 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target the "4.17.0" version, but no target version was set.

In response to this:

Why the changes were made

Users were able to set ephemeral-storage values in DPA, but OADP code would never read the values. This PR fixes this behavior.

How to test the changes made

Create OADP with make deploy-olm and create DPA with ephemeral-storage values. Check if values are passed to Velero and node-agent containers.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

[mateusoliveira43]

/retest

[weshayutin]

hrm.. shouldn't the crd spec be updated or we can't because it's upstream only?
Should see ephemeral storage

 oc explain dpa.spec.configuration.nodeAgent.podConfig.resourceAllocations
KIND:     DataProtectionApplication
VERSION:  oadp.openshift.io/v1alpha1

DESCRIPTION:
     resourceAllocations defines the CPU and Memory resource allocations for the
     Pod

If we can't update the crd doc, we should clone the bug for a doc add to our downstream only.

[shubham-pampattiwar]

hrm.. shouldn't the crd spec be updated or we can't because it's upstream only? Should see ephemeral storage

 oc explain dpa.spec.configuration.nodeAgent.podConfig.resourceAllocations
KIND:     DataProtectionApplication
VERSION:  oadp.openshift.io/v1alpha1

DESCRIPTION:
     resourceAllocations defines the CPU and Memory resource allocations for the
     Pod

If we can't update the crd doc, we should clone the bug for a doc add to our downstream only.

@weshayutin Good catch ! We own the DPA CRD, we should be able to update the description here via kube builder markers.

[weshayutin]

  configuration:
    nodeAgent:
      enable: true
      podConfig:
        resourceAllocations:
          requests:
            cpu: 200m
            ephemeral-storage: 5G
            memory: 256Mi
      uploaderType: kopia
    velero:
      defaultPlugins:
        - kubevirt
        - csi
        - openshift
        - aws
      podConfig:
        resourceAllocations:
          requests:
            cpu: 200m
            ephemeral-storage: 5G
            memory: 256Mi

 oc get daemonsets.apps node-agent -o yaml | grep ephemeral
            ephemeral-storage: 5G

Needs a doc update in the crd for the dpa for approval

[shubham-pampattiwar]

PR changes worked for me:

    ports:
    - containerPort: 8085
      name: metrics
      protocol: TCP
    resources:
      requests:
        cpu: 512m
        ephemeral-storage: 2Gi
        memory: 1Gi
    securityContext:
      allowPrivilegeEscalation: false
--
  initContainers:
  - image: quay.io/konveyor/openshift-velero-plugin:latest
    imagePullPolicy: Always
    name: openshift-velero-plugin
    resources:
      requests:
        cpu: 512m
        ephemeral-storage: 2Gi
        memory: 1Gi
    securityContext:
      allowPrivilegeEscalation: false
--
      readOnly: true
  - image: quay.io/konveyor/velero-plugin-for-aws:latest
    imagePullPolicy: Always
    name: velero-plugin-for-aws
    resources:
      requests:
        cpu: 512m
        ephemeral-storage: 2Gi
        memory: 1Gi
    securityContext:
      allowPrivilegeEscalation: false

Requested one change: https://github.com/openshift/oadp-operator/pull/1477/files#r1714703057

[weshayutin]

/test 4.16-e2e-test-aws

[kaovilai]

need rebase

[kaovilai]

@shubham-pampattiwar can you review if this is ok? you recently modified this in here

[shubham-pampattiwar]

yeah we need those

[mateusoliveira43]

removed usage in my changes

[openshift-ci]

@mateusoliveira43: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

[weshayutin]

/LGTM

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mateusoliveira43, weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [mateusoliveira43]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[mateusoliveira43]

/cherry-pick oadp-1.4

[openshift-cherrypick-robot]

@mateusoliveira43: #1477 failed to apply on top of branch "oadp-1.4":

Applying: fix: read ephemeral-storage in code
Using index info to reconstruct a base tree...
M	api/v1alpha1/oadp_types.go
M	bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
M	config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
M	controllers/nodeagent.go
M	controllers/nodeagent_test.go
M	controllers/validator.go
M	controllers/velero.go
M	controllers/velero_test.go
M	pkg/credentials/credentials.go
M	pkg/credentials/credentials_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/credentials/credentials_test.go
Auto-merging pkg/credentials/credentials.go
Auto-merging controllers/velero_test.go
CONFLICT (content): Merge conflict in controllers/velero_test.go
Auto-merging controllers/velero.go
Auto-merging controllers/validator.go
CONFLICT (content): Merge conflict in controllers/validator.go
Auto-merging controllers/nodeagent_test.go
CONFLICT (content): Merge conflict in controllers/nodeagent_test.go
Auto-merging controllers/nodeagent.go
Auto-merging config/crd/bases/oadp.openshift.io_dataprotectionapplications.yaml
Auto-merging bundle/manifests/oadp.openshift.io_dataprotectionapplications.yaml
Auto-merging api/v1alpha1/oadp_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: read ephemeral-storage in code
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick oadp-1.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.