Remove statement from rebase, and downgrade go version

jgwest · jgwest · commit dcb60c300ac0 · 2024-07-17T09:51:27.000-04:00
Signed-off-by: Jonathan West &lt;jonwest@redhat.com&gt;
diff --git a/controllers/deployment.go b/controllers/deployment.go
@@ -200,10 +200,6 @@ func identifyDeploymentDifference(x appsv1.Deployment, y appsv1.Deployment) stri
 		return ".Spec.Strategy"
 	}
 
-	if !reflect.DeepEqual(x.Annotations, y.Annotations) {
-		return "Annotations"
-	}
-
 	if !reflect.DeepEqual(x.Labels, y.Labels) {
 		return "Labels"
 	}
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/argoproj-labs/argo-rollouts-manager
 
-go 1.22
-
-toolchain go1.22.2
+go 1.21
 
 require (
 	github.com/coreos/prometheus-operator v0.40.0

Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,6 @@ func identifyDeploymentDifference(x appsv1.Deployment, y appsv1.Deployment) stri`
`200`	`200`	`return ".Spec.Strategy"`
`201`	`201`	`}`
`202`	`202`
`203`		`- if !reflect.DeepEqual(x.Annotations, y.Annotations) {`
`204`		`- return "Annotations"`
`205`		`- }`
`206`		`-`
`207`	`203`	`if !reflect.DeepEqual(x.Labels, y.Labels) {`
`208`	`204`	`return "Labels"`
`209`	`205`	`}`
-Original file line number
+Diff line change
@@ @@ -1,8 +1,6 @@ @@
 module github.com/argoproj-labs/argo-rollouts-manager
 -go 1.22
+-
 -toolchain go1.22.2
 +go 1.21
 require (
 	github.com/coreos/prometheus-operator v0.40.0