diff --git a/charts/planr-tools/Chart.yaml b/charts/planr-tools/Chart.yaml index 13fe76ce..a4d4e797 100644 --- a/charts/planr-tools/Chart.yaml +++ b/charts/planr-tools/Chart.yaml @@ -2,12 +2,12 @@ apiVersion: v2 name: planr-tools description: A Helm chart for deploying the planr-tools applications type: application -version: 1.5.2 +version: 1.5.3 appVersion: "5.1.1" annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" sources: - https://github.com/subshell/helm-charts/tree/main/charts/planr-tools home: https://gitlab.com/subshell/kunden/planr-tools diff --git a/charts/planr-tools/values.yaml b/charts/planr-tools/values.yaml index f8fcacd0..680390c0 100644 --- a/charts/planr-tools/values.yaml +++ b/charts/planr-tools/values.yaml @@ -91,7 +91,9 @@ applications: loadBalancerIP: exposure: path: /document-creator - env: [] + env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" envFrom: [] resources: {} config: @@ -131,7 +133,9 @@ applications: loadBalancerIP: exposure: path: /feed - env: [] + env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" envFrom: [] resources: {} config: @@ -173,7 +177,9 @@ applications: loadBalancerIP: exposure: path: / - env: [] + env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" envFrom: [] resources: {} config: diff --git a/charts/sophora-ai/Chart.yaml b/charts/sophora-ai/Chart.yaml index c2468560..1168d10d 100644 --- a/charts/sophora-ai/Chart.yaml +++ b/charts/sophora-ai/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: sophora-ai description: Sophora AI type: application -version: 2.7.3 +version: 2.7.4 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: 1.7.0 sources: - https://github.com/subshell/helm-charts/tree/main/charts/sophora-ai diff --git a/charts/sophora-ai/templates/deployment.yaml b/charts/sophora-ai/templates/deployment.yaml index f98b2330..8040aaaa 100644 --- a/charts/sophora-ai/templates/deployment.yaml +++ b/charts/sophora-ai/templates/deployment.yaml @@ -43,6 +43,8 @@ spec: protocol: TCP containerPort: 8080 env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-contentapi/Chart.yaml b/charts/sophora-contentapi/Chart.yaml index b6b8e753..2842a7cc 100644 --- a/charts/sophora-contentapi/Chart.yaml +++ b/charts/sophora-contentapi/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: sophora-contentapi description: Sophora Content API type: application -version: 1.5.3 +version: 1.5.4 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: 6.0.0 sources: diff --git a/charts/sophora-contentapi/templates/deployment.yaml b/charts/sophora-contentapi/templates/deployment.yaml index 36935011..6bcbc8ea 100644 --- a/charts/sophora-contentapi/templates/deployment.yaml +++ b/charts/sophora-contentapi/templates/deployment.yaml @@ -35,6 +35,8 @@ spec: protocol: TCP containerPort: 8080 env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-image-access-service/Chart.yaml b/charts/sophora-image-access-service/Chart.yaml index 50779e6f..a11f240b 100644 --- a/charts/sophora-image-access-service/Chart.yaml +++ b/charts/sophora-image-access-service/Chart.yaml @@ -15,11 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.12.2 +version: 1.12.3 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: changed + description: "use readiness probe endpoint /actuator/health/readiness" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" # This is the version number of the application being deployed. This version number should be diff --git a/charts/sophora-image-access-service/templates/deployment.yaml b/charts/sophora-image-access-service/templates/deployment.yaml index 1de85dc4..19942d14 100644 --- a/charts/sophora-image-access-service/templates/deployment.yaml +++ b/charts/sophora-image-access-service/templates/deployment.yaml @@ -40,6 +40,8 @@ spec: containerPort: {{ .Values.service.metricsPort }} protocol: TCP env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} {{- if .Values.sophora.authentication.accessToken }} @@ -87,7 +89,7 @@ spec: {{- with .Values.readinessProbe }} readinessProbe: httpGet: - path: /actuator/health + path: /actuator/health/readiness port: metrics failureThreshold: {{ .failureThreshold }} initialDelaySeconds: {{ .initialDelaySeconds }} diff --git a/charts/sophora-image-ai/Chart.yaml b/charts/sophora-image-ai/Chart.yaml index 2bfb44f8..3b97d00a 100644 --- a/charts/sophora-image-ai/Chart.yaml +++ b/charts/sophora-image-ai/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: sophora-image-ai description: Sophora Image AI type: application -version: 2.6.4 +version: 2.6.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: 5.1.0 diff --git a/charts/sophora-image-ai/templates/deployment.yaml b/charts/sophora-image-ai/templates/deployment.yaml index a9f88845..f74cef05 100644 --- a/charts/sophora-image-ai/templates/deployment.yaml +++ b/charts/sophora-image-ai/templates/deployment.yaml @@ -51,6 +51,8 @@ spec: protocol: TCP containerPort: 8080 env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-image-update-service/Chart.yaml b/charts/sophora-image-update-service/Chart.yaml index 3023ac1a..1aa55da4 100644 --- a/charts/sophora-image-update-service/Chart.yaml +++ b/charts/sophora-image-update-service/Chart.yaml @@ -15,11 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.1 +version: 1.2.2 annotations: artifacthub.io/changes: | - kind: added - description: "Added extraDeploy to additionally deploy custom resources" + description: "add readinessProbe with readiness probe endpoint /actuator/health/readiness" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sophora-image-update-service/templates/deployment.yaml b/charts/sophora-image-update-service/templates/deployment.yaml index 0334e161..983e54b0 100644 --- a/charts/sophora-image-update-service/templates/deployment.yaml +++ b/charts/sophora-image-update-service/templates/deployment.yaml @@ -36,6 +36,8 @@ spec: containerPort: {{ .Values.service.httpPort }} protocol: TCP env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME @@ -70,6 +72,16 @@ spec: periodSeconds: {{ .periodSeconds }} timeoutSeconds: {{ .timeoutSeconds }} {{- end }} + {{- with .Values.readinessProbe }} + readinessProbe: + httpGet: + path: /actuator/health/readiness + port: http + failureThreshold: {{ .failureThreshold }} + initialDelaySeconds: {{ .initialDelaySeconds }} + periodSeconds: {{ .periodSeconds }} + timeoutSeconds: {{ .timeoutSeconds }} + {{- end }} {{- with .Values.startupProbe }} startupProbe: httpGet: diff --git a/charts/sophora-image-update-service/values.yaml b/charts/sophora-image-update-service/values.yaml index f3aed07b..d0c0160e 100644 --- a/charts/sophora-image-update-service/values.yaml +++ b/charts/sophora-image-update-service/values.yaml @@ -74,5 +74,11 @@ livenessProbe: timeoutSeconds: 3 periodSeconds: 60 +readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 1 + timeoutSeconds: 3 + periodSeconds: 10 + # extraDeploy is a list of full Kubernetes manifests that will be rendered additionally by this chart extraDeploy: [] diff --git a/charts/sophora-importer/Chart.yaml b/charts/sophora-importer/Chart.yaml index 2cf0097f..a725695f 100644 --- a/charts/sophora-importer/Chart.yaml +++ b/charts/sophora-importer/Chart.yaml @@ -15,11 +15,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.11.4 +version: 2.11.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" # This is the version number of the application being deployed. This version number should be diff --git a/charts/sophora-importer/templates/statefulset.yaml b/charts/sophora-importer/templates/statefulset.yaml index 29a2179b..ac3e50b1 100644 --- a/charts/sophora-importer/templates/statefulset.yaml +++ b/charts/sophora-importer/templates/statefulset.yaml @@ -40,6 +40,8 @@ spec: image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" imagePullPolicy: {{ .Values.image.pullPolicy }} env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-indexing-service/Chart.yaml b/charts/sophora-indexing-service/Chart.yaml index 70096f0a..5d59947e 100644 --- a/charts/sophora-indexing-service/Chart.yaml +++ b/charts/sophora-indexing-service/Chart.yaml @@ -2,11 +2,13 @@ apiVersion: v2 name: sophora-indexing-service description: Sophora Indexing Service (SISI) type: application -version: 1.11.4 +version: 1.11.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: changed + description: "use readiness probe endpoint /actuator/health/readiness" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: '5.4.1' diff --git a/charts/sophora-indexing-service/templates/deployment.yaml b/charts/sophora-indexing-service/templates/deployment.yaml index 73c392f4..6dcaa444 100644 --- a/charts/sophora-indexing-service/templates/deployment.yaml +++ b/charts/sophora-indexing-service/templates/deployment.yaml @@ -51,6 +51,8 @@ spec: containerPort: 1837 protocol: TCP env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-indexing-service/values.yaml b/charts/sophora-indexing-service/values.yaml index fff13c62..d3d8e804 100644 --- a/charts/sophora-indexing-service/values.yaml +++ b/charts/sophora-indexing-service/values.yaml @@ -63,7 +63,7 @@ startupProbe: periodSeconds: 2 readinessProbe: - httpPath: '/health' + httpPath: '/actuator/health/readiness' failureThreshold: 5 initialDelaySeconds: 5 timeoutSeconds: 1 diff --git a/charts/sophora-linkchecker/Chart.yaml b/charts/sophora-linkchecker/Chart.yaml index f39fd2a2..c45dcf9d 100644 --- a/charts/sophora-linkchecker/Chart.yaml +++ b/charts/sophora-linkchecker/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: sophora-linkchecker description: Sophora Link Checker type: application -version: 0.6.4 +version: 0.6.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: 6.0.0 sources: diff --git a/charts/sophora-linkchecker/templates/deployment.yaml b/charts/sophora-linkchecker/templates/deployment.yaml index 6226c50c..745e6f36 100644 --- a/charts/sophora-linkchecker/templates/deployment.yaml +++ b/charts/sophora-linkchecker/templates/deployment.yaml @@ -35,6 +35,8 @@ spec: protocol: TCP containerPort: 8080 env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-metadata-supplier/Chart.yaml b/charts/sophora-metadata-supplier/Chart.yaml index f24893ba..42616b36 100644 --- a/charts/sophora-metadata-supplier/Chart.yaml +++ b/charts/sophora-metadata-supplier/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: sophora-metadata-supplier description: Sophora Metadata Supplier (SMS) type: application -version: 1.8.3 +version: 1.8.4 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: '4.14.0' diff --git a/charts/sophora-metadata-supplier/templates/deployment.yaml b/charts/sophora-metadata-supplier/templates/deployment.yaml index 830c03c3..b2024cf7 100644 --- a/charts/sophora-metadata-supplier/templates/deployment.yaml +++ b/charts/sophora-metadata-supplier/templates/deployment.yaml @@ -111,6 +111,8 @@ spec: containerPort: 8080 protocol: TCP env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-schema-docs/Chart.yaml b/charts/sophora-schema-docs/Chart.yaml index 1226b5fe..a226cf63 100644 --- a/charts/sophora-schema-docs/Chart.yaml +++ b/charts/sophora-schema-docs/Chart.yaml @@ -2,11 +2,11 @@ apiVersion: v2 name: sophora-schema-docs description: Sophora Schema Docs type: application -version: 2.6.4 +version: 2.6.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: 5.0.0 sources: diff --git a/charts/sophora-schema-docs/templates/deployment.yaml b/charts/sophora-schema-docs/templates/deployment.yaml index dd5cba61..c31efe16 100644 --- a/charts/sophora-schema-docs/templates/deployment.yaml +++ b/charts/sophora-schema-docs/templates/deployment.yaml @@ -46,6 +46,8 @@ spec: protocol: TCP containerPort: 8080 env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME diff --git a/charts/sophora-seo-check/Chart.yaml b/charts/sophora-seo-check/Chart.yaml index 2b41838c..7eebd6a4 100644 --- a/charts/sophora-seo-check/Chart.yaml +++ b/charts/sophora-seo-check/Chart.yaml @@ -2,11 +2,13 @@ apiVersion: v2 name: sophora-seo-check description: Sophora SEO Check type: application -version: 1.5.4 +version: 1.5.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "fix linting issue on enabled GCPHealthChecks and GCPBackendPolicies" + - kind: changed + description: "use readiness probe endpoint /actuator/health/readiness" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" appVersion: 4.12.0 sources: diff --git a/charts/sophora-seo-check/templates/statefulset.yaml b/charts/sophora-seo-check/templates/statefulset.yaml index 73d3102d..9d542265 100644 --- a/charts/sophora-seo-check/templates/statefulset.yaml +++ b/charts/sophora-seo-check/templates/statefulset.yaml @@ -55,6 +55,8 @@ spec: protocol: TCP containerPort: 8080 env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME @@ -83,7 +85,7 @@ spec: readinessProbe: httpGet: port: http - path: /actuator/health + path: /actuator/health/readiness volumes: - name: config configMap: diff --git a/charts/sophora-tablestar-controller/Chart.yaml b/charts/sophora-tablestar-controller/Chart.yaml index 430567fa..64ac4dc0 100644 --- a/charts/sophora-tablestar-controller/Chart.yaml +++ b/charts/sophora-tablestar-controller/Chart.yaml @@ -15,11 +15,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.2.1 +version: 1.2.2 annotations: artifacthub.io/changes: | - kind: added - description: "Added extraDeploy to additionally deploy custom resources" + description: "add readinessProbe with readiness probe endpoint /actuator/health/readiness" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sophora-tablestar-controller/templates/deployment.yaml b/charts/sophora-tablestar-controller/templates/deployment.yaml index 28138e5c..91d5c10a 100644 --- a/charts/sophora-tablestar-controller/templates/deployment.yaml +++ b/charts/sophora-tablestar-controller/templates/deployment.yaml @@ -35,6 +35,8 @@ spec: containerPort: {{ .Values.service.httpPort }} protocol: TCP env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME @@ -64,7 +66,7 @@ spec: {{- with .Values.readinessProbe }} readinessProbe: httpGet: - path: /actuator/health + path: /actuator/health/readiness port: http failureThreshold: {{ .failureThreshold }} initialDelaySeconds: {{ .initialDelaySeconds }} diff --git a/charts/sophora-tablestar-controller/values.yaml b/charts/sophora-tablestar-controller/values.yaml index ae882b0b..867aea9b 100644 --- a/charts/sophora-tablestar-controller/values.yaml +++ b/charts/sophora-tablestar-controller/values.yaml @@ -61,5 +61,11 @@ livenessProbe: timeoutSeconds: 3 periodSeconds: 60 +readinessProbe: + failureThreshold: 3 + initialDelaySeconds: 1 + timeoutSeconds: 3 + periodSeconds: 10 + # extraDeploy is a list of full Kubernetes manifests that will be rendered additionally by this chart extraDeploy: [] diff --git a/charts/sophora-ugc/Chart.yaml b/charts/sophora-ugc/Chart.yaml index d2f80e6f..e8bf7fcb 100644 --- a/charts/sophora-ugc/Chart.yaml +++ b/charts/sophora-ugc/Chart.yaml @@ -15,16 +15,11 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 2.11.0 +version: 2.11.1 annotations: artifacthub.io/changes: | - kind: added - description: "ServiceMonitor objects for UGC and UGC multimedia" - - kind: changed - description: "The parameter `service.jolokia.clusterIP` is now `service.management.clusterIP`. The deployed service and the corresponding container port are now named `management` instead of `jolokia`." - - kind: changed - description: "The `gcp` parameters can now be configured for UGC and UGC multimedia independently at `ugc.gcp` and `ugcMultimedia.gcp`." - + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" artifacthub.io/links: | - name: Documentation for Sophora UGC diff --git a/charts/sophora-ugc/templates/deployment.yaml b/charts/sophora-ugc/templates/deployment.yaml index 26d1b3b1..1b4ce6b8 100644 --- a/charts/sophora-ugc/templates/deployment.yaml +++ b/charts/sophora-ugc/templates/deployment.yaml @@ -41,6 +41,8 @@ spec: image: "{{ .Values.ugc.image.repository }}:{{ .Values.ugc.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.ugc.image.pullPolicy }} env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JAVA_TOOL_OPTIONS value: {{ .Values.javaOptions }} {{- if .Values.authentication.secret.server.usernameKey }} diff --git a/charts/sophora-ugc/templates/ugc-multimedia/statefulset.yaml b/charts/sophora-ugc/templates/ugc-multimedia/statefulset.yaml index 9b555e3d..a0ccacf0 100644 --- a/charts/sophora-ugc/templates/ugc-multimedia/statefulset.yaml +++ b/charts/sophora-ugc/templates/ugc-multimedia/statefulset.yaml @@ -35,6 +35,8 @@ spec: image: "{{ .Values.ugcMultimedia.image.repository }}:{{ .Values.ugcMultimedia.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.ugcMultimedia.image.pullPolicy }} env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JAVA_TOOL_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVER-CONNECTION_USERNAME diff --git a/charts/sophora-webclient/Chart.yaml b/charts/sophora-webclient/Chart.yaml index a86226be..9881ccbd 100644 --- a/charts/sophora-webclient/Chart.yaml +++ b/charts/sophora-webclient/Chart.yaml @@ -6,11 +6,13 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.10.4 +version: 1.10.5 annotations: artifacthub.io/changes: | - - kind: fixed - description: "Removed an invalid document separator when using gcp.backendPolicy.enabled:true" + - kind: changed + description: "use readiness probe endpoint /actuator/health/readiness" + - kind: added + description: "add env MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE=sophora to add the sophora health indicator to the readiness group" # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/charts/sophora-webclient/templates/deployment.yaml b/charts/sophora-webclient/templates/deployment.yaml index 8eb94e03..431b0231 100644 --- a/charts/sophora-webclient/templates/deployment.yaml +++ b/charts/sophora-webclient/templates/deployment.yaml @@ -32,6 +32,8 @@ spec: image: "{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}" imagePullPolicy: {{ .Values.image.pullPolicy | quote }} env: + - name: MANAGEMENT_ENDPOINT_HEALTH_GROUP_READINESS_INCLUDE + value: "sophora" - name: JDK_JAVA_OPTIONS value: {{ .Values.javaOptions }} - name: SOPHORA_CLIENT_SERVERCONNECTION_USERNAME @@ -72,7 +74,7 @@ spec: {{- with .Values.readinessProbe }} readinessProbe: httpGet: - path: /health + path: /actuator/health/readiness port: 8080 failureThreshold: {{ .failureThreshold }} initialDelaySeconds: {{ .initialDelaySeconds }}