Skip to content

Commit 785f0ca

Browse files
committed
dependency updates
1 parent 39c1438 commit 785f0ca

File tree

6 files changed

+22
-26
lines changed

6 files changed

+22
-26
lines changed

.github/workflows/ci.yaml

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
go: ["1.18", "1.19", "1.20"]
16+
go: ["1.22"]
1717

1818
steps:
1919
- name: Set up Go
@@ -33,16 +33,15 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
kube: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24"]
37-
# kube: ["1.19", "1.20", "1.21", "1.22", "1.23", "1.24", "1.25", "1.26"]
36+
kube: ["1.25", "1.26", "1.27", "1.28", "1.29", "1.30"]
3837
env:
3938
KUBECONFIG: ${{ github.workspace }}/.kube/config
4039

4140
steps:
4241
- name: Set up Go
4342
uses: actions/setup-go@v4
4443
with:
45-
go-version: '1.20'
44+
go-version: '1.22'
4645

4746
- name: Checkout code
4847
uses: actions/checkout@v3
@@ -52,23 +51,18 @@ jobs:
5251
id: node_image
5352
run: |
5453
case ${{ matrix.kube }} in
55-
1.19)
56-
NODE_IMAGE=kindest/node:v1.19.16@sha256:476cb3269232888437b61deca013832fee41f9f074f9bed79f57e4280f7c48b7 ;;
57-
1.20)
58-
NODE_IMAGE=kindest/node:v1.20.15@sha256:a32bf55309294120616886b5338f95dd98a2f7231519c7dedcec32ba29699394 ;;
59-
1.21)
60-
NODE_IMAGE=kindest/node:v1.21.14@sha256:9d9eb5fb26b4fbc0c6d95fa8c790414f9750dd583f5d7cee45d92e8c26670aa1 ;;
61-
1.22)
62-
NODE_IMAGE=kindest/node:v1.22.15@sha256:7d9708c4b0873f0fe2e171e2b1b7f45ae89482617778c1c875f1053d4cef2e41 ;;
63-
1.23)
64-
NODE_IMAGE=kindest/node:v1.23.13@sha256:ef453bb7c79f0e3caba88d2067d4196f427794086a7d0df8df4f019d5e336b61 ;;
65-
1.24)
66-
NODE_IMAGE=kindest/node:v1.24.7@sha256:577c630ce8e509131eab1aea12c022190978dd2f745aac5eb1fe65c0807eb315 ;;
67-
# Integration tests don't pass on these versions due to API incompatibilities
68-
# 1.25)
69-
# NODE_IMAGE=kindest/node:v1.25.3@sha256:f52781bc0d7a19fb6c405c2af83abfeb311f130707a0e219175677e366cc45d1 ;;
70-
# 1.26)
71-
# NODE_IMAGE=kindest/node:v1.26.0@sha256:691e24bd2417609db7e589e1a479b902d2e209892a10ce375fab60a8407c7352 ;;
54+
1.25)
55+
NODE_IMAGE=kindest/node:v1.25.11@sha256:227fa11ce74ea76a0474eeefb84cb75d8dad1b08638371ecf0e86259b35be0c8 ;;
56+
1.26)
57+
NODE_IMAGE=kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb ;;
58+
1.27)
59+
NODE_IMAGE=kindest/node:v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72 ;;
60+
1.28)
61+
NODE_IMAGE=kindest/node:v1.28.9@sha256:9ba4d311e7861d27b210e5960e5ce921a7c53d3c67e0545fd8a1cb9a76dfa2cb ;;
62+
1.29)
63+
NODE_IMAGE=kindest/node:v1.29.4@sha256:ea40a6bd365a17f71fd3883a1d34a0791d7d6b0eb75832c6d85b6f2326827f1e ;;
64+
1.30)
65+
NODE_IMAGE=kindest/node:v1.30.0@sha256:2af5d1b382926abcd6336312d652cd045b7cc47475844a608669c71b1fefcfbc ;;
7266
esac
7367
echo "image=$NODE_IMAGE" >> $GITHUB_OUTPUT
7468

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/vendor/
22
/bin/
33
/.licensei.cache
4+
.idea

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
LICENSEI_VERSION = 0.5.0
2-
GOLANGCI_VERSION = 1.51.1
1+
LICENSEI_VERSION = 0.9.0
2+
GOLANGCI_VERSION = 1.59.0
33

44
all: license fmt vet test
55

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cisco-open/k8s-objectmatcher
22

3-
go 1.17
3+
go 1.22.0
44

55
require (
66
emperror.dev/errors v0.8.1

tests/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/cisco-open/k8s-objectmatcher/tests
22

3-
go 1.17
3+
go 1.22.0
44

55
require (
66
emperror.dev/errors v0.8.1
@@ -14,7 +14,7 @@ require (
1414

1515
require (
1616
github.com/davecgh/go-spew v1.1.1 // indirect
17-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
17+
github.com/evanphx/json-patch v5.9.0+incompatible // indirect
1818
github.com/go-logr/logr v0.4.0 // indirect
1919
github.com/gogo/protobuf v1.3.2 // indirect
2020
github.com/golang/protobuf v1.4.3 // indirect

tests/go.sum

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7
9393
github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
9494
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
9595
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
96+
github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
9697
github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
9798
github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
9899
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=

0 commit comments

Comments
 (0)