Skip to content

feat: update control update methods with change check #1345

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

Closed
wants to merge 22 commits into from
Closed

feat: update control update methods with change check #1345

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
5229d02
feat: update to fabric8 client v6.0.0 (#1305)
csviri Jul 25, 2022
20b9a12
fix: remove config and deprecated api for samples (#1370)
csviri Jul 25, 2022
f8d5e5d
fix: test on fabric v6
csviri Aug 2, 2022
491baf5
fix: simpify resource patching with fabric8 client v6 api (#1372)
csviri Aug 4, 2022
0c5233f
chore: change version to 3.2.0-SNAPSHOT (#1386)
csviri Aug 5, 2022
9289426
feat: use fabric8 client json mapper by default (#1382)
csviri Aug 17, 2022
56c6ef8
feat: add bom module (#1402)
honnix Aug 22, 2022
79bf0d8
fix: bom name and version on rebase (#1414)
csviri Aug 23, 2022
d809957
feat: multiversion crd integration test improvements (#1415)
csviri Aug 23, 2022
2fc5423
refactor: remove smoke-test-samples (#1384)
csviri Aug 24, 2022
f7688c2
refactor: naming of resource update method (#1377)
csviri Aug 24, 2022
b8676a1
fix: replace label selector mock server test with IT (#1375)
csviri Aug 24, 2022
e5c4928
feat: support leader Election (#1358)
csviri Aug 24, 2022
59df367
feat: update control update methods with change check
csviri Jul 15, 2022
1451037
fix: format
csviri Jul 26, 2022
2635b4e
impl
csviri Jul 26, 2022
b6506bc
unit tests
csviri Jul 27, 2022
24a75ae
revert renaming
csviri Jul 27, 2022
8571f4b
error handler suppoer for conditional update
csviri Jul 27, 2022
8c59e7c
update to v6
csviri Aug 4, 2022
23402e4
fix test
csviri Aug 23, 2022
a5f2134
fixes after rebase
csviri Aug 25, 2022
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
Prev Previous commit
Next Next commit
feat: multiversion crd integration test improvements (#1415)
  • Loading branch information
@csviri
csviri committed Aug 24, 2022
commit d809957b807f023682d9d026050412f56ae5d689
23 changes: 12 additions & 11 deletions operator-framework/src/test/java/io/javaoperatorsdk/operator/MultiVersionCRDIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import io.javaoperatorsdk.operator.sample.multiversioncrd.MultiVersionCRDTestReconciler1;
import io.javaoperatorsdk.operator.sample.multiversioncrd.MultiVersionCRDTestReconciler2;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import static com.google.common.truth.Truth.assertThat;
import static org.awaitility.Awaitility.await;

class MultiVersionCRDIT {
Expand All @@ -38,16 +38,16 @@ void multipleCRDVersions() {
await()
.atMost(Duration.ofSeconds(2))
.pollInterval(Duration.ofMillis(50))
.until(
.untilAsserted(
() -> {
var crV1Now = operator.get(MultiVersionCRDTestCustomResource1.class, CR_V1_NAME);
var crV2Now = operator.get(MultiVersionCRDTestCustomResource2.class, CR_V2_NAME);
return crV1Now.getStatus().getReconciledBy().size() == 1
&& crV1Now.getStatus().getReconciledBy()
.contains(MultiVersionCRDTestReconciler1.class.getSimpleName())
&& crV2Now.getStatus().getReconciledBy().size() == 1
&& crV2Now.getStatus().getReconciledBy()
.contains(MultiVersionCRDTestReconciler2.class.getSimpleName());
assertThat(crV1Now.getStatus()).isNotNull();
assertThat(crV2Now.getStatus()).isNotNull();
assertThat(crV1Now.getStatus().getReconciledBy())
.containsExactly(MultiVersionCRDTestReconciler1.class.getSimpleName());
assertThat(crV2Now.getStatus().getReconciledBy())
.containsExactly(MultiVersionCRDTestReconciler2.class.getSimpleName());
});
}

Expand All @@ -62,10 +62,11 @@ void invalidEventsDoesNotBreakEventHandling() {
await()
.atMost(Duration.ofSeconds(2))
.pollInterval(Duration.ofMillis(50))
.until(() -> {
.untilAsserted(() -> {
var crV1Now = operator.get(MultiVersionCRDTestCustomResource1.class, CR_V1_NAME);
return crV1Now.getStatus().getReconciledBy()
.contains(MultiVersionCRDTestReconciler1.class.getSimpleName());
assertThat(crV1Now.getStatus()).isNotNull();
assertThat(crV1Now.getStatus().getReconciledBy())
.containsExactly(MultiVersionCRDTestReconciler1.class.getSimpleName());
});
assertThat(
operator
Expand Down