Skip to content

Commit cbee1e1

Browse files
seanschneeweissseanschneeweiss
authored
[all] Update k8s dependencies to v1.19.0 (kubernetes#1151)
* [occm] update cloud-provider to 1.19.0 This commit updates k8s version to 1.19.0 to use the cloud-provider pkg from its new location. Signed-off-by: Sean Schneeweiss <[email protected]> * [occm] use version v1.19.0, do not use InstancesV2 InstancesV2 requires further testing before being used. Signed-off-by: Sean Schneeweiss <[email protected]>
1 parent 0a52dcb commit cbee1e1

File tree

4 files changed

+362
-324
lines changed

4 files changed

+362
-324
lines changed

‎cmd/openstack-cloud-controller-manager/main.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,14 @@ import (
3232
"k8s.io/apimachinery/pkg/util/sets"
3333
"k8s.io/apimachinery/pkg/util/wait"
3434
"k8s.io/apiserver/pkg/server/healthz"
35+
"k8s.io/apiserver/pkg/util/feature"
3536
cloudprovider "k8s.io/cloud-provider"
3637
"k8s.io/cloud-provider-openstack/pkg/cloudprovider/providers/openstack"
3738
"k8s.io/cloud-provider-openstack/pkg/version"
39+
nodecontroller "k8s.io/cloud-provider/controllers/node"
40+
nodelifecyclecontroller "k8s.io/cloud-provider/controllers/nodelifecycle"
41+
routecontroller "k8s.io/cloud-provider/controllers/route"
42+
servicecontroller "k8s.io/cloud-provider/controllers/service"
3843
"k8s.io/component-base/cli/flag"
3944
"k8s.io/component-base/logs"
4045
_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
@@ -43,11 +48,7 @@ import (
4348
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
4449
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
4550
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
46-
cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud"
47-
routecontroller "k8s.io/kubernetes/pkg/controller/route"
48-
servicecontroller "k8s.io/kubernetes/pkg/controller/service"
4951
_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
50-
utilflag "k8s.io/kubernetes/pkg/util/flag"
5152

5253
"github.com/spf13/cobra"
5354
"github.com/spf13/pflag"
@@ -98,7 +99,7 @@ the cloud specific control loops shipped with Kubernetes.`,
9899
version.PrintVersionAndExit()
99100
}
100101

101-
utilflag.PrintFlags(cmd.Flags())
102+
flag.PrintFlags(cmd.Flags())
102103

103104
c, err := s.Config(KnownControllers(), ControllersDisabledByDefault.List())
104105
if err != nil {
@@ -168,7 +169,7 @@ func newControllerInitializers() map[string]initFunc {
168169

169170
func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
170171
// Start the CloudNodeController
171-
nodeController, err := cloudcontrollers.NewCloudNodeController(
172+
nodeController, err := nodecontroller.NewCloudNodeController(
172173
ctx.SharedInformers.Core().V1().Nodes(),
173174
// cloud node controller uses existing cluster role from node-controller
174175
ctx.ClientBuilder.ClientOrDie("node-controller"),
@@ -187,7 +188,7 @@ func startCloudNodeController(ctx *cloudcontrollerconfig.CompletedConfig, cloud
187188

188189
func startCloudNodeLifecycleController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
189190
// Start the cloudNodeLifecycleController
190-
cloudNodeLifecycleController, err := cloudcontrollers.NewCloudNodeLifecycleController(
191+
cloudNodeLifecycleController, err := nodelifecyclecontroller.NewCloudNodeLifecycleController(
191192
ctx.SharedInformers.Core().V1().Nodes(),
192193
// cloud node lifecycle controller uses existing cluster role from node-controller
193194
ctx.ClientBuilder.ClientOrDie("node-controller"),
@@ -212,6 +213,7 @@ func startServiceController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cl
212213
ctx.SharedInformers.Core().V1().Services(),
213214
ctx.SharedInformers.Core().V1().Nodes(),
214215
ctx.ComponentConfig.KubeCloudShared.ClusterName,
216+
feature.DefaultFeatureGate,
215217
)
216218
if err != nil {
217219
// This error shouldn't fail. It lives like this as a legacy.

‎go.mod‎

Lines changed: 43 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
module k8s.io/cloud-provider-openstack
22

3-
go 1.13
3+
go 1.15
44

55
require (
66
github.com/NYTimes/gziphandler v1.1.1 // indirect
77
github.com/container-storage-interface/spec v1.2.0
88
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
99
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
10-
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
11-
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
12-
github.com/golang/protobuf v1.3.2
13-
github.com/googleapis/gnostic v0.3.1 // indirect
10+
github.com/golang/protobuf v1.4.2
1411
github.com/gophercloud/gophercloud v0.11.1-0.20200518183226-7aec46f32c19
1512
github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d
1613
github.com/gorilla/mux v1.7.3
@@ -26,56 +23,57 @@ require (
2623
github.com/onsi/gomega v1.9.0
2724
github.com/pborman/uuid v1.2.0
2825
github.com/pelletier/go-toml v1.4.0 // indirect
29-
github.com/prometheus/client_golang v1.4.1
30-
github.com/sirupsen/logrus v1.4.2
31-
github.com/spf13/cobra v0.0.5
26+
github.com/prometheus/client_golang v1.7.1
27+
github.com/sirupsen/logrus v1.6.0
28+
github.com/spf13/cobra v1.0.0
3229
github.com/spf13/pflag v1.0.5
3330
github.com/spf13/viper v1.4.0
3431
github.com/stretchr/testify v1.5.1
35-
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
36-
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
32+
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
33+
golang.org/x/net v0.0.0-20200707034311-ab3426394381
3734
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
38-
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82
39-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
40-
google.golang.org/appengine v1.6.2 // indirect
41-
google.golang.org/grpc v1.26.0
35+
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
36+
google.golang.org/grpc v1.27.0
4237
gopkg.in/gcfg.v1 v1.2.3
43-
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
4438
gopkg.in/warnings.v0 v0.1.2 // indirect
4539
gopkg.in/yaml.v2 v2.2.8
46-
k8s.io/api v0.18.0
47-
k8s.io/apimachinery v0.18.0
48-
k8s.io/apiserver v0.18.0
49-
k8s.io/client-go v0.18.0
50-
k8s.io/cloud-provider v0.18.0
51-
k8s.io/component-base v0.18.0
52-
k8s.io/klog/v2 v2.0.0
53-
k8s.io/kubernetes v1.18.0
54-
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
40+
k8s.io/api v0.19.0
41+
k8s.io/apimachinery v0.19.0
42+
k8s.io/apiserver v0.19.0
43+
k8s.io/client-go v0.19.0
44+
k8s.io/cloud-provider v0.19.0
45+
k8s.io/component-base v0.19.0
46+
k8s.io/klog v1.0.0 // indirect
47+
k8s.io/klog/v2 v2.2.0
48+
k8s.io/kubernetes v1.19.0
49+
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
5550
software.sslmate.com/src/go-pkcs12 v0.0.0-20190209200317-47dd539968c4
5651
)
5752

5853
replace (
5954
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc9
60-
k8s.io/api => k8s.io/api v0.18.0
61-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
62-
k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
63-
k8s.io/apiserver => k8s.io/apiserver v0.18.0
64-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
65-
k8s.io/client-go => k8s.io/client-go v0.18.0
66-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
67-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
68-
k8s.io/code-generator => k8s.io/code-generator v0.18.0
69-
k8s.io/component-base => k8s.io/component-base v0.18.0
70-
k8s.io/cri-api => k8s.io/cri-api v0.18.0
71-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
72-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
73-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
74-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
75-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
76-
k8s.io/kubectl => k8s.io/kubectl v0.18.0
77-
k8s.io/kubelet => k8s.io/kubelet v0.18.0
78-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
79-
k8s.io/metrics => k8s.io/metrics v0.18.0
80-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
55+
k8s.io/api => k8s.io/api v0.19.0
56+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
57+
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
58+
k8s.io/apiserver => k8s.io/apiserver v0.19.0
59+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
60+
k8s.io/client-go => k8s.io/client-go v0.19.0
61+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0
62+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0
63+
k8s.io/code-generator => k8s.io/code-generator v0.19.0
64+
k8s.io/component-base => k8s.io/component-base v0.19.0
65+
k8s.io/controller-manager => k8s.io/controller-manager v0.19.0
66+
k8s.io/cri-api => k8s.io/cri-api v0.19.0
67+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0
68+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0
69+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0
70+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0
71+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0
72+
k8s.io/kubectl => k8s.io/kubectl v0.19.0
73+
k8s.io/kubelet => k8s.io/kubelet v0.19.0
74+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0
75+
k8s.io/metrics => k8s.io/metrics v0.19.0
76+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0
77+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.0
78+
k8s.io/sample-controller => k8s.io/sample-controller v0.19.0
8179
)

0 commit comments

Comments
 (0)