Skip to content

fix: Debug logging errors #26

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
zacharyblasczyk merged 1 commit into from
Sep 3, 2024
Merged

fix: Debug logging errors #26

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
20 changes: 16 additions & 4 deletions controllers/weightsandbiases_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,22 +160,34 @@ func (r *WeightsAndBiasesReconciler) Reconcile(ctx context.Context, req ctrl.Req
}

// First takes precedence
desiredSpec.Merge(crdSpec)
if err := desiredSpec.Merge(crdSpec); err != nil {
log.Error(err, "Failed to merge CRD spec into desired spec")
return ctrlqueue.RequeueWithError(err)
}
if r.Debug {
log.Info("Desired spec after merging crdSpec", "spec", desiredSpec.SensitiveValuesMasked())
}

desiredSpec.Merge(userInputSpec)
if err := desiredSpec.Merge(userInputSpec); err != nil {
log.Error(err, "Failed to merge user input spec into desired spec")
return ctrlqueue.RequeueWithError(err)
}
if r.Debug {
log.Info("Desired spec after merging userInputSpec", "spec", desiredSpec.SensitiveValuesMasked())
}

desiredSpec.Merge(deployerSpec)
if err := desiredSpec.Merge(deployerSpec); err != nil {
log.Error(err, "Failed to merge deployer spec into desired spec")
return ctrlqueue.RequeueWithError(err)
}
if r.Debug {
log.Info("Desired spec after merging deployerSpec", "spec", desiredSpec.SensitiveValuesMasked())
}

desiredSpec.Merge(operator.Defaults(wandb, r.Scheme))
if err := desiredSpec.Merge(operator.Defaults(wandb, r.Scheme)); err != nil {
log.Error(err, "Failed to merge operator defaults into desired spec")
return ctrlqueue.RequeueWithError(err)
}
if r.Debug {
log.Info("Desired spec after merging operator defaults", "spec", desiredSpec.SensitiveValuesMasked())
}
Expand Down
10 changes: 7 additions & 3 deletions pkg/wandb/spec/spec.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,9 +105,9 @@ func (s *Spec) mergeConfig(values Values) (err error) {
// take precedence. This means, if the current spec has a value for a key, the
// new spec will not override it. Likewise, charts & metadata cannot be merged,
// so if a chart/metadata value is set, the one passed in will be ignored.
func (s *Spec) Merge(spec *Spec) {
func (s *Spec) Merge(spec *Spec) (err error) {
if spec == nil {
return
return nil
}

if s.Metadata == nil {
Expand All @@ -117,8 +117,12 @@ func (s *Spec) Merge(spec *Spec) {
s.Chart = spec.Chart
}
if spec.Values != nil {
s.mergeConfig(spec.Values)
err = s.mergeConfig(spec.Values)
if err != nil {
return err
}
}
return nil
}

func (s *Spec) SensitiveValuesMasked() *Spec {
Expand Down