OADP-1057: CloudStorageLocation Prefix/CACert support

[kaovilai]

Related to openshift/openshift-velero-plugin#199

In order to avoid conflict with velero expected folders, new validations has been added.

Change Summary

• bl.CloudStorage now support Prefix/CACert fields
• New validation errors when Prefix is not specified and backupImages is not false.

  BackupLocation must have velero prefix when backupImages is not set to false
  

  BackupLocation must have cloud storage prefix when backupImages is not set to false
  

• Convert BSL/VSL validation reconciler into a function called from ValidateDataProtectionCR function

Testing instructions

Prerequisites:

• https://mobb.ninja/docs/misc/oadp/rosa-sts/

Substitute operator install steps in prerequiste for the following operator-sdk run command.

To try this patch, get operator-sdk and run

export OADP_TEST_NS=openshift-adp
(oc create namespace $OADP_TEST_NS || true) && \
operator-sdk run bundle ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle --namespace $OADP_TEST_NS

cleanup

operator-sdk cleanup oadp-operator --namespace $OADP_TEST_NS

After cleanup, you will have to create dpa again.

Example DPA

cat << EOF | oc create -f -
apiVersion: oadp.openshift.io/v1alpha1
kind: DataProtectionApplication
metadata:
  name: ${CLUSTER_NAME}-dpa
  namespace: openshift-adp
spec:
  features:
    dataMover:
      enable: false
  backupLocations:
  - bucket:
      cloudStorageRef:
        name: ${CLUSTER_NAME}-oadp
      credential:
        key: credentials
        name: cloud-credentials
      default: true
      prefix: velero # added capability in oadp-operator#1126 PR
      config:
        region: ${REGION}
  configuration:
    velero:
      defaultPlugins:
      - openshift
      - aws
      - csi
    restic:
      enable: false
  unsupportedOverrides:
    openshiftPluginImageFqin: ghcr.io/kaovilai/openshift-velero-plugin:sts
EOF

dev notes

bundle build command

IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-support-operator BUNDLE_IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle make docker-build docker-push bundle bundle-build bundle-push

[openshift-ci-robot]

@kaovilai: This pull request references OADP-1057 which is a valid jira issue.

In response to this:

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/test-infra 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]

@kaovilai: This pull request references OADP-1057 which is a valid jira issue.

In response to this:

Related to openshift/openshift-velero-plugin#199

Testing instructions

Prerequisites:

• https://mobb.ninja/docs/misc/oadp/rosa-sts/

Substitute operator install steps in prerequiste for the following operator-sdk run command.

To try this patch, get operator-sdk and run

export OADP_TEST_NS=openshift-adp
(oc create namespace $OADP_TEST_NS || true) && \
operator-sdk run bundle ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle --namespace $OADP_TEST_NS

cleanup

operator-sdk cleanup oadp-operator --namespace $OADP_TEST_NS

After cleanup, you will have to create dpa again.

Example DPA

cat << EOF | oc create -f -
apiVersion: oadp.openshift.io/v1alpha1
kind: DataProtectionApplication
metadata:
 name: ${CLUSTER_NAME}-dpa
 namespace: openshift-adp
spec:
 features:
   dataMover:
     enable: false
 backupLocations:
 - bucket:
     cloudStorageRef:
       name: ${CLUSTER_NAME}-oadp
     credential:
       key: credentials
       name: cloud-credentials
     default: true
     config:
       region: ${REGION}
 configuration:
   velero:
     defaultPlugins:
     - openshift
     - aws
     - csi
   restic:
     enable: false
 unsupportedOverrides:
   openshiftPluginImageFqin: ghcr.io/kaovilai/openshift-velero-plugin:sts
EOF

dev notes

bundle build command

IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-support-operator BUNDLE_IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle make docker-build docker-push bundle bundle-build bundle-push

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/test-infra repository.

[kaovilai]

validated working :D
backup/restore of imagestreamtags restored the image shas

[openshift-ci-robot]

@kaovilai: This pull request references OADP-1057 which is a valid jira issue.

In response to this:

Related to openshift/openshift-velero-plugin#199

Testing instructions

Prerequisites:

• https://mobb.ninja/docs/misc/oadp/rosa-sts/

Substitute operator install steps in prerequiste for the following operator-sdk run command.

To try this patch, get operator-sdk and run

export OADP_TEST_NS=openshift-adp
(oc create namespace $OADP_TEST_NS || true) && \
operator-sdk run bundle ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle --namespace $OADP_TEST_NS

cleanup

operator-sdk cleanup oadp-operator --namespace $OADP_TEST_NS

After cleanup, you will have to create dpa again.

Example DPA

cat << EOF | oc create -f -
apiVersion: oadp.openshift.io/v1alpha1
kind: DataProtectionApplication
metadata:
 name: ${CLUSTER_NAME}-dpa
 namespace: openshift-adp
spec:
 features:
   dataMover:
     enable: false
 backupLocations:
 - bucket:
     cloudStorageRef:
       name: ${CLUSTER_NAME}-oadp
     credential:
       key: credentials
       name: cloud-credentials
     default: true
     prefix: velero # added capability in oadp-operator#1126 PR
     config:
       region: ${REGION}
 configuration:
   velero:
     defaultPlugins:
     - openshift
     - aws
     - csi
   restic:
     enable: false
 unsupportedOverrides:
   openshiftPluginImageFqin: ghcr.io/kaovilai/openshift-velero-plugin:sts
EOF

dev notes

