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

Refactor k8s client configuration watcher #1849

Merged

Conversation

wind57
Copy link
Contributor

@wind57 wind57 commented Jan 23, 2025

No description provided.

@@ -1,9 +0,0 @@
apiVersion: v1
data:
application.properties: |-
Copy link
Contributor Author

Choose a reason for hiding this comment

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

it was used to configure the configuration watcher and I moved those properties to env variables

@@ -34,7 +34,7 @@
<properties>
<kubernetes-fabric8-client.version>6.9.2</kubernetes-fabric8-client.version>
<kubernetes-native-client.version>19.0.2</kubernetes-native-client.version>
<wiremock.version>3.4.2</wiremock.version>
Copy link
Contributor Author

Choose a reason for hiding this comment

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

minor upgrade, safe since it is used only in tests

@@ -22,8 +22,8 @@
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.apps.Deployment;
import io.fabric8.kubernetes.client.utils.Serialization;
import org.assertj.core.api.Assertions;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

using assertj assertions

@@ -92,129 +81,45 @@ void after() {
}

/*
* this test loads uses two services: wiremock on port 8080 and configuration-watcher
Copy link
Contributor Author

Choose a reason for hiding this comment

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

I've tried to simplify tests a bit here, but did not change the logical behind them at all.

I did drop one overlapping tests here though :)

.isEmpty());
WireMock.verify(WireMock.exactly(4), WireMock.postRequestedFor(WireMock.urlEqualTo("/actuator/refresh")));
createSecret(util, LEFT_NAMESPACE);
createSecret(util, RIGHT_NAMESPACE);
Copy link
Contributor Author

Choose a reason for hiding this comment

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

the logic did not change at all, I just cleaned up things

@wind57 wind57 marked this pull request as ready for review January 31, 2025 16:33
@wind57
Copy link
Contributor Author

wind57 commented Jan 31, 2025

@ryanjbaxter last PR I have in my queue, it refactors one more integration test. thank you

@ryanjbaxter ryanjbaxter added this to the 3.1.6 milestone Jan 31, 2025
@ryanjbaxter ryanjbaxter merged commit c60c907 into spring-cloud:3.1.x Jan 31, 2025
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants