github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #108901 from dims/temporarily-ignore-some-verify-failures-in-go-1.18

Browse Source 
Temporarily ignore some verify failures in go1.18 and other broken things
This commit is contained in:
Kubernetes Prow Robot 2022-03-23 06:04:09 -07:00 committed by GitHub
commit 1580b69e8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hack/jenkins/test-dockerized.sh
View File

@ -51,5 +51,10 @@ make generated_files
go install ./cmd/... go install ./cmd/...
./hack/install-etcd.sh ./hack/install-etcd.sh
# TODO(MadhavJivrajani): Temporary fix due to Go 1.18 changes.
# Please see https://tip.golang.org/doc/go1.18#sha1
GODEBUG=x509sha1=1
export GODEBUG
make test-cmd make test-cmd
make test-integration make test-integration

2
hack/make-rules/verify.sh
View File

@ -35,6 +35,8 @@ EXCLUDED_PATTERNS=(
"verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage "verify-linkcheck.sh" # runs in separate Jenkins job once per day due to high network usage
"verify-*-dockerized.sh" # Don't run any scripts that intended to be run dockerized "verify-*-dockerized.sh" # Don't run any scripts that intended to be run dockerized
"verify-govet-levee.sh" # Do not run levee analysis by default while KEP-1933 implementation is in alpha. "verify-govet-levee.sh" # Do not run levee analysis by default while KEP-1933 implementation is in alpha.
"verify-golangci-lint.sh" # TODO(dims) Need to get this running with golang 1.18
"verify-structured-logging.sh" # TODO(dims) Need to get this running with golang 1.18
) )
# Exclude generated-files-remake in certain cases, if they're running in a separate job. # Exclude generated-files-remake in certain cases, if they're running in a separate job.

4
test/instrumentation/stability-utils.sh
View File

@ -29,6 +29,8 @@ stability_check_setup() {
export KUBE_EXTRA_GOPATH=$KUBE_TEMP export KUBE_EXTRA_GOPATH=$KUBE_TEMP
kube::golang::setup_env kube::golang::setup_env
pushd "${KUBE_EXTRA_GOPATH}" >/dev/null pushd "${KUBE_EXTRA_GOPATH}" >/dev/null
touch go.mod
GO111MODULE=on go mod edit -module=example.com/mod
GO111MODULE=on go get "gopkg.in/yaml.v2" GO111MODULE=on go get "gopkg.in/yaml.v2"
popd >/dev/null popd >/dev/null
} }
@ -58,7 +60,7 @@ reset=$(tput sgr0)
kube::validate::stablemetrics() { kube::validate::stablemetrics() {
stability_check_setup stability_check_setup
temp_file=$(mktemp) temp_file=$(mktemp)
doValidate=$(find_files_to_check | grep -E ".*.go" | grep -v ".*_test.go" | sort | KUBE_ROOT=${KUBE_ROOT} xargs -L 200 go run "test/instrumentation/main.go" "test/instrumentation/decode_metric.go" "test/instrumentation/find_stable_metric.go" "test/instrumentation/error.go" "test/instrumentation/metric.go" -- 1>"${temp_file}") doValidate=$(find_files_to_check | grep -E ".*.go" | grep -v ".*_test.go" | grep -v ".git" | sort | KUBE_ROOT=${KUBE_ROOT} xargs -L 200 go run "test/instrumentation/main.go" "test/instrumentation/decode_metric.go" "test/instrumentation/find_stable_metric.go" "test/instrumentation/error.go" "test/instrumentation/metric.go" -- 1>"${temp_file}")
if $doValidate; then if $doValidate; then
echo -e "${green}Diffing test/instrumentation/testdata/stable-metrics-list.yaml\n${reset}" echo -e "${green}Diffing test/instrumentation/testdata/stable-metrics-list.yaml\n${reset}"

2
test/integration/apimachinery/watch_restart_test.go
View File

@ -121,7 +121,7 @@ func TestWatchRestartsIfTimeoutNotReached(t *testing.T) {
patch := fmt.Sprintf(`{"metadata": {"annotations": {"count": "%d"}}}`, counter) patch := fmt.Sprintf(`{"metadata": {"annotations": {"count": "%d"}}}`, counter)
_, err := c.CoreV1().Secrets(secret.Namespace).Patch(context.TODO(), secret.Name, types.StrategicMergePatchType, []byte(patch), metav1.PatchOptions{}) _, err := c.CoreV1().Secrets(secret.Namespace).Patch(context.TODO(), secret.Name, types.StrategicMergePatchType, []byte(patch), metav1.PatchOptions{})
if err != nil { if err != nil {
t.Fatalf("Failed to patch secret: %v", err) panic(fmt.Sprintf("Failed to patch secret: %v", err))
} }
*referenceOutput = append(*referenceOutput, fmt.Sprintf("%d", counter)) *referenceOutput = append(*referenceOutput, fmt.Sprintf("%d", counter))