Skip to content
This repository was archived by the owner on Nov 2, 2023. It is now read-only.

Commit c81d544

Browse files
committed
Add cert tests
Signed-off-by: Dan Bason <[email protected]>
1 parent b3ab688 commit c81d544

File tree

2 files changed

+64
-0
lines changed

2 files changed

+64
-0
lines changed

controllers/dashboards_controller_test.go

+37
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,17 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
8989
HaveOwner(dashboards),
9090
))
9191
})
92+
It("should create the secret when tls secret isn't specified", func() {
93+
Eventually(Object(&corev1.Secret{
94+
ObjectMeta: metav1.ObjectMeta{
95+
Name: "test-dashboards-osdb-tls",
96+
Namespace: dashboards.Namespace,
97+
},
98+
})).Should(ExistAnd(
99+
HaveData("tls.crt", nil),
100+
HaveData("tls.key", nil),
101+
))
102+
})
92103
It("should update the replica counts", func() {
93104
updateObject(dashboards, func(obj *v1beta1.Dashboards) {
94105
obj.Spec.Replicas = pointer.Int32(2)
@@ -100,6 +111,32 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
100111
},
101112
})).Should(HaveReplicaCount(2))
102113
})
114+
It("should not create a secret when tls is specified", func() {
115+
secret := &corev1.Secret{
116+
ObjectMeta: metav1.ObjectMeta{
117+
Name: "test-tls",
118+
Namespace: dashboards.Namespace,
119+
},
120+
Type: corev1.SecretTypeTLS,
121+
StringData: map[string]string{
122+
"tls.crt": "this is cert data",
123+
"tls.key": "this is key data",
124+
},
125+
}
126+
Expect(k8sClient.Create(context.Background(), secret)).To(Succeed())
127+
128+
updateObject(dashboards, func(obj *v1beta1.Dashboards) {
129+
obj.Spec.TLSSecret = &corev1.LocalObjectReference{
130+
Name: secret.Name,
131+
}
132+
})
133+
Eventually(Object(&corev1.Secret{
134+
ObjectMeta: metav1.ObjectMeta{
135+
Name: "test-dashboards-osdb-tls",
136+
Namespace: dashboards.Namespace,
137+
},
138+
})).ShouldNot(Exist())
139+
})
103140
It("should remove the resources when deleted", func() {
104141
Expect(k8sClient.Delete(context.Background(), dashboards)).To(Succeed())
105142

controllers/opensearchcluster_controller_test.go

+27
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
102102
HaveName("internalusers"),
103103
HaveVolumeSource("Secret"),
104104
)),
105+
HaveMatchingVolume(And(
106+
HaveName("certs"),
107+
HaveVolumeSource("Secret"),
108+
)),
105109
HaveMatchingContainer(And(
106110
HaveName("opensearch"),
107111
HaveImage("docker.io/opensearchproject/opensearch:1.0.0"),
@@ -112,6 +116,7 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
112116
HavePorts("transport", "http", "metrics", "rca"),
113117
HaveVolumeMounts("config", "opensearch-data"),
114118
HaveVolumeMounts("internalusers", "test-cluster-os-internalusers"),
119+
HaveVolumeMounts("certs", "test-cluster-os-certs"),
115120
)),
116121
HaveMatchingPersistentVolume(And(
117122
HaveName("opensearch-data"),
@@ -147,6 +152,7 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
147152
HavePorts("transport"),
148153
HaveVolumeMounts("config", "opensearch-data"),
149154
HaveVolumeMounts("internalusers", "test-cluster-os-internalusers"),
155+
HaveVolumeMounts("certs", "test-cluster-os-certs"),
150156
)),
151157
HaveMatchingPersistentVolume(And(
152158
HaveName("opensearch-data"),
@@ -156,6 +162,10 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
156162
HaveName("internalusers"),
157163
HaveVolumeSource("Secret"),
158164
)),
165+
HaveMatchingVolume(And(
166+
HaveName("certs"),
167+
HaveVolumeSource("Secret"),
168+
)),
159169
))
160170
}()
161171
go func() {
@@ -181,12 +191,17 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
181191
HavePorts("transport", "http", "metrics", "rca"),
182192
HaveVolumeMounts("config"),
183193
HaveVolumeMounts("internalusers", "test-cluster-os-internalusers"),
194+
HaveVolumeMounts("certs", "test-cluster-os-certs"),
184195
Not(HaveVolumeMounts("opensearch-data")),
185196
)),
186197
HaveMatchingVolume(And(
187198
HaveName("internalusers"),
188199
HaveVolumeSource("Secret"),
189200
)),
201+
HaveMatchingVolume(And(
202+
HaveName("certs"),
203+
HaveVolumeSource("Secret"),
204+
)),
190205
))
191206
}()
192207
wg.Wait()
@@ -213,6 +228,7 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
213228
})).Should(ExistAnd(
214229
HaveOwner(osCluster),
215230
HaveData("logging.yml", nil),
231+
HaveData("opensearch.yml", nil),
216232
))
217233
Eventually(Object(&corev1.Secret{
218234
ObjectMeta: metav1.ObjectMeta{
@@ -233,6 +249,17 @@ var _ = Describe("OpensearchCluster Controller", Label("controller"), func() {
233249
HaveOwner(osCluster),
234250
HaveData("internal_users.yml", nil),
235251
))
252+
Eventually(Object(&corev1.Secret{
253+
ObjectMeta: metav1.ObjectMeta{
254+
Name: "test-cluster-os-pki",
255+
Namespace: osCluster.Namespace,
256+
},
257+
})).Should(ExistAnd(
258+
HaveData("transportca.crt", nil),
259+
HaveData("transportca.key", nil),
260+
HaveData("httpca.crt", nil),
261+
HaveData("httpca.key", nil),
262+
))
236263
})
237264
It("should update the replica counts", func() {
238265
updateObject(osCluster, func(obj *v1beta1.OpensearchCluster) {

0 commit comments

Comments
 (0)