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

Fabric8 it part 6 #1471

Merged
merged 35 commits into from
Oct 9, 2023
Merged

Fabric8 it part 6 #1471

Show file tree
Hide file tree
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
a468581
fix
wind57 Oct 4, 2023
fd54734
checkstyle
wind57 Oct 5, 2023
cfacf31
clean-up
wind57 Oct 5, 2023
ec05ccc
clean-up
wind57 Oct 5, 2023
8f2f2d9
started work
wind57 Oct 5, 2023
8ef893e
clean-up
wind57 Oct 5, 2023
3585182
merged
wind57 Oct 5, 2023
446eee2
started-work
wind57 Oct 5, 2023
d350fdf
merge 3.0.x
wind57 Oct 5, 2023
85535c8
merge
wind57 Oct 5, 2023
29d9bcb
Merge branch 'fabric8-configmap-event-reload-patch-refactor-part-2' i…
wind57 Oct 5, 2023
8c8370e
continue work
wind57 Oct 5, 2023
74c03f5
dirty
wind57 Oct 5, 2023
752d92e
dirty
wind57 Oct 6, 2023
ed96191
fixed
wind57 Oct 6, 2023
aef0127
merge 3.0.x
wind57 Oct 6, 2023
37a6ee9
fix merge
wind57 Oct 6, 2023
bfc418d
rename package
wind57 Oct 6, 2023
8680b1e
increase
wind57 Oct 6, 2023
a95ad35
fix
wind57 Oct 6, 2023
d9f9be0
fix
wind57 Oct 6, 2023
1d68777
trigger
wind57 Oct 6, 2023
81c0d41
simplify + enable all tests
wind57 Oct 6, 2023
d1f42c5
remove overlaping test
wind57 Oct 6, 2023
a0cd375
dirty
wind57 Oct 6, 2023
4964e36
dirty
wind57 Oct 6, 2023
e3e0d04
fix
wind57 Oct 6, 2023
385243a
merge 3.0.x
wind57 Oct 6, 2023
00738ea
fix
wind57 Oct 7, 2023
30bb51e
Merge branch '3.0.x' into fabric8-it-part-5
wind57 Oct 7, 2023
473f69f
format
wind57 Oct 7, 2023
1e32c8f
merge 3.0.x
wind57 Oct 7, 2023
25d0258
merge latest
wind57 Oct 7, 2023
4a039b0
merge 3.0.x
wind57 Oct 7, 2023
e066558
fix test
wind57 Oct 7, 2023
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
61 changes: 0 additions & 61 deletions ...a/org/springframework/cloud/kubernetes/fabric8/reload/ConfigMapPollingReloadDelegate.java
View file
Open in desktop

This file was deleted.

8 changes: 1 addition & 7 deletions ...c/test/java/org/springframework/cloud/kubernetes/fabric8/reload/Fabric8EventReloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ void testInformFromOneNamespaceEventNotTriggered() {
testInform();
testInformFromOneNamespaceEventTriggeredSecretsDisabled();
testDataChangesInConfigMap();
testConfigMapPollingReload();
Copy link
Contributor Author

Choose a reason for hiding this comment

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

after looking a bit closer, we have two tests related to configmap fabric8 reload that badly overlap, so just drop one of them

testConfigMapMountPollingReload();
testPollingReloadConfigMapWithBootstrap();
testSecretReload();
Expand Down Expand Up @@ -303,11 +302,6 @@ void testDataChangesInConfigMap() {
DataChangesInConfigMapReloadDelegate.testDataChangesInConfigMap(client, K3S, IMAGE_NAME);
}

void testConfigMapPollingReload() {
TestUtil.patchFive(util, DOCKER_IMAGE, IMAGE_NAME, NAMESPACE);
ConfigMapPollingReloadDelegate.testConfigMapPollingReload(client);
}

void testConfigMapMountPollingReload() {
TestUtil.reCreateSources(util, client);
TestUtil.patchSix(util, DOCKER_IMAGE, IMAGE_NAME, NAMESPACE);
Expand All @@ -322,7 +316,7 @@ void testPollingReloadConfigMapWithBootstrap() {
}

void testSecretReload() {
TestUtil.patchEight(util, DOCKER_IMAGE, IMAGE_NAME, NAMESPACE);
TestUtil.patchSeven(util, DOCKER_IMAGE, IMAGE_NAME, NAMESPACE);
SecretsEventsReloadDelegate.testSecretReload(client, K3S, IMAGE_NAME);
}

Expand Down
33 changes: 2 additions & 31 deletions ...nt-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/reload/TestUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,31 +171,6 @@ final class TestUtil {
""";

private static final String BODY_FIVE = """
{
"spec": {
"template": {
"spec": {
"containers": [{
"name": "spring-cloud-kubernetes-fabric8-client-configmap-event-reload",
"image": "image_name_here",
"env": [
{
"name": "SPRING_PROFILES_ACTIVE",
"value": "no-mount"
},
{
"name": "SPRING_CLOUD_BOOTSTRAP_ENABLED",
"value": "FALSE"
}
]
}]
}
}
}
}
""";

private static final String BODY_SIX = """
{
"spec": {
"template": {
Expand Down Expand Up @@ -247,7 +222,7 @@ final class TestUtil {
}
""";

private static final String BODY_SEVEN = """
private static final String BODY_SIX = """
{
"spec": {
"template": {
Expand Down Expand Up @@ -299,7 +274,7 @@ final class TestUtil {
}
""";

private static final String BODY_EIGHT = """
private static final String BODY_SEVEN = """
{
"spec": {
"template": {
Expand Down Expand Up @@ -370,10 +345,6 @@ static void patchSeven(Util util, String dockerImage, String deploymentName, Str
util.patchWithReplace(dockerImage, deploymentName, namespace, BODY_SEVEN, POD_LABELS);
}

static void patchEight(Util util, String dockerImage, String deploymentName, String namespace) {
util.patchWithReplace(dockerImage, deploymentName, namespace, BODY_EIGHT, POD_LABELS);
}

static WebClient.Builder builder() {
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
}
Expand Down
Loading