Skip to content

Commit

Permalink
fix: Remove and realocate files
Browse files Browse the repository at this point in the history
Signed-off-by: Mateus Oliveira <[email protected]>
  • Loading branch information
mateusoliveira43 committed Dec 29, 2023
1 parent b7ad0e4 commit 0aa055c
Show file tree
Hide file tree
Showing 12 changed files with 6 additions and 185 deletions.
3 changes: 1 addition & 2 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,10 @@ bin
.devcontainer
build
cache
.ci-operator.yaml
.gitignore
./*.yml
./*.yaml
OWNERS*
OWNERS
PROJECT
LICENSE
Dockerfile
21 changes: 0 additions & 21 deletions .github/workflows/docs-actions.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/go-tests.yml

This file was deleted.

70 changes: 0 additions & 70 deletions .travis.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -311,9 +311,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
Expand Down
12 changes: 0 additions & 12 deletions OWNERS_ALIASES

This file was deleted.

9 changes: 0 additions & 9 deletions build/Dockerfile-ansible

This file was deleted.

21 changes: 0 additions & 21 deletions build/Dockerfile.bundle

This file was deleted.

9 changes: 0 additions & 9 deletions build/custom-ci-Dockerfile

This file was deleted.

2 changes: 1 addition & 1 deletion docs/design/upstream-datamover.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 `hack/disconnected-prep.sh`.

#### Velero code

Expand Down
8 changes: 4 additions & 4 deletions docs/developer/MTC_OADP_Upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
```
Expand Down
File renamed without changes.

0 comments on commit 0aa055c

Please sign in to comment.