public/k3s
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/k3s.git synced 2026-08-05 05:59:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace docker go test SERVER_ARGS env with config.yaml injection

Browse Source 
Signed-off-by: Derek Nola <derek.nola@suse.com>

x

Signed-off-by: Derek Nola <derek.nola@suse.com>
This commit is contained in:
Derek Nola
2025-01-16 15:04:39 -08:00
parent ca165cacbc
commit 669c11a686
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/docker/lazypull/lazypull_test.go
View File

@@ -3,7 +3,6 @@ package main
import (
"flag"
"fmt"
"os"
"strings"
"testing"
@@ -28,8 +27,7 @@ var _ = Describe("LazyPull Tests", Ordered, func() {
var err error
config, err = tester.NewTestConfig(*k3sImage)
Expect(err).NotTo(HaveOccurred())
Expect(os.Setenv("SERVER_ARGS", "--snapshotter=stargz")).To(Succeed())
config.ServerYaml = "snapshotter: stargz"
Expect(config.ProvisionServers(1)).To(Succeed())
Eventually(func() error {
return tester.DeploymentsReady([]string{"coredns", "local-path-provisioner", "metrics-server", "traefik"}, config.KubeconfigFile)
@@ -121,7 +119,10 @@ func lookLayers(node, layer string) error {
func getTopmostLayer(node, container string) (string, error) {
var targetContainer string
cmd := fmt.Sprintf("docker exec -i %s ctr --namespace=k8s.io c ls -q labels.\"io.kubernetes.container.name\"==\"%s\" | sed -n 1p", node, container)
targetContainer, _ = tester.RunCommand(cmd)
targetContainer, err := tester.RunCommand(cmd)
if err != nil {
return "", fmt.Errorf("failed to get target container: %v", err)
}
targetContainer = strings.TrimSpace(targetContainer)
fmt.Println("targetContainer: ", targetContainer)
if targetContainer == "" {

5
tests/docker/test-helpers.go
View File

@@ -183,8 +183,9 @@ func (config *TestConfig) ProvisionServers(numOfServers int) error {
os.Getenv("SERVER_DOCKER_ARGS"),
os.Getenv(fmt.Sprintf("SERVER_%d_DOCKER_ARGS", i)),
os.Getenv("REGISTRY_CLUSTER_ARGS"),
yamlMount,
serverImage,
"server", joinOrStart, os.Getenv("SERVER_ARGS"), os.Getenv(fmt.Sprintf("SERVER_%d_ARGS", i))}, " ")
"server", joinOrStart, os.Getenv(fmt.Sprintf("SERVER_%d_ARGS", i))}, " ")
if out, err := RunCommand(dRun); err != nil {
return fmt.Errorf("failed to run server container: %s: %v", out, err)
}
@@ -271,7 +272,7 @@ func (config *TestConfig) ProvisionAgents(numOfAgents int) error {
os.Getenv(fmt.Sprintf("AGENT_%d_DOCKER_ARGS", i)),
os.Getenv("REGISTRY_CLUSTER_ARGS"),
getEnvOrDefault("K3S_IMAGE_AGENT", config.K3sImage),
"agent", os.Getenv("ARGS"), os.Getenv("AGENT_ARGS"), os.Getenv(agentInstanceArgs)}, " ")
"agent", os.Getenv("ARGS"), os.Getenv(agentInstanceArgs)}, " ")
if out, err := RunCommand(dRun); err != nil {
return fmt.Errorf("failed to run agent container: %s: %v", out, err)