From b25a1c0caa809424efb94c0556fb021fe9a2b47b Mon Sep 17 00:00:00 2001 From: upodroid Date: Thu, 14 Jul 2022 18:24:58 +0300 Subject: [PATCH] fix typos and upstream library.sh changes --- library.sh | 20 +------------------- schema/README.md | 9 ++++----- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/library.sh b/library.sh index a9f068eb..9642030d 100755 --- a/library.sh +++ b/library.sh @@ -632,31 +632,13 @@ function go_update_deps() { fi fi - group "Go mod tidy and vendor" + group "Go mod tidy" # Prune modules. local orig_pipefail_opt=$(shopt -p -o pipefail) set -o pipefail go mod tidy 2>&1 | grep -v "ignoring symlink" || true - go mod vendor 2>&1 | grep -v "ignoring symlink" || true eval "$orig_pipefail_opt" - - group "Removing unwanted vendor files" - - # Remove unwanted vendor files - find vendor/ \( -name "OWNERS" \ - -o -name "OWNERS_ALIASES" \ - -o -name "BUILD" \ - -o -name "BUILD.bazel" \ - -o -name "*_test.go" \) -exec rm -f {} + - - export GOFLAGS=-mod=vendor - - group "Updating licenses" - update_licenses third_party/VENDOR-LICENSE "./..." - - group "Removing broken symlinks" - remove_broken_symlinks ./vendor } # Return the go module name of the current module. diff --git a/schema/README.md b/schema/README.md index de2ab959..76bc34d3 100644 --- a/schema/README.md +++ b/schema/README.md @@ -4,9 +4,8 @@ Schema is a seed of a CLI tool that a downstream can use to use reflection and g generate a base version of OpenAPI for a CRD. The resulting schema will be used by Kubernetes to provide results from `kubectl explain ` calls, and type validation. -Knative does not currently support full CRD generation via tools like -[controller-gen][controller-gen], this tool is to be used to support managing CRD manifests -manually. +Knative does not currently support full CRD generation via tools like [controller-gen][controller-gen], this +tool is to be used to support managing CRD manifests manually. ## Integration steps @@ -38,7 +37,7 @@ Paste this inside the CRD for LoremIpsum, ### Downstream -Start with [example.go](./example.go), copy this into the downstream and modify which -kinds are registered via `registry.Register`. You can register more than one kind at a time. (TODO: support versions in the CLI.) +Start with [example.go](./example.go), copy this into the downstream and modify which kinds are +registered via `registry.Register`. You can register more than one kind at a time. (TODO: support versions in the CLI.) [controller-gen]: https://github.com/kubernetes-sigs/controller-tools/tree/master/cmd/controller-gen