From e385ec8130776275a8d82bbab5687c1cd913d1c5 Mon Sep 17 00:00:00 2001 From: ychangkim Date: Tue, 2 Dec 2025 14:03:48 +0900 Subject: [PATCH] kafka-cluster --- charts/kafka-cluster/CUSTOM-README.md | 2 -- charts/kafka-cluster/custom-values.yaml | 2 -- charts/kafka-cluster/templates/kafka-connect.yaml | 6 +----- charts/kafka-cluster/templates/kafka-topics.yaml | 5 +---- charts/kafka-cluster/templates/kafka-user.yaml | 4 +--- charts/kafka-cluster/templates/kafka.yaml | 2 -- charts/kafka-cluster/values.yaml | 2 -- 7 files changed, 3 insertions(+), 20 deletions(-) diff --git a/charts/kafka-cluster/CUSTOM-README.md b/charts/kafka-cluster/CUSTOM-README.md index 76aa18f..4916e90 100644 --- a/charts/kafka-cluster/CUSTOM-README.md +++ b/charts/kafka-cluster/CUSTOM-README.md @@ -127,7 +127,6 @@ logging: | Name | 설명 | 기본값 | | ------------------------ | -------------------------- | ------------------------------ | -| `oauth.enabled` | OAuth 2.0 인증 활성화 여부 | `true` | | `oauth.keycloakUrl` | Keycloak 서버 URL | `https://keycloak.example.com` | | `oauth.keycloakRealm` | Keycloak Realm 이름 | `your-realm` | | `oauth.keycloakClientId` | Keycloak Client ID | `kafka-client` | @@ -136,7 +135,6 @@ logging: | Name | 설명 | 기본값 | | ----------------------- | ------------------------- | -------------------------- | -| `kafkaConnect.enabled` | Kafka Connect 활성화 여부 | `true` | | `kafkaConnect.image` | Kafka Connect 이미지 | `paasup/kafka-connect:0.2` | | `kafkaConnect.replicas` | Kafka Connect 워커 수 | `1` | diff --git a/charts/kafka-cluster/custom-values.yaml b/charts/kafka-cluster/custom-values.yaml index a6cdbf2..c0037e8 100644 --- a/charts/kafka-cluster/custom-values.yaml +++ b/charts/kafka-cluster/custom-values.yaml @@ -28,13 +28,11 @@ config: deleteTopicEnable: true oauth: - enabled: true keycloakUrl: "https://keycloak.example.com" keycloakRealm: "your-realm" keycloakClientId: "kafka-client" kafkaConnect: - enabled: true image: paasup/kafka-connect:0.2 replicas: 1 diff --git a/charts/kafka-cluster/templates/kafka-connect.yaml b/charts/kafka-cluster/templates/kafka-connect.yaml index 07fb932..faf8293 100644 --- a/charts/kafka-cluster/templates/kafka-connect.yaml +++ b/charts/kafka-cluster/templates/kafka-connect.yaml @@ -1,4 +1,3 @@ -{{- if .Values.kafkaConnect.enabled }} apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaConnect metadata: @@ -22,7 +21,6 @@ spec: value.converter: org.apache.kafka.connect.json.JsonConverter plugin.path: /opt/kafka/plugins topic.creation.enable: "true" - {{- if .Values.oauth.enabled }} authentication: type: oauth tokenEndpointUri: {{ .Values.oauth.keycloakUrl }}/realms/{{ .Values.oauth.keycloakRealm }}/protocol/openid-connect/token @@ -33,7 +31,6 @@ spec: tlsTrustedCertificates: - secretName: {{ .Values.oauth.tlsSecretName }} pattern: {{ .Values.oauth.tlsCertificate | quote }} - {{- end }} template: connectContainer: volumeMounts: @@ -49,5 +46,4 @@ spec: logging: type: inline loggers: - rootLogger.level: {{ .Values.logging.connect.rootLoggerLevel }} -{{- end }} \ No newline at end of file + rootLogger.level: {{ .Values.logging.connect.rootLoggerLevel }} \ No newline at end of file diff --git a/charts/kafka-cluster/templates/kafka-topics.yaml b/charts/kafka-cluster/templates/kafka-topics.yaml index ed16bdc..c5ecd4f 100644 --- a/charts/kafka-cluster/templates/kafka-topics.yaml +++ b/charts/kafka-cluster/templates/kafka-topics.yaml @@ -1,5 +1,3 @@ -{{- if .Values.kafkaConnect.enabled }} ---- apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaTopic metadata: @@ -49,5 +47,4 @@ spec: config: cleanup.policy: {{ .Values.connectTopics.config.cleanupPolicy }} retention.ms: {{ .Values.connectTopics.config.retentionMs }} - segment.bytes: {{ .Values.connectTopics.config.segmentBytes }} -{{- end }} \ No newline at end of file + segment.bytes: {{ .Values.connectTopics.config.segmentBytes }} \ No newline at end of file diff --git a/charts/kafka-cluster/templates/kafka-user.yaml b/charts/kafka-cluster/templates/kafka-user.yaml index 2790c6f..c53f2ed 100644 --- a/charts/kafka-cluster/templates/kafka-user.yaml +++ b/charts/kafka-cluster/templates/kafka-user.yaml @@ -1,4 +1,3 @@ -{{- if .Values.kafkaConnect.enabled }} apiVersion: kafka.strimzi.io/v1beta2 kind: KafkaUser metadata: @@ -27,5 +26,4 @@ spec: operations: - Read - Write - - Describe -{{- end }} \ No newline at end of file + - Describe \ No newline at end of file diff --git a/charts/kafka-cluster/templates/kafka.yaml b/charts/kafka-cluster/templates/kafka.yaml index ed7cfa6..eedf8a7 100644 --- a/charts/kafka-cluster/templates/kafka.yaml +++ b/charts/kafka-cluster/templates/kafka.yaml @@ -22,7 +22,6 @@ spec: type: cluster-ip port: {{ .Values.listener.port }} tls: {{ .Values.listener.tls }} - {{- if .Values.oauth.enabled }} authentication: type: oauth clientId: {{ .Values.oauth.keycloakClientId | quote }} @@ -41,7 +40,6 @@ spec: tlsTrustedCertificates: - secretName: {{ .Values.oauth.tlsSecretName }} certificate: {{ .Values.oauth.tlsCertificate }} - {{- end }} config: offsets.topic.replication.factor: {{ .Values.config.offsetsTopicReplicationFactor }} transaction.state.log.replication.factor: {{ .Values.config.transactionStateLogReplicationFactor }} diff --git a/charts/kafka-cluster/values.yaml b/charts/kafka-cluster/values.yaml index f51a963..da403bc 100644 --- a/charts/kafka-cluster/values.yaml +++ b/charts/kafka-cluster/values.yaml @@ -53,7 +53,6 @@ listener: # OAuth/Keycloak configuration oauth: - enabled: true keycloakUrl: "" keycloakRealm: "" keycloakClientId: "" @@ -64,7 +63,6 @@ oauth: # Kafka Connect configuration kafkaConnect: - enabled: true image: paasup/kafka-connect:0.2 replicas: 1 oauthSecretName: kafka-connect-oauth-secret