Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix downward API #8099

Merged
merged 1 commit into from
May 12, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 14 additions & 17 deletions examples/cassandra/cassandra-controller.yaml
Original file line number Diff line number Diff line change
@@ -1,42 +1,39 @@
apiVersion: v1beta3
kind: ReplicationController
metadata:
labels:
metadata:
labels:
name: cassandra
name: cassandra
spec:
spec:
replicas: 1
selector:
selector:
name: cassandra
template:
metadata:
labels:
template:
metadata:
labels:
name: cassandra
spec:
containers:
- command:
spec:
containers:
- command:
- /run.sh
resources:
limits:
cpu: 1
env:
env:
- name: MAX_HEAP_SIZE
key: MAX_HEAP_SIZE
value: 512M
- name: HEAP_NEWSIZE
key: HEAP_NEWSIZE
value: 100M
image: "kubernetes/cassandra:v2"
name: cassandra
ports:
ports:
- containerPort: 9042
name: cql
- containerPort: 9160
name: thrift
volumeMounts:
volumeMounts:
- mountPath: /cassandra_data
name: data
volumes:
volumes:
- name: data
emptyDir: {}

8 changes: 4 additions & 4 deletions examples/cassandra/cassandra-service.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
apiVersion: v1beta3
kind: Service
metadata:
labels:
metadata:
labels:
name: cassandra
name: cassandra
spec:
spec:
ports:
- port: 9042
targetPort: 9042
selector:
selector:
name: cassandra
4 changes: 1 addition & 3 deletions examples/cassandra/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ spec:
- /run.sh
resources:
limits:
cpu: "1"
cpu: "1"
image: kubernetes/cassandra:v2
name: cassandra
ports:
Expand All @@ -31,5 +31,3 @@ spec:
volumes:
- name: data
emptyDir: {}


2 changes: 1 addition & 1 deletion examples/downward-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ started](../../docs/getting-started-guides) for installation instructions for yo
Containers consume the downward API using environment variables. The downward API allows
containers to be injected with the name and namespace of the pod the container is in.

Use the `examples/secrets/secret-pod.yaml` file to create a Pod with a container that consumes the
Use the `examples/downward-api/dapi-pod.yaml` file to create a Pod with a container that consumes the
downward API.

```shell
Expand Down