Skip to content

Commit

Permalink
build: go 1.21, godog 0.14.1, api, apimachinery & client-go v0.28.12 (#…
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
garomonegro authored Aug 12, 2024
1 parent 2a2fbc2 commit 982eb78
Show file tree
Hide file tree
Showing 18 changed files with 394 additions and 1,071 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-test-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: ^1.19
go-version: ^1.21
id: go
- uses: actions/checkout@v4
- run: make build
Expand Down
19 changes: 19 additions & 0 deletions .github/workflows/examples.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: CI
on:
push:
tags:
- v*
branches:
- master
pull_request:
jobs:
build:
name: examples
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v5
with:
go-version: ^1.21
id: go
- uses: actions/checkout@v4
- run: make build-examples
2 changes: 1 addition & 1 deletion .github/workflows/golangci-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.21
- uses: actions/checkout@v4
- uses: golangci/golangci-lint-action@v6
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/syntax.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/setup-go@v5
with:
go-version: ^1.19
go-version: ^1.21
id: go
- uses: actions/checkout@v4
- run: make check-syntax
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ pkg/generic/test/generated_*
pkg/kube/unstructured/test/templates/generated_*
kubedog
coverage.txt
examples/templating/generic/generic

# ignore edit files
.*~
Expand Down
16 changes: 16 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,19 @@ clean:
@rm -f ${BINARY}
@rm -f ${COVER_FILE}

build-examples: build-example-templating-generic build-example-templating-kube build-example-usage check-dirty-repo

.PHONY: build-example-templating-generic
build-example-templating-generic:
cd examples/templating/generic && \
go build

.PHONY: build-example-templating-kube
build-example-templating-kube:
cd examples/templating/kube && \
go test -c

.PHONY: build-example-usage
build-example-usage:
cd examples/usage && \
go test -c
13 changes: 7 additions & 6 deletions examples/templating/generic/go.mod
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
module github.com/keikoproj/kubedog/examples/templating/generic

go 1.19
go 1.21

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

require github.com/keikoproj/kubedog v1.2.3

require (
github.com/go-logr/logr v1.2.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
golang.org/x/sys v0.1.0 // indirect
k8s.io/apimachinery v0.22.17 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
golang.org/x/sys v0.18.0 // indirect
k8s.io/apimachinery v0.28.12 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
)
227 changes: 24 additions & 203 deletions examples/templating/generic/go.sum

Large diffs are not rendered by default.

68 changes: 39 additions & 29 deletions examples/templating/kube/go.mod
Original file line number Diff line number Diff line change
@@ -1,57 +1,67 @@
module github.com/keikoproj/kubedog/examples/templating/kube

go 1.19
go 1.21

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

require (
github.com/cucumber/godog v0.12.6
github.com/cucumber/godog v0.14.1
github.com/keikoproj/kubedog v1.2.3
)

require (
github.com/aws/aws-sdk-go v1.34.0 // indirect
github.com/cucumber/gherkin-go/v19 v19.0.3 // indirect
github.com/cucumber/messages-go/v16 v16.0.1 // indirect
github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect
github.com/cucumber/messages/go/v21 v21.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/go-logr/logr v1.2.0 // indirect
github.com/gofrs/uuid v4.2.0+incompatible // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gofrs/uuid v4.3.1+incompatible // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
github.com/hashicorp/go-memdb v1.3.2 // indirect
github.com/hashicorp/go-memdb v1.3.4 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/imdario/mergo v0.3.10 // indirect
github.com/influxdata/tdigest v0.0.0-20180711151920-a7d76c6f093a // indirect
github.com/influxdata/tdigest v0.0.1 // indirect
github.com/jmespath/go-jmespath v0.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/sirupsen/logrus v1.8.1 // indirect
github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/tsenart/vegeta/v12 v12.8.3 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
github.com/tsenart/vegeta/v12 v12.11.1 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.3.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.27.1 // indirect
google.golang.org/protobuf v1.33.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/api v0.22.17 // indirect
k8s.io/apimachinery v0.22.17 // indirect
k8s.io/client-go v0.22.17 // indirect
k8s.io/klog/v2 v2.60.1 // indirect
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
sigs.k8s.io/yaml v1.2.0 // indirect
k8s.io/api v0.28.12 // indirect
k8s.io/apimachinery v0.28.12 // indirect
k8s.io/client-go v0.28.12 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
sigs.k8s.io/yaml v1.3.0 // indirect
)
Loading

0 comments on commit 982eb78

Please sign in to comment.