Skip to content

Add per-pool TSIG key creation gated by AZAwareMode #486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
abhiramnarayana wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add per-pool TSIG key creation gated by AZAwareMode #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion internal/controller/designate_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package controller

import (
"context"
"encoding/json"
"errors"
"fmt"
"maps"
Expand Down Expand Up @@ -1337,7 +1338,23 @@ func (r *DesignateReconciler) reconcileNormal(ctx context.Context, instance *des
Data: make(map[string]string),
}

poolsYaml, poolsYamlHash, err := designate.GeneratePoolsYamlDataAndHash(updatedBindMap, mdnsConfigMap.Data, nsRecords, multipoolConfig, externalBindData, externalMasterServiceIPs)
// Read per-pool TSIG key ID mapping if AZ-aware mode is enabled
var tsigKeyIDs map[string]string
if instance.Spec.AZAwareMode == designatev1beta1.AZModeEnabled && multipoolConfig != nil {
tsigSecretName := fmt.Sprintf("%s-backendbind9%s", instance.Name, designate.TsigSecretSuffix)
tsigSecret := &corev1.Secret{}
err := helper.GetClient().Get(ctx, types.NamespacedName{Name: tsigSecretName, Namespace: instance.GetNamespace()}, tsigSecret)
if err == nil {
if data, exists := tsigSecret.Data[designate.TSIGKeyIDsDataKey]; exists {
if jsonErr := json.Unmarshal(data, &tsigKeyIDs); jsonErr != nil {
Log.Info(fmt.Sprintf("Failed to parse TSIG key ID mapping from secret, pools.yaml will be generated without tsigkey_ids: %v", jsonErr))
}
}
}
// If secret doesn't exist yet, tsigKeyIDs stays nil — pools.yaml is generated without tsigkey_ids (first pass)
}

poolsYaml, poolsYamlHash, err := designate.GeneratePoolsYamlDataAndHash(updatedBindMap, mdnsConfigMap.Data, nsRecords, multipoolConfig, externalBindData, externalMasterServiceIPs, tsigKeyIDs)
if err != nil {
return ctrl.Result{}, err
}
Expand Down
Loading