VladPolskiy/mariadb-operator
1
0
Fork 0
mirror of https://github.com/mariadb-operator/mariadb-operator.git synced 2025-07-22 18:27:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Using ca.crt Secret field in MaxScale's trust bundle

Browse Source
This commit is contained in:
mmontes11
2025-01-09 15:23:53 +01:00
committed by Martin Montes
parent 62e30283a0
commit 4e394f7495
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/v1alpha1/maxscale_keys.go
View File

@ -105,10 +105,19 @@ func (m *MaxScale) TLSCABundleSecretKeyRef() SecretKeySelector {
// TLSServerCASecretKey defines the key for the TLS admin CA.
func (m *MaxScale) TLSAdminCASecretKey() types.NamespacedName {
tls := ptr.Deref(m.Spec.TLS, MaxScaleTLS{})
if tls.Enabled && tls.AdminCASecretRef != nil {
return types.NamespacedName{
Name: tls.AdminCASecretRef.Name,
Namespace: m.Namespace,
if tls.Enabled {
if tls.AdminCASecretRef != nil {
return types.NamespacedName{
Name: tls.AdminCASecretRef.Name,
Namespace: m.Namespace,
}
}
if tls.AdminCertIssuerRef != nil {
// Secret issued by cert-manager containing the ca.crt field.
return types.NamespacedName{
Name: m.TLSAdminCertSecretKey().Name,
Namespace: m.Namespace,
}
}
}
return types.NamespacedName{
@ -135,10 +144,19 @@ func (m *MaxScale) TLSAdminCertSecretKey() types.NamespacedName {
// TLSListenerCASecretKey defines the key for the TLS listener CA.
func (m *MaxScale) TLSListenerCASecretKey() types.NamespacedName {
tls := ptr.Deref(m.Spec.TLS, MaxScaleTLS{})
if tls.Enabled && tls.ListenerCASecretRef != nil {
return types.NamespacedName{
Name: tls.ListenerCASecretRef.Name,
Namespace: m.Namespace,
if tls.Enabled {
if tls.ListenerCASecretRef != nil {
return types.NamespacedName{
Name: tls.ListenerCASecretRef.Name,
Namespace: m.Namespace,
}
}
if tls.ListenerCertIssuerRef != nil {
// Secret issued by cert-manager containing the ca.crt field.
return types.NamespacedName{
Name: m.TLSListenerCertSecretKey().Name,
Namespace: m.Namespace,
}
}
}
return types.NamespacedName{