Add groups in Kubernetes example

codecentric · May 24, 2024 · f710ac2 · f710ac2
1 parent cdaf5f9
commit f710ac2
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 7 deletions.
diff --git a/kubernetes/apps/health-simulator/deployment/values.yaml b/kubernetes/apps/health-simulator/deployment/values.yaml
@@ -3,3 +3,4 @@ name: health-simulator
 deployment:
   image: health-simulator
   replicas: 1
+  group: spring-boot-app
diff --git a/kubernetes/apps/hello-world/deployment/values.yaml b/kubernetes/apps/hello-world/deployment/values.yaml
@@ -3,3 +3,4 @@ name: hello-world
 deployment:
   image: hello-world
   replicas: 3
+  group: spring-boot-app
diff --git a/kubernetes/apps/spring-boot-admin-discoveryclient/README.md b/kubernetes/apps/spring-boot-admin-discoveryclient/README.md
@@ -5,11 +5,6 @@ Therefore, it needs a running spring-cloud-kubernetes-discoveryserver.
 For this reason, the SBA server does not need kubernetes api permissions on kubernetes itself and uses the 
 spring-boot-app helmchart.
 
-
-TODO does not add new services that are started after this one, seems is no Watch like in the other discovery clients. 
-This also means that it does not add itself to the list of services. 
-
-
 Make sure [discoveryserver](../../helm-charts/spring-cloud-kubernetes-discoveryserver/README.md) is running before deploying this app.
 
 

diff --git a/kubernetes/apps/spring-boot-admin-discoveryclient/deployment/values.yml b/kubernetes/apps/spring-boot-admin-discoveryclient/deployment/values.yml
@@ -9,3 +9,4 @@ deployment:
   management:
     port: 8081
   image: spring-boot-admin:discocli
+  group: spring-boot-admin
diff --git a/kubernetes/apps/spring-boot-admin-fabric8/deployment/values.yml b/kubernetes/apps/spring-boot-admin-fabric8/deployment/values.yml
@@ -5,3 +5,4 @@ deployment:
   env:
     SPRING_BOOT_ADMIN_UI_TITLE: Spring Boot Admin - Kubernetes Fabric8
   image: spring-boot-admin:fabric8
+  group: spring-boot-admin
diff --git a/kubernetes/apps/spring-boot-admin-kubernetes/deployment/values.yml b/kubernetes/apps/spring-boot-admin-kubernetes/deployment/values.yml
@@ -9,3 +9,4 @@ deployment:
   management:
     port: 9091
   image: spring-boot-admin:kubernetes
+  group: spring-boot-admin
diff --git a/kubernetes/helm-charts/spring-boot-admin/templates/service.yaml b/kubernetes/helm-charts/spring-boot-admin/templates/service.yaml
@@ -6,9 +6,9 @@ metadata:
   labels:
     app: {{ .Values.name }}
     spring-boot: "true"
-  # Filter discovery to tagged services
   annotations:
-    spring-boot-admin: "true"
+    spring-boot-admin: "true"  # used by SBA server to filter services (e.g. when using fabric8 client)
+    group: {{ .Values.deployment.group }} # optional: used by SBA frontend to group services
 spec:
   ports:
     - port: {{ .Values.deployment.server.port }}

diff --git a/kubernetes/helm-charts/spring-boot-admin/values.yaml b/kubernetes/helm-charts/spring-boot-admin/values.yaml
@@ -22,3 +22,4 @@ deployment:
     port: 8080
   management:
     port: 8081
+  group: default
diff --git a/kubernetes/helm-charts/spring-boot-app/templates/service.yaml b/kubernetes/helm-charts/spring-boot-app/templates/service.yaml
@@ -8,6 +8,7 @@ metadata:
     spring-boot: "true" # used by kubernetes java client to filter directly in discovery client
   annotations:
     spring-boot-admin: "true" # used by SBA server to filter services (e.g. when using fabric8 client)
+    group: {{ .Values.deployment.group }} # optional: used by SBA frontend to group services
 spec:
   ports:
     - port: 8080

diff --git a/kubernetes/helm-charts/spring-boot-app/values.yaml b/kubernetes/helm-charts/spring-boot-app/values.yaml
@@ -20,3 +20,4 @@ deployment:
     port: 8080
   management:
     port: 8081
+  group: default