diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatformWithBaseImage.yaml b/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatformWithBaseImage.yaml deleted file mode 100644 index e14e61c93..000000000 --- a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatformWithBaseImage.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessPlatform -metadata: - name: kogito-workflow-platform -spec: - platform: - baseImage: quay.io/customx/custom-swf-builder:24.8.17 - registry: - address: quay.io/kiegroup - secret: regcred diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatformWithDevBaseImage.yaml b/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatformWithDevBaseImage.yaml deleted file mode 100644 index b0b4db473..000000000 --- a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatformWithDevBaseImage.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessPlatform -metadata: - name: kogito-workflow-platform -spec: - devBaseImage: quay.io/customgroup/custom-swf-builder-nightly:42.43.7 - platform: - registry: - address: quay.io/kiegroup - secret: regcred diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache.yaml b/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache.yaml deleted file mode 100644 index b2b12670c..000000000 --- a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessPlatform -metadata: - name: kogito-workflow-platform -spec: - platform: - registry: - address: quay.io/kiegroup - secret: regcred - buildStrategyOptions: - KanikoBuildCacheEnabled: "true" - diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmodeWithExternalResource.yaml b/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmodeWithExternalResource.yaml deleted file mode 100644 index a13ce392a..000000000 --- a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmodeWithExternalResource.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessWorkflow -metadata: - name: greeting - annotations: - sw.kogito.kie.org/description: Greeting example on k8s! - sw.kogito.kie.org/version: 0.0.1 - sw.kogito.kie.org/profile: dev - sw.kogito.kie.org/resource-camel: mycamel-configmap -spec: - flow: - start: ChooseOnLanguage - functions: - - name: greetFunction - type: custom - operation: sysout - states: - - name: ChooseOnLanguage - type: switch - dataConditions: - - condition: "${ .language == \"English\" }" - transition: GreetInEnglish - - condition: "${ .language == \"Spanish\" }" - transition: GreetInSpanish - defaultCondition: GreetInEnglish - - name: GreetInEnglish - type: inject - data: - greeting: "Hello from JSON Workflow, " - transition: GreetPerson - - name: GreetInSpanish - type: inject - data: - greeting: "Saludos desde JSON Workflow, " - transition: GreetPerson - - name: GreetPerson - type: operation - actions: - - name: greetAction - functionRef: - refName: greetFunction - arguments: - message: ".greeting+.name" - end: true - diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_withExplicitProdProfile.yaml b/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_withExplicitProdProfile.yaml deleted file mode 100644 index 802096f38..000000000 --- a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_withExplicitProdProfile.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessWorkflow -metadata: - name: greeting - annotations: - sw.kogito.kie.org/description: Greeting example on k8s! - sw.kogito.kie.org/version: 0.0.1 - sw.kogito.kie.org/profile: prod #It is not mandatory to add this annotation to use the Prod Profile since it's the default one -spec: - flow: - start: ChooseOnLanguage - functions: - - name: greetFunction - type: custom - operation: sysout - states: - - name: ChooseOnLanguage - type: switch - dataConditions: - - condition: "${ .language == \"English\" }" - transition: GreetInEnglish - - condition: "${ .language == \"Spanish\" }" - transition: GreetInSpanish - defaultCondition: GreetInEnglish - - name: GreetInEnglish - type: inject - data: - greeting: "Hello from JSON Workflow, " - transition: GreetPerson - - name: GreetInSpanish - type: inject - data: - greeting: "Saludos desde JSON Workflow, " - transition: GreetPerson - - name: GreetPerson - type: operation - actions: - - name: greetAction - functionRef: - refName: greetFunction - arguments: - message: ".greeting+.name" - end: true diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_withITA.yaml b/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_withITA.yaml deleted file mode 100644 index 50fe4310b..000000000 --- a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_withITA.yaml +++ /dev/null @@ -1,49 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessWorkflow -metadata: - name: greeting - annotations: - sw.kogito.kie.org/description: Greeting example on k8s with Italian! - sw.kogito.kie.org/version: 0.0.2 -spec: - flow: - start: ChooseOnLanguage - functions: - - name: greetFunction - type: custom - operation: sysout - states: - - name: ChooseOnLanguage - type: switch - dataConditions: - - condition: "${ .language == \"English\" }" - transition: GreetInEnglish - - condition: "${ .language == \"Spanish\" }" - transition: GreetInSpanish - - condition: "${ .language == \"Italian\" }" - transition: GreetInItalian - defaultCondition: GreetInEnglish - - name: GreetInEnglish - type: inject - data: - greeting: "Hello from JSON Workflow, " - transition: GreetPerson - - name: GreetInSpanish - type: inject - data: - greeting: "Saludos desde JSON Workflow, " - transition: GreetPerson - - name: GreetInItalian - type: inject - data: - greeting: "Saluti dal JSON Workflow, " - transition: GreetPerson - - name: GreetPerson - type: operation - actions: - - name: greetAction - functionRef: - refName: greetFunction - arguments: - message: ".greeting+.name" - end: true diff --git a/controllers/builder/openshiftbuilder_test.go b/controllers/builder/openshiftbuilder_test.go index 216459012..30e30c175 100644 --- a/controllers/builder/openshiftbuilder_test.go +++ b/controllers/builder/openshiftbuilder_test.go @@ -35,8 +35,8 @@ import ( func Test_openshiftBuilderManager_Reconcile(t *testing.T) { // Setup ns := t.Name() - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, ns) - platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, ns) + workflow := test.GetBaseServerlessWorkflow(ns) + platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name()) config := test.GetKogitoServerlessOperatorBuilderConfig("../../", ns) namespacedName := types.NamespacedName{Namespace: workflow.Namespace, Name: workflow.Name} client := test.NewKogitoClientBuilderWithOpenShift().WithRuntimeObjects(workflow, platform, config).Build() @@ -89,8 +89,8 @@ func Test_openshiftBuilderManager_Reconcile(t *testing.T) { func Test_openshiftbuilder_externalCMs(t *testing.T) { ns := t.Name() - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, ns) - platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, ns) + workflow := test.GetBaseServerlessWorkflow(ns) + platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name()) config := test.GetKogitoServerlessOperatorBuilderConfig("../../", ns) externalCm := &v1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ diff --git a/controllers/kogitoserverlessbuild_controller_test.go b/controllers/kogitoserverlessbuild_controller_test.go index 9aea90492..0ea9aaf2d 100644 --- a/controllers/kogitoserverlessbuild_controller_test.go +++ b/controllers/kogitoserverlessbuild_controller_test.go @@ -31,11 +31,12 @@ import ( func TestKogitoServerlessBuildController(t *testing.T) { namespace := t.Name() - ksw := test.GetKogitoServerlessWorkflow("../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, namespace) + ksw := test.GetBaseServerlessWorkflowNoPackage(namespace) ksb := test.GetNewEmptyKogitoServerlessBuild(ksw.Name, namespace) + cl := test.NewKogitoClientBuilder(). WithRuntimeObjects(ksb, ksw). - WithRuntimeObjects(test.GetKogitoServerlessPlatformInReadyPhase("../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, namespace)). + WithRuntimeObjects(test.GetBasePlatformWithCacheInReadyPhaseNoPackage(namespace)). WithRuntimeObjects(test.GetKogitoServerlessOperatorBuilderConfig("../", namespace)). Build() diff --git a/controllers/kogitoserverlessworkflow_controller_test.go b/controllers/kogitoserverlessworkflow_controller_test.go index d9f132192..3edb1dfdc 100644 --- a/controllers/kogitoserverlessworkflow_controller_test.go +++ b/controllers/kogitoserverlessworkflow_controller_test.go @@ -34,10 +34,10 @@ func TestKogitoServerlessWorkflowController(t *testing.T) { t.Run("verify that a basic reconcile is performed without error", func(t *testing.T) { namespace := t.Name() // Create a KogitoServerlessWorkflow object with metadata and spec. - ksw := test.GetKogitoServerlessWorkflow("../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, namespace) + ksw := test.GetBaseServerlessWorkflowNoPackage(namespace) // The Workflow controller needs at least to perform a call for Platforms, so we need to add this kind to the known // ones by the fake client - ksp := test.GetKogitoServerlessPlatformInReadyPhase("../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, namespace) + ksp := test.GetBasePlatformWithCacheInReadyPhaseNoPackage(namespace) // Objects to track in the fake Client. objs := []runtime.Object{ksw, ksp} diff --git a/controllers/profiles/object_creators_dev_test.go b/controllers/profiles/object_creators_dev_test.go index 88c08d7a8..c0e27d33d 100644 --- a/controllers/profiles/object_creators_dev_test.go +++ b/controllers/profiles/object_creators_dev_test.go @@ -24,7 +24,7 @@ import ( ) func Test_ensureWorkflowDevServiceIsExposed(t *testing.T) { - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) //On Kubernetes we want the service exposed in Dev with NodePort service, _ := devServiceCreator(workflow) diff --git a/controllers/profiles/object_creators_test.go b/controllers/profiles/object_creators_test.go index c43119ec2..12f1e4ede 100644 --- a/controllers/profiles/object_creators_test.go +++ b/controllers/profiles/object_creators_test.go @@ -25,7 +25,7 @@ import ( ) func Test_ensureWorkflowPropertiesConfigMapMutator(t *testing.T) { - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) // can't be new cm, _ := workflowPropsConfigMapCreator(workflow) cm.SetUID("1") diff --git a/controllers/profiles/profile_test.go b/controllers/profiles/profile_test.go index 192a3b626..4d1674dd8 100644 --- a/controllers/profiles/profile_test.go +++ b/controllers/profiles/profile_test.go @@ -23,12 +23,12 @@ import ( ) func Test_workflowIsDevProfile(t *testing.T) { - workflowWithDevProfile := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflowWithDevProfile := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) assert.True(t, IsDevProfile(workflowWithDevProfile)) - workflowWithNoProfile := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name()) + workflowWithNoProfile := test.GetBaseServerlessWorkflow(t.Name()) assert.False(t, IsDevProfile(workflowWithNoProfile)) - workflowWithProdProfile := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowProdProfileSampleYamlCR, t.Name()) + workflowWithProdProfile := test.GetBaseServerlessWorkflowWithProdProfile(t.Name()) assert.False(t, IsDevProfile(workflowWithProdProfile)) } diff --git a/controllers/profiles/reconciler_dev_test.go b/controllers/profiles/reconciler_dev_test.go index 7dcbe87ee..c8898e051 100644 --- a/controllers/profiles/reconciler_dev_test.go +++ b/controllers/profiles/reconciler_dev_test.go @@ -163,7 +163,7 @@ func Test_newDevProfile(t *testing.T) { func Test_devProfileImageDefaultsNoPlatform(t *testing.T) { logger := ctrllog.FromContext(context.TODO()) - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build() config := &rest.Config{} devReconciler := newDevProfileReconciler(client, config, &logger) @@ -179,11 +179,9 @@ func Test_devProfileImageDefaultsNoPlatform(t *testing.T) { func Test_devProfileWithImageSnapshotOverrideWithPlatform(t *testing.T) { logger := ctrllog.FromContext(context.TODO()) - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) - platform := test.GetKogitoServerlessPlatform("../../config/samples/" + test.KogitoServerlessPlatformWithDevBaseImageYamlCR) - platform.Status.Phase = operatorapi.PlatformPhaseReady - platform.Namespace = workflow.Namespace + platform := test.GetBasePlatformWithDevBaseImageInReadyPhase(workflow.Namespace) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build() errCreatePlatform := client.Create(context.Background(), platform) @@ -202,11 +200,9 @@ func Test_devProfileWithImageSnapshotOverrideWithPlatform(t *testing.T) { func Test_devProfileWithWPlatformWithoutDevBaseImageAndWithBaseImage(t *testing.T) { logger := ctrllog.FromContext(context.TODO()) - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) - platform := test.GetKogitoServerlessPlatform("../../config/samples/" + test.KogitoServerlessPlatformWithBaseImageYamlCR) - platform.Status.Phase = operatorapi.PlatformPhaseReady - platform.Namespace = workflow.Namespace + platform := test.GetBasePlatformWithBaseImageInReadyPhase(workflow.Namespace) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build() errCreatePlatform := client.Create(context.Background(), platform) @@ -225,7 +221,7 @@ func Test_devProfileWithWPlatformWithoutDevBaseImageAndWithBaseImage(t *testing. func Test_devProfileWithPlatformWithoutDevBaseImageAndWithoutBaseImage(t *testing.T) { logger := ctrllog.FromContext(context.TODO()) - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name()) platform := test.GetKogitoServerlessPlatform("../../config/samples/" + test.KogitoServerlessPlatformYamlCR) platform.Status.Phase = operatorapi.PlatformPhaseReady @@ -248,7 +244,7 @@ func Test_devProfileWithPlatformWithoutDevBaseImageAndWithoutBaseImage(t *testin func Test_newDevProfileWithExternalConfigMaps(t *testing.T) { logger := ctrllog.FromContext(context.TODO()) - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeWithExternalResourceYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflowWithDevProfileAndExternalResource(t.Name()) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build() config := &rest.Config{} devReconciler := newDevProfileReconciler(client, config, &logger) diff --git a/controllers/profiles/reconciler_prod_test.go b/controllers/profiles/reconciler_prod_test.go index b9ac2b735..cada66456 100644 --- a/controllers/profiles/reconciler_prod_test.go +++ b/controllers/profiles/reconciler_prod_test.go @@ -37,7 +37,7 @@ func Test_reconcilerProdBuildConditions(t *testing.T) { workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name()) // make sure that the workflow won't trigger a change workflow.Status.Applied = workflow.Spec - platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, t.Name()) + platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name()) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow, platform).Build() config := &rest.Config{} @@ -88,7 +88,7 @@ func Test_deployWorkflowReconciliationHandler_handleObjects(t *testing.T) { workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name()) // make sure that the workflow won't trigger a change workflow.Status.Applied = workflow.Spec - platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, t.Name()) + platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name()) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow, platform).Build() handler := &deployWorkflowReconciliationState{ stateSupport: fakeReconcilerSupport(client), @@ -132,10 +132,10 @@ func Test_deployWorkflowReconciliationHandler_handleObjects(t *testing.T) { func Test_GenerationAnnotationCheck(t *testing.T) { logger := ctrllog.FromContext(context.TODO()) // we load a workflow with metadata.generation to 0 - workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name()) + workflow := test.GetBaseServerlessWorkflow(t.Name()) // make sure that the workflow won't trigger a change workflow.Status.Applied = workflow.Spec - platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, t.Name()) + platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name()) client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow, platform).Build() handler := &deployWorkflowReconciliationState{ stateSupport: fakeReconcilerSupport(client), @@ -147,7 +147,9 @@ func Test_GenerationAnnotationCheck(t *testing.T) { assert.NotNil(t, result) assert.Len(t, objects, 3) // then we load a workflow with metadata.generation set to 1 - workflowChanged := test.GetKogitoServerlessWorkflow("../../test/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name()) + workflowChanged := test.GetBaseServerlessWorkflow(t.Name()) + //we set the generation to 1 + workflowChanged.Generation = int64(1) client = test.NewKogitoClientBuilder().WithRuntimeObjects(workflowChanged, platform).Build() handler = &deployWorkflowReconciliationState{ stateSupport: fakeReconcilerSupport(client), diff --git a/test/e2e/workflow_test.go b/test/e2e/workflow_test.go index 46bdff3ad..5f4ef3579 100644 --- a/test/e2e/workflow_test.go +++ b/test/e2e/workflow_test.go @@ -178,7 +178,7 @@ var _ = Describe("Kogito Serverless Operator", Ordered, func() { By("creating an instance of the Kogito Serverless Platform") EventuallyWithOffset(1, func() error { cmd := exec.Command("kubectl", "apply", "-f", filepath.Join(projectDir, - "config/samples/"+test.KogitoServerlessPlatformWithCacheMinikubeYamlCR), "-n", namespace) + "test/samples/"+test.KogitoServerlessPlatformWithCacheMinikubeYamlCR), "-n", namespace) _, err := utils.Run(cmd) return err }, time.Minute, time.Second).Should(Succeed()) @@ -209,7 +209,7 @@ var _ = Describe("Kogito Serverless Operator", Ordered, func() { By("creating an instance of the Kogito Serverless Workflow in DevMode") EventuallyWithOffset(1, func() error { cmd := exec.Command("kubectl", "apply", "-f", filepath.Join(projectDir, - "config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace) + "test/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace) _, err := utils.Run(cmd) return err }, time.Minute, time.Second).Should(Succeed()) @@ -224,7 +224,7 @@ var _ = Describe("Kogito Serverless Operator", Ordered, func() { EventuallyWithOffset(1, func() error { cmd := exec.Command("kubectl", "delete", "-f", filepath.Join(projectDir, - "config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace) + "test/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace) _, err := utils.Run(cmd) return err }, time.Minute, time.Second).Should(Succeed()) diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache_minikube.yaml b/test/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache_minikube.yaml similarity index 100% rename from config/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache_minikube.yaml rename to test/samples/sw.kogito_v1alpha08_kogitoserverlessplatform_withCache_minikube.yaml diff --git a/test/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow.yaml b/test/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow.yaml deleted file mode 100644 index 3a0901254..000000000 --- a/test/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow.yaml +++ /dev/null @@ -1,50 +0,0 @@ -apiVersion: sw.kogito.kie.org/v1alpha08 -kind: KogitoServerlessWorkflow -metadata: - name: greeting - annotations: - sw.kogito.kie.org/description: Greeting example on k8s! - sw.kogito.kie.org/version: 0.0.1 - generation: 1 -spec: - flow: - start: ChooseOnLanguage - functions: - - name: greetFunction - type: custom - operation: sysout - states: - - name: ChooseOnLanguage - type: switch - dataConditions: - - condition: "${ .language == \"English\" }" - transition: GreetInEnglish - - condition: "${ .language == \"Spanish\" }" - transition: GreetInSpanish - - condition: "${ .language == \"Italian\" }" - transition: GreetInItalian - defaultCondition: GreetInEnglish - - name: GreetInEnglish - type: inject - data: - greeting: "Hello from JSON Workflow, " - transition: GreetPerson - - name: GreetInSpanish - type: inject - data: - greeting: "Saludos desde JSON Workflow, " - transition: GreetPerson - - name: GreetInItalian - type: inject - data: - greeting: "Saluti dal JSON Workflow, " - transition: GreetPerson - - name: GreetPerson - type: operation - actions: - - name: greetAction - functionRef: - refName: greetFunction - arguments: - message: ".greeting+.name" - end: true diff --git a/config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmode.yaml b/test/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmode.yaml similarity index 100% rename from config/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmode.yaml rename to test/samples/sw.kogito_v1alpha08_kogitoserverlessworkflow_devmode.yaml diff --git a/test/yaml.go b/test/yaml.go index 2dc8ea69c..d83821e84 100644 --- a/test/yaml.go +++ b/test/yaml.go @@ -28,16 +28,12 @@ import ( ) const ( - KogitoServerlessWorkflowSampleYamlCR = "sw.kogito_v1alpha08_kogitoserverlessworkflow.yaml" - KogitoServerlessWorkflowSampleDevModeYamlCR = "sw.kogito_v1alpha08_kogitoserverlessworkflow_devmode.yaml" - KogitoServerlessWorkflowSampleDevModeWithExternalResourceYamlCR = "sw.kogito_v1alpha08_kogitoserverlessworkflow_devmodeWithExternalResource.yaml" - KogitoServerlessWorkflowProdProfileSampleYamlCR = "sw.kogito_v1alpha08_kogitoserverlessworkflow_withExplicitProdProfile.yaml" - KogitoServerlessPlatformWithCacheYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatform_withCacheAndCustomization.yaml" - KogitoServerlessPlatformWithCacheMinikubeYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatform_withCache_minikube.yaml" - KogitoServerlessPlatformYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatform.yaml" - KogitoServerlessPlatformWithBaseImageYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatformWithBaseImage.yaml" - KogitoServerlessPlatformWithDevBaseImageYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatformWithDevBaseImage.yaml" - kogitoServerlessOperatorBuilderConfig = "kogito-serverless-operator-builder-config_v1_configmap.yaml" + KogitoServerlessWorkflowSampleYamlCR = "sw.kogito_v1alpha08_kogitoserverlessworkflow.yaml" + KogitoServerlessWorkflowSampleDevModeYamlCR = "sw.kogito_v1alpha08_kogitoserverlessworkflow_devmode.yaml" + //KogitoServerlessPlatformWithCacheYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatform_withCacheAndCustomization.yaml" + KogitoServerlessPlatformWithCacheMinikubeYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatform_withCache_minikube.yaml" + KogitoServerlessPlatformYamlCR = "sw.kogito_v1alpha08_kogitoserverlessplatform.yaml" + kogitoServerlessOperatorBuilderConfig = "kogito-serverless-operator-builder-config_v1_configmap.yaml" manifestsPath = "bundle/manifests/" ) @@ -119,3 +115,60 @@ func GetKogitoServerlessOperatorBuilderConfig(path, namespace string) *corev1.Co cm.Namespace = namespace return cm } + +func GetBaseServerlessWorkflow(namespace string) *operatorapi.KogitoServerlessWorkflow { + return GetKogitoServerlessWorkflow("../../config/samples/"+KogitoServerlessWorkflowSampleYamlCR, namespace) +} + +func GetBaseServerlessWorkflowNoPackage(namespace string) *operatorapi.KogitoServerlessWorkflow { + return GetKogitoServerlessWorkflow("../config/samples/"+KogitoServerlessWorkflowSampleYamlCR, namespace) +} + +func GetBaseServerlessWorkflowWithDevProfile(namespace string) *operatorapi.KogitoServerlessWorkflow { + workflow := GetBaseServerlessWorkflow(namespace) + workflow.Annotations["sw.kogito.kie.org/profile"] = "dev" + return workflow +} + +func GetBaseServerlessWorkflowWithDevProfileAndExternalResource(namespace string) *operatorapi.KogitoServerlessWorkflow { + workflow := GetBaseServerlessWorkflowWithDevProfile(namespace) + workflow.Annotations["sw.kogito.kie.org/resource-camel"] = "mycamel-configmap" + return workflow +} + +func GetBaseServerlessWorkflowWithProdProfile(namespace string) *operatorapi.KogitoServerlessWorkflow { + workflow := GetBaseServerlessWorkflow(namespace) + workflow.Annotations["sw.kogito.kie.org/profile"] = "prod" + return workflow +} + +func GetBasePlatformWithCacheInReadyPhase(namespace string) *operatorapi.KogitoServerlessPlatform { + return getBasePlatformWithCacheInReadyPhaseNoPackage("../../config/samples/", namespace) +} + +func GetBasePlatformWithCacheInReadyPhaseNoPackage(namespace string) *operatorapi.KogitoServerlessPlatform { + return getBasePlatformWithCacheInReadyPhaseNoPackage("../config/samples/", namespace) +} + +func GetBasePlatformWithBaseImageInReadyPhase(namespace string) *operatorapi.KogitoServerlessPlatform { + platform := GetKogitoServerlessPlatform("../../config/samples/" + KogitoServerlessPlatformYamlCR) + platform.Namespace = namespace + platform.Status.Phase = operatorapi.PlatformPhaseReady + platform.Spec.BuildPlatform.BaseImage = "quay.io/customx/custom-swf-builder:24.8.17" + return platform +} + +func GetBasePlatformWithDevBaseImageInReadyPhase(namespace string) *operatorapi.KogitoServerlessPlatform { + platform := GetKogitoServerlessPlatform("../../config/samples/" + KogitoServerlessPlatformYamlCR) + platform.Namespace = namespace + platform.Status.Phase = operatorapi.PlatformPhaseReady + platform.Spec.DevBaseImage = "quay.io/customgroup/custom-swf-builder-nightly:42.43.7" + return platform +} + +func getBasePlatformWithCacheInReadyPhaseNoPackage(path string, namespace string) *operatorapi.KogitoServerlessPlatform { + platform := GetKogitoServerlessPlatformInReadyPhase(path+KogitoServerlessPlatformYamlCR, namespace) + buildStrategyOptions := map[string]string{"KanikoBuildCacheEnabled": "true"} + platform.Spec.BuildPlatform.BuildStrategyOptions = buildStrategyOptions + return platform +}