Skip to content

Commit

Permalink
[all] Update k8s dependencies to v1.19.0 (kubernetes#1151)
Browse files Browse the repository at this point in the history 
* [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 <sean.schneeweiss@daimler.com>

* [occm] use version v1.19.0, do not use InstancesV2

InstancesV2 requires further testing before being used.

Signed-off-by: Sean Schneeweiss <sean.schneeweiss@daimler.com>
  • Loading branch information
@seanschneeweiss
seanschneeweiss committed Sep 10, 2020
1 parent 3bcfcbf commit 5a626f6
Show file tree
Hide file tree
Showing 4 changed files with 362 additions and 324 deletions.
16 changes: 9 additions & 7 deletions cmd/openstack-cloud-controller-manager/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,14 @@ import (
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/apiserver/pkg/server/healthz"
"k8s.io/apiserver/pkg/util/feature"
cloudprovider "k8s.io/cloud-provider"
"k8s.io/cloud-provider-openstack/pkg/cloudprovider/providers/openstack"
"k8s.io/cloud-provider-openstack/pkg/version"
nodecontroller "k8s.io/cloud-provider/controllers/node"
nodelifecyclecontroller "k8s.io/cloud-provider/controllers/nodelifecycle"
routecontroller "k8s.io/cloud-provider/controllers/route"
servicecontroller "k8s.io/cloud-provider/controllers/service"
"k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
_ "k8s.io/component-base/metrics/prometheus/restclient" // for client metric registration
Expand All @@ -43,11 +48,7 @@ import (
"k8s.io/kubernetes/cmd/cloud-controller-manager/app"
cloudcontrollerconfig "k8s.io/kubernetes/cmd/cloud-controller-manager/app/config"
"k8s.io/kubernetes/cmd/cloud-controller-manager/app/options"
cloudcontrollers "k8s.io/kubernetes/pkg/controller/cloud"
routecontroller "k8s.io/kubernetes/pkg/controller/route"
servicecontroller "k8s.io/kubernetes/pkg/controller/service"
_ "k8s.io/kubernetes/pkg/features" // add the kubernetes feature gates
utilflag "k8s.io/kubernetes/pkg/util/flag"

"github.com/spf13/cobra"
"github.com/spf13/pflag"
Expand Down Expand Up @@ -98,7 +99,7 @@ the cloud specific control loops shipped with Kubernetes.`,
version.PrintVersionAndExit()
}

utilflag.PrintFlags(cmd.Flags())
flag.PrintFlags(cmd.Flags())

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

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

func startCloudNodeLifecycleController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cloudprovider.Interface, stopCh <-chan struct{}) (http.Handler, bool, error) {
// Start the cloudNodeLifecycleController
cloudNodeLifecycleController, err := cloudcontrollers.NewCloudNodeLifecycleController(
cloudNodeLifecycleController, err := nodelifecyclecontroller.NewCloudNodeLifecycleController(
ctx.SharedInformers.Core().V1().Nodes(),
// cloud node lifecycle controller uses existing cluster role from node-controller
ctx.ClientBuilder.ClientOrDie("node-controller"),
Expand All @@ -212,6 +213,7 @@ func startServiceController(ctx *cloudcontrollerconfig.CompletedConfig, cloud cl
ctx.SharedInformers.Core().V1().Services(),
ctx.SharedInformers.Core().V1().Nodes(),
ctx.ComponentConfig.KubeCloudShared.ClusterName,
feature.DefaultFeatureGate,
)
if err != nil {
// This error shouldn't fail. It lives like this as a legacy.
Expand Down
88 changes: 43 additions & 45 deletions go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
module k8s.io/cloud-provider-openstack

go 1.13
go 1.15

require (
github.com/NYTimes/gziphandler v1.1.1 // indirect
github.com/container-storage-interface/spec v1.2.0
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
github.com/golang/protobuf v1.3.2
github.com/googleapis/gnostic v0.3.1 // indirect
github.com/golang/protobuf v1.4.2
github.com/gophercloud/gophercloud v0.11.1-0.20200518183226-7aec46f32c19
github.com/gophercloud/utils v0.0.0-20200423144003-7c72efc7435d
github.com/gorilla/mux v1.7.3
Expand All @@ -26,56 +23,57 @@ require (
github.com/onsi/gomega v1.9.0
github.com/pborman/uuid v1.2.0
github.com/pelletier/go-toml v1.4.0 // indirect
github.com/prometheus/client_golang v1.4.1
github.com/sirupsen/logrus v1.4.2
github.com/spf13/cobra v0.0.5
github.com/prometheus/client_golang v1.7.1
github.com/sirupsen/logrus v1.6.0
github.com/spf13/cobra v1.0.0
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.4.0
github.com/stretchr/testify v1.5.1
golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/net v0.0.0-20200707034311-ab3426394381
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
google.golang.org/appengine v1.6.2 // indirect
google.golang.org/grpc v1.26.0
golang.org/x/sys v0.0.0-20200622214017-ed371f2e16b4
google.golang.org/grpc v1.27.0
gopkg.in/gcfg.v1 v1.2.3
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.18.0
k8s.io/apimachinery v0.18.0
k8s.io/apiserver v0.18.0
k8s.io/client-go v0.18.0
k8s.io/cloud-provider v0.18.0
k8s.io/component-base v0.18.0
k8s.io/klog/v2 v2.0.0
k8s.io/kubernetes v1.18.0
k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
k8s.io/api v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/apiserver v0.19.0
k8s.io/client-go v0.19.0
k8s.io/cloud-provider v0.19.0
k8s.io/component-base v0.19.0
k8s.io/klog v1.0.0 // indirect
k8s.io/klog/v2 v2.2.0
k8s.io/kubernetes v1.19.0
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
software.sslmate.com/src/go-pkcs12 v0.0.0-20190209200317-47dd539968c4
)

replace (
github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.0-rc9
k8s.io/api => k8s.io/api v0.18.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.0
k8s.io/apimachinery => k8s.io/apimachinery v0.18.0
k8s.io/apiserver => k8s.io/apiserver v0.18.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.0
k8s.io/client-go => k8s.io/client-go v0.18.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.0
k8s.io/code-generator => k8s.io/code-generator v0.18.0
k8s.io/component-base => k8s.io/component-base v0.18.0
k8s.io/cri-api => k8s.io/cri-api v0.18.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.0
k8s.io/kubectl => k8s.io/kubectl v0.18.0
k8s.io/kubelet => k8s.io/kubelet v0.18.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.0
k8s.io/metrics => k8s.io/metrics v0.18.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.0
k8s.io/api => k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
k8s.io/apiserver => k8s.io/apiserver v0.19.0
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
k8s.io/client-go => k8s.io/client-go v0.19.0
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0
k8s.io/code-generator => k8s.io/code-generator v0.19.0
k8s.io/component-base => k8s.io/component-base v0.19.0
k8s.io/controller-manager => k8s.io/controller-manager v0.19.0
k8s.io/cri-api => k8s.io/cri-api v0.19.0
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0
k8s.io/kubectl => k8s.io/kubectl v0.19.0
k8s.io/kubelet => k8s.io/kubelet v0.19.0
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0
k8s.io/metrics => k8s.io/metrics v0.19.0
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.0
k8s.io/sample-controller => k8s.io/sample-controller v0.19.0
)
Loading

0 comments on commit 5a626f6

Please sign in to comment.