Skip to content
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

fix: fix always update EMQX config #1017

Merged
merged 1 commit into from
Feb 22, 2024
Merged

fix: fix always update EMQX config #1017

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
4 changes: 2 additions & 2 deletions controllers/apps/v2beta1/sync_emqx_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (s *syncConfig) reconcile(ctx context.Context, logger logr.Logger, instance
if instance.Annotations == nil {
instance.Annotations = map[string]string{}
}
instance.Annotations[appsv2beta1.AnnotationsLastEMQXConfigKey] = confStr
instance.Annotations[appsv2beta1.AnnotationsLastEMQXConfigKey] = instance.Spec.Config.Data
if err := s.Client.Update(ctx, instance); err != nil {
return subResult{err: emperror.Wrap(err, "failed to update emqx instance annotation")}
}
Expand Down Expand Up @@ -91,7 +91,7 @@ func (s *syncConfig) reconcile(ctx context.Context, logger logr.Logger, instance
return subResult{err: emperror.Wrap(err, "failed to update configMap")}
}

instance.Annotations[appsv2beta1.AnnotationsLastEMQXConfigKey] = confStr
instance.Annotations[appsv2beta1.AnnotationsLastEMQXConfigKey] = instance.Spec.Config.Data
if err := s.Client.Update(ctx, instance); err != nil {
return subResult{err: emperror.Wrap(err, "failed to update emqx instance annotation")}
}
Expand Down
Loading