Skip to content

Commit 1148261

Browse files
committed
fix: path to data yamls from e2e smoke test
1 parent 194c560 commit 1148261

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

tests/e2e/smoke_test.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ var _ = Describe("Operator smoke test", func() {
5959
var databaseSample *v1alpha1.Database
6060

6161
BeforeEach(func() {
62-
storageSample = testobjects.DefaultStorage(filepath.Join(".", "data", "storage-mirror-3-dc-config.yaml"))
62+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "data", "storage-mirror-3-dc-config.yaml"))
6363
databaseSample = testobjects.DefaultDatabase()
6464

6565
ctx = context.Background()
@@ -95,7 +95,7 @@ var _ = Describe("Operator smoke test", func() {
9595
})
9696

9797
It("Check webhook defaulter with dynconfig and nodeSets", func() {
98-
storageSample = testobjects.DefaultStorage(filepath.Join(".", "data", "storage-mirror-3-dc-dynconfig.yaml"))
98+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "data", "storage-mirror-3-dc-dynconfig.yaml"))
9999
emptyStorageDefaultFields(storageSample)
100100
storageSample.Spec.NodeSets = []v1alpha1.StorageNodeSetSpecInline{
101101
{
@@ -278,7 +278,7 @@ var _ = Describe("Operator smoke test", func() {
278278

279279
It("create storage and database with nodeSets", func() {
280280
By("issuing create commands...")
281-
storageSample = testobjects.DefaultStorage(filepath.Join(".", "data", "storage-mirror-3-dc-config.yaml"))
281+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "data", "storage-mirror-3-dc-config.yaml"))
282282
testNodeSetName := "nodeset"
283283
for idx := 1; idx <= 3; idx++ {
284284
storageSample.Spec.NodeSets = append(storageSample.Spec.NodeSets, v1alpha1.StorageNodeSetSpecInline{
@@ -368,7 +368,7 @@ var _ = Describe("Operator smoke test", func() {
368368

369369
It("operatorConnection check, create storage with default staticCredentials", func() {
370370
By("issuing create commands...")
371-
storageSample = testobjects.DefaultStorage(filepath.Join(".", "data", "storage-mirror-3-dc-config-staticCreds.yaml"))
371+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "data", "storage-mirror-3-dc-config-staticCreds.yaml"))
372372
storageSample.Spec.OperatorConnection = &v1alpha1.ConnectionOptions{
373373
StaticCredentials: &v1alpha1.StaticCredentialsAuth{
374374
Username: "root",
@@ -415,17 +415,17 @@ var _ = Describe("Operator smoke test", func() {
415415
It("using grpcs for storage connection", func() {
416416
By("create secret...")
417417
cert := testobjects.DefaultCertificate(
418-
filepath.Join(".", "data", "tls.crt"),
419-
filepath.Join(".", "data", "tls.key"),
420-
filepath.Join(".", "data", "ca.crt"),
418+
filepath.Join("..", "data", "tls.crt"),
419+
filepath.Join("..", "data", "tls.key"),
420+
filepath.Join("..", "data", "ca.crt"),
421421
)
422422
Expect(k8sClient.Create(ctx, cert)).Should(Succeed())
423423
defer func() {
424424
Expect(k8sClient.Delete(ctx, cert)).Should(Succeed())
425425
}()
426426

427427
By("create storage...")
428-
storageSample = testobjects.DefaultStorage(filepath.Join(".", "data", "storage-mirror-3-dc-config-tls.yaml"))
428+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "data", "storage-mirror-3-dc-config-tls.yaml"))
429429
storageSample.Spec.Service.GRPC.TLSConfiguration.Enabled = true
430430
storageSample.Spec.Service.GRPC.TLSConfiguration.Certificate = corev1.SecretKeySelector{
431431
LocalObjectReference: corev1.LocalObjectReference{Name: testobjects.CertificateSecretName},
@@ -551,7 +551,7 @@ var _ = Describe("Operator smoke test", func() {
551551

552552
It("check storage with dynconfig", func() {
553553
By("create storage...")
554-
storageSample = testobjects.DefaultStorage(filepath.Join(".", "data", "storage-mirror-3-dc-dynconfig.yaml"))
554+
storageSample = testobjects.DefaultStorage(filepath.Join("..", "data", "storage-mirror-3-dc-dynconfig.yaml"))
555555

556556
Expect(k8sClient.Create(ctx, storageSample)).Should(Succeed())
557557
defer DeleteStorageSafely(ctx, k8sClient, storageSample)
@@ -606,7 +606,7 @@ var _ = Describe("Operator smoke test", func() {
606606
It("TLS for status service", func() {
607607
tlsHTTPCheck := func(port int) error {
608608
url := fmt.Sprintf("https://localhost:%d/", port)
609-
cert, err := os.ReadFile(filepath.Join(".", "data", "ca.crt"))
609+
cert, err := os.ReadFile(filepath.Join("..", "data", "ca.crt"))
610610
Expect(err).ShouldNot(HaveOccurred())
611611

612612
certPool := x509.NewCertPool()
@@ -645,9 +645,9 @@ var _ = Describe("Operator smoke test", func() {
645645

646646
By("create secret...")
647647
cert := testobjects.DefaultCertificate(
648-
filepath.Join(".", "data", "tls.crt"),
649-
filepath.Join(".", "data", "tls.key"),
650-
filepath.Join(".", "data", "ca.crt"),
648+
filepath.Join("..", "data", "tls.crt"),
649+
filepath.Join("..", "data", "tls.key"),
650+
filepath.Join("..", "data", "ca.crt"),
651651
)
652652
Expect(k8sClient.Create(ctx, cert)).Should(Succeed())
653653

0 commit comments

Comments
 (0)