From 828678af3ec1267ccd146aeb96643d10629ac0e6 Mon Sep 17 00:00:00 2001
From: Joshua Thompson <thompsonja@google.com>
Date: Mon, 3 Apr 2017 14:56:30 -0700
Subject: [PATCH] Remove unnecessary port forwarding steps.

---
 test/cluster/sandbox/example_sandbox.yaml     |  5 +--
 .../sandbox/vitess_kubernetes_sandbox.py      | 34 ++++---------------
 2 files changed, 7 insertions(+), 32 deletions(-)

diff --git a/test/cluster/sandbox/example_sandbox.yaml b/test/cluster/sandbox/example_sandbox.yaml
index 6f5a41ae42c..9eb607dfc4e 100644
--- a/test/cluster/sandbox/example_sandbox.yaml
+++ b/test/cluster/sandbox/example_sandbox.yaml
@@ -22,6 +22,7 @@ sandbox:
   application:
     vtgate_count: 1
     enable_orchestrator: True
+    enable_guestbook: True
     etcd_count: 3
     cells:
       - test1
@@ -40,10 +41,6 @@ sandbox:
     mysql_cpu: 500m
     vtgate_ram: 512Mi
     vtgate_cpu: 500m
-    port_forwarding:
-      vtgate: 15001
-      vtctld: 15000
-      guestbook: 80
     backup_flags:
       backup_storage_implementation: gcs
       gcs_backup_storage_bucket: 'my-builtin-backup'
diff --git a/test/cluster/sandbox/vitess_kubernetes_sandbox.py b/test/cluster/sandbox/vitess_kubernetes_sandbox.py
index bb5ab8a415f..376769898cd 100755
--- a/test/cluster/sandbox/vitess_kubernetes_sandbox.py
+++ b/test/cluster/sandbox/vitess_kubernetes_sandbox.py
@@ -27,30 +27,13 @@ class VitessKubernetesSandbox(sandbox.Sandbox):
   def __init__(self, sandbox_options):
     super(VitessKubernetesSandbox, self).__init__(sandbox_options)
 
-  def generate_firewall_sandlet(self):
-    """Generates sandlet for firewall rules."""
-    firewall_sandlet = sandlet.Sandlet('firewall')
-
-    if 'vtctld' in self.app_options.port_forwarding:
-      firewall_sandlet.components.add_component(
-          self.cluster_env.Port('%s-vtctld' % self.name,
-                                self.app_options.port_forwarding['vtctld']))
-    if 'vtgate' in self.app_options.port_forwarding:
-      for cell in self.app_options.cells:
-        firewall_sandlet.components.add_component(
-            self.cluster_env.Port('%s-vtgate-%s' % (self.name, cell),
-                                  self.app_options.port_forwarding['vtgate']))
-    if 'guestbook' in self.app_options.port_forwarding:
-      firewall_sandlet.components.add_component(
-          self.cluster_env.Port('%s-guestbook' % self.name,
-                                self.app_options.port_forwarding['guestbook']))
-    self.sandlets.add_component(firewall_sandlet)
-
   def generate_guestbook_sandlet(self):
     """Creates a sandlet encompassing the guestbook app built on Vitess."""
     guestbook_sandlet = sandlet.Sandlet('guestbook')
     guestbook_sandlet.dependencies = ['helm']
     template_dir = os.path.join(os.environ['VTTOP'], 'examples/kubernetes')
+    guestbook_sandlet.components.add_component(
+        self.cluster_env.Port('%s-guestbook' % self.name, 80))
     for keyspace in self.app_options.keyspaces:
       create_schema_subprocess = subprocess_component.Subprocess(
           'create_schema_%s' % keyspace['name'], self.name, 'create_schema.py',
@@ -249,26 +232,21 @@ def generate_from_config(self):
         'Struct', self.sandbox_options['application'].keys())(
             *self.sandbox_options['application'].values())
 
-    if any(k in self.app_options.port_forwarding
-           for k in ['vtgate', 'vtctld', 'guestbook']):
-      self.generate_firewall_sandlet()
     self.generate_helm_sandlet()
-    if 'guestbook' in self.app_options.port_forwarding:
+    if self.app_options.enable_guestbook:
       self.generate_guestbook_sandlet()
 
   def print_banner(self):
     logging.info('Fetching forwarded ports.')
     banner = '\nVitess Sandbox Info:\n'
-    vtctld_port = self.app_options.port_forwarding['vtctld']
-    vtgate_port = self.app_options.port_forwarding['vtgate']
     vtctld_ip = kubernetes_components.get_forwarded_ip(
         'vtctld', self.name)
-    banner += '  vtctld: http://%s:%d\n' % (vtctld_ip, vtctld_port)
+    banner += '  vtctld: http://%s:15000\n' % vtctld_ip
     for cell in self.app_options.cells:
       vtgate_ip = kubernetes_components.get_forwarded_ip(
           'vtgate-%s' % cell, self.name)
-      banner += '  vtgate-%s: http://%s:%d\n' % (cell, vtgate_ip, vtgate_port)
-    if 'guestbook' in self.app_options.port_forwarding:
+      banner += '  vtgate-%s: http://%s:15001\n' % (cell, vtgate_ip)
+    if self.app_options.enable_guestbook:
       guestbook_ip = kubernetes_components.get_forwarded_ip(
           'guestbook', self.name)
       banner += '  guestbook: http://%s:80\n' % guestbook_ip