Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix typos and upstream library.sh changes #196

Open
wants to merge 1 commit into
base: vendor-cleanup
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions library.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
9 changes: 4 additions & 5 deletions schema/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <type>` 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

Expand Down Expand Up @@ -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