using volumes for secrets and PropertySource fro configMaps to showca…

…se both. Left placeholders to mount configMaps as volumes for now until we finalize decision on use of PropertySource

department-service/src/main/resources/bootstrap.yml

@@ -3,5 +3,26 @@ spring:
     name: department
   cloud:
     kubernetes:
+      config:
+        enableApi: true
+#        # default is true
+#        enabled: true
+#        # load from path
+#        # configs must be mounted as single file
+#        # there is no recursion support, see:
+#        # https://github.com/spring-cloud/spring-cloud-kubernetes/issues/327#issuecomment-522538916
+#        # file must be referenced here
+#        paths:
+#          - /etc/appconfig/application.properties
+#        enableApi: false
       secrets:
-        enableApi: true
+        # default is true
+        enabled: true
+        # secret location
+        # this is loaded in with normal k/v in a Kubernetes secret
+        # and not a application.properties file
+        # spring will handle looking up the credentials in each k/v's directory
+        paths:
+          - /etc/secretspot
+        # default is false
+        enableApi: false

employee-service/src/main/resources/bootstrap.yml

@@ -3,8 +3,30 @@ spring:
     name: employee
   cloud:
     kubernetes:
-      secrets:
+      config:
         enableApi: true
+      #        # default is true
+      #        enabled: true
+      #        # load from path
+      #        # configs must be mounted as single file
+      #        # there is no recursion support, see:
+      #        # https://github.com/spring-cloud/spring-cloud-kubernetes/issues/327#issuecomment-522538916
+      #        # file must be referenced here
+      #        paths:
+      #          - /etc/appconfig/application.properties
+      #        enableApi: false
+      secrets:
+        # default is true
+        enabled: true
+        # secret location
+        # this is loaded in with normal k/v in a Kubernetes secret
+        # and not a application.properties file
+        # spring will handle looking up the credentials in each k/v's directory
+        paths:
+          - /etc/secretspot
+        # default is false
+        enableApi: false
+
 #      client:
 #        masterUrl: ${minikube ip}:8443
 #        masterUrl: kubernetes.default.svc:8443

k8s/department-deployment.yaml

@@ -15,33 +15,45 @@ spec:
         app: department
     spec:
       containers:
-      - name: department
-        image: vmware/department:1.1
-        ports:
-          - containerPort: 8080
-        resources:
+        - name: department
+          image: vmware/department:1.1
+          ports:
+            - containerPort: 8080
+          resources:
             requests:
               cpu: "0.2"
               memory: 300Mi
             limits:
               cpu: "1.0"
               memory: 300Mi
-        readinessProbe:
+          readinessProbe:
             httpGet:
               port: 8080
               path: /actuator/health
             initialDelaySeconds: 60
             timeoutSeconds: 2
             periodSeconds: 20
             failureThreshold: 5
-        livenessProbe:
+          livenessProbe:
             httpGet:
               port: 8080
               path: /actuator/info
             initialDelaySeconds: 60
             timeoutSeconds: 2
             periodSeconds: 20
             failureThreshold: 5
+          volumeMounts:
+            - name: mongodb
+              mountPath: /etc/secretspot
+#            - name: config
+#              mountPath: /etc/appconfig
+      volumes:
+        - name: mongodb
+          secret:
+            secretName: department
+#        - name: config
+#          configMap:
+#            name: department
       serviceAccountName: api-service-account
 ---
 apiVersion: v1
@@ -52,8 +64,8 @@ metadata:
     app: department
 spec:
   ports:
-  - port: 8080
-    protocol: TCP
+    - port: 8080
+      protocol: TCP
   selector:
     app: department
   type: NodePort

k8s/employee-deployment.yaml

@@ -42,6 +42,18 @@ spec:
             timeoutSeconds: 10
             periodSeconds: 20
             failureThreshold: 10
+          volumeMounts:
+            - name: mongodb
+              mountPath: /etc/secretspot
+#            - name: config
+#              mountPath: /etc/appconfig
+      volumes:
+        - name: mongodb
+          secret:
+            secretName: employee
+#        - name: config
+#          configMap:
+#            name: employee
       serviceAccountName: api-service-account
 ---
 apiVersion: v1

k8s/organization-deployment.yaml

@@ -42,6 +42,18 @@ spec:
           timeoutSeconds: 2
           periodSeconds: 20
           failureThreshold: 5
+        volumeMounts:
+          - name: mongodb
+            mountPath: /etc/secretspot
+#          - name: config
+#            mountPath: /etc/appconfig
+      volumes:
+        - name: mongodb
+          secret:
+            secretName: organization
+#        - name: config
+#          configMap:
+#            name: organization
       serviceAccountName: api-service-account
 ---
 apiVersion: v1

organization-service/src/main/resources/bootstrap.yml

@@ -3,5 +3,26 @@ spring:
     name: organization
   cloud:
     kubernetes:
+      config:
+        enableApi: true
+      #        # default is true
+      #        enabled: true
+      #        # load from path
+      #        # configs must be mounted as single file
+      #        # there is no recursion support, see:
+      #        # https://github.com/spring-cloud/spring-cloud-kubernetes/issues/327#issuecomment-522538916
+      #        # file must be referenced here
+      #        paths:
+      #          - /etc/appconfig/application.properties
+      #        enableApi: false
       secrets:
-        enableApi: true
+        # default is true
+        enabled: true
+        # secret location
+        # this is loaded in with normal k/v in a Kubernetes secret
+        # and not a application.properties file
+        # spring will handle looking up the credentials in each k/v's directory
+        paths:
+          - /etc/secretspot
+        # default is false
+        enableApi: false