mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
136f89dfc5
The recently introduced failure handling in ExpectNoError depends on error
wrapping: if an error prefix gets added with `fmt.Errorf("foo: %v", err)`, then
ExpectNoError cannot detect that the root cause is an assertion failure and
then will add another useless "unexpected error" prefix and will not dump the
additional failure information (currently the backtrace inside the E2E
framework).
Instead of manually deciding on a case-by-case basis where %w is needed, all
error wrapping was updated automatically with
sed -i "s/fmt.Errorf\(.*\): '*\(%s\|%v\)'*\",\(.* err)\)/fmt.Errorf\1: %w\",\3/" $(git grep -l 'fmt.Errorf' test/e2e*)
This may be unnecessary in some cases, but it's not wrong.
90 lines
2.5 KiB
Go
90 lines
2.5 KiB
Go
/*
|
|
Copyright 2016 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.
|
|
*/
|
|
|
|
package common
|
|
|
|
import (
|
|
"fmt"
|
|
"path"
|
|
"strings"
|
|
|
|
utilversion "k8s.io/apimachinery/pkg/util/version"
|
|
"k8s.io/client-go/discovery"
|
|
"k8s.io/kubernetes/test/e2e/framework"
|
|
e2econfig "k8s.io/kubernetes/test/e2e/framework/config"
|
|
"k8s.io/kubernetes/test/e2e/upgrades"
|
|
)
|
|
|
|
var (
|
|
upgradeTarget = e2econfig.Flags.String("upgrade-target", "ci/latest", "Version to upgrade to (e.g. 'release/stable', 'release/latest', 'ci/latest', '0.19.1', '0.19.1-669-gabac8c8') if doing an upgrade test.")
|
|
upgradeImage = e2econfig.Flags.String("upgrade-image", "", "Image to upgrade to (e.g. 'container_vm' or 'gci') if doing an upgrade test.")
|
|
)
|
|
|
|
// GetUpgradeContext return UpgradeContext for GCP provider.
|
|
func GetUpgradeContext(c discovery.DiscoveryInterface) (*upgrades.UpgradeContext, error) {
|
|
current, err := c.ServerVersion()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
curVer, err := utilversion.ParseSemantic(current.String())
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
upgCtx := &upgrades.UpgradeContext{
|
|
Versions: []upgrades.VersionContext{
|
|
{
|
|
Version: *curVer,
|
|
NodeImage: framework.TestContext.NodeOSDistro,
|
|
},
|
|
},
|
|
}
|
|
|
|
if len(*upgradeTarget) == 0 {
|
|
return upgCtx, nil
|
|
}
|
|
|
|
next, err := realVersion(*upgradeTarget)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
nextVer, err := utilversion.ParseSemantic(next)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
upgCtx.Versions = append(upgCtx.Versions, upgrades.VersionContext{
|
|
Version: *nextVer,
|
|
NodeImage: *upgradeImage,
|
|
})
|
|
|
|
return upgCtx, nil
|
|
}
|
|
|
|
// realVersion turns a version constants into a version string deployable on
|
|
// GKE. See hack/get-build.sh for more information.
|
|
func realVersion(s string) (string, error) {
|
|
framework.Logf("Getting real version for %q", s)
|
|
v, _, err := framework.RunCmd(path.Join(framework.TestContext.RepoRoot, "hack/get-build.sh"), "-v", s)
|
|
if err != nil {
|
|
return v, fmt.Errorf("error getting real version for %q: %w", s, err)
|
|
}
|
|
framework.Logf("Version for %q is %q", s, v)
|
|
return strings.TrimPrefix(strings.TrimSpace(v), "v"), nil
|
|
}
|