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

Jump to bottom

PWX-38512 Skip token refresh verification if host-pid not enabled #1635

Merged
merged 3 commits into from
Aug 12, 2024
Merged

PWX-38512 Skip token refresh verification if host-pid not enabled #1635

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
299f69b
skip token refresh verification if host-pid not enabled
Aug 9, 2024
96ead5e
validate px serviceaccount token secret created
Aug 9, 2024
f8dc862
update error message
Aug 9, 2024
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
12 changes: 12 additions & 0 deletions pkg/util/test/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1845,6 +1845,18 @@ func validatePortworxTokenRefresh(cluster *corev1.StorageCluster, timeout, inter
logrus.Infof("pxVersion: %v, opVersion: %v. Skip verification because px token refresh is not supported with these versions.", pxVersion, opVersion)
return nil
}
pidEnabled, err := strconv.ParseBool(cluster.Annotations["portworx.io/host-pid"])
if err != nil || !pidEnabled {
pxSaSecret, err := coreops.Instance().GetSecret(pxSaTokenSecretName, cluster.Namespace)
if err != nil {
return fmt.Errorf("failed to get px serviceaccount secret [%s] in namespace [%s]. Err: %w", pxSaTokenSecretName, cluster.Namespace, err)
}
if len(pxSaSecret.Data[core.ServiceAccountTokenKey]) == 0 {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also we can probably just do this, less heavier operation

Suggested change
if len(pxSaSecret.Data[core.ServiceAccountTokenKey]) == 0 {
if pxSaSecret.Data[core.ServiceAccountTokenKey] == "" {

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's a byte array, not a string, so checking the length would be better in this case?

return fmt.Errorf("px serviceaccount token validation failed. Token doesn't exist or length is 0")
}
logrus.Infof("Annotation `host-pid: true` is required for verifying token refresh because we need to run command inside px runc container. Thus Skipping verification.")
return nil
}
logrus.Infof("Verifying px runc container token...")
// Get one Portworx pod to run commands inside the px runc container on the same node
pxPods, err := coreops.Instance().GetPods(cluster.Namespace, map[string]string{"name": "portworx"})
Expand Down
Loading