Skip to content

[WIP]Fix cert-manager scheme registration #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+23 −16
Open

[WIP]Fix cert-manager scheme registration #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e56cedf
Refactor testUtils variable name
ArkaSaha30 Oct 30, 2025
a89ca02
Fix cert-manager test installation
ArkaSaha30 Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions test/e2e/cert_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package e2e
import (
"context"
"fmt"
"log"
"reflect"
"testing"
"time"
Expand All @@ -22,6 +23,7 @@ import (
ecv1alpha1 "go.etcd.io/etcd-operator/api/v1alpha1"
"go.etcd.io/etcd-operator/pkg/certificate/cert_manager"
interfaces "go.etcd.io/etcd-operator/pkg/certificate/interfaces"
testUtils "go.etcd.io/etcd-operator/test/utils"
)

const (
Expand Down Expand Up @@ -60,6 +62,11 @@ func TestCertManagerProvider(t *testing.T) {

feature.Setup(
func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
log.Println("Installing cert-manager...")
if err := testUtils.InstallCertManager(); err != nil {
log.Printf("Unable to install Cert Manager: %s", err)
}

client := cfg.Client()
_ = appsv1.AddToScheme(client.Resources().GetScheme())
_ = corev1.AddToScheme(client.Resources().GetScheme())
Expand Down Expand Up @@ -179,6 +186,11 @@ func TestClusterCertCreation(t *testing.T) {
}

feature.Setup(func(ctx context.Context, t *testing.T, cfg *envconf.Config) context.Context {
log.Println("Installing cert-manager...")
if err := testUtils.InstallCertManager(); err != nil {
log.Printf("Unable to install Cert Manager: %s", err)
}

client := cfg.Client()
_ = appsv1.AddToScheme(client.Resources().GetScheme())
_ = corev1.AddToScheme(client.Resources().GetScheme())
Expand Down
27 changes: 11 additions & 16 deletions test/e2e/e2e_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import (
"sigs.k8s.io/e2e-framework/support/kind"

ecv1alpha1 "go.etcd.io/etcd-operator/api/v1alpha1"
test_utils "go.etcd.io/etcd-operator/test/utils"
testUtils "go.etcd.io/etcd-operator/test/utils"
)

var (
Expand Down Expand Up @@ -72,12 +72,12 @@ func TestMain(m *testing.M) {
// Build docker image
log.Println("Building docker image...")
cmd := exec.Command("make", "docker-build", fmt.Sprintf("IMG=%s", imageName))
if _, err := test_utils.Run(cmd); err != nil {
if _, err := testUtils.Run(cmd); err != nil {
log.Printf("Failed to build docker image: %s", err)
return ctx, err
}

if err := test_utils.LoadContainerImageToKindCluster(ctx,
if err := testUtils.LoadContainerImageToKindCluster(ctx,
kindCluster,
imageName, containerTool); err != nil {
log.Println(err)
Expand All @@ -87,18 +87,13 @@ func TestMain(m *testing.M) {
return ctx, nil
},

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

log.Println("Installing cert-manager...")
if err := test_utils.InstallCertManager(); err != nil {
log.Printf("Unable to install Cert Manager: %s", err)
}

return ctx, nil
},

Expand All @@ -115,7 +110,7 @@ func TestMain(m *testing.M) {
// install crd
log.Println("Install crd...")
cmd := exec.Command("make", "install")
if _, err := test_utils.Run(cmd); err != nil {
if _, err := testUtils.Run(cmd); err != nil {
log.Printf("Failed to install crd: %s", err)
return ctx, err
}
Expand All @@ -125,7 +120,7 @@ func TestMain(m *testing.M) {

log.Println("Deploying controller-manager resources...")
cmd = exec.Command("make", "deploy", fmt.Sprintf("IMG=%s", imageName))
if _, err := test_utils.Run(cmd); err != nil {
if _, err := testUtils.Run(cmd); err != nil {
log.Printf("Failed to deploy resource configurations: %s", err)
return ctx, err
}
Expand Down Expand Up @@ -162,14 +157,14 @@ func TestMain(m *testing.M) {
// undeploy etcd operator
log.Println("Undeploy etcd controller...")
cmd := exec.Command("make", "undeploy", "ignore-not-found=true")
if _, err := test_utils.Run(cmd); err != nil {
if _, err := testUtils.Run(cmd); err != nil {
log.Printf("Warning: Failed to undeploy controller: %s", err)
}

// uninstall crd
log.Println("Uninstalling crd...")
cmd = exec.Command("make", "uninstall", "ignore-not-found=true")
if _, err := test_utils.Run(cmd); err != nil {
if _, err := testUtils.Run(cmd); err != nil {
log.Printf("Warning: Failed to install crd: %s", err)
}

Expand All @@ -189,10 +184,10 @@ func TestMain(m *testing.M) {
log.Println("Removing dependencies...")

// remove prometheus
test_utils.UninstallPrometheusOperator()
testUtils.UninstallPrometheusOperator()

// remove cert-manager
test_utils.UninstallCertManager()
testUtils.UninstallCertManager()

return ctx, nil
},
Expand Down