Skip to content
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.

Sign up for GitHub

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

[release-4.13] OCPBUGS-27357: fix: avoid topolvm-controller annotation generation increment #548

Merged
merged 1 commit into from
Jan 22, 2024
Merged

[release-4.13] OCPBUGS-27357: fix: avoid topolvm-controller annotation generation increment #548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions controllers/topolvm_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2022 Red Hat Openshift Data Foundation.
Copyright © 2023 Red Hat, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -119,11 +119,6 @@ func (c topolvmController) setTopolvmControllerDesiredState(existing, desired *a
existing.Spec.Template.Spec.Containers = desired.Spec.Template.Spec.Containers
existing.Spec.Template.Spec.InitContainers = desired.Spec.Template.Spec.InitContainers

initMapIfNil(&existing.ObjectMeta.Annotations)
for key, value := range desired.Annotations {
existing.ObjectMeta.Annotations[key] = value
}

initMapIfNil(&existing.Spec.Template.Annotations)
for key, value := range desired.Spec.Template.Annotations {
existing.Spec.Template.Annotations[key] = value
Expand Down