@@ -17,14 +17,11 @@ limitations under the License.
17
17
package writer
18
18
19
19
import (
20
- "encoding/json"
21
-
22
20
. "github.com/onsi/ginkgo"
23
21
. "github.com/onsi/gomega"
24
22
25
23
corev1 "k8s.io/api/core/v1"
26
24
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
27
- "k8s.io/apimachinery/pkg/runtime"
28
25
"k8s.io/apimachinery/pkg/types"
29
26
"sigs.k8s.io/controller-runtime/pkg/client"
30
27
"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -38,7 +35,6 @@ var _ = Describe("secretCertWriter", func() {
38
35
var certWriter CertWriter
39
36
var sCertWriter * secretCertWriter
40
37
var secret * corev1.Secret
41
- var expectedSecret runtime.RawExtension
42
38
43
39
BeforeEach (func (done Done ) {
44
40
var err error
@@ -111,43 +107,25 @@ var _ = Describe("secretCertWriter", func() {
111
107
It ("should default it and return no error" , func () {
112
108
_ , _ , err := certWriter .EnsureCert (dnsName )
113
109
Expect (err ).NotTo (HaveOccurred ())
114
- list := & corev1.List {}
110
+ list := & corev1.SecretList {}
115
111
err = sCertWriter .Client .List (nil , & client.ListOptions {
116
112
Namespace : "namespace-bar" ,
117
- Raw : & metav1.ListOptions {
118
- TypeMeta : metav1.TypeMeta {
119
- APIVersion : "v1" ,
120
- Kind : "Secret" ,
121
- },
122
- },
123
113
}, list )
124
114
Expect (err ).NotTo (HaveOccurred ())
125
115
Expect (list .Items ).To (HaveLen (1 ))
126
116
})
127
117
})
128
118
129
119
Context ("no existing secret" , func () {
130
- BeforeEach (func (done Done ) {
131
- j , _ := json .Marshal (secret )
132
- expectedSecret = runtime.RawExtension {Raw : j }
133
- close (done )
134
- })
135
-
136
120
It ("should create new secrets with certs" , func () {
137
121
_ , changed , err := certWriter .EnsureCert (dnsName )
138
122
Expect (err ).NotTo (HaveOccurred ())
139
- list := & corev1.List {}
123
+ list := & corev1.SecretList {}
140
124
err = sCertWriter .Client .List (nil , & client.ListOptions {
141
125
Namespace : "namespace-bar" ,
142
- Raw : & metav1.ListOptions {
143
- TypeMeta : metav1.TypeMeta {
144
- APIVersion : "v1" ,
145
- Kind : "Secret" ,
146
- },
147
- },
148
126
}, list )
149
127
Expect (err ).NotTo (HaveOccurred ())
150
- Expect (list .Items ).To (ConsistOf (expectedSecret ))
128
+ Expect (list .Items ).To (ConsistOf (* secret ))
151
129
Expect (list .Items ).To (HaveLen (1 ))
152
130
Expect (changed ).To (BeTrue ())
153
131
})
@@ -157,12 +135,6 @@ var _ = Describe("secretCertWriter", func() {
157
135
var oldSecret * corev1.Secret
158
136
159
137
Context ("cert is invalid" , func () {
160
- BeforeEach (func (done Done ) {
161
- j , _ := json .Marshal (secret )
162
- expectedSecret = runtime.RawExtension {Raw : j }
163
- close (done )
164
- })
165
-
166
138
Describe ("cert in secret is incomplete" , func () {
167
139
BeforeEach (func (done Done ) {
168
140
oldSecret = secret .DeepCopy ()
@@ -174,18 +146,12 @@ var _ = Describe("secretCertWriter", func() {
174
146
It ("should replace with new certs" , func () {
175
147
_ , changed , err := certWriter .EnsureCert (dnsName )
176
148
Expect (err ).NotTo (HaveOccurred ())
177
- list := & corev1.List {}
149
+ list := & corev1.SecretList {}
178
150
err = sCertWriter .Client .List (nil , & client.ListOptions {
179
151
Namespace : "namespace-bar" ,
180
- Raw : & metav1.ListOptions {
181
- TypeMeta : metav1.TypeMeta {
182
- APIVersion : "v1" ,
183
- Kind : "Secret" ,
184
- },
185
- },
186
152
}, list )
187
153
Expect (err ).NotTo (HaveOccurred ())
188
- Expect (list .Items ).To (ConsistOf (expectedSecret ))
154
+ Expect (list .Items ).To (ConsistOf (* secret ))
189
155
Expect (list .Items ).To (HaveLen (1 ))
190
156
Expect (changed ).To (BeTrue ())
191
157
})
@@ -207,18 +173,12 @@ var _ = Describe("secretCertWriter", func() {
207
173
It ("should replace with new certs" , func () {
208
174
_ , changed , err := certWriter .EnsureCert (dnsName )
209
175
Expect (err ).NotTo (HaveOccurred ())
210
- list := & corev1.List {}
176
+ list := & corev1.SecretList {}
211
177
err = sCertWriter .Client .List (nil , & client.ListOptions {
212
178
Namespace : "namespace-bar" ,
213
- Raw : & metav1.ListOptions {
214
- TypeMeta : metav1.TypeMeta {
215
- APIVersion : "v1" ,
216
- Kind : "Secret" ,
217
- },
218
- },
219
179
}, list )
220
180
Expect (err ).NotTo (HaveOccurred ())
221
- Expect (list .Items ).To (ConsistOf (expectedSecret ))
181
+ Expect (list .Items ).To (ConsistOf (* secret ))
222
182
Expect (list .Items ).To (HaveLen (1 ))
223
183
Expect (changed ).To (BeTrue ())
224
184
})
@@ -233,8 +193,6 @@ var _ = Describe("secretCertWriter", func() {
233
193
ServerKeyName : []byte (certs2 .Key ),
234
194
ServerCertName : []byte (certs2 .Cert ),
235
195
}
236
- j , _ := json .Marshal (oldSecret )
237
- expectedSecret = runtime.RawExtension {Raw : j }
238
196
sCertWriter .Client = fake .NewFakeClient (oldSecret )
239
197
close (done )
240
198
})
@@ -248,28 +206,20 @@ var _ = Describe("secretCertWriter", func() {
248
206
ServerKeyName : []byte (certs2 .Key ),
249
207
ServerCertName : []byte (certs2 .Cert ),
250
208
}
251
- j , _ := json .Marshal (oldSecret )
252
- expectedSecret = runtime.RawExtension {Raw : j }
253
209
254
210
sCertWriter .Client = fake .NewFakeClient (oldSecret )
255
211
close (done )
256
212
})
257
213
It ("should keep the secret" , func () {
258
214
_ , changed , err := certWriter .EnsureCert (dnsName )
259
215
Expect (err ).NotTo (HaveOccurred ())
260
- list := & corev1.List {}
216
+ list := & corev1.SecretList {}
261
217
err = sCertWriter .Client .List (nil , & client.ListOptions {
262
218
Namespace : "namespace-bar" ,
263
- Raw : & metav1.ListOptions {
264
- TypeMeta : metav1.TypeMeta {
265
- APIVersion : "v1" ,
266
- Kind : "Secret" ,
267
- },
268
- },
269
219
}, list )
270
220
Expect (err ).NotTo (HaveOccurred ())
271
221
Expect (list .Items ).To (HaveLen (1 ))
272
- Expect (list .Items [0 ]).To (Equal (expectedSecret ))
222
+ Expect (list .Items [0 ]).To (Equal (* oldSecret ))
273
223
Expect (changed ).To (BeFalse ())
274
224
})
275
225
})
0 commit comments