Merge pull request #256 from vincepri/add-release-notes

k8s-ci-robot · web-flow · commit e09e034494f7 · 2019-09-27T08:33:38.000-07:00
🏃Add release notes utility / update controller-tools &amp; CRDs
diff --git a/Makefile b/Makefile
@@ -51,6 +51,8 @@ CONTROLLER_GEN_BIN := bin/controller-gen
 CONTROLLER_GEN := $(TOOLS_DIR)/$(CONTROLLER_GEN_BIN)
 GOLANGCI_LINT_BIN := bin/golangci-lint
 GOLANGCI_LINT := $(TOOLS_DIR)/$(GOLANGCI_LINT_BIN)
+RELEASE_NOTES_BIN := bin/release-notes
+RELEASE_NOTES := $(TOOLS_DIR)/$(RELEASE_NOTES_BIN)
 
 # Allow overriding manifest generation destination directory
 MANIFEST_ROOT ?= "config"
@@ -175,6 +177,9 @@ RELEASE_DIR := out
 $(RELEASE_DIR):
 	mkdir -p $(RELEASE_DIR)/
 
+$(RELEASE_NOTES) : $(TOOLS_DIR)/go.mod
+	cd $(TOOLS_DIR) && go build -o $(RELEASE_NOTES_BIN) -tags tools sigs.k8s.io/cluster-api/hack/tools/release
+
 .PHONY: release
 release: clean-release  ## Builds and push container images using the latest git tag for the commit.
 	@if [ -z "${RELEASE_TAG}" ]; then echo "RELEASE_TAG is not set"; exit 1; fi
@@ -194,6 +199,9 @@ release-manifests: $(RELEASE_DIR) ## Builds the manifests to publish with a rele
 release-staging: ## Builds and push container images to the staging bucket.
 	REGISTRY=$(STAGING_REGISTRY) $(MAKE) docker-build-all docker-push-all release-tag-latest
 
+.PHONY: release-notes
+release-notes: $(RELEASE_NOTES)
+	$(RELEASE_NOTES)
 
 .PHONY: release-tag-latest
 release-tag-latest: ## Adds the latest tag to the last build tag.
diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigs.yaml
@@ -11,7 +11,9 @@ spec:
     categories:
     - cluster-api
     kind: KubeadmConfig
+    listKind: KubeadmConfigList
     plural: kubeadmconfigs
+    singular: kubeadmconfig
   scope: Namespaced
   subresources:
     status: {}
diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_kubeadmconfigtemplates.yaml
@@ -11,7 +11,9 @@ spec:
     categories:
     - cluster-api
     kind: KubeadmConfigTemplate
+    listKind: KubeadmConfigTemplateList
     plural: kubeadmconfigtemplates
+    singular: kubeadmconfigtemplate
   scope: Namespaced
   validation:
     openAPIV3Schema:
diff --git a/go.mod b/go.mod
@@ -4,19 +4,27 @@ go 1.12
 
 require (
 	github.com/go-logr/logr v0.1.0
-	github.com/google/gofuzz v1.0.0 // indirect
-	github.com/onsi/ginkgo v1.8.0
-	github.com/onsi/gomega v1.5.0
+	github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d // indirect
+	github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
+	github.com/json-iterator/go v1.1.7 // indirect
+	github.com/onsi/ginkgo v1.10.1
+	github.com/onsi/gomega v1.7.0
 	github.com/pkg/errors v0.8.1
-	golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8 // indirect
-	golang.org/x/net v0.0.0-20190620200207-3b0461eec859
-	golang.org/x/sys v0.0.0-20190621203818-d432491b9138 // indirect
+	github.com/prometheus/client_golang v0.9.3 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/stretchr/testify v1.4.0 // indirect
+	go.uber.org/atomic v1.4.0 // indirect
+	go.uber.org/zap v1.10.0 // indirect
+	golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7 // indirect
+	golang.org/x/net v0.0.0-20190909003024-a7b16738d86b
+	golang.org/x/sys v0.0.0-20190911201528-7ad0cfa0b7b5 // indirect
+	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
 	k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
 	k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
 	k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
 	k8s.io/cluster-bootstrap v0.0.0-20190516232516-d7d78ab2cfe7
 	k8s.io/klog v0.4.0
-	k8s.io/kube-openapi v0.0.0-20190603182131-db7b694dc208 // indirect
+	k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf // indirect
 	sigs.k8s.io/cluster-api v0.2.0
 	sigs.k8s.io/controller-runtime v0.2.0
 )
diff --git a/go.sum b/go.sum
diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -4,5 +4,6 @@ go 1.12
 
 require (
 	github.com/golangci/golangci-lint v1.18.0
-	sigs.k8s.io/controller-tools v0.2.0
+	sigs.k8s.io/cluster-api/hack/tools v0.0.0-20190926205936-6fc621a1c6af
+	sigs.k8s.io/controller-tools v0.2.1
 )
diff --git a/hack/tools/go.sum b/hack/tools/go.sum
diff --git a/hack/tools/tools.go b/hack/tools/tools.go
@@ -21,5 +21,6 @@ package tools
 
 import (
 	_ "github.com/golangci/golangci-lint/cmd/golangci-lint" // nolint
+	_ "sigs.k8s.io/cluster-api/hack/tools/release"          //nolint
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"     // nolint
 )

Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,6 @@ go 1.12`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/golangci/golangci-lint v1.18.0`
`7`		`- sigs.k8s.io/controller-tools v0.2.0`
	`7`	`+ sigs.k8s.io/cluster-api/hack/tools v0.0.0-20190926205936-6fc621a1c6af`
	`8`	`+ sigs.k8s.io/controller-tools v0.2.1`
`8`	`9`	`)`
Original file line number	Diff line number	Diff line change
`@@ -21,5 +21,6 @@ package tools`
`21`	`21`
`22`	`22`	`import (`
`23`	`23`	`_ "github.com/golangci/golangci-lint/cmd/golangci-lint" // nolint`
	`24`	`+ _ "sigs.k8s.io/cluster-api/hack/tools/release" //nolint`
`24`	`25`	`_ "sigs.k8s.io/controller-tools/cmd/controller-gen" // nolint`
`25`	`26`	`)`