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.

Sign up for GitHub

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

Jump to bottom

Fix error in Fluenetd->ES colo pod definition #2921

Merged
merged 1 commit into from
Dec 15, 2014
Merged

Fix error in Fluenetd->ES colo pod definition #2921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions contrib/logging/fluentd-ek-colo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ down: logger-down es-kibana-down


es-kibana-up:
-${KUBECTL} create -f es-kibana-pod.yml
-${KUBECTL} create -f es-service.yml
-${KUBECTL} create -f es-kibana-pod.yml
-${KUBECTL} create -f kibana-service.yml

es-kibana-down:
-${KUBECTL} delete pods elasticsearch-kibana-pod
-${KUBECTL} delete service kibana-colo
-${KUBECTL} delete service elasticsearch-colo
-${KUBECTL} delete service elasticsearch

update:
-${KUBECTL} delete pods elasticsearch-kibana-pod
Expand All @@ -33,7 +33,7 @@ get:
${KUBECTL} get services

net:
gcutil getforwardingrule elasticsearch-colo
gcutil getforwardingrule elasticsearch
gcutil getforwardingrule kibana-colo

firewall:
Expand Down
8 changes: 4 additions & 4 deletions contrib/logging/fluentd-ek-colo/es-kibana-pod.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ desiredState:
volumeMounts:
- name: es-persistent-storage
mountPath: /data
volumes:
- name: es-persistent-storage
source:
emptyDir: {}
- name: kibana-image
image: kubernetes/kibana
ports:
- name: kibana-port
containerPort: 80
volumes:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't you keep this above? I think that kibana-image will break.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean move volumes: ? But is that not a peer of containers: ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

kibana-image was a container, not a volume.

- name: es-persistent-storage
source:
emptyDir: {}
labels:
app: elasticsearch-kibana
2 changes: 1 addition & 1 deletion contrib/logging/fluentd-ek-colo/es-service.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v1beta1
kind: Service
id: elasticsearch-colo
id: elasticsearch
containerPort: es-port
port: 9200
selector:
Expand Down