fix: Remove and realocate files

Signed-off-by: Mateus Oliveira <[email protected]>

.dockerignore

@@ -4,13 +4,12 @@ bin
 .vscode
 .github
 .devcontainer
-build
+scripts
 cache
-.ci-operator.yaml
 .gitignore
 ./*.yml
 ./*.yaml
-OWNERS*
+OWNERS
 PROJECT
 LICENSE
 Dockerfile

Makefile

@@ -154,7 +154,7 @@ manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and Cust
 	# To keep dpa CRD the same, nullables have been added to test and bundle target separately.
 
 generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
-	GOFLAGS="-mod=mod" $(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
+	GOFLAGS="-mod=mod" $(CONTROLLER_GEN) object:headerFile="scripts/boilerplate.go.txt" paths="./..."
 
 fmt: ## Run go fmt against code.
 	go fmt -mod=mod ./...
@@ -318,9 +318,6 @@ bundle: manifests kustomize operator-sdk ## Generate bundle manifests and metada
 	cd config/manager && GOFLAGS="-mod=mod" $(KUSTOMIZE) edit set image controller=$(IMG)
 	GOFLAGS="-mod=mod" $(KUSTOMIZE) build config/manifests | GOFLAGS="-mod=mod" $(OPERATOR_SDK) generate bundle -q --extra-service-accounts "velero" --overwrite --version $(VERSION) $(BUNDLE_METADATA_OPTS)
 	@make nullables
-	# Copy updated bundle.Dockerfile to CI's Dockerfile.bundle
-	# TODO: update CI to use generated one
-	cp bundle.Dockerfile build/Dockerfile.bundle
 	GOFLAGS="-mod=mod" $(OPERATOR_SDK) bundle validate ./bundle
 
 .PHONY: nullables

docs/design/upstream-datamover.md

@@ -66,7 +66,7 @@ The new velero `DataUpload` and `DataDownload` will be added.
 
 #### OADP container images
 
-References to `velero-plugin-for-vsm` and `volume-snapshot-mover` images need to be removed from `config/manager/manager.yaml`, golang code, and `deploy/disconnected-prep.sh`.
+References to `velero-plugin-for-vsm` and `volume-snapshot-mover` images need to be removed from `config/manager/manager.yaml`, golang code, and `scripts/disconnected-prep.sh`.
 
 #### Velero code
 

docs/developer/MTC_OADP_Upgrade.md

@@ -15,7 +15,7 @@ Before you follow the steps, install MTC `1.6.3` in the cluster and also make th
 
 **MTC changes are as follows:**
 
-_**build/Dockerfile.bundle:**_
+_**bundle.Dockerfile:**_
 
 ```diff
 - LABEL operators.operatorframework.io.bundle.package.v1=crane-operator
@@ -97,7 +97,7 @@ _**deploy/olm-catalog/bundle/metadata/dependencies.yaml:**_
 
 **OADP changes are as follows:**
 
-**_build/Dockerfile.bundle:_**
+**_bundle.Dockerfile:_**
 ```diff
 - LABEL operators.operatorframework.io.bundle.package.v1=oadp-operator
 - LABEL operators.operatorframework.io.bundle.channels.v1=stable
@@ -140,15 +140,15 @@ Upgrade simulation steps:
 
 1. Build the MTC bundle using the following command (from MTC root directory)
 ```
-podman build -f build/Dockerfile.bundle -t quay.io/$ORG/mig-operator-bundle:$TAG .  
+podman build -f bundle.Dockerfile -t quay.io/$ORG/mig-operator-bundle:$TAG .  
 ```
 2. Push the MTC bundle image
 ```
 podman push quay.io/$ORG/mig-operator-bundle:$TAG
 ```
 3. Build the OADP Operator bundle using the following command (from OADP root directory)
 ```
-podman build -f build/Dockerfile.bundle -t quay.io/$ORG/oadp-operator-bundle:$TAG .
+podman build -f bundle.Dockerfile -t quay.io/$ORG/oadp-operator-bundle:$TAG .
 ```
 4. Push the OADP bundle image
 ```