From eb85ed9a160a95c0ffcca8a9aa3033bfdeadf240 Mon Sep 17 00:00:00 2001 From: Seagyn Davis Date: Tue, 16 Apr 2024 14:22:11 +0200 Subject: [PATCH] feat: update templates to use values --- .idea/jsonSchemas.xml | 25 ++++++++++++ charts/confluent/Chart.yaml | 4 +- .../000.ca-pair-sslcerts-secret.yaml | 8 ++++ .../templates/000.ca-pair-sslcerts.yaml | 9 ----- .../templates/000.connect-login-secret.yaml | 14 +++++++ .../templates/000.connect-login.yaml | 8 ---- .../000.controlcenter-login-secret.yaml | 11 ++++++ .../templates/000.controlcenter-login.yaml | 7 ---- .../templates/000.kafka-login-secret.yaml | 8 ++++ .../confluent/templates/000.kafka-login.yaml | 7 ---- .../000.kafkarestclass-login-secret.yaml | 14 +++++++ .../templates/000.kafkarestclass-login.yaml | 8 ---- .../000.kafkarestproxy-login-secret.yaml | 11 ++++++ .../templates/000.kafkarestproxy-login.yaml | 7 ---- .../templates/000.ksqldb-login-secret.yaml | 13 +++++++ .../confluent/templates/000.ksqldb-login.yaml | 8 ---- .../templates/000.mds-login-secret.yaml | 8 ++++ charts/confluent/templates/000.mds-login.yaml | 7 ---- .../templates/000.mds-token-secret.yaml | 7 ++++ charts/confluent/templates/000.mds-token.yaml | 8 ---- .../000.schemaregistry-login-secret.yaml | 14 +++++++ .../templates/000.schemaregistry-login.yaml | 8 ---- .../templates/010.kraftcontroller.yaml | 2 - charts/confluent/values.yaml | 39 ++++++++++++++++++- 24 files changed, 172 insertions(+), 83 deletions(-) create mode 100644 .idea/jsonSchemas.xml create mode 100644 charts/confluent/templates/000.ca-pair-sslcerts-secret.yaml delete mode 100644 charts/confluent/templates/000.ca-pair-sslcerts.yaml create mode 100644 charts/confluent/templates/000.connect-login-secret.yaml delete mode 100644 charts/confluent/templates/000.connect-login.yaml create mode 100644 charts/confluent/templates/000.controlcenter-login-secret.yaml delete mode 100644 charts/confluent/templates/000.controlcenter-login.yaml create mode 100644 charts/confluent/templates/000.kafka-login-secret.yaml delete mode 100644 charts/confluent/templates/000.kafka-login.yaml create mode 100644 charts/confluent/templates/000.kafkarestclass-login-secret.yaml delete mode 100644 charts/confluent/templates/000.kafkarestclass-login.yaml create mode 100644 charts/confluent/templates/000.kafkarestproxy-login-secret.yaml delete mode 100644 charts/confluent/templates/000.kafkarestproxy-login.yaml create mode 100644 charts/confluent/templates/000.ksqldb-login-secret.yaml delete mode 100644 charts/confluent/templates/000.ksqldb-login.yaml create mode 100644 charts/confluent/templates/000.mds-login-secret.yaml delete mode 100644 charts/confluent/templates/000.mds-login.yaml create mode 100644 charts/confluent/templates/000.mds-token-secret.yaml delete mode 100644 charts/confluent/templates/000.mds-token.yaml create mode 100644 charts/confluent/templates/000.schemaregistry-login-secret.yaml delete mode 100644 charts/confluent/templates/000.schemaregistry-login.yaml diff --git a/.idea/jsonSchemas.xml b/.idea/jsonSchemas.xml new file mode 100644 index 0000000..dce4ac3 --- /dev/null +++ b/.idea/jsonSchemas.xml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/charts/confluent/Chart.yaml b/charts/confluent/Chart.yaml index f056554..79e6cf2 100644 --- a/charts/confluent/Chart.yaml +++ b/charts/confluent/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: lsdmesp-confluent -version: "1.0.0" -appVersion: "1.0.0" +version: "0.2.0" +appVersion: "0.2.0" description: 'LSDMESP CFK: LSD Event Streaming Platform with Confluent Operator' keywords: - lsdmesp diff --git a/charts/confluent/templates/000.ca-pair-sslcerts-secret.yaml b/charts/confluent/templates/000.ca-pair-sslcerts-secret.yaml new file mode 100644 index 0000000..e7728aa --- /dev/null +++ b/charts/confluent/templates/000.ca-pair-sslcerts-secret.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +stringData: + tls.crt: "{{ .Values.lsdmesp.tls.ca.crt }}" + tls.key: "{{ .Values.lsdmesp.tls.ca.key }}" +kind: Secret +metadata: + name: ca-pair-sslcerts +type: kubernetes.io/tls diff --git a/charts/confluent/templates/000.ca-pair-sslcerts.yaml b/charts/confluent/templates/000.ca-pair-sslcerts.yaml deleted file mode 100644 index e015393..0000000 --- a/charts/confluent/templates/000.ca-pair-sslcerts.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -data: - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURzekNDQXB1Z0F3SUJBZ0lVUktmMTRJYmRGZ01qbGtVK1VoVHFVV1IzYXNnd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2FURUxNQWtHQTFVRUJoTUNWVk14Q3pBSkJnTlZCQWdNQWtOQk1SVXdFd1lEVlFRSERBeE5iM1Z1ZEdGcApibFpwWlhjeEVqQVFCZ05WQkFvTUNVTnZibVpzZFdWdWRERVJNQThHQTFVRUN3d0lUM0JsY21GMGIzSXhEekFOCkJnTlZCQU1NQmxSbGMzUkRRVEFlRncweU16RXdNRFl4TWpBeE5EWmFGdzB5TmpBM01ESXhNakF4TkRaYU1Ha3gKQ3pBSkJnTlZCQVlUQWxWVE1Rc3dDUVlEVlFRSURBSkRRVEVWTUJNR0ExVUVCd3dNVFc5MWJuUmhhVzVXYVdWMwpNUkl3RUFZRFZRUUtEQWxEYjI1bWJIVmxiblF4RVRBUEJnTlZCQXNNQ0U5d1pYSmhkRzl5TVE4d0RRWURWUVFECkRBWlVaWE4wUTBFd2dnRWlNQTBHQ1NxR1NJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUURXZi9NL0hoK3gKRGJKUzdkVEc3OWMwWStaZjhJS1k3dnlBdmVTb3FncjdJYU9PaTU2Y3JUSm1UdkpqbEtsQkFJc28wclRFQ1pvWAp2YUFqYVE2T2hVQWsvNHBKa2o0aU5VK0ZabVJpeEs2VlhvZjVGMnV1MFlVdG9ja0dtZXl5SGRWVzRHTjFKREVXCjY5a3BYcUNhd2VrRkpPQUhCT1RGejNmMmI0RFEzZjBOam5KczlackdFUVVwSGNOVE40d1BueEFKMEt5OTl2UGUKYmpzN0Rpa3JpSUVPd1J4TGcycGRsQnJ6YVZDVVpOU1A1SXpkK3BGekdRanZzTDUrR1J2QlRXdnJGL0J4SXVJRgpRcTFPZ1V6bEh5YVMrcVB2ZE1zNHJZdW9taDdFZTBlV1hkSjlTeUNlU3lybXhkMktrMUdPL1pGaFdiMVNFa3pSClY1ZUNreEQ0WnFxWEFnTUJBQUdqVXpCUk1CMEdBMVVkRGdRV0JCUjJWaFpVU3cwT3ZsRHBTQ01KcnU4ZzhPTzkKNHpBZkJnTlZIU01FR0RBV2dCUjJWaFpVU3cwT3ZsRHBTQ01KcnU4ZzhPTzk0ekFQQmdOVkhSTUJBZjhFQlRBRApBUUgvTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFCNGFFTldUTnVBVWZCUEI4d2lNd05WVi83NHZrazgyQlJBCkRaNjFzNkVoOW9LMEhibkxXZlUxcWNXTmlRTGkyS0l0TkxQczgrRkZvNDRmZWdheFYydmlDeHRJeGVyemt1TjAKWWFJSE8rdFBNTCtZc3RyTzB5azJuNC83YlNpNkk1MnVQRmJwLy9rdEpVUzFQRy9ud1lkeW1NejNNRXpOZ1E1RgphQkpwZDVzMW5adElEWnZ5MEZ6YnFpbHhXeUI3c1c4YU5NNTZCTDRMY1pQQjhMZDdKM3JEN2dHQlZCZTRIVnVxCm5WMVZsVGdCODFNc1dzMitNOTF5VlYyb3h6NFJjQzJ5ZXJJRGU0OSsyWXhJb1diZ1A0bEhDUlBhNm1teWxuN0kKVUpzNk1yaGlnbzJIbWpMcElYZVhhK09PTTk2enB4Z1hVSUxqZXQ4UEo3cTc5STFXa3FOdwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBMW4velB4NGZzUTJ5VXUzVXh1L1hOR1BtWC9DQ21PNzhnTDNrcUtvSyt5R2pqb3VlCm5LMHlaazd5WTVTcFFRQ0xLTksweEFtYUY3MmdJMmtPam9WQUpQK0tTWkkrSWpWUGhXWmtZc1N1bFY2SCtSZHIKcnRHRkxhSEpCcG5zc2gzVlZ1QmpkU1F4RnV2WktWNmdtc0hwQlNUZ0J3VGt4YzkzOW0rQTBOMzlEWTV5YlBXYQp4aEVGS1IzRFV6ZU1ENThRQ2RDc3ZmYnozbTQ3T3c0cEs0aUJEc0VjUzROcVhaUWE4MmxRbEdUVWorU00zZnFSCmN4a0k3N0MrZmhrYndVMXI2eGZ3Y1NMaUJVS3RUb0ZNNVI4bWt2cWo3M1RMT0syTHFKb2V4SHRIbGwzU2ZVc2cKbmtzcTVzWGRpcE5SanYyUllWbTlVaEpNMFZlWGdwTVErR2FxbHdJREFRQUJBb0lCQUV4Z3N4UytmVHBtVGlFSgpYc0tYbEdHclVOVElwemdkb1B1V29sME1iMnlNeGRoMERyNXJUWTd3Zlk3SDJKeTB2TmlFYnFsL1ljY2lWbXRGCmRWRjZVU1RiZVRwSlFLYWRwUHN6UW51STNVR0NyNWdhcHRWUTljTVI0S3JoRkU4NElFY1hEMU1lMS92NWJ4STAKQjZ3VGNBM00yNWlrUFhIU05qMGg1eFI0ZHlyajd3a0dQdFJZcGdTQi9hVW1hWTZwa2FOS05mc0hVK2gwTWxnaAo2Y0dLTVh5MVphd1FxOTlpeU04QmVRbHYrb0NWcDhJVGltb0RscDdaTXRBbGxmWlphSlVOSGVrc1pQSURZUEhOCnZBWWVhaG45RXVaT2hTTkFuMnQ1cEczSEF2amwvcHVpYTFHM2xXZkZ4OC9zQ3ZjRHhZZWRDS2MwZzJobVNZbkEKL2YweHdnRUNnWUVBODQycUtxb0g3S0pwM3RibUtxYnkweFF6NVd6VHh4cUlLSmd0SjJCMnJLVTFsZFk0dnFDZgpITS9MbXo3RDNUVTFaaTR3SjhJbWZQVXlmNG5EK1B2dlExai9NcTdHNWYxR3lhWWZXdml6ZTd0a1NvdkMxY3c0CnIxMTdyTGJFQzd2eUFzR1g4cklsSWg3VXFKV0U1TDVFRFlXT0tiOUVJdDNWTzY2YXJucUZOSGNDZ1lFQTRYWXYKdFBsSnFZb0puSjVUSm1DbStCbm5SaW1XSjJvSHA1dU1TK25yR0FBbjQ5SDhZMndPUkJDNDZmV2JUbWhKRkxMVApmYVBPSG16dm5ZdmtZaGR1Zm1zUmJLKzZoaTlpb0J6RXljWTN0YzdSK1NwMWlvTEZ2MG1IRHVPNllvNlZyZGJsCkNoSUhsem1PNnl6VWp3SThaN3pnQlozazlBTUdQaW9KVTFReVl1RUNnWUVBNkZTS01GcTBabnBrRGV2bjhtWUIKbTNOWk1oRUhVSll4cnEvRDJ4MDg5K0k5WktyT3hLSEtScHkrZUdCK1RPVTJCRHdwT2JRT0xRTmw0WjNVc1EzNwpKcjZkNm9ZcFBEbklyaEZuTmN1cXcyeDE5bHF1U0c2ZzRFQ0grckQ2QU11UHlDdE92SGhOemVlbEt4QStqa29sCjl0UWhVaGVmY3JjMGN0TlR3UDhsVkc4Q2dZRUExKzZvYkV4ZzkyWkVKR01pUWR4SnJjNnBTUEpsWStSUjVuMjgKVmF4NFE2bEtpeEEvQ0QyaVFDQS82WnNZSG5VVW9TVlFGc0crbERkREdvR3p2eHF2OFpXN3YzdGlTa2V4enFVZQorQnpHbUhLM2VVcm4vanVYQnNoMStKVzBtZFh6bHVYOHdMTlozOFQ1azFXQlVtSVMxa3YzeG9sZGtUSWdWWU5QCklTYS9oeUVDZ1lFQWhZd2RxSXRWSmI4T2xBNHBPQ0hyYnZ6M0w1U2JsMG1oZUZpemxjRGdObnk0OE5XbkU1K1YKK1N2eG9ZVGY2UDlhN0liL0hZTGNKS3Z4Zks0ekJaRkQrczJoNmFkZVJCSGNvbUxVdmF3eUlTUGszVnl4WFIweApSbklVUGc1bDNSUUZmMlUva2FvQ3YxT21YM293OGJiUkhwSnh6R1JmTnViNC9wOWNnWXRGczNzPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo= -kind: Secret -metadata: - creationTimestamp: null - name: ca-pair-sslcerts -type: kubernetes.io/tls diff --git a/charts/confluent/templates/000.connect-login-secret.yaml b/charts/confluent/templates/000.connect-login-secret.yaml new file mode 100644 index 0000000..ae151fe --- /dev/null +++ b/charts/confluent/templates/000.connect-login-secret.yaml @@ -0,0 +1,14 @@ +{{- $connect := .Values.lsdmesp.confluent.connect -}} +{{- if $connect.enabled -}} +apiVersion: v1 +stringData : + basic.txt: |- + username={{ $connect.username }} + password={{ $connect.password }} + bearer.txt: |- + username={{ $connect.username }} + password={{ $connect.password }} +kind: Secret +metadata: + name: connect-login +{{- end -}} diff --git a/charts/confluent/templates/000.connect-login.yaml b/charts/confluent/templates/000.connect-login.yaml deleted file mode 100644 index befb952..0000000 --- a/charts/confluent/templates/000.connect-login.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - basic.txt: dXNlcm5hbWU9Y2ZfY29ubmVjdApwYXNzd29yZD15M0FDajY5NHN3a1o= - bearer.txt: dXNlcm5hbWU9Y2ZfY29ubmVjdApwYXNzd29yZD15M0FDajY5NHN3a1o= -kind: Secret -metadata: - creationTimestamp: null - name: connect-login diff --git a/charts/confluent/templates/000.controlcenter-login-secret.yaml b/charts/confluent/templates/000.controlcenter-login-secret.yaml new file mode 100644 index 0000000..8f69f61 --- /dev/null +++ b/charts/confluent/templates/000.controlcenter-login-secret.yaml @@ -0,0 +1,11 @@ +{{- $controlcenter := .Values.lsdmesp.confluent.controlcenter -}} +{{- if $controlcenter.enabled -}} +apiVersion: v1 +stringData: + bearer.txt: |- + username={{ $controlcenter.username }} + password={{ $controlcenter.password }} +kind: Secret +metadata: + name: controlcenter-login +{{- end -}} \ No newline at end of file diff --git a/charts/confluent/templates/000.controlcenter-login.yaml b/charts/confluent/templates/000.controlcenter-login.yaml deleted file mode 100644 index eb5d5f3..0000000 --- a/charts/confluent/templates/000.controlcenter-login.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - bearer.txt: dXNlcm5hbWU9Y2ZfY29udHJvbGNlbnRlcgpwYXNzd29yZD1QcUtmdzNITURuNEM= -kind: Secret -metadata: - creationTimestamp: null - name: controlcenter-login diff --git a/charts/confluent/templates/000.kafka-login-secret.yaml b/charts/confluent/templates/000.kafka-login-secret.yaml new file mode 100644 index 0000000..bd2b3d2 --- /dev/null +++ b/charts/confluent/templates/000.kafka-login-secret.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +stringData: + bearer.txt: |- + username={{ .Values.lsdmesp.confluent.kafka.username }} + password={{ .Values.lsdmesp.confluent.kafka.password }} +kind: Secret +metadata: + name: kafka-login diff --git a/charts/confluent/templates/000.kafka-login.yaml b/charts/confluent/templates/000.kafka-login.yaml deleted file mode 100644 index 8df6cd5..0000000 --- a/charts/confluent/templates/000.kafka-login.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - bearer.txt: dXNlcm5hbWU9Y2Zfa2Fma2EKcGFzc3dvcmQ9dWlHUThpNmdIdkd0 -kind: Secret -metadata: - creationTimestamp: null - name: kafka-login diff --git a/charts/confluent/templates/000.kafkarestclass-login-secret.yaml b/charts/confluent/templates/000.kafkarestclass-login-secret.yaml new file mode 100644 index 0000000..92e3821 --- /dev/null +++ b/charts/confluent/templates/000.kafkarestclass-login-secret.yaml @@ -0,0 +1,14 @@ +{{- $kafkarestclass := .Values.lsdmesp.confluent.kafkarestclass -}} +{{- if $kafkarestclass.enabled -}} +apiVersion: v1 +stringData: + basic.txt: |- + username={{ $kafkarestclass.username }} + password={{ $kafkarestclass.password }} + bearer.txt: |- + username={{ $kafkarestclass.username }} + password={{ $kafkarestclass.password }} +kind: Secret +metadata: + name: kafkarestclass-login +{{- end -}} diff --git a/charts/confluent/templates/000.kafkarestclass-login.yaml b/charts/confluent/templates/000.kafkarestclass-login.yaml deleted file mode 100644 index 5e0abeb..0000000 --- a/charts/confluent/templates/000.kafkarestclass-login.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - basic.txt: dXNlcm5hbWU9Y2Zfa2Fma2EKcGFzc3dvcmQ9dWlHUThpNmdIdkd0 - bearer.txt: dXNlcm5hbWU9Y2Zfa2Fma2EKcGFzc3dvcmQ9dWlHUThpNmdIdkd0 -kind: Secret -metadata: - creationTimestamp: null - name: kafkarestclass-login diff --git a/charts/confluent/templates/000.kafkarestproxy-login-secret.yaml b/charts/confluent/templates/000.kafkarestproxy-login-secret.yaml new file mode 100644 index 0000000..78cef3d --- /dev/null +++ b/charts/confluent/templates/000.kafkarestproxy-login-secret.yaml @@ -0,0 +1,11 @@ +{{- $kafkarestproxy := .Values.lsdmesp.confluent.kafkarestproxy -}} +{{- if $kafkarestproxy.enabled -}} +apiVersion: v1 +stringData: + bearer.txt: |- + username={{ $kafkarestproxy.username }} + password={{ $kafkarestproxy.password }} +kind: Secret +metadata: + name: kafkarestproxy-login +{{- end -}} \ No newline at end of file diff --git a/charts/confluent/templates/000.kafkarestproxy-login.yaml b/charts/confluent/templates/000.kafkarestproxy-login.yaml deleted file mode 100644 index 3cdf37f..0000000 --- a/charts/confluent/templates/000.kafkarestproxy-login.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - bearer.txt: dXNlcm5hbWU9Y2ZfcmVzdHByb3h5CnBhc3N3b3JkPU1aR2tuUHZkTDZ5ZQ== -kind: Secret -metadata: - creationTimestamp: null - name: kafkarestproxy-login diff --git a/charts/confluent/templates/000.ksqldb-login-secret.yaml b/charts/confluent/templates/000.ksqldb-login-secret.yaml new file mode 100644 index 0000000..de7c4ff --- /dev/null +++ b/charts/confluent/templates/000.ksqldb-login-secret.yaml @@ -0,0 +1,13 @@ +{{- $ksqldb := .Values.lsdmesp.confluent.ksqldb -}} +{{- if $ksqldb.enabled -}} +apiVersion: v1 +stringData: + basic.txt: |- + username={{ $ksqldb.username }} + password={{ $ksqldb.password }} + bearer.txt: |- + username={{ $ksqldb.username }} + password={{ $ksqldb.password }} +kind: Secret +metadata: + name: ksqldb-login diff --git a/charts/confluent/templates/000.ksqldb-login.yaml b/charts/confluent/templates/000.ksqldb-login.yaml deleted file mode 100644 index a8b94c6..0000000 --- a/charts/confluent/templates/000.ksqldb-login.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - basic.txt: dXNlcm5hbWU9Y2Zfa3NxbGRiCnBhc3N3b3JkPXBGNUd3NWZkWXRQaQ== - bearer.txt: dXNlcm5hbWU9Y2Zfa3NxbGRiCnBhc3N3b3JkPXBGNUd3NWZkWXRQaQ== -kind: Secret -metadata: - creationTimestamp: null - name: ksqldb-login diff --git a/charts/confluent/templates/000.mds-login-secret.yaml b/charts/confluent/templates/000.mds-login-secret.yaml new file mode 100644 index 0000000..35b573a --- /dev/null +++ b/charts/confluent/templates/000.mds-login-secret.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +stringData: + ldap.txt: |- + username={{ .Values.lsdmesp.ldap.readOnlyUser.username }} + password={{ .Values.lsdmesp.ldap.readOnlyUser.password }} +kind: Secret +metadata: + name: mds-login diff --git a/charts/confluent/templates/000.mds-login.yaml b/charts/confluent/templates/000.mds-login.yaml deleted file mode 100644 index 1e3a4bc..0000000 --- a/charts/confluent/templates/000.mds-login.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - ldap.txt: dXNlcm5hbWU9Y249bWRzLGRjPXRlc3QsZGM9Y29tCnBhc3N3b3JkPURldmVsb3BlciE= -kind: Secret -metadata: - creationTimestamp: null - name: mds-login diff --git a/charts/confluent/templates/000.mds-token-secret.yaml b/charts/confluent/templates/000.mds-token-secret.yaml new file mode 100644 index 0000000..7c07bdd --- /dev/null +++ b/charts/confluent/templates/000.mds-token-secret.yaml @@ -0,0 +1,7 @@ +apiVersion: v1 +stringData: + mdsPublicKey.pem: "{{ .Values.lsdmesp.tls.mds.key }}" + mdsTokenKeyPair.pem: "{{ .Values.lsdmesp.tls.mds.publicKey }}" +kind: Secret +metadata: + name: mds-token diff --git a/charts/confluent/templates/000.mds-token.yaml b/charts/confluent/templates/000.mds-token.yaml deleted file mode 100644 index ae87e43..0000000 --- a/charts/confluent/templates/000.mds-token.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - mdsPublicKey.pem: LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF3TXlqblA0cWZkVEtoQ1M1c1BiVgpxaVhWeVExNXdyZVZBc0VxRXNuTUZ0Mkp0TUwxM0VMT1Eyc3pXbjU3V3p1NzgyYnlFdFlGbEYzVG9WVzNjbDRkCk9KUnphU0VRNnhlMTBSL2k3VG5lSXRFUWZwSnIvMkw0YnVidVFSR05lL0tyTE1FMGl2cjl1NElFYmJSUytsdHUKNkE5Z2d6R2NhRFN4Vi9leUtNTlBhZEhRL0FONEJaaWpBZUtaY0RUano2YkhqSjZFUTNZTmdxeW44NDZyZVFrOQpUb0habDhiR0hPaHo1Qzd5b0lmc3haZ1lIbG54NkpHc2lVWjVQMzZXR2MzOFpJQi9tNDVvOGN2NGlmVVZQVUIwCklRUTlBaFlJNVp1TXJ4RHNSUERYMkdHNkU1YlcydnFEV3lxWE9ZN2NTb0k3QWlrRmR3QVRXNFJ2N2V1RUpVeXoKTndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t - mdsTokenKeyPair.pem: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBd015am5QNHFmZFRLaENTNXNQYlZxaVhWeVExNXdyZVZBc0VxRXNuTUZ0Mkp0TUwxCjNFTE9RMnN6V241N1d6dTc4MmJ5RXRZRmxGM1RvVlczY2w0ZE9KUnphU0VRNnhlMTBSL2k3VG5lSXRFUWZwSnIKLzJMNGJ1YnVRUkdOZS9LckxNRTBpdnI5dTRJRWJiUlMrbHR1NkE5Z2d6R2NhRFN4Vi9leUtNTlBhZEhRL0FONApCWmlqQWVLWmNEVGp6NmJIako2RVEzWU5ncXluODQ2cmVRazlUb0habDhiR0hPaHo1Qzd5b0lmc3haZ1lIbG54CjZKR3NpVVo1UDM2V0djMzhaSUIvbTQ1bzhjdjRpZlVWUFVCMElRUTlBaFlJNVp1TXJ4RHNSUERYMkdHNkU1YlcKMnZxRFd5cVhPWTdjU29JN0Fpa0Zkd0FUVzRSdjdldUVKVXl6TndJREFRQUJBb0lCQVFDS3pJaFpoSTE0cTFIawprai93eTdNRTNGb3RkUHNjbUdlNVpQRHlONzhyRXZDSlp2WHpUVkVMTGtqNU5DZUFoZCtJbXF0WnJpUzBMRndvClFQcGhacW5veXM3UGQ1T2pmQjFUNFgzUVJTSEx0UEVIL2tlcncwZVJKOFdNcUtOUUFXTUVSRStjWXBkNmYxN0sKejlBUkZ2UWdNcm5MbVZLOW5ubXlGOHQyRnkyN3dxVVZCbVlYWC9tK25lLysyUzRQTzhac1BkM3dZMlk5UjhMVgp1ZmJIQytIMkV4QThuRTR6dGVmZzl6UHluMXdNaS9HTVVnMVdpQ1QzQjJ1M0Nac1dhWkp6Vkl0VDZ0N3FuQVpKClh6a2dOcElIbjltV3V3aDhreGdNZDZzeERSQU9ENWlQZDZhOWkwb0xTYVMzLzBMRGV6VUxDMFZoVFB5M0cyb1IKQTBBSmVPblJBb0dCQVBWMXV6MXBQSkF0ZW1yOHdMaUtoUU9lOGpBc3h0blN6VjhGcWQxMXFKWWduaWh3YWkrWQprNDRoT0ovMDIvNnd5cTQ5RmhNR21reUZXdjVkVURFUkdWN01jWFA2YkVmWTVjMVArUGRSVUFtNUg1bmVmMzd6Ck5SOWY3b2lmVjNqKzQ5dXkyVmZVUUNyL2grVCt5d3pBb2MwaVp5WUdhSTF3aktYUXIzKzFvNTV2QW9HQkFNa1UKQnEySWFJRHdvbUJnUUNLUWpDeS9BTmpRMzJ5TUFHSGYvbUUzMlJURnB1NVNaRUxlOXlyR1FyM3hIRnRROWFRTApWdjVQMDl3WmZiNElPZHAvM3d3SE1xRmpOak5kRzhzdzdSeU5TK3dmUUd1OHYxR2ZZc3N1QnVYaTl2MFhHWEZICldlbk5RRVVQYmliUmJvY0o5Mk9KVEpLNFAvczV2djEzMkhEUi9wdTVBb0dCQUorWThTbTQ1endIbGZWQ2FqeVQKTkhGcVE2YTNOb1FpNEkzTUxPcGx1andDOFZMeDVOa1ZwN3RlTm1jcTJtLzdtNDAzQXNkVUg3ZHBiZ1M5djRwbgp4OHN2dXdUaDZzMjhaWTdkVk0vWit1U1hqY2lLTnZQZ1JzWWpwZ0VIT2VUZU5tRi9KSHBLODM0QnIrWmhGTDB4Cjh3SmlRQmNsUzQzTGhHZThES0JKQmgzWkFvR0FONWJIdWRYS1BrdElPS2lqVW1ydnRiY2dQdENQMCt4b2RxWjgKSnRoUHRVUm5QOStiUkRscnozRjhKaEt3S2phWmtqNW9VR28xUWRYeVEwVDI2WWNNWE1Eb3FHRkxMS3dDOFF1WApvWnNXY0RLN2xvMVp2dkQzV1FCaWU4OWhSTnJMOTlzbjZsRUtBWTJnZ0M3S0JaOGx1MmpMdUl3amRBcWsyR0gzCmZra3Z3RkVDZ1lBeVhqNXo2Q09QSURKMUUxVkxySml3MVlCWGFhN1pMazVFcHczUXZDTTdoVEtTRmJ1U053c3AKRXVMbU03Zzh3TVBaQWJ6cy9SUU9hZjlJaEUveDUzZE8ySW1rNVBBUmFvRXNTRmpORDRkcFZIYUtlbTJjQm9tdAp4NXEwU3FVVnE2eHY0MjIxM2dsQlFNREo0cVFYVHJzRUJkcE55bnY3b1ZlWFh3Y2FPVFVhQnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQ== -kind: Secret -metadata: - creationTimestamp: null - name: mds-token diff --git a/charts/confluent/templates/000.schemaregistry-login-secret.yaml b/charts/confluent/templates/000.schemaregistry-login-secret.yaml new file mode 100644 index 0000000..b909b21 --- /dev/null +++ b/charts/confluent/templates/000.schemaregistry-login-secret.yaml @@ -0,0 +1,14 @@ +{{- $schemaregistryy := .Values.lsdmesp.confluent.schemaregistryy -}} +{{- if $schemaregistryy.enabled -}} +apiVersion: v1 +stringData: + basic.txt: |- + username={{ .Values.lsdmesp.confluent.schemaregistry.username }} + password={{ .Values.lsdmesp.confluent.schemaregistry.password }} + bearer.txt: |- + username={{ .Values.lsdmesp.confluent.schemaregistry.username }} + password={{ .Values.lsdmesp.confluent.schemaregistry.password }} +kind: Secret +metadata: + name: schemaregistry-login +{{- end -}} diff --git a/charts/confluent/templates/000.schemaregistry-login.yaml b/charts/confluent/templates/000.schemaregistry-login.yaml deleted file mode 100644 index 0b3a663..0000000 --- a/charts/confluent/templates/000.schemaregistry-login.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - basic.txt: dXNlcm5hbWU9Y2Zfc2NoZW1hcmVnaXN0cnkKcGFzc3dvcmQ9S3FVUDhQeURkOGdl - bearer.txt: dXNlcm5hbWU9Y2Zfc2NoZW1hcmVnaXN0cnkKcGFzc3dvcmQ9S3FVUDhQeURkOGdl -kind: Secret -metadata: - creationTimestamp: null - name: schemaregistry-login diff --git a/charts/confluent/templates/010.kraftcontroller.yaml b/charts/confluent/templates/010.kraftcontroller.yaml index 513c259..ae229c2 100644 --- a/charts/confluent/templates/010.kraftcontroller.yaml +++ b/charts/confluent/templates/010.kraftcontroller.yaml @@ -1,5 +1,4 @@ {{- $kraftcontroller := .Values.lsdmesp.confluent.kraftcontroller -}} -{{- if $kraftcontroller.enabled -}} apiVersion: platform.confluent.io/v1beta1 kind: KRaftController metadata: @@ -35,4 +34,3 @@ spec: name: {{ .Values.lsdmesp.storageClass }} tls: autoGeneratedCerts: true -{{- end -}} diff --git a/charts/confluent/values.yaml b/charts/confluent/values.yaml index dd7c096..517b4bd 100644 --- a/charts/confluent/values.yaml +++ b/charts/confluent/values.yaml @@ -6,10 +6,24 @@ lsdmesp: defaultReplicationFactor: 3 defaultMinInSyncReplicas: 2 defaultNumPartitions: 6 + + tls: + ca: + cert: "" + key: "" + mds: + key: "" + publicKey: "" + + ldap: + # if `true`, then will be provisioned + enabled: true + readOnlyUser: + username: mds + password: "" + confluent: kraftcontroller: - # if `true`, then will be provisioned - enabled: true # java memory sizes jvm: Xms: 384m @@ -30,6 +44,9 @@ lsdmesp: kafka: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_kafka + password: "" # java memory sizes jvm: Xms: 1g @@ -50,10 +67,16 @@ lsdmesp: kafkarestclass: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_kafka + password: "" schemaregistry: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_schemaregistry + password: "" # java memory sizes jvm: Xms: 384m @@ -72,6 +95,9 @@ lsdmesp: connect: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_connect + password: "" # java memory sizes jvm: Xms: 512m @@ -90,6 +116,9 @@ lsdmesp: ksqldb: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_ksqldb + password: "" # java memory sizes jvm: Xms: 512m @@ -110,6 +139,9 @@ lsdmesp: kafkarestproxy: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_restproxy + password: "" # java memory sizes jvm: Xms: 384m @@ -128,6 +160,9 @@ lsdmesp: controlcenter: # if `true`, then will be provisioned enabled: true + # credential config + username: cf_controlcenter + password: "" # java memory sizes jvm: Xms: 2g