Skip to content

Commit 3c0f612

Browse files
committed
Squashed 'release-tools/' changes from 7bc70e5..00bc64a9
00bc64a9 remove travis.yml, Go 1.16 REVERT: 7bc70e5 Merge pull request kubernetes-csi#129 from pohly/squash-documentation REVERT: e0b02e7 README.md: document usage of --squash REVERT: 316cb95 Merge pull request kubernetes-csi#132 from yiyang5055/bugfix/boilerplate REVERT: 26e2ab1 fix: default boilerplate path REVERT: 1add8c1 Merge pull request kubernetes-csi#133 from pohly/kubernetes-1.20-tag REVERT: 3e811d6 prow.sh: fix "on-master" prow jobs REVERT: 1d60e77 Merge pull request kubernetes-csi#131 from pohly/kubernetes-1.20-tag REVERT: 9f10459 prow.sh: support building Kubernetes for a specific version REVERT: fe1f284 Merge pull request kubernetes-csi#121 from kvaps/namespace-check REVERT: 8fdf0f7 Merge pull request kubernetes-csi#128 from fengzixu/master REVERT: 1c94220 fix: fix a bug of csi-sanity REVERT: a4c41e6 Merge pull request kubernetes-csi#127 from pohly/fix-boilerplate REVERT: ece0f50 check namespace for snapshot-controller REVERT: dbd8967 verify-boilerplate.sh: fix path to script REVERT: 9289fd1 Merge pull request kubernetes-csi#125 from sachinkumarsingh092/optional-spelling-boilerplate-checks REVERT: ad29307 Make the spelling and boilerplate checks optional REVERT: 5f06d02 Merge pull request kubernetes-csi#124 from sachinkumarsingh092/fix-spellcheck-boilerplate-tests REVERT: 48186eb Fix spelling and boilerplate errors REVERT: 71690af Merge pull request kubernetes-csi#122 from sachinkumarsingh092/include-spellcheck-boilerplate-tests REVERT: 981be3f 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
1 parent 7fa1349 commit 3c0f612

19 files changed

+47
-605
lines changed

.prow.sh

-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,7 @@
11
#! /bin/bash -e
2-
3-
# Copyright 2021 The Kubernetes Authors.
4-
#
5-
# Licensed under the Apache License, Version 2.0 (the "License");
6-
# you may not use this file except in compliance with the License.
7-
# You may obtain a copy of the License at
82
#
9-
# http://www.apache.org/licenses/LICENSE-2.0
10-
#
11-
# Unless required by applicable law or agreed to in writing, software
12-
# distributed under the License is distributed on an "AS IS" BASIS,
13-
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
# See the License for the specific language governing permissions and
15-
# limitations under the License.
16-
173
# This is for testing csi-release-tools itself in Prow. All other
184
# repos use prow.sh for that, but as csi-release-tools isn't a normal
195
# repo with some Go code in it, it has a custom Prow test script.
206

217
./verify-shellcheck.sh "$(pwd)"
22-
./verify-spelling.sh "$(pwd)"
23-
./verify-boilerplate.sh "$(pwd)"

README.md

+7-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ The expected repository layout is:
2121
Dockerfile in the root when only building a single command
2222
- `Makefile` - includes `release-tools/build.make` and sets
2323
configuration variables
24-
- `.travis.yml` - a symlink to `release-tools/.travis.yml`
24+
- `.prow.sh` script which imports `release-tools/prow.sh`
25+
and may contain further customization
26+
- `.cloudbuild.sh` and `cloudbuild.yaml` as symlinks to
27+
the corresponding files in `release-tools` or (if necessary)
28+
as custom files
2529

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

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

56-
- `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)
57-
- `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)
53+
- `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)
54+
- `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)
5855
- 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
5956

6057
verify-shellcheck.sh

SIDECAR_RELEASE_PROCESS.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The release manager must:
1111
kubernetes/org to request membership
1212
* Be a top level approver for the repository. To become a top level approver,
1313
the candidate must demonstrate ownership and deep knowledge of the repository
14-
through active maintenance, responding to and fixing issues, reviewing PRs,
14+
through active maintainence, responding to and fixing issues, reviewing PRs,
1515
test triage.
1616
* Be part of the maintainers or admin group for the repository. admin is a
1717
superset of maintainers, only maintainers level is required for cutting a

boilerplate/boilerplate.Dockerfile.txt

-13
This file was deleted.

boilerplate/boilerplate.Makefile.txt

-13
This file was deleted.

boilerplate/boilerplate.bzl.txt

-13
This file was deleted.

boilerplate/boilerplate.go.txt

-15
This file was deleted.

boilerplate/boilerplate.py

-200
This file was deleted.

boilerplate/boilerplate.py.txt

-13
This file was deleted.

boilerplate/boilerplate.sh.txt

-13
This file was deleted.

0 commit comments

Comments
 (0)