diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index aef588108..8fca764c2 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -17,13 +17,13 @@ jobs: - static - helm emqx: - - [EmqxBroker, emqx, "config/samples/emqx/v1beta3/emqxbroker-slim.yaml"] + # - [EmqxBroker, emqx, "config/samples/emqx/v1beta3/emqxbroker-slim.yaml"] # - [EmqxBroker, emqx, "config/samples/emqx/v1beta3/emqxbroker-full.yaml"] - [EmqxEnterprise, emqx-ee, "config/samples/emqx/v1beta3/emqxenterprise-slim.yaml"] # - [EmqxEnterprise, emqx-ee, "config/samples/emqx/v1beta3/emqxenterprise-full.yaml"] - - [EmqxBroker, emqx, "config/samples/emqx/v1beta4/emqxbroker-slim.yaml"] - - [EmqxBroker, emqx, "config/samples/emqx/v1beta4/emqxbroker-full.yaml"] + # - [EmqxBroker, emqx, "config/samples/emqx/v1beta4/emqxbroker-slim.yaml"] + # - [EmqxBroker, emqx, "config/samples/emqx/v1beta4/emqxbroker-full.yaml"] - [EmqxEnterprise, emqx-ee, "config/samples/emqx/v1beta4/emqxenterprise-slim.yaml"] - [EmqxEnterprise, emqx-ee, "config/samples/emqx/v1beta4/emqxenterprise-full.yaml"] diff --git a/e2e/v1beta4/e2e_base_test.go b/e2e/v1beta4/e2e_base_test.go index e727c8ffa..b9470466f 100644 --- a/e2e/v1beta4/e2e_base_test.go +++ b/e2e/v1beta4/e2e_base_test.go @@ -37,41 +37,42 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) -var emqxBroker = &appsv1beta4.EmqxBroker{ - TypeMeta: metav1.TypeMeta{ - Kind: "EmqxBroker", - APIVersion: "apps.emqx.io/v1beta4", - }, - ObjectMeta: metav1.ObjectMeta{ - Name: "emqx", - Namespace: "e2e-test-v1beta4", - Labels: map[string]string{ - "test": "e2e", - }, - }, - Spec: appsv1beta4.EmqxBrokerSpec{ - Replicas: pointer.Int32Ptr(1), - Template: appsv1beta4.EmqxTemplate{ - Spec: appsv1beta4.EmqxTemplateSpec{ - EmqxContainer: appsv1beta4.EmqxContainer{ - Image: appsv1beta4.EmqxImage{ - Repository: "emqx", - Version: "4.4.15", - }, - EmqxConfig: appsv1beta4.EmqxConfig{ - "sysmon.long_schedule": "240h", - }, - BootstrapAPIKeys: []appsv1beta4.BootstrapAPIKey{ - { - Key: "test_key", - Secret: "secret", - }, - }, - }, - }, - }, - }, -} +// EMQX 4 open source edition is no longer supported +// var emqxBroker = &appsv1beta4.EmqxBroker{ +// TypeMeta: metav1.TypeMeta{ +// Kind: "EmqxBroker", +// APIVersion: "apps.emqx.io/v1beta4", +// }, +// ObjectMeta: metav1.ObjectMeta{ +// Name: "emqx", +// Namespace: "e2e-test-v1beta4", +// Labels: map[string]string{ +// "test": "e2e", +// }, +// }, +// Spec: appsv1beta4.EmqxBrokerSpec{ +// Replicas: pointer.Int32Ptr(1), +// Template: appsv1beta4.EmqxTemplate{ +// Spec: appsv1beta4.EmqxTemplateSpec{ +// EmqxContainer: appsv1beta4.EmqxContainer{ +// Image: appsv1beta4.EmqxImage{ +// Repository: "emqx", +// Version: "4.4.15", +// }, +// EmqxConfig: appsv1beta4.EmqxConfig{ +// "sysmon.long_schedule": "240h", +// }, +// BootstrapAPIKeys: []appsv1beta4.BootstrapAPIKey{ +// { +// Key: "test_key", +// Secret: "secret", +// }, +// }, +// }, +// }, +// }, +// }, +// } var emqxEnterprise = &appsv1beta4.EmqxEnterprise{ TypeMeta: metav1.TypeMeta{ @@ -346,7 +347,8 @@ var _ = Describe("Base E2E Test", Label("base"), func() { By("delete EMQX CR and EMQX Plugin") deleteEmqx(emqx) }, - Entry(nil, emqxBroker.DeepCopy(), lwm2m.DeepCopy()), + // EMQX 4 open source edition is no longer supported + // Entry(nil, emqxBroker.DeepCopy(), lwm2m.DeepCopy()), Entry(nil, emqxEnterprise.DeepCopy(), lwm2m.DeepCopy()), ) }) diff --git a/e2e/v1beta4/e2e_upgrade_test.go b/e2e/v1beta4/e2e_upgrade_test.go index 324ce32d3..5f3d8013d 100644 --- a/e2e/v1beta4/e2e_upgrade_test.go +++ b/e2e/v1beta4/e2e_upgrade_test.go @@ -96,7 +96,8 @@ var _ = Describe("Upgrade Test", Label("upgrade"), func() { deleteEmqx(emqx) }) }, - Entry(nil, emqxBroker.DeepCopy()), + // EMQX 4 open source edition is no longer supported + // Entry(nil, emqxBroker.DeepCopy()), Entry(nil, emqxEnterprise.DeepCopy()), ) })