Ensure dataflow and skipper use ports above 1024 in pods (#5137)

Fixes #5136

Author: Corneil du Plessis

src/carvel/config/dataflow-deployment.yml

@@ -44,7 +44,7 @@ spec:
           mountPath: /workspace/runtime/secrets
           readOnly: true
         ports:
-        - containerPort: 80
+        - containerPort: 9393
         startupProbe:
           httpGet:
             port: 9393

src/carvel/config/skipper-deployment.yml

@@ -42,7 +42,7 @@ spec:
           readOnly: true
         #@ end
         ports:
-        - containerPort: 80
+        - containerPort: 7577
         startupProbe:
           httpGet:
             port: 7577

src/kubernetes/server/server-deployment.yaml

@@ -26,20 +26,20 @@ spec:
             mountPath: /etc/secrets/database
             readOnly: true
         ports:
-        - containerPort: 80
+        - containerPort: 9393
         livenessProbe:
           httpGet:
             path: /management/health
-            port: 80
+            port: 9393
           initialDelaySeconds: 45
         readinessProbe:
           httpGet:
             path: /management/info
-            port: 80
+            port: 9393
           initialDelaySeconds: 45
         startupProbe:
           tcpSocket:
-            port: 80
+            port: 9393
           initialDelaySeconds: 15
           periodSeconds: 3
           failureThreshold: 120
@@ -60,7 +60,7 @@ spec:
             fieldRef:
               fieldPath: "metadata.namespace"
         - name: SERVER_PORT
-          value: '80'
+          value: '9393'
         - name: SPRING_CLOUD_CONFIG_ENABLED
           value: 'false'
         - name: SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED

src/kubernetes/server/server-svc.yaml

@@ -10,6 +10,7 @@ spec:
   type: LoadBalancer
   ports:
     - port: 80
+      targetPort: 9393
       name: scdf-server
   selector:
     app: scdf-server

src/kubernetes/skipper/skipper-deployment.yaml

@@ -26,7 +26,7 @@ spec:
             mountPath: /etc/secrets/database
             readOnly: true
         ports:
-        - containerPort: 80
+        - containerPort: 7577
         livenessProbe:
           httpGet:
             path: /actuator/health
@@ -59,6 +59,8 @@ spec:
           value: 'en_US.utf8'
         - name: JDK_JAVA_OPTIONS
           value: '-Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8'
+        - name: SERVER_PORT
+          value: '7577'
         - name: SPRING_CLOUD_CONFIG_ENABLED
           value: 'false'
         - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API

src/templates/kubernetes/server/server-deployment.yaml

@@ -26,16 +26,16 @@ spec:
             mountPath: /etc/secrets/database
             readOnly: true
         ports:
-        - containerPort: 80
+        - containerPort: 8080
         livenessProbe:
           httpGet:
             path: /management/health
-            port: 80
+            port: 8080
           initialDelaySeconds: 45
         readinessProbe:
           httpGet:
             path: /management/info
-            port: 80
+            port: 8080
           initialDelaySeconds: 45
         resources:
           limits:
@@ -56,7 +56,7 @@ spec:
               fieldRef:
                 fieldPath: "metadata.namespace"
           - name: SERVER_PORT
-            value: '80'
+            value: '8080'
           - name: SPRING_CLOUD_CONFIG_ENABLED
             value: 'false'
           - name: SPRING_CLOUD_DATAFLOW_FEATURES_ANALYTICS_ENABLED

src/templates/kubernetes/server/server-svc.yaml

@@ -10,6 +10,7 @@ spec:
   type: LoadBalancer
   ports:
     - port: 80
+      targetPort: 8080
       name: scdf-server
   selector:
     app: scdf-server

src/templates/kubernetes/skipper/skipper-deployment.yaml

@@ -26,7 +26,7 @@ spec:
             mountPath: /etc/secrets/database
             readOnly: true
         ports:
-        - containerPort: 80
+        - containerPort: 7577
         livenessProbe:
           httpGet:
             path: /actuator/health