Merge branch 'master' into Setup_for_Qase_test_run

charts/kafka-ui/Chart.yaml

@@ -2,6 +2,6 @@ apiVersion: v2
 name: kafka-ui
 description: A Helm chart for kafka-UI
 type: application
-version: 0.5.2
+version: 0.5.3
 appVersion: v0.5.0
 icon: https://github.com/provectus/kafka-ui/raw/master/documentation/images/kafka-ui-logo.png

charts/kafka-ui/templates/secret.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.envs.secret -}}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,3 +10,4 @@ data:
   {{- range $key, $val := .Values.envs.secret }}
   {{ $key }}: {{ $val | b64enc | quote }}
   {{- end -}}
+{{- end}}

kafka-ui-api/Dockerfile

@@ -1,4 +1,4 @@
-FROM azul/zulu-openjdk-alpine:17
+FROM azul/zulu-openjdk-alpine:17-jre
 
 RUN apk add --no-cache gcompat # need to make snappy codec work
 RUN addgroup -S kafkaui && adduser -S kafkaui -G kafkaui

kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/ProtobufSchemaConverterTest.java

@@ -57,6 +57,7 @@ class ProtobufSchemaConverterTest {
             message EmbeddedMsg {
                 int32 emb_f1 = 1;
                 TestMsg outer_ref = 2;
+                EmbeddedMsg self_ref = 3;
             }
         }""";
 
@@ -116,7 +117,8 @@ class ProtobufSchemaConverterTest {
                     "properties":
                     {
                         "emb_f1": { "type": "integer", "maximum": 2147483647, "minimum": -2147483648 },
-                        "outer_ref": { "$ref": "#/definitions/test.TestMsg" }
+                        "outer_ref": { "$ref": "#/definitions/test.TestMsg" },
+                        "self_ref": { "$ref": "#/definitions/test.TestMsg.EmbeddedMsg" }
                     }
                 }
             },