Backport latest changes to release-0.2

Gopkg.toml

@@ -50,7 +50,7 @@ required = [
 
 [[constraint]]
   name = "sigs.k8s.io/cluster-api"
-  version = "0.1.0"
+  branch = "release-0.1"
 
 # For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
 [[override]]

Makefile

@@ -120,7 +120,7 @@ verify: ## Runs verification scripts to ensure correct execution
 ## --------------------------------------
 
 .PHONY: manifests
-manifests: cmd/clusterctl/examples/aws/provider-components-base.yaml ## Build example set of manifests from the current source
+manifests: clusterawsadm cmd/clusterctl/examples/aws/provider-components-base.yaml ## Build example set of manifests from the current source
 	./cmd/clusterctl/examples/aws/generate-yaml.sh
 
 .PHONY: cmd/clusterctl/examples/aws/provider-components-base.yaml
@@ -145,10 +145,10 @@ gazelle: ## Run Bazel Gazelle
 generate: ## Generate mocks, CRDs and runs `go generate` through Bazel
 	GOPATH=$(shell go env GOPATH) bazel run //:generate $(BAZEL_ARGS)
 	$(MAKE) dep-ensure
-	bazel build $(BAZEL_ARGS) //pkg/cloud/aws/services/mocks:go_mock_interfaces \
-		//pkg/cloud/aws/services/ec2/mock_ec2iface:go_default_library \
-		//pkg/cloud/aws/services/elb/mock_elbiface:go_default_library
-	cp -Rf bazel-genfiles/pkg/* pkg/
+	bazel build $(BAZEL_ARGS) //pkg/cloud/aws/services/mocks:mocks \
+		//pkg/cloud/aws/services/ec2/mock_ec2iface:mocks \
+		//pkg/cloud/aws/services/elb/mock_elbiface:mocks
+	./hack/copy-bazel-mocks.sh
 	$(MAKE) generate-crds
 
 .PHONY: generate-crds
@@ -211,8 +211,7 @@ release-artifacts: ## Build release artifacts
 ## --------------------------------------
 
 .PHONY: binaries-dev
-binaries-dev: ## Builds and installs all development binaries using go get
-	go get -v ./...
+binaries-dev: generate manager clusterawsadm clusterctl
 
 .PHONY: create-cluster
 create-cluster: binaries-dev ## Create a development Kubernetes cluster on AWS using examples
@@ -224,6 +223,16 @@ create-cluster: binaries-dev ## Create a development Kubernetes cluster on AWS u
 	-p ./cmd/clusterctl/examples/aws/out/provider-components.yaml \
 	-a ./cmd/clusterctl/examples/aws/out/addons.yaml
 
+.PHONY: create-cluster-ha
+create-cluster-ha: binaries-dev ## Create a development Kubernetes cluster on AWS using HA examples
+	clusterctl create cluster -v 4 \
+	--provider aws \
+	--bootstrap-type kind \
+	-m ./cmd/clusterctl/examples/aws/out/machines-ha.yaml \
+	-c ./cmd/clusterctl/examples/aws/out/cluster.yaml \
+	-p ./cmd/clusterctl/examples/aws/out/provider-components.yaml \
+	-a ./cmd/clusterctl/examples/aws/out/addons.yaml
+
 .PHONY: delete-cluster
 delete-cluster: binaries-dev ## Deletes the development Kubernetes Cluster "test1"
 	clusterctl delete cluster -v 4 \

OWNERS_ALIASES

@@ -2,39 +2,28 @@
 
 aliases:
   sig-cluster-lifecycle-leads:
-    - lukemarsden
+    - justinsb
     - luxas
-    - roberthbailey
     - timothysc
   cluster-api-admins:
+    - davidewatson
+    - detiber
     - justinsb
-    - krousey
-    - luxas
-    - roberthbailey
-    - kris-nova
   cluster-api-maintainers:
-    - jessicaochen
-    - k4leung4
-    - karan
-    - kris-nova
-    - krousey
-    - medinatiger
-    - mkjelland
-    - roberthbailey
-    - rsdcastro
-    - spew
+    - detiber
+    - justinsb
+    - vincepri
   sig-aws-leads:
+    - d-nishi
     - justinsb
     - kris-nova
-    - countspongebob
   cluster-api-aws-maintainers:
-    - detiber
     - chuckha
     - davidewatson
-    - d-nishi
+    - detiber
     - enxebre
     - ingvagabund
-    - vincepri
     - randomvariable
+    - vincepri
   cluster-api-aws-reviewers:
-    - ashish-amarnath
+    - ashish-amarnath

README.md

@@ -60,6 +60,19 @@ policy may be made to more closely align with other providers in the Cluster API
 
 ------
 
+## Kubernetes versions with published AMIs
+
+Note: These AMIs are not updated for security fixes and it is recommended to always use the latest patch version for the Kubernetes version you wish to run. For production-like environments, it is highly recommended to build and use your own custom images.
+
+| Kubernetes minor version | Kubernetes full version |
+|-|-|
+| v1.13                    | v1.13.3                 |
+|                          | v1.13.5                 |
+| v1.14                    | v1.14.0                 |
+|                          | v1.14.1                 |
+
+------
+
 ## Documentation
 
 Documentation is in the `/docs` directory, and the [index is here](docs/README.md).

SECURITY_CONTACTS

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

WORKSPACE

@@ -13,12 +13,11 @@
 # limitations under the License.
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
-load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "301c8b39b0808c49f98895faa6aa8c92cbd605ab5ad4b6a3a652da33a1a2ba2e",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.0/rules_go-0.18.0.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(
@@ -30,8 +29,8 @@ http_archive(
 
 http_archive(
     name = "bazel_gazelle",
-    sha256 = "7949fc6cc17b5b191103e97481cf8889217263acf52e00b560683413af204fcb",
-    urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.16.0/bazel-gazelle-0.16.0.tar.gz"],
+    sha256 = "3c681998538231a2d24d0c07ed5a7658cb72bfb5fd4bf9911157c0e9ac6a2687",
+    urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.17.0/bazel-gazelle-0.17.0.tar.gz"],
 )
 
 http_archive(
@@ -41,33 +40,39 @@ http_archive(
     urls = ["https://github.com/kubernetes/repo-infra/archive/df02ded38f9506e5bbcbf21702034b4fef815f2f.tar.gz"],
 )
 
+http_archive(
+    name = "bazel_skylib",
+    sha256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e",
+    type = "tar.gz",
+    url = "https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz",
+)
+
+load("@bazel_skylib//:lib.bzl", "versions")
+
+versions.check(
+    minimum_bazel_version = "0.21.0",
+    maximum_bazel_version = "1.0.0",
+)  # fails if not within range
+
 load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
 
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.11.5",
+    go_version = "1.12.3",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
 
 gazelle_dependencies()
 
-load(
-    "@io_bazel_rules_docker//toolchains/docker:toolchain.bzl",
-    docker_toolchain_configure = "toolchain_configure",
-)
 load(
     "@io_bazel_rules_docker//repositories:repositories.bzl",
     container_repositories = "repositories",
 )
 
 container_repositories()
 
-load(
-    "@io_bazel_rules_docker//container:container.bzl",
-    "container_pull",
-)
 load(
     "@io_bazel_rules_docker//go:image.bzl",
     _go_image_repos = "repositories",
@@ -86,7 +91,7 @@ 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",
 )
 
 go_repository(
@@ -99,7 +104,7 @@ go_repository(
 go_repository(
     name = "io_k8s_sigs_kind",
     importpath = "sigs.k8s.io/kind",
-    tag = "0.1.0",
+    tag = "0.2.1",
 )
 
 go_repository(
@@ -111,11 +116,17 @@ go_repository(
 go_repository(
     name = "io_k8s_kubernetes",
     importpath = "k8s.io/kubernetes",
-    tag = "v1.13.4",
+    tag = "v1.13.5",
 )
 
 go_repository(
     name = "com_github_a8m_envsubst",
     importpath = "github.com/a8m/envsubst",
     tag = "v1.1.0",
 )
+
+go_repository(
+    name = "bazel_gomock",
+    commit = "08cc809a2f68f6d810c2013987970a9a5c1181b4",
+    importpath = "github.com/jmhodges/bazel_gomock",
+)