Skip to content

Commit

Permalink
debug xx
Browse files Browse the repository at this point in the history
Signed-off-by: ty-dc <[email protected]>
  • Loading branch information
ty-dc committed Jun 14, 2024
1 parent 669c255 commit ca26aeb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/ipam/pool_selections.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func (i *ipam) getPoolCandidates(ctx context.Context, addArgs *models.IpamAddArg
} else {
hasSubnetsAnnotation := applicationinformers.HasSubnetsAnnotation(pod.Annotations)
if hasSubnetsAnnotation {
return nil, fmt.Errorf("it's invalid to use '%s' or '%s' annotation when Auto-Pool feature is disabled", constant.AnnoSpiderSubnets, constant.AnnoSpiderSubnet)
return nil, fmt.Errorf("'%s' or '%s' annotation when Auto-Pool feature is disabled", constant.AnnoSpiderSubnets, constant.AnnoSpiderSubnet)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ setup_spiderpool:
HELM_OPTION+=" --set dra.enabled=true " ; \
HELM_OPTION+=" --set dra.hostDevicePath=$(E2E_SPIDERPOOL_DRA_SOLIBRARY_PATH) " ; \
fi ; \
HELM_OPTION+=" --set multus.multusCNI.install=true " ; \
HELM_OPTION+=" --set multus.multusCNI.+=true " ; \
HELM_OPTION+=" --set multus.multusCNI.image.registry= " ; \
HELM_OPTION+=" --set multus.multusCNI.image.repository=$(E2E_MULTUS_IMAGE_NAME) " ; \
if [ "$(INSTALL_OVERLAY_CNI)" == "true" ]; then \
Expand Down

0 comments on commit ca26aeb

Please sign in to comment.