From 0cfccafa49c06fa732116d875bc1ddada0f13f99 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 23 Jul 2025 11:42:03 +0300 Subject: [PATCH 1/4] fix: update eventbus type to jetstream in values.yaml --- charts/gitops-runtime/values.yaml | 2 +- tests/component-tests/setup/codefresh-isc | 1 + tests/component-tests/setup/simple-app | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 160000 tests/component-tests/setup/codefresh-isc create mode 160000 tests/component-tests/setup/simple-app diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index ca09fede..ff9422eb 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -89,7 +89,7 @@ global: enabled: true # -- Minimum number of available eventbus pods. For eventbus to stay functional the majority of its replicas should always be available. minAvailable: 2 - type: nats # -- Eventbus type. Can be nats or jetstream. + type: jetstream # -- Eventbus type. Can be nats or jetstream. nats: native: metadata: diff --git a/tests/component-tests/setup/codefresh-isc b/tests/component-tests/setup/codefresh-isc new file mode 160000 index 00000000..36db6073 --- /dev/null +++ b/tests/component-tests/setup/codefresh-isc @@ -0,0 +1 @@ +Subproject commit 36db6073a3c784095872b5243aeb1cbb31f85765 diff --git a/tests/component-tests/setup/simple-app b/tests/component-tests/setup/simple-app new file mode 160000 index 00000000..725c7353 --- /dev/null +++ b/tests/component-tests/setup/simple-app @@ -0,0 +1 @@ +Subproject commit 725c7353bd7859036d547c97b948734c91d30d61 From 9c8b77bc596b99ca66044ea1ff71a6cd94b43f18 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 23 Jul 2025 11:48:45 +0300 Subject: [PATCH 2/4] removed submodules --- tests/component-tests/setup/codefresh-isc | 1 - tests/component-tests/setup/simple-app | 1 - 2 files changed, 2 deletions(-) delete mode 160000 tests/component-tests/setup/codefresh-isc delete mode 160000 tests/component-tests/setup/simple-app diff --git a/tests/component-tests/setup/codefresh-isc b/tests/component-tests/setup/codefresh-isc deleted file mode 160000 index 36db6073..00000000 --- a/tests/component-tests/setup/codefresh-isc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 36db6073a3c784095872b5243aeb1cbb31f85765 diff --git a/tests/component-tests/setup/simple-app b/tests/component-tests/setup/simple-app deleted file mode 160000 index 725c7353..00000000 --- a/tests/component-tests/setup/simple-app +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 725c7353bd7859036d547c97b948734c91d30d61 From 46129732237b35fb276ef0252b181043d4cb3751 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 23 Jul 2025 12:00:09 +0300 Subject: [PATCH 3/4] fixed unit test for default eventbus --- charts/gitops-runtime/tests/eventbus_test.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitops-runtime/tests/eventbus_test.yaml b/charts/gitops-runtime/tests/eventbus_test.yaml index b6ea09ea..d1a79127 100644 --- a/charts/gitops-runtime/tests/eventbus_test.yaml +++ b/charts/gitops-runtime/tests/eventbus_test.yaml @@ -30,12 +30,12 @@ tests: - notExists: path: spec.nats - - it: Should create an EventBus with the correct default name (nats) + - it: Should create an EventBus with the correct default name (jetstream) template: eventbus/codefresh-eventbus.yaml values: - ./values/mandatory-values.yaml set: - global.runtime.eventBus.type: nats + global.runtime.eventBus.type: jetstream asserts: - equal: path: metadata.name From b7bdbdd7d13502c1991dc26ddd62adb53ec1b9b8 Mon Sep 17 00:00:00 2001 From: Noam Gal Date: Wed, 23 Jul 2025 12:29:36 +0300 Subject: [PATCH 4/4] fixed unit test for default eventbus --- charts/gitops-runtime/tests/eventbus_test.yaml | 2 +- charts/gitops-runtime/tests/global_constraints_test.yaml | 8 ++++---- .../tests/values/subcharts-constraints-values.yaml | 7 +++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/charts/gitops-runtime/tests/eventbus_test.yaml b/charts/gitops-runtime/tests/eventbus_test.yaml index d1a79127..37595ef3 100644 --- a/charts/gitops-runtime/tests/eventbus_test.yaml +++ b/charts/gitops-runtime/tests/eventbus_test.yaml @@ -39,7 +39,7 @@ tests: asserts: - equal: path: metadata.name - value: codefresh-eventbus + value: codefresh-eventbus-jetstream - it: Should create an EventBus with the correct override name (nats) template: eventbus/codefresh-eventbus.yaml diff --git a/charts/gitops-runtime/tests/global_constraints_test.yaml b/charts/gitops-runtime/tests/global_constraints_test.yaml index 232a2a2d..c443781d 100644 --- a/charts/gitops-runtime/tests/global_constraints_test.yaml +++ b/charts/gitops-runtime/tests/global_constraints_test.yaml @@ -119,13 +119,13 @@ tests: template: event-reporters/workflow-reporter/sensor.yaml # -- codefresh-eventbus - equal: - path: spec.nats.native.nodeSelector + path: spec.jetstream.nodeSelector value: some-key: some-value extra-key: extra-value template: eventbus/codefresh-eventbus.yaml - equal: - path: spec.nats.native.tolerations + path: spec.jetstream.tolerations value: - key: some-key operator: Equal @@ -456,13 +456,13 @@ tests: template: event-reporters/workflow-reporter/sensor.yaml # -- codefresh-eventbus - equal: - path: spec.nats.native.nodeSelector + path: spec.jetstream.nodeSelector value: some-key: another-value foo: bar template: eventbus/codefresh-eventbus.yaml - equal: - path: spec.nats.native.tolerations + path: spec.jetstream.tolerations value: - key: another-key operator: Equal diff --git a/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml b/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml index ede59046..aca70868 100644 --- a/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml +++ b/charts/gitops-runtime/tests/values/subcharts-constraints-values.yaml @@ -12,10 +12,9 @@ anchors: global: runtime: eventBus: - nats: - native: - nodeSelector: *nodeSelector - tolerations: *tolerations + jetstream: + nodeSelector: *nodeSelector + tolerations: *tolerations app-proxy: nodeSelector: *nodeSelector