chore(apps): combine some ports (#3096)

* chore(apps): combine some ports

* lints

* move `protocol` under `ports` rather under `service`

* bump cloudd

charts/stable/storj-node/Chart.yaml

@@ -20,7 +20,7 @@ sources:
 - https://github.com/storj/storj
 - https://docs.storj.io/node/
 - https://hub.docker.com/r/storjlabs/storagenode
-version: 2.0.16
+version: 2.0.17
 annotations:
   truecharts.org/catagories: |
     - media

charts/stable/storj-node/questions.yaml

@@ -187,9 +187,9 @@ questions:
                                   schema:
                                     type: int
                                     default: 14002
-        - variable: coretcp
-          label: "Core TCP Service"
-          description: "Core TCP Service"
+        - variable: core
+          label: "Core Service"
+          description: "Core Service"
           schema:
             additional_attrs: true
             type: dict
@@ -242,14 +242,6 @@ questions:
                                   schema:
                                     type: int
                                     default: 28967
-        - variable: coreudp
-          label: "Core UDP Service"
-          description: "Core UDP Service"
-          schema:
-            additional_attrs: true
-            type: dict
-            attrs:
-# Include{serviceSelector}
                     - variable: coreudp
                       label: "Core UDP Service Port Configuration"
                       schema:

charts/stable/storj-node/values.yaml

@@ -26,7 +26,7 @@ service:
       main:
         port: 14002
         targetPort: 14002
-  coretcp:
+  core:
     enabled: true
     ports:
       coretcp:
@@ -34,9 +34,6 @@ service:
         protocol: TCP
         port: 28967
         targetPort: 28967
-  coreudp:
-    enabled: true
-    ports:
       coreudp:
         enabled: true
         protocol: UDP