From 47dbd6a3ab0b1c3f5303febd2da0a2666c375448 Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Thu, 19 Mar 2026 14:11:50 -0300 Subject: [PATCH 1/3] fix: align broker Helm values with adapter chart snake_case convention MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The hyperfleet-adapter chart (HYPERFLEET-551) renamed all broker config fields from camelCase to snake_case (e.g. projectId → project_id). The E2E deploy scripts and adapter values.yaml files still used the old camelCase keys, causing Helm to pass empty values and the adapter deployment to crash on startup. --- deploy-scripts/lib/adapter.sh | 10 +++++----- testdata/adapter-configs/cl-deployment/values.yaml | 6 +++--- .../adapter-configs/cl-invalid-resource/values.yaml | 10 +++++----- testdata/adapter-configs/cl-job/values.yaml | 6 +++--- testdata/adapter-configs/cl-maestro/values.yaml | 6 +++--- testdata/adapter-configs/cl-namespace/values.yaml | 6 +++--- .../adapter-configs/cl-precondition-error/values.yaml | 10 +++++----- testdata/adapter-configs/np-configmap/values.yaml | 6 +++--- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/deploy-scripts/lib/adapter.sh b/deploy-scripts/lib/adapter.sh index f152f60..bb4dfa4 100755 --- a/deploy-scripts/lib/adapter.sh +++ b/deploy-scripts/lib/adapter.sh @@ -179,12 +179,12 @@ install_adapter_instance() { --set "image.registry=${IMAGE_REGISTRY}" --set "image.repository=${ADAPTER_IMAGE_REPO}" --set "image.tag=${ADAPTER_IMAGE_TAG}" - --set "broker.googlepubsub.projectId=${GCP_PROJECT_ID}" - --set "broker.googlepubsub.createTopicIfMissing=${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}" - --set "broker.googlepubsub.createSubscriptionIfMissing=${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}" - --set "broker.googlepubsub.subscriptionId=${subscription_id}" + --set "broker.googlepubsub.project_id=${GCP_PROJECT_ID}" + --set "broker.googlepubsub.create_topic_if_missing=${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING}" + --set "broker.googlepubsub.create_subscription_if_missing=${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING}" + --set "broker.googlepubsub.subscription_id=${subscription_id}" --set "broker.googlepubsub.topic=${topic}" - --set "broker.googlepubsub.deadLetterTopic=${dead_letter_topic}" + --set "broker.googlepubsub.dead_letter_topic=${dead_letter_topic}" ) log_info "Executing Helm command:" diff --git a/testdata/adapter-configs/cl-deployment/values.yaml b/testdata/adapter-configs/cl-deployment/values.yaml index c2fc9d5..2c4fcda 100644 --- a/testdata/adapter-configs/cl-deployment/values.yaml +++ b/testdata/adapter-configs/cl-deployment/values.yaml @@ -14,10 +14,10 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: CHANGE_ME - subscriptionId: CHANGE_ME + project_id: CHANGE_ME + subscription_id: CHANGE_ME topic: CHANGE_ME - deadLetterTopic: CHANGE_ME + dead_letter_topic: CHANGE_ME image: registry: CHANGE_ME diff --git a/testdata/adapter-configs/cl-invalid-resource/values.yaml b/testdata/adapter-configs/cl-invalid-resource/values.yaml index 849b340..d221e12 100644 --- a/testdata/adapter-configs/cl-invalid-resource/values.yaml +++ b/testdata/adapter-configs/cl-invalid-resource/values.yaml @@ -13,12 +13,12 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: ${GCP_PROJECT_ID} - subscriptionId: ${NAMESPACE}-clusters-${ADAPTER_NAME} + project_id: ${GCP_PROJECT_ID} + subscription_id: ${NAMESPACE}-clusters-${ADAPTER_NAME} topic: ${NAMESPACE}-clusters - deadLetterTopic: ${NAMESPACE}-clusters-dlq - createTopicIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING} - createSubscriptionIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING} + dead_letter_topic: ${NAMESPACE}-clusters-dlq + create_topic_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING} + create_subscription_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING} image: registry: ${IMAGE_REGISTRY} diff --git a/testdata/adapter-configs/cl-job/values.yaml b/testdata/adapter-configs/cl-job/values.yaml index 106cdbc..2fafdaa 100644 --- a/testdata/adapter-configs/cl-job/values.yaml +++ b/testdata/adapter-configs/cl-job/values.yaml @@ -17,10 +17,10 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: CHANGE_ME - subscriptionId: CHANGE_ME + project_id: CHANGE_ME + subscription_id: CHANGE_ME topic: CHANGE_ME - deadLetterTopic: CHANGE_ME + dead_letter_topic: CHANGE_ME image: registry: CHANGE_ME diff --git a/testdata/adapter-configs/cl-maestro/values.yaml b/testdata/adapter-configs/cl-maestro/values.yaml index a1f39d9..ff07e89 100644 --- a/testdata/adapter-configs/cl-maestro/values.yaml +++ b/testdata/adapter-configs/cl-maestro/values.yaml @@ -13,10 +13,10 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: CHANGE_ME - subscriptionId: CHANGE_ME + project_id: CHANGE_ME + subscription_id: CHANGE_ME topic: CHANGE_ME - deadLetterTopic: CHANGE_ME + dead_letter_topic: CHANGE_ME image: registry: CHANGE_ME diff --git a/testdata/adapter-configs/cl-namespace/values.yaml b/testdata/adapter-configs/cl-namespace/values.yaml index 97efc14..5185ed8 100644 --- a/testdata/adapter-configs/cl-namespace/values.yaml +++ b/testdata/adapter-configs/cl-namespace/values.yaml @@ -13,10 +13,10 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: CHANGE_ME - subscriptionId: CHANGE_ME + project_id: CHANGE_ME + subscription_id: CHANGE_ME topic: CHANGE_ME - deadLetterTopic: CHANGE_ME + dead_letter_topic: CHANGE_ME image: registry: CHANGE_ME diff --git a/testdata/adapter-configs/cl-precondition-error/values.yaml b/testdata/adapter-configs/cl-precondition-error/values.yaml index 82996a7..5f7e0a9 100644 --- a/testdata/adapter-configs/cl-precondition-error/values.yaml +++ b/testdata/adapter-configs/cl-precondition-error/values.yaml @@ -13,12 +13,12 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: ${GCP_PROJECT_ID} - subscriptionId: ${NAMESPACE}-clusters-${ADAPTER_NAME} + project_id: ${GCP_PROJECT_ID} + subscription_id: ${NAMESPACE}-clusters-${ADAPTER_NAME} topic: ${NAMESPACE}-clusters - deadLetterTopic: ${NAMESPACE}-clusters-dlq - createTopicIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING} - createSubscriptionIfMissing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING} + dead_letter_topic: ${NAMESPACE}-clusters-dlq + create_topic_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_TOPIC_IF_MISSING} + create_subscription_if_missing: ${ADAPTER_GOOGLEPUBSUB_CREATE_SUBSCRIPTION_IF_MISSING} image: registry: ${IMAGE_REGISTRY} diff --git a/testdata/adapter-configs/np-configmap/values.yaml b/testdata/adapter-configs/np-configmap/values.yaml index 877fbed..d5ab162 100644 --- a/testdata/adapter-configs/np-configmap/values.yaml +++ b/testdata/adapter-configs/np-configmap/values.yaml @@ -14,10 +14,10 @@ adapterTaskConfig: broker: create: true googlepubsub: - projectId: CHANGE_ME - subscriptionId: CHANGE_ME + project_id: CHANGE_ME + subscription_id: CHANGE_ME topic: CHANGE_ME - deadLetterTopic: CHANGE_ME + dead_letter_topic: CHANGE_ME image: registry: CHANGE_ME From 1e18b8d9424f95668f1c665fce88b9391f74223e Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Thu, 19 Mar 2026 19:10:42 -0300 Subject: [PATCH 2/3] fix: use env vars for adapter image in error test configs Replace hardcoded `ci/hyperfleet-adapter:latest` with `${ADAPTER_IMAGE_REPO}:${ADAPTER_IMAGE_TAG}` in cl-invalid-resource and cl-precondition-error values.yaml to match the pattern used by other adapter configs and allow testing with custom image builds. --- testdata/adapter-configs/cl-invalid-resource/values.yaml | 4 ++-- testdata/adapter-configs/cl-precondition-error/values.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/testdata/adapter-configs/cl-invalid-resource/values.yaml b/testdata/adapter-configs/cl-invalid-resource/values.yaml index d221e12..dd757d8 100644 --- a/testdata/adapter-configs/cl-invalid-resource/values.yaml +++ b/testdata/adapter-configs/cl-invalid-resource/values.yaml @@ -22,9 +22,9 @@ broker: image: registry: ${IMAGE_REGISTRY} - repository: ci/hyperfleet-adapter + repository: ${ADAPTER_IMAGE_REPO} pullPolicy: Always - tag: latest + tag: ${ADAPTER_IMAGE_TAG} rbac: resources: diff --git a/testdata/adapter-configs/cl-precondition-error/values.yaml b/testdata/adapter-configs/cl-precondition-error/values.yaml index 5f7e0a9..cc270af 100644 --- a/testdata/adapter-configs/cl-precondition-error/values.yaml +++ b/testdata/adapter-configs/cl-precondition-error/values.yaml @@ -22,9 +22,9 @@ broker: image: registry: ${IMAGE_REGISTRY} - repository: ci/hyperfleet-adapter + repository: ${ADAPTER_IMAGE_REPO} pullPolicy: Always - tag: latest + tag: ${ADAPTER_IMAGE_TAG} rbac: resources: From e2bdaa342857f31ffe04bb84290ed6d7dfbd268b Mon Sep 17 00:00:00 2001 From: Rafael Benevides Date: Thu, 19 Mar 2026 22:39:14 -0300 Subject: [PATCH 3/3] fix: use env vars for adapter image in cl-maestro values.yaml Replace hardcoded `ci/hyperfleet-adapter:latest` with `${ADAPTER_IMAGE_REPO}:${ADAPTER_IMAGE_TAG}` to match the pattern used by other adapter configs. Keep broker `CHANGE_ME` placeholders as maestro transport requires specific configuration. --- testdata/adapter-configs/cl-maestro/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testdata/adapter-configs/cl-maestro/values.yaml b/testdata/adapter-configs/cl-maestro/values.yaml index ff07e89..d5796d5 100644 --- a/testdata/adapter-configs/cl-maestro/values.yaml +++ b/testdata/adapter-configs/cl-maestro/values.yaml @@ -19,10 +19,10 @@ broker: dead_letter_topic: CHANGE_ME image: - registry: CHANGE_ME - repository: ci/hyperfleet-adapter + registry: ${IMAGE_REGISTRY} + repository: ${ADAPTER_IMAGE_REPO} pullPolicy: Always - tag: latest + tag: ${ADAPTER_IMAGE_TAG} rbac: resources: