Skip to content

Commit 18ee1c6

Browse files
jgwestsvghadi
jgwest
and
svghadi
authored
chore: upgrade to Argo CD v3.1.1 (#63)
* chore: upgrade to Argo CD v3.1.1 Signed-off-by: Jonathan West <jonwest@redhat.com> * Update Go and golangci-lint versions * Update * Update * Bump argocd to latest of 3.1 Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> --------- Signed-off-by: Jonathan West <jonwest@redhat.com> Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> Co-authored-by: Siddhesh Ghadi <sghadi1203@gmail.com>
1 parent 1d0aab2 commit 18ee1c6

13 files changed

Lines changed: 391 additions & 322 deletions

File tree

‎.ci-operator.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
2-
name: release
3-
namespace: openshift
4-
tag: golang-1.23
2+
name: openshift-gitops-go-toolset
3+
namespace: ci
4+
tag: 1.24.6

‎.github/workflows/golangci-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v4
1616
- name: golangci-lint
17-
uses: golangci/golangci-lint-action@v3
17+
uses: golangci/golangci-lint-action@v8
1818
with:
19-
version: v1.52.2
19+
version: v2.4.0
2020
only-new-issues: true

‎.golangci.yaml‎

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,34 @@
1-
run:
2-
timeout: 10m
1+
version: "2"
2+
linters:
3+
enable:
4+
- govet
5+
- unused
6+
- ineffassign
7+
- unconvert
8+
- unparam
9+
exclusions:
10+
generated: lax
11+
presets:
12+
- comments
13+
- common-false-positives
14+
- legacy
15+
- std-error-handling
16+
paths:
17+
- vendor/
18+
- third_party$
19+
- builtin$
20+
- examples$
21+
formatters:
22+
enable:
23+
- goimports
24+
settings:
25+
goimports:
26+
local-prefixes:
27+
- github.com/redhat-developer/gitops-backend
28+
exclusions:
29+
generated: lax
30+
paths:
31+
- vendor/
32+
- third_party$
33+
- builtin$
34+
- examples$

‎.konflux/Containerfile.plugin‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build Stage
2-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.23 AS builder
2+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_8_golang_1.24 AS builder
33
WORKDIR /go/src
44
COPY . /go/src
55
RUN GIT_COMMIT=$(git rev-parse HEAD) && \

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23 AS build
1+
FROM golang:1.24 AS build
22
WORKDIR /go/src
33
COPY . /go/src
44
RUN GIT_COMMIT=$(git rev-parse HEAD) && \

‎go.mod‎

Lines changed: 98 additions & 94 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,182 @@
11
module github.com/redhat-developer/gitops-backend
22

3-
go 1.23.0
4-
5-
toolchain go1.23.8
3+
go 1.24.6
64

75
require (
8-
github.com/argoproj/argo-cd/v2 v2.14.11
9-
github.com/go-git/go-git/v5 v5.13.2
10-
github.com/google/go-cmp v0.6.0
6+
github.com/argoproj/argo-cd/v3 v3.1.10
7+
github.com/go-git/go-git/v5 v5.16.2
8+
github.com/google/go-cmp v0.7.0
119
github.com/jenkins-x/go-scm v1.14.43
1210
github.com/julienschmidt/httprouter v1.3.0
1311
github.com/openshift/api v0.0.0-20240906151052-5d963dce87aa
14-
github.com/prometheus/client_golang v1.20.5
12+
github.com/prometheus/client_golang v1.22.0
1513
github.com/sirupsen/logrus v1.9.3
16-
github.com/spf13/cobra v1.8.1
14+
github.com/spf13/cobra v1.9.1
1715
github.com/spf13/viper v1.7.0
18-
go.uber.org/zap v1.26.0
19-
k8s.io/api v0.31.2
20-
k8s.io/apimachinery v0.31.2
21-
k8s.io/client-go v0.31.2
22-
sigs.k8s.io/controller-runtime v0.19.3
23-
sigs.k8s.io/kustomize/api v0.17.2
24-
sigs.k8s.io/kustomize/kyaml v0.17.1
16+
go.uber.org/zap v1.27.0
17+
k8s.io/api v0.33.1
18+
k8s.io/apimachinery v0.33.1
19+
k8s.io/client-go v0.33.1
20+
sigs.k8s.io/controller-runtime v0.21.0
21+
sigs.k8s.io/kustomize/api v0.19.0
22+
sigs.k8s.io/kustomize/kyaml v0.19.0
2523
sigs.k8s.io/yaml v1.4.0
2624
)
2725

2826
require (
29-
cloud.google.com/go/compute/metadata v0.5.2 // indirect
30-
code.gitea.io/sdk/gitea v0.19.0 // indirect
31-
dario.cat/mergo v1.0.1 // indirect
32-
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
27+
cloud.google.com/go/compute/metadata v0.6.0 // indirect
28+
code.gitea.io/sdk/gitea v0.21.0 // indirect
29+
dario.cat/mergo v1.0.2 // indirect
30+
github.com/42wim/httpsig v1.2.2 // indirect
31+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
32+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
33+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
34+
github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
35+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
3336
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3437
github.com/Masterminds/semver/v3 v3.3.1 // indirect
35-
github.com/Microsoft/go-winio v0.6.1 // indirect
36-
github.com/ProtonMail/go-crypto v1.1.5 // indirect
37-
github.com/argoproj/gitops-engine v0.7.1-0.20250328191959-6d3cf122b03f // indirect
38+
github.com/Microsoft/go-winio v0.6.2 // indirect
39+
github.com/ProtonMail/go-crypto v1.1.6 // indirect
40+
github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec // indirect
3841
github.com/argoproj/pkg v0.13.7-0.20230626144333-d56162821bd1 // indirect
42+
github.com/argoproj/pkg/v2 v2.0.1 // indirect
3943
github.com/beorn7/perks v1.0.1 // indirect
4044
github.com/blang/semver/v4 v4.0.0 // indirect
4145
github.com/bluekeyes/go-gitdiff v0.8.0 // indirect
42-
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
43-
github.com/bombsimon/logrusr/v2 v2.0.1 // indirect
44-
github.com/bradleyfalzon/ghinstallation/v2 v2.12.0 // indirect
45-
github.com/casbin/casbin/v2 v2.102.0 // indirect
46-
github.com/casbin/govaluate v1.2.0 // indirect
46+
github.com/bmatcuk/doublestar/v4 v4.8.1 // indirect
47+
github.com/bombsimon/logrusr/v4 v4.1.0 // indirect
48+
github.com/bradleyfalzon/ghinstallation/v2 v2.16.0 // indirect
49+
github.com/casbin/casbin/v2 v2.107.0 // indirect
50+
github.com/casbin/govaluate v1.7.0 // indirect
4751
github.com/cespare/xxhash/v2 v2.3.0 // indirect
48-
github.com/chai2010/gettext-go v1.0.2 // indirect
49-
github.com/cloudflare/circl v1.3.7 // indirect
50-
github.com/cyphar/filepath-securejoin v0.3.6 // indirect
52+
github.com/chai2010/gettext-go v1.0.3 // indirect
53+
github.com/cloudflare/circl v1.6.1 // indirect
54+
github.com/cyphar/filepath-securejoin v0.4.1 // indirect
5155
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5256
github.com/davidmz/go-pageant v1.0.2 // indirect
5357
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
54-
github.com/distribution/reference v0.5.0 // indirect
55-
github.com/dlclark/regexp2 v1.11.4 // indirect
56-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
58+
github.com/distribution/reference v0.6.0 // indirect
59+
github.com/dlclark/regexp2 v1.11.5 // indirect
60+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
5761
github.com/emirpasic/gods v1.18.1 // indirect
58-
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
59-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
60-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
62+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
63+
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
6164
github.com/fatih/camelcase v1.0.0 // indirect
62-
github.com/fsnotify/fsnotify v1.8.0 // indirect
63-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
64-
github.com/go-errors/errors v1.4.2 // indirect
65+
github.com/fsnotify/fsnotify v1.9.0 // indirect
66+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
67+
github.com/go-errors/errors v1.5.1 // indirect
6568
github.com/go-fed/httpsig v1.1.0 // indirect
6669
github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect
6770
github.com/go-git/go-billy/v5 v5.6.2 // indirect
68-
github.com/go-logr/logr v1.4.2 // indirect
69-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
71+
github.com/go-logr/logr v1.4.3 // indirect
72+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
7073
github.com/go-openapi/jsonreference v0.21.0 // indirect
71-
github.com/go-openapi/swag v0.23.0 // indirect
74+
github.com/go-openapi/swag v0.23.1 // indirect
7275
github.com/go-redis/cache/v9 v9.0.0 // indirect
7376
github.com/gobwas/glob v0.2.3 // indirect
7477
github.com/gogo/protobuf v1.3.2 // indirect
7578
github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
76-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
77-
github.com/golang/protobuf v1.5.4 // indirect
79+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
80+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7881
github.com/google/btree v1.1.3 // indirect
79-
github.com/google/gnostic-models v0.6.8 // indirect
80-
github.com/google/go-github/v66 v66.0.0 // indirect
82+
github.com/google/gnostic-models v0.6.9 // indirect
83+
github.com/google/go-github/v69 v69.2.0 // indirect
84+
github.com/google/go-github/v72 v72.0.0 // indirect
8185
github.com/google/go-querystring v1.1.0 // indirect
82-
github.com/google/gofuzz v1.2.0 // indirect
8386
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
84-
github.com/google/uuid v1.6.0 // indirect
85-
github.com/gorilla/websocket v1.5.3 // indirect
87+
github.com/google/uuid v1.6.1-0.20241114170450-2d3c2a9cc518 // indirect
88+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
8689
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
87-
github.com/hashicorp/go-version v1.6.0 // indirect
90+
github.com/hashicorp/go-version v1.7.0 // indirect
8891
github.com/hashicorp/hcl v1.0.0 // indirect
89-
github.com/imdario/mergo v0.3.16 // indirect
9092
github.com/inconshreveable/mousetrap v1.1.0 // indirect
9193
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
92-
github.com/jonboulle/clockwork v0.2.2 // indirect
94+
github.com/jonboulle/clockwork v0.5.0 // indirect
9395
github.com/josharian/intern v1.0.0 // indirect
9496
github.com/json-iterator/go v1.1.12 // indirect
9597
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
9698
github.com/kevinburke/ssh_config v1.2.0 // indirect
97-
github.com/klauspost/compress v1.17.9 // indirect
99+
github.com/klauspost/compress v1.18.0 // indirect
98100
github.com/kylelemons/godebug v1.1.0 // indirect
99101
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
100102
github.com/magiconair/properties v1.8.1 // indirect
101-
github.com/mailru/easyjson v0.7.7 // indirect
103+
github.com/mailru/easyjson v0.9.0 // indirect
102104
github.com/mitchellh/copystructure v1.2.0 // indirect
103105
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
104106
github.com/mitchellh/mapstructure v1.5.0 // indirect
105107
github.com/mitchellh/reflectwalk v1.0.2 // indirect
106-
github.com/moby/spdystream v0.4.0 // indirect
107-
github.com/moby/term v0.5.0 // indirect
108+
github.com/moby/spdystream v0.5.0 // indirect
109+
github.com/moby/term v0.5.2 // indirect
108110
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
109111
github.com/modern-go/reflect2 v1.0.2 // indirect
110112
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
111113
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
112114
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
113115
github.com/opencontainers/go-digest v1.0.0 // indirect
114-
github.com/opencontainers/image-spec v1.1.0 // indirect
115-
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
116+
github.com/opencontainers/image-spec v1.1.1 // indirect
117+
github.com/patrickmn/go-cache v2.1.1-0.20191004192108-46f407853014+incompatible // indirect
116118
github.com/pelletier/go-toml v1.2.0 // indirect
117119
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
118120
github.com/pjbgf/sha1cd v0.3.2 // indirect
121+
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
119122
github.com/pkg/errors v0.9.1 // indirect
120123
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
121-
github.com/prometheus/client_model v0.6.1 // indirect
122-
github.com/prometheus/common v0.55.0 // indirect
123-
github.com/prometheus/procfs v0.15.1 // indirect
124-
github.com/redis/go-redis/v9 v9.7.1 // indirect
125-
github.com/robfig/cron/v3 v3.0.1 // indirect
124+
github.com/prometheus/client_model v0.6.2 // indirect
125+
github.com/prometheus/common v0.64.0 // indirect
126+
github.com/prometheus/procfs v0.16.1 // indirect
127+
github.com/redis/go-redis/v9 v9.8.0 // indirect
128+
github.com/robfig/cron/v3 v3.0.2-0.20210106135023-bc59245fe10e // indirect
126129
github.com/russross/blackfriday/v2 v2.1.0 // indirect
127130
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
128131
github.com/shurcooL/githubv4 v0.0.0-20190718010115-4ba037080260 // indirect
129132
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
130-
github.com/skeema/knownhosts v1.3.0 // indirect
133+
github.com/skeema/knownhosts v1.3.1 // indirect
131134
github.com/spf13/afero v1.2.2 // indirect
132-
github.com/spf13/cast v1.7.0 // indirect
135+
github.com/spf13/cast v1.7.1 // indirect
133136
github.com/spf13/jwalterweatherman v1.0.0 // indirect
134-
github.com/spf13/pflag v1.0.5 // indirect
137+
github.com/spf13/pflag v1.0.6 // indirect
135138
github.com/stretchr/testify v1.10.0 // indirect
136139
github.com/subosito/gotenv v1.2.0 // indirect
137140
github.com/vmihailenco/go-tinylfu v0.2.2 // indirect
138-
github.com/vmihailenco/msgpack/v5 v5.3.4 // indirect
141+
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
139142
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
140143
github.com/x448/float16 v0.8.4 // indirect
141144
github.com/xanzy/ssh-agent v0.3.3 // indirect
142145
github.com/xlab/treeprint v1.2.0 // indirect
143-
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
146+
go.opentelemetry.io/otel v1.36.0 // indirect
147+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
144148
go.uber.org/multierr v1.11.0 // indirect
145-
golang.org/x/crypto v0.32.0 // indirect
146-
golang.org/x/mod v0.22.0 // indirect
147-
golang.org/x/net v0.34.0 // indirect
148-
golang.org/x/oauth2 v0.24.0 // indirect
149-
golang.org/x/sync v0.10.0 // indirect
150-
golang.org/x/sys v0.29.0 // indirect
151-
golang.org/x/term v0.28.0 // indirect
152-
golang.org/x/text v0.21.0 // indirect
153-
golang.org/x/time v0.8.0 // indirect
154-
golang.org/x/tools v0.27.0 // indirect
155-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 // indirect
156-
google.golang.org/grpc v1.68.1 // indirect
157-
google.golang.org/protobuf v1.35.2 // indirect
149+
golang.org/x/crypto v0.46.0 // indirect
150+
golang.org/x/net v0.47.0 // indirect
151+
golang.org/x/oauth2 v0.30.0 // indirect
152+
golang.org/x/sync v0.19.0 // indirect
153+
golang.org/x/sys v0.39.0 // indirect
154+
golang.org/x/term v0.38.0 // indirect
155+
golang.org/x/text v0.32.0 // indirect
156+
golang.org/x/time v0.12.0 // indirect
157+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250519155744-55703ea1f237 // indirect
158+
google.golang.org/grpc v1.73.0 // indirect
159+
google.golang.org/protobuf v1.36.6 // indirect
158160
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
159161
gopkg.in/inf.v0 v0.9.1 // indirect
160162
gopkg.in/ini.v1 v1.67.0 // indirect
161163
gopkg.in/warnings.v0 v0.1.2 // indirect
162164
gopkg.in/yaml.v2 v2.4.0 // indirect
163165
gopkg.in/yaml.v3 v3.0.1 // indirect
164-
k8s.io/apiextensions-apiserver v0.31.2 // indirect
165-
k8s.io/apiserver v0.31.2 // indirect
166-
k8s.io/cli-runtime v0.31.2 // indirect
167-
k8s.io/component-base v0.31.2 // indirect
168-
k8s.io/component-helpers v0.31.2 // indirect
166+
k8s.io/apiextensions-apiserver v0.33.1 // indirect
167+
k8s.io/apiserver v0.33.1 // indirect
168+
k8s.io/cli-runtime v0.33.1 // indirect
169+
k8s.io/component-base v0.33.1 // indirect
170+
k8s.io/component-helpers v0.33.1 // indirect
171+
k8s.io/controller-manager v0.33.1 // indirect
169172
k8s.io/klog/v2 v2.130.1 // indirect
170-
k8s.io/kube-aggregator v0.31.2 // indirect
171-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
172-
k8s.io/kubectl v0.31.2 // indirect
173-
k8s.io/kubernetes v1.31.0 // indirect
174-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
175-
oras.land/oras-go/v2 v2.5.0 // indirect
176-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
177-
sigs.k8s.io/structured-merge-diff/v4 v4.4.4-0.20241211184406-7bf59b3d70ee // indirect
173+
k8s.io/kube-aggregator v0.33.1 // indirect
174+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
175+
k8s.io/kubectl v0.33.1 // indirect
176+
k8s.io/kubernetes v1.33.1 // indirect
177+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
178+
oras.land/oras-go/v2 v2.6.0 // indirect
179+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
180+
sigs.k8s.io/randfill v1.0.0 // indirect
181+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
178182
)

0 commit comments

Comments
 (0)