docs(cloud-config-demo): enhence Kubernetes cluster usages

Signed-off-by: lony2003 <zhangke200377@outlook.com>

Author: lony2003

spring-boot-examples/README.md

@@ -9,7 +9,6 @@ This example consists of three applications:
   - Subscribe to messages
 - Cloud Config Demo:
   - Import and use configs
-  - Can not run in Kubernetes currently, as lack of redis pre-fill data supported
 
 ## Running these examples from source code
 
@@ -71,6 +70,29 @@ cd consumer-app/
 <!-- END_STEP -->
 The `consumer-app` starts in port `8081` by default.
 
+To run `cloud-config-demo`, you should run in a terminal (`cloud-config-demo` doesn't depends on two applications above):
+<!-- STEP
+name: Run Demo Producer Service
+match_order: none
+output_match_mode: substring
+expected_stdout_lines:
+- 'Started ProducerApplication'
+background: true
+expected_return_code: 143
+sleep: 30
+timeout_seconds: 45
+-->
+<!-- Timeout for above service must be more than sleep + timeout for the client-->
+
+```sh
+cd cloud-config-demo/
+../../mvnw -Dspring-boot.run.arguments="--reuse=true" spring-boot:test-run
+```
+
+<!-- END_STEP -->
+
+It will work and gain secrets from secret store. you can also uncomment the lines in application.yaml to enable more configuration imports.
+
 ## Interacting with the applications
 
 Now that both applications are up you can place an order by sending a POST request to `:8080/orders/`

spring-boot-examples/cloud-config-demo/src/main/java/io/dapr/springboot/examples/cloudconfig/config/MultipleConfig.java

@@ -13,9 +13,6 @@ public class MultipleConfig {
   @Value("${dapr.spring.demo-config-secret.multivalue.v2}")
   private String multipleSecretConfigV2;
 
-  //should be cloud
-  @Value("${dapr.spring.demo-config-config.multivalue.v3}")
-  private String multipleConfigurationConfigV3;
 
   public String getMultipleSecretConfigV1() {
     return multipleSecretConfigV1;
@@ -32,12 +29,4 @@ public String getMultipleSecretConfigV2() {
   public void setMultipleSecretConfigV2(String multipleSecretConfigV2) {
     this.multipleSecretConfigV2 = multipleSecretConfigV2;
   }
-
-  public String getMultipleConfigurationConfigV3() {
-    return multipleConfigurationConfigV3;
-  }
-
-  public void setMultipleConfigurationConfigV3(String multipleConfigurationConfigV3) {
-    this.multipleConfigurationConfigV3 = multipleConfigurationConfigV3;
-  }
 }

spring-boot-examples/cloud-config-demo/src/main/java/io/dapr/springboot/examples/cloudconfig/config/SingleConfig.java

@@ -10,23 +10,11 @@ public class SingleConfig {
   @Value("${dapr.spring.demo-config-secret.singlevalue}")
   private String singleValueSecret;
 
-  // should be testvalue
-  @Value("${dapr.spring.demo-config-config.singlevalue}")
-  private String singleValueConfig;
-
   public String getSingleValueSecret() {
     return singleValueSecret;
   }
 
   public void setSingleValueSecret(String singleValueSecret) {
     this.singleValueSecret = singleValueSecret;
   }
-
-  public String getSingleValueConfig() {
-    return singleValueConfig;
-  }
-
-  public void setSingleValueConfig(String singleValueConfig) {
-    this.singleValueConfig = singleValueConfig;
-  }
 }

spring-boot-examples/cloud-config-demo/src/main/resources/application.yaml

@@ -5,8 +5,15 @@ spring:
     import:
       - dapr:secret:democonfig/multivalue-properties?type=doc
       - dapr:secret:democonfig/dapr.spring.demo-config-secret.singlevalue?type=value
-      #- dapr:secret:democonfigmulti/value1?type=value
-      - dapr:config:democonfigconf/dapr.spring.demo-config-config.singlevalue?type=value
-      - dapr:config:democonfigconf/multivalue-yaml?type=doc&doc-type=yaml
-
+# Following line works by default even if no secret store components defined in dapr running
+# inside kubernetes cluster
+# To maintain the compatibility of local version, we defined a secret store to dapr kubernetes,
+# so following lines are commented.
+#      - dapr:secret:kubernetes/multivalue-properties?type=doc
+#      - dapr:secret:kubernetes/dapr.spring.demo-config-secret.singlevalue?type=value
 
+# Following line includes dapr configuration schema of Cloud Config
+# Unfortunately current dapr runtime doesn't support Kubernetes ConfigMap for configuration,
+# so to maintain the compatibility of Kubernetes, following lines are commented.
+#      - dapr:config:democonfigconf/dapr.spring.demo-config-config.singlevalue?type=value
+#      - dapr:config:democonfigconf/multivalue-yaml?type=doc&doc-type=yaml

spring-boot-examples/cloud-config-demo/src/test/java/io/dapr/springboot/examples/cloudconfig/CloudConfigTests.java

@@ -145,10 +145,6 @@ void testCloudConfig() {
     assertEquals("testvalue", singleConfig.getSingleValueSecret());
     assertEquals("spring", multipleConfig.getMultipleSecretConfigV1());
     assertEquals("dapr", multipleConfig.getMultipleSecretConfigV2());
-
-    assertEquals("testvalue", singleConfig.getSingleValueConfig());
-
-    assertEquals("cloud", multipleConfig.getMultipleConfigurationConfigV3());
   }
 
 }

spring-boot-examples/kubernetes/README.md

@@ -3,6 +3,10 @@
 To run this example on Kubernetes, you can use any Kubernetes distribution. 
 We install Dapr on a Kubernetes cluster and then we will deploy both the `producer-app` and `consumer-app`.
 
+You can also deploy `cloud-config-demo` if you like, but actually it doesn't have any feature.
+
+> Remind that only Kubernetes Secret works on dapr secret, Kubernetes ConfigMap doesn't support in dapr runtime, and there is no easy way to fill data to redis running in cluster before container started automatically, so configuration schema are commented by default.
+
 ## Creating a cluster and installing Dapr
 
 If you don't have any Kubernetes cluster you can use Kubernetes KIND to create a local cluster. We will create a cluster 
@@ -24,6 +28,32 @@ helm upgrade --install dapr dapr/dapr \
 --create-namespace \
 --wait
 ```
+__Optional: pre-configure data needed by  `cloud-config-demo`__
+
+If you want to run `cloud-config-demo` on your cluster, you should apply the secrets file from `secrets/kubernates-secrets-multivalue.yaml`, or you can just run following command:
+
+```bash
+cat <<EOF | kubectl apply -f -
+apiVersion: v1
+kind: Secret
+metadata:
+  name: multivalue-properties
+type: Opaque
+stringData:
+  value1: |
+    dapr.spring.demo-config-secret.multivalue.v1=spring
+    dapr.spring.demo-config-secret.multivalue.v2=dapr
+  value2: "dapr.spring.demo-config-secret.multivalue.v3=cloud"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dapr.spring.demo-config-secret.singlevalue
+type: Opaque
+stringData:
+  value: "dapr.spring.demo-config-secret.singlevalue=testvalue"
+EOF
+```
 
 ## Creating containers using Spring Boot and pushing to local registry
 
@@ -56,6 +86,21 @@ docker tag consumer-app:0.14.0-SNAPSHOT localhost:5001/sb-consumer-app
 docker push localhost:5001/sb-consumer-app
 ```
 
+__Optional: deploy `cloud-config-demo`__
+
+From inside the `spring-boot-examples/cloud-config-demo` directory you can run the following command to create a container:
+```bash
+mvn spring-boot:build-image
+```
+
+Once we have the container image created, we need to tag and push to the local registry, so the image can be used from our local cluster.
+Alternatively, you can push the images to a public registry and update the Kubernetes manifests accordingly.
+
+```bash
+docker tag cloud-config-demo:0.15.0-SNAPSHOT localhost:5001/sb-cloud-config-demo
+docker push localhost:5001/sb-cloud-config-demo
+```
+
 Now we are ready to install our application into the cluster.
 
 ## Installing and interacting with the application

spring-boot-examples/kubernetes/secrets/kubernates-secrets-multivalue.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: multivalue-properties
+type: Opaque
+stringData:
+  value1: |
+    dapr.spring.demo-config-secret.multivalue.v1=spring
+    dapr.spring.demo-config-secret.multivalue.v2=dapr
+  value2: "dapr.spring.demo-config-secret.multivalue.v3=cloud"
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dapr.spring.demo-config-secret.singlevalue
+type: Opaque
+stringData:
+  value: "dapr.spring.demo-config-secret.singlevalue=testvalue"

spring-boot-examples/kubernetes/secretstore.yaml

@@ -0,0 +1,7 @@
+apiVersion: dapr.io/v1alpha1
+kind: Component
+metadata:
+  name: democonfig
+spec:
+  type: secretstores.kubernetes
+  version: v1