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

improve: running integration tests parallel #2292

Closed
wants to merge 26 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
a5d66b7
chore: set version to 5.0.0-SNAPSHOT (#2200)
csviri Jan 18, 2024
5ccb7e3
improve: java version minimal 11, tested on 21 (#2207)
csviri Jan 18, 2024
52aa43c
improve: remove deprecated EventFilter (#2208)
csviri Jan 18, 2024
1808197
docs: 5.0 migration guide skeleton (#2210)
csviri Jan 19, 2024
df29f5f
improve: managed dependent reconciliation results not optional (#2212)
csviri Jan 22, 2024
f1a5b85
improve: remove deprecated RetryConfiguration (#2211)
csviri Jan 22, 2024
c43ef58
feat: JDK client is not the default (#2235)
csviri Feb 6, 2024
f146fc6
fix: update SCM information (#2237)
metacosm Feb 7, 2024
2e67cf6
feat: move name is directly to dependent resource (#2250)
csviri Mar 4, 2024
64c716c
format
csviri Mar 7, 2024
5f503fa
fix: test after rebase on master (#2270)
csviri Mar 7, 2024
d93ffd4
feat: use java 17 as baseline (#2271)
csviri Mar 8, 2024
cfc1008
improve: matcher always considers metadata (#2273)
csviri Mar 9, 2024
2b0c7f0
feat: API to check if next reconciliation is imminent (#2272)
csviri Mar 11, 2024
c67ca26
feat: Workflow extracted to a separate annotation (#2274)
csviri Mar 11, 2024
31fec7c
fix: pom properties cleanup (#2280)
csviri Mar 11, 2024
106f14b
improve: remove EventSourceInitializer (#2257)
csviri Mar 12, 2024
3283e91
fix: date parsing after 8.0.0 release of git-commit-id (#2286)
metacosm Mar 13, 2024
5f6e654
refactor: make loadFromProperties private (#2287)
metacosm Mar 13, 2024
3365b73
feat: distinguish resources based on desired state (#2252)
csviri Mar 13, 2024
0ce6c24
improve: running integration tests parallel
csviri Mar 15, 2024
223b9a9
run test methods on same thread
csviri Mar 15, 2024
fdec821
improve
csviri Mar 15, 2024
c104219
improve
csviri Mar 15, 2024
5910f72
minimal concurrency
csviri Mar 15, 2024
c6865cf
improve
csviri Mar 15, 2024
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/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
http-client:
type: string
required: false
default: 'okhttp'
default: 'jdk'
experimental:
type: boolean
required: false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
integration_tests:
strategy:
matrix:
java: [ 11, 17 ]
java: [ 17, 21 ]
kubernetes: [ 'v1.26.13', 'v1.27.10', 'v1.28.6', 'v1.29.1' ]
uses: ./.github/workflows/integration-tests.yml
with:
Expand All @@ -56,7 +56,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
java: [ 11, 17 ]
java: [ 17, 21 ]
steps:
- uses: actions/checkout@v4
- name: Set up Java and Maven
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-project-in-dir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Set up Java and Maven
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: temurin
cache: 'maven'

Expand Down Expand Up @@ -61,7 +61,7 @@ jobs:
- name: Set up Java and Maven
uses: actions/setup-java@v4
with:
java-version: 11
java-version: 17
distribution: temurin
cache: 'maven'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snapshot-releases.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
cache: 'maven'
- name: Build and test project
run: ./mvnw ${MAVEN_ARGS} clean install --file pom.xml
Expand All @@ -34,7 +34,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 11
java-version: 17
cache: 'maven'
- name: Release Maven package
uses: samuelmeuli/action-maven-publish@v1
Expand Down
2 changes: 1 addition & 1 deletion bootstrapper-maven-plugin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.8.1-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>

<artifactId>bootstrapper</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.EventSourceInitializer;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
import io.javaoperatorsdk.operator.api.reconciler.Workflow;
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;

import java.util.Map;
import java.util.Optional;

@ControllerConfiguration(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
@Workflow(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
@ControllerConfiguration
public class {{artifactClassId}}Reconciler implements Reconciler<{{artifactClassId}}CustomResource> {

public UpdateControl<{{artifactClassId}}CustomResource> reconcile({{artifactClassId}}CustomResource primary,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<packaging>jar</packaging>

<properties>
<java.version>11</java.version>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<josdk.version>{{josdkVersion}}</josdk.version>
Expand Down
7 changes: 1 addition & 6 deletions caffeine-bounded-cache-support/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,13 @@
<parent>
<artifactId>java-operator-sdk</artifactId>
<groupId>io.javaoperatorsdk</groupId>
<version>4.8.1-SNAPSHOT</version>
<version>5.0.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>caffeine-bounded-cache-support</artifactId>
<name>Operator SDK - Caffeine Bounded Cache Support</name>

<properties>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
</properties>

<dependencies>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
import com.github.benmanes.caffeine.cache.Caffeine;

public abstract class AbstractTestReconciler<P extends CustomResource<BoundedCacheTestSpec, BoundedCacheTestStatus>>
implements Reconciler<P>, EventSourceInitializer<P> {
implements Reconciler<P> {

private static final Logger log =
LoggerFactory.getLogger(BoundedCacheClusterScopeTestReconciler.class);
Expand Down Expand Up @@ -82,7 +82,7 @@ public Map<String, EventSource> prepareEventSources(
Mappers.fromOwnerReference(this instanceof BoundedCacheClusterScopeTestReconciler))
.build(), context);

return EventSourceInitializer.nameEventSources(es);
return EventSourceUtils.nameEventSources(es);
}

private void ensureStatus(P resource) {
Expand Down
4 changes: 3 additions & 1 deletion docs/_data/sidebar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@
- title: Migrating from v4.3 to v4.4
url: /docs/v4-4-migration
- title: Migrating from v4.4 to v4.5
url: /docs/v4-5-migration
url: /docs/v4-5-migration
- title: Migrating from v4.7 to v5.0
url: /docs/v5-0-migration
Loading
Loading