Skip to content

Commit 82f11db

Browse files
authored
Merge pull request #4333 from twz123/remove-config-getter
Remove testutil.ConfigGetter
2 parents 0cf6ff0 + 2b584be commit 82f11db

File tree

2 files changed

+3
-90
lines changed

2 files changed

+3
-90
lines changed

cmd/kubeconfig/kubeconfig_test.go

+3-10
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"path/filepath"
2424
"testing"
2525

26-
"github.com/k0sproject/k0s/internal/testutil"
26+
"github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
2727
"github.com/k0sproject/k0s/pkg/certificate"
2828
"github.com/k0sproject/k0s/pkg/config"
2929

@@ -40,15 +40,8 @@ type CLITestSuite struct {
4040
}
4141

4242
func (s *CLITestSuite) TestKubeConfigCreate() {
43-
yamlData := `
44-
apiVersion: k0s.k0sproject.io/v1beta1
45-
kind: ClusterConfig
46-
spec:
47-
api:
48-
externalAddress: 10.0.0.86
49-
`
50-
configGetter := testutil.NewConfigGetter(s.T(), yamlData, false, config.DefaultCfgVars())
51-
cfg := configGetter.FakeConfigFromFile()
43+
cfg := v1beta1.DefaultClusterConfig()
44+
cfg.Spec.API.ExternalAddress = "10.0.0.86"
5245

5346
caCert := `
5447
-----BEGIN CERTIFICATE-----

internal/testutil/runtime_config.go

-80
This file was deleted.

0 commit comments

Comments
 (0)