akhq

2023-11-10 12:02:45 +08:00 · 2023-11-10 12:02:45 +08:00 · 6ba8618410
parent a27a159a6d
commit 6ba8618410
3 changed files with 33 additions and 40 deletions
--- a/dev-upgrade/kafka/akhq.yaml
+++ b/dev-upgrade/kafka/akhq.yaml
@ -5,14 +5,6 @@ metadata:
  name: akhq-config
 data:
  application.yml: |
-    akhq:
-      connections:
-        kafka-cluster:
-          properties:
-            bootstrap.servers: "kafka-0-internal:9092,kafka-1-internal:9092,kafka-2-internal:9092"
-          schema-registry:
-            url: "http://schemaregistry-0-internal:8081,http://schemaregistry-1-internal:8081,http://schemaregistry-2-internal:8081"
-            type: "confluent"
    micronaut:
      security:
        enabled: true
@ -22,14 +14,21 @@ data:
              secret:
                generator:
                  secret: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjpbeyJ0b29sdHQiOiJodHRwczovL3Rvb2x0dC5jb20ifV0sImlhdCI6MTY4NTY4OTU1MiwiZXhwIjoyNTM3NjI1NTk5LCJhdWQiOiIiLCJpc3MiOiJzbWFsbGtvdWRhaSIsInN1YiI6IiJ9.mKw9nKRhQimdaNtMWLHT9TqIn2-iIcZR4txgy8z07xQ
-
-    akhq.security:
-      basic-auth:
-        - username: admin
-          password: "$2a$10$ARWW4TWyaAywZ0vS4ua62OS8s.qm3cVHGmApWx8vALSMzUVS.q.Se"
-          passwordHash: BCRYPT
-          groups:
-          - admin
+    akhq:
+      connections:
+        kafka-cluster:
+          properties:
+            bootstrap.servers: "kafka-0-internal:9092,kafka-1-internal:9092,kafka-2-internal:9092"
+          schema-registry:
+            url: "http://schemaregistry-0-internal:8081,http://schemaregistry-1-internal:8081,http://schemaregistry-2-internal:8081"
+            type: "confluent"
+      security:
+        basic-auth:
+          - username: admin
+            password: "$2a$10$ARWW4TWyaAywZ0vS4ua62OS8s.qm3cVHGmApWx8vALSMzUVS.q.Se"
+            passwordHash: BCRYPT
+            groups:
+            - admin

 ---
 apiVersion: apps/v1
--- a/qa-upgrade/kafka/akhq.yaml
+++ b/qa-upgrade/kafka/akhq.yaml
@ -5,6 +5,15 @@ metadata:
  name: akhq-config
 data:
  application.yml: |
+    micronaut:
+      security:
+        enabled: true
+        token:
+          jwt:
+            signatures:
+              secret:
+                generator:
+                  secret: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjpbeyJ0b29sdHQiOiJodHRwczovL3Rvb2x0dC5jb20ifV0sImlhdCI6MTY4NTY4OTU1MiwiZXhwIjoyNTM3NjI1NTk5LCJhdWQiOiIiLCJpc3MiOiJzbWFsbGtvdWRhaSIsInN1YiI6IiJ9.mKw9nKRhQimdaNtMWLHT9TqIn2-iIcZR4txgy8z07xQ
    akhq:
      connections:
        kafka-cluster:
@ -22,17 +31,6 @@ data:
            groups:
            - admin

-    micronaut:
-      security:
-        enabled: true
-        token:
-          jwt:
-            signatures:
-              secret:
-                generator:
-                  secret: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjpbeyJ0b29sdHQiOiJodHRwczovL3Rvb2x0dC5jb20ifV0sImlhdCI6MTY4NTY4OTU1MiwiZXhwIjoyNTM3NjI1NTk5LCJhdWQiOiIiLCJpc3MiOiJzbWFsbGtvdWRhaSIsInN1YiI6IiJ9.mKw9nKRhQimdaNtMWLHT9TqIn2-iIcZR4txgy8z07xQ
-
-
 ---
 apiVersion: apps/v1
 kind: Deployment
--- a/tcs-upgrade/kafka/akhq.yaml
+++ b/tcs-upgrade/kafka/akhq.yaml
@ -5,6 +5,15 @@ metadata:
  name: akhq-config
 data:
  application.yml: |
+    micronaut:
+      security:
+        enabled: true
+        token:
+          jwt:
+            signatures:
+              secret:
+                generator:
+                  secret: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjpbeyJ0b29sdHQiOiJodHRwczovL3Rvb2x0dC5jb20ifV0sImlhdCI6MTY4NTY4OTU1MiwiZXhwIjoyNTM3NjI1NTk5LCJhdWQiOiIiLCJpc3MiOiJzbWFsbGtvdWRhaSIsInN1YiI6IiJ9.mKw9nKRhQimdaNtMWLHT9TqIn2-iIcZR4txgy8z07xQ
    akhq:
      security:
        default-group: no-roles
@ -21,19 +30,6 @@ data:
          schema-registry:
            url: "http://schemaregistry.tcs.svc.cluster.local:8081"
            type: "confluent"
-            
-    micronaut:
-      security:
-        enabled: true
-        token:
-          jwt:
-            signatures:
-              secret:
-                generator:
-                  secret: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJkYXRhIjpbeyJ0b29sdHQiOiJodHRwczovL3Rvb2x0dC5jb20ifV0sImlhdCI6MTY4NTY4OTU1MiwiZXhwIjoyNTM3NjI1NTk5LCJhdWQiOiIiLCJpc3MiOiJzbWFsbGtvdWRhaSIsInN1YiI6IiJ9.mKw9nKRhQimdaNtMWLHT9TqIn2-iIcZR4txgy8z07xQ
-
-    akhq.security:
-

 ---
 apiVersion: apps/v1