Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#3363 from woopstar/remove_efk
Browse files Browse the repository at this point in the history
Remove EFK from Kubespray
  • Loading branch information
k8s-ci-robot authored Sep 20, 2018
2 parents f9502e0 + 09b67c1 commit 1dda89d
Show file tree
Hide file tree
Showing 23 changed files with 1 addition and 857 deletions.
3 changes: 0 additions & 3 deletions inventory/sample/group_vars/k8s-cluster/addons.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@
# RBAC required. see docs/getting-started.md for access details.
dashboard_enabled: true

# Monitoring apps for k8s
efk_enabled: false

# Helm deployment
helm_enabled: false

Expand Down
36 changes: 0 additions & 36 deletions roles/download/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -169,15 +169,6 @@ kubednsautoscaler_image_repo: "gcr.io/google_containers/cluster-proportional-aut
kubednsautoscaler_image_tag: "{{ kubednsautoscaler_version }}"
test_image_repo: busybox
test_image_tag: latest
elasticsearch_version: "v5.6.4"
elasticsearch_image_repo: "k8s.gcr.io/elasticsearch"
elasticsearch_image_tag: "{{ elasticsearch_version }}"
fluentd_version: "v2.0.4"
fluentd_image_repo: "k8s.gcr.io/fluentd-elasticsearch"
fluentd_image_tag: "{{ fluentd_version }}"
kibana_version: "5.6.4"
kibana_image_repo: "docker.elastic.co/kibana/kibana"
kibana_image_tag: "{{ kibana_version }}"
helm_version: "v2.9.1"
helm_image_repo: "lachlanevenson/k8s-helm"
helm_image_tag: "{{ helm_version }}"
Expand Down Expand Up @@ -479,33 +470,6 @@ downloads:
tag: "{{ test_image_tag }}"
sha256: "{{ testbox_digest_checksum|default(None) }}"

elasticsearch:
enabled: "{{ efk_enabled }}"
container: true
repo: "{{ elasticsearch_image_repo }}"
tag: "{{ elasticsearch_image_tag }}"
sha256: "{{ elasticsearch_digest_checksum|default(None) }}"
groups:
- kube-node

fluentd:
enabled: "{{ efk_enabled }}"
container: true
repo: "{{ fluentd_image_repo }}"
tag: "{{ fluentd_image_tag }}"
sha256: "{{ fluentd_digest_checksum|default(None) }}"
groups:
- kube-node

kibana:
enabled: "{{ efk_enabled }}"
container: true
repo: "{{ kibana_image_repo }}"
tag: "{{ kibana_image_tag }}"
sha256: "{{ kibana_digest_checksum|default(None) }}"
groups:
- kube-node

helm:
enabled: "{{ helm_enabled }}"
container: true
Expand Down
6 changes: 0 additions & 6 deletions roles/kubernetes-apps/efk/elasticsearch/defaults/main.yml

This file was deleted.

5 changes: 0 additions & 5 deletions roles/kubernetes-apps/efk/elasticsearch/meta/main.yml

This file was deleted.

38 changes: 0 additions & 38 deletions roles/kubernetes-apps/efk/elasticsearch/tasks/main.yml

This file was deleted.

This file was deleted.

9 changes: 0 additions & 9 deletions roles/kubernetes-apps/efk/elasticsearch/templates/efk-sa.yml

This file was deleted.

This file was deleted.

This file was deleted.

7 changes: 0 additions & 7 deletions roles/kubernetes-apps/efk/fluentd/defaults/main.yml

This file was deleted.

22 changes: 0 additions & 22 deletions roles/kubernetes-apps/efk/fluentd/tasks/main.yml

This file was deleted.

Loading

0 comments on commit 1dda89d

Please sign in to comment.