bundle build command

IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-support-operator BUNDLE_IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle make docker-build docker-push bundle bundle-build bundle-push

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/test-infra repository.

[kaovilai]

/retest

[kaovilai]

/retest

[kaovilai]

/retest

[openshift-ci-robot]

@kaovilai: This pull request references OADP-1057 which is a valid jira issue.

In response to this:

Related to openshift/openshift-velero-plugin#199

In order to avoid conflict with velero expected folders, a new validation has been added.

BackupLocation must have velero prefix when backupImages is set to true

Testing instructions

Prerequisites:

• https://mobb.ninja/docs/misc/oadp/rosa-sts/

Substitute operator install steps in prerequiste for the following operator-sdk run command.

To try this patch, get operator-sdk and run

export OADP_TEST_NS=openshift-adp
(oc create namespace $OADP_TEST_NS || true) && \
operator-sdk run bundle ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle --namespace $OADP_TEST_NS

cleanup

operator-sdk cleanup oadp-operator --namespace $OADP_TEST_NS

After cleanup, you will have to create dpa again.

Example DPA

cat << EOF | oc create -f -
apiVersion: oadp.openshift.io/v1alpha1
kind: DataProtectionApplication
metadata:
 name: ${CLUSTER_NAME}-dpa
 namespace: openshift-adp
spec:
 features:
   dataMover:
     enable: false
 backupLocations:
 - bucket:
     cloudStorageRef:
       name: ${CLUSTER_NAME}-oadp
     credential:
       key: credentials
       name: cloud-credentials
     default: true
     prefix: velero # added capability in oadp-operator#1126 PR
     config:
       region: ${REGION}
 configuration:
   velero:
     defaultPlugins:
     - openshift
     - aws
     - csi
   restic:
     enable: false
 unsupportedOverrides:
   openshiftPluginImageFqin: ghcr.io/kaovilai/openshift-velero-plugin:sts
EOF

dev notes

bundle build command

IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-support-operator BUNDLE_IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle make docker-build docker-push bundle bundle-build bundle-push

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/test-infra repository.

[kaovilai]

/retest

[kaovilai]

/retest

[openshift-ci-robot]

@kaovilai: This pull request references OADP-1057 which is a valid jira issue.

In response to this:

Related to openshift/openshift-velero-plugin#199

In order to avoid conflict with velero expected folders, new validations has been added.

Change Summary

• bl.CloudStorage now support Prefix/CACert fields
• New validation errors when Prefix is not specified and backupImages is not false.

BackupLocation must have velero prefix when backupImages is not set to false

BackupLocation must have cloud storage prefix when backupImages is not set to false

• Convert BSL/VSL validation reconciler into a function called from ValidateDataProtectionCR function

Testing instructions

Prerequisites:

• https://mobb.ninja/docs/misc/oadp/rosa-sts/

Substitute operator install steps in prerequiste for the following operator-sdk run command.

To try this patch, get operator-sdk and run

export OADP_TEST_NS=openshift-adp
(oc create namespace $OADP_TEST_NS || true) && \
operator-sdk run bundle ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle --namespace $OADP_TEST_NS

cleanup

operator-sdk cleanup oadp-operator --namespace $OADP_TEST_NS

After cleanup, you will have to create dpa again.

Example DPA

cat << EOF | oc create -f -
apiVersion: oadp.openshift.io/v1alpha1
kind: DataProtectionApplication
metadata:
 name: ${CLUSTER_NAME}-dpa
 namespace: openshift-adp
spec:
 features:
   dataMover:
     enable: false
 backupLocations:
 - bucket:
     cloudStorageRef:
       name: ${CLUSTER_NAME}-oadp
     credential:
       key: credentials
       name: cloud-credentials
     default: true
     prefix: velero # added capability in oadp-operator#1126 PR
     config:
       region: ${REGION}
 configuration:
   velero:
     defaultPlugins:
     - openshift
     - aws
     - csi
   restic:
     enable: false
 unsupportedOverrides:
   openshiftPluginImageFqin: ghcr.io/kaovilai/openshift-velero-plugin:sts
EOF

dev notes

bundle build command

IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-support-operator BUNDLE_IMG=ghcr.io/kaovilai/oadp-operator:csl-prefix-bundle make docker-build docker-push bundle bundle-build bundle-push

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/test-infra repository.

[kaovilai]

/retest

[kaovilai]

/hold
for openshift/openshift-velero-plugin#199 to merge first

[openshift-ci]

@kaovilai: 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/test-infra repository. I understand the commands that are listed here.

[sseago]

/unhold

[sseago]

/lgtm

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, sseago

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 [kaovilai,sseago]

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

[kaovilai]

/cherry-pick oadp-1.2

[openshift-cherrypick-robot]

@kaovilai: #1126 failed to apply on top of branch "oadp-1.2":

Applying: validator and type updates
Applying: validator and type updates
Applying: CloudStorageLocation prefix is added to BSL
Applying: clarify backupImages error
Applying: validator refactor returns err from validating funcs
Applying: unit tests fix
Applying: simplify expression
Applying: Add ignorable restore error logs and unit test
Using index info to reconstruct a base tree...
M	tests/e2e/lib/velero_helpers.go
Falling back to patching base and 3-way merge...
Auto-merging tests/e2e/lib/velero_helpers.go
CONFLICT (content): Merge conflict in tests/e2e/lib/velero_helpers.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0008 Add ignorable restore error logs and unit test
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.2

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/test-infra repository.