Skip to content

feat: limited build to k8s >= 1.20.x #1230

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

Merged
merged 2 commits into from
May 24, 2022
Merged

feat: limited build to k8s >= 1.20.x #1230

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a30dee1
feat: limited build to k8s >= 1.20.x
csviri May 20, 2022
5d1a3ce
remove excludes
csviri May 23, 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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
matrix:
java: [ 11, 17 ]
kubernetes: [ 'v1.17.17','v1.18.20','v1.19.16','v1.20.15','v1.21.12', 'v1.22.9', 'v1.23.6', 'v1.24.0' ]
kubernetes: ['v1.20.15','v1.21.12', 'v1.22.9', 'v1.23.6', 'v1.24.0' ]
exclude:
- java: 11
kubernetes: 'v1.18.20'
Copy link
Collaborator

Choose a reason for hiding this comment

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

You also need to remove these excludes that are not needed anymore…

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

ahh, yes, thx. done.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

btw, its not clear to me why exactly those are excluded, what is the rational behind those values? I mean why are those exactly excluded.
Should be there just the oldest and the newest not excluded for java 11? @metacosm

Copy link
Collaborator

Choose a reason for hiding this comment

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

I guess the idea was to test only the latest versions with java 11 to limit the CI intensity.

Expand Down
3 changes: 0 additions & 3 deletions operator-framework/src/test/java/io/javaoperatorsdk/operator/StatusPatchNotLockingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.time.Duration;
import java.util.Map;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand Down Expand Up @@ -48,7 +47,6 @@ void noOptimisticLockingDoneOnStatusUpdate() throws InterruptedException {
}

// see https://github.com/fabric8io/kubernetes-client/issues/4158
@Disabled("Patch generated supported by K8S version below 1.20.x")
@Test
void valuesAreDeletedIfSetToNull() {
var resource = operator.create(StatusPatchLockingCustomResource.class, createResource());
Expand All @@ -71,7 +69,6 @@ void valuesAreDeletedIfSetToNull() {
});
}


StatusPatchLockingCustomResource createResource() {
StatusPatchLockingCustomResource res = new StatusPatchLockingCustomResource();
res.setSpec(new StatusPatchLockingCustomResourceSpec());
Expand Down