chore: refactor to atmosphere_ingress_class_name
This commit refactors to using atmosphere_ingress_class_name
and also moving it to "atmosphere" ingress class name.
diff --git a/roles/atmosphere/vars/main.yml b/roles/atmosphere/vars/main.yml
index 85f1809..f839fa4 100644
--- a/roles/atmosphere/vars/main.yml
+++ b/roles/atmosphere/vars/main.yml
@@ -1,5 +1,5 @@
_atmosphere_cloud_spec:
imageRepository: "{{ atmosphere_image_repository | default(None) }}"
- ingressClassName: "{{ openstack_helm_ingress_class_name | default('openstack') }}"
+ ingressClassName: "{{ atmosphere_ingress_class_name }}"
certManagerClusterIssuer: "{{ openstack_helm_ingress_cluster_issuer | default('atmosphere') }}"
regionName: "{{ openstack_helm_endpoints_region_name }}"
diff --git a/roles/defaults/defaults/main.yml b/roles/defaults/defaults/main.yml
index b5a6da0..bc6551b 100644
--- a/roles/defaults/defaults/main.yml
+++ b/roles/defaults/defaults/main.yml
@@ -1,3 +1,6 @@
+# Ingress
+atmosphere_ingress_class_name: atmosphere
+
atmosphere_images:
alertmanager: quay.io/prometheus/alertmanager:v0.24.0
atmosphere: quay.io/vexxhost/atmosphere:0.13.0 # x-release-please-version
diff --git a/roles/ingress_nginx/vars/main.yml b/roles/ingress_nginx/vars/main.yml
index 8370da9..6eaf0f4 100644
--- a/roles/ingress_nginx/vars/main.yml
+++ b/roles/ingress_nginx/vars/main.yml
@@ -24,8 +24,8 @@
dnsPolicy: ClusterFirstWithHostNet
hostNetwork: true
ingressClassResource:
- name: openstack
- ingressClass: openstack
+ name: "{{ atmosphere_ingress_class_name }}"
+ ingressClass: "{{ atmosphere_ingress_class_name }}"
kind: DaemonSet
nodeSelector:
openstack-control-plane: enabled
diff --git a/roles/openstack_helm_ingress/defaults/main.yml b/roles/openstack_helm_ingress/defaults/main.yml
index 9dacdb1..1a6e7b2 100644
--- a/roles/openstack_helm_ingress/defaults/main.yml
+++ b/roles/openstack_helm_ingress/defaults/main.yml
@@ -11,7 +11,7 @@
openstack_helm_ingress_cluster_issuer: atmosphere
# Name of the Ingress class to use for exposing the service.
-openstack_helm_ingress_class_name: openstack
+openstack_helm_ingress_class_name: "{{ atmosphere_ingress_class_name }}"
# Secret containing the TLS certificate to use for the Ingress, overriding this
# value globally should allow to point towards a secret containing the custom