Skip to content

Use upstream install.Deployment, use secretName from BSL spec for volumeMount/Volume names#234

Merged
dymurray merged 6 commits into
openshift:masterfrom
kaovilai:useUpstreamInstallDeploymentFunc
Sep 1, 2021
Merged

Use upstream install.Deployment, use secretName from BSL spec for volumeMount/Volume names#234
dymurray merged 6 commits into
openshift:masterfrom
kaovilai:useUpstreamInstallDeploymentFunc

Conversation

@kaovilai
Copy link
Copy Markdown
Member

@kaovilai kaovilai commented Aug 22, 2021

Refactored buildVeleroDeployment to use upstream install.Deployment
Blocked by #233 #232 #231
This PR will be base for PR #235 resolving #175

@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch 3 times, most recently from 8cfaebe to 5a65e08 Compare August 22, 2021 23:05
@kaovilai kaovilai marked this pull request as draft August 23, 2021 16:53
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 23, 2021
@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch 2 times, most recently from 5e19572 to 5b34b75 Compare August 23, 2021 18:54
Comment thread controllers/velero.go
@openshift-ci openshift-ci Bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 25, 2021
@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch from 5b34b75 to 285638e Compare August 25, 2021 15:33
@kaovilai kaovilai marked this pull request as ready for review August 25, 2021 15:34
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 25, 2021
@kaovilai
Copy link
Copy Markdown
Member Author

/test ci/prow/operator-e2e

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Aug 25, 2021

@kaovilai: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

  • /test ci-index
  • /test images
  • /test operator-e2e

Use /test all to run all jobs.

Details

In response to this:

/test ci/prow/operator-e2e

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
Copy link
Copy Markdown
Member Author

/test operator-e2e

@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch from 285638e to e5b7b5c Compare August 25, 2021 16:06
@openshift-ci openshift-ci Bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Aug 25, 2021
@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch from e5b7b5c to bcd2f1f Compare August 25, 2021 16:46
@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch 2 times, most recently from d7e8b68 to 9c7f976 Compare August 25, 2021 17:16
@kaovilai kaovilai changed the title Use upstream install.Deployment Use upstream install.Deployment, use secretName from BSL spec for volumeMount/Volume names Aug 25, 2021
@kaovilai kaovilai dismissed shubham-pampattiwar’s stale review August 25, 2021 20:18

Requested changes implemented

Comment thread pkg/credentials/credentials.go
@kaovilai
Copy link
Copy Markdown
Member Author

wtf
/retest ci-index

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Aug 26, 2021

@kaovilai: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

  • /test ci-index
  • /test images
  • /test operator-e2e

Use /test all to run all jobs.

Details

In response to this:

wtf
/retest ci-index

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
Copy link
Copy Markdown
Member Author

/test ci-index

Comment thread controllers/velero.go
Comment thread controllers/velero.go
Comment thread controllers/velero.go
Comment thread controllers/velero.go
Comment thread controllers/velero.go Outdated
Comment thread controllers/velero.go
veleroDeployment.Spec.Replicas = pointer.Int32(1)
veleroDeployment.Spec.Template.Spec.Tolerations = velero.Spec.VeleroTolerations
veleroDeployment.Spec.Template.Spec.Volumes = append(veleroDeployment.Spec.Template.Spec.Volumes,
corev1.Volume{
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shubham-pampattiwar can you remind me, do we need this? I thought maybe we determined this came from an older instance of our installation we no longer needed. Setting this to an emptydir volume doesn't seem to be doing anything... but I can't remember what we said about it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dymurray I am not sure if this is needed but would like to keep it for now 😅 , IIRC we removed the certs-* initContainer.

Comment thread controllers/velero.go Outdated
Comment thread controllers/velero.go
Comment thread controllers/velero.go
Comment thread controllers/velero_test.go Outdated
@kaovilai kaovilai force-pushed the useUpstreamInstallDeploymentFunc branch from 48e4a85 to c291880 Compare August 31, 2021 18:19
@kaovilai kaovilai requested a review from dymurray August 31, 2021 18:30
@dymurray dymurray merged commit e93f9fe into openshift:master Sep 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants