Merge pull request kubernetes#12480 from GoogleCloudPlatform/revert-12309-haproxy_gcr

Revert "Add multi cluster services documentation "

Author: gmarek

contrib/service-loadbalancer/Makefile

@@ -2,7 +2,7 @@ all: push
 
 # 0.0 shouldn't clobber any released builds
 TAG = 0.0
-PREFIX = gcr.io/google_containers/servicelb
+PREFIX = bprashanth/servicelb
 
 server: service_loadbalancer.go
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags '-w' -o service_loadbalancer ./service_loadbalancer.go
@@ -11,7 +11,7 @@ container: server
 	docker build -t $(PREFIX):$(TAG) .
 
 push: container
-	gcloud docker push $(PREFIX):$(TAG)
+	docker push $(PREFIX):$(TAG)
 
 clean:
 	rm -f service_loadbalancer

contrib/service-loadbalancer/README.md

@@ -32,9 +32,11 @@ __L7 load balancing of Http services__: The load balancer controller automatical
 
 __L4 loadbalancing of Tcp services__: Since one needs to specify ports at pod creation time (kubernetes doesn't currently support port ranges), a single loadbalancer is tied to a set of preconfigured node ports, and hence a set of TCP services it can expose. The load balancer controller will dynamically add rules for each configured TCP service as it pops into existence. However, each "new" (unspecified in the tcpServices section of the loadbalancer.json) service will need you to open up a new container-host port pair for traffic. You can achieve this by creating a new loadbalancer pod with the `targetPort` set to the name of your service, and that service specified in the tcpServices map of the new loadbalancer.
 
+
 ### Cross-cluster loadbalancing
 
-On cloud providers that offer a private ip range for all instances on a network, you can setup multiple clusters in different availability zones, on the same network, and loadbalancer services across these zones. On GCE for example, every instance is a member of a single network. A network performs the same function that a router does: it defines the network range and gateway IP address, handles communication between instances, and serves as a gateway between instances and other networks. On such networks the endpoints of a service in one cluster are visible in all other clusters in the same network, so you can setup an edge loadbalancer that watches a kubernetes master of another cluster for services. Such a deployment allows you to fallback to a different AZ during times of duress or planned downtime (eg: database update).
+Still trying this out.
+
 
 ### Examples
 
@@ -186,95 +188,6 @@ $ mysql -u root -ppassword --host 104.197.63.17 --port 3306 -e 'show databases;'
 +--------------------+
 ```
 
-
-#### Cross-cluster loadbalancing
-
-First setup your 2 clusters, and a kubeconfig secret as described in the [sharing clusters example] (../../examples/sharing-clusters/README.md). We will create a loadbalancer in our first cluster (US) and have it publish the services from the second cluster (EU). This is the entire modified loadbalancer manifest:
-
-```yaml
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: service-loadbalancer
-  labels:
-    app: service-loadbalancer
-    version: v1
-spec:
-  replicas: 1
-  selector:
-    app: service-loadbalancer
-    version: v1
-  template:
-    metadata:
-      labels:
-        app: service-loadbalancer
-        version: v1
-    spec:
-      volumes:
-      # token from the eu cluster, must already exist
-      # and match the name of the volume using in container
-      - name: eu-config
-        secret:
-          secretName: kubeconfig
-      nodeSelector:
-        role: loadbalancer
-      containers:
-      - image: gcr.io/google_containers/servicelb:0.1
-        imagePullPolicy: Always
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: 8081
-            scheme: HTTP
-          initialDelaySeconds: 30
-          timeoutSeconds: 5
-        name: haproxy
-        ports:
-        # All http services
-        - containerPort: 80
-          hostPort: 80
-          protocol: TCP
-        # nginx https
-        - containerPort: 443
-          hostPort: 8080
-          protocol: TCP
-        # mysql
-        - containerPort: 3306
-          hostPort: 3306
-          protocol: TCP
-        # haproxy stats
-        - containerPort: 1936
-          hostPort: 1936
-          protocol: TCP
-        resources: {}
-        args:
-        - --tcp-services=mysql:3306,nginxsvc:443
-        - --use-kubernetes-cluster-service=false
-        # use-kubernetes-cluster-service=false in conjunction with the
-        # kube/config will force the service-loadbalancer to watch for
-        # services form the eu cluster.
-        volumeMounts:
-        - mountPath: /.kube
-          name: eu-config
-        env:
-        - name: KUBECONFIG
-          value: /.kube/config
-```
-
-Note that it is essentially the same as the rc.yaml checked into the service-loadbalancer directory expect that it consumes the kubeconfig secret as an extra KUBECONFIG environment variable.
-
-```cmd
-$ kubectl config use-context <us-clustername>
-$ kubectl create -f rc.yaml
-$ kubectl get pods -o wide
-service-loadbalancer-5o2p4   1/1       Running   0          13m       kubernetes-minion-5jtd
-$ kubectl get node kubernetes-minion-5jtd -o json | grep -i externalip -A 2
-                "type": "ExternalIP",
-                "address": "104.197.81.116"
-$ curl http://104.197.81.116/nginxsvc
-Europe
-```
-
 ### Troubleshooting:
 - If you can curl or netcat the endpoint from the pod (with kubectl exec) and not from the node, you have not specified hostport and containerport.
 - If you can hit the ips from the node but not from your machine outside the cluster, you have not opened firewall rules for the right network.

contrib/service-loadbalancer/rc.yaml

@@ -19,7 +19,7 @@ spec:
       nodeSelector:
         role: loadbalancer
       containers:
-      - image: gcr.io/google_containers/servicelb:0.1
+      - image: bprashanth/servicelb:0.0
         imagePullPolicy: Always
         livenessProbe:
           httpGet:

contrib/service-loadbalancer/template.cfg

@@ -48,7 +48,7 @@ backend {{$svc.Name}}
     balance roundrobin
     # TODO: Make the path used to access a service customizable.
     reqrep ^([^\ :]*)\ /{{$svc.Name}}[/]?(.*) \1\ /\2
-    {{range $j, $ep := $svc.Ep}}server {{$svcName}}_{{$j}} {{$ep}}
+    {{range $j, $ep := $svc.Ep}}server {{$svcName}}_{{$j}} {{$ep}} check
     {{end}}
 {{end}}
 
@@ -64,6 +64,6 @@ frontend {{$svc.Name}}
 backend {{$svc.Name}}
     balance roundrobin
     mode tcp
-    {{range $j, $ep := $svc.Ep}}server {{$svcName}}_{{$j}} {{$ep}}
+    {{range $j, $ep := $svc.Ep}}server {{$svcName}}_{{$j}} {{$ep}} check
     {{end}}
 {{end}}