Skip to content

Commit

Permalink
Upgrade kubernetes SDK (1.28) (#67)
Browse files Browse the repository at this point in the history 
# Description
<!--
* Prefix: the title with the component name being changed. Add a short
and self describing sentence to ease the review
* Please add a few lines providing context and describing the change
* Please self comment changes whenever applicable to help with the
review process
* Please keep the checklist as part of the PR. Tick what applies to this
change.
-->

- Upgrade the Kubernetes SDK
- Fix a small breaking change (introduced by
kubernetes/cloud-provider@1339cd2#diff-c835d4fe6575e4473e744075d1cc7b38b0daf51663053e78f0f159b8ff1e28d1)
- Update new repositories for Kubernetes upstream packages (kubeadm
setup)

## Checklist
(For exoscale contributors)

* [x] Changelog updated (under *Unreleased* block)
* [x] Testing

## Testing

```sks
INFO[run]: Running test type 'sks'
=================================================================== test session starts ====================================================================
platform linux -- Python 3.10.7, pytest-7.4.0, pluggy-1.2.0
rootdir: /home/phil/git/github.com/exoscale/exoscale-cloud-controller-manager/test
configfile: pytest.ini
collected 69 items / 1 deselected / 68 selected                                                                                                            

tests_0_environment/test_001_environment.py .....                                                                                                    [  7%]
tests_1_control_plane/test_101_control_plane.py .                                                                                                    [  8%]
tests_1_control_plane/test_102_control_plane_files.py ......                                                                                         [ 17%]
tests_1_control_plane/test_103_control_plane_start.py ..                                                                                             [ 20%]
tests_2_nodes/test_201_nodes.py .                                                                                                                    [ 22%]
tests_2_nodes/test_202_nodes_files.py s.                                                                                                             [ 25%]
tests_3_ccm/test_300_init.py .                                                                                                                       [ 26%]
tests_3_ccm/test_301_k8s_state.py ..                                                                                                                 [ 29%]
tests_3_ccm/test_302_ccm_start.py .....                                                                                                              [ 36%]
tests_3_ccm/test_303_ccm_node_csr_validation.py .                                                                                                    [ 38%]
tests_3_ccm/test_304_ccm_node_csr_invalid.py ss                                                                                                      [ 41%]
tests_3_ccm/test_305_ccm_nodes.py x                                                                                                                  [ 42%]
tests_3_ccm/test_306_ccm_api_credentials_update.py ..                                                                                                [ 45%]
tests_3_ccm/test_307_k8s_nodes.py x.x                                                                                                                [ 50%]
tests_4_nlb/test_400_init.py ..                                                                                                                      [ 52%]
tests_4_nlb/test_401_nlb_hello_external.py .....                                                                                                     [ 60%]
tests_4_nlb/test_402_nlb_ingress_nginx.py .......                                                                                                    [ 70%]
tests_4_nlb/test_403_nlb_hello_ingress.py ..                                                                                                         [ 73%]
tests_5_nodes_pool_resize/test_500_init.py ..                                                                                                        [ 76%]
tests_5_nodes_pool_resize/test_501_k8s_state.py ...                                                                                                  [ 80%]
tests_5_nodes_pool_resize/test_502_ccm_nodes_deletion.py s                                                                                           [ 82%]
tests_5_nodes_pool_resize/test_503_ccm_nodes_csr_validation.py .                                                                                     [ 83%]
tests_5_nodes_pool_resize/test_504_k8s_nodes.py .                                                                                                    [ 85%]
tests_5_nodes_pool_resize/test_505_nlb_hello.py ..                                                                                                   [ 88%]
tests_5_nodes_pool_resize/test_501_k8s_state.py ...                                                                                                  [ 92%]
tests_5_nodes_pool_resize/test_502_ccm_nodes_deletion.py X                                                                                           [ 94%]
tests_5_nodes_pool_resize/test_503_ccm_nodes_csr_validation.py s                                                                                     [ 95%]
tests_5_nodes_pool_resize/test_504_k8s_nodes.py .                                                                                                    [ 97%]
tests_5_nodes_pool_resize/test_505_nlb_hello.py ..                                                                                                   [100%]

====================================== 59 passed, 5 skipped, 1 deselected, 3 xfailed, 1 xpassed in 991.31s (0:16:31) =======================================
```

```kubeadm
INFO[run]: Running test type 'kubeadm'
=================================================================== test session starts ====================================================================
platform linux -- Python 3.10.7, pytest-7.4.0, pluggy-1.2.0
rootdir: /home/phil/git/github.com/exoscale/exoscale-cloud-controller-manager/test
configfile: pytest.ini
collected 69 items / 1 deselected / 68 selected                                                                                                            

tests_0_environment/test_001_environment.py .....                                                                                                    [  7%]
tests_1_control_plane/test_101_control_plane.py .                                                                                                    [  8%]
tests_1_control_plane/test_102_control_plane_files.py ......                                                                                         [ 17%]
tests_1_control_plane/test_103_control_plane_start.py ..                                                                                             [ 20%]
tests_2_nodes/test_201_nodes.py .                                                                                                                    [ 22%]
tests_2_nodes/test_202_nodes_files.py ..                                                                                                             [ 25%]
tests_3_ccm/test_300_init.py .                                                                                                                       [ 26%]
tests_3_ccm/test_301_k8s_state.py ..                                                                                                                 [ 29%]
tests_3_ccm/test_302_ccm_start.py .....                                                                                                              [ 36%]
tests_3_ccm/test_303_ccm_node_csr_validation.py .                                                                                                    [ 38%]
tests_3_ccm/test_304_ccm_node_csr_invalid.py ..                                                                                                      [ 41%]
tests_3_ccm/test_305_ccm_nodes.py .                                                                                                                  [ 42%]
tests_3_ccm/test_306_ccm_api_credentials_update.py ..                                                                                                [ 45%]
tests_3_ccm/test_307_k8s_nodes.py ...                                                                                                                [ 50%]
tests_4_nlb/test_400_init.py ..                                                                                                                      [ 52%]
tests_4_nlb/test_401_nlb_hello_external.py .....                                                                                                     [ 60%]
tests_4_nlb/test_402_nlb_ingress_nginx.py .......                                                                                                    [ 70%]
tests_4_nlb/test_403_nlb_hello_ingress.py ..                                                                                                         [ 73%]
tests_5_nodes_pool_resize/test_500_init.py ..                                                                                                        [ 76%]
tests_5_nodes_pool_resize/test_501_k8s_state.py ...                                                                                                  [ 80%]
tests_5_nodes_pool_resize/test_502_ccm_nodes_deletion.py s                                                                                           [ 82%]
tests_5_nodes_pool_resize/test_503_ccm_nodes_csr_validation.py .                                                                                     [ 83%]
tests_5_nodes_pool_resize/test_504_k8s_nodes.py .                                                                                                    [ 85%]
tests_5_nodes_pool_resize/test_505_nlb_hello.py ..                                                                                                   [ 88%]
tests_5_nodes_pool_resize/test_501_k8s_state.py ...                                                                                                  [ 92%]
tests_5_nodes_pool_resize/test_502_ccm_nodes_deletion.py .                                                                                           [ 94%]
tests_5_nodes_pool_resize/test_503_ccm_nodes_csr_validation.py s                                                                                     [ 95%]
tests_5_nodes_pool_resize/test_504_k8s_nodes.py .                                                                                                    [ 97%]
tests_5_nodes_pool_resize/test_505_nlb_hello.py ..                                                                                                   [100%]

================================================= 66 passed, 2 skipped, 1 deselected in 928.32s (0:15:28) ==================================================
```
  • Loading branch information
@PhilippeChepy
PhilippeChepy authored Aug 29, 2023
1 parent 6c4848c commit e1ed489
Show file tree
Hide file tree
Showing 988 changed files with 81,838 additions and 21,920 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 0.14.0

* Upgrade Kubernetes SDK to 1.28.1, egoscale to 0.100.3

## 0.13.0

* Fix a rare bug happening on tests when trying to reload configuration
Expand Down
7 changes: 2 additions & 5 deletions cmd/exoscale-cloud-controller-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import (
cloudprovider "k8s.io/cloud-provider"
"k8s.io/cloud-provider/app"
"k8s.io/cloud-provider/app/config"
"k8s.io/cloud-provider/names"
"k8s.io/cloud-provider/options"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
Expand All @@ -29,11 +30,7 @@ func main() {
}

fss := cliflag.NamedFlagSets{}
command := app.NewCloudControllerManagerCommand(ccmOptions,
cloudInitializer,
app.DefaultInitFuncConstructors,
fss,
wait.NeverStop)
command := app.NewCloudControllerManagerCommand(ccmOptions, cloudInitializer, app.DefaultInitFuncConstructors, names.CCMControllerAliases(), fss, wait.NeverStop)

// From https://github.com/kubernetes/cloud-provider/blob/master/sample/basic_main.go:
// TODO: once we switch everything over to Cobra commands, we can go back to calling
Expand Down
104 changes: 53 additions & 51 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,78 +3,77 @@ module github.com/exoscale/exoscale-cloud-controller-manager
go 1.20

require (
github.com/exoscale/egoscale v0.100.1
github.com/gofrs/uuid v4.0.0+incompatible
github.com/exoscale/egoscale v0.100.3
github.com/gofrs/uuid v4.4.0+incompatible
github.com/google/go-cmp v0.5.9
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.1
github.com/stretchr/testify v1.8.2
gopkg.in/fsnotify.v1 v1.4.7
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.27.0
k8s.io/apimachinery v0.27.0
k8s.io/client-go v0.27.0
k8s.io/cloud-provider v0.27.0
k8s.io/component-base v0.27.0
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
k8s.io/api v0.28.1
k8s.io/apimachinery v0.28.1
k8s.io/client-go v0.28.1
k8s.io/cloud-provider v0.28.1
k8s.io/component-base v0.28.1
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
)

require (
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deepmap/oapi-codegen v1.9.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // 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
github.com/google/cel-go v0.12.6 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/cel-go v0.16.0 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-retryablehttp v0.7.1 // indirect
github.com/imdario/mergo v0.3.6 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.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.7 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mitchellh/mapstructure v1.4.1 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // 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/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.37.0 // indirect
github.com/prometheus/procfs v0.8.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/stoewer/go-strcase v1.2.0 // indirect
github.com/stretchr/objx v0.5.0 // indirect
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
go.etcd.io/etcd/api/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/pkg/v3 v3.5.9 // indirect
go.etcd.io/etcd/client/v3 v3.5.9 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.35.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.35.1 // indirect
go.opentelemetry.io/otel v1.10.0 // indirect
Expand All @@ -85,30 +84,33 @@ require (
go.opentelemetry.io/otel/sdk v1.10.0 // indirect
go.opentelemetry.io/otel/trace v1.10.0 // indirect
go.opentelemetry.io/proto/otlp v0.19.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/atomic v1.10.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.19.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/net v0.8.0 // indirect
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/sync v0.1.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/crypto v0.11.0 // indirect
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/grpc v1.53.0 // indirect
google.golang.org/protobuf v1.28.1 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.30.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/apiserver v0.27.0 // indirect
k8s.io/component-helpers v0.27.0 // indirect
k8s.io/controller-manager v0.27.0 // indirect
k8s.io/kms v0.27.0 // indirect
k8s.io/kube-openapi v0.0.0-20230308215209-15aac26d736a // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.1 // indirect
k8s.io/apiserver v0.28.1 // indirect
k8s.io/component-helpers v0.28.1 // indirect
k8s.io/controller-manager v0.28.1 // indirect
k8s.io/kms v0.28.1 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // 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
Expand Down
Loading

0 comments on commit e1ed489

Please sign in to comment.