Merge pull request #252 from Edwinhr716/automated-cherry-pick-of-#250-upstream-release-0.4.0

k8s-ci-robot · web-flow · commit d62051213fc2 · 2024-11-07T22:46:43.000Z
Automated cherry pick of #250: change to not use NetworkConfig in hash calculation if it has default value
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
@@ -41,7 +41,7 @@ func NonZeroValue(value int32) int32 {
 }
 
 func LeaderWorkerTemplateHash(lws *leaderworkerset.LeaderWorkerSet) string {
-	if lws.Spec.NetworkConfig == nil {
+	if lws.Spec.NetworkConfig == nil || string(*lws.Spec.NetworkConfig.SubdomainPolicy) == string(leaderworkerset.SubdomainShared) {
 		return Sha1Hash(lws.Spec.LeaderWorkerTemplate.LeaderTemplate.String() +
 			lws.Spec.LeaderWorkerTemplate.WorkerTemplate.String())
 	}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func NonZeroValue(value int32) int32 {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`func LeaderWorkerTemplateHash(lws *leaderworkerset.LeaderWorkerSet) string {`
`44`		`- if lws.Spec.NetworkConfig == nil {`
	`44`	`+ if lws.Spec.NetworkConfig == nil \|\| string(*lws.Spec.NetworkConfig.SubdomainPolicy) == string(leaderworkerset.SubdomainShared) {`
`45`	`45`	`return Sha1Hash(lws.Spec.LeaderWorkerTemplate.LeaderTemplate.String() +`
`46`	`46`	`lws.Spec.LeaderWorkerTemplate.WorkerTemplate.String())`
`47`	`47`	`}`