Merge pull request #9507 from caesarxuchao/cassandra-example-v1

update examples/cassandra to v1
This commit is contained in:
Abhi Shah 2015-06-12 09:47:20 -07:00
commit b3f11b2d4c
5 changed files with 6 additions and 7 deletions

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: ReplicationController kind: ReplicationController
metadata: metadata:
labels: labels:
@ -24,7 +24,7 @@ spec:
value: 512M value: 512M
- name: HEAP_NEWSIZE - name: HEAP_NEWSIZE
value: 100M value: 100M
image: gcr.io/google_containers/cassandra:v3 image: gcr.io/google_containers/cassandra:v4
name: cassandra name: cassandra
ports: ports:
- containerPort: 9042 - containerPort: 9042

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
labels: labels:
@ -7,6 +7,5 @@ metadata:
spec: spec:
ports: ports:
- port: 9042 - port: 9042
targetPort: 9042
selector: selector:
name: cassandra name: cassandra

View File

@ -1,4 +1,4 @@
apiVersion: v1beta3 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
labels: labels:
@ -11,7 +11,7 @@ spec:
resources: resources:
limits: limits:
cpu: "1" cpu: "1"
image: gcr.io/google_containers/cassandra:v3 image: gcr.io/google_containers/cassandra:v4
name: cassandra name: cassandra
ports: ports:
- name: cql - name: cql

View File

@ -102,7 +102,7 @@ public class KubernetesSeedProvider implements SeedProvider {
List<InetAddress> list = new ArrayList<InetAddress>(); List<InetAddress> list = new ArrayList<InetAddress>();
String host = "https://kubernetes.default.cluster.local"; String host = "https://kubernetes.default.cluster.local";
String serviceName = getEnvOrDefault("CASSANDRA_SERVICE", "cassandra"); String serviceName = getEnvOrDefault("CASSANDRA_SERVICE", "cassandra");
String path = "/api/v1beta3/namespaces/default/endpoints/"; String path = "/api/v1/namespaces/default/endpoints/";
try { try {
String token = getServiceAccountToken(); String token = getServiceAccountToken();