Skip to content

Commit b1883d7

Browse files
authored
Update ingress-controller and use metal-roles v0.6.4 release. (#84)
1 parent f596728 commit b1883d7

File tree

10 files changed

+61
-407
lines changed

10 files changed

+61
-407
lines changed

deploy_partition.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
---
22
- name: deploy leaves and docker
33
hosts: leaves
4-
pre_tasks:
5-
- name: create docker directory # TODO: move to docker-on-cumulus role
6-
file:
7-
path: /etc/docker
8-
state: directory
94
roles:
105
- name: metal-roles/partition/roles/leaf
116
tags: leaf
@@ -68,7 +63,7 @@
6863
tags: always
6964
- name: metal-ansible-modules
7065
tags: always
71-
- name: metal-python
66+
- name: metal-roles/control-plane/roles/metal-python
7267
tags: metal-python
7368
post_tasks:
7469
- name: Wait for switches to register
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
metal_stack_release_version: v0.8.4
33
metal_core_image_tag: pr-dont-turn-off-chassis-led-on-registration
4+
metal_roles_version: v0.6.4

inventories/group_vars/control-plane/metal.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
metal_set_resource_limits: no
33
metal_check_api_health_endpoint: http://api.0.0.0.0.nip.io:8080/metal/v1/health
4+
metal_expose_ingress_service_ports: no
45

56
# metal_helm_chart_local_path: /helm-charts/charts/metal-control-plane
67

inventories/group_vars/control-plane/nsq.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
---
22
nsq_set_resource_limits: no
33

4+
nsq_expose_ingress_service_ports: no
5+
46
nsq_log_level: debug
57

68
nsq_tls_enabled: false

roles/ingress-controller/library/k8s_fits.py

Lines changed: 0 additions & 63 deletions
This file was deleted.
Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
---
2-
# When encountering module failures like: AttributeError: 'NoneType' object has no attribute 'get'
3-
# This is how to resolve them: https://github.com/ansible/ansible/issues/47081#issuecomment-431194051
4-
- name: Apply mandatory nginx-ingress definition
2+
- name: Create namespace ingress controller
53
k8s:
6-
definition: "{{ lookup('template', 'mandatory.yaml') }}"
4+
definition:
5+
apiVersion: v1
6+
kind: Namespace
7+
metadata:
8+
name: ingress-nginx
9+
labels:
10+
name: ingress-nginx
711

8-
- name: Deploy nginx-ingress service
9-
k8s:
10-
definition: "{{ lookup('template', 'service.yaml') }}"
12+
- name: Deploy nginx-ingress
13+
include_role:
14+
name: ansible-common/roles/helm-chart
15+
vars:
16+
helm_repo: "https://kubernetes.github.io/ingress-nginx"
17+
helm_chart: ingress-nginx
18+
helm_target_namespace: ingress-nginx
19+
helm_release_name: ingress-nginx
20+
helm_value_file_template: "values.yaml"

0 commit comments

Comments
 (0)