Skip to content

Commit

Permalink
Merge pull request #303 from openshift-cherrypick-robot/cherry-pick-3…
Browse files Browse the repository at this point in the history
…02-to-release-4.14

[release-4.14] OCPBUGS-18992: Always sort disabled controller list
  • Loading branch information
openshift-merge-robot committed Sep 14, 2023
2 parents 6beccbe + 20cc7c9 commit 7f0f4f9
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions pkg/operator/sync_openshiftcontrollermanager_v311_00.go
Expand Up @@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"os"
"sort"
"strconv"
"strings"

Expand Down Expand Up @@ -308,6 +309,9 @@ func disableControllers(clusterVersion *configv1.ClusterVersion) []string {
controllers = append(controllers, fmt.Sprintf("-%s", cont))
}
}
// we need to sort this slice to have always same list
// otherwise, change in the order would modify configmap and causes roll out
sort.Strings(controllers)
return controllers
}

Expand Down

0 comments on commit 7f0f4f9

Please sign in to comment.