Skip to content

Commit 982eb78

Browse files
garomonegrogaromonegro
authored
build: go 1.21, godog 0.14.1, api, apimachinery & client-go v0.28.12 (#161)
* build: go 1.21, godog 0.14.1, api, apimachinery & client-go v0.28.12 * ci: building examples * ci(examples): check-dirty-repo * test(UT): fixing getIngressWithHostname * test(UT): fixing TestGetInstanceGroupList * refactor: replace 'err == wait.ErrWaitTimeout' with 'wait.Interrupted(err)' * chore: adding missed space
1 parent 2a2fbc2 commit 982eb78

File tree

18 files changed

+394
-1071
lines changed

18 files changed

+394
-1071
lines changed

‎.github/workflows/build-test-coverage.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: ^1.19
16+
go-version: ^1.21
1717
id: go
1818
- uses: actions/checkout@v4
1919
- run: make build

‎.github/workflows/examples.yml

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
name: CI
2+
on:
3+
push:
4+
tags:
5+
- v*
6+
branches:
7+
- master
8+
pull_request:
9+
jobs:
10+
build:
11+
name: examples
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/setup-go@v5
15+
with:
16+
go-version: ^1.21
17+
id: go
18+
- uses: actions/checkout@v4
19+
- run: make build-examples

‎.github/workflows/golangci-lint.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
steps:
1616
- uses: actions/setup-go@v5
1717
with:
18-
go-version: 1.19
18+
go-version: 1.21
1919
- uses: actions/checkout@v4
2020
- uses: golangci/golangci-lint-action@v6
2121
with:

‎.github/workflows/syntax.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: ^1.19
16+
go-version: ^1.21
1717
id: go
1818
- uses: actions/checkout@v4
1919
- run: make check-syntax

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ pkg/generic/test/generated_*
66
pkg/kube/unstructured/test/templates/generated_*
77
kubedog
88
coverage.txt
9+
examples/templating/generic/generic
910

1011
# ignore edit files
1112
.*~

‎Makefile

+16
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,19 @@ clean:
5151
@rm -f ${BINARY}
5252
@rm -f ${COVER_FILE}
5353

54+
build-examples: build-example-templating-generic build-example-templating-kube build-example-usage check-dirty-repo
55+
56+
.PHONY: build-example-templating-generic
57+
build-example-templating-generic:
58+
cd examples/templating/generic && \
59+
go build
60+
61+
.PHONY: build-example-templating-kube
62+
build-example-templating-kube:
63+
cd examples/templating/kube && \
64+
go test -c
65+
66+
.PHONY: build-example-usage
67+
build-example-usage:
68+
cd examples/usage && \
69+
go test -c

‎examples/templating/generic/go.mod

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
module github.com/keikoproj/kubedog/examples/templating/generic
22

3-
go 1.19
3+
go 1.21
44

55
replace github.com/keikoproj/kubedog => ../../../
66

77
require github.com/keikoproj/kubedog v1.2.3
88

99
require (
10-
github.com/go-logr/logr v1.2.0 // indirect
10+
github.com/go-logr/logr v1.2.4 // indirect
1111
github.com/pkg/errors v0.9.1 // indirect
12-
github.com/sirupsen/logrus v1.8.1 // indirect
13-
golang.org/x/sys v0.1.0 // indirect
14-
k8s.io/apimachinery v0.22.17 // indirect
15-
k8s.io/klog/v2 v2.60.1 // indirect
12+
github.com/sirupsen/logrus v1.9.3 // indirect
13+
golang.org/x/sys v0.18.0 // indirect
14+
k8s.io/apimachinery v0.28.12 // indirect
15+
k8s.io/klog/v2 v2.100.1 // indirect
16+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
1617
)

‎examples/templating/generic/go.sum

+24-203
Large diffs are not rendered by default.

‎examples/templating/kube/go.mod

+39-29
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,67 @@
11
module github.com/keikoproj/kubedog/examples/templating/kube
22

3-
go 1.19
3+
go 1.21
44

55
replace github.com/keikoproj/kubedog => ../../../
66

77
require (
8-
github.com/cucumber/godog v0.12.6
8+
github.com/cucumber/godog v0.14.1
99
github.com/keikoproj/kubedog v1.2.3
1010
)
1111

1212
require (
1313
github.com/aws/aws-sdk-go v1.34.0 // indirect
14-
github.com/cucumber/gherkin-go/v19 v19.0.3 // indirect
15-
github.com/cucumber/messages-go/v16 v16.0.1 // indirect
14+
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
15+
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
1616
github.com/davecgh/go-spew v1.1.1 // indirect
17-
github.com/go-logr/logr v1.2.0 // indirect
18-
github.com/gofrs/uuid v4.2.0+incompatible // indirect
17+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
18+
github.com/go-logr/logr v1.2.4 // indirect
19+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
20+
github.com/go-openapi/jsonreference v0.20.2 // indirect
21+
github.com/go-openapi/swag v0.22.3 // indirect
22+
github.com/gofrs/uuid v4.3.1+incompatible // indirect
1923
github.com/gogo/protobuf v1.3.2 // indirect
20-
github.com/golang/protobuf v1.5.2 // indirect
21-
github.com/google/go-cmp v0.5.5 // indirect
22-
github.com/google/gofuzz v1.1.0 // indirect
23-
github.com/googleapis/gnostic v0.5.5 // indirect
24+
github.com/golang/protobuf v1.5.4 // indirect
25+
github.com/google/gnostic-models v0.6.8 // indirect
26+
github.com/google/go-cmp v0.6.0 // indirect
27+
github.com/google/gofuzz v1.2.0 // indirect
28+
github.com/google/uuid v1.3.0 // indirect
2429
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
25-
github.com/hashicorp/go-memdb v1.3.2 // indirect
30+
github.com/hashicorp/go-memdb v1.3.4 // indirect
2631
github.com/hashicorp/golang-lru v0.5.4 // indirect
2732
github.com/imdario/mergo v0.3.10 // indirect
28-
github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a // indirect
33+
github.com/influxdata/tdigest v0.0.1 // indirect
2934
github.com/jmespath/go-jmespath v0.3.0 // indirect
3035
github.com/josharian/intern v1.0.0 // indirect
3136
github.com/json-iterator/go v1.1.12 // indirect
32-
github.com/mailru/easyjson v0.7.6 // indirect
37+
github.com/mailru/easyjson v0.7.7 // indirect
3338
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3439
github.com/modern-go/reflect2 v1.0.2 // indirect
40+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3541
github.com/pkg/errors v0.9.1 // indirect
36-
github.com/sirupsen/logrus v1.8.1 // indirect
42+
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
43+
github.com/sirupsen/logrus v1.9.3 // indirect
3744
github.com/spf13/pflag v1.0.5 // indirect
38-
github.com/tsenart/vegeta/v12 v12.8.3 // indirect
39-
golang.org/x/net v0.17.0 // indirect
40-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
41-
golang.org/x/sys v0.13.0 // indirect
42-
golang.org/x/term v0.13.0 // indirect
43-
golang.org/x/text v0.13.0 // indirect
44-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
45+
github.com/tsenart/vegeta/v12 v12.11.1 // indirect
46+
golang.org/x/net v0.23.0 // indirect
47+
golang.org/x/oauth2 v0.8.0 // indirect
48+
golang.org/x/sync v0.3.0 // indirect
49+
golang.org/x/sys v0.18.0 // indirect
50+
golang.org/x/term v0.18.0 // indirect
51+
golang.org/x/text v0.14.0 // indirect
52+
golang.org/x/time v0.3.0 // indirect
4553
google.golang.org/appengine v1.6.7 // indirect
46-
google.golang.org/protobuf v1.27.1 // indirect
54+
google.golang.org/protobuf v1.33.0 // indirect
4755
gopkg.in/inf.v0 v0.9.1 // indirect
4856
gopkg.in/yaml.v2 v2.4.0 // indirect
4957
gopkg.in/yaml.v3 v3.0.1 // indirect
50-
k8s.io/api v0.22.17 // indirect
51-
k8s.io/apimachinery v0.22.17 // indirect
52-
k8s.io/client-go v0.22.17 // indirect
53-
k8s.io/klog/v2 v2.60.1 // indirect
54-
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
55-
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
56-
sigs.k8s.io/yaml v1.2.0 // indirect
58+
k8s.io/api v0.28.12 // indirect
59+
k8s.io/apimachinery v0.28.12 // indirect
60+
k8s.io/client-go v0.28.12 // indirect
61+
k8s.io/klog/v2 v2.100.1 // indirect
62+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
63+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
64+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
65+
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
66+
sigs.k8s.io/yaml v1.3.0 // indirect
5767
)

0 commit comments

Comments
 (0)