Skip to content

Get secrets to hash for api and conductor pods <JIRA: OSPRH-10696> #570

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

Merged
openshift-merge-bot merged 1 commit into from
Jul 3, 2025
+62 −0
Merged

Get secrets to hash for api and conductor pods <JIRA: OSPRH-10696> #570

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
31 changes: 31 additions & 0 deletions controllers/ironicapi_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -659,6 +659,37 @@ func (r *IronicAPIReconciler) reconcileNormal(ctx context.Context, instance *iro
// ConfigMap
configMapVars := make(map[string]env.Setter)

// Get secrets by Namespace and Label that we need to hash
labelSelectorMap := map[string]string{}
lbl := labels.GetOwnerNameLabelSelector(labels.GetGroupLabel(ironic.ServiceName))
labelSelectorMap[lbl] = ironicv1.GetOwningIronicName(instance)
secrets, err := secret.GetSecrets(ctx, helper, instance.Namespace, labelSelectorMap)
if err != nil {
Log.Info(fmt.Sprintf("No secrets with label %s found", lbl))
} else {
for _, s := range secrets.Items {
hash, err := secret.Hash(&s)
if err != nil {
if k8s_errors.IsNotFound(err) {
Log.Info(fmt.Sprintf("OpenStack secret %s not found", instance.Spec.Secret))
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
condition.RequestedReason,
condition.SeverityInfo,
condition.InputReadyWaitingMessage))
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
condition.ErrorReason,
condition.SeverityWarning,
condition.InputReadyErrorMessage,
err.Error()))
return ctrl.Result{}, err
}
configMapVars[s.Name] = env.SetValue(hash)
}
}
//
// check for required OpenStack secret holding passwords for service/admin user and add hash to the vars map
//
Expand Down
31 changes: 31 additions & 0 deletions controllers/ironicconductor_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,37 @@ func (r *IronicConductorReconciler) reconcileNormal(ctx context.Context, instanc
// ConfigMap
configMapVars := make(map[string]env.Setter)

// Get secrets by Namespace and Label that we need to hash
labelSelectorMap := map[string]string{}
lbl := labels.GetOwnerNameLabelSelector(labels.GetGroupLabel(ironic.ServiceName))
labelSelectorMap[lbl] = ironicv1.GetOwningIronicName(instance)
secrets, err := secret.GetSecrets(ctx, helper, instance.Namespace, labelSelectorMap)
if err != nil {
Log.Info(fmt.Sprintf("No secrets with label %s found", lbl))
} else {
for _, s := range secrets.Items {
hash, err := secret.Hash(&s)
if err != nil {
if k8s_errors.IsNotFound(err) {
Log.Info(fmt.Sprintf("OpenStack secret %s not found", instance.Spec.Secret))
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
condition.RequestedReason,
condition.SeverityInfo,
condition.InputReadyWaitingMessage))
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}
instance.Status.Conditions.Set(condition.FalseCondition(
condition.InputReadyCondition,
condition.ErrorReason,
condition.SeverityWarning,
condition.InputReadyErrorMessage,
err.Error()))
return ctrl.Result{}, err
}
configMapVars[s.Name] = env.SetValue(hash)
}
}
//
// check for required OpenStack secret holding passwords for service/admin user and add hash to the vars map
//
Expand Down