Skip to content

Commit 93c5350

Browse files
authored
Merge pull request #138 from kcl-lang/bump-flux-kcl-deps
chore: bump kcl-go 0.10.x and go 1.23 deps
2 parents 03ccced + 729d579 commit 93c5350

File tree

5 files changed

+17
-19
lines changed

5 files changed

+17
-19
lines changed

Diff for: .github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
- name: Setup Go
4545
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
4646
with:
47-
go-version: 1.22
47+
go-version: 1.23
4848
cache-dependency-path: |
4949
**/go.sum
5050
**/go.mod

Diff for: .github/workflows/test.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Setup Go
3030
uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
3131
with:
32-
go-version: 1.22
32+
go-version: 1.23
3333
cache-dependency-path: |
3434
**/go.sum
3535
**/go.mod

Diff for: Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# We use the Go 1.22 version unless asked to use something else.
1+
# We use the Go 1.23 version unless asked to use something else.
22
# The GitHub Actions CI job sets this argument for a consistent Go version.
3-
ARG GO_VERSION=1.22
3+
ARG GO_VERSION=1.23
44
ARG BASE_IMAGE=kcllang/kcl
55

66
# Setup the base environment. The BUILDPLATFORM is set automatically by Docker.

Diff for: go.mod

+5-7
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/kcl-lang/flux-kcl-controller
22

3-
go 1.22.4
4-
5-
toolchain go1.22.6
3+
go 1.23
64

75
// Replace digest lib to master to gather access to BLAKE3.
86
// xref: https://github.com/opencontainers/go-digest/pull/66
@@ -25,8 +23,8 @@ require (
2523
github.com/stretchr/testify v1.9.0
2624
k8s.io/apimachinery v0.31.1
2725
k8s.io/client-go v0.31.1
28-
kcl-lang.io/kcl-go v0.10.0-rc.1
29-
kcl-lang.io/kpm v0.10.0-rc.1
26+
kcl-lang.io/kcl-go v0.10.1
27+
kcl-lang.io/kpm v0.10.0
3028
sigs.k8s.io/controller-runtime v0.19.0
3129
)
3230

@@ -167,12 +165,12 @@ require (
167165
google.golang.org/genproto v0.0.0-20240624140628-dc46fd24d27d // indirect
168166
google.golang.org/genproto/googleapis/api v0.0.0-20240624140628-dc46fd24d27d // indirect
169167
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
170-
google.golang.org/grpc v1.66.0 // indirect
168+
google.golang.org/grpc v1.66.2 // indirect
171169
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
172170
gopkg.in/warnings.v0 v0.1.2 // indirect
173171
k8s.io/cli-runtime v0.31.1 // indirect
174172
k8s.io/kubectl v0.31.1 // indirect
175-
kcl-lang.io/lib v0.10.0-rc.1 // indirect
173+
kcl-lang.io/lib v0.10.0 // indirect
176174
oras.land/oras-go v1.2.6 // indirect
177175
oras.land/oras-go/v2 v2.5.0 // indirect
178176
sigs.k8s.io/kustomize/api v0.17.3 // indirect

Diff for: go.sum

+8-8
Original file line numberDiff line numberDiff line change
@@ -1387,8 +1387,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu
13871387
google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
13881388
google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
13891389
google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI=
1390-
google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
1391-
google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
1390+
google.golang.org/grpc v1.66.2 h1:3QdXkuq3Bkh7w+ywLdLvM56cmGvQHUMZpiCzt6Rqaoo=
1391+
google.golang.org/grpc v1.66.2/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
13921392
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
13931393
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
13941394
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -1461,12 +1461,12 @@ k8s.io/kubectl v0.31.1 h1:ih4JQJHxsEggFqDJEHSOdJ69ZxZftgeZvYo7M/cpp24=
14611461
k8s.io/kubectl v0.31.1/go.mod h1:aNuQoR43W6MLAtXQ/Bu4GDmoHlbhHKuyD49lmTC8eJM=
14621462
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
14631463
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
1464-
kcl-lang.io/kcl-go v0.10.0-rc.1 h1:6jH1xSW/WsoXQLy++71prlL8DpkXflx0BKFN5Xyi2sI=
1465-
kcl-lang.io/kcl-go v0.10.0-rc.1/go.mod h1:7qUv6g/II7VmGUMXmwxdma1bR2UgLGNC3VopfDj0tSU=
1466-
kcl-lang.io/kpm v0.10.0-rc.1 h1:J4AfkTyls1YXfF5fkogSjWnhMnvxHnSQOB580R6cWqw=
1467-
kcl-lang.io/kpm v0.10.0-rc.1/go.mod h1:TEj1XJBBPo3G8UIbFfOzHp6rlPPP4N2Deu6blvRcKpY=
1468-
kcl-lang.io/lib v0.10.0-rc.1 h1:HRHMW2ane3mjKMVBUQQVvln9Z7FDkUJVXRWEVXPtP+w=
1469-
kcl-lang.io/lib v0.10.0-rc.1/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs=
1464+
kcl-lang.io/kcl-go v0.10.1 h1:2YXQP5QcwNGVLnxdcTNLRoJkYn357gCgqbgU+8hVHxU=
1465+
kcl-lang.io/kcl-go v0.10.1/go.mod h1:AQIQplXxCpodSw1Kt+qiFvIB7tzBQ18djT2GytS33nM=
1466+
kcl-lang.io/kpm v0.10.0 h1:VnsJ5IS8YSvgXYnItLdaJp/1tTrSSmThzmNCWmhm5Bg=
1467+
kcl-lang.io/kpm v0.10.0/go.mod h1:MhQh9kewILcUlhuhVBksxWVZfgdwkpkX6xFj1pxF0QM=
1468+
kcl-lang.io/lib v0.10.0 h1:VLwZTMfRZyaGfIJc8qxLn7bKr24PSgZLc3SxMRxUaN4=
1469+
kcl-lang.io/lib v0.10.0/go.mod h1:tu+tzwGgHLzYZSIxUG/ntipStrxZd6OvutWYPTxS7cs=
14701470
oras.land/oras-go v1.2.6 h1:z8cmxQXBU8yZ4mkytWqXfo6tZcamPwjsuxYU81xJ8Lk=
14711471
oras.land/oras-go v1.2.6/go.mod h1:OVPc1PegSEe/K8YiLfosrlqlqTN9PUyFvOw5Y9gwrT8=
14721472
oras.land/oras-go/v2 v2.5.0 h1:o8Me9kLY74Vp5uw07QXPiitjsw7qNXi8Twd+19Zf02c=

0 commit comments

Comments
 (0)