Skip to content

Commit 54209cb

Browse files
iam-veeramallaiam-veeramalla
authored
Merge pull request #605 from iam-veeramalla/kamreconciliationfix
fix: issues with kam image reconcile and pull latest argocd-operator
2 parents 542ed73 + 29f7046 commit 54209cb

3 files changed

Lines changed: 77 additions & 69 deletions

File tree

‎controllers/kam.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,10 @@ func (r *ReconcileGitopsService) reconcileCLIServer(cr *pipelinesv1alpha1.Gitops
221221
existingDeployment.Spec.Template.Spec.Containers[0].Resources = deploymentObj.Spec.Template.Spec.Containers[0].Resources
222222
changed = true
223223
}
224+
if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.Containers[0].Image, deploymentObj.Spec.Template.Spec.Containers[0].Image) {
225+
existingDeployment.Spec.Template.Spec.Containers[0].Image = deploymentObj.Spec.Template.Spec.Containers[0].Image
226+
changed = true
227+
}
224228
if !reflect.DeepEqual(existingDeployment.Spec.Template.Spec.NodeSelector, deploymentObj.Spec.Template.Spec.NodeSelector) {
225229
existingDeployment.Spec.Template.Spec.NodeSelector = deploymentObj.Spec.Template.Spec.NodeSelector
226230
changed = true

‎go.mod‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.19
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5
7-
github.com/argoproj-labs/argocd-operator v0.0.16-0.20230911190332-91bf13127dd7
7+
github.com/argoproj-labs/argocd-operator v0.0.16-0.20230926060808-5c75b923b245
88
github.com/coreos/prometheus-operator v0.40.0
99
github.com/go-logr/logr v1.2.4
1010
github.com/google/go-cmp v0.5.9
@@ -14,45 +14,45 @@ require (
1414
github.com/openshift/api v3.9.1-0.20190916204813-cdbe64fb0c91+incompatible
1515
github.com/operator-framework/api v0.17.5
1616
github.com/stretchr/testify v1.8.4
17-
go.uber.org/zap v1.24.0
18-
golang.org/x/mod v0.10.0
17+
go.uber.org/zap v1.26.0
18+
golang.org/x/mod v0.12.0
1919
gotest.tools v2.2.0+incompatible
20-
k8s.io/api v0.27.1
21-
k8s.io/apimachinery v0.27.1
20+
k8s.io/api v0.28.2
21+
k8s.io/apimachinery v0.28.2
2222
k8s.io/client-go v12.0.0+incompatible
23-
k8s.io/utils v0.0.0-20230505201702-9f6742963106
24-
sigs.k8s.io/controller-runtime v0.14.6
23+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
24+
sigs.k8s.io/controller-runtime v0.16.2
2525
sigs.k8s.io/yaml v1.3.0
2626
)
2727

2828
require (
29-
cloud.google.com/go/compute v1.19.2 // indirect
29+
cloud.google.com/go/compute v1.23.0 // indirect
3030
cloud.google.com/go/compute/metadata v0.2.3 // indirect
3131
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3232
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
3333
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
3434
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
3535
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3636
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
37-
github.com/argoproj/argo-cd/v2 v2.8.3 // indirect
37+
github.com/argoproj/argo-cd/v2 v2.8.4 // indirect
3838
github.com/beorn7/perks v1.0.1 // indirect
3939
github.com/blang/semver/v4 v4.0.0 // indirect
4040
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4141
github.com/davecgh/go-spew v1.1.1 // indirect
4242
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
43-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
43+
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
4444
github.com/fsnotify/fsnotify v1.6.0 // indirect
4545
github.com/go-logr/zapr v1.2.4 // indirect
46-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
4747
github.com/go-openapi/jsonreference v0.20.2 // indirect
4848
github.com/go-openapi/spec v0.20.9 // indirect
49-
github.com/go-openapi/swag v0.22.3 // indirect
49+
github.com/go-openapi/swag v0.22.4 // indirect
5050
github.com/gogo/protobuf v1.3.2 // indirect
5151
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5252
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5353
github.com/golang/protobuf v1.5.3 // indirect
5454
github.com/google/gofuzz v1.2.0 // indirect
55-
github.com/google/uuid v1.3.0 // indirect
55+
github.com/google/uuid v1.3.1 // indirect
5656
github.com/googleapis/gnostic v0.5.5 // indirect
5757
github.com/imdario/mergo v0.3.16 // indirect
5858
github.com/josharian/intern v1.0.0 // indirect
@@ -63,46 +63,46 @@ require (
6363
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6464
github.com/modern-go/reflect2 v1.0.2 // indirect
6565
github.com/nxadm/tail v1.4.8 // indirect
66-
github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb // indirect
66+
github.com/openshift/client-go v0.0.0-20230915115245-53bd8980dfb7 // indirect
6767
github.com/operator-framework/operator-sdk v0.18.2 // indirect
6868
github.com/pkg/errors v0.9.1 // indirect
6969
github.com/pmezard/go-difflib v1.0.0 // indirect
7070
github.com/prometheus/client_golang v1.16.0 // indirect
7171
github.com/prometheus/client_model v0.4.0 // indirect
72-
github.com/prometheus/common v0.43.0 // indirect
73-
github.com/prometheus/procfs v0.10.1 // indirect
72+
github.com/prometheus/common v0.44.0 // indirect
73+
github.com/prometheus/procfs v0.12.0 // indirect
7474
github.com/sethvargo/go-password v0.2.0 // indirect
7575
github.com/sirupsen/logrus v1.9.3 // indirect
7676
github.com/spf13/pflag v1.0.5 // indirect
77-
go.uber.org/atomic v1.11.0 // indirect
7877
go.uber.org/multierr v1.11.0 // indirect
79-
golang.org/x/crypto v0.10.0 // indirect
80-
golang.org/x/net v0.11.0 // indirect
81-
golang.org/x/oauth2 v0.9.0 // indirect
82-
golang.org/x/sys v0.9.0 // indirect
83-
golang.org/x/term v0.9.0 // indirect
84-
golang.org/x/text v0.10.0 // indirect
78+
golang.org/x/crypto v0.13.0 // indirect
79+
golang.org/x/net v0.15.0 // indirect
80+
golang.org/x/oauth2 v0.12.0 // indirect
81+
golang.org/x/sys v0.12.0 // indirect
82+
golang.org/x/term v0.12.0 // indirect
83+
golang.org/x/text v0.13.0 // indirect
8584
golang.org/x/time v0.3.0 // indirect
86-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
87-
google.golang.org/appengine v1.6.7 // indirect
85+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
86+
google.golang.org/appengine v1.6.8 // indirect
8887
google.golang.org/protobuf v1.31.0 // indirect
8988
gopkg.in/inf.v0 v0.9.1 // indirect
9089
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9190
gopkg.in/yaml.v2 v2.4.0 // indirect
9291
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/apiextensions-apiserver v0.27.1 // indirect
94-
k8s.io/component-base v0.27.1 // indirect
92+
k8s.io/apiextensions-apiserver v0.28.2 // indirect
93+
k8s.io/component-base v0.28.2 // indirect
9594
k8s.io/klog/v2 v2.100.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
95+
k8s.io/kube-openapi v0.0.0-20230918164632-68afd615200d // indirect
9796
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
98-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
97+
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
9998
)
10099

101100
replace (
102101
cloud.google.com/go => cloud.google.com/go v0.100.2
103102
github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.4
104103
github.com/onsi/gomega => github.com/onsi/gomega v1.14.0
105104
github.com/openshift/api => github.com/openshift/api v0.0.0-20220929131120-2bde012f248a
105+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb
106106
k8s.io/api => k8s.io/api v0.23.6
107107
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6
108108
k8s.io/apimachinery => k8s.io/apimachinery v0.23.7-rc.0

0 commit comments

Comments
 (0)