From 2cca1800e6f8568da3c6b4b7802c667d28d2ee31 Mon Sep 17 00:00:00 2001 From: Joseph Date: Sun, 3 Aug 2025 15:30:15 -0400 Subject: [PATCH 1/4] Point velero code to openshift fork --- go.mod | 4 +++- go.sum | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 80271e4a..3cb52674 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/migtools/oadp-non-admin v0.0.0-20250505165924-a9be4321819c github.com/spf13/cobra v1.9.1 github.com/spf13/pflag v1.0.6 - github.com/vmware-tanzu/velero v1.16.1 + github.com/vmware-tanzu/velero v1.14.0 gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.33.1 k8s.io/apimachinery v0.33.1 @@ -99,3 +99,5 @@ require ( sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) + +replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250701195919-c5900973e7ec diff --git a/go.sum b/go.sum index 49f204ca..383eaf4c 100644 --- a/go.sum +++ b/go.sum @@ -142,6 +142,8 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/openshift/oadp-operator v1.0.2-0.20250425163444-a21288a0f20b h1:9u0bnuVHUFN24crRZOiog1ZgQCZaMJtFO9y8vT/+cXQ= github.com/openshift/oadp-operator v1.0.2-0.20250425163444-a21288a0f20b/go.mod h1:IvBUP2qVUBst49SSzVhxajq4Bs1n/lm9K/kguhTltqI= +github.com/openshift/velero v0.10.2-0.20250701195919-c5900973e7ec h1:LHlDtJ2RRhu0jlBWpeC+uMKpeqKMGUdwDemxrKt6RcE= +github.com/openshift/velero v0.10.2-0.20250701195919-c5900973e7ec/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -178,8 +180,6 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/vmware-tanzu/velero v1.16.1 h1:T9Jdt/6Jl1x+nT+OCCyOBtiakCdInHZAB3qU/jH6yGg= -github.com/vmware-tanzu/velero v1.16.1/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= From 601cfbf1d6d3d8bbf2d234de1a3ac3edbdd53f06 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 4 Aug 2025 09:38:46 -0400 Subject: [PATCH 2/4] Rename to maintain case --- docs/demo.outline | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 docs/demo.outline diff --git a/docs/demo.outline b/docs/demo.outline new file mode 100644 index 00000000..00cde135 --- /dev/null +++ b/docs/demo.outline @@ -0,0 +1,18 @@ +Demo outline to be recorded by team: + +1: on a clean system, show the system is clean +2: run through cli install + * show help for various commands +3: on a openshift cluster, w/ oadp already installed, dpa configed and sample app ready. Have non-admin user prepared w/ non-admin app deployed +4. execute admin backup + * show cli logs / describe +4. nuke app namespace +5. restore app + * show cli logs / describe +6. WIN +7. Now log out of cluster as admin, login as non-admin +8. Show app, add data to the to-dolist +9. run non-admin cli for backup +10. run non-admin cli logs for backup +11. run non-admin describe for backup +12. run non-admin backup delete From 54982236395f3544e34bb5494ed5022feae06109 Mon Sep 17 00:00:00 2001 From: Joseph Date: Mon, 4 Aug 2025 09:41:08 -0400 Subject: [PATCH 3/4] Add design dir --- kubectl-oadp-design.md => design/kubectl-oadp-design.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename kubectl-oadp-design.md => design/kubectl-oadp-design.md (100%) diff --git a/kubectl-oadp-design.md b/design/kubectl-oadp-design.md similarity index 100% rename from kubectl-oadp-design.md rename to design/kubectl-oadp-design.md From 1fc771d4b044438bb119f5be5078025c0bf3689d Mon Sep 17 00:00:00 2001 From: Joseph Date: Tue, 5 Aug 2025 13:11:34 -0400 Subject: [PATCH 4/4] Point to oadp-dev branch of openshift/velero --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3cb52674..8820c3d9 100644 --- a/go.mod +++ b/go.mod @@ -100,4 +100,4 @@ require ( sigs.k8s.io/yaml v1.4.0 // indirect ) -replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250701195919-c5900973e7ec +replace github.com/vmware-tanzu/velero => github.com/openshift/velero v0.10.2-0.20250429182916-56ba9c6f9c7f diff --git a/go.sum b/go.sum index 383eaf4c..8bd0b3ef 100644 --- a/go.sum +++ b/go.sum @@ -142,8 +142,8 @@ github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4= github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog= github.com/openshift/oadp-operator v1.0.2-0.20250425163444-a21288a0f20b h1:9u0bnuVHUFN24crRZOiog1ZgQCZaMJtFO9y8vT/+cXQ= github.com/openshift/oadp-operator v1.0.2-0.20250425163444-a21288a0f20b/go.mod h1:IvBUP2qVUBst49SSzVhxajq4Bs1n/lm9K/kguhTltqI= -github.com/openshift/velero v0.10.2-0.20250701195919-c5900973e7ec h1:LHlDtJ2RRhu0jlBWpeC+uMKpeqKMGUdwDemxrKt6RcE= -github.com/openshift/velero v0.10.2-0.20250701195919-c5900973e7ec/go.mod h1:+wInt9pLqlRiUZAWsO5eSxLZK9Q3jSV9MFaUrBfvGN0= +github.com/openshift/velero v0.10.2-0.20250429182916-56ba9c6f9c7f h1:j8eSzFwDy+Fmi7Cd0rXO6gzzOUOUsB4YK7Q8cc6k/pg= +github.com/openshift/velero v0.10.2-0.20250429182916-56ba9c6f9c7f/go.mod h1:sASoDB9pLWqvIi1nD1ZFOpmj5JB+p10lHVm+f+Hp1oU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=