Skip to content

Commit

Permalink
Merge pull request #548 from jakobmoellerdev/OCPBUGS-27357
Browse files Browse the repository at this point in the history
[release-4.13] OCPBUGS-27357: fix: avoid topolvm-controller annotation generation increment
  • Loading branch information
openshift-merge-bot[bot] authored Jan 22, 2024
2 parents e7d34fb + 42fb7f6 commit e92d0c3
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions controllers/topolvm_controller.go
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

0 comments on commit e92d0c3

Please sign in to comment.