Update Helm templates to use consistent naming for replicaCount acros…

…s ingest services
OneUptime · Nov 21, 2024 · 23c169c · 23c169c
1 parent 6c4a4ca
commit 23c169c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 26 deletions.
diff --git a/HelmChart/Public/oneuptime/templates/fluent-ingest.yaml b/HelmChart/Public/oneuptime/templates/fluent-ingest.yaml
@@ -15,8 +15,8 @@ spec:
   selector:
     matchLabels:
       app: {{ printf "%s-%s" $.Release.Name "fluent-ingest"  }}
-  {{- if $.Values.deployment.fluent-ingest.replicaCount }}
-  replicas: {{ $.Values.deployment.fluent-ingest.replicaCount }}
+  {{- if $.Values.deployment.fluentIngest.replicaCount }}
+  replicas: {{ $.Values.deployment.fluentIngest.replicaCount }}
   {{- else }}
   replicas: {{ $.Values.deployment.replicaCount }}
   {{- end }}
@@ -100,12 +100,12 @@ spec:
 ---
 
 # OneUptime fluent-ingest Service
-{{- $fluent-ingestPorts := dict "port" $.Values.port.fluentIngest -}}
-{{- $fluent-ingestServiceArgs := dict "ServiceName" "fluent-ingest" "Ports" $fluent-ingestPorts "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.service" $fluent-ingestServiceArgs }}
+{{- $fluentIngestPorts := dict "port" $.Values.port.fluentIngest -}}
+{{- $fluentIngestServiceArgs := dict "ServiceName" "fluent-ingest" "Ports" $fluentIngestPorts "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.service" $fluentIngestServiceArgs }}
 ---
 
 # OneUptime fluent-ingest autoscaler
-{{- $fluent-ingestAutoScalerArgs := dict "ServiceName" "fluent-ingest" "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.autoscaler" $fluent-ingestAutoScalerArgs }}
+{{- $fluentIngestAutoScalerArgs := dict "ServiceName" "fluent-ingest" "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.autoscaler" $fluentIngestAutoScalerArgs }}
 ---
diff --git a/HelmChart/Public/oneuptime/templates/incoming-request-ingest.yaml b/HelmChart/Public/oneuptime/templates/incoming-request-ingest.yaml
@@ -15,8 +15,8 @@ spec:
   selector:
     matchLabels:
       app: {{ printf "%s-%s" $.Release.Name "incoming-request-ingest"  }}
-  {{- if $.Values.deployment.incoming-request-ingest.replicaCount }}
-  replicas: {{ $.Values.deployment.incoming-request-ingest.replicaCount }}
+  {{- if $.Values.deployment.incomingRequestIngest.replicaCount }}
+  replicas: {{ $.Values.deployment.incomingRequestIngest.replicaCount }}
   {{- else }}
   replicas: {{ $.Values.deployment.replicaCount }}
   {{- end }}
@@ -100,12 +100,12 @@ spec:
 ---
 
 # OneUptime incoming-request-ingest Service
-{{- $incoming-request-ingestPorts := dict "port" $.Values.port.incomingRequestIngest -}}
-{{- $incoming-request-ingestServiceArgs := dict "ServiceName" "incoming-request-ingest" "Ports" $incoming-request-ingestPorts "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.service" $incoming-request-ingestServiceArgs }}
+{{- $incomingRequestIngestPorts := dict "port" $.Values.port.incomingRequestIngest -}}
+{{- $incomingRequestIngestServiceArgs := dict "ServiceName" "incoming-request-ingest" "Ports" $incomingRequestIngestPorts "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.service" $incomingRequestIngestServiceArgs }}
 ---
 
 # OneUptime incoming-request-ingest autoscaler
-{{- $incoming-request-ingestAutoScalerArgs := dict "ServiceName" "incoming-request-ingest" "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.autoscaler" $incoming-request-ingestAutoScalerArgs }}
+{{- $incomingRequestIngestAutoScalerArgs := dict "ServiceName" "incoming-request-ingest" "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.autoscaler" $incomingRequestIngestAutoScalerArgs }}
 ---
