Skip to content

Commit ac4fecc

Browse files
committed
fix: fix logging
1 parent 8a83d53 commit ac4fecc

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

pkg/auth/cred.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ func (w *expireEarlyTokenCredential) GetToken(ctx context.Context, options polic
8989
// IMDS may have the MI token already, and have an expiration of less than 2h when we receive the token. We don't want to set that value beyond the ExpiresOn time and potentially miss a refresh
9090
// So we just return earlier here. See discussion here: https://github.com/Azure/karpenter-provider-azure/pull/391/files#r1648633051
9191
if token.ExpiresOn.Before(twoHoursFromNow) {
92-
log.FromContext(ctx).Info("XPMT: ExpiresOn %s is before two hours from now %s, not adjusting", token.ExpiresOn, twoHoursFromNow)
92+
log.FromContext(ctx).Info(fmt.Sprintf("XPMT: ExpiresOn %s is before two hours from now %s, not adjusting", token.ExpiresOn, twoHoursFromNow))
9393
return token, nil
9494
}
95-
log.FromContext(ctx).Info("XPMT: adjusting ExpiresOn from %s to %s", token.ExpiresOn, twoHoursFromNow)
95+
log.FromContext(ctx).Info(fmt.Sprintf("XPMT: adjusting ExpiresOn from %s to %s", token.ExpiresOn, twoHoursFromNow))
9696
// If the token expires in more than 2 hours, this means we are taking in a new token with a fresh 24h expiration time or one already in the cache that hasn't been modified by us, so we want to set that to two hours so
9797
// we can refresh it early to avoid the polling bugs mentioned in the above issue
9898
token.ExpiresOn = twoHoursFromNow

pkg/providers/imagefamily/nodebootstrapping_client.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func (t *tokenCache) getToken(ctx context.Context, credential azcore.TokenCreden
6161
return t.token, nil
6262
}
6363
if t.token.Token != "" {
64-
log.FromContext(ctx).Info("XPMT: getToken(): cached token is expired: refreshAfter=%s; ExpiresOn=%s, RefreshOn=%s", t.refreshAfter, t.token.ExpiresOn, t.token.RefreshOn)
64+
log.FromContext(ctx).Info(fmt.Sprintf("XPMT: getToken(): cached token is expired: refreshAfter=%s; ExpiresOn=%s, RefreshOn=%s", t.refreshAfter, t.token.ExpiresOn, t.token.RefreshOn))
6565
} else {
6666
log.FromContext(ctx).Info("XPMT: getToken(): no cached token present, fetching a new one")
6767
}
@@ -74,7 +74,7 @@ func (t *tokenCache) getToken(ctx context.Context, credential azcore.TokenCreden
7474
return azcore.AccessToken{}, fmt.Errorf("failed to get token: %w", err)
7575
}
7676

77-
log.FromContext(ctx).Info("XPMT: getToken(): fetched new token: ExpiresOn=%s, RefreshOn=%s", tokenObj.ExpiresOn, tokenObj.RefreshOn)
77+
log.FromContext(ctx).Info(fmt.Sprintf("XPMT: getToken(): fetched new token: ExpiresOn=%s, RefreshOn=%s", tokenObj.ExpiresOn, tokenObj.RefreshOn))
7878

7979
// Store the token with its expiration
8080
t.token = tokenObj
@@ -83,7 +83,7 @@ func (t *tokenCache) getToken(ctx context.Context, credential azcore.TokenCreden
8383
if tokenObj.RefreshOn.IsZero() {
8484
defaultRefreshBuffer := 5 * time.Minute
8585
t.refreshAfter = tokenObj.ExpiresOn.Add(-defaultRefreshBuffer)
86-
log.FromContext(ctx).Info("XPMT: getToken(): no RefreshOn provided, using default buffer: refreshAfter=%s", t.refreshAfter)
86+
log.FromContext(ctx).Info(fmt.Sprintf("XPMT: getToken(): no RefreshOn provided, using default buffer: refreshAfter=%s", t.refreshAfter))
8787
} else {
8888
// Use the RefreshOn time if provided, otherwise define our own buffer
8989
t.refreshAfter = tokenObj.RefreshOn
@@ -155,7 +155,7 @@ func (c *NodeBootstrappingClient) Get(
155155
return "", "", err
156156
}
157157
xpmtEndTime := time.Now()
158-
log.FromContext(ctx).Info("XPMT: NodeBootstrappingClient.Get(): request completed, duration=%s", xpmtEndTime.Sub(xpmtStartTime))
158+
log.FromContext(ctx).Info(fmt.Sprintf("XPMT: NodeBootstrappingClient.Get(): request completed, duration=%s", xpmtEndTime.Sub(xpmtStartTime)))
159159

160160
if resp.Payload == nil {
161161
return "", "", fmt.Errorf("no payload in response")

0 commit comments

Comments
 (0)