@@ -24,6 +24,7 @@ import (
24
24
25
25
"k8s.io/api/core/v1"
26
26
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27
+ "k8s.io/apimachinery/pkg/runtime"
27
28
)
28
29
29
30
var (
@@ -104,17 +105,8 @@ func TestBothAppAndCATLSAssetsExist(t *testing.T) {
104
105
}
105
106
106
107
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 )
118
110
if err != nil {
119
111
t .Fatal (err )
120
112
}
@@ -146,17 +138,8 @@ func TestOnlyAppSecretExist(t *testing.T) {
146
138
}
147
139
148
140
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 )
160
143
if err == nil {
161
144
t .Fatal ("expect error, but got none" )
162
145
}
@@ -186,23 +169,14 @@ func TestOnlyCAExist(t *testing.T) {
186
169
}
187
170
188
171
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 )
199
173
appSvc := & v1.Service {
200
174
ObjectMeta : metav1.ObjectMeta {
201
175
Name : "app-service" ,
202
176
Namespace : namespace ,
203
177
},
204
178
}
205
- appSecret , _ , _ , err := cg .GenerateCert (mCR , appSvc , ccfg )
179
+ appSecret , _ , _ , err := cg .GenerateCert (appCR , appSvc , ccfg )
206
180
if err != nil {
207
181
t .Fatal (err )
208
182
}
@@ -234,3 +208,16 @@ func TestOnlyCAExist(t *testing.T) {
234
208
t .Fatalf ("expect %+v, but got %+v" , appSecret , appSecretFromCluster )
235
209
}
236
210
}
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