Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-12-15 16:09:39 -05:00
Code Issues Projects Releases Packages Wiki Activity

operators: cleanup placeholder nodeversion (#1881)

Browse source 
* operators: cleanup placeholder nodeversion
* e2e: improve upgrade test portability
This commit is contained in:
Malte Poll 2023-06-06 15:22:06 +02:00 • committed by GitHub
parent 025d34a259
commit b3c052e299
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 142 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
e2e/internal/upgrade/BUILD.bazel
View file

@ -29,11 +29,11 @@ go_test(
# keep
count = 1,
data = [
"//cli:cli_enterprise_linux_amd64",
"//cli:cli_enterprise_host",
],
embed = [":upgrade"],
env = {
"PATH_CLI": "$(location //cli:cli_enterprise_linux_amd64)",
"PATH_CLI": "$(rlocationpath //cli:cli_enterprise_host)",
},
# keep
gotags = ["e2e"],
@ -48,6 +48,7 @@ go_test(
"//internal/versions",
"@com_github_spf13_afero//:afero",
"@com_github_stretchr_testify//require",
"@io_bazel_rules_go//go/runfiles:go_default_library",
"@io_k8s_api//core/v1:core",
"@io_k8s_apimachinery//pkg/apis/meta/v1:meta",
"@io_k8s_client_go//kubernetes",

31
e2e/internal/upgrade/upgrade_test.go
View file

@ -17,11 +17,13 @@ import (
"log"
"os"
"os/exec"
"path/filepath"
"strings"
"sync"
"testing"
"time"
"github.com/bazelbuild/rules_go/go/runfiles"
"github.com/edgelesssys/constellation/v2/e2e/internal/kubectl"
attestationconfigfetcher "github.com/edgelesssys/constellation/v2/internal/api/attestationconfig/fetcher"
"github.com/edgelesssys/constellation/v2/internal/config"
@ -68,6 +70,7 @@ func TestUpgrade(t *testing.T) {
require.NotEqual(*targetImage, "", "--target-image needs to be specified")
log.Println("Waiting for nodes and pods to be ready.")
testNodesEventuallyAvailable(t, k, *wantControl, *wantWorker)
testPodsEventuallyReady(t, k, "kube-system")
@ -75,6 +78,7 @@ func TestUpgrade(t *testing.T) {
require.NoError(err)
// Migrate config if necessary.
log.Println("Migrating config if needed.")
cmd := exec.CommandContext(context.Background(), cli, "config", "migrate", "--config", constants.ConfigFilename, "--force", "--debug")
stdout, stderr, err := runCommandWithSeparateOutputs(cmd)
require.NoError(err, "Stdout: %s\nStderr: %s", string(stdout), string(stderr))
@ -138,16 +142,35 @@ func workingDir(workspace string) (string, error) {
}
// getCLIPath returns the path to the CLI.
func getCLIPath(cliPath string) (string, error) {
func getCLIPath(cliPathFlag string) (string, error) {
pathCLI := os.Getenv("PATH_CLI")
var relCLIPath string
switch {
case pathCLI != "":
return pathCLI, nil
case cliPath != "":
return cliPath, nil
relCLIPath = pathCLI
case cliPathFlag != "":
relCLIPath = cliPathFlag
default:
return "", errors.New("neither 'PATH_CLI' nor 'cli' flag set")
}
// try to find the CLI in the working directory
// (e.g. when running via `go test` or when specifying a path manually)
workdir, err := os.Getwd()
if err != nil {
return "", fmt.Errorf("getting working directory: %w", err)
}
absCLIPath := relCLIPath
if !filepath.IsAbs(relCLIPath) {
absCLIPath = filepath.Join(workdir, relCLIPath)
}
if _, err := os.Stat(absCLIPath); err == nil {
return absCLIPath, nil
}
// fall back to runfiles (e.g. when running via bazel)
return runfiles.Rlocation(pathCLI)
}
// testPodsEventuallyReady checks that: