Backports for release 0.1 (#924)

* 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]>

Author: detiber

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.11.6 as builder
+FROM golang:1.12.3 as builder
 
 # Copy in the go src
 WORKDIR $GOPATH/src/sigs.k8s.io/cluster-api

Gopkg.lock

@@ -111,7 +111,7 @@ clean: ## Remove all generated files
 docker-build: generate fmt vet manifests ## Build the docker image for controller-manager
 	docker build . -t ${CONTROLLER_IMG}
 	@echo "updating kustomize image patch file for manager resource"
-	sed -i.tmp -e 's@image: .*@image: '"${CONTROLLER_IMG}"'@' ./config/default/manager_image_patch.yaml
+	hack/sed.sh -i.tmp -e 's@image: .*@image: '"${CONTROLLER_IMG}"'@' ./config/default/manager_image_patch.yaml
 
 .PHONY: docker-push
 docker-push: docker-build ## Push the docker image
@@ -121,7 +121,7 @@ docker-push: docker-build ## Push the docker image
 docker-build-ci: generate fmt vet manifests ## Build the docker image for example provider
 	docker build . -f ./pkg/provider/example/container/Dockerfile -t ${EXAMPLE_PROVIDER_IMG}
 	@echo "updating kustomize image patch file for ci"
-	sed -i.tmp -e 's@image: .*@image: '"${EXAMPLE_PROVIDER_IMG}"'@' ./config/ci/manager_image_patch.yaml
+	hack/sed.sh -i.tmp -e 's@image: .*@image: '"${EXAMPLE_PROVIDER_IMG}"'@' ./config/ci/manager_image_patch.yaml
 
 .PHONY: docker-push-ci
 docker-push-ci: docker-build-ci  ## Build the docker image for ci

Makefile

@@ -3,16 +3,13 @@
 aliases:
   sig-cluster-lifecycle-leads:
     - luxas
-    - roberthbailey
+    - justinsb
     - timothysc
   cluster-api-admins:
     - justinsb
-    - kris-nova
-    - krousey
-    - luxas
-    - roberthbailey
+    - detiber
+    - davidewatson
   cluster-api-maintainers:
     - justinsb
-    - krousey
-    - roberthbailey
+    - detiber
     - vincepri

OWNERS_ALIASES

@@ -10,7 +10,7 @@
 # DO NOT REPORT SECURITY VULNERABILITIES DIRECTLY TO THESE NAMES, FOLLOW THE
 # INSTRUCTIONS AT https://kubernetes.io/security/
 
-lukemarsden
+detiber
+justinsb
 luxas
-roberthbailey
 timothysc

SECURITY_CONTACTS

@@ -3,8 +3,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "77dfd303492f2634de7a660445ee2d3de2960cbd52f97d8c0dffa9362d3ddef9",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.1/rules_go-0.18.1.tar.gz",
+    sha256 = "86ae934bd4c43b99893fc64be9d9fc684b81461581df7ea8fc291c816f5ee8c5",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.3/rules_go-0.18.3.tar.gz",
 )
 
 http_archive(
@@ -18,7 +18,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.11.6",
+    go_version = "1.12.3",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
@@ -27,13 +27,13 @@ gazelle_dependencies()
 
 go_repository(
     name = "io_k8s_sigs_kustomize",
-    commit = "58492e2d83c59ed63881311f46ad6251f77dabc3",
     importpath = "sigs.k8s.io/kustomize",
+    tag = "v1.0.11",
 )
 
 go_repository(
     name = "com_github_golangci_golangci-lint",
     build_file_generation = "on",
     importpath = "github.com/golangci/golangci-lint",
-    tag = "v1.15.0",
+    tag = "v1.16.0",
 )

WORKSPACE

@@ -50,6 +50,9 @@ If you are using minikube, to choose a specific minikube driver, please use the
 
 Additional advanced flags can be found via help.
 
+Also, some environment variables are supported:
+`CLUSTER_API_MACHINE_READY_TIMEOUT`: set this value to adjust the timeout value in minutes for a machine to become ready, The default timeout is currently 30 minutes, `export CLUSTER_API_MACHINE_READY_TIMEOUT=45` will extend the timeout value to 45 minutes.
+
 ```shell
 ./clusterctl create cluster --help
 ```

cmd/clusterctl/README.md

@@ -61,7 +61,7 @@ func WithOptionsAndKubeConfigPath(options []string, kubeconfigpath string) *Mini
 		}
 		return true
 	}() {
-		options = append(options, fmt.Sprintf("p=%s", minikubeClusterName))
+		options = append(options, fmt.Sprintf("profile=%s", minikubeClusterName))
 	}
 
 	return &Minikube{

cmd/clusterctl/clusterdeployer/bootstrap/minikube/minikube.go

@@ -55,6 +55,10 @@ const (
 	machineClusterLabelName     = "cluster.k8s.io/cluster-name"
 )
 
+const (
+	TimeoutMachineReady = "CLUSTER_API_MACHINE_READY_TIMEOUT"
+)
+
 // Provides interaction with a cluster
 type Client interface {
 	Apply(string) error
@@ -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
+	if p := os.Getenv(TimeoutMachineReady); p != "" {
+		t, err := strconv.Atoi(p)
+		if err == nil {
+			// only valid value will be used
+			timeout = time.Duration(t) * time.Minute
+			klog.V(4).Info("Setting wait for machine timeout value to ", timeout)
+		}
+	}
+
+	err := util.PollImmediate(retryIntervalResourceReady, timeout, func() (bool, error) {
 		klog.V(2).Infof("Waiting for Machine %v to become ready...", machine.Name)
 		m, err := cs.ClusterV1alpha1().Machines(machine.Namespace).Get(machine.Name, metav1.GetOptions{})
 		if err != nil {

cmd/clusterctl/clusterdeployer/clusterclient/clusterclient.go

@@ -43,6 +43,7 @@ go_library(
         "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
+        "//vendor/k8s.io/component-base/cli/flag:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
         "//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
         "//vendor/sigs.k8s.io/controller-runtime/pkg/client/config:go_default_library",