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

Deprecate in tree #653

Closed
wants to merge 3 commits into from
Closed

Deprecate in tree #653

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
a21923a
dead code deprecated
AxiomSamarth Nov 4, 2021
8ef0543
removed cloud specific driver code and updated go.mod
AxiomSamarth Nov 23, 2021
20720f6
vendored files
AxiomSamarth Nov 23, 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
  •  
  •  
  •  
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ IMAGE_REPOSITORY := eu.gcr.io/gardener-project/gardener/machine-controller-man
IMAGE_TAG := $(shell cat VERSION)
COVERPROFILE := test/output/coverprofile.out

CONTROL_NAMESPACE := default
CONTROL_KUBECONFIG := dev/target-kubeconfig.yaml
TARGET_KUBECONFIG := dev/target-kubeconfig.yaml
CONTROL_NAMESPACE := default
CONTROL_KUBECONFIG := dev/control-kubeconfig.yaml
TARGET_KUBECONFIG := dev/target-kubeconfig.yaml

LEADER_ELECT := "true"
MACHINE_SAFETY_OVERSHOOTING_PERIOD:=1m
Expand All @@ -45,7 +45,6 @@ start:
--safety-up=2 \
--safety-down=1 \
--machine-creation-timeout=20m \
--machine-drain-timeout=5m \
--machine-pv-detach-timeout=2m \
--machine-health-timeout=10m \
--machine-safety-apiserver-statuscheck-timeout=30s \
Expand Down
129 changes: 0 additions & 129 deletions cmd/machine-controller-manager-cli/main.go
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions cmd/machine-controller-manager/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ import (

"github.com/gardener/machine-controller-manager/pkg/util/client/leaderelectionconfig"

"github.com/gardener/machine-controller-manager/pkg/controller"
// add the machine feature gates
_ "github.com/gardener/machine-controller-manager/pkg/features"
)
Expand Down Expand Up @@ -68,8 +67,6 @@ func NewMCMServer() *MCMServer {
SafetyDown: 1,
MachineCreationTimeout: metav1.Duration{Duration: 20 * time.Minute},
MachineHealthTimeout: metav1.Duration{Duration: 10 * time.Minute},
MachineDrainTimeout: metav1.Duration{Duration: controller.DefaultMachineDrainTimeout},
MaxEvictRetries: controller.DefaultMaxEvictRetries,
PvDetachTimeout: metav1.Duration{Duration: 2 * time.Minute},
MachineSafetyOrphanVMsPeriod: metav1.Duration{Duration: 30 * time.Minute},
MachineSafetyOvershootingPeriod: metav1.Duration{Duration: 1 * time.Minute},
Expand Down Expand Up @@ -104,8 +101,6 @@ func (s *MCMServer) AddFlags(fs *pflag.FlagSet) {

fs.DurationVar(&s.SafetyOptions.MachineCreationTimeout.Duration, "machine-creation-timeout", s.SafetyOptions.MachineCreationTimeout.Duration, "Timeout (in duration) used while joining (during creation) of machine before it is declared as failed.")
fs.DurationVar(&s.SafetyOptions.MachineHealthTimeout.Duration, "machine-health-timeout", s.SafetyOptions.MachineHealthTimeout.Duration, "Timeout (in duration) used while re-joining (in case of temporary health issues) of machine before it is declared as failed.")
fs.DurationVar(&s.SafetyOptions.MachineDrainTimeout.Duration, "machine-drain-timeout", controller.DefaultMachineDrainTimeout, "Timeout (in duration) used while draining of machine before deletion, beyond which MCM forcefully deletes machine.")
fs.Int32Var(&s.SafetyOptions.MaxEvictRetries, "machine-max-evict-retries", controller.DefaultMaxEvictRetries, "Maximum number of times evicts would be attempted on a pod before it is forcibly deleted during draining of a machine.")
fs.DurationVar(&s.SafetyOptions.PvDetachTimeout.Duration, "machine-pv-detach-timeout", s.SafetyOptions.PvDetachTimeout.Duration, "Timeout (in duration) used while waiting for detach of PV while evicting/deleting pods")
fs.DurationVar(&s.SafetyOptions.MachineSafetyAPIServerStatusCheckTimeout.Duration, "machine-safety-apiserver-statuscheck-timeout", s.SafetyOptions.MachineSafetyAPIServerStatusCheckTimeout.Duration, "Timeout (in duration) for which the APIServer can be down before declare the machine controller frozen by safety controller")

Expand Down
23 changes: 0 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,17 @@ module github.com/gardener/machine-controller-manager
go 1.16

require (
github.com/Azure/azure-sdk-for-go v42.2.0+incompatible
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.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/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 v1.7.1
github.com/satori/go.uuid v1.2.0 // indirect
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.20.0
k8s.io/api v0.20.6
k8s.io/apiextensions-apiserver v0.20.6
k8s.io/apimachinery v0.20.6
Expand All @@ -39,13 +26,3 @@ require (
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 (
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