Skip to content

Commit a89ca02

Browse files
committed
Fix cert-manager test installation
This commit will fix default always install cert-manager to optional when cert-manager specific test is run. Signed-off-by: ArkaSaha30 <[email protected]>
1 parent e56cedf commit a89ca02

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

test/e2e/cert_manager_test.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package e2e
33
import (
44
"context"
55
"fmt"
6+
"log"
67
"reflect"
78
"testing"
89
"time"
@@ -22,6 +23,7 @@ import (
2223
ecv1alpha1 "go.etcd.io/etcd-operator/api/v1alpha1"
2324
"go.etcd.io/etcd-operator/pkg/certificate/cert_manager"
2425
interfaces "go.etcd.io/etcd-operator/pkg/certificate/interfaces"
26+
testUtils "go.etcd.io/etcd-operator/test/utils"
2527
)
2628

2729
const (
@@ -60,6 +62,11 @@ func TestCertManagerProvider(t *testing.T) {
6062

6163
feature.Setup(
6264
func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
65+
log.Println("Installing cert-manager...")
66+
if err := testUtils.InstallCertManager(); err != nil {
67+
log.Printf("Unable to install Cert Manager: %s", err)
68+
}
69+
6370
client := cfg.Client()
6471
_ = appsv1.AddToScheme(client.Resources().GetScheme())
6572
_ = corev1.AddToScheme(client.Resources().GetScheme())
@@ -179,6 +186,11 @@ func TestClusterCertCreation(t *testing.T) {
179186
}
180187

181188
feature.Setup(func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
189+
log.Println("Installing cert-manager...")
190+
if err := testUtils.InstallCertManager(); err != nil {
191+
log.Printf("Unable to install Cert Manager: %s", err)
192+
}
193+
182194
client := cfg.Client()
183195
_ = appsv1.AddToScheme(client.Resources().GetScheme())
184196
_ = corev1.AddToScheme(client.Resources().GetScheme())

test/e2e/e2e_suite_test.go

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,18 +87,13 @@ func TestMain(m *testing.M) {
8787
return ctx, nil
8888
},
8989

90-
// install prometheus and cert-manager
90+
// install prometheus
9191
func(ctx context.Context, cfg *envconf.Config) (context.Context, error) {
9292
log.Println("Installing prometheus operator...")
9393
if err := testUtils.InstallPrometheusOperator(); err != nil {
9494
log.Printf("Unable to install Prometheus operator: %s", err)
9595
}
9696

97-
log.Println("Installing cert-manager...")
98-
if err := testUtils.InstallCertManager(); err != nil {
99-
log.Printf("Unable to install Cert Manager: %s", err)
100-
}
101-
10297
return ctx, nil
10398
},
10499

0 commit comments

Comments
 (0)