Skip to content

Commit

Permalink
⬆️ Upgrade Kotary to 1.26.0
Browse files Browse the repository at this point in the history
⬆️ Upgrade Golang and Kubernetes packages
⬆️ Upgrade codeGenerator
⬆️ Fix klog that is not working with go 1.21
  • Loading branch information
Kévin PEREZ committed Jan 30, 2024
1 parent 63e391e commit cc4c83f
Show file tree
Hide file tree
Showing 6 changed files with 198 additions and 128 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v4
with:
go-version: '1.20'
go-version: '1.21'
- name: Run Tests
run: make test
- name: Convert coverage to lcov
Expand Down
73 changes: 36 additions & 37 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
module github.com/ca-gip/kotary

go 1.20
go 1.21

require (
github.com/ahl5esoft/golang-underscore v2.0.0+incompatible
github.com/prometheus/client_golang v1.15.0
github.com/prometheus/client_golang v1.18.0
github.com/storageos/go-api v2.6.0+incompatible
github.com/troian/healthcheck v0.1.3
gotest.tools/v3 v3.4.0
k8s.io/api v0.24.13
k8s.io/apimachinery v0.24.13
k8s.io/apiserver v0.24.13
k8s.io/client-go v0.24.13
k8s.io/code-generator v0.24.13
k8s.io/klog/v2 v2.90.1
k8s.io/kubernetes v1.24.13
sigs.k8s.io/yaml v1.3.0
gotest.tools/v3 v3.5.1
k8s.io/api v0.26.13
k8s.io/apimachinery v0.26.13
k8s.io/apiserver v0.26.13
k8s.io/client-go v0.26.13
k8s.io/code-generator v0.26.13
k8s.io/klog/v2 v2.120.1
k8s.io/kubernetes v1.26.13
sigs.k8s.io/yaml v1.4.0
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
Expand All @@ -39,42 +39,41 @@ require (
github.com/imdario/mergo v0.3.6 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mailru/easyjson v0.7.6 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // 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/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/rogpeppe/go-internal v1.10.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/streadway/amqp v0.0.0-20200108173154-1c71cc93ed71 // indirect
golang.org/x/mod v0.9.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/sys v0.6.0 // indirect
golang.org/x/term v0.6.0 // indirect
golang.org/x/text v0.8.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/tools v0.7.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.12.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.30.0 // indirect
google.golang.org/protobuf v1.31.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/cluster-bootstrap v0.0.0 // indirect
k8s.io/component-base v0.24.13 // indirect
k8s.io/component-base v0.26.13 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)

// Dépendances indirectes, on doit spéficier la version car certains packages Kubernetes l'importes en version v0.0.0 ...
replace (
k8s.io/cloud-provider => k8s.io/cloud-provider v0.24.13
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.24.13
k8s.io/cloud-provider => k8s.io/cloud-provider v0.26.13
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.26.13
)
Loading

0 comments on commit cc4c83f

Please sign in to comment.