Merge pull request #10940 from hakman/sort-external-policies

Sort external policies when checking for changes
kubernetes · Feb 27, 2021 · 6e7f635 · 6e7f635
2 parents 5c3ce59 + 925350f
commit 6e7f635
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/pkg/model/iam.go b/pkg/model/iam.go
@@ -18,6 +18,7 @@ package model
 
 import (
 	"fmt"
+	"sort"
 	"strings"
 
 	"k8s.io/klog/v2"
@@ -254,6 +255,7 @@ func (b *IAMModelBuilder) buildIAMTasks(role iam.Subject, iamName string, c *fi.
 				p := *(b.Cluster.Spec.ExternalPolicies)
 				externalPolicies = append(externalPolicies, p[roleKey]...)
 			}
+			sort.Strings(externalPolicies)
 
 			name := fmt.Sprintf("%s-policyoverride", roleKey)
 			t := &awstasks.IAMRolePolicy{

diff --git a/upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go b/upup/pkg/fi/cloudup/awstasks/iamrolepolicy.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"hash/fnv"
 	"net/url"
+	"sort"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
@@ -76,6 +77,7 @@ func (e *IAMRolePolicy) Find(c *fi.Context) (*IAMRolePolicy, error) {
 				policies = append(policies, aws.StringValue(policy.PolicyArn))
 			}
 		}
+		sort.Strings(policies)
 
 		actual.ID = e.ID
 		actual.Name = e.Name