Move reading from ConfigMap and Secrets to a dedicated extension

quarkusio · Apr 3, 2020 · feaddb8 · feaddb8
1 parent b537140
commit feaddb8
Show file tree

Hide file tree

Showing 18 changed files with 143 additions and 15 deletions.
diff --git a/bom/deployment/pom.xml b/bom/deployment/pom.xml
@@ -593,6 +593,11 @@
                 <artifactId>quarkus-kubernetes-client-deployment-internal</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-kubernetes-config-deployment</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-flyway-deployment</artifactId>

diff --git a/bom/runtime/pom.xml b/bom/runtime/pom.xml
@@ -810,6 +810,11 @@
                 <artifactId>quarkus-kubernetes-client-internal</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-kubernetes-config</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-optaplanner</artifactId>

diff --git a/extensions/kubernetes-client/runtime/pom.xml b/extensions/kubernetes-client/runtime/pom.xml
@@ -64,17 +64,6 @@
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config-source-yaml</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/extensions/kubernetes-config/deployment/pom.xml b/extensions/kubernetes-config/deployment/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-kubernetes-config-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-kubernetes-config-deployment</artifactId>
+    <name>Quarkus - Kubernetes Config - Deployment</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client-deployment</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-config</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/...deployment/KubernetesConfigProcessor.java → ...deployment/KubernetesConfigProcessor.java b/...deployment/KubernetesConfigProcessor.java → ...deployment/KubernetesConfigProcessor.java
@@ -1,4 +1,4 @@
-package io.quarkus.kubernetes.client.deployment;
+package io.quarkus.kubernetes.config.deployment;
 
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
@@ -15,6 +15,6 @@ public class KubernetesConfigProcessor {
     public RunTimeConfigurationSourceValueBuildItem configure(KubernetesConfigRecorder recorder,
             KubernetesConfigSourceConfig config, KubernetesClientBuildConfig clientConfig) {
         return new RunTimeConfigurationSourceValueBuildItem(
-                recorder.configMaps(config, clientConfig));
+                recorder.configSources(config, clientConfig));
     }
 }
diff --git a/extensions/kubernetes-config/pom.xml b/extensions/kubernetes-config/pom.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>quarkus-build-parent</artifactId>
+        <groupId>io.quarkus</groupId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../../build-parent/pom.xml</relativePath>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>quarkus-kubernetes-config-parent</artifactId>
+    <name>Quarkus - Kubernetes Config</name>
+    <packaging>pom</packaging>
+    <modules>
+        <module>deployment</module>
+        <module>runtime</module>
+    </modules>
+</project>
diff --git a/extensions/kubernetes-config/runtime/pom.xml b/extensions/kubernetes-config/runtime/pom.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>io.quarkus</groupId>
+        <artifactId>quarkus-kubernetes-config-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>quarkus-kubernetes-config</artifactId>
+    <name>Quarkus - Kubernetes Config - Runtime</name>
+    <description>Read runtime configuration from Kubernetes ConfigMaps and Secrets</description>
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkus</groupId>
+            <artifactId>quarkus-kubernetes-client</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.quarkus</groupId>
+                <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>io.quarkus</groupId>
+                            <artifactId>quarkus-extension-processor</artifactId>
+                            <version>${project.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>
diff --git a/...e/AbstractKubernetesConfigSourceUtil.java → ...e/AbstractKubernetesConfigSourceUtil.java b/...e/AbstractKubernetesConfigSourceUtil.java → ...e/AbstractKubernetesConfigSourceUtil.java
diff --git a/...nt/runtime/ConfigMapConfigSourceUtil.java → ...nt/runtime/ConfigMapConfigSourceUtil.java b/...nt/runtime/ConfigMapConfigSourceUtil.java → ...nt/runtime/ConfigMapConfigSourceUtil.java
diff --git a/...ent/runtime/KubernetesConfigRecorder.java → ...ent/runtime/KubernetesConfigRecorder.java b/...ent/runtime/KubernetesConfigRecorder.java → ...ent/runtime/KubernetesConfigRecorder.java
@@ -14,7 +14,7 @@ public class KubernetesConfigRecorder {
 
     private static final Logger log = Logger.getLogger(KubernetesConfigRecorder.class);
 
-    public RuntimeValue<ConfigSourceProvider> configMaps(KubernetesConfigSourceConfig kubernetesConfigSourceConfig,
+    public RuntimeValue<ConfigSourceProvider> configSources(KubernetesConfigSourceConfig kubernetesConfigSourceConfig,
             KubernetesClientBuildConfig clientConfig) {
         if (!kubernetesConfigSourceConfig.enabled) {
             log.debug(

diff --git a/...runtime/KubernetesConfigSourceConfig.java → ...runtime/KubernetesConfigSourceConfig.java b/...runtime/KubernetesConfigSourceConfig.java → ...runtime/KubernetesConfigSourceConfig.java
diff --git a/...ntime/KubernetesConfigSourceProvider.java → ...ntime/KubernetesConfigSourceProvider.java b/...ntime/KubernetesConfigSourceProvider.java → ...ntime/KubernetesConfigSourceProvider.java
diff --git a/...lient/runtime/SecretConfigSourceUtil.java → ...lient/runtime/SecretConfigSourceUtil.java b/...lient/runtime/SecretConfigSourceUtil.java → ...lient/runtime/SecretConfigSourceUtil.java
diff --git a/extensions/kubernetes-config/runtime/src/main/resources/META-INF/quarkus-extension.yaml b/extensions/kubernetes-config/runtime/src/main/resources/META-INF/quarkus-extension.yaml
@@ -0,0 +1,9 @@
+---
+name: "Kubernetes Config"
+metadata:
+  keywords:
+  - "kubernetes-config"
+  guide: "https://quarkus.io/guides/kubernetes-config"
+  categories:
+  - "cloud"
+  status: "preview"
diff --git a/...untime/ConfigMapConfigSourceUtilTest.java → ...untime/ConfigMapConfigSourceUtilTest.java b/...untime/ConfigMapConfigSourceUtilTest.java → ...untime/ConfigMapConfigSourceUtilTest.java
diff --git a/...t/runtime/SecretConfigSourceUtilTest.java → ...t/runtime/SecretConfigSourceUtilTest.java b/...t/runtime/SecretConfigSourceUtilTest.java → ...t/runtime/SecretConfigSourceUtilTest.java
diff --git a/extensions/pom.xml b/extensions/pom.xml
@@ -145,6 +145,7 @@
         <module>container-image</module>
         <module>kubernetes</module>
         <module>kubernetes-client</module>
+        <module>kubernetes-config</module>
 
         <!-- Database migrations -->
         <module>flyway</module>

diff --git a/integration-tests/kubernetes-client/pom.xml b/integration-tests/kubernetes-client/pom.xml
@@ -21,7 +21,7 @@
         </dependency>
         <dependency>
             <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-kubernetes-client</artifactId>
+            <artifactId>quarkus-kubernetes-config</artifactId>
         </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>