-
Notifications
You must be signed in to change notification settings - Fork 69
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[OADP-458] Bring back component: velero
label
#638
Conversation
@kaovilai I am a little confused so bear with me, the label we are looking for is |
@@ -392,6 +392,7 @@ func (r *DPAReconciler) buildVeleroDeployment(veleroDeployment *appsv1.Deploymen | |||
) | |||
veleroDeployment.TypeMeta = installDeployment.TypeMeta | |||
veleroDeployment.Spec = installDeployment.Spec | |||
veleroDeployment.Labels = installDeployment.Labels |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JaydipGabani This adds component: velero to veleroDeployment
@@ -427,23 +428,16 @@ func removeDuplicateValues(slice []string) []string { | |||
} | |||
|
|||
func (r *DPAReconciler) customizeVeleroDeployment(dpa *oadpv1alpha1.DataProtectionApplication, veleroDeployment *appsv1.Deployment) error { | |||
veleroDeployment.Labels = r.getAppLabels(dpa) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't override labels
}, | ||
//append dpa labels | ||
for k, v := range r.getDpaAppLabels(dpa) { | ||
if veleroDeployment.Labels[k] == "" { //saves component: velero labels |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We set only if it's not set already
preserves label from https://github.com/openshift/oadp-operator/pull/638/files#r849903351
@@ -152,6 +152,7 @@ func (r *DPAReconciler) buildResticDaemonset(dpa *oadpv1alpha1.DataProtectionApp | |||
ds.TypeMeta = installDs.TypeMeta | |||
// Update Spec | |||
ds.Spec = installDs.Spec | |||
ds.Labels = installDs.Labels |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@JaydipGabani this sets label for restic.
/retest |
/retest |
1 similar comment
/retest |
@kaovilai: all tests passed! Full PR test history. Your PR dashboard. 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. I understand the commands that are listed here. |
component: velero
labelcomponent: velero
label
* Bring back `component: velero` label, fix OADP-452 * fix component:server on deployment, unit test update
fix OADP-458