Merge pull request #11 from verrazzano/aamitra/VZ-11396-uptake-capi-1…

….5.3 VZ-11396: allow README file to be added
verrazzano · Nov 1, 2023 · e11429a · e11429a
2 parents 85bbfde + 9d3de5f
commit e11429a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -7,7 +7,6 @@ hack/
 docs/
 logos/
 scripts/
-**/*.md
 tilt-settings.json
 tilt-settings.yaml
 tilt.d/
@@ -53,4 +52,4 @@ go.work.sum
 **/*~
 **/*.tmp
 **/.DS_Store
-**/*.swp
+**/*.swp
diff --git a/Makefile b/Makefile
@@ -215,7 +215,7 @@ CAPI_KIND_CLUSTER_NAME ?= capi-test
 # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971
 
 SHORT_COMMIT_SHA := $(shell git rev-parse --short HEAD)
-TAG_VERSION ?= "v1.5.0"
+TAG_VERSION ?= "v1.5.3"
 TAG ?= ${TAG_VERSION}-${SHORT_COMMIT_SHA}
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64

diff --git a/hack/tools/go.mod b/hack/tools/go.mod
@@ -108,6 +108,7 @@ require (
 	github.com/spf13/viper v1.16.0 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
 	github.com/subosito/gotenv v1.4.2 // indirect
+	github.com/verrazzano/cluster-api/hack/tools v0.0.0-20231101152234-f907859a4003 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	golang.org/x/crypto v0.14.0 // indirect
 	golang.org/x/mod v0.10.0 // indirect

diff --git a/hack/tools/go.sum b/hack/tools/go.sum
@@ -463,6 +463,8 @@ github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNG
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/valyala/fastjson v1.6.4 h1:uAUNq9Z6ymTgGhcm0UynUAB6tlbakBrz6CQFax3BXVQ=
 github.com/valyala/fastjson v1.6.4/go.mod h1:CLCAqky6SMuOcxStkYQvblddUtoRxhYMGLrsQns1aXY=
+github.com/verrazzano/cluster-api/hack/tools v0.0.0-20231101152234-f907859a4003 h1:etQ+2HwDzDC0b/padF8ZOzyGlkBW2v5B7BWfvQuzfYA=
+github.com/verrazzano/cluster-api/hack/tools v0.0.0-20231101152234-f907859a4003/go.mod h1:eGA4zy74LsCFwDm1Cyy6WtLeIAFvSiP442kT7E6CMJY=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=