diff --git a/HelmChart/Public/oneuptime/templates/open-telemetry-ingest.yaml b/HelmChart/Public/oneuptime/templates/open-telemetry-ingest.yaml
@@ -15,8 +15,8 @@ spec:
   selector:
     matchLabels:
       app: {{ printf "%s-%s" $.Release.Name "open-telemetry-ingest"  }}
-  {{- if $.Values.deployment.open-telemetry-ingest.replicaCount }}
-  replicas: {{ $.Values.deployment.open-telemetry-ingest.replicaCount }}
+  {{- if $.Values.deployment.openTelemetryIngest.replicaCount }}
+  replicas: {{ $.Values.deployment.openTelemetryIngest.replicaCount }}
   {{- else }}
   replicas: {{ $.Values.deployment.replicaCount }}
   {{- end }}
@@ -100,12 +100,12 @@ spec:
 ---
 
 # OneUptime open-telemetry-ingest Service
-{{- $open-telemetry-ingestPorts := dict "port" $.Values.port.openTelemetryIngest -}}
-{{- $open-telemetry-ingestServiceArgs := dict "ServiceName" "open-telemetry-ingest" "Ports" $open-telemetry-ingestPorts "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.service" $open-telemetry-ingestServiceArgs }}
+{{- $openTelemetryIngestPorts := dict "port" $.Values.port.openTelemetryIngest -}}
+{{- $openTelemetryIngestServiceArgs := dict "ServiceName" "open-telemetry-ingest" "Ports" $openTelemetryIngestPorts "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.service" $openTelemetryIngestServiceArgs }}
 ---
 
 # OneUptime open-telemetry-ingest autoscaler
-{{- $open-telemetry-ingestAutoScalerArgs := dict "ServiceName" "open-telemetry-ingest" "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.autoscaler" $open-telemetry-ingestAutoScalerArgs }}
+{{- $openTelemetryIngestAutoScalerArgs := dict "ServiceName" "open-telemetry-ingest" "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.autoscaler" $openTelemetryIngestAutoScalerArgs }}
 ---
diff --git a/HelmChart/Public/oneuptime/templates/probe-ingest.yaml b/HelmChart/Public/oneuptime/templates/probe-ingest.yaml
@@ -100,12 +100,12 @@ spec:
 ---
 
 # OneUptime probe-ingest Service
-{{- $probe-ingestPorts := dict "port" $.Values.port.probeIngest -}}
-{{- $probe-ingestServiceArgs := dict "ServiceName" "probe-ingest" "Ports" $probe-ingestPorts "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.service" $probe-ingestServiceArgs }}
+{{- $probeIngestPorts := dict "port" $.Values.port.probeIngest -}}
+{{- $probeIngestServiceArgs := dict "ServiceName" "probe-ingest" "Ports" $probeIngestPorts "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.service" $probeIngestServiceArgs }}
 ---
 
 # OneUptime probe-ingest autoscaler
-{{- $probe-ingestAutoScalerArgs := dict "ServiceName" "probe-ingest" "Release" $.Release "Values" $.Values -}}
-{{- include "oneuptime.autoscaler" $probe-ingestAutoScalerArgs }}
+{{- $probeIngestAutoScalerArgs := dict "ServiceName" "probe-ingest" "Release" $.Release "Values" $.Values -}}
+{{- include "oneuptime.autoscaler" $probeIngestAutoScalerArgs }}
 ---
diff --git a/HelmChart/Public/oneuptime/values.yaml b/HelmChart/Public/oneuptime/values.yaml
@@ -32,6 +32,12 @@ deployment:
   replicaCount: 1
   probeIngest:
     replicaCount:
+  openTelemetryIngest: 
+    replicaCount:
+  fluentIngest:
+    replicaCount:
+  incomingRequestIngest:
+    replicaCount:
 
 metalLb:
   enabled: false