Skip to content

Commit

Permalink
Squashed 'release-tools/' changes from 7bc70e52..00bc64a9
Browse files Browse the repository at this point in the history
00bc64a9 remove travis.yml, Go 1.16
REVERT: 7bc70e52 Merge pull request kubernetes-csi#129 from pohly/squash-documentation
REVERT: e0b02e72 README.md: document usage of --squash
REVERT: 316cb957 Merge pull request kubernetes-csi#132 from yiyang5055/bugfix/boilerplate
REVERT: 26e2ab10 fix: default boilerplate path
REVERT: 1add8c18 Merge pull request kubernetes-csi#133 from pohly/kubernetes-1.20-tag
REVERT: 3e811d6c prow.sh: fix "on-master" prow jobs
REVERT: 1d60e779 Merge pull request kubernetes-csi#131 from pohly/kubernetes-1.20-tag
REVERT: 9f104590 prow.sh: support building Kubernetes for a specific version
REVERT: fe1f2848 Merge pull request kubernetes-csi#121 from kvaps/namespace-check
REVERT: 8fdf0f78 Merge pull request kubernetes-csi#128 from fengzixu/master
REVERT: 1c94220d fix: fix a bug of csi-sanity
REVERT: a4c41e6a Merge pull request kubernetes-csi#127 from pohly/fix-boilerplate
REVERT: ece0f50 check namespace for snapshot-controller
REVERT: dbd89672 verify-boilerplate.sh: fix path to script
REVERT: 9289fd16 Merge pull request kubernetes-csi#125 from sachinkumarsingh092/optional-spelling-boilerplate-checks
REVERT: ad29307f Make the spelling and boilerplate checks optional
REVERT: 5f06d024 Merge pull request kubernetes-csi#124 from sachinkumarsingh092/fix-spellcheck-boilerplate-tests
REVERT: 48186eba Fix spelling and boilerplate errors
REVERT: 71690aff Merge pull request kubernetes-csi#122 from sachinkumarsingh092/include-spellcheck-boilerplate-tests
REVERT: 981be3fe Adding spelling and boilerplate checks.
REVERT: 2bb7525 Merge pull request kubernetes-csi#117 from fengzixu/master
REVERT: 3b6d17b Merge pull request kubernetes-csi#118 from pohly/cloud-build-timeout
REVERT: 9318c6c cloud build: double the timeout, now 1 hour
REVERT: 4ab8b15 use the tag to replace commit of csi-test
REVERT: 5d74e45 change the csi-test import path to v4
REVERT: 7dcd0a9 upgrade csi-test to v4.0.2
REVERT: 86ff580 Merge pull request kubernetes-csi#116 from andyzhangx/export-image-name
REVERT: c3a9662 allow export image name and registry name
REVERT: c6a88c6 Merge pull request kubernetes-csi#113 from xing-yang/install_snapshot_controller
REVERT: 45ec4c6 Fix the install of snapshot CRDs and controller
REVERT: 5d874cc Merge pull request kubernetes-csi#112 from xing-yang/cleanup
REVERT: 79bbca7 Cleanup
REVERT: d437673 Merge pull request kubernetes-csi#111 from xing-yang/update_snapshot_v1_rc
REVERT: 57718f8 Update snapshot CRD version
REVERT: 4aff857 Merge pull request kubernetes-csi#109 from pohly/alpha-test-defaults
REVERT: 0427289 Merge pull request kubernetes-csi#110 from pohly/kind-0.9-bazel-build-workaround
REVERT: 9a370ab prow.sh: work around "kind build node-image" failure
REVERT: 522361e prow.sh: only run alpha tests for latest Kubernetes release
REVERT: 22c0395 Merge pull request kubernetes-csi#108 from bnrjee/master
REVERT: b5b447b Add go ldflags using LDFLAGS at the time of compilation
REVERT: 16f4afb Merge pull request kubernetes-csi#107 from pohly/kind-update

