#300 Correct shs ports

boozallen · Sep 9, 2024 · 42ec405 · 42ec405
1 parent a173fd1
commit 42ec405
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 8 deletions.
diff --git a/...lm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/README.md b/...lm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/README.md
@@ -99,10 +99,17 @@ If you are migrating from the v1 version of the spark-infrastructure chart, use
 existing customizations from the old chart to the new v2 chart.
 
 ## Property Location
-All properties listed below have been moved to the parent chart. If any properties are set to the default value, we 
+
+All properties listed below have been moved to the parent chart. If any properties are set to the default value, we
 recommend removing them from your values file entirely.
 
 **Note**: *all new property locations include the prefix `aissemble-spark-history-chart.`*
 
+| Old Property Location | New Property Location | 
+|-----------------------|-----------------------|
+| deployment.ports[]    | service.port          |
+| service.spec.ports[]  | service.port          |
+
 ## Property Removed
-The following properties no longer exist.
+
+No properties removed.
diff --git a/...ensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/deployment.yaml b/...ensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/deployment.yaml
@@ -80,7 +80,7 @@ spec:
                   key: {{ $v.key }}
             {{- end }}
           ports:
-            - containerPort: 18080
+            - containerPort: {{ .Values.service.port.port }}
               name: {{ .Values.service.port.name }}
           volumeMounts:
             {{- if or (not (empty .Values.dependencies.packages)) (not (empty .Values.dependencies.jars)) }}

diff --git a/...extensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/service.yaml b/...extensions-helm-spark-infrastructure/aissemble-spark-history-chart/templates/service.yaml
@@ -11,8 +11,8 @@ spec:
   selector:
     app: {{ .Release.Name }}
   ports:
-    - name: {{ .Release.Name }}-service-port
+    - name: {{ .Values.service.port.name }}
       protocol: TCP
       port: {{ .Values.service.port.port }}
-      targetPort: shs-http
+      targetPort: {{ .Values.service.port.targetPort }}
 {{- end }}
diff --git a/...nsions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/deployment_test.yaml b/...nsions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/deployment_test.yaml
@@ -356,6 +356,8 @@ tests:
                 key: secret_key
 
   - it: The appropriate containerPort is exposed to reach Spark History (18080)
+    set:
+      service.port.port: 18080
     asserts:
       - contains:
           path: spec.template.spec.containers[0].ports
@@ -375,4 +377,4 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].ports[0].name
-          value: "port-name"
+          value: "port-name"
diff --git a/...xtensions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/service_test.yaml b/...xtensions-helm-spark-infrastructure/aissemble-spark-history-chart/tests/service_test.yaml
@@ -31,10 +31,10 @@ tests:
       - contains:
           path: spec.ports
           content:
-            name: RELEASE-NAME-service-port
+            name: shs-http
             protocol: TCP
             port: 18080
-            targetPort: shs-http
+            targetPort: 18080
 
   - it: Should be able to specify service type
     set:

diff --git a/...sions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/values.yaml b/...sions-helm/extensions-helm-spark-infrastructure/aissemble-spark-history-chart/values.yaml
@@ -27,6 +27,7 @@ service:
   port:
     name: "shs-http"
     port: 18080
+    targetPort: 18080
 
 ingress:
   enabled: true