POWERMON-251: ensure redfish config change restart kepler #378
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sthaha
force-pushed
the
fix-reconcile-on-cm-change
branch
2 times, most recently
from
71b2b7b to
33798eb
Compare
sthaha
force-pushed
the
fix-reconcile-on-cm-change
branch
from
33798eb to
4e28a83
Compare
vprashar2929
previously approved these changes
Mar 13, 2024
vimalk78
previously approved these changes
Mar 13, 2024
| @@ -182,7 +182,9 @@ func TestDaemonSet(t *testing.T) { | |||
| }, | |||
| }, | |||
| annotation: map[string]string{ | |||
| "kepler.system.sustainable.computing.io/redfish-secret-ref": "123", | |||
|
|
|||
| RedfishSecretAnnotation: "123", | |||
There was a problem hiding this comment.
It is better to use string values than consts in test code. This makes sure tests break when const is changed, else the tests pass silently.
pkg/components/exporter/exporter.go
Outdated
| @@ -154,6 +155,7 @@ func MountRedfishSecretToDaemonSet(ds *appsv1.DaemonSet, secret *corev1.Secret) | |||
| // forces pods to be reployed if the secret chanage | |||
| ds.Spec.Template.Annotations = map[string]string{ | |||
| RedfishSecretAnnotation: secret.ResourceVersion, | |||
| RedfishConfigHash: fmt.Sprint(hash), | |||
There was a problem hiding this comment.
Sprint will use reflection. Ignore, if no other way.
There was a problem hiding this comment.
+1 .. using strconv now.
sthaha
force-pushed
the
fix-reconcile-on-cm-change
branch
from
4e28a83 to
9155cf3
Compare
vimalk78
previously approved these changes
Mar 13, 2024
pkg/reconciler/kepler.go
Outdated
| if rf.ProbeInterval != zero { | ||
| r.Cfm.Data["REDFISH_PROBE_INTERVAL_IN_SECONDS"] = fmt.Sprintf("%f", rf.ProbeInterval.Duration.Seconds()) | ||
| } | ||
| r.Cfm.Data["REDFISH_PROBE_INTERVAL_IN_SECONDS"] = fmt.Sprint(int64(rf.ProbeInterval.Duration.Seconds())) |
There was a problem hiding this comment.
here also using fmt.Sprint
There was a problem hiding this comment.
BenchmarkStrconv-8 18622068 112.7 ns/op
BenchmarkFmt-8 23205686 107.4 ns/op
There was a problem hiding this comment.
The reason for the change from the original implementation was fmt.Sprintf"%f", 60.0) resulted in 60.0000000 in the configmap. instead of 60
This commit modifies kepler reconciler to add the hash of redfish spec to pod annotations so that any change to the redfish spec will redeploy the pod. This commit also fixes POWERMON-250 by removing the default redfish config added to kepler configmap. Signed-off-by: Sunil Thaha <[email protected]>
sthaha
force-pushed
the
fix-reconcile-on-cm-change
branch
from
9155cf3 to
214c9b5
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit modifies kepler reconciler to add the hash of redfish spec to pod annotations so that any change to the redfish spec will redeploy the pod.
This commit also fixes POWERMON-250 by removing the default redfish config added to kepler configmap.