Remove 3scale port number from configs (#1676)

* Remove 'threescale-api-port' from all configs in node setup

* Update docs - remove references to threescale-api-port

* Fix typo

k8s/nginx-https/container/nginx.conf.template

@@ -139,17 +139,6 @@ http {
         return 426 'Consider using the HTTPS protocol next time!';
     }
   }
-
-  # Frontend server to respond to requests from 3scale; forward directly to
-  # OpenResty instance.
-  server {
-    sendfile on;
-    listen THREESCALE_API_PORT;
-
-    location / {
-      proxy_pass http://$openresty_backend:OPENRESTY_BACKEND_PORT;
-    }
-  }
 }
 
 # NGINX stream block for TCP and UDP proxies. Used to proxy MDB TCP

k8s/nginx-https/container/nginx_entrypoint.bash

@@ -20,7 +20,6 @@ mongo_backend_port=`printenv MONGODB_BACKEND_PORT`
 # OpenResty vars
 openresty_backend_host=`printenv OPENRESTY_BACKEND_HOST`
 openresty_backend_port=`printenv OPENRESTY_BACKEND_PORT`
-threescale_api_port=`printenv THREESCALE_API_PORT`
 
 
 # BigchainDB vars
@@ -36,7 +35,6 @@ if [[ -z "${cluster_frontend_port}" || \
       -z "${mongo_backend_port}" || \
       -z "${openresty_backend_port}" || \
       -z "${openresty_backend_host}" || \
-      -z "${threescale_api_port}" || \
       -z "${bdb_backend_host}" || \
       -z "${bdb_api_port}" || \
       -z "${bdb_ws_port}" || \
@@ -57,7 +55,6 @@ sed -i "s|MONGODB_BACKEND_HOST|${mongo_backend_host}|g" ${NGINX_CONF_FILE}
 sed -i "s|MONGODB_BACKEND_PORT|${mongo_backend_port}|g" ${NGINX_CONF_FILE}
 sed -i "s|OPENRESTY_BACKEND_PORT|${openresty_backend_port}|g" ${NGINX_CONF_FILE}
 sed -i "s|OPENRESTY_BACKEND_HOST|${openresty_backend_host}|g" ${NGINX_CONF_FILE}
-sed -i "s|THREESCALE_API_PORT|${threescale_api_port}|g" ${NGINX_CONF_FILE}
 sed -i "s|BIGCHAINDB_BACKEND_HOST|${bdb_backend_host}|g" ${NGINX_CONF_FILE}
 sed -i "s|BIGCHAINDB_API_PORT|${bdb_api_port}|g" ${NGINX_CONF_FILE}
 sed -i "s|BIGCHAINDB_WS_PORT|${bdb_ws_port}|g" ${NGINX_CONF_FILE}

k8s/nginx-https/nginx-https-dep.yaml

@@ -60,11 +60,6 @@ spec:
             configMapKeyRef:
               name: vars
               key: openresty-backend-host
-        - name: THREESCALE_API_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: vars
-              key: threescale-api-port
         - name: BIGCHAINDB_BACKEND_HOST
           valueFrom:
             configMapKeyRef:
@@ -89,8 +84,6 @@ spec:
           protocol: TCP
         - containerPort: "<cluster-frontend-port from ConfigMap>"
           protocol: TCP
-        - containerPort: "<threescale-api-port from ConfigMap>"
-          protocol: TCP
         - containerPort: "<cluster-health-check-port from ConfigMap>"
           protocol: TCP
           name: ngx-port

k8s/nginx-https/nginx-https-svc.yaml

@@ -21,10 +21,6 @@ spec:
     targetPort: "<mongodb-frontend-port from ConfigMap>"
     name: public-mdb-port
     protocol: TCP
-  - port: "<threescale-api-port from ConfigMap>"
-    targetPort: "<threescale-api-port from ConfigMap>"
-    name: public-threescale-port
-    protocol: TCP
   - port: 80
     targetPort: 80
     name: public-insecure-cluster-port