Skip to content

Commit b5f35ab

Browse files
xueli181114xueli181114
committed
HYPERFLEET-786 - chore: align Helm values with chart conventions standard
Convert broker keys from snake_case to camelCase in adapter values. Unify all placeholder values to CHANGE_ME across adapter, sentinel, and API umbrella charts. Update tf-helm-values.sh to generate camelCase keys.
1 parent 0e10806 commit b5f35ab

7 files changed

Lines changed: 41 additions & 41 deletions

File tree

‎helm/adapter1/values.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
hyperfleet-adapter:
44
image:
55
# make install will substitute this by data coming from terraform
6-
registry: CHANGE_THIS
7-
repository: hyperfleet-adapter
6+
registry: CHANGE_ME
7+
repository: CHANGE_ME
88
tag: latest
99

1010
adapterConfig:
@@ -23,20 +23,20 @@ hyperfleet-adapter:
2323
type: googlepubsub
2424
googlepubsub:
2525
# make install will substitute this by data coming from terraform
26-
project_id: CHANGE_THIS
26+
projectId: CHANGE_ME
2727
# make install will substitute this by data coming from terraform
28-
subscription_id: CHANGE_THIS
28+
subscriptionId: CHANGE_ME
2929
# make install will substitute this by data coming from terraform
30-
topic: CHANGE_THIS
31-
dead_letter_topic: ""
32-
create_topic_if_missing: true
33-
create_subscription_if_missing: true
30+
topic: CHANGE_ME
31+
deadLetterTopic: ""
32+
createTopicIfMissing: true
33+
createSubscriptionIfMissing: true
3434
rabbitmq:
3535
# make install will substitute this by data coming from tf-helm-values.sh
36-
url: CHANGE_THIS
36+
url: CHANGE_ME
3737
queue: ""
3838
exchange: ""
39-
routing_key: ""
39+
routingKey: ""
4040

4141
env:
4242
- name: SIMULATE_RESULT

‎helm/adapter2/values.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
hyperfleet-adapter:
44
image:
55
# make install will substitute this by data coming from terraform
6-
registry: CHANGE_THIS
7-
repository: hyperfleet-adapter
6+
registry: CHANGE_ME
7+
repository: CHANGE_ME
88
tag: latest
99

1010
adapterConfig:
@@ -19,20 +19,20 @@ hyperfleet-adapter:
1919
type: googlepubsub
2020
googlepubsub:
2121
# make install will substitute this by data coming from terraform
22-
project_id: CHANGE_THIS
22+
projectId: CHANGE_ME
2323
# make install will substitute this by data coming from terraform
24-
subscription_id: CHANGE_THIS
24+
subscriptionId: CHANGE_ME
2525
# make install will substitute this by data coming from terraform
26-
topic: CHANGE_THIS
27-
dead_letter_topic: ""
28-
create_topic_if_missing: true
29-
create_subscription_if_missing: true
26+
topic: CHANGE_ME
27+
deadLetterTopic: ""
28+
createTopicIfMissing: true
29+
createSubscriptionIfMissing: true
3030
rabbitmq:
3131
# make install will substitute this by data coming from tf-helm-values.sh
32-
url: CHANGE_THIS
32+
url: CHANGE_ME
3333
queue: ""
3434
exchange: ""
35-
routing_key: ""
35+
routingKey: ""
3636

3737
env:
3838
- name: SIMULATE_RESULT

‎helm/adapter3/values.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
hyperfleet-adapter:
44
image:
55
# make install will substitute this by data coming from terraform
6-
registry: CHANGE_THIS
7-
repository: hyperfleet-adapter
6+
registry: CHANGE_ME
7+
repository: CHANGE_ME
88
tag: latest
99

1010
adapterConfig:
@@ -19,20 +19,20 @@ hyperfleet-adapter:
1919
type: googlepubsub
2020
googlepubsub:
2121
# make install will substitute this by data coming from terraform
22-
project_id: CHANGE_THIS
22+
projectId: CHANGE_ME
2323
# make install will substitute this by data coming from terraform
24-
subscription_id: CHANGE_THIS
24+
subscriptionId: CHANGE_ME
2525
# make install will substitute this by data coming from terraform
26-
topic: CHANGE_THIS
27-
dead_letter_topic: ""
28-
create_topic_if_missing: true
29-
create_subscription_if_missing: true
26+
topic: CHANGE_ME
27+
deadLetterTopic: ""
28+
createTopicIfMissing: true
29+
createSubscriptionIfMissing: true
3030
rabbitmq:
3131
# make install will substitute this by data coming from tf-helm-values.sh
32-
url: CHANGE_THIS
32+
url: CHANGE_ME
3333
queue: ""
3434
exchange: ""
35-
routing_key: ""
35+
routingKey: ""
3636

3737
env:
3838
- name: SIMULATE_RESULT

‎helm/api/values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
hyperfleet-api:
44
image:
55
# make install will substitute this by data coming from terraform
6-
registry: CHANGE_THIS
6+
registry: CHANGE_ME
77
database:
88
postgresql:
99
enabled: true

‎helm/sentinel-clusters/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
sentinel:
44
image:
55
# make install will substitute this by data coming from terraform
6-
registry: CHANGE_THIS
6+
registry: CHANGE_ME
77

88
config:
99
resourceType: clusters
@@ -14,11 +14,11 @@ sentinel:
1414
broker:
1515
type: googlepubsub
1616
# make install will substitute this by data coming from terraform
17-
topic: CHANGE_THIS
17+
topic: CHANGE_ME
1818
googlepubsub:
1919
# make install will substitute this by data coming from terraform
20-
projectId: CHANGE_THIS
20+
projectId: CHANGE_ME
2121
rabbitmq:
2222
# make install will substitute this by data coming from tf-helm-values.sh
23-
url: CHANGE_THIS
23+
url: CHANGE_ME
2424
exchangeType: topic

‎helm/sentinel-nodepools/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
sentinel:
44
image:
55
# make install will substitute this by data coming from terraform
6-
registry: CHANGE_THIS
6+
registry: CHANGE_ME
77

88
config:
99
resourceType: nodepools
@@ -23,11 +23,11 @@ sentinel:
2323
broker:
2424
type: googlepubsub
2525
# make install will substitute this by data coming from terraform
26-
topic: CHANGE_THIS
26+
topic: CHANGE_ME
2727
googlepubsub:
2828
# make install will substitute this by data coming from terraform
29-
projectId: CHANGE_THIS
29+
projectId: CHANGE_ME
3030
rabbitmq:
3131
# make install will substitute this by data coming from tf-helm-values.sh
32-
url: CHANGE_THIS
32+
url: CHANGE_ME
3333
exchangeType: topic

‎scripts/tf-helm-values.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@ hyperfleet-adapter:
8484
broker:
8585
type: ${BROKER_TYPE}
8686
googlepubsub:
87-
project_id: ${PROJECT_ID}
88-
subscription_id: ${NS}-${topic}-${adapter}
87+
projectId: ${PROJECT_ID}
88+
subscriptionId: ${NS}-${topic}-${adapter}
8989
topic: ${NS}-${topic}
9090
EOF
9191
echo " wrote ${file}"

0 commit comments

Comments
 (0)