Revert "Validate LB created with the OCI Cloud Controller in test cluster."

This reverts commit ee761fc.

Author: jlamillan

tests/create/runner.py

@@ -98,9 +98,10 @@ def _wait_until(predicate, timeoutSeconds, delaySeconds=0.25, *args, **kwargs):
         except Exception:
             pass
         time.sleep(delaySeconds)
-        
+
     print("Condition not met within " + str(timeoutSeconds))
-    raise
+    raise Exception("Condition not met within " + str(timeoutSeconds))
+
 
 def _utf_encode_list(list):
     return [s.encode("UTF8") for s in list]
@@ -197,6 +198,9 @@ def _verifyConfig(tfvars_file, no_create=None, no_destroy=None):
         numWorkers = len(outputJSON["value"])
         workerPublicAddressList = _utf_encode_list(outputJSON["value"])
 
+        outputJSON = json.loads(_terraform("output -json control_plane_subnet_access"))
+        controlPlaneSubnetAccess = outputJSON["value"]
+
         _log("K8s Master Public LB Address: " + masterPublicLBAddress)
         _log("K8s Worker Public Addresses: " + str(workerPublicAddressList))
 
@@ -225,29 +229,32 @@ def _verifyConfig(tfvars_file, no_create=None, no_destroy=None):
         _log("Sleeping 30 seconds to let pods initialize", as_banner=True)
         time.sleep(30)
 
-        _kubectl("apply -f " + TEST_ROOT_DIR + "/resources/hello-service.yml", exit_on_error=True)
-        _kubectl("apply -f " + TEST_ROOT_DIR + "/resources/frontend-service.yml", exit_on_error=True)
+        helloServicePort = _kubectl("get svc/hello -o jsonpath={.spec.ports[0].nodePort}", exit_on_error=True)
+        _log("Hello service port: " + str(helloServicePort))
 
-        _log("Waiting for the LoadBalancer to initialize", as_banner=True)
-        externalIPReady = lambda: _kubectl("get svc/frontend -o jsonpath={.status.loadBalancer.ingress[0].ip}", exit_on_error=True) != ""
-        _wait_until(externalIPReady, 600)
-        externalIP = _kubectl("get svc/frontend -o jsonpath={.status.loadBalancer.ingress[0].ip}", exit_on_error=True)
-        _log("Frontend service IP (OCI Load Balancer): " + str(externalIP))
+        frontendServicePort = _kubectl("get svc/frontend -o jsonpath={.spec.ports[0].nodePort}", exit_on_error=True)
+        _log("Frontend service port: " + str(frontendServicePort))
 
-        _log("Checking " + "http://" + externalIP)
-        applicationAvailable = lambda: requests.get("http://" + externalIP).status_code == 200
-        _wait_until(applicationAvailable, 60)
+        if controlPlaneSubnetAccess == "public":
+            # Ping deployment
+            _log("Pinging hello and frontend deployments for each K8s worker", as_banner=True)
+            for workerPublicAddress in workerPublicAddressList:
+                serviceAddressList = ["http://" + workerPublicAddress + ":" + str(helloServicePort),
+                                      "http://" + workerPublicAddress + ":" + str(frontendServicePort)]
+                for serviceAddress in serviceAddressList:
+                    _log("Checking " + serviceAddress)
+                    deploymentReady = lambda: requests.get(serviceAddress).status_code == 200
+                    _wait_until(deploymentReady, 180)
 
     except Exception, e:
         _log("Unexpected error:", str(e))
         traceback.print_exc()
         success = False
     finally:
-        _log("Undeploying the hello service", as_banner=True)
-        _kubectl("delete -f " + TEST_ROOT_DIR + "/resources/hello-service.yml", exit_on_error=False)
-        _kubectl("delete -f " + TEST_ROOT_DIR + "/resources/frontend-service.yml", exit_on_error=False)
-        # Wait a minute for OCI Load Balancer to be deleted before starting terraform destroy
-        time.sleep(120)
+        if masterPublicLBAddress != None:
+            _log("Undeploying the hello service", as_banner=True)
+            _kubectl("delete -f " + TEST_ROOT_DIR + "/resources/hello-service.yml", exit_on_error=False)
+            _kubectl("delete -f " + TEST_ROOT_DIR + "/resources/frontend-service.yml", exit_on_error=False)
 
     if not no_destroy:
         _log("Destroying the K8s cluster from " + str(os.path.basename(tfvars_file)), as_banner=True)

tests/resources/frontend-service.yml

@@ -1,16 +1,16 @@
-apiVersion: v1
 kind: Service
+apiVersion: v1
 metadata:
   name: frontend
 spec:
   selector:
     app: hello
     tier: frontend
   ports:
-  - protocol: "TCP"
-    port: 80
-    targetPort: 80
-  type: LoadBalancer
+    - protocol: "TCP"
+      port: 80
+      targetPort: 80
+  type: NodePort
 ---
 apiVersion: apps/v1beta1
 kind: Deployment
@@ -26,9 +26,9 @@ spec:
         track: stable
     spec:
       containers:
-      - name: nginx
-        image: "gcr.io/google-samples/hello-frontend:1.0"
-        lifecycle:
-          preStop:
-            exec:
-              command: ["/usr/sbin/nginx","-s","quit"]
+        - name: nginx
+          image: "gcr.io/google-samples/hello-frontend:1.0"
+          lifecycle:
+            preStop:
+              exec:
+                command: ["/usr/sbin/nginx","-s","quit"]

tests/resources/hello-service.yml

@@ -7,9 +7,10 @@ spec:
     app: hello
     tier: backend
   ports:
-  - protocol: TCP
-    port: 80
-    targetPort: http
+    - protocol: TCP
+      port: 80
+      targetPort: http
+  type: NodePort
 ---
 apiVersion: apps/v1beta1
 kind: Deployment