mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #108901 from dims/temporarily-ignore-some-verify-failures-in-go-1.18
Temporarily ignore some verify failures in go1.18 and other broken things
This commit is contained in:
commit
1580b69e8c
@ -51,5 +51,10 @@ make generated_files
|
||||
go install ./cmd/...
|
||||
./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-integration
|
||||
|
@ -35,6 +35,8 @@ EXCLUDED_PATTERNS=(
|
||||
"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-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.
|
||||
|
@ -29,6 +29,8 @@ stability_check_setup() {
|
||||
export KUBE_EXTRA_GOPATH=$KUBE_TEMP
|
||||
kube::golang::setup_env
|
||||
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"
|
||||
popd >/dev/null
|
||||
}
|
||||
@ -58,7 +60,7 @@ reset=$(tput sgr0)
|
||||
kube::validate::stablemetrics() {
|
||||
stability_check_setup
|
||||
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
|
||||
echo -e "${green}Diffing test/instrumentation/testdata/stable-metrics-list.yaml\n${reset}"
|
||||
|
@ -121,7 +121,7 @@ func TestWatchRestartsIfTimeoutNotReached(t *testing.T) {
|
||||
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{})
|
||||
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))
|
||||
|
Loading…
Reference in New Issue
Block a user