瀏覽代碼

fix health/readiness path

fix health/readiness path in order to align current development,
We decided to make specific health path to check service availability even if kafka-ui configured with authorization.
/actuator/health return 2XX codes despite of authorization settings

(cherry picked from commit b05bd69aa1d7f15154acbeace89d536fa47a9033)
azatsafin 3 年之前
父節點
當前提交
d6ada34a7e
共有 3 個文件被更改,包括 10 次插入10 次删除
  1. 2 2
      charts/kafka-ui/templates/deployment.yaml
  2. 7 7
      kafka-ui-react-app/package-lock.json
  3. 1 1
      kafka-ui-react-app/package.json

+ 2 - 2
charts/kafka-ui/templates/deployment.yaml

@@ -54,7 +54,7 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/" | urlParse }}
+              {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/actuator/health" | urlParse }}
               path: {{ get $contextPath "path" }}
               port: http
             initialDelaySeconds: 60
@@ -62,7 +62,7 @@ spec:
             timeoutSeconds: 10
           readinessProbe:
             httpGet:
-              {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/" | urlParse }}
+              {{- $contextPath := .Values.envs.config.SERVER_SERVLET_CONTEXT_PATH | default "" | printf "%s/actuator/health" | urlParse }}
               path: {{ get $contextPath "path" }}
               port: http
             initialDelaySeconds: 60

+ 7 - 7
kafka-ui-react-app/package-lock.json

@@ -2266,9 +2266,9 @@
       }
     },
     "@openapitools/openapi-generator-cli": {
-      "version": "2.4.14",
-      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.4.14.tgz",
-      "integrity": "sha512-Dawzf2pOYDcbQb5C1YK9TVVL97vY50GHInjDHPmZV48qom833syXNuuTE6jlMtMJkYjgk7ZuC4iOKroL+pI3SA==",
+      "version": "2.4.15",
+      "resolved": "https://registry.npmjs.org/@openapitools/openapi-generator-cli/-/openapi-generator-cli-2.4.15.tgz",
+      "integrity": "sha512-pBjhkPKWSWVvX/jTm9WwjYQevvg7tRTa2b1o2xzolDzwwyXgxNl85m1ltmX1KHTLXoHwnbxOYIqmvbE0AcTZKA==",
       "dev": true,
       "requires": {
         "@nestjs/common": "8.2.0",
@@ -2277,7 +2277,7 @@
         "chalk": "4.1.2",
         "commander": "8.3.0",
         "compare-versions": "3.6.0",
-        "concurrently": "6.3.0",
+        "concurrently": "6.4.0",
         "console.table": "0.10.0",
         "fs-extra": "10.0.0",
         "glob": "7.1.6",
@@ -5956,9 +5956,9 @@
       }
     },
     "concurrently": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.3.0.tgz",
-      "integrity": "sha512-k4k1jQGHHKsfbqzkUszVf29qECBrkvBKkcPJEUDTyVR7tZd1G/JOfnst4g1sYbFvJ4UjHZisj1aWQR8yLKpGPw==",
+      "version": "6.4.0",
+      "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-6.4.0.tgz",
+      "integrity": "sha512-HZ3D0RTQMH3oS4gvtYj1P+NBc6PzE2McEra6yEFcQKrUQ9HvtTGU4Dbne083F034p+LRb7kWU0tPRNvSGs1UCQ==",
       "dev": true,
       "requires": {
         "chalk": "^4.1.0",

+ 1 - 1
kafka-ui-react-app/package.json

@@ -77,7 +77,7 @@
   },
   "devDependencies": {
     "@jest/types": "^27.0.6",
-    "@openapitools/openapi-generator-cli": "^2.4.14",
+    "@openapitools/openapi-generator-cli": "^2.4.15",
     "@testing-library/jest-dom": "^5.14.1",
     "@types/classnames": "^2.2.11",
     "@types/enzyme": "^3.10.9",