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.

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

Cleanup in it utilities 6 #1770

Merged
merged 14 commits into from
Oct 16, 2024

Conversation

wind57
Copy link
Contributor

@wind57 wind57 commented Oct 16, 2024

No description provided.

String version = StreamUtils.copyToString(in, StandardCharsets.UTF_8);
if (StringUtils.hasText(version)) {
version = version.trim();
if (POM_VERSION == null) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

nitpick improvement, don't read pom version all the time by loading that file, but do it only once, per vm

@@ -149,6 +149,11 @@ public static void loadImage(String image, String tag, String tarName, K3sContai
* either get the tar from '/tmp/docker/images', or pull the image.
*/
public static void load(K3sContainer container, String tarName, String imageNameForDownload, String imageVersion) {

if (imageAlreadyInK3s(container, tarName)) {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

if the image is already inside the container, skip. We already had this, but for busybox only. This generalizes it for all images (also it does it according to your comment in a previous PR, thx for that btw!)

@wind57 wind57 marked this pull request as ready for review October 16, 2024 20:33
@wind57
Copy link
Contributor Author

wind57 commented Oct 16, 2024

@ryanjbaxter last one for today. thank you

@ryanjbaxter ryanjbaxter added this to the 3.1.4 milestone Oct 16, 2024
@ryanjbaxter ryanjbaxter merged commit 3c8e0a0 into spring-cloud:3.1.x Oct 16, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
No open projects
Status: Done
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants