Add timeout param for create machine #865

jichenjc · 2019-03-31T07:31:57Z

Add timeout for create machine param, so that we won't have a
fixed time for timeout, user can give param on timeout

What this PR does / why we need it:

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

gyliu513 · 2019-04-01T08:25:40Z

@jichenjc can you please update your commit message by adding following:

Fixes #860

This can make sure your PR can be linked to #860 and the issue will be automatically closed once the PR got merged.

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

gyliu513 · 2019-04-03T02:18:26Z

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

@@ -968,7 +972,17 @@ func waitForClusterResourceReady(cs clientset.Interface) error {
 }

 func waitForMachineReady(cs clientset.Interface, machine *clusterv1.Machine) error {
-	err := util.PollImmediate(retryIntervalResourceReady, timeoutMachineReady, func() (bool, error) {
+	timeout := timeoutMachineReady


After second think, not sure if we can enhance the clusterctl create by adding a new flag to specify the timeoutMachineReady?

Let's get some comments from @vincepri @detiber .

In general, I would definitely prefer a flag to using environment variables, but if we extend this to other timeout values as well, then I would worry about how many flags would be needed to support the individual timeouts.

Thanks @detiber OK, let's stick on the environment variable.

jichenjc · 2019-04-03T03:18:32Z

I actually tried, it need to be transferred from several layers and this env is more convenient.. I agree if would be better if a flag is given but this means we may a lot of flags (see there are several timeout settings)

gyliu513 · 2019-04-03T03:22:13Z

/cc @vincepri @detiber

detiber

minor nits around some of the documentation, otherwise lgtm.

cmd/clusterctl/README.md

detiber · 2019-04-03T13:51:15Z

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

@@ -968,7 +972,17 @@ func waitForClusterResourceReady(cs clientset.Interface) error {
 }

 func waitForMachineReady(cs clientset.Interface, machine *clusterv1.Machine) error {
-	err := util.PollImmediate(retryIntervalResourceReady, timeoutMachineReady, func() (bool, error) {
+	timeout := timeoutMachineReady


In general, I would definitely prefer a flag to using environment variables, but if we extend this to other timeout values as well, then I would worry about how many flags would be needed to support the individual timeouts.

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

add an environment to make timeout configurable for timeoutMachineReady

gyliu513 · 2019-04-09T09:08:55Z

/lgtm

bradtopol · 2019-04-09T12:38:02Z

/lgtm Great job!

detiber · 2019-04-09T14:02:17Z

/assign @vincepri

vincepri

/approve

k8s-ci-robot · 2019-04-09T20:11:21Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jichenjc, vincepri

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

add an environment to make timeout configurable for timeoutMachineReady

* Update CRDs (#863) Generated with `make generate` * fix various shell bugs (#868) * fix errors in scripts/ci-build.gitsh * fix errors in scripts/ci-integration.sh * fix errors in scripts/ci-is-vendor-in-sync.sh * fix errors in scripts/ci-make.sh * fix errors in scripts/ci-test.sh * removed unused variables from scripts/fetch_ext_bins.sh * fix errors in hack/update-bazel.sh * fix errors in hack/verify_clientset.sh * use gnu sed on all platforms (#867) * Fix error message in getCluster (#871) Previously it was showing 'Machine foo in namespace "cluster.k8s.io/cluster-name" doesn't specify "k8s-machine-api" label, assuming nil cluster' * minikube: use --profile instead of --p (#875) It was reported that "minikube start" fails: minikube start --bootstrapper=kubeadm --p=clusterapi Error: unknown flag: --p From "minikube start --help": -p, --profile string Use --profile in minikube.go as --p does not work. The alternative is -p. * nit: fix log to replace Creating with Preparing (#872) saw this log with following flag --bootstrap-cluster-kubeconfig /root/.kube/config I0403 17:32:28.339021 31615 createbootstrapcluster.go:27] Creating bootstrap cluster actually we are reusing ,not creating * Record machine sync error event (#880) * make clusterapi wait timeout configurable (#865) add an environment to make timeout configurable for timeoutMachineReady * Update klog to 0.3.0 release (#890) Signed-off-by: Vince Prignano <[email protected]> * Add missing namespace to Get function (#896) * Add NodeName to Machine's additionalPrinterColumns (#895) Because it is useful to cross-reference between Machines and Nodes. Set priority to >0 so that node names will only be displayed in `-o wide` because the names are often quite long. * additionalPrinterColumns for Machine, added correctly. (#897) Co-authored-by: Danny Berger <[email protected]> * Normalize clusterctl options to underscores (#899) Matches current conventions and implementation of kubectl. This change does not include warning messages when using the previous, underscore option names, but it does recognize those names. Co-authored-by: Leah Hanson <[email protected]> * Update manager-role ClusterRole (#901) * Update Go 1.12 (#898) * Update Go 1.12 Signed-off-by: Vince Prignano <[email protected]> * update Signed-off-by: Vince Prignano <[email protected]> * Update OWNERS_ALIASES and SECURITY_CONTACTS (#884) * Update OWNERS_ALIASES and SECURITY_CONTACTS * Add davidewatson to cluster-api-admins * Clarify log message for machine-controller isDeleteAllowed (#905) Users have noted that this log message is confusing and does not lead to a clear path forward when deleting this machine. This commit makes it clear that the machine will not be deleted. * Clarify MachineDeployment watchers' comments (#887) Signed-off-by: Vince Prignano <[email protected]> * Simplify util.ParseMachinesYaml (#909) Signed-off-by: Vince Prignano <[email protected]> * Add support for passing namespace cmdline flag to the manager (#914) * Bump kubectl version to v1.13.2 in ci (#923) kubectl v1.10.2 does not compatible with cluster v1.14.x anymore Signed-off-by: Hui Luo <[email protected]> * Add /status to MachineSet and MachineDeployment kubebuilder directives (#922) Signed-off-by: Vince Prignano <[email protected]>

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 31, 2019

k8s-ci-robot requested review from justinsb and vincepri March 31, 2019 07:32

jichenjc force-pushed the add_time_out_param branch 3 times, most recently from 0977b70 to f439625 Compare April 1, 2019 07:09

k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 1, 2019

gyliu513 reviewed Apr 1, 2019

View reviewed changes

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go Show resolved Hide resolved

jichenjc force-pushed the add_time_out_param branch from f439625 to 78cb1d1 Compare April 1, 2019 09:07

gyliu513 reviewed Apr 3, 2019

View reviewed changes

k8s-ci-robot requested a review from detiber April 3, 2019 03:22

detiber reviewed Apr 3, 2019

View reviewed changes

bradtopol reviewed Apr 9, 2019

View reviewed changes

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go Outdated Show resolved Hide resolved

jichenjc force-pushed the add_time_out_param branch from 78cb1d1 to 8a9faa7 Compare April 9, 2019 06:35

make clusterapi wait timeout configurable

6383e3f

add an environment to make timeout configurable for timeoutMachineReady

jichenjc force-pushed the add_time_out_param branch from 8a9faa7 to 6383e3f Compare April 9, 2019 08:45

k8s-ci-robot assigned gyliu513 Apr 9, 2019

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 9, 2019

k8s-ci-robot assigned vincepri Apr 9, 2019

vincepri approved these changes Apr 9, 2019

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 9, 2019

k8s-ci-robot merged commit 3534230 into kubernetes-sigs:master Apr 9, 2019

jichenjc mentioned this pull request Apr 11, 2019

Make timeoutMachineReady configurable #860

Closed

detiber pushed a commit to detiber/cluster-api that referenced this pull request May 2, 2019

make clusterapi wait timeout configurable (kubernetes-sigs#865)

4d88293

add an environment to make timeout configurable for timeoutMachineReady

detiber mentioned this pull request Jun 14, 2019

Add CLUSTER_API_KUBECONFIG_READY_TIMEOUT to clusterctl #1026

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add timeout param for create machine #865

Add timeout param for create machine #865

jichenjc commented Mar 31, 2019

gyliu513 commented Apr 1, 2019

gyliu513 Apr 3, 2019

detiber Apr 3, 2019

gyliu513 Apr 3, 2019

jichenjc commented Apr 3, 2019

gyliu513 commented Apr 3, 2019

detiber left a comment

detiber Apr 3, 2019

gyliu513 commented Apr 9, 2019

bradtopol commented Apr 9, 2019

detiber commented Apr 9, 2019

vincepri left a comment

k8s-ci-robot commented Apr 9, 2019

Add timeout param for create machine #865

Add timeout param for create machine #865

Conversation

jichenjc commented Mar 31, 2019

gyliu513 commented Apr 1, 2019

gyliu513 Apr 3, 2019

Choose a reason for hiding this comment

detiber Apr 3, 2019

Choose a reason for hiding this comment

gyliu513 Apr 3, 2019

Choose a reason for hiding this comment

jichenjc commented Apr 3, 2019

gyliu513 commented Apr 3, 2019

detiber left a comment

Choose a reason for hiding this comment

detiber Apr 3, 2019

Choose a reason for hiding this comment

gyliu513 commented Apr 9, 2019

bradtopol commented Apr 9, 2019

detiber commented Apr 9, 2019

vincepri left a comment

Choose a reason for hiding this comment

k8s-ci-robot commented Apr 9, 2019