[#3700] Change OSGi ConfigurationPolicy to REQUIRE

- Prevent NPE when config does not exist - Fix karaf itests
fabric8io · Feb 15, 2022 · a46ce5e · a46ce5e
1 parent e31044a
commit a46ce5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java b/...netes-client/src/main/java/io/fabric8/kubernetes/client/osgi/ManagedKubernetesClient.java
@@ -127,7 +127,7 @@
 
 import static io.fabric8.kubernetes.client.Config.*;
 
-@Component(immediate = true, configurationPid = "io.fabric8.kubernetes.client", policy = ConfigurationPolicy.OPTIONAL)
+@Component(immediate = true, configurationPid = "io.fabric8.kubernetes.client", policy = ConfigurationPolicy.REQUIRE)
 @Service({KubernetesClient.class,NamespacedKubernetesClient.class})
 @References({
   @Reference(referenceInterface = io.fabric8.kubernetes.client.ResourceHandler.class, cardinality = ReferenceCardinality.OPTIONAL_MULTIPLE, policy = ReferencePolicy.DYNAMIC, bind = "bindResourceHandler", unbind = "unbindResourceHandler"),

diff --git a/platforms/karaf/itests/src/test/java/io/fabric8/kubernetes/karaf/itests/TestBase.java b/platforms/karaf/itests/src/test/java/io/fabric8/kubernetes/karaf/itests/TestBase.java
@@ -52,6 +52,8 @@ Option[] baseConfiguration(Option features, List<Option> extraOptions) {
         karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")),
         configureSecurity().disableKarafMBeanServerBuilder(),
         features,
+        editConfigurationFileExtend(
+          "etc/io.fabric8.kubernetes.client.cfg", "junit", "ignored"),
         editConfigurationFileExtend(
           "etc/org.ops4j.pax.url.mvn.cfg",
           "org.ops4j.pax.url.mvn.repositories",
@@ -62,10 +64,10 @@ Option[] baseConfiguration(Option features, List<Option> extraOptions) {
           + "org.apache.karaf.specs.locator=java.xml,ALL-UNNAMED"),
         new VMOption("--patch-module"),
         new VMOption("java.base=lib/endorsed/org.apache.karaf.specs.locator-"
-          + System.getProperty("karaf.version", "4.2.2-SNAPSHOT") + ".jar"),
+          + System.getProperty("karaf.version", "4.3.5") + ".jar"),
         new VMOption("--patch-module"),
         new VMOption("java.xml=lib/endorsed/org.apache.karaf.specs.java.xml-"
-          + System.getProperty("karaf.version", "4.2.2-SNAPSHOT") + ".jar"),
+          + System.getProperty("karaf.version", "4.3.5") + ".jar"),
         new VMOption("--add-opens"),
         new VMOption("java.base/java.security=ALL-UNNAMED"),
         new VMOption("--add-opens"),
@@ -90,6 +92,8 @@ Option[] baseConfiguration(Option features, List<Option> extraOptions) {
         karafDistributionConfiguration().frameworkUrl(karafUrl).name("Apache Karaf").unpackDirectory(new File("target/exam")),
         configureSecurity().disableKarafMBeanServerBuilder(),
         features,
+        editConfigurationFileExtend(
+          "etc/io.fabric8.kubernetes.client.cfg", "junit", "ignored"),
         editConfigurationFileExtend(
           "etc/org.ops4j.pax.url.mvn.cfg",
           "org.ops4j.pax.url.mvn.repositories",