Skip to content

Commit 719c785

Browse files
chetan-rnschetan-rns
authored
Update Go version to 1.18 (#27)
* Update Go version to 1.18 * Update golangci-lint version * update Go version in Dockerfile * check go version
1 parent 66aad74 commit 719c785

File tree

6 files changed

+138
-23
lines changed

6 files changed

+138
-23
lines changed

‎.github/workflows/go.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- name: Set up Go
1717
uses: actions/setup-go@v2
1818
with:
19-
go-version: 1.15
19+
go-version: 1.18
2020

2121
- name: Build
2222
run: go build -v ./...

‎Dockerfile

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

‎go.mod

Lines changed: 134 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,160 @@
11
module github.com/redhat-developer/gitops-backend
22

3-
go 1.15
3+
go 1.18
44

55
require (
66
github.com/argoproj/argo-cd v0.8.1-0.20210326223336-719d6a9c252e
7-
github.com/argoproj/pkg v0.9.0 // indirect
8-
github.com/emicklei/go-restful v2.12.0+incompatible // indirect
97
github.com/go-git/go-git/v5 v5.1.0
10-
github.com/go-openapi/spec v0.19.8 // indirect
11-
github.com/go-openapi/swag v0.19.9 // indirect
128
github.com/google/go-cmp v0.5.2
139
github.com/jenkins-x/go-scm v1.5.151
1410
github.com/julienschmidt/httprouter v1.2.0
15-
github.com/mailru/easyjson v0.7.1 // indirect
16-
github.com/mitchellh/mapstructure v1.3.2 // indirect
17-
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 // indirect
1811
github.com/openshift/api v3.9.0+incompatible
19-
github.com/pelletier/go-toml v1.6.0 // indirect
2012
github.com/prometheus/client_golang v1.7.1
21-
github.com/robfig/cron v1.2.0 // indirect
22-
github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b // indirect
2313
github.com/sirupsen/logrus v1.7.0
24-
github.com/spf13/cast v1.3.1 // indirect
2514
github.com/spf13/cobra v1.1.1
2615
github.com/spf13/viper v1.7.0
2716
go.uber.org/zap v1.15.0
2817
k8s.io/api v0.21.0
2918
k8s.io/apimachinery v0.21.0
3019
k8s.io/client-go v11.0.1-0.20190816222228-6d55c1b1f1ca+incompatible
31-
k8s.io/kubernetes v1.21.0 // indirect
3220
sigs.k8s.io/controller-runtime v0.8.3
3321
sigs.k8s.io/kustomize v2.0.3+incompatible
3422
sigs.k8s.io/yaml v1.2.0
3523
)
3624

25+
require (
26+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
27+
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
28+
github.com/Masterminds/semver v1.5.0 // indirect
29+
github.com/PuerkitoBio/purell v1.1.1 // indirect
30+
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
31+
github.com/argoproj/gitops-engine v0.3.1-0.20210325215106-1ce2acc845d2 // indirect
32+
github.com/argoproj/pkg v0.9.0 // indirect
33+
github.com/beorn7/perks v1.0.1 // indirect
34+
github.com/bombsimon/logrusr v1.0.0 // indirect
35+
github.com/bradleyfalzon/ghinstallation v1.1.1 // indirect
36+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
37+
github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 // indirect
38+
github.com/davecgh/go-spew v1.1.1 // indirect
39+
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
40+
github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
41+
github.com/docker/distribution v2.7.1+incompatible // indirect
42+
github.com/emicklei/go-restful v2.12.0+incompatible // indirect
43+
github.com/emirpasic/gods v1.12.0 // indirect
44+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
45+
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
46+
github.com/fatih/camelcase v1.0.0 // indirect
47+
github.com/fsnotify/fsnotify v1.4.9 // indirect
48+
github.com/ghodss/yaml v1.0.0 // indirect
49+
github.com/go-errors/errors v1.0.1 // indirect
50+
github.com/go-git/gcfg v1.5.0 // indirect
51+
github.com/go-git/go-billy/v5 v5.0.0 // indirect
52+
github.com/go-logr/logr v0.4.0 // indirect
53+
github.com/go-openapi/jsonpointer v0.19.3 // indirect
54+
github.com/go-openapi/jsonreference v0.19.3 // indirect
55+
github.com/go-openapi/spec v0.19.8 // indirect
56+
github.com/go-openapi/swag v0.19.9 // indirect
57+
github.com/go-redis/cache/v8 v8.2.1 // indirect
58+
github.com/go-redis/redis/v8 v8.3.2 // indirect
59+
github.com/gobwas/glob v0.2.3 // indirect
60+
github.com/gogo/protobuf v1.3.2 // indirect
61+
github.com/golang/protobuf v1.4.3 // indirect
62+
github.com/google/btree v1.0.0 // indirect
63+
github.com/google/go-github/v29 v29.0.2 // indirect
64+
github.com/google/go-querystring v1.0.0 // indirect
65+
github.com/google/gofuzz v1.1.0 // indirect
66+
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
67+
github.com/google/uuid v1.1.2 // indirect
68+
github.com/googleapis/gnostic v0.5.1 // indirect
69+
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
70+
github.com/hashicorp/golang-lru v0.5.4 // indirect
71+
github.com/hashicorp/hcl v1.0.0 // indirect
72+
github.com/imdario/mergo v0.3.10 // indirect
73+
github.com/inconshreveable/mousetrap v1.0.0 // indirect
74+
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
75+
github.com/jonboulle/clockwork v0.1.0 // indirect
76+
github.com/json-iterator/go v1.1.10 // indirect
77+
github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
78+
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
79+
github.com/klauspost/compress v1.11.1 // indirect
80+
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
81+
github.com/magiconair/properties v1.8.1 // indirect
82+
github.com/mailru/easyjson v0.7.1 // indirect
83+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
84+
github.com/mitchellh/go-homedir v1.1.0 // indirect
85+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
86+
github.com/mitchellh/mapstructure v1.3.2 // indirect
87+
github.com/moby/spdystream v0.2.0 // indirect
88+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
89+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
90+
github.com/modern-go/reflect2 v1.0.1 // indirect
91+
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
92+
github.com/opencontainers/go-digest v1.0.0 // indirect
93+
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
94+
github.com/pelletier/go-toml v1.6.0 // indirect
95+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
96+
github.com/pkg/errors v0.9.1 // indirect
97+
github.com/pmezard/go-difflib v1.0.0 // indirect
98+
github.com/prometheus/client_model v0.2.0 // indirect
99+
github.com/prometheus/common v0.10.0 // indirect
100+
github.com/prometheus/procfs v0.2.0 // indirect
101+
github.com/robfig/cron v1.2.0 // indirect
102+
github.com/russross/blackfriday v1.5.2 // indirect
103+
github.com/sergi/go-diff v1.1.0 // indirect
104+
github.com/shurcooL/githubv4 v0.0.0-20191102174205-af46314aec7b // indirect
105+
github.com/shurcooL/graphql v0.0.0-20181231061246-d48a9a75455f // indirect
106+
github.com/spf13/afero v1.2.2 // indirect
107+
github.com/spf13/cast v1.3.1 // indirect
108+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
109+
github.com/spf13/pflag v1.0.5 // indirect
110+
github.com/src-d/gcfg v1.4.0 // indirect
111+
github.com/stretchr/testify v1.6.1 // indirect
112+
github.com/subosito/gotenv v1.2.0 // indirect
113+
github.com/vmihailenco/bufpool v0.1.11 // indirect
114+
github.com/vmihailenco/go-tinylfu v0.1.0 // indirect
115+
github.com/vmihailenco/msgpack/v5 v5.1.0 // indirect
116+
github.com/vmihailenco/tagparser v0.1.2 // indirect
117+
github.com/xanzy/ssh-agent v0.2.1 // indirect
118+
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
119+
go.opentelemetry.io/otel v0.13.0 // indirect
120+
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
121+
go.uber.org/atomic v1.6.0 // indirect
122+
go.uber.org/multierr v1.5.0 // indirect
123+
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
124+
golang.org/x/exp v0.0.0-20210220032938-85be41e4509f // indirect
125+
golang.org/x/net v0.0.0-20210224082022-3d97a244fca7 // indirect
126+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
127+
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a // indirect
128+
golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073 // indirect
129+
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
130+
golang.org/x/text v0.3.4 // indirect
131+
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect
132+
google.golang.org/appengine v1.6.7 // indirect
133+
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
134+
google.golang.org/grpc v1.33.1 // indirect
135+
google.golang.org/protobuf v1.25.0 // indirect
136+
gopkg.in/inf.v0 v0.9.1 // indirect
137+
gopkg.in/ini.v1 v1.57.0 // indirect
138+
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
139+
gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
140+
gopkg.in/warnings.v0 v0.1.2 // indirect
141+
gopkg.in/yaml.v2 v2.4.0 // indirect
142+
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect
143+
k8s.io/apiserver v0.21.0 // indirect
144+
k8s.io/cli-runtime v0.21.0 // indirect
145+
k8s.io/component-base v0.21.0 // indirect
146+
k8s.io/component-helpers v0.21.0 // indirect
147+
k8s.io/klog/v2 v2.8.0 // indirect
148+
k8s.io/kube-aggregator v0.20.4 // indirect
149+
k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
150+
k8s.io/kubectl v0.20.4 // indirect
151+
k8s.io/kubernetes v1.21.0 // indirect
152+
k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect
153+
sigs.k8s.io/kustomize/api v0.8.5 // indirect
154+
sigs.k8s.io/kustomize/kyaml v0.10.15 // indirect
155+
sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect
156+
)
157+
37158
replace (
38159
k8s.io/api => k8s.io/api v0.21.0
39160
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.21.0

‎go.sum

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,6 @@ github.com/caddyserver/caddy v1.0.3/go.mod h1:G+ouvOY32gENkJC+jhgl62TyhvqEsFaDiZ
115115
github.com/casbin/casbin v1.9.1/go.mod h1:z8uPsfBJGUsnkagrt3G8QvjgTKFMBJ32UP8HpZllfog=
116116
github.com/cenkalti/backoff v2.1.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
117117
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
118-
github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
119118
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
120119
github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
121120
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
@@ -219,7 +218,6 @@ github.com/fatih/camelcase v1.0.0/go.mod h1:yN2Sb0lFhZJUdVvtELVWefmrXpuZESvPmqwo
219218
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
220219
github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
221220
github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
222-
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ=
223221
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
224222
github.com/fogleman/gg v1.2.1-0.20190220221249-0403632d5b90/go.mod h1:R/bRT+9gY/C5z7JzPU0zXsXHKM4/ayA+zqcVNZzPa1k=
225223
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
@@ -587,8 +585,6 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW
587585
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
588586
github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
589587
github.com/naoina/toml v0.1.1/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
590-
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
591-
github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
592588
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
593589
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
594590
github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
@@ -805,7 +801,6 @@ go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
805801
go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
806802
go.uber.org/atomic v1.6.0 h1:Ezj3JGmsOnG1MoRWQkPBsKLe9DwWD9QeXzTRzzldNVk=
807803
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
808-
go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
809804
go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
810805
go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
811806
go.uber.org/multierr v1.5.0 h1:KCa4XfM8CWFCpxXRGok+Q0SS/0XBhMDbHHGABQLvD2A=
@@ -1077,7 +1072,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
10771072
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
10781073
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
10791074
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
1080-
gomodules.xyz/jsonpatch/v2 v2.1.0 h1:Phva6wqu+xR//Njw6iorylFFgn/z547tw5Ne3HZPQ+k=
10811075
gomodules.xyz/jsonpatch/v2 v2.1.0/go.mod h1:IhYNNY4jnS53ZnfE4PAmpKtDpTCj1JFXc+3mwe7XcUU=
10821076
gonum.org/v1/gonum v0.0.0-20180816165407-929014505bf4/go.mod h1:Y+Yx5eoAFn32cQvJDxZx5Dpnq+c3wtXuadVZAcxbbBo=
10831077
gonum.org/v1/gonum v0.0.0-20190331200053-3d26580ed485/go.mod h1:2ltnJ7xHfj0zHS40VVPYEAAMTa3ZGguvHGBSJeRWqE0=
@@ -1234,7 +1228,6 @@ k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
12341228
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
12351229
k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
12361230
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
1237-
k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
12381231
k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
12391232
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
12401233
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

‎openshift-ci/build-root/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Dockerfile to bootstrap build and test in openshift-ci
22

3-
FROM registry.ci.openshift.org/openshift/release:golang-1.15
3+
FROM registry.ci.openshift.org/openshift/release:golang-1.18
44

55
RUN yum -y install dnf httpd-tools

‎scripts/openshiftci-presubmit-unittests.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ if [[ $(go fmt `go list ./... | grep -v vendor`) ]]; then
1313
echo "not well formatted sources are found"
1414
exit 1
1515
fi
16+
go version
1617
go mod tidy
1718
if [[ ! -z $(git status -s) ]]
1819
then

0 commit comments

Comments
 (0)