Skip to content

Commit 646a948

Browse files
committed
chore: only set the tls secretName as needed
All charts have the proper values and default them to keep them in sync except for the Ironic chart. We can drop this configuration in the deploy repos and just default it in Ironic until upstream fixes the issue.
1 parent a127b1d commit 646a948

File tree

3 files changed

+8
-50
lines changed

3 files changed

+8
-50
lines changed

components/ironic/values.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,14 @@ endpoints:
117117
name: understack-cluster-issuer
118118
kind: ClusterIssuer
119119

120+
secrets:
121+
tls:
122+
baremetal:
123+
api:
124+
# needs to be kept in sync with secretName in the host_fqdn_override
125+
# because helm-toolkit checks one field but then uses the other
126+
public: ironic-tls-public
127+
120128
network:
121129
api:
122130
ingress:

components/openstack-secrets.tpl.yaml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -137,29 +137,4 @@ endpoints:
137137
host_fqdn_override:
138138
public:
139139
host: horizon.${DNS_ZONE}
140-
141-
# necessary cause the ingress definition in openstack-helm-infra helm-toolkit hardcodes this
142-
secrets:
143-
tls:
144-
baremetal:
145-
api:
146-
public: ironic-tls-public
147-
image:
148-
api:
149-
public: glance-tls-public
150-
identity:
151-
api:
152-
public: keystone-tls-public
153-
network:
154-
server:
155-
public: neutron-tls-public
156-
compute:
157-
osapi:
158-
public: nova-tls-public
159-
placement:
160-
api:
161-
public: placement-tls-public
162-
dashboard:
163-
dashboard:
164-
public: horizon-tls-public
165140
...

go/understackctl/cmd/other/openstack.go

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -138,29 +138,4 @@ endpoints:
138138
host_fqdn_override:
139139
public:
140140
host: horizon.{{ .DNS_ZONE }}
141-
142-
# necessary cause the ingress definition in openstack-helm-infra helm-toolkit hardcodes this
143-
secrets:
144-
tls:
145-
baremetal:
146-
api:
147-
public: ironic-tls-public
148-
image:
149-
api:
150-
public: glance-tls-public
151-
identity:
152-
api:
153-
public: keystone-tls-public
154-
network:
155-
server:
156-
public: neutron-tls-public
157-
compute:
158-
osapi:
159-
public: nova-tls-public
160-
placement:
161-
api:
162-
public: placement-tls-public
163-
dashboard:
164-
dashboard:
165-
public: horizon-tls-public
166141
`

0 commit comments

Comments
 (0)