Squashed 'release-tools/' changes from 3b6d17b1..1d60e779
1d60e779 Merge pull request #131 from pohly/kubernetes-1.20-tag 9f104590 prow.sh: support building Kubernetes for a specific version fe1f2848 Merge pull request #121 from kvaps/namespace-check 8fdf0f78 Merge pull request #128 from fengzixu/master 1c94220d fix: fix a bug of csi-sanity a4c41e6a Merge pull request #127 from pohly/fix-boilerplate ece0f500 check namespace for snapshot-controller dbd89672 verify-boilerplate.sh: fix path to script 9289fd16 Merge pull request #125 from sachinkumarsingh092/optional-spelling-boilerplate-checks ad29307f Make the spelling and boilerplate checks optional 5f06d024 Merge pull request #124 from sachinkumarsingh092/fix-spellcheck-boilerplate-tests 48186eba Fix spelling and boilerplate errors 71690aff Merge pull request #122 from sachinkumarsingh092/include-spellcheck-boilerplate-tests 981be3fe Adding spelling and boilerplate checks. 2bb75253 Merge pull request #117 from fengzixu/master 4ab8b154 use the tag to replace commit of csi-test 5d74e455 change the csi-test import path to v4 7dcd0a99 upgrade csi-test to v4.0.2 git-subtree-dir: release-tools git-subtree-split: 1d60e7792624a9938c0bd1b045211fbb89e513d6
This commit is contained in:
16
.prow.sh
16
.prow.sh
@@ -1,7 +1,23 @@
|
|||||||
#! /bin/bash -e
|
#! /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
|
# 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
|
# 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.
|
# repo with some Go code in it, it has a custom Prow test script.
|
||||||
|
|
||||||
./verify-shellcheck.sh "$(pwd)"
|
./verify-shellcheck.sh "$(pwd)"
|
||||||
|
./verify-spelling.sh "$(pwd)"
|
||||||
|
./verify-boilerplate.sh "$(pwd)"
|
||||||
|
@@ -11,7 +11,7 @@ The release manager must:
|
|||||||
kubernetes/org to request membership
|
kubernetes/org to request membership
|
||||||
* Be a top level approver for the repository. To become a top level approver,
|
* 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
|
the candidate must demonstrate ownership and deep knowledge of the repository
|
||||||
through active maintainence, responding to and fixing issues, reviewing PRs,
|
through active maintenance, responding to and fixing issues, reviewing PRs,
|
||||||
test triage.
|
test triage.
|
||||||
* Be part of the maintainers or admin group for the repository. admin is a
|
* 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
|
superset of maintainers, only maintainers level is required for cutting a
|
||||||
|
13
boilerplate/boilerplate.Dockerfile.txt
Normal file
13
boilerplate/boilerplate.Dockerfile.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Copyright YEAR 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.
|
13
boilerplate/boilerplate.Makefile.txt
Normal file
13
boilerplate/boilerplate.Makefile.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Copyright YEAR 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.
|
13
boilerplate/boilerplate.bzl.txt
Normal file
13
boilerplate/boilerplate.bzl.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Copyright YEAR 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.
|
15
boilerplate/boilerplate.go.txt
Normal file
15
boilerplate/boilerplate.go.txt
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
/*
|
||||||
|
Copyright YEAR 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.
|
||||||
|
*/
|
202
boilerplate/boilerplate.py
Executable file
202
boilerplate/boilerplate.py
Executable file
@@ -0,0 +1,202 @@
|
|||||||
|
#!/usr/bin/env python
|
||||||
|
|
||||||
|
# Copyright 2019 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.
|
||||||
|
|
||||||
|
from __future__ import print_function
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import difflib
|
||||||
|
import glob
|
||||||
|
import json
|
||||||
|
import mmap
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import sys
|
||||||
|
from datetime import date
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser()
|
||||||
|
parser.add_argument(
|
||||||
|
"filenames",
|
||||||
|
help="list of files to check, all files if unspecified",
|
||||||
|
nargs='*')
|
||||||
|
|
||||||
|
# Rootdir defaults to the directory **above** the repo-infra dir.
|
||||||
|
rootdir = os.path.dirname(__file__) + "./../../../"
|
||||||
|
rootdir = os.path.abspath(rootdir)
|
||||||
|
parser.add_argument(
|
||||||
|
"--rootdir", default=rootdir, help="root directory to examine")
|
||||||
|
|
||||||
|
default_boilerplate_dir = os.path.join(rootdir, "csi-driver-nfs/hack/boilerplate")
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
"--boilerplate-dir", default=default_boilerplate_dir)
|
||||||
|
|
||||||
|
parser.add_argument(
|
||||||
|
"-v", "--verbose",
|
||||||
|
help="give verbose output regarding why a file does not pass",
|
||||||
|
action="store_true")
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
verbose_out = sys.stderr if args.verbose else open("/dev/null", "w")
|
||||||
|
|
||||||
|
def get_refs():
|
||||||
|
refs = {}
|
||||||
|
|
||||||
|
for path in glob.glob(os.path.join(args.boilerplate_dir, "boilerplate.*.txt")):
|
||||||
|
extension = os.path.basename(path).split(".")[1]
|
||||||
|
|
||||||
|
ref_file = open(path, 'r')
|
||||||
|
ref = ref_file.read().splitlines()
|
||||||
|
ref_file.close()
|
||||||
|
refs[extension] = ref
|
||||||
|
|
||||||
|
return refs
|
||||||
|
|
||||||
|
def file_passes(filename, refs, regexs):
|
||||||
|
try:
|
||||||
|
f = open(filename, 'r')
|
||||||
|
except Exception as exc:
|
||||||
|
print("Unable to open %s: %s" % (filename, exc), file=verbose_out)
|
||||||
|
return False
|
||||||
|
|
||||||
|
data = f.read()
|
||||||
|
f.close()
|
||||||
|
|
||||||
|
basename = os.path.basename(filename)
|
||||||
|
extension = file_extension(filename)
|
||||||
|
if extension != "":
|
||||||
|
ref = refs[extension]
|
||||||
|
else:
|
||||||
|
ref = refs[basename]
|
||||||
|
|
||||||
|
# remove build tags from the top of Go files
|
||||||
|
if extension == "go":
|
||||||
|
p = regexs["go_build_constraints"]
|
||||||
|
(data, found) = p.subn("", data, 1)
|
||||||
|
|
||||||
|
# remove shebang from the top of shell files
|
||||||
|
if extension == "sh" or extension == "py":
|
||||||
|
p = regexs["shebang"]
|
||||||
|
(data, found) = p.subn("", data, 1)
|
||||||
|
|
||||||
|
data = data.splitlines()
|
||||||
|
|
||||||
|
# if our test file is smaller than the reference it surely fails!
|
||||||
|
if len(ref) > len(data):
|
||||||
|
print('File %s smaller than reference (%d < %d)' %
|
||||||
|
(filename, len(data), len(ref)),
|
||||||
|
file=verbose_out)
|
||||||
|
return False
|
||||||
|
|
||||||
|
# trim our file to the same number of lines as the reference file
|
||||||
|
data = data[:len(ref)]
|
||||||
|
|
||||||
|
p = regexs["year"]
|
||||||
|
for d in data:
|
||||||
|
if p.search(d):
|
||||||
|
print('File %s is missing the year' % filename, file=verbose_out)
|
||||||
|
return False
|
||||||
|
|
||||||
|
# Replace all occurrences of the regex "CURRENT_YEAR|...|2016|2015|2014" with "YEAR"
|
||||||
|
p = regexs["date"]
|
||||||
|
for i, d in enumerate(data):
|
||||||
|
(data[i], found) = p.subn('YEAR', d)
|
||||||
|
if found != 0:
|
||||||
|
break
|
||||||
|
|
||||||
|
# if we don't match the reference at this point, fail
|
||||||
|
if ref != data:
|
||||||
|
print("Header in %s does not match reference, diff:" % filename, file=verbose_out)
|
||||||
|
if args.verbose:
|
||||||
|
print(file=verbose_out)
|
||||||
|
for line in difflib.unified_diff(ref, data, 'reference', filename, lineterm=''):
|
||||||
|
print(line, file=verbose_out)
|
||||||
|
print(file=verbose_out)
|
||||||
|
return False
|
||||||
|
|
||||||
|
return True
|
||||||
|
|
||||||
|
def file_extension(filename):
|
||||||
|
return os.path.splitext(filename)[1].split(".")[-1].lower()
|
||||||
|
|
||||||
|
skipped_dirs = ['Godeps', 'third_party', '_gopath', '_output', '.git',
|
||||||
|
'cluster/env.sh', 'vendor', 'test/e2e/generated/bindata.go',
|
||||||
|
'repo-infra/verify/boilerplate/test', '.glide']
|
||||||
|
|
||||||
|
def normalize_files(files):
|
||||||
|
newfiles = []
|
||||||
|
for pathname in files:
|
||||||
|
if any(x in pathname for x in skipped_dirs):
|
||||||
|
continue
|
||||||
|
newfiles.append(pathname)
|
||||||
|
return newfiles
|
||||||
|
|
||||||
|
def get_files(extensions):
|
||||||
|
files = []
|
||||||
|
if len(args.filenames) > 0:
|
||||||
|
files = args.filenames
|
||||||
|
else:
|
||||||
|
for root, dirs, walkfiles in os.walk(args.rootdir):
|
||||||
|
# don't visit certain dirs. This is just a performance improvement
|
||||||
|
# as we would prune these later in normalize_files(). But doing it
|
||||||
|
# cuts down the amount of filesystem walking we do and cuts down
|
||||||
|
# the size of the file list
|
||||||
|
for d in skipped_dirs:
|
||||||
|
if d in dirs:
|
||||||
|
dirs.remove(d)
|
||||||
|
|
||||||
|
for name in walkfiles:
|
||||||
|
pathname = os.path.join(root, name)
|
||||||
|
files.append(pathname)
|
||||||
|
|
||||||
|
files = normalize_files(files)
|
||||||
|
|
||||||
|
outfiles = []
|
||||||
|
for pathname in files:
|
||||||
|
basename = os.path.basename(pathname)
|
||||||
|
extension = file_extension(pathname)
|
||||||
|
if extension in extensions or basename in extensions:
|
||||||
|
outfiles.append(pathname)
|
||||||
|
return outfiles
|
||||||
|
|
||||||
|
def get_regexs():
|
||||||
|
regexs = {}
|
||||||
|
# Search for "YEAR" which exists in the boilerplate, but shouldn't in the real thing
|
||||||
|
regexs["year"] = re.compile( 'YEAR' )
|
||||||
|
# dates can be 2014, 2015, 2016, ..., CURRENT_YEAR, company holder names can be anything
|
||||||
|
years = range(2014, date.today().year + 1)
|
||||||
|
regexs["date"] = re.compile( '(%s)' % "|".join(map(lambda l: str(l), years)) )
|
||||||
|
# strip // +build \n\n build constraints
|
||||||
|
regexs["go_build_constraints"] = re.compile(r"^(// \+build.*\n)+\n", re.MULTILINE)
|
||||||
|
# strip #!.* from shell scripts
|
||||||
|
regexs["shebang"] = re.compile(r"^(#!.*\n)\n*", re.MULTILINE)
|
||||||
|
return regexs
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
regexs = get_regexs()
|
||||||
|
refs = get_refs()
|
||||||
|
filenames = get_files(refs.keys())
|
||||||
|
|
||||||
|
for filename in filenames:
|
||||||
|
if not file_passes(filename, refs, regexs):
|
||||||
|
print(filename, file=sys.stdout)
|
||||||
|
|
||||||
|
return 0
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
sys.exit(main())
|
13
boilerplate/boilerplate.py.txt
Normal file
13
boilerplate/boilerplate.py.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Copyright YEAR 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.
|
13
boilerplate/boilerplate.sh.txt
Normal file
13
boilerplate/boilerplate.sh.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
# Copyright YEAR 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.
|
13
build.make
13
build.make
@@ -275,3 +275,16 @@ test-shellcheck:
|
|||||||
.PHONY: check-go-version-%
|
.PHONY: check-go-version-%
|
||||||
check-go-version-%:
|
check-go-version-%:
|
||||||
./release-tools/verify-go-version.sh "$*"
|
./release-tools/verify-go-version.sh "$*"
|
||||||
|
|
||||||
|
# Test for spelling errors.
|
||||||
|
.PHONY: test-spelling
|
||||||
|
test-spelling:
|
||||||
|
@ echo; echo "### $@:"
|
||||||
|
@ ./release-tools/verify-spelling.sh "$(pwd)"
|
||||||
|
|
||||||
|
# Test the boilerplates of the files.
|
||||||
|
.PHONY: test-boilerplate
|
||||||
|
test-boilerplate:
|
||||||
|
@ echo; echo "### $@:"
|
||||||
|
@ ./release-tools/verify-boilerplate.sh "$(pwd)"
|
||||||
|
|
||||||
|
@@ -1,5 +1,19 @@
|
|||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
|
|
||||||
|
# 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.
|
||||||
|
|
||||||
# shellcheck disable=SC1091
|
# shellcheck disable=SC1091
|
||||||
. release-tools/prow.sh
|
. release-tools/prow.sh
|
||||||
|
|
||||||
|
66
prow.sh
66
prow.sh
@@ -1,5 +1,5 @@
|
|||||||
#! /bin/bash
|
#! /bin/bash
|
||||||
#
|
|
||||||
# Copyright 2019 The Kubernetes Authors.
|
# Copyright 2019 The Kubernetes Authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
@@ -65,6 +65,18 @@ get_versioned_variable () {
|
|||||||
echo "$value"
|
echo "$value"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# This takes a version string like CSI_PROW_KUBERNETES_VERSION and
|
||||||
|
# maps it to the corresponding git tag, branch or commit.
|
||||||
|
version_to_git () {
|
||||||
|
version="$1"
|
||||||
|
shift
|
||||||
|
case "$version" in
|
||||||
|
latest) echo "master";;
|
||||||
|
release-*) echo "$version";;
|
||||||
|
*) echo "v$version";;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
configvar CSI_PROW_BUILD_PLATFORMS "linux amd64; windows amd64 .exe; linux ppc64le -ppc64le; linux s390x -s390x; linux arm64 -arm64" "Go target platforms (= GOOS + GOARCH) and file suffix of the resulting binaries"
|
configvar CSI_PROW_BUILD_PLATFORMS "linux amd64; windows amd64 .exe; linux ppc64le -ppc64le; linux s390x -s390x; linux arm64 -arm64" "Go target platforms (= GOOS + GOARCH) and file suffix of the resulting binaries"
|
||||||
|
|
||||||
# If we have a vendor directory, then use it. We must be careful to only
|
# If we have a vendor directory, then use it. We must be careful to only
|
||||||
@@ -73,7 +85,7 @@ configvar CSI_PROW_BUILD_PLATFORMS "linux amd64; windows amd64 .exe; linux ppc64
|
|||||||
# which is disabled with GOFLAGS=-mod=vendor).
|
# which is disabled with GOFLAGS=-mod=vendor).
|
||||||
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
|
configvar GOFLAGS_VENDOR "$( [ -d vendor ] && echo '-mod=vendor' )" "Go flags for using the vendor directory"
|
||||||
|
|
||||||
# Go versions can be specified seperately for different tasks
|
# Go versions can be specified separately for different tasks
|
||||||
# If the pre-installed Go is missing or a different
|
# If the pre-installed Go is missing or a different
|
||||||
# version, the required version here will get installed
|
# version, the required version here will get installed
|
||||||
# from https://golang.org/dl/.
|
# from https://golang.org/dl/.
|
||||||
@@ -208,16 +220,7 @@ configvar CSI_PROW_DRIVER_CANARY_REGISTRY "gcr.io/k8s-staging-sig-storage" "regi
|
|||||||
# all generated files are present.
|
# all generated files are present.
|
||||||
#
|
#
|
||||||
# CSI_PROW_E2E_REPO=none disables E2E testing.
|
# CSI_PROW_E2E_REPO=none disables E2E testing.
|
||||||
tag_from_version () {
|
configvar CSI_PROW_E2E_VERSION "$(version_to_git "${CSI_PROW_KUBERNETES_VERSION}")" "E2E version"
|
||||||
version="$1"
|
|
||||||
shift
|
|
||||||
case "$version" in
|
|
||||||
latest) echo "master";;
|
|
||||||
release-*) echo "$version";;
|
|
||||||
*) echo "v$version";;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
configvar CSI_PROW_E2E_VERSION "$(tag_from_version "${CSI_PROW_KUBERNETES_VERSION}")" "E2E version"
|
|
||||||
configvar CSI_PROW_E2E_REPO "https://github.com/kubernetes/kubernetes" "E2E repo"
|
configvar CSI_PROW_E2E_REPO "https://github.com/kubernetes/kubernetes" "E2E repo"
|
||||||
configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
|
configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
|
||||||
|
|
||||||
@@ -227,8 +230,8 @@ configvar CSI_PROW_E2E_IMPORT_PATH "k8s.io/kubernetes" "E2E package"
|
|||||||
# of the cluster. The alternative would have been to (cross-)compile csi-sanity
|
# of the cluster. The alternative would have been to (cross-)compile csi-sanity
|
||||||
# and install it inside the cluster, which is not necessarily easier.
|
# and install it inside the cluster, which is not necessarily easier.
|
||||||
configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo"
|
configvar CSI_PROW_SANITY_REPO https://github.com/kubernetes-csi/csi-test "csi-test repo"
|
||||||
configvar CSI_PROW_SANITY_VERSION 5421d9f3c37be3b95b241b44a094a3db11bee789 "csi-test version" # latest master
|
configvar CSI_PROW_SANITY_VERSION v4.0.2 "csi-test version" # v4.0.2
|
||||||
configvar CSI_PROW_SANITY_IMPORT_PATH github.com/kubernetes-csi/csi-test "csi-test package"
|
configvar CSI_PROW_SANITY_PACKAGE_PATH github.com/kubernetes-csi/csi-test "csi-test package"
|
||||||
configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock"
|
configvar CSI_PROW_SANITY_SERVICE "hostpath-service" "Kubernetes TCP service name that exposes csi.sock"
|
||||||
configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver"
|
configvar CSI_PROW_SANITY_POD "csi-hostpathplugin-0" "Kubernetes pod with CSI driver"
|
||||||
configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI driver"
|
configvar CSI_PROW_SANITY_CONTAINER "hostpath" "Kubernetes container with CSI driver"
|
||||||
@@ -293,7 +296,7 @@ configvar CSI_PROW_E2E_FOCUS_LATEST '\[Feature:VolumeSnapshotDataSource\]' "non-
|
|||||||
configvar CSI_PROW_E2E_FOCUS "$(get_versioned_variable CSI_PROW_E2E_FOCUS "${csi_prow_kubernetes_version_suffix}")" "non-alpha, feature-tagged tests"
|
configvar CSI_PROW_E2E_FOCUS "$(get_versioned_variable CSI_PROW_E2E_FOCUS "${csi_prow_kubernetes_version_suffix}")" "non-alpha, feature-tagged tests"
|
||||||
|
|
||||||
# Serial vs. parallel is always determined by these regular expressions.
|
# Serial vs. parallel is always determined by these regular expressions.
|
||||||
# Individual regular expressions are seperated by spaces for readability
|
# Individual regular expressions are separated by spaces for readability
|
||||||
# and expected to not contain spaces. Use dots instead. The complete
|
# and expected to not contain spaces. Use dots instead. The complete
|
||||||
# regex for Ginkgo will be created by joining the individual terms.
|
# regex for Ginkgo will be created by joining the individual terms.
|
||||||
configvar CSI_PROW_E2E_SERIAL '\[Serial\] \[Disruptive\]' "tags for serial E2E tests"
|
configvar CSI_PROW_E2E_SERIAL '\[Serial\] \[Disruptive\]' "tags for serial E2E tests"
|
||||||
@@ -465,20 +468,22 @@ git_checkout () {
|
|||||||
|
|
||||||
# This clones a repo ("https://github.com/kubernetes/kubernetes")
|
# This clones a repo ("https://github.com/kubernetes/kubernetes")
|
||||||
# in a certain location ("$GOPATH/src/k8s.io/kubernetes") at
|
# in a certain location ("$GOPATH/src/k8s.io/kubernetes") at
|
||||||
# a the head of a specific branch (i.e., release-1.13, master).
|
# a the head of a specific branch (i.e., release-1.13, master),
|
||||||
# The directory cannot exist.
|
# tag (v1.20.0) or commit.
|
||||||
git_clone_branch () {
|
#
|
||||||
local repo path branch parent
|
# The directory must not exist.
|
||||||
|
git_clone () {
|
||||||
|
local repo path name parent
|
||||||
repo="$1"
|
repo="$1"
|
||||||
shift
|
shift
|
||||||
path="$1"
|
path="$1"
|
||||||
shift
|
shift
|
||||||
branch="$1"
|
name="$1"
|
||||||
shift
|
shift
|
||||||
|
|
||||||
parent="$(dirname "$path")"
|
parent="$(dirname "$path")"
|
||||||
mkdir -p "$parent"
|
mkdir -p "$parent"
|
||||||
(cd "$parent" && run git clone --single-branch --branch "$branch" "$repo" "$path") || die "cloning $repo" failed
|
(cd "$parent" && run git clone --single-branch --branch "$name" "$repo" "$path") || die "cloning $repo" failed
|
||||||
# This is useful for local testing or when switching between different revisions in the same
|
# This is useful for local testing or when switching between different revisions in the same
|
||||||
# repo.
|
# repo.
|
||||||
(cd "$path" && run git clean -fdx) || die "failed to clean $path"
|
(cd "$path" && run git clean -fdx) || die "failed to clean $path"
|
||||||
@@ -567,7 +572,7 @@ start_cluster () {
|
|||||||
else
|
else
|
||||||
type="docker"
|
type="docker"
|
||||||
fi
|
fi
|
||||||
git_clone_branch https://github.com/kubernetes/kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version" || die "checking out Kubernetes $version failed"
|
git_clone https://github.com/kubernetes/kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$(version_to_git "$version")" || die "checking out Kubernetes $version failed"
|
||||||
|
|
||||||
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
|
go_version="$(go_version_for_kubernetes "${CSI_PROW_WORK}/src/kubernetes" "$version")" || die "cannot proceed without knowing Go version for Kubernetes"
|
||||||
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
|
# Changing into the Kubernetes source code directory is a workaround for https://github.com/kubernetes-sigs/kind/issues/1910
|
||||||
@@ -796,16 +801,17 @@ install_snapshot_controller() {
|
|||||||
echo "kubectl apply -f ${SNAPSHOT_CONTROLLER_YAML}(modified)"
|
echo "kubectl apply -f ${SNAPSHOT_CONTROLLER_YAML}(modified)"
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
echo "kubectl apply -f ${CONTROLLER_DIR}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml"
|
echo "kubectl apply -f $SNAPSHOT_CONTROLLER_YAML"
|
||||||
kubectl apply -f "${CONTROLLER_DIR}/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml"
|
kubectl apply -f "$SNAPSHOT_CONTROLLER_YAML"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cnt=0
|
cnt=0
|
||||||
expected_running_pods=$(curl https://raw.githubusercontent.com/kubernetes-csi/external-snapshotter/"${CSI_SNAPSHOTTER_VERSION}"/deploy/kubernetes/snapshot-controller/setup-snapshot-controller.yaml | grep replicas | cut -d ':' -f 2-)
|
expected_running_pods=$(kubectl apply --dry-run=client -o "jsonpath={.spec.replicas}" -f "$SNAPSHOT_CONTROLLER_YAML")
|
||||||
while [ "$(kubectl get pods -l app=snapshot-controller | grep 'Running' -c)" -lt "$expected_running_pods" ]; do
|
expected_namespace=$(kubectl apply --dry-run=client -o "jsonpath={.metadata.namespace}" -f "$SNAPSHOT_CONTROLLER_YAML")
|
||||||
|
while [ "$(kubectl get pods -n "$expected_namespace" -l app=snapshot-controller | grep 'Running' -c)" -lt "$expected_running_pods" ]; do
|
||||||
if [ $cnt -gt 30 ]; then
|
if [ $cnt -gt 30 ]; then
|
||||||
echo "snapshot-controller pod status:"
|
echo "snapshot-controller pod status:"
|
||||||
kubectl describe pods -l app=snapshot-controller
|
kubectl describe pods -n "$expected_namespace" -l app=snapshot-controller
|
||||||
echo >&2 "ERROR: snapshot controller not ready after over 5 min"
|
echo >&2 "ERROR: snapshot controller not ready after over 5 min"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -879,8 +885,8 @@ install_sanity () (
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git_checkout "${CSI_PROW_SANITY_REPO}" "${GOPATH}/src/${CSI_PROW_SANITY_IMPORT_PATH}" "${CSI_PROW_SANITY_VERSION}" --depth=1 || die "checking out csi-sanity failed"
|
git_checkout "${CSI_PROW_SANITY_REPO}" "${GOPATH}/src/${CSI_PROW_SANITY_PACKAGE_PATH}" "${CSI_PROW_SANITY_VERSION}" --depth=1 || die "checking out csi-sanity failed"
|
||||||
run_with_go "${CSI_PROW_GO_VERSION_SANITY}" go test -c -o "${CSI_PROW_WORK}/csi-sanity" "${CSI_PROW_SANITY_IMPORT_PATH}/cmd/csi-sanity" || die "building csi-sanity failed"
|
( cd "${GOPATH}/src/${CSI_PROW_SANITY_PACKAGE_PATH}/cmd/csi-sanity" && run_with_go "${CSI_PROW_GO_VERSION_SANITY}" go build -o "${CSI_PROW_WORK}/csi-sanity" ) || die "building csi-sanity failed"
|
||||||
)
|
)
|
||||||
|
|
||||||
# Captures pod output while running some other command.
|
# Captures pod output while running some other command.
|
||||||
@@ -998,7 +1004,7 @@ make_test_to_junit () {
|
|||||||
echo "$line" # pass through
|
echo "$line" # pass through
|
||||||
if echo "$line" | grep -q "^### [^ ]*:$"; then
|
if echo "$line" | grep -q "^### [^ ]*:$"; then
|
||||||
if [ "$testname" ]; then
|
if [ "$testname" ]; then
|
||||||
# previous test succesful
|
# previous test successful
|
||||||
echo " </system-out>" >>"$out"
|
echo " </system-out>" >>"$out"
|
||||||
echo " </testcase>" >>"$out"
|
echo " </testcase>" >>"$out"
|
||||||
fi
|
fi
|
||||||
|
54
verify-boilerplate.sh
Executable file
54
verify-boilerplate.sh
Executable file
@@ -0,0 +1,54 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
# Copyright 2014 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.
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o nounset
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
echo "Verifying boilerplate"
|
||||||
|
|
||||||
|
if [[ -z "$(command -v python)" ]]; then
|
||||||
|
echo "Cannot find python. Make link to python3..."
|
||||||
|
update-alternatives --install /usr/bin/python python /usr/bin/python3 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# The csi-release-tools directory (absolute path).
|
||||||
|
TOOLS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
|
||||||
|
# Directory to check. Default is the parent of the tools themselves.
|
||||||
|
ROOT="${1:-${TOOLS}/..}"
|
||||||
|
|
||||||
|
boiler="${TOOLS}/boilerplate/boilerplate.py"
|
||||||
|
|
||||||
|
mapfile -t files_need_boilerplate < <("${boiler}" --rootdir="${ROOT}" --verbose)
|
||||||
|
|
||||||
|
# Run boilerplate.py unit tests
|
||||||
|
unitTestOut="$(mktemp)"
|
||||||
|
trap cleanup EXIT
|
||||||
|
cleanup() {
|
||||||
|
rm "${unitTestOut}"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Run boilerplate check
|
||||||
|
if [[ ${#files_need_boilerplate[@]} -gt 0 ]]; then
|
||||||
|
for file in "${files_need_boilerplate[@]}"; do
|
||||||
|
echo "Boilerplate header is wrong for: ${file}"
|
||||||
|
done
|
||||||
|
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Done"
|
59
verify-spelling.sh
Executable file
59
verify-spelling.sh
Executable file
@@ -0,0 +1,59 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
# Copyright 2019 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.
|
||||||
|
|
||||||
|
set -o errexit
|
||||||
|
set -o nounset
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
TOOL_VERSION="v0.3.4"
|
||||||
|
|
||||||
|
# The csi-release-tools directory (absolute path).
|
||||||
|
TOOLS="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
|
||||||
|
|
||||||
|
# Directory to check. Default is the parent of the tools themselves.
|
||||||
|
ROOT="${1:-${TOOLS}/..}"
|
||||||
|
|
||||||
|
# create a temporary directory
|
||||||
|
TMP_DIR=$(mktemp -d)
|
||||||
|
|
||||||
|
# cleanup
|
||||||
|
exitHandler() (
|
||||||
|
echo "Cleaning up..."
|
||||||
|
rm -rf "${TMP_DIR}"
|
||||||
|
)
|
||||||
|
trap exitHandler EXIT
|
||||||
|
|
||||||
|
if [[ -z "$(command -v misspell)" ]]; then
|
||||||
|
echo "Cannot find misspell. Installing misspell..."
|
||||||
|
# perform go get in a temp dir as we are not tracking this version in a go module
|
||||||
|
# if we do the go get in the repo, it will create / update a go.mod and go.sum
|
||||||
|
cd "${TMP_DIR}"
|
||||||
|
GO111MODULE=on GOBIN="${TMP_DIR}" go get "github.com/client9/misspell/cmd/misspell@${TOOL_VERSION}"
|
||||||
|
export PATH="${TMP_DIR}:${PATH}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# check spelling
|
||||||
|
RES=0
|
||||||
|
echo "Checking spelling..."
|
||||||
|
ERROR_LOG="${TMP_DIR}/errors.log"
|
||||||
|
cd "${ROOT}"
|
||||||
|
git ls-files | grep -v vendor | xargs misspell > "${ERROR_LOG}"
|
||||||
|
if [[ -s "${ERROR_LOG}" ]]; then
|
||||||
|
sed 's/^/error: /' "${ERROR_LOG}" # add 'error' to each line to highlight in e2e status
|
||||||
|
echo "Found spelling errors!"
|
||||||
|
RES=1
|
||||||
|
fi
|
||||||
|
exit "${RES}"
|
@@ -1,5 +1,5 @@
|
|||||||
#! /bin/sh -e
|
#! /bin/sh -e
|
||||||
#
|
|
||||||
# Copyright 2019 The Kubernetes Authors.
|
# Copyright 2019 The Kubernetes Authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
Reference in New Issue
Block a user