Skip to content

Commit

Permalink
adapt to k8s v1.20.5, introduce contexts & adapt IT suite to v1.20.5
Browse files Browse the repository at this point in the history
  • Loading branch information
AxiomSamarth committed Jul 21, 2021
1 parent 1814324 commit 44f2bfb
Show file tree
Hide file tree
Showing 207 changed files with 3,105 additions and 2,158 deletions.
2 changes: 1 addition & 1 deletion .ci/integration-tests
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
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
2 changes: 1 addition & 1 deletion pkg/apis/machine/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/machine/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/machine/v1alpha1/zz_generated.defaults.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/apis/machine/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/internalversion/clientset.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset/internalversion/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset/internalversion/fake/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions pkg/client/clientset/internalversion/fake/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset/internalversion/scheme/doc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/client/clientset/internalversion/scheme/register.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 44f2bfb

Please sign in to comment.