HYPERFLEET-786 - chore: align adapter values to Helm chart conventions

Makefile

@@ -175,10 +175,10 @@ install-sentinel-clusters: check-helm check-kubectl check-namespace ## Install S
 	helm upgrade --install $(DRY_RUN_FLAG) $(NAMESPACE)-sentinel-clusters $(HELM_DIR)/sentinel-clusters \
 		--namespace $(NAMESPACE) \
 		--kubeconfig $(KUBECONFIG) \
-		--set sentinel.broker.type=$(BROKER_TYPE) \
-		$(if $(REGISTRY),--set sentinel.image.registry=$(REGISTRY)) \
-		$(if $(SENTINEL_REPOSITORY),--set sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
-		--set sentinel.image.tag=$(SENTINEL_IMAGE_TAG) \
+		--set hyperfleet-sentinel.broker.type=$(BROKER_TYPE) \
+		$(if $(REGISTRY),--set hyperfleet-sentinel.image.registry=$(REGISTRY)) \
+		$(if $(SENTINEL_REPOSITORY),--set hyperfleet-sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
+		--set hyperfleet-sentinel.image.tag=$(SENTINEL_IMAGE_TAG) \
 		$(if $(wildcard $(GENERATED_DIR)/sentinel-clusters.yaml),--values $(GENERATED_DIR)/sentinel-clusters.yaml)
 
 .PHONY: install-sentinel-nodepools
@@ -188,10 +188,10 @@ install-sentinel-nodepools: check-helm check-kubectl check-namespace ## Install
 	helm upgrade --install $(DRY_RUN_FLAG) $(NAMESPACE)-sentinel-nodepools $(HELM_DIR)/sentinel-nodepools \
 		--namespace $(NAMESPACE) \
 		--kubeconfig $(KUBECONFIG) \
-		--set sentinel.broker.type=$(BROKER_TYPE) \
-		$(if $(REGISTRY),--set sentinel.image.registry=$(REGISTRY)) \
-		$(if $(SENTINEL_REPOSITORY),--set sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
-		--set sentinel.image.tag=$(SENTINEL_IMAGE_TAG) \
+		--set hyperfleet-sentinel.broker.type=$(BROKER_TYPE) \
+		$(if $(REGISTRY),--set hyperfleet-sentinel.image.registry=$(REGISTRY)) \
+		$(if $(SENTINEL_REPOSITORY),--set hyperfleet-sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
+		--set hyperfleet-sentinel.image.tag=$(SENTINEL_IMAGE_TAG) \
 		$(if $(wildcard $(GENERATED_DIR)/sentinel-nodepools.yaml),--values $(GENERATED_DIR)/sentinel-nodepools.yaml)
 
 .PHONY: install-adapter1
@@ -321,16 +321,16 @@ validate-helm-charts: check-helm ## Render all Helm charts with helm template (n
 		--set hyperfleet-api.image.tag=$(API_IMAGE_TAG))
 
 	$(call validate-chart,sentinel-clusters,$(SENTINEL_CHART_REF),\
-		--set sentinel.broker.type=$(BROKER_TYPE) \
-		$(if $(REGISTRY),--set sentinel.image.registry=$(REGISTRY)) \
-		$(if $(SENTINEL_REPOSITORY),--set sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
-		--set sentinel.image.tag=$(SENTINEL_IMAGE_TAG))
+		--set hyperfleet-sentinel.broker.type=$(BROKER_TYPE) \
+		$(if $(REGISTRY),--set hyperfleet-sentinel.image.registry=$(REGISTRY)) \
+		$(if $(SENTINEL_REPOSITORY),--set hyperfleet-sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
+		--set hyperfleet-sentinel.image.tag=$(SENTINEL_IMAGE_TAG))
 
 	$(call validate-chart,sentinel-nodepools,$(SENTINEL_CHART_REF),\
-		--set sentinel.broker.type=$(BROKER_TYPE) \
-		$(if $(REGISTRY),--set sentinel.image.registry=$(REGISTRY)) \
-		$(if $(SENTINEL_REPOSITORY),--set sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
-		--set sentinel.image.tag=$(SENTINEL_IMAGE_TAG))
+		--set hyperfleet-sentinel.broker.type=$(BROKER_TYPE) \
+		$(if $(REGISTRY),--set hyperfleet-sentinel.image.registry=$(REGISTRY)) \
+		$(if $(SENTINEL_REPOSITORY),--set hyperfleet-sentinel.image.repository=$(SENTINEL_REPOSITORY)) \
+		--set hyperfleet-sentinel.image.tag=$(SENTINEL_IMAGE_TAG))
 
 	$(call validate-chart,adapter1,$(ADAPTER_CHART_REF),\
 		--set hyperfleet-adapter.broker.type=$(BROKER_TYPE) \

helm/adapter1/Chart.yaml

@@ -7,5 +7,5 @@ appVersion: "1.0.0"
 
 dependencies:
   - name: hyperfleet-adapter
-    version: "1.0.0"
+    version: "2.0.0"
     repository: "git+https://github.com/openshift-hyperfleet/hyperfleet-adapter@charts?ref=main"

helm/adapter1/values.yaml

@@ -3,8 +3,8 @@
 hyperfleet-adapter:
   image:
     # make install will substitute this by data coming from terraform
-    registry: CHANGE_THIS
-    repository: hyperfleet-adapter
+    registry: CHANGE_ME
+    repository: CHANGE_ME
     tag: latest
 
   adapterConfig:
@@ -23,20 +23,20 @@ hyperfleet-adapter:
     type: googlepubsub
     googlepubsub:
       # make install will substitute this by data coming from terraform
-      project_id: CHANGE_THIS
+      projectId: CHANGE_ME
       # make install will substitute this by data coming from terraform
-      subscription_id: CHANGE_THIS
+      subscriptionId: CHANGE_ME
       # make install will substitute this by data coming from terraform
-      topic: CHANGE_THIS
-      dead_letter_topic: ""
-      create_topic_if_missing: true
-      create_subscription_if_missing: true
+      topic: CHANGE_ME
+      deadLetterTopic: ""
+      createTopicIfMissing: true
+      createSubscriptionIfMissing: true
     rabbitmq:
       # make install will substitute this by data coming from tf-helm-values.sh
-      url: CHANGE_THIS
+      url: CHANGE_ME
       queue: ""
       exchange: ""
-      routing_key: ""
+      routingKey: ""
 
   env:
     - name: SIMULATE_RESULT

helm/adapter2/Chart.yaml

@@ -7,5 +7,5 @@ appVersion: "1.0.0"
 
 dependencies:
   - name: hyperfleet-adapter
-    version: "1.0.0"
+    version: "2.0.0"
     repository: "git+https://github.com/openshift-hyperfleet/hyperfleet-adapter@charts?ref=main"

helm/adapter2/values.yaml

@@ -3,8 +3,8 @@
 hyperfleet-adapter:
   image:
     # make install will substitute this by data coming from terraform
-    registry: CHANGE_THIS
-    repository: hyperfleet-adapter
+    registry: CHANGE_ME
+    repository: CHANGE_ME
     tag: latest
 
   adapterConfig:
@@ -19,20 +19,20 @@ hyperfleet-adapter:
     type: googlepubsub
     googlepubsub:
       # make install will substitute this by data coming from terraform
-      project_id: CHANGE_THIS
+      projectId: CHANGE_ME
       # make install will substitute this by data coming from terraform
-      subscription_id: CHANGE_THIS
+      subscriptionId: CHANGE_ME
       # make install will substitute this by data coming from terraform
-      topic: CHANGE_THIS
-      dead_letter_topic: ""
-      create_topic_if_missing: true
-      create_subscription_if_missing: true
+      topic: CHANGE_ME
+      deadLetterTopic: ""
+      createTopicIfMissing: true
+      createSubscriptionIfMissing: true
     rabbitmq:
       # make install will substitute this by data coming from tf-helm-values.sh
-      url: CHANGE_THIS
+      url: CHANGE_ME
       queue: ""
       exchange: ""
-      routing_key: ""
+      routingKey: ""
 
   env:
     - name: SIMULATE_RESULT

helm/adapter3/Chart.yaml

@@ -7,5 +7,5 @@ appVersion: "1.0.0"
 
 dependencies:
   - name: hyperfleet-adapter
-    version: "1.0.0"
+    version: "2.0.0"
     repository: "git+https://github.com/openshift-hyperfleet/hyperfleet-adapter@charts?ref=main"

helm/adapter3/values.yaml

@@ -3,8 +3,8 @@
 hyperfleet-adapter:
   image:
     # make install will substitute this by data coming from terraform
-    registry: CHANGE_THIS
-    repository: hyperfleet-adapter
+    registry: CHANGE_ME
+    repository: CHANGE_ME
     tag: latest
 
   adapterConfig:
@@ -19,20 +19,20 @@ hyperfleet-adapter:
     type: googlepubsub
     googlepubsub:
       # make install will substitute this by data coming from terraform
-      project_id: CHANGE_THIS
+      projectId: CHANGE_ME
       # make install will substitute this by data coming from terraform
-      subscription_id: CHANGE_THIS
+      subscriptionId: CHANGE_ME
       # make install will substitute this by data coming from terraform
-      topic: CHANGE_THIS
-      dead_letter_topic: ""
-      create_topic_if_missing: true
-      create_subscription_if_missing: true
+      topic: CHANGE_ME
+      deadLetterTopic: ""
+      createTopicIfMissing: true
+      createSubscriptionIfMissing: true
     rabbitmq:
       # make install will substitute this by data coming from tf-helm-values.sh
-      url: CHANGE_THIS
+      url: CHANGE_ME
       queue: ""
       exchange: ""
-      routing_key: ""
+      routingKey: ""
 
   env:
     - name: SIMULATE_RESULT

helm/api/values.yaml

@@ -3,7 +3,7 @@
 hyperfleet-api:
   image:
     # make install will substitute this by data coming from terraform
-    registry: CHANGE_THIS
+    registry: CHANGE_ME
   database:
     postgresql:
       enabled: true

helm/sentinel-clusters/Chart.yaml

@@ -6,6 +6,6 @@ version: 0.1.0
 appVersion: "1.0.0"
 
 dependencies:
-  - name: sentinel
-    version: "0.1.0"
+  - name: hyperfleet-sentinel
+    version: "1.0.0"
     repository: "git+https://github.com/openshift-hyperfleet/hyperfleet-sentinel@charts?ref=main"

helm/sentinel-clusters/values.yaml

@@ -1,9 +1,9 @@
 # Default values for Sentinel (clusters)
 
-sentinel:
+hyperfleet-sentinel:
   image:
     # make install will substitute this by data coming from terraform
-    registry: CHANGE_THIS
+    registry: CHANGE_ME
 
   config:
     resourceType: clusters
@@ -14,11 +14,11 @@ sentinel:
   broker:
     type: googlepubsub
     # make install will substitute this by data coming from terraform
-    topic: CHANGE_THIS
+    topic: CHANGE_ME
     googlepubsub:
       # make install will substitute this by data coming from terraform
-      projectId: CHANGE_THIS
+      projectId: CHANGE_ME
     rabbitmq:
       # make install will substitute this by data coming from tf-helm-values.sh
-      url: CHANGE_THIS
+      url: CHANGE_ME
       exchangeType: topic

helm/sentinel-nodepools/Chart.yaml

@@ -6,6 +6,6 @@ version: 0.1.0
 appVersion: "1.0.0"
 
 dependencies:
-  - name: sentinel
-    version: "0.1.0"
+  - name: hyperfleet-sentinel
+    version: "1.0.0"
     repository: "git+https://github.com/openshift-hyperfleet/hyperfleet-sentinel@charts?ref=main"

helm/sentinel-nodepools/values.yaml

@@ -1,9 +1,9 @@
 # Default values for Sentinel (nodepools)
 
-sentinel:
+hyperfleet-sentinel:
   image:
     # make install will substitute this by data coming from terraform
-    registry: CHANGE_THIS
+    registry: CHANGE_ME
 
   config:
     resourceType: nodepools
@@ -23,11 +23,11 @@ sentinel:
   broker:
     type: googlepubsub
     # make install will substitute this by data coming from terraform
-    topic: CHANGE_THIS
+    topic: CHANGE_ME
     googlepubsub:
       # make install will substitute this by data coming from terraform
-      projectId: CHANGE_THIS
+      projectId: CHANGE_ME
     rabbitmq:
       # make install will substitute this by data coming from tf-helm-values.sh
-      url: CHANGE_THIS
+      url: CHANGE_ME
       exchangeType: topic

scripts/tf-helm-values.sh

@@ -63,7 +63,7 @@ if [[ "$BROKER_TYPE" == "googlepubsub" ]]; then
   for resource_type in clusters nodepools; do
     file="${OUT_DIR}/sentinel-${resource_type}.yaml"
     cat > "$file" <<EOF
-sentinel:
+hyperfleet-sentinel:
   broker:
     type: ${BROKER_TYPE}
     topic: ${NS}-${resource_type}
@@ -84,8 +84,8 @@ hyperfleet-adapter:
   broker:
     type: ${BROKER_TYPE}
     googlepubsub:
-      project_id: ${PROJECT_ID}
-      subscription_id: ${NS}-${topic}-${adapter}
+      projectId: ${PROJECT_ID}
+      subscriptionId: ${NS}-${topic}-${adapter}
       topic: ${NS}-${topic}
 EOF
     echo "  wrote ${file}"
@@ -116,7 +116,7 @@ elif [[ "$BROKER_TYPE" == "rabbitmq" ]]; then
   for resource_type in clusters nodepools; do
     file="${OUT_DIR}/sentinel-${resource_type}.yaml"
     cat > "$file" <<EOF
-sentinel:
+hyperfleet-sentinel:
   broker:
     type: rabbitmq
     topic: ${NS}-${resource_type}