Skip to content

Commit e865167

Browse files
1gtmtamalsaha
1gtm
and
tamalsaha
authored
[cherry-pick] Update workflows (Go 1.20, k8s 1.26) (#148) (#150)
/cherry-pick Signed-off-by: Tamal Saha <tamal@appscode.com> Co-authored-by: Tamal Saha <tamal@appscode.com>
1 parent 8fb361c commit e865167

File tree

9 files changed

+45
-54
lines changed

9 files changed

+45
-54
lines changed

‎.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
name: Build
1414
runs-on: ubuntu-20.04
1515
steps:
16-
- name: Set up Go 1.19
16+
- name: Set up Go 1.20
1717
uses: actions/setup-go@v1
1818
with:
19-
go-version: 1.19
19+
go-version: '1.20'
2020
id: go
2121

2222
- uses: actions/checkout@v1

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ TAG := $(VERSION)_$(OS)_$(ARCH)
6969
TAG_PROD := $(TAG)
7070
TAG_DBG := $(VERSION)-dbg_$(OS)_$(ARCH)
7171

72-
GO_VERSION ?= 1.19
72+
GO_VERSION ?= 1.20
7373
BUILD_IMAGE ?= appscode/golang-dev:$(GO_VERSION)
7474

7575
OUTBIN = bin/$(OS)_$(ARCH)/$(BIN)

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ require (
6060
github.com/spf13/pflag v1.0.5 // indirect
6161
github.com/yudai/gojsondiff v1.0.0 // indirect
6262
github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect
63-
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220917052300-e49b09065bec // indirect
64-
go.bytebuilders.dev/license-verifier v0.12.0 // indirect
65-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
63+
go.bytebuilders.dev/license-proxyserver v0.0.3 // indirect
64+
go.bytebuilders.dev/license-verifier v0.12.1-0.20221113063237-6eb88040dd50 // indirect
65+
golang.org/x/crypto v0.6.0 // indirect
6666
golang.org/x/net v0.7.0 // indirect
6767
golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094 // indirect
6868
golang.org/x/sys v0.5.0 // indirect
@@ -88,7 +88,7 @@ require (
8888
kmodules.xyz/apiversion v0.2.0 // indirect
8989
kmodules.xyz/objectstore-api v0.25.1-0.20221104003322-f0289b5b6ca2 // indirect
9090
kmodules.xyz/prober v0.25.0 // indirect
91-
sigs.k8s.io/controller-runtime v0.13.0 // indirect
91+
sigs.k8s.io/controller-runtime v0.13.1 // indirect
9292
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
9393
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9494
sigs.k8s.io/yaml v1.3.0 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,10 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
402402
github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
403403
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
404404
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
405-
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220917052300-e49b09065bec h1:p7KajgbysG84Xoe3DYryDh0mwlYya8FymtuNyrsNXrc=
406-
go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220917052300-e49b09065bec/go.mod h1:x7fp0T3Vsjdg/HA1cSBkIzmXNoQgj/y5DuMA+AMWX+Y=
407-
go.bytebuilders.dev/license-verifier v0.12.0 h1:HdgYKDe+lzjvTkkhlhrBtm5ORUXIKg8obst107OYVd4=
408-
go.bytebuilders.dev/license-verifier v0.12.0/go.mod h1:47HPt3RVp9gsujYpOeXi28IsTV5lilZ+EOpuhz/DIJM=
405+
go.bytebuilders.dev/license-proxyserver v0.0.3 h1:vAFMBWfrlmFKNspjBm2KfPXnxYnC17xLwZiHmVzUmzs=
406+
go.bytebuilders.dev/license-proxyserver v0.0.3/go.mod h1:iMJbPzDf2R2EJOZwRi7ziEr5DBMfT9Cm75/XfPb/QnU=
407+
go.bytebuilders.dev/license-verifier v0.12.1-0.20221113063237-6eb88040dd50 h1:RaKwNQ6dvJMLVUT5/EZ+WBZQxwloskamgDgiMwMJwEQ=
408+
go.bytebuilders.dev/license-verifier v0.12.1-0.20221113063237-6eb88040dd50/go.mod h1:47HPt3RVp9gsujYpOeXi28IsTV5lilZ+EOpuhz/DIJM=
409409
go.bytebuilders.dev/license-verifier/kubernetes v0.12.0 h1:YJ/JWjeJgDOHzgI/RYMn60x+R7KpZ+3Nu8BHJLghYc8=
410410
go.bytebuilders.dev/license-verifier/kubernetes v0.12.0/go.mod h1:XJUtMI5o0QQyaor1SAqL/2YTYU9LxYM6/Q8X8o/750w=
411411
go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
@@ -432,8 +432,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
432432
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
433433
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
434434
golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
435-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
436-
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
435+
golang.org/x/crypto v0.6.0 h1:qfktjS5LUO+fFKeJXZ+ikTRijMmljikvG68fpMMruSc=
436+
golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58=
437437
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
438438
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
439439
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
@@ -900,8 +900,8 @@ kubedb.dev/apimachinery v0.28.4-0.20220918021210-a0b96812228b/go.mod h1:OZ2A5/mT
900900
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
901901
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
902902
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
903-
sigs.k8s.io/controller-runtime v0.13.0 h1:iqa5RNciy7ADWnIc8QxCbOX5FEKVR3uxVxKHRMc2WIQ=
904-
sigs.k8s.io/controller-runtime v0.13.0/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
903+
sigs.k8s.io/controller-runtime v0.13.1 h1:tUsRCSJVM1QQOOeViGeX3GMT3dQF1eePPw6sEE3xSlg=
904+
sigs.k8s.io/controller-runtime v0.13.1/go.mod h1:Zbz+el8Yg31jubvAEyglRZGdLAjplZl+PgtYNI6WNTI=
905905
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k=
906906
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
907907
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=

‎vendor/golang.org/x/crypto/AUTHORS

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎vendor/golang.org/x/crypto/CONTRIBUTORS

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎vendor/golang.org/x/crypto/pkcs12/crypto.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go

Lines changed: 25 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,14 +138,14 @@ github.com/yudai/gojsondiff/formatter
138138
# github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82
139139
## explicit
140140
github.com/yudai/golcs
141-
# go.bytebuilders.dev/license-proxyserver v0.0.2-0.20220917052300-e49b09065bec
141+
# go.bytebuilders.dev/license-proxyserver v0.0.3
142142
## explicit; go 1.18
143143
go.bytebuilders.dev/license-proxyserver/apis/proxyserver
144144
go.bytebuilders.dev/license-proxyserver/apis/proxyserver/v1alpha1
145145
go.bytebuilders.dev/license-proxyserver/client/clientset/versioned
146146
go.bytebuilders.dev/license-proxyserver/client/clientset/versioned/scheme
147147
go.bytebuilders.dev/license-proxyserver/client/clientset/versioned/typed/proxyserver/v1alpha1
148-
# go.bytebuilders.dev/license-verifier v0.12.0
148+
# go.bytebuilders.dev/license-verifier v0.12.1-0.20221113063237-6eb88040dd50
149149
## explicit; go 1.18
150150
go.bytebuilders.dev/license-verifier
151151
go.bytebuilders.dev/license-verifier/apis/licenses
@@ -154,7 +154,7 @@ go.bytebuilders.dev/license-verifier/info
154154
# go.bytebuilders.dev/license-verifier/kubernetes v0.12.0
155155
## explicit; go 1.18
156156
go.bytebuilders.dev/license-verifier/kubernetes
157-
# golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
157+
# golang.org/x/crypto v0.6.0
158158
## explicit; go 1.17
159159
golang.org/x/crypto/pkcs12
160160
golang.org/x/crypto/pkcs12/internal/rc2
@@ -648,7 +648,7 @@ kmodules.xyz/prober/api/v1
648648
## explicit; go 1.18
649649
kubedb.dev/apimachinery/apis/config
650650
kubedb.dev/apimachinery/apis/config/v1alpha1
651-
# sigs.k8s.io/controller-runtime v0.13.0
651+
# sigs.k8s.io/controller-runtime v0.13.1
652652
## explicit; go 1.17
653653
sigs.k8s.io/controller-runtime/pkg/client
654654
sigs.k8s.io/controller-runtime/pkg/client/apiutil

0 commit comments

Comments
 (0)