Skip to content

Commit

Permalink
Update ingress-controller and use metal-roles v0.6.4 release. (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerrit91 authored Dec 3, 2021
1 parent f596728 commit b1883d7
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 407 deletions.
7 changes: 1 addition & 6 deletions deploy_partition.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
---
- name: deploy leaves and docker
hosts: leaves
pre_tasks:
- name: create docker directory # TODO: move to docker-on-cumulus role
file:
path: /etc/docker
state: directory
roles:
- name: metal-roles/partition/roles/leaf
tags: leaf
Expand Down Expand Up @@ -68,7 +63,7 @@
tags: always
- name: metal-ansible-modules
tags: always
- name: metal-python
- name: metal-roles/control-plane/roles/metal-python
tags: metal-python
post_tasks:
- name: Wait for switches to register
Expand Down
1 change: 1 addition & 0 deletions inventories/group_vars/all/images.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
metal_stack_release_version: v0.8.4
metal_core_image_tag: pr-dont-turn-off-chassis-led-on-registration
metal_roles_version: v0.6.4
1 change: 1 addition & 0 deletions inventories/group_vars/control-plane/metal.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
---
metal_set_resource_limits: no
metal_check_api_health_endpoint: http://api.0.0.0.0.nip.io:8080/metal/v1/health
metal_expose_ingress_service_ports: no

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

Expand Down
2 changes: 2 additions & 0 deletions inventories/group_vars/control-plane/nsq.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
nsq_set_resource_limits: no

nsq_expose_ingress_service_ports: no

nsq_log_level: debug

nsq_tls_enabled: false
Expand Down
63 changes: 0 additions & 63 deletions roles/ingress-controller/library/k8s_fits.py

This file was deleted.

24 changes: 17 additions & 7 deletions roles/ingress-controller/tasks/main.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,20 @@
---
# When encountering module failures like: AttributeError: 'NoneType' object has no attribute 'get'
# This is how to resolve them: https://github.com/ansible/ansible/issues/47081#issuecomment-431194051
- name: Apply mandatory nginx-ingress definition
- name: Create namespace ingress controller
k8s:
definition: "{{ lookup('template', 'mandatory.yaml') }}"
definition:
apiVersion: v1
kind: Namespace
metadata:
name: ingress-nginx
labels:
name: ingress-nginx

- name: Deploy nginx-ingress service
k8s:
definition: "{{ lookup('template', 'service.yaml') }}"
- name: Deploy nginx-ingress
include_role:
name: ansible-common/roles/helm-chart
vars:
helm_repo: "https://kubernetes.github.io/ingress-nginx"
helm_chart: ingress-nginx
helm_target_namespace: ingress-nginx
helm_release_name: ingress-nginx
helm_value_file_template: "values.yaml"
Loading

0 comments on commit b1883d7

Please sign in to comment.