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

add helm to k8s master for vault and fixes [#1729] #1731

Merged
merged 1 commit into from
Oct 2, 2020
Merged

add helm to k8s master for vault and fixes [#1729] #1731

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions core/src/epicli/data/common/ansible/playbooks/roles/kubernetes_master/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,3 +103,8 @@
lineinfile:
path: "/home/{{ admin_user.name }}/.bashrc"
line: source <(kubectl completion bash)

- name: Include Helm binary installation
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- name: Include Helm binary installation
- name: Install Helm binary file

include_role:
name: helm
tasks_from: install-bin
2 changes: 1 addition & 1 deletion core/src/epicli/data/common/ansible/playbooks/roles/prometheus/templates/prometheus.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ scrape_configs:
- __meta_kubernetes_namespace
- __meta_kubernetes_service_name
- __meta_kubernetes_endpoint_port_name

# Scrape config for node exporters in "k8s as cloud service"

{% if k8s_as_cloud_service is defined and k8s_as_cloud_service %}
Expand Down
4 changes: 3 additions & 1 deletion core/src/epicli/data/common/ansible/playbooks/roles/vault/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@
dest: /tmp/vault_helm_chart_values.yaml
when: vault_helm_chart_values_bool

- name: Install and configure Hashicorp Vault if enabled
- name: Install and configure Hashicorp Vault if enabled and no cloud service is used
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
- name: Install and configure Hashicorp Vault if enabled and no cloud service is used
- name: Install and configure Hashicorp Vault if enabled and no cloud k8s service is used

when:
- specification.vault_enabled
- k8s_as_cloud_service is not defined
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this line has no effect, we can safely assume this is defined always (it's merged with defaults), no? 🤔

Suggested change
- k8s_as_cloud_service is not defined

Copy link
Contributor

Choose a reason for hiding this comment

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

Also it could mask some future issues with upgrades... 🤔

- not k8s_as_cloud_service
block:
- name: Create Vault system group
group:
Expand Down