cf0dcc6ab2
Storing settings in the framework's TestContext is not something that out-of-tree test authors can do because for them the framework is a read-only upstream component. Conceptually the same is true for in-tree tests, so the recommended approach is to define configuration settings in the code that uses them. How to do that is a bit uncertain. Viper has several drawbacks (maintenance status uncertain, cannot list supported options, cannot validate the configuration file). How to handle configuration files is currently getting discussed for kubeadm, with similar concerns about Viper (https://github.com/kubernetes/kubeadm/issues/1040). Instead of making a choice now for E2E, the recommendation is that test authors continue to define command line flags as before, except that they should do it in their own code and with better flag names. But the ability to read options also from a file is useful, so several enhancements get added: - all settings defined via flags can also be read from a configuration file, without extra work for test authors - framework/config makes it possible to populate a struct directly and define flags with a single function call - a path and file suffix can be given to --viper-config (as in "--viper-config /tmp/e2e.json") instead of expecting the file in the current directory; as before, just plain "--viper-config e2e" still works - if "--viper-config" is set, the file must exist; otherwise the "e2e" config is optional (as before) - errors from Viper are no longer silently ignored, so syntax errors are detected early - Viper support is optional: test suite authors who don't want it are not forced to use it by the e2e/framework
79 lines
2.8 KiB
Go
79 lines
2.8 KiB
Go
/*
|
|
Copyright 2015 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 e2e
|
|
|
|
import (
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
"testing"
|
|
|
|
"k8s.io/kubernetes/test/e2e/framework"
|
|
"k8s.io/kubernetes/test/e2e/framework/testfiles"
|
|
"k8s.io/kubernetes/test/e2e/framework/viperconfig"
|
|
"k8s.io/kubernetes/test/e2e/generated"
|
|
|
|
// test sources
|
|
_ "k8s.io/kubernetes/test/e2e/apimachinery"
|
|
_ "k8s.io/kubernetes/test/e2e/apps"
|
|
_ "k8s.io/kubernetes/test/e2e/auth"
|
|
_ "k8s.io/kubernetes/test/e2e/autoscaling"
|
|
_ "k8s.io/kubernetes/test/e2e/common"
|
|
_ "k8s.io/kubernetes/test/e2e/instrumentation"
|
|
_ "k8s.io/kubernetes/test/e2e/kubectl"
|
|
_ "k8s.io/kubernetes/test/e2e/lifecycle"
|
|
_ "k8s.io/kubernetes/test/e2e/lifecycle/bootstrap"
|
|
_ "k8s.io/kubernetes/test/e2e/network"
|
|
_ "k8s.io/kubernetes/test/e2e/node"
|
|
_ "k8s.io/kubernetes/test/e2e/scalability"
|
|
_ "k8s.io/kubernetes/test/e2e/scheduling"
|
|
_ "k8s.io/kubernetes/test/e2e/servicecatalog"
|
|
_ "k8s.io/kubernetes/test/e2e/storage"
|
|
_ "k8s.io/kubernetes/test/e2e/ui"
|
|
)
|
|
|
|
var viperConfig = flag.String("viper-config", "", "The name of a viper config file (https://github.com/spf13/viper#what-is-viper). All e2e command line parameters can also be configured in such a file. May contain a path and may or may not contain the file suffix. The default is to look for an optional file with `e2e` as base name. If a file is specified explicitly, it must be present.")
|
|
|
|
func init() {
|
|
// Register framework flags, then handle flags and Viper config.
|
|
framework.HandleFlags()
|
|
if err := viperconfig.ViperizeFlags(*viperConfig, "e2e"); err != nil {
|
|
fmt.Fprintln(os.Stderr, err)
|
|
os.Exit(1)
|
|
}
|
|
framework.AfterReadingAllFlags(&framework.TestContext)
|
|
|
|
// TODO: Deprecating repo-root over time... instead just use gobindata_util.go , see #23987.
|
|
// Right now it is still needed, for example by
|
|
// test/e2e/framework/ingress/ingress_utils.go
|
|
// for providing the optional secret.yaml file and by
|
|
// test/e2e/framework/util.go for cluster/log-dump.
|
|
if framework.TestContext.RepoRoot != "" {
|
|
testfiles.AddFileSource(testfiles.RootFileSource{Root: framework.TestContext.RepoRoot})
|
|
}
|
|
|
|
// Enable bindata file lookup as fallback.
|
|
testfiles.AddFileSource(testfiles.BindataFileSource{
|
|
Asset: generated.Asset,
|
|
AssetNames: generated.AssetNames,
|
|
})
|
|
}
|
|
|
|
func TestE2E(t *testing.T) {
|
|
RunE2ETests(t)
|
|
}
|