Skip to content

Commit 89a95cd

Browse files
authored
refactor: remove some deprecated code (#601)
1 parent 77f35ce commit 89a95cd

File tree

8 files changed

+15
-13
lines changed

8 files changed

+15
-13
lines changed

core/deployment/src/main/java/io/quarkiverse/operatorsdk/deployment/OperatorSDKProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ private void registerAssociatedClassesForReflection(BuildProducer<ReflectiveClas
310310
BuildProducer<ForceNonWeakReflectiveClassBuildItem> forcedReflectionClasses,
311311
Set<String> classNamesToRegister) {
312312
classNamesToRegister.forEach(cn -> {
313-
reflectionClasses.produce(new ReflectiveClassBuildItem(true, true, cn));
313+
reflectionClasses.produce(ReflectiveClassBuildItem.builder(cn).methods().fields().build());
314314
forcedReflectionClasses.produce(
315315
new ForceNonWeakReflectiveClassBuildItem(cn));
316316
log.infov("Registered ''{0}'' for reflection", cn);

core/deployment/src/test/java/io/quarkiverse/operatorsdk/test/OperatorSDKTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import java.io.IOException;
1111
import java.nio.file.Files;
1212
import java.util.Arrays;
13-
import java.util.Collections;
1413
import java.util.List;
1514

1615
import org.junit.jupiter.api.Assertions;
@@ -60,7 +59,7 @@ public void shouldCreateRolesAndRoleBindings() throws IOException {
6059
final var kubeIS = new FileInputStream(kubeManifest.toFile());
6160
// use unmarshall version with parameters map to ensure code goes through the proper processing wrt multiple documents
6261
@SuppressWarnings("unchecked")
63-
final var kubeResources = (List<HasMetadata>) Serialization.unmarshal(kubeIS, Collections.emptyMap());
62+
final var kubeResources = (List<HasMetadata>) Serialization.unmarshal(kubeIS);
6463

6564
// check cluster role for TestReconciler
6665
final var testReconcilerRoleName = AddClusterRolesDecorator.getClusterRoleName(TestReconciler.NAME);

core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/CRDUtils.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,13 @@ private static void apply(KubernetesClient client, String v, Object crd) {
4242
switch (v) {
4343
case "v1":
4444
client.apiextensions().v1().customResourceDefinitions()
45-
.resource((CustomResourceDefinition) crd).createOrReplace();
45+
.resource((CustomResourceDefinition) crd)
46+
.serverSideApply();
4647
break;
4748
case "v1beta1":
4849
client.apiextensions().v1beta1().customResourceDefinitions()
4950
.resource((io.fabric8.kubernetes.api.model.apiextensions.v1beta1.CustomResourceDefinition) crd)
50-
.createOrReplace();
51+
.serverSideApply();
5152
break;
5253
default:
5354
throw new IllegalArgumentException("Unknown CRD version: " + v);

core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/ConfigurationServiceRecorder.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.quarkus.jackson.ObjectMapperCustomizer;
2020
import io.quarkus.runtime.LaunchMode;
2121
import io.quarkus.runtime.annotations.Recorder;
22-
import io.quarkus.runtime.configuration.ProfileManager;
22+
import io.quarkus.runtime.configuration.ConfigUtils;
2323

2424
@Recorder
2525
public class ConfigurationServiceRecorder {
@@ -78,11 +78,13 @@ public Supplier<QuarkusConfigurationService> configurationServiceSupplier(Versio
7878

7979
// deactivate leader election in dev mode
8080
LeaderElectionConfiguration leaderElectionConfiguration = null;
81-
final var profile = ProfileManager.getActiveProfile(); // todo: use ConfigUtils instead
82-
if (buildTimeConfiguration.activateLeaderElectionForProfiles.contains(profile)) {
81+
final var profiles = ConfigUtils.getProfiles();
82+
if (profiles.stream().anyMatch(buildTimeConfiguration.activateLeaderElectionForProfiles::contains)) {
8383
leaderElectionConfiguration = container.instance(LeaderElectionConfiguration.class).get();
8484
} else {
85-
log.info("Leader election deactivated for " + profile + " profile");
85+
log.info("Leader election deactivated because it is only activated for "
86+
+ buildTimeConfiguration.activateLeaderElectionForProfiles
87+
+ " profiles. Currently active profiles: " + profiles);
8688
}
8789

8890
return new QuarkusConfigurationService(

core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/MicrometerMetricsProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class MicrometerMetricsProvider implements MeterBinder {
1515

1616
@Override
1717
public void bindTo(MeterRegistry registry) {
18-
metrics = new MicrometerMetrics(registry);
18+
metrics = MicrometerMetrics.newPerResourceCollectingMicrometerMetricsBuilder(registry).build();
1919
}
2020

2121
@Produces

core/runtime/src/main/java/io/quarkiverse/operatorsdk/runtime/Version.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public String getQuarkusVersion() {
5353
}
5454

5555
public static Version loadFromProperties() {
56-
final var sdkVersion = Utils.loadFromProperties();
56+
final var sdkVersion = Utils.VERSION;
5757
InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream("extension-version.properties");
5858
Properties properties = new Properties();
5959
if (is != null) {

samples/mysql-schema/src/test/java/io/quarkiverse/operatorsdk/samples/mysqlschema/MySQLSchemaOperatorE2ETest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void test() {
5252
testSchema.getSpec().setEncoding("utf8");
5353

5454
log.infof("Creating test MySQLSchema object: %s", testSchema);
55-
client.resource(testSchema).createOrReplace();
55+
client.resource(testSchema).serverSideApply();
5656

5757
log.info("Waiting 10 seconds for expected resources to be created and updated");
5858
await().atMost(10, SECONDS).untilAsserted(() -> {

samples/pingpong/src/test/java/io/quarkiverse/operatorsdk/samples/pingpong/PingPongReconcilerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ void canReconcile() {
4444

4545
// assert ping reconciler
4646
await().ignoreException(NullPointerException.class).atMost(5, MINUTES).untilAsserted(() -> {
47-
Ping updatedRequest = client.resource(testRequest).fromServer().get();
47+
Ping updatedRequest = client.resource(testRequest).get();
4848
assertThat(updatedRequest.getStatus(), is(notNullValue()));
4949
assertThat(updatedRequest.getStatus().getState(), is(Status.State.PROCESSED));
5050
});

0 commit comments

Comments
 (0)