Merge pull request #83 from codecademy-engineering/DEVOPS-4852-option…

…al-pod-port

[DEVOPS-4852] Optional pod ports

charts/service/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: service
 description: A generic k8s service chart
 type: application
-version: 1.1.4
+version: 1.2.0
 maintainers:
   - email: [email protected]
     name: devops

charts/service/ci/custom-values.yaml

@@ -51,6 +51,8 @@ podLabels:
 annotations:
   abc: def
 
+containerPort: 80
+
 additionalPort:
   port: 10000
   name: potato

charts/service/ci/no-port-values.yaml

@@ -0,0 +1,37 @@
+resources:
+  requests:
+    cpu: 5m
+  limits:
+    cpu: 100m
+
+env:
+  - name: FOO
+    value: bar
+  - name: POTATO
+    value: potato
+
+envKeyValue:
+  ABCDEF: ghijkl
+  STUFF: things
+  NUMBER: 7
+
+image:
+  command:
+    - nginx-debug
+    - '-g'
+    - 'daemon off;'
+
+annotations:
+  abc: def
+
+autoscaling:
+  enabled: true
+  minReplicas: 1
+  maxReplicas: 2
+  metrics:
+  - type: Resource
+    resource:
+      name: cpu
+      target:
+        type: Utilization
+        averageUtilization: 50

charts/service/templates/deployment.yaml

@@ -95,10 +95,12 @@ spec:
                 fieldRef:
                   fieldPath: metadata.labels['tags.datadoghq.com/version']
           {{- end }}
+          {{- if .Values.containerPort }}
           ports:
             - name: http
               containerPort: {{ .Values.containerPort }}
               protocol: TCP
+          {{- end }}
             {{- with .Values.service.additionalPort }}
             - name: {{ .name }}
               containerPort: {{ .port }}

charts/service/values.yaml

@@ -48,8 +48,6 @@ env: []
 envKeyValue: {}
   # FOO: bar
 
-containerPort: 80
-
 autoscaling:
   enabled: false