Update service-types test for targetport changes (#156)

* Update service-types test for targetport changes

Author: yongja79

bundle/tests/scorecard/kuttl/service-types/03-assert.yaml

@@ -2,27 +2,46 @@ apiVersion: liberty.websphere.ibm.com/v1
 kind: WebSphereLibertyApplication
 metadata:
   name: service-types-lib
+spec:
+  service:
+    bindable: true
+    port: 8080
+    ports:
+      - name: test-port1
+        port: 8081
+        protocol: TCP
+        targetPort: 8081
+      - name: test-port2
+        port: 8082
+        protocol: TCP
+        targetPort: 8083
+    annotations:
+      name: ClusterIPService
 status:
   binding:
     name: service-types-lib-expose-binding
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: service-types-lib
   annotations:
-    name: LoadBalancerService
+    name: ClusterIPService
+  name: service-types-lib
 spec:
   ports:
-    - name: test-port
+    - name: 8080-tcp
       protocol: TCP
-      port: 8082
-      targetPort: 8083
+      port: 8080
+      targetPort: 8080
     - name: test-port1
       protocol: TCP
       port: 8081
+      targetPort: 8081
+    - name: test-port2
+      protocol: TCP
+      port: 8082
       targetPort: 8083
-  type: LoadBalancer
+  type: ClusterIP
 ---
 apiVersion: v1
 kind: Secret
@@ -37,4 +56,4 @@ metadata:
 status:
   replicas: 1
   readyReplicas: 1
-  updatedReplicas: 1
+  updatedReplicas: 1

bundle/tests/scorecard/kuttl/service-types/03-clusterip-services.yaml

@@ -0,0 +1,21 @@
+apiVersion: liberty.websphere.ibm.com/v1
+kind: WebSphereLibertyApplication
+metadata:
+  name: service-types-lib
+spec:
+  # Add fields here
+  applicationImage: icr.io/appcafe/websphere-liberty:full-java8-openj9-ubi
+  replicas: 1
+  service:
+    bindable: true
+    port: 8080
+    ports:
+      - name: test-port1
+        port: 8081
+        protocol: TCP
+      - name: test-port2
+        port: 8082
+        protocol: TCP
+        targetPort: 8083
+    annotations:
+      name: ClusterIPService

bundle/tests/scorecard/kuttl/service-types/04-assert.yaml

@@ -14,10 +14,10 @@ metadata:
     name: LoadBalancerService
 spec:
   ports:
-    - name: 8082-tcp
+    - name: test-port
       protocol: TCP
       port: 8082
-      targetPort: 8082
+      targetPort: 8083
     - name: test-port1
       protocol: TCP
       port: 8081

bundle/tests/scorecard/kuttl/service-types/03-loadbalancer-service.yaml renamed to bundle/tests/scorecard/kuttl/service-types/04-loadbalancer-service.yaml

@@ -11,23 +11,18 @@ kind: Service
 metadata:
   name: service-types-lib
   annotations:
-    name: NodePort
+    name: LoadBalancerService
 spec:
   ports:
-    - name: test-port
-      protocol: TCP
-      port: 8080
-      targetPort: 8081
-      nodePort: 30932
-    - name: test-port1
+    - name: 8082-tcp
       protocol: TCP
       port: 8082
       targetPort: 8082
-    - name: test-port2
-      port: 8083
+    - name: test-port1
       protocol: TCP
+      port: 8081
       targetPort: 8083
-  type: NodePort
+  type: LoadBalancer
 ---
 apiVersion: v1
 kind: Secret

bundle/tests/scorecard/kuttl/service-types/05-assert.yaml

@@ -18,6 +18,7 @@ spec:
       protocol: TCP
       port: 8080
       targetPort: 8081
+      nodePort: 30932
     - name: test-port1
       protocol: TCP
       port: 8082
@@ -26,7 +27,7 @@ spec:
       port: 8083
       protocol: TCP
       targetPort: 8083
-  type: ClusterIP
+  type: NodePort
 ---
 apiVersion: v1
 kind: Secret

bundle/tests/scorecard/kuttl/service-types/04-remove-portname-targetport.yaml renamed to bundle/tests/scorecard/kuttl/service-types/05-remove-portname-targetport.yaml

@@ -0,0 +1,44 @@
+apiVersion: liberty.websphere.ibm.com/v1
+kind: WebSphereLibertyApplication
+metadata:
+  name: service-types-lib
+status:
+  binding:
+    name: service-types-lib-expose-binding
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: service-types-lib
+  annotations:
+    name: NodePort
+spec:
+  ports:
+    - name: test-port
+      protocol: TCP
+      port: 8080
+      targetPort: 8081
+    - name: test-port1
+      protocol: TCP
+      port: 8082
+      targetPort: 8082
+    - name: test-port2
+      port: 8083
+      protocol: TCP
+      targetPort: 8083
+  type: ClusterIP
+---
+apiVersion: v1
+kind: Secret
+type: Opaque
+metadata:
+  name: service-types-lib-expose-binding
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: service-types-lib
+status:
+  replicas: 1
+  readyReplicas: 1
+  updatedReplicas: 1