From a85147aa1c15d0ada1e0af357d7fac91740cab0a Mon Sep 17 00:00:00 2001 From: Benjamin Schimke Date: Fri, 27 Sep 2024 20:39:24 +0200 Subject: [PATCH] fix unittests after rebase --- src/k8s/pkg/k8sd/setup/k8s_apiserver_proxy_test.go | 4 ++-- src/k8s/pkg/k8sd/setup/kube_apiserver_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/k8s/pkg/k8sd/setup/k8s_apiserver_proxy_test.go b/src/k8s/pkg/k8sd/setup/k8s_apiserver_proxy_test.go index ad03d1dee..2df5238c8 100644 --- a/src/k8s/pkg/k8sd/setup/k8s_apiserver_proxy_test.go +++ b/src/k8s/pkg/k8sd/setup/k8s_apiserver_proxy_test.go @@ -138,13 +138,13 @@ func TestK8sApiServerProxy(t *testing.T) { s := mustSetupSnapAndDirectories(t, setKubeletMock) s.Mock.Hostname = "dev" - g.Expect(setup.K8sAPIServerProxy(s, nil, "[2001:db8::]", nil)).To(Succeed()) + g.Expect(setup.K8sAPIServerProxy(s, nil, 1234, nil)).To(Succeed()) tests := []struct { key string expectedVal string }{ - {key: "--listen", expectedVal: "[2001:db8::]:6443"}, + {key: "--listen", expectedVal: ":1234"}, } for _, tc := range tests { t.Run(tc.key, func(t *testing.T) { diff --git a/src/k8s/pkg/k8sd/setup/kube_apiserver_test.go b/src/k8s/pkg/k8sd/setup/kube_apiserver_test.go index 03b33f8dd..1da6c7986 100644 --- a/src/k8s/pkg/k8sd/setup/kube_apiserver_test.go +++ b/src/k8s/pkg/k8sd/setup/kube_apiserver_test.go @@ -253,7 +253,7 @@ func TestKubeAPIServer(t *testing.T) { s := mustSetupSnapAndDirectories(t, setKubeletMock) s.Mock.Hostname = "dev" - g.Expect(setup.KubeAPIServer(s, net.ParseIP("2001:db8::"), "fd98::/108", "https://auth-webhook.url", false, types.Datastore{Type: utils.Pointer("k8s-dqlite")}, "Node,RBAC", nil)).To(Succeed()) + g.Expect(setup.KubeAPIServer(s, 6443, net.ParseIP("2001:db8::"), "fd98::/108", "https://auth-webhook.url", false, types.Datastore{Type: utils.Pointer("k8s-dqlite")}, "Node,RBAC", nil)).To(Succeed()) tests := []struct { key string