Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions deploy-scripts/lib/adapter.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
6 changes: 3 additions & 3 deletions testdata/adapter-configs/cl-deployment/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions testdata/adapter-configs/cl-invalid-resource/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ 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}
repository: ci/hyperfleet-adapter
repository: ${ADAPTER_IMAGE_REPO}
pullPolicy: Always
tag: latest
tag: ${ADAPTER_IMAGE_TAG}

rbac:
resources:
Expand Down
6 changes: 3 additions & 3 deletions testdata/adapter-configs/cl-job/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions testdata/adapter-configs/cl-maestro/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ 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
repository: ci/hyperfleet-adapter
registry: ${IMAGE_REGISTRY}
repository: ${ADAPTER_IMAGE_REPO}
pullPolicy: Always
tag: latest
tag: ${ADAPTER_IMAGE_TAG}

rbac:
resources:
Expand Down
6 changes: 3 additions & 3 deletions testdata/adapter-configs/cl-namespace/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions testdata/adapter-configs/cl-precondition-error/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ 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}
repository: ci/hyperfleet-adapter
repository: ${ADAPTER_IMAGE_REPO}
pullPolicy: Always
tag: latest
tag: ${ADAPTER_IMAGE_TAG}

rbac:
resources:
Expand Down
6 changes: 3 additions & 3 deletions testdata/adapter-configs/np-configmap/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down