git-subtree-dir: release-tools
git-subtree-split: 00bc64a9b7c2585676b1da301a7acae8797229a9
  • Loading branch information
pohly committed Mar 15, 2021
1 parent 7fa1349 commit 3c0f612
Show file tree
Hide file tree
Showing 19 changed files with 47 additions and 605 deletions.
16 changes: 0 additions & 16 deletions .prow.sh
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
#! /bin/bash -e

# Copyright 2021 The Kubernetes Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# This is for testing csi-release-tools itself in Prow. All other
# repos use prow.sh for that, but as csi-release-tools isn't a normal
# repo with some Go code in it, it has a custom Prow test script.

./verify-shellcheck.sh "$(pwd)"
./verify-spelling.sh "$(pwd)"
./verify-boilerplate.sh "$(pwd)"
17 changes: 7 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@ The expected repository layout is:
Dockerfile in the root when only building a single command
- `Makefile` - includes `release-tools/build.make` and sets
configuration variables
- `.travis.yml` - a symlink to `release-tools/.travis.yml`
- `.prow.sh` script which imports `release-tools/prow.sh`
and may contain further customization
- `.cloudbuild.sh` and `cloudbuild.yaml` as symlinks to
the corresponding files in `release-tools` or (if necessary)
as custom files

To create a release, tag a certain revision with a name that
starts with `v`, for example `v1.0.0`, then `make push`
Expand All @@ -44,17 +48,10 @@ is the recommended way of maintaining a copy of the rules inside the
changes also locally, test them and then push them back to the shared
repository at a later time.

We no longer care about importing the full commit history, so `--squash` should be used
when submitting a `release-tools` update. Also make sure that the PR for that
contains the automatically generated commit message in the PR description.
It contains the list of individual commits that were squashed. The script from
https://github.com/kubernetes-csi/csi-release-tools/issues/7 can create such
PRs automatically.

Cheat sheet:

- `git subtree add --squash --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - add release tools to a repo which does not have them yet (only once)
- `git subtree pull --squash --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - update local copy to latest upstream (whenever upstream changes)
- `git subtree add --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - add release tools to a repo which does not have them yet (only once)
- `git subtree pull --prefix=release-tools https://github.com/kubernetes-csi/csi-release-tools.git master` - update local copy to latest upstream (whenever upstream changes)
- edit, `git commit`, `git subtree push --prefix=release-tools [email protected]:<user>/csi-release-tools.git <my-new-or-existing-branch>` - push to a new branch before submitting a PR

verify-shellcheck.sh
Expand Down
2 changes: 1 addition & 1 deletion SIDECAR_RELEASE_PROCESS.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The release manager must:
kubernetes/org to request membership
* Be a top level approver for the repository. To become a top level approver,
the candidate must demonstrate ownership and deep knowledge of the repository
through active maintenance, responding to and fixing issues, reviewing PRs,
through active maintainence, responding to and fixing issues, reviewing PRs,
test triage.
* Be part of the maintainers or admin group for the repository. admin is a
superset of maintainers, only maintainers level is required for cutting a
Expand Down
13 changes: 0 additions & 13 deletions boilerplate/boilerplate.Dockerfile.txt

This file was deleted.

13 changes: 0 additions & 13 deletions boilerplate/boilerplate.Makefile.txt

This file was deleted.

13 changes: 0 additions & 13 deletions boilerplate/boilerplate.bzl.txt

This file was deleted.

15 changes: 0 additions & 15 deletions boilerplate/boilerplate.go.txt

This file was deleted.

200 changes: 0 additions & 200 deletions boilerplate/boilerplate.py

This file was deleted.

13 changes: 0 additions & 13 deletions boilerplate/boilerplate.py.txt

This file was deleted.

13 changes: 0 additions & 13 deletions boilerplate/boilerplate.sh.txt

This file was deleted.

Loading

0 comments on commit 3c0f612

Please sign in to comment.