Skip to content

Commit ed2bfb8

Browse files
committed
fix tls secret tests
1 parent cb9f84c commit ed2bfb8

File tree

1 file changed

+15
-20
lines changed

1 file changed

+15
-20
lines changed

cloud/linode/loadbalancers_test.go

Lines changed: 15 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,7 +1322,7 @@ func testEnsureExistingLoadBalancer(t *testing.T, client *linodego.Client, _ *fa
13221322
defer func() { _ = lb.EnsureLoadBalancerDeleted(context.TODO(), "linodelb", svc) }()
13231323
getLBStatus, exists, err := lb.GetLoadBalancer(context.TODO(), "linodelb", svc)
13241324
if err != nil {
1325-
t.Fatal(err)
1325+
t.Fatalf("failed to create nodebalancer: %s", err)
13261326
}
13271327
if !exists {
13281328
t.Fatal("Node balancer not found")
@@ -1728,7 +1728,6 @@ func Test_getTLSCertInfo(t *testing.T) {
17281728
testcases := []struct {
17291729
name string
17301730
portConfig portConfig
1731-
namespace string
17321731
cert string
17331732
key string
17341733
err error
@@ -1739,41 +1738,37 @@ func Test_getTLSCertInfo(t *testing.T) {
17391738
TLSSecretName: "tls-secret",
17401739
Port: 8080,
17411740
},
1742-
namespace: "test",
1743-
cert: testCert,
1744-
key: testKey,
1745-
err: nil,
1741+
cert: testCert,
1742+
key: testKey,
1743+
err: nil,
17461744
},
17471745
{
17481746
name: "Test unspecified Cert info",
17491747
portConfig: portConfig{
17501748
Port: 8080,
17511749
},
1752-
namespace: "test",
1753-
cert: "",
1754-
key: "",
1755-
err: fmt.Errorf("TLS secret name for port 8080 is not specified"),
1750+
cert: "",
1751+
key: "",
1752+
err: fmt.Errorf("TLS secret name for port 8080 is not specified"),
17561753
},
17571754
{
17581755
name: "Test blank Cert info",
17591756
portConfig: portConfig{
17601757
TLSSecretName: "",
17611758
Port: 8080,
17621759
},
1763-
namespace: "test",
1764-
cert: "",
1765-
key: "",
1766-
err: fmt.Errorf("TLS secret name for port 8080 is not specified"),
1760+
cert: "",
1761+
key: "",
1762+
err: fmt.Errorf("TLS secret name for port 8080 is not specified"),
17671763
},
17681764
{
17691765
name: "Test no secret found",
17701766
portConfig: portConfig{
17711767
TLSSecretName: "secret",
17721768
Port: 8080,
17731769
},
1774-
namespace: "test",
1775-
cert: "",
1776-
key: "",
1770+
cert: "",
1771+
key: "",
17771772
err: errors.NewNotFound(schema.GroupResource{
17781773
Group: "",
17791774
Resource: "secrets",
@@ -1783,7 +1778,7 @@ func Test_getTLSCertInfo(t *testing.T) {
17831778

17841779
for _, test := range testcases {
17851780
t.Run(test.name, func(t *testing.T) {
1786-
cert, key, err := getTLSCertInfo(context.TODO(), kubeClient, test.namespace, test.portConfig)
1781+
cert, key, err := getTLSCertInfo(context.TODO(), kubeClient, "", test.portConfig)
17871782
if cert != test.cert {
17881783
t.Error("unexpected error")
17891784
t.Logf("expected: %v", test.cert)
@@ -1804,7 +1799,7 @@ func Test_getTLSCertInfo(t *testing.T) {
18041799
}
18051800

18061801
func addTLSSecret(t *testing.T, kubeClient kubernetes.Interface) {
1807-
_, err := kubeClient.CoreV1().Secrets("test").Create(context.TODO(), &v1.Secret{
1802+
_, err := kubeClient.CoreV1().Secrets("").Create(context.TODO(), &v1.Secret{
18081803
ObjectMeta: metav1.ObjectMeta{
18091804
Name: "tls-secret",
18101805
},
@@ -1816,6 +1811,6 @@ func addTLSSecret(t *testing.T, kubeClient kubernetes.Interface) {
18161811
Type: "kubernetes.io/tls",
18171812
}, metav1.CreateOptions{})
18181813
if err != nil {
1819-
t.Error(err)
1814+
t.Fatalf("failed to add TLS secret: %s\n", err)
18201815
}
18211816
}

0 commit comments

Comments
 (0)