fix: support host port and protocol in functional tests (#1586)

script/test/fixtures/healthcheck/output-healthcheck-k8s.yaml

@@ -1,28 +1,3 @@
----
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    kompose.service.group: my-group
-    kompose.service.healthcheck.liveness.tcp_port: "8081"
-    kompose.service.healthcheck.readiness.interval: 11s
-    kompose.service.healthcheck.readiness.retries: "6"
-    kompose.service.healthcheck.readiness.tcp_port: "9091"
-    kompose.service.healthcheck.readiness.timeout: 2s
-  creationTimestamp: null
-  labels:
-    io.kompose.service: my-group
-  name: mysql
-spec:
-  ports:
-    - name: "3306"
-      port: 3306
-      targetPort: 3306
-  selector:
-    io.kompose.service: my-group
-status:
-  loadBalancer: {}
-
 ---
 apiVersion: v1
 kind: Service
@@ -48,6 +23,31 @@ spec:
 status:
   loadBalancer: {}
 
+---
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    kompose.service.group: my-group
+    kompose.service.healthcheck.liveness.tcp_port: "8081"
+    kompose.service.healthcheck.readiness.interval: 11s
+    kompose.service.healthcheck.readiness.retries: "6"
+    kompose.service.healthcheck.readiness.tcp_port: "9091"
+    kompose.service.healthcheck.readiness.timeout: 2s
+  creationTimestamp: null
+  labels:
+    io.kompose.service: my-group
+  name: mysql
+spec:
+  ports:
+    - name: "3306"
+      port: 3306
+      targetPort: 3306
+  selector:
+    io.kompose.service: my-group
+status:
+  loadBalancer: {}
+
 ---
 apiVersion: v1
 kind: Service
@@ -103,11 +103,11 @@ kind: Deployment
 metadata:
   annotations:
     kompose.service.group: my-group
-    kompose.service.healthcheck.liveness.tcp_port: "8080"
-    kompose.service.healthcheck.readiness.interval: 10s
-    kompose.service.healthcheck.readiness.retries: "5"
-    kompose.service.healthcheck.readiness.tcp_port: "9090"
-    kompose.service.healthcheck.readiness.timeout: 1s
+    kompose.service.healthcheck.liveness.tcp_port: "8081"
+    kompose.service.healthcheck.readiness.interval: 11s
+    kompose.service.healthcheck.readiness.retries: "6"
+    kompose.service.healthcheck.readiness.tcp_port: "9091"
+    kompose.service.healthcheck.readiness.timeout: 2s
   creationTimestamp: null
   labels:
     io.kompose.service: my-group
@@ -122,34 +122,17 @@ spec:
     metadata:
       annotations:
         kompose.service.group: my-group
-        kompose.service.healthcheck.liveness.tcp_port: "8081"
-        kompose.service.healthcheck.readiness.interval: 11s
-        kompose.service.healthcheck.readiness.retries: "6"
-        kompose.service.healthcheck.readiness.tcp_port: "9091"
-        kompose.service.healthcheck.readiness.timeout: 2s
+        kompose.service.healthcheck.liveness.tcp_port: "8080"
+        kompose.service.healthcheck.readiness.interval: 10s
+        kompose.service.healthcheck.readiness.retries: "5"
+        kompose.service.healthcheck.readiness.tcp_port: "9090"
+        kompose.service.healthcheck.readiness.timeout: 1s
       creationTimestamp: null
       labels:
         io.kompose.network/healthcheck-default: "true"
         io.kompose.service: my-group
     spec:
       containers:
-        - image: mysql
-          livenessProbe:
-            failureThreshold: 6
-            periodSeconds: 11
-            tcpSocket:
-              port: 8081
-            timeoutSeconds: 2
-          name: mysql
-          ports:
-            - containerPort: 3306
-          readinessProbe:
-            failureThreshold: 6
-            periodSeconds: 11
-            tcpSocket:
-              port: 9091
-            timeoutSeconds: 2
-          resources: {}
         - image: mongo
           livenessProbe:
             failureThreshold: 5
@@ -160,6 +143,7 @@ spec:
           name: mongo
           ports:
             - containerPort: 27017
+              protocol: TCP
           readinessProbe:
             failureThreshold: 5
             periodSeconds: 10
@@ -167,6 +151,24 @@ spec:
               port: 9090
             timeoutSeconds: 1
           resources: {}
+        - image: mysql
+          livenessProbe:
+            failureThreshold: 6
+            periodSeconds: 11
+            tcpSocket:
+              port: 8081
+            timeoutSeconds: 2
+          name: mysql
+          ports:
+            - containerPort: 3306
+              protocol: TCP
+          readinessProbe:
+            failureThreshold: 6
+            periodSeconds: 11
+            tcpSocket:
+              port: 9091
+            timeoutSeconds: 2
+          resources: {}
       restartPolicy: Always
 status: {}
 
@@ -235,6 +237,7 @@ spec:
           name: postgresql
           ports:
             - containerPort: 5432
+              protocol: TCP
           readinessProbe:
             failureThreshold: 5
             httpGet:
@@ -289,6 +292,7 @@ spec:
           name: redis
           ports:
             - containerPort: 6379
+              protocol: TCP
           readinessProbe:
             exec:
               command:

script/test/fixtures/healthcheck/output-healthcheck-os.yaml

@@ -136,6 +136,7 @@ spec:
           name: mongo
           ports:
             - containerPort: 27017
+              protocol: TCP
           readinessProbe:
             failureThreshold: 5
             periodSeconds: 10
@@ -226,6 +227,7 @@ spec:
           name: mysql
           ports:
             - containerPort: 3306
+              protocol: TCP
           readinessProbe:
             failureThreshold: 6
             periodSeconds: 11
@@ -318,6 +320,7 @@ spec:
           name: postgresql
           ports:
             - containerPort: 5432
+              protocol: TCP
           readinessProbe:
             failureThreshold: 5
             httpGet:
@@ -408,6 +411,7 @@ spec:
           name: redis
           ports:
             - containerPort: 6379
+              protocol: TCP
           readinessProbe:
             exec:
               command: