diff --git a/dev-upgrade/kafka/akhq.yaml b/dev-upgrade/kafka/akhq.yaml index 45edcfd..0251c73 100644 --- 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 diff --git a/qa-upgrade/kafka/akhq.yaml b/qa-upgrade/kafka/akhq.yaml index f2ac85e..a4f3b13 100644 --- 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 diff --git a/tcs-upgrade/kafka/akhq.yaml b/tcs-upgrade/kafka/akhq.yaml index ced40ea..a29c88a 100644 --- 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