Skip to content

Commit

Permalink
OADP-205: Remove registry deployment in favor of plugin enhancement (#…
Browse files Browse the repository at this point in the history
…743)

* wip

* add OPENSHIFT_IMAGESTREAM_BACKUP env to velero container

* remove registry deployment waits, add TODO for s3 check

* comment out empty func

* remove commented code

* Remove func and tests for code deprecated or moved to plugin repo

Removed buildRegistryDeployment, buildRegistryContainer, getAWS/Azure/GCPRegistryEnvVars, populateAWSRegistrySecret, updateRegistrySVC/Route/RouteCM

* remove registry from CSV

* remove registry unsupportedOverride key

* add name/ns to deletion event message

* force velero loglevel to debug to expose registry logs

* Print velero container logs after each entry

* ignore debug logs we don't care about

* remove FEntry

* add "blob unknown" to failure log ignore

* disable backupImages for GCP provider

* add import b/r entry name clarification update
  • Loading branch information
kaovilai committed Jul 12, 2022
1 parent 515fbb3 commit 2665b29
Show file tree
Hide file tree
Showing 13 changed files with 232 additions and 2,073 deletions.
1 change: 0 additions & 1 deletion api/v1alpha1/oadp_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ const GCPPluginImageKey UnsupportedImageKey = "gcpPluginImageFqin"
const CSIPluginImageKey UnsupportedImageKey = "csiPluginImageFqin"
const DataMoverImageKey UnsupportedImageKey = "dataMoverImageFqin"
const ResticRestoreImageKey UnsupportedImageKey = "resticRestoreImageFqin"
const RegistryImageKey UnsupportedImageKey = "registryImageFqin"
const KubeVirtPluginImageKey UnsupportedImageKey = "kubevirtPluginImageFqin"
const OperatorTypeKey UnsupportedImageKey = "operator-type"

Expand Down
6 changes: 0 additions & 6 deletions bundle/manifests/oadp-operator.clusterserviceversion.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -708,10 +708,6 @@ spec:
value: quay.io
- name: PROJECT
value: konveyor
- name: VELERO_REGISTRY_REPO
value: registry
- name: VELERO_REGISTRY_TAG
value: latest
- name: VELERO_REPO
value: velero
- name: VELERO_OPENSHIFT_PLUGIN_REPO
Expand Down Expand Up @@ -864,8 +860,6 @@ spec:
name: gcp_plugin
- image: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
name: csi_plugin
- image: quay.io/konveyor/registry:latest
name: registry
- image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
name: kubevirt_plugin
version: 99.0.0
4 changes: 0 additions & 4 deletions config/manager/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@ spec:
value: quay.io
- name: PROJECT
value: konveyor
- name: VELERO_REGISTRY_REPO
value: registry
- name: VELERO_REGISTRY_TAG
value: latest
- name: VELERO_REPO
value: velero
- name: VELERO_OPENSHIFT_PLUGIN_REPO
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,6 @@ spec:
name: gcp_plugin
- image: quay.io/konveyor/velero-plugin-for-csi:konveyor-0.3
name: csi_plugin
- image: quay.io/konveyor/registry:latest
name: registry
- image: quay.io/konveyor/kubevirt-velero-plugin:v0.2.0
name: kubevirt_plugin
version: 99.0.0

0 comments on commit 2665b29

Please sign in to comment.