Skip to content

Upgrade to newest QOSDK #205

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
csviri merged 1 commit into from
Jun 22, 2026
Merged

Upgrade to newest QOSDK #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 17 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<surefire-plugin.version>3.5.2</surefire-plugin.version>
<sonar.organization>java-operator-sdk</sonar.organization>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<fabric8-client.version>7.1.0</fabric8-client.version>
<quarkus.version>3.19.0</quarkus.version>
<fabric8-client.version>7.7.0</fabric8-client.version>
<quarkus.version>3.35.3</quarkus.version>
<graalvm.version>24.1.2</graalvm.version>
<mokito.version>5.11.0</mokito.version>
<qosdk.version>7.1.0</qosdk.version>
<qosdk.version>7.7.5</qosdk.version>
<assertj.version>3.27.7</assertj.version>
<spotless.version>2.43.0</spotless.version>
</properties>
Expand All @@ -46,12 +46,6 @@
</dependencyManagement>

<dependencies>
<!-- TODO remove after released as part of QOSDK -->
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-core</artifactId>
<version>5.0.4</version>
</dependency>
<dependency>
<groupId>io.quarkiverse.operatorsdk</groupId>
<artifactId>quarkus-operator-sdk</artifactId>
Expand Down Expand Up @@ -142,10 +136,24 @@
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>properties</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration>
<!-- Mockito 5.18+ no longer self-attaches its inline agent on recent JDKs;
load it explicitly as a Java agent. -->
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
<includes>
<include>**/*Test.java</include>
</includes>
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/io/javaoperatorsdk/operator/glue/dependent/GenericBulkDependentResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

public class GenericBulkDependentResource extends
GenericDependentResource implements
BulkDependentResource<GenericKubernetesResource, Glue> {
BulkDependentResource<GenericKubernetesResource, Glue, String> {

public GenericBulkDependentResource(GenericTemplateHandler genericTemplateHandler,
String desiredTemplate, String name,
Expand Down Expand Up @@ -49,4 +49,11 @@ public Map<String, GenericKubernetesResource> getSecondaryResources(Glue glue,
r -> name.equals(r.getMetadata().getAnnotations().get(DEPENDENT_NAME_ANNOTATION_KEY)))
.collect(Collectors.toMap(r -> r.getMetadata().getName(), r -> r));
}

@Override
public void deleteTargetResource(Glue primary, GenericKubernetesResource resource, String key,
Context<Glue> context) {
context.getClient().resource(resource).delete();
}

}
4 changes: 2 additions & 2 deletions src/test/java/io/javaoperatorsdk/operator/glue/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import io.fabric8.kubernetes.client.KubernetesClient;
import io.fabric8.kubernetes.client.dsl.NonDeletingOperation;
import io.fabric8.kubernetes.client.utils.Serialization;
import io.javaoperatorsdk.operator.ReconcilerUtils;
import io.javaoperatorsdk.operator.ReconcilerUtilsInternal;
import io.javaoperatorsdk.operator.glue.customresource.glue.Glue;
import io.javaoperatorsdk.operator.glue.customresource.operator.GlueOperator;

Expand Down Expand Up @@ -66,7 +66,7 @@ public static GenericKubernetesResource createOrUpdate(KubernetesClient client,

public static void applyCrd(Class<? extends HasMetadata> resourceClass, KubernetesClient client,
boolean test) {
applyCrd(ReconcilerUtils.getResourceTypeName(resourceClass), client, test);
applyCrd(ReconcilerUtilsInternal.getResourceTypeName(resourceClass), client, test);
}

@SafeVarargs
Expand Down
Loading