Skip to content

Cache secret hashes in nodeset sync checks to avoid redundant API calls #701

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
lmiccini wants to merge 1 commit into
base: main
Choose a base branch
from
+40 −26
Open

Cache secret hashes in nodeset sync checks to avoid redundant API calls #701

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
66 changes: 40 additions & 26 deletions modules/edpm/unstructured/nodeset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ func AreSecretHashesInSync(
return true, "", nil
}

hashCache := map[string]string{}

for i := range nodesetList.Items {
item := &nodesetList.Items[i]

Expand All @@ -102,23 +104,28 @@ func AreSecretHashesInSync(
}

for secretName, deployedHash := range secretHashes {
currentSecret := &corev1.Secret{}
err := c.Get(ctx, types.NamespacedName{
Name: secretName,
Namespace: namespace,
}, currentSecret)
if err != nil {
if k8s_errors.IsNotFound(err) {
info := fmt.Sprintf("nodeset %s/%s: deployed secret %s no longer exists",
item.GetNamespace(), item.GetName(), secretName)
return false, info, nil
currentHash, ok := hashCache[secretName]
if !ok {
currentSecret := &corev1.Secret{}
err := c.Get(ctx, types.NamespacedName{
Name: secretName,
Namespace: namespace,
}, currentSecret)
if err != nil {
if k8s_errors.IsNotFound(err) {
info := fmt.Sprintf("nodeset %s/%s: deployed secret %s no longer exists",
item.GetNamespace(), item.GetName(), secretName)
return false, info, nil
}
return false, "", fmt.Errorf("failed to get secret %s: %w", secretName, err)
}
return false, "", fmt.Errorf("failed to get secret %s: %w", secretName, err)
}

currentHash, hashErr := oko_secret.Hash(currentSecret)
if hashErr != nil {
return false, "", fmt.Errorf("failed to hash secret %s: %w", secretName, hashErr)
h, hashErr := oko_secret.Hash(currentSecret)
if hashErr != nil {
return false, "", fmt.Errorf("failed to hash secret %s: %w", secretName, hashErr)
}
currentHash = h
hashCache[secretName] = currentHash
}

if currentHash != deployedHash {
Expand Down Expand Up @@ -167,6 +174,9 @@ func IsSecretHashInSync(
return false, "", fmt.Errorf("failed to list OpenStackDataPlaneNodeSets: %w", err)
}

var currentHash string
var hashResolved bool

for i := range nodesetList.Items {
item := &nodesetList.Items[i]

Expand All @@ -184,19 +194,23 @@ func IsSecretHashInSync(
continue
}

currentSecret := &corev1.Secret{}
if err := c.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, currentSecret); err != nil {
if k8s_errors.IsNotFound(err) {
info := fmt.Sprintf("nodeset %s/%s: deployed secret %s no longer exists",
item.GetNamespace(), item.GetName(), secretName)
return false, info, nil
if !hashResolved {
currentSecret := &corev1.Secret{}
if err := c.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, currentSecret); err != nil {
if k8s_errors.IsNotFound(err) {
info := fmt.Sprintf("nodeset %s/%s: deployed secret %s no longer exists",
item.GetNamespace(), item.GetName(), secretName)
return false, info, nil
}
return false, "", fmt.Errorf("failed to get secret %s: %w", secretName, err)
}
return false, "", fmt.Errorf("failed to get secret %s: %w", secretName, err)
}

currentHash, hashErr := oko_secret.Hash(currentSecret)
if hashErr != nil {
return false, "", fmt.Errorf("failed to hash secret %s: %w", secretName, hashErr)
h, hashErr := oko_secret.Hash(currentSecret)
if hashErr != nil {
return false, "", fmt.Errorf("failed to hash secret %s: %w", secretName, hashErr)
}
currentHash = h
hashResolved = true
}

if currentHash != deployedHash {
Expand Down
Loading