Skip to content

Commit 6995c3a

Browse files
committed
e2e: refactor to use toDummyCR() to create a dummy cr
1 parent 14f2335 commit 6995c3a

File tree

1 file changed

+20
-33
lines changed

1 file changed

+20
-33
lines changed

test/e2e/tls_util_test.go

Lines changed: 20 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424

2525
"k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27+
"k8s.io/apimachinery/pkg/runtime"
2728
)
2829

2930
var (
@@ -104,17 +105,8 @@ func TestBothAppAndCATLSAssetsExist(t *testing.T) {
104105
}
105106

106107
cg := tlsutil.NewSDKCertGenerator(f.KubeClient)
107-
// Use Pod as a dummy runtime object for the CR input of GenerateCert().
108-
mCR := &v1.Pod{
109-
TypeMeta: metav1.TypeMeta{
110-
Kind: crKind,
111-
},
112-
ObjectMeta: metav1.ObjectMeta{
113-
Name: crName,
114-
Namespace: namespace,
115-
},
116-
}
117-
actualAppSecret, actualCaConfigMap, actualCaSecret, err := cg.GenerateCert(mCR, nil, ccfg)
108+
appCR := toDummyCR(namespace)
109+
actualAppSecret, actualCaConfigMap, actualCaSecret, err := cg.GenerateCert(appCR, nil, ccfg)
118110
if err != nil {
119111
t.Fatal(err)
120112
}
@@ -146,17 +138,8 @@ func TestOnlyAppSecretExist(t *testing.T) {
146138
}
147139

148140
cg := tlsutil.NewSDKCertGenerator(f.KubeClient)
149-
// Use Pod as a dummy runtime object for the CR input of GenerateCert().
150-
mCR := &v1.Pod{
151-
TypeMeta: metav1.TypeMeta{
152-
Kind: crKind,
153-
},
154-
ObjectMeta: metav1.ObjectMeta{
155-
Name: crName,
156-
Namespace: namespace,
157-
},
158-
}
159-
_, _, _, err = cg.GenerateCert(mCR, nil, ccfg)
141+
appCR := toDummyCR(namespace)
142+
_, _, _, err = cg.GenerateCert(appCR, nil, ccfg)
160143
if err == nil {
161144
t.Fatal("expect error, but got none")
162145
}
@@ -186,23 +169,14 @@ func TestOnlyCAExist(t *testing.T) {
186169
}
187170

188171
cg := tlsutil.NewSDKCertGenerator(f.KubeClient)
189-
// Use Pod as a dummy runtime object for the CR input of GenerateCert().
190-
mCR := &v1.Pod{
191-
TypeMeta: metav1.TypeMeta{
192-
Kind: crKind,
193-
},
194-
ObjectMeta: metav1.ObjectMeta{
195-
Name: crName,
196-
Namespace: namespace,
197-
},
198-
}
172+
appCR := toDummyCR(namespace)
199173
appSvc := &v1.Service{
200174
ObjectMeta: metav1.ObjectMeta{
201175
Name: "app-service",
202176
Namespace: namespace,
203177
},
204178
}
205-
appSecret, _, _, err := cg.GenerateCert(mCR, appSvc, ccfg)
179+
appSecret, _, _, err := cg.GenerateCert(appCR, appSvc, ccfg)
206180
if err != nil {
207181
t.Fatal(err)
208182
}
@@ -234,3 +208,16 @@ func TestOnlyCAExist(t *testing.T) {
234208
t.Fatalf("expect %+v, but got %+v", appSecret, appSecretFromCluster)
235209
}
236210
}
211+
212+
// use Pod as a dummy runtime object for the CR input of GenerateCert().
213+
func toDummyCR(namespace string) runtime.Object {
214+
return &v1.Pod{
215+
TypeMeta: metav1.TypeMeta{
216+
Kind: crKind,
217+
},
218+
ObjectMeta: metav1.ObjectMeta{
219+
Name: crName,
220+
Namespace: namespace,
221+
},
222+
}
223+
}

0 commit comments

Comments
 (0)