Merge branch 'master' into setup-doctoc

Author: nobody4t

.gitignore

@@ -32,6 +32,7 @@ minikube.kubeconfig
 
 # GitBook - do not check in node_modules for a specific arch and os.
 docs/book/node_modules/
+docs/book/_book/
 
 # Common editor / temporary files
 *~
@@ -42,3 +43,6 @@ config/ci/rbac/role_binding.yaml
 config/ci/rbac/role.yaml
 config/ci/manager/manager.yaml
 config/crds-v1alpha1
+
+# Sample config files auto-generated by kubebuilder
+config/samples

.golangci.yml

@@ -21,3 +21,6 @@ linters:
 issue:
   max-same-issues: 0
   max-per-linter: 0
+run:
+  skip-files:
+    - ".*\\.deepcopy\\.go$"

Makefile

@@ -32,6 +32,7 @@ TAG ?= dev
 
 ARCH?=amd64
 ALL_ARCH = amd64 arm arm64 ppc64le s390x
+GOOS?=linux
 
 all: test manager clusterctl
 
@@ -58,13 +59,20 @@ test-go: ## Run tests
 manager: lint-full ## Build manager binary
 	go build -o bin/manager sigs.k8s.io/cluster-api/cmd/manager
 
+.PHONY: docker-build-manager
+docker-build-manager: lint-full ## Build manager binary in docker
+	docker run --rm \
+	-v "${PWD}:/go/src/sigs.k8s.io/cluster-api" \
+	-v "${PWD}/bin:/go/bin" \
+	-w "/go/src/sigs.k8s.io/cluster-api" \
+	-e CGO_ENABLED=0 -e GOOS=${GOOS} -e GOARCH=${ARCH} -e GO111MODULE=on -e GOFLAGS="-mod=vendor" \
+	golang:1.12.6 \
+	go build -a -ldflags '-extldflags "-static"' -o /go/bin/manager sigs.k8s.io/cluster-api/cmd/manager
+
 .PHONY: clusterctl
 clusterctl: lint-full ## Build clusterctl binary
 	go build -o bin/clusterctl sigs.k8s.io/cluster-api/cmd/clusterctl
 
-bin/%-gen: ./vendor/k8s.io/code-generator/cmd/%-gen ## Build code-generator binaries
-	go build -o $@ ./$<
-
 .PHONY: run
 run: lint ## Run against the configured Kubernetes cluster in ~/.kube/config
 	go run ./cmd/manager/main.go
@@ -87,36 +95,14 @@ lint-full: ## Run slower linters to detect possible issues
 .PHONY: generate
 generate: ## Generate code
 	$(MAKE) generate-manifests
-	$(MAKE) generate-go
+	$(MAKE) generate-deepcopy
 	$(MAKE) gazelle
 
-.PHONY: generate-full
-generate-full: vendor ## Generate code
-	$(MAKE) generate-clientset
-	$(MAKE) generate
-
-.PHONY: generate-go
-generate-go: ## Runs go generate
-	go generate ./pkg/... ./cmd/...
-
-.PHONY: generate-clientset
-generate-clientset: clean-clientset bin/client-gen bin/lister-gen bin/informer-gen ## Generate a typed clientset
-	bin/client-gen \
-		--clientset-name clientset \
-		--input-base sigs.k8s.io/cluster-api/pkg/apis \
-		--input deprecated/v1alpha1,cluster/v1alpha2 \
-		--output-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-	bin/lister-gen \
-		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
-		--output-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
-	bin/informer-gen \
-		--input-dirs sigs.k8s.io/cluster-api/pkg/apis/deprecated/v1alpha1,sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha2 \
-		--versioned-clientset-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset \
-		--listers-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
-		--output-package sigs.k8s.io/cluster-api/pkg/client/informers_generated \
-		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
+.PHONY: generate-deepcopy
+generate-deepcopy: ## Runs controller-gen to generate deepcopy files
+	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go \
+	object:headerFile=./hack/boilerplate/boilerplate.generatego.txt \
+	paths=./pkg/...
 
 .PHONY: generate-manifests
 generate-manifests: ## Generate manifests e.g. CRD, RBAC etc.
@@ -194,6 +180,7 @@ docker-push-manifest: ## Push the fat manifest docker image. TODO: Update bazel
 clean: ## Remove all generated files
 	$(MAKE) clean-bazel
 	$(MAKE) clean-bin
+	$(MAKE) clean-book
 
 .PHONY: clean-bazel
 clean-bazel: ## Remove all generated bazel symlinks

PROJECT

@@ -1,3 +1,3 @@
 version: "1"
-domain: sigs.k8s.io
+domain: x-k8s.io
 repo: sigs.k8s.io/cluster-api

README.md

@@ -82,6 +82,7 @@ are also sponsored by SIG-cluster-lifecycle:
   * GCP, https://github.com/kubernetes-sigs/cluster-api-provider-gcp
   * IBM Cloud, https://github.com/kubernetes-sigs/cluster-api-provider-ibmcloud
   * OpenStack, https://github.com/kubernetes-sigs/cluster-api-provider-openstack
