Rename kubernetes to config-kubernetes. Fixes #353

micronaut-projects · Jul 27, 2020 · 54d35ab · 54d35ab
1 parent 18a1216
commit 54d35ab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/.../src/main/java/io/micronaut/starter/feature/build/gradle/templates/buildGradle.rocker.raw b/.../src/main/java/io/micronaut/starter/feature/build/gradle/templates/buildGradle.rocker.raw
@@ -169,7 +169,7 @@ dependencies {
 @if (features.contains("config-consul") && features.stream().noneMatch( f -> f.startsWith("discovery-"))) {
     @dependency.template("io.micronaut", "micronaut-discovery-client", "implementation", null)
 }
-@if (features.contains("kubernetes")) {
+@if (features.contains("config-kubernetes")) {
     @dependency.template("io.micronaut.kubernetes", "micronaut-kubernetes-discovery-client", "implementation", null)
 }
 @if (features.contains("micrometer")) {

diff --git a/starter-core/src/main/java/io/micronaut/starter/feature/build/maven/templates/pom.rocker.raw b/starter-core/src/main/java/io/micronaut/starter/feature/build/maven/templates/pom.rocker.raw
@@ -169,7 +169,7 @@ List<Property> properties
 @if (features.contains("config-consul") && features.stream().noneMatch( f -> f.startsWith("discovery-"))) {
 @dependency.template("io.micronaut", "micronaut-discovery-client", "compile", null)
 }
-@if (features.contains("kubernetes")) {
+@if (features.contains("config-kubernetes")) {
 @dependency.template("io.micronaut.kubernetes", "micronaut-kubernetes-discovery-client", "compile", null)
 }
 @if (features.contains("micrometer")) {

diff --git a/starter-core/src/main/java/io/micronaut/starter/feature/distributedconfig/Kubernetes.java b/starter-core/src/main/java/io/micronaut/starter/feature/distributedconfig/Kubernetes.java
@@ -38,7 +38,7 @@ public Kubernetes(Management management, Jib jib) {
 
     @Override
     public String getName() {
-        return "kubernetes";
+        return "config-kubernetes";
     }
 
     @Override
@@ -48,7 +48,7 @@ public String getTitle() {
 
     @Override
     public String getDescription() {
-        return "Adds support for Kubernetes";
+        return "Adds support for Distributed Configuration with Kubernetes ConfigMap";
     }
 
     @Override

diff --git a/...core/src/test/groovy/io/micronaut/starter/feature/distributedconfig/KubernetesSpec.groovy b/...core/src/test/groovy/io/micronaut/starter/feature/distributedconfig/KubernetesSpec.groovy
@@ -13,7 +13,7 @@ class KubernetesSpec extends BeanContextSpec  implements CommandOutputFixture {
 
     void 'test readme.md with feature kubernetes contains links to micronaut docs'() {
         when:
-        def output = generate(['kubernetes'])
+        def output = generate(['config-kubernetes'])
         def readme = output["README.md"]
 
         then:
@@ -24,7 +24,7 @@ class KubernetesSpec extends BeanContextSpec  implements CommandOutputFixture {
     @Unroll
     void 'test gradle kubernetes feature for language=#language'() {
         when:
-        String template = buildGradle.template(ApplicationType.DEFAULT, buildProject(), getFeatures(['kubernetes'], language)).render().toString()
+        String template = buildGradle.template(ApplicationType.DEFAULT, buildProject(), getFeatures(['config-kubernetes'], language)).render().toString()
 
         then:
         template.contains('implementation("io.micronaut.kubernetes:micronaut-kubernetes-discovery-client")')
@@ -38,7 +38,7 @@ class KubernetesSpec extends BeanContextSpec  implements CommandOutputFixture {
     @Unroll
     void 'test maven kubernetes feature for language=#language'() {
         when:
-        String template = pom.template(ApplicationType.DEFAULT, buildProject(), getFeatures(['kubernetes'], language), []).render().toString()
+        String template = pom.template(ApplicationType.DEFAULT, buildProject(), getFeatures(['config-kubernetes'], language), []).render().toString()
 
         then:
         template.contains("""
@@ -55,7 +55,7 @@ class KubernetesSpec extends BeanContextSpec  implements CommandOutputFixture {
 
     void 'test kubernetes configuration'() {
         when:
-        GeneratorContext commandContext = buildGeneratorContext(['kubernetes'])
+        GeneratorContext commandContext = buildGeneratorContext(['config-kubernetes'])
 
         then:
         commandContext.bootstrapConfig.get('micronaut.application.name'.toString()) == 'foo'