Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Kubernetes dependency versions to 1.20.6 #601

Merged
merged 3 commits into from
Jul 29, 2021
Merged

Update Kubernetes dependency versions to 1.20.6 #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e06a4bb
update k8s to v1.20.5
AxiomSamarth Jul 21, 2021
11c623e
vendored files
AxiomSamarth Jul 21, 2021
8afbfea
adapt k8s v1.20 and introduce contexts
AxiomSamarth Jul 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .ci/integration-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ function run_controller() {
--machine-safety-apiserver-statuscheck-timeout=30s \
--machine-safety-apiserver-statuscheck-period=1m \
--machine-safety-orphan-vms-period=30m \
--machine-safety-overshooting-period=100ms \
--machine-safety-overshooting-period=300ms \
--leader-elect-lease-duration=1m \
--leader-elect-renew-deadline=30s \
--leader-elect-retry-period=15s \
Expand Down
10 changes: 7 additions & 3 deletions cmd/machine-controller-manager/app/controllermanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import (
"github.com/gardener/machine-controller-manager/cmd/machine-controller-manager/app/options"
"github.com/gardener/machine-controller-manager/pkg/handlers"
"github.com/gardener/machine-controller-manager/pkg/util/configz"
"github.com/prometheus/client_golang/prometheus"
prometheus "github.com/prometheus/client_golang/prometheus/promhttp"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime/schema"
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
Expand All @@ -57,11 +57,13 @@ import (
"k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock"
"k8s.io/client-go/tools/record"
"k8s.io/klog"
"k8s.io/klog/v2"
)

const (
controllerManagerAgentName = "machine-controller-manager"
targetkubeconfigTimeout = 1 * time.Minute
controlkubeconfigTimeout = 1 * time.Minute
)

var (
Expand Down Expand Up @@ -108,6 +110,8 @@ func Run(s *options.MCMServer) error {
controlkubeconfig.QPS = s.KubeAPIQPS
targetkubeconfig.Burst = int(s.KubeAPIBurst)
controlkubeconfig.Burst = int(s.KubeAPIBurst)
targetkubeconfig.Timeout = targetkubeconfigTimeout
controlkubeconfig.Timeout = controlkubeconfigTimeout

kubeClientControl, err := kubernetes.NewForConfig(
rest.AddUserAgent(controlkubeconfig, "machine-controller-manager"),
Expand Down Expand Up @@ -311,7 +315,7 @@ func getAvailableResources(clientBuilder corecontroller.ClientBuilder) (map[sche
}

healthStatus := 0
resp := client.Discovery().RESTClient().Get().AbsPath("/healthz").Do().StatusCode(&healthStatus)
resp := client.Discovery().RESTClient().Get().AbsPath("/healthz").Do(context.TODO()).StatusCode(&healthStatus)
if healthStatus != http.StatusOK {
klog.Errorf("Server isn't healthy yet. Waiting a little while.")
return false, nil
Expand Down
62 changes: 27 additions & 35 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,51 @@
module github.com/gardener/machine-controller-manager

go 1.13
go 1.16

require (
github.com/Azure/azure-sdk-for-go v42.2.0+incompatible
github.com/Azure/go-autorest/autorest v0.10.1
github.com/Azure/go-autorest/autorest/adal v0.8.2
github.com/Azure/go-autorest/autorest v0.11.1
github.com/Azure/go-autorest/autorest/adal v0.9.5
github.com/Azure/go-autorest/autorest/to v0.3.0
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20180828111155-cad214d7d71f
github.com/aws/aws-sdk-go v1.23.13
github.com/cenkalti/backoff/v4 v4.1.0
github.com/davecgh/go-spew v1.1.1
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
github.com/go-git/go-git/v5 v5.3.0
github.com/go-openapi/spec v0.19.2
github.com/golang/groupcache v0.0.0-20180513044358-24b0969c4cb7 // indirect
github.com/googleapis/gnostic v0.2.0 // indirect
github.com/go-git/go-git/v5 v5.4.2
github.com/go-openapi/spec v0.19.3
github.com/gophercloud/gophercloud v0.7.0
github.com/gophercloud/utils v0.0.0-20200204043447-9864b6f1f12f
github.com/json-iterator/go v1.1.9 // indirect
github.com/onsi/ginkgo v1.16.2
github.com/onsi/gomega v1.11.0
github.com/packethost/packngo v0.0.0-20181217122008-b3b45f1b4979
github.com/prometheus/client_golang v0.9.2
github.com/prometheus/client_golang v1.7.1
github.com/satori/go.uuid v1.2.0 // indirect
github.com/spf13/pflag v1.0.3
golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
github.com/spf13/pflag v1.0.5
golang.org/x/lint v0.0.0-20200302205851-738671d3881b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/sys v0.0.0-20210514084401-e8d321eab015 // indirect
google.golang.org/api v0.4.0
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
google.golang.org/api v0.20.0
k8s.io/api v0.20.6
k8s.io/apiextensions-apiserver v0.20.6
k8s.io/apimachinery v0.20.6
k8s.io/apiserver v0.20.6
k8s.io/client-go v0.20.6
k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
k8s.io/klog v0.4.0
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
k8s.io/utils v0.0.0-20190801114015-581e00157fb1
k8s.io/code-generator v0.20.6
k8s.io/component-base v0.20.6
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // keep this value in sync with k8s.io/apiserver
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
)

replace (
github.com/go-git/go-git/v5 => github.com/go-git/go-git/v5 v5.3.0
github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.8.0
github.com/onsi/gomega => github.com/onsi/gomega v1.5.0
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f // kubernetes-1.16.0
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783 // kubernetes-1.16.0
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655 // kubernetes-1.16.0
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad // kubernetes-1.16.0
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90 // kubernetes-1.16.0
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb // kubernetes-1.16.0
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269 // kubernetes-1.16.0
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
k8s.io/api => k8s.io/api v0.20.6
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.20.6
k8s.io/apimachinery => k8s.io/apimachinery v0.20.6
k8s.io/apiserver => k8s.io/apiserver v0.20.6
k8s.io/client-go => k8s.io/client-go v0.20.6
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.20.6
k8s.io/code-generator => k8s.io/code-generator v0.20.6
)
Loading