File tree Expand file tree Collapse file tree 11 files changed +16
-69
lines changed
Expand file tree Collapse file tree 11 files changed +16
-69
lines changed Original file line number Diff line number Diff line change @@ -54,12 +54,6 @@ network:
5454 # instead of expecting the ingress controller provided
5555 # by OpenStack Helm
5656 use_external_ingress_controller : true
57- api :
58- ingress :
59- annotations :
60- nginx.ingress.kubernetes.io/rewrite-target : /
61- # set our default issuer
62- cert-manager.io/cluster-issuer : understack-cluster-issuer
6357
6458pod :
6559 mounts :
@@ -232,6 +226,7 @@ manifests:
232226 secret_rabbitmq : false
233227 secret_registry : false
234228 service_ingress_api : false
229+ ingress_api : false
235230 deployment_backup : false
236231 # We set the `secret_keystone` and `secret_ks_etc` to false in order to disable
237232 # Kubernetes section generation in OpenStack Helm, because we want those
Original file line number Diff line number Diff line change @@ -30,12 +30,6 @@ network:
3030 # instead of expecting the ingress controller provided
3131 # by OpenStack Helm
3232 use_external_ingress_controller : true
33- api :
34- ingress :
35- annotations :
36- nginx.ingress.kubernetes.io/rewrite-target : /
37- # set our default issuer
38- cert-manager.io/cluster-issuer : understack-cluster-issuer
3933
4034# Glance storage backend
4135# we'll switch to radosgw in the future
@@ -137,6 +131,7 @@ manifests:
137131 pod_rally_test : false
138132 secret_db : false
139133 service_ingress_api : false
134+ ingress_api : false
140135 # We set the `secret_keystone` and `secret_ks_etc` to false in order to disable
141136 # Kubernetes section generation in OpenStack Helm, because we want those
142137 # to be generated indirectly via ESO as configured in keystoneServiceUsers.enabled
Original file line number Diff line number Diff line change @@ -48,12 +48,6 @@ network:
4848 # instead of expecting the ingress controller provided
4949 # by OpenStack Helm
5050 use_external_ingress_controller : true
51- dashboard :
52- ingress :
53- annotations :
54- nginx.ingress.kubernetes.io/rewrite-target : /
55- # set our default issuer
56- cert-manager.io/cluster-issuer : understack-cluster-issuer
5751
5852# (nicholas.kuechler) updating the jobs list to remove the 'horizon-db-init' job.
5953dependencies :
@@ -69,6 +63,7 @@ manifests:
6963 job_db_init : false
7064 secret_db : false
7165 service_ingress : false
66+ ingress_api : false
7267
7368pod :
7469 lifecycle :
Original file line number Diff line number Diff line change @@ -136,15 +136,6 @@ secrets:
136136
137137network :
138138 api :
139- ingress :
140- public : true
141- classes :
142- namespace : " nginx"
143- cluster : " nginx-openstack"
144- annotations :
145- nginx.ingress.kubernetes.io/rewrite-target : /
146- # set our default issuer
147- cert-manager.io/cluster-issuer : understack-cluster-issuer
148139 external_policy_local : false
149140 node_port :
150141 enabled : false
@@ -200,6 +191,8 @@ manifests:
200191 secret_rabbitmq : false
201192 secret_registry : false
202193 service_ingress_api : false
194+ service_ingress : false
195+ ingress_api : false
203196 # We set the `secret_keystone` and `secret_ks_etc` to false in order to disable
204197 # Kubernetes section generation in OpenStack Helm, because we want those
205198 # to be generated indirectly via ESO as configured in keystoneServiceUsers.enabled
Original file line number Diff line number Diff line change @@ -13,12 +13,6 @@ network:
1313 # instead of expecting the ingress controller provided
1414 # by OpenStack Helm
1515 use_external_ingress_controller : true
16- api :
17- ingress :
18- annotations :
19- nginx.ingress.kubernetes.io/rewrite-target : /
20- # set our default issuer
21- cert-manager.io/cluster-issuer : understack-cluster-issuer
2216
2317dependencies :
2418 static :
@@ -339,6 +333,7 @@ manifests:
339333 # that is later consumed via components/openstack helm chart
340334 secret_keystone : false
341335 secret_ks_etc : false
336+ ingress_api : false
342337
343338annotations :
344339 # we need to modify the annotations on OpenStack Helm
Original file line number Diff line number Diff line change @@ -86,13 +86,7 @@ redis:
8686 argocd.argoproj.io/sync-options : Delete=false
8787
8888ingress :
89- enabled : true
90- ingressClassName : " nginx"
91- tls : true
92- secretName : " nautobot-ingress-tls"
93- annotations :
94- cert-manager.io/cluster-issuer : understack-cluster-issuer
95- nginx.ingress.kubernetes.io/backend-protocol : HTTPS
89+ enabled : false
9690
9791# (nicholas.kuechler) seeing something unexpected:
9892# https://networktocode.slack.com/archives/C01NWPK6WHL/p1736445485521569
Original file line number Diff line number Diff line change @@ -37,12 +37,6 @@ network:
3737 # instead of expecting the ingress controller provided
3838 # by OpenStack Helm
3939 use_external_ingress_controller : true
40- server :
41- ingress :
42- annotations :
43- nginx.ingress.kubernetes.io/rewrite-target : /
44- # set our default issuer
45- cert-manager.io/cluster-issuer : understack-cluster-issuer
4640
4741conf :
4842 plugins :
@@ -248,6 +242,7 @@ manifests:
248242 # hardcodes the config-file flag which then causes oslo.config to prefer
249243 # that data over the directory which we want to override
250244 configmap_bin : false
245+ ingress_server : false
251246
252247annotations :
253248 # we need to modify the annotations on OpenStack Helm
Original file line number Diff line number Diff line change @@ -41,12 +41,6 @@ network:
4141 # instead of expecting the ingress controller provided
4242 # by OpenStack Helm
4343 use_external_ingress_controller : true
44- osapi :
45- ingress :
46- annotations :
47- nginx.ingress.kubernetes.io/rewrite-target : /
48- # set our default issuer
49- cert-manager.io/cluster-issuer : understack-cluster-issuer
5044
5145conf :
5246 ceph :
@@ -227,6 +221,11 @@ manifests:
227221 # that is later consumed via components/openstack helm chart
228222 secret_keystone : false
229223 secret_ks_etc : false
224+ ingress_metadata : false
225+ ingress_novncproxy : false
226+ ingress_serialproxy : false
227+ ingress_spiceproxy : false
228+ ingress_osapi : false
230229
231230annotations :
232231 # we need to modify the annotations on OpenStack Helm
Original file line number Diff line number Diff line change @@ -30,11 +30,6 @@ network:
3030 # by OpenStack Helm
3131 use_external_ingress_controller : true
3232 api :
33- ingress :
34- annotations :
35- nginx.ingress.kubernetes.io/rewrite-target : /
36- # set our default issuer
37- cert-manager.io/cluster-issuer : understack-cluster-issuer
3833 external_policy_local : false
3934 node_port :
4035 enabled : false
@@ -167,6 +162,7 @@ manifests:
167162 # that is later consumed via components/openstack helm chart
168163 secret_keystone : false
169164 secret_ks_etc : false
165+ ingress_api : false
170166
171167annotations :
172168 # we need to modify the annotations on OpenStack Helm
Original file line number Diff line number Diff line change @@ -6,12 +6,6 @@ network:
66 # instead of expecting the ingress controller provided
77 # by OpenStack Helm
88 use_external_ingress_controller : true
9- api :
10- ingress :
11- annotations :
12- nginx.ingress.kubernetes.io/rewrite-target : /
13- # set our default issuer
14- cert-manager.io/cluster-issuer : understack-cluster-issuer
159
1610# (nicholas.kuechler) updating the jobs list to remove the 'placement-db-init' job.
1711dependencies :
@@ -83,6 +77,7 @@ manifests:
8377 # that is later consumed via components/openstack helm chart
8478 secret_keystone : false
8579 secret_ks_etc : false
80+ ingress : false
8681
8782annotations :
8883 # we need to modify the annotations on OpenStack Helm
You can’t perform that action at this time.
0 commit comments