Skip to content

Commit

Permalink
Merge pull request #4 from lsdopen/feature/001-rbac
Browse files Browse the repository at this point in the history
feat: update templates to use values
  • Loading branch information
seagyn authored Apr 16, 2024
2 parents 2ba113f + eb85ed9 commit 3e92db0
Show file tree
Hide file tree
Showing 24 changed files with 172 additions and 83 deletions.
25 changes: 25 additions & 0 deletions .idea/jsonSchemas.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions charts/confluent/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 8 additions & 0 deletions charts/confluent/templates/000.ca-pair-sslcerts-secret.yaml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 0 additions & 9 deletions charts/confluent/templates/000.ca-pair-sslcerts.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions charts/confluent/templates/000.connect-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
8 changes: 0 additions & 8 deletions charts/confluent/templates/000.connect-login.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions charts/confluent/templates/000.controlcenter-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
7 changes: 0 additions & 7 deletions charts/confluent/templates/000.controlcenter-login.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions charts/confluent/templates/000.kafka-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions charts/confluent/templates/000.kafka-login.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions charts/confluent/templates/000.kafkarestclass-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
8 changes: 0 additions & 8 deletions charts/confluent/templates/000.kafkarestclass-login.yaml

This file was deleted.

11 changes: 11 additions & 0 deletions charts/confluent/templates/000.kafkarestproxy-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
7 changes: 0 additions & 7 deletions charts/confluent/templates/000.kafkarestproxy-login.yaml

This file was deleted.

13 changes: 13 additions & 0 deletions charts/confluent/templates/000.ksqldb-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 0 additions & 8 deletions charts/confluent/templates/000.ksqldb-login.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions charts/confluent/templates/000.mds-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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
7 changes: 0 additions & 7 deletions charts/confluent/templates/000.mds-login.yaml

This file was deleted.

7 changes: 7 additions & 0 deletions charts/confluent/templates/000.mds-token-secret.yaml
Original file line number Diff line number Diff line change
@@ -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
8 changes: 0 additions & 8 deletions charts/confluent/templates/000.mds-token.yaml

This file was deleted.

14 changes: 14 additions & 0 deletions charts/confluent/templates/000.schemaregistry-login-secret.yaml
Original file line number Diff line number Diff line change
@@ -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 -}}
8 changes: 0 additions & 8 deletions charts/confluent/templates/000.schemaregistry-login.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions charts/confluent/templates/010.kraftcontroller.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{- $kraftcontroller := .Values.lsdmesp.confluent.kraftcontroller -}}
{{- if $kraftcontroller.enabled -}}
apiVersion: platform.confluent.io/v1beta1
kind: KRaftController
metadata:
Expand Down Expand Up @@ -35,4 +34,3 @@ spec:
name: {{ .Values.lsdmesp.storageClass }}
tls:
autoGeneratedCerts: true
{{- end -}}
39 changes: 37 additions & 2 deletions charts/confluent/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 3e92db0

Please sign in to comment.