Merge pull request confluentinc#194 from qshao-pivotal/master

[cp-kafka-connect] Moved all possible config parameters under configurationOverrides
vivekjain123 · Dec 4, 2018 · 181a705 · 181a705
2 parents 99408a6 + d1962b6
commit 181a705
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 35 deletions.
diff --git a/charts/cp-kafka-connect/README.md b/charts/cp-kafka-connect/README.md
@@ -107,13 +107,6 @@ The configuration parameters in this section control the resources requested and
 
 | Parameter | Description | Default |
 | --------- | ----------- | ------- |
-| `connectKeyConverter` | Converter class for key Connect data. This controls the format of the data that will be written to Kafka for source connectors or read from Kafka for sink connectors. Popular formats include Avro and JSON. |`"io.confluent.connect.avro.AvroConverter"`|
-| `connectValueConverter` | Converter class for value Connect data. This controls the format of the data that will be written to Kafka for source connectors or read from Kafka for sink connectors. Popular formats include Avro and JSON. |`"io.confluent.connect.avro.AvroConverter"`|
-| `connectKeyConverterSchemaEnable` | Whether or not the converter class for key will have schema enabled.  |`false`|
-| `connectValueConverterSchemaEnable` | Whether or not the converter class for value will have schema enabled. |`false`|
-| `connectInternalKeyConverter` | Converter class for internal key Connect data that implements the Converter interface. Used for converting data like offsets and configs. |`"org.apache.kafka.connect.json.JsonConverter"`|
-| `connectInternalValueConverter` | Converter class for offset value Connect data that implements the Converter interface. Used for converting data like offsets and configs. |`"org.apache.kafka.connect.json.JsonConverter"`|
-| `pluginPath` | The comma-separated list of paths to directories that contain Kafka Connect plugins. |`"/usr/share/java"`|
 | `configurationOverrides` | Kafka Connect [configuration](https://docs.confluent.io/current/connect/references/allconfigs.html) overrides in the dictionary format. | `{}` |
 | `customEnv` | Custom enviromental variables | `{}` |
 

diff --git a/charts/cp-kafka-connect/templates/deployment.yaml b/charts/cp-kafka-connect/templates/deployment.yaml
@@ -69,8 +69,6 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: status.podIP
-            - name: CONNECT_PLUGIN_PATH
-              value: {{ .Values.pluginPath }}
             - name: CONNECT_BOOTSTRAP_SERVERS
               value: {{ template "cp-kafka-connect.kafka.bootstrapServers" . }}
             - name: CONNECT_GROUP_ID
@@ -85,18 +83,6 @@ spec:
               value: {{ template "cp-kafka-connect.cp-schema-registry.service-name" .}}
             - name: CONNECT_VALUE_CONVERTER_SCHEMA_REGISTRY_URL
               value: {{ template "cp-kafka-connect.cp-schema-registry.service-name" .}}
-            - name: CONNECT_KEY_CONVERTER
-              value: {{ .Values.connectKeyConverter }}
-            - name: CONNECT_VALUE_CONVERTER
-              value: {{ .Values.connectValueConverter }}
-            - name: CONNECT_KEY_CONVERTER_SCHEMAS_ENABLE
-              value: "{{ .Values.connectKeyConverterSchemaEnable }}"
-            - name: CONNECT_VALUE_CONVERTER_SCHEMAS_ENABLE
-              value: "{{ .Values.connectValueConverterSchemaEnable }}"
-            - name: CONNECT_INTERNAL_KEY_CONVERTER
-              value: {{ .Values.connectInternalKeyConverter }}
-            - name: CONNECT_INTERNAL_VALUE_CONVERTER
-              value: {{ .Values.connectInternalValueConverter }}
             {{- range $key, $value := .Values.configurationOverrides }}
             - name: {{ printf "CONNECT_%s" $key | replace "." "_" | upper | quote }}
               value: {{ $value | quote }}

diff --git a/charts/cp-kafka-connect/values.yaml b/charts/cp-kafka-connect/values.yaml
@@ -20,15 +20,19 @@ imagePullSecrets:
 
 servicePort: 8083
 
-## Kafka Connect Worker Configurations
+## Kafka Connect properties
 ## ref: https://docs.confluent.io/current/connect/userguide.html#configuring-workers
-connectKeyConverter: "io.confluent.connect.avro.AvroConverter"
-connectValueConverter: "io.confluent.connect.avro.AvroConverter"
-connectKeyConverterSchemaEnable: false
-connectValueConverterSchemaEnable: false
-connectInternalKeyConverter: "org.apache.kafka.connect.json.JsonConverter"
-connectInternalValueConverter: "org.apache.kafka.connect.json.JsonConverter"
-pluginPath: "/usr/share/java"
+configurationOverrides:
+  "plugin.path": "/usr/share/java"
+  "key.converter": "io.confluent.connect.avro.AvroConverter"
+  "value.converter": "io.confluent.connect.avro.AvroConverter"
+  "key.converter.schemas.enable": "false"
+  "value.converter.schemas.enable": "false"
+  "internal.key.converter": "org.apache.kafka.connect.json.JsonConverter"
+  "internal.value.converter": "org.apache.kafka.connect.json.JsonConverter"
+
+## Additional env variables
+customEnv: {}
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -79,9 +83,3 @@ kafka:
 ## e.g. gnoble-panther-cp-schema-registry:8081
 cp-schema-registry:
   url: ""
-
-## Kafka Connect properties
-configurationOverrides: {}
-
-## Additional env variables
-customEnv: {}