0.1 backports for noderef

.gitignore

@@ -38,7 +38,7 @@ docs/book/node_modules/
 *.tmp
 
 # rbac and manager config for example provider
-config/ci/rbac/rbac_role_binding.yaml
-config/ci/rbac/rbac_role.yaml
+config/ci/rbac/manager_role_binding.yaml
+config/ci/rbac/manager_role.yaml
 config/ci/manager/manager.yaml
 

Gopkg.toml

@@ -23,15 +23,19 @@ required = [
 # STANZAS BELOW ARE GENERATED AND MAY BE WRITTEN - DO NOT MODIFY BELOW THIS LINE.
 
 [[constraint]]
-  name="sigs.k8s.io/controller-runtime"
-  version="v0.1.11"
+  name = "sigs.k8s.io/controller-runtime"
+  version = "v0.1.12"
 
 [[constraint]]
-  name="sigs.k8s.io/controller-tools"
-  version="v0.1.9"
+  name = "sigs.k8s.io/controller-tools"
+  version = "v0.1.11"
+
+[[constraint]]
+  name = "k8s.io/code-generator"
+  branch = "release-1.13"
 
 # For dependency below: Refer to issue https://github.com/golang/dep/issues/1799
 [[override]]
 name = "gopkg.in/fsnotify.v1"
 source = "https://github.com/fsnotify/fsnotify.git"
-version="v1.4.7"
+version = "v1.4.7"

Makefile

@@ -63,7 +63,7 @@ deploy: manifests ## Deploy controller in the configured Kubernetes cluster in ~
 .PHONY: manifests
 manifests: ## Generate manifests e.g. CRD, RBAC etc.
 	go run vendor/sigs.k8s.io/controller-tools/cmd/controller-gen/main.go all
-	cp -f ./config/rbac/rbac*.yaml ./config/ci/rbac/
+	cp -f ./config/rbac/manager*.yaml ./config/ci/rbac/
 	cp -f ./config/manager/manager*.yaml ./config/ci/manager/
 
 .PHONY: fmt
@@ -92,15 +92,15 @@ clientset: ## Generate a typed clientset
 	cd ./vendor/k8s.io/code-generator/cmd && go install ./client-gen ./lister-gen ./informer-gen
 	$$GOPATH/bin/client-gen --clientset-name clientset --input-base sigs.k8s.io/cluster-api/pkg/apis \
 		--input cluster/v1alpha1 --output-package sigs.k8s.io/cluster-api/pkg/client/clientset_generated \
-		--go-header-file=./hack/boilerplate.go.txt
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	$$GOPATH/bin/lister-gen --input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1 \
 		--output-package sigs.k8s.io/cluster-api/pkg/client/listers_generated \
-		--go-header-file=./hack/boilerplate.go.txt
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	$$GOPATH/bin/informer-gen --input-dirs sigs.k8s.io/cluster-api/pkg/apis/cluster/v1alpha1 \
 		--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.go.txt
+		--go-header-file=./hack/boilerplate/boilerplate.generatego.txt
 	$(MAKE) gazelle
 
 .PHONY: clean
@@ -129,6 +129,6 @@ docker-push-ci: docker-build-ci  ## Build the docker image for ci
 
 .PHONY: verify
 verify:
-	./hack/verify_boilerplate.py
+	./hack/verify-boilerplate.sh
 	./hack/verify_clientset.sh
 	./hack/verify-bazel.sh

WORKSPACE

@@ -1,10 +1,19 @@
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
-http_archive(
+# Use the git repository for bazel rules until a released version contains https://github.com/bazelbuild/rules_go/pull/2090
+# http_archive(
+#     name = "io_bazel_rules_go",
+#     urls = [
+#         "https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/0.18.6/rules_go-0.18.6.tar.gz",
+#         "https://github.com/bazelbuild/rules_go/releases/download/0.18.6/rules_go-0.18.6.tar.gz",
+#     ],
+#     sha256 = "f04d2373bcaf8aa09bccb08a98a57e721306c8f6043a2a0ee610fd6853dcde3d",
+# )
+git_repository(
     name = "io_bazel_rules_go",
-    sha256 = "3743a20704efc319070957c45e24ae4626a05ba4b1d6a8961e87520296f1b676",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.4/rules_go-0.18.4.tar.gz",
+    remote = "https://github.com/bazelbuild/rules_go.git",
+    commit = "f2373c9fbd09586d8e591dda3c43d66445b2d7ca",
 )
 
 http_archive(
@@ -13,12 +22,26 @@ http_archive(
     urls = ["https://github.com/bazelbuild/bazel-gazelle/releases/download/0.17.0/bazel-gazelle-0.17.0.tar.gz"],
 )
 
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
+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:versions.bzl", "versions")
+
+versions.check(
+    minimum_bazel_version = "0.23.0",
+    maximum_bazel_version = "1.0.0",
+)  # fails if not within range
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")
 
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.12.5",
+    go_version = "1.12.6",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
@@ -35,5 +58,5 @@ go_repository(
     name = "com_github_golangci_golangci-lint",
     build_file_generation = "on",
     importpath = "github.com/golangci/golangci-lint",
-    tag = "v1.16.0",
+    tag = "v1.17.1",
 )

build/run_in_workspace_with_goroot.bzl

@@ -51,18 +51,15 @@ _workspace_binary_script = rule(
     attrs = {
         "cmd": attr.label(
             mandatory = True,
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
         ),
         "root_file": attr.label(
             mandatory = True,
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
         ),
         "go_bin": attr.label(
             mandatory = True,
-            allow_files = True,
-            single_file = True,
+            allow_single_file = True,
         ),
     },
     executable = True,