+  * Packet, https://github.com/packethost/cluster-api-provider-packet
   * Talos, https://github.com/talos-systems/cluster-api-provider-talos
   * Tencent Cloud, https://github.com/TencentCloud/cluster-api-provider-tencent
   * vSphere, https://github.com/kubernetes-sigs/cluster-api-provider-vsphere

cmd/clusterctl/BUILD.bazel

@@ -5,7 +5,11 @@ go_library(
     srcs = ["main.go"],
     importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl",
     visibility = ["//visibility:private"],
-    deps = ["//cmd/clusterctl/cmd:go_default_library"],
+    deps = [
+        "//cmd/clusterctl/cmd:go_default_library",
+        "//pkg/apis:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
+    ],
 )
 
 go_binary(

cmd/clusterctl/clientcmd/BUILD.bazel

@@ -6,10 +6,10 @@ go_library(
     importpath = "sigs.k8s.io/cluster-api/cmd/clusterctl/clientcmd",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/client/clientset_generated/clientset:go_default_library",
         "//vendor/k8s.io/client-go/kubernetes:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd/api:go_default_library",
+        "//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
     ],
 )

cmd/clusterctl/clientcmd/configutil.go

@@ -23,17 +23,19 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
-	"sigs.k8s.io/cluster-api/pkg/client/clientset_generated/clientset"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // This is a convenience method to prevent the need of importing both this version of clientcmd and the client-go version
 func NewConfigOverrides() clientcmd.ConfigOverrides {
 	return clientcmd.ConfigOverrides{}
 }
 
-// NewCoreClientSetForDefaultSearchPath creates a core kubernetes clientset. If the kubeconfigPath is specified then the configuration is loaded from that path.
-// Otherwise the default kubeconfig search path is used.
-// The overrides parameter is used to select a specific context of the config, for example, select the context with a given cluster name or namespace.
+// NewCoreClientSetForDefaultSearchPath creates a core kubernetes clientset.
+// If the kubeconfigPath is specified then the configuration is loaded from that path,
+// otherwise the default kubeconfig search path is used.
+// The overrides parameter is used to select a specific context of the config, for example,
+// select the context with a given cluster name or namespace.
 func NewCoreClientSetForDefaultSearchPath(kubeconfigPath string, overrides clientcmd.ConfigOverrides) (*kubernetes.Clientset, error) {
 	config, err := newRestConfigForDefaultSearchPath(kubeconfigPath, overrides)
 	if err != nil {
@@ -42,19 +44,23 @@ func NewCoreClientSetForDefaultSearchPath(kubeconfigPath string, overrides clien
 	return kubernetes.NewForConfig(config)
 }
 
-// NewClusterAPIClientForDefaultSearchPath creates a Cluster API clientset. If the kubeconfigPath is specified then the configuration is loaded from that path.
-// Otherwise the default kubeconfig search path is used.
-// The overrides parameter is used to select a specific context of the config, for example, select the context with a given cluster name or namespace.
-func NewClusterAPIClientForDefaultSearchPath(kubeconfigPath string, overrides clientcmd.ConfigOverrides) (*clientset.Clientset, error) {
+// NewControllerRuntimeClient creates a controller-runtime Client.
+// If the kubeconfigPath is specified then the configuration is loaded from that path,
+// otherwise the default kubeconfig search path is used.
+// The overrides parameter is used to select a specific context of the config, for example,
+// select the context with a given cluster name or namespace.
+func NewControllerRuntimeClient(kubeconfigPath string, overrides clientcmd.ConfigOverrides) (client.Client, error) {
 	config, err := newRestConfigForDefaultSearchPath(kubeconfigPath, overrides)
 	if err != nil {
 		return nil, err
 	}
-	return clientset.NewForConfig(config)
+
+	return client.New(config, client.Options{})
 }
 
 // newRestConfig creates a rest.Config for the given apiConfig
-// The overrides parameter is used to select a specific context of the config, for example, select the context with a given cluster name or namespace.
+// The overrides parameter is used to select a specific context of the config, for example,
+// select the context with a given cluster name or namespace.
 func newRestConfig(apiConfig *api.Config, overrides clientcmd.ConfigOverrides) (*rest.Config, error) {
 	return clientcmd.NewDefaultClientConfig(*apiConfig, &overrides).ClientConfig()
 }

cmd/clusterctl/clusterdeployer/clusterclient/BUILD.bazel

@@ -11,7 +11,6 @@ go_library(
     deps = [
         "//cmd/clusterctl/clientcmd:go_default_library",
         "//pkg/apis/cluster/v1alpha2:go_default_library",
-        "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/util:go_default_library",
         "//vendor/github.com/pkg/errors:go_default_library",
         "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
@@ -22,6 +21,7 @@ go_library(
         "//vendor/k8s.io/client-go/plugin/pkg/client/auth:go_default_library",
         "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
+        "//vendor/sigs.k8s.io/controller-runtime/pkg/client:go_default_library",
     ],
 )