From dafc78b489f67fbdc3911d987d21cbb92efddeb8 Mon Sep 17 00:00:00 2001 From: Charles Butler Date: Wed, 23 Mar 2016 12:21:01 -0400 Subject: [PATCH] Removing the duplicated guestbook example files --- .../frontend-controller.yaml | 28 ------------------- .../guestbook-example/frontend-service.yaml | 15 ---------- .../redis-master-controller.yaml | 20 ------------- .../redis-master-service.yaml | 13 --------- .../redis-slave-controller.yaml | 28 ------------------- .../redis-slave-service.yaml | 12 -------- 6 files changed, 116 deletions(-) delete mode 100644 cluster/juju/layers/kubernetes/files/guestbook-example/frontend-controller.yaml delete mode 100644 cluster/juju/layers/kubernetes/files/guestbook-example/frontend-service.yaml delete mode 100644 cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-controller.yaml delete mode 100644 cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-service.yaml delete mode 100644 cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-controller.yaml delete mode 100644 cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-service.yaml diff --git a/cluster/juju/layers/kubernetes/files/guestbook-example/frontend-controller.yaml b/cluster/juju/layers/kubernetes/files/guestbook-example/frontend-controller.yaml deleted file mode 100644 index 1a48f95b346..00000000000 --- a/cluster/juju/layers/kubernetes/files/guestbook-example/frontend-controller.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: frontend - labels: - name: frontend -spec: - replicas: 3 - selector: - name: frontend - template: - metadata: - labels: - name: frontend - spec: - containers: - - name: php-redis - image: gcr.io/google_samples/gb-frontend:v3 - env: - - name: GET_HOSTS_FROM - value: dns - # If your cluster config does not include a dns service, then to - # instead access environment variables to find service host - # info, comment out the 'value: dns' line above, and uncomment the - # line below. - # value: env - ports: - - containerPort: 80 diff --git a/cluster/juju/layers/kubernetes/files/guestbook-example/frontend-service.yaml b/cluster/juju/layers/kubernetes/files/guestbook-example/frontend-service.yaml deleted file mode 100644 index 22f0273b095..00000000000 --- a/cluster/juju/layers/kubernetes/files/guestbook-example/frontend-service.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: frontend - labels: - name: frontend -spec: - # if your cluster supports it, uncomment the following to automatically create - # an external load-balanced IP for the frontend service. - # type: LoadBalancer - ports: - # the port that this service should serve on - - port: 80 - selector: - name: frontend diff --git a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-controller.yaml b/cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-controller.yaml deleted file mode 100644 index 2eebf2625c3..00000000000 --- a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-controller.yaml +++ /dev/null @@ -1,20 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: redis-master - labels: - name: redis-master -spec: - replicas: 1 - selector: - name: redis-master - template: - metadata: - labels: - name: redis-master - spec: - containers: - - name: master - image: redis - ports: - - containerPort: 6379 diff --git a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-service.yaml b/cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-service.yaml deleted file mode 100644 index b200cd6ec01..00000000000 --- a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-master-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-master - labels: - name: redis-master -spec: - ports: - # the port that this service should serve on - - port: 6379 - targetPort: 6379 - selector: - name: redis-master diff --git a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-controller.yaml b/cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-controller.yaml deleted file mode 100644 index 6e5dde18aa7..00000000000 --- a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-controller.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: v1 -kind: ReplicationController -metadata: - name: redis-slave - labels: - name: redis-slave -spec: - replicas: 2 - selector: - name: redis-slave - template: - metadata: - labels: - name: redis-slave - spec: - containers: - - name: worker - image: gcr.io/google_samples/gb-redisslave:v1 - env: - - name: GET_HOSTS_FROM - value: dns - # If your cluster config does not include a dns service, then to - # instead access an environment variable to find the master - # service's host, comment out the 'value: dns' line above, and - # uncomment the line below. - # value: env - ports: - - containerPort: 6379 diff --git a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-service.yaml b/cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-service.yaml deleted file mode 100644 index 1acc9def301..00000000000 --- a/cluster/juju/layers/kubernetes/files/guestbook-example/redis-slave-service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: redis-slave - labels: - name: redis-slave -spec: - ports: - # the port that this service should serve on - - port: 6379 - selector: - name: redis-slave