Kafka chart without Bitnami

charts/druid/templates/ingestion/ingestion-config.yaml

@@ -9,7 +9,7 @@ metadata:
     heritage: {{ .Release.Service }}
 data:
   SERVICE_NAME: ingestion-server
-  KAFKA_BROKERS: kafka:9092
+  KAFKA_BROKERS: {{ .Values.kafka.brokerService }}:{{ .Values.kafka.brokerPort }}
   BROKER_PORT: "8082"
   OVERLORD_HOST: {{ .Values.coordinator.hostname }}
   OVERLORD_PORT: {{ .Values.coordinator.port | quote }}

charts/druid/values.yaml

@@ -21,20 +21,18 @@ global:
 # databasePassword: 7layer
 
 image:
-  zookeeper: zookeeper:5.0
-  broker: druid:5.0
-  coordinator: druid:5.0
-  middlemanager: druid:5.0
-  minio: minio:5.0
-  historical: druid:5.0
-  kafka: kafka:5.0
-  ingestion: ingestion-server:5.0
+  zookeeper: zookeeper:5.4
+  broker: druid:5.4
+  coordinator: druid:5.4
+  middlemanager: druid:5.4
+  minio: minio:5.4
+  historical: druid:5.4
+  ingestion: ingestion-server:5.4
 
 persistence:
   storage:
     historical: 50Gi
     minio: 40Gi
-    kafka: 10Gi
     zookeeper: 10Gi
 
 # Service Account for Druid services
@@ -178,16 +176,11 @@ ingestion:
 # nodeSelector: {}
 # affinity:
 
+# Kafka configuration (provided by parent chart when Kafka is deployed separately)
 kafka:
+  # Kafka broker service name
+  brokerService: kafka
+  # Kafka broker port
+  brokerPort: 9092
+  # Kafka replication count
   replicaCount: 1
-  image:
-    pullPolicy: IfNotPresent
-  resources:
-    requests: {}
-    # cpu: 100m
-    # memory: 750Mi
-    limits: {}
-    # cpu: 1000m
-    # memory: 1.5Gi
-# nodeSelector: {}
-# affinity:

charts/intelligence/.helmignore

@@ -0,0 +1,23 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*.orig
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/

charts/intelligence/Chart.yaml

@@ -0,0 +1,12 @@
+apiVersion: v2
+appVersion: "1.0.0"
+description: APIM Intelligence
+name: apim-intelligence
+version: 1.0.10
+type: application
+home: https://github.com/CAAPIM/apim-chart
+maintainers:
+  - name: Layer7
+sources:
+  - https://github.com/CAAPIM/apim-charts
+engine: gotpl

charts/intelligence/README.md

@@ -0,0 +1,102 @@
+# API Management Intelligence Chart
+
+This chart deploys the API Management Intelligence. APIM Intelligence is responsible for processing and aggregating policy code from the API Gateway and making it available to the Portal.
+
+## Parameters
+
+### Global parameters
+
+These values are typically provided by a parent chart.
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `global.portalRepository` | The repository for the portal images. | `caapim/` |
+| `global.pullSecret` | The name of an existing image pull secret. | `""` |
+| `global.databaseType` | The type of database to use. | `mysql` |
+| `global.databaseSecret` | The name of the secret containing the database password. | `intelligence-db-secret` |
+| `global.databaseUsername` | The username for the database. | `intelligence_user` |
+| `global.databaseHost` | The hostname of the database. | `mysql` |
+| `global.databasePort` | The port of the database. | `3306` |
+| `global.databaseUseSSL` | Whether to use SSL for the database connection. | `true` |
+| `global.databaseRequireSSL` | Whether to require SSL for the database connection. | `false` |
+| `global.legacyDatabaseNames` | Whether to use legacy database names. | `false` |
+| `global.subdomainPrefix` | The prefix for the subdomain. | `dev-portal` |
+| `global.podSecurityContext` | The security context for the pod. | `{}` |
+| `global.containerSecurityContext` | The security context for the container. | `{}` |
+| `global.schedulerName` | The name of the scheduler to use for the pods. | `""` |
+| `global.additionalLabels` | Additional labels to be applied to all resources. | `{}` |
+
+### General parameters
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `nameOverride` | A string to override the name of the chart. | `""` |
+| `fullnameOverride` | A string to override the full name of the chart. | `""` |
+| `forceRedeploy` | Whether to force redeployment of statefulsets and deployments on upgrade. | `false` |
+
+### Image settings
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `image.intelligenceServer` | The image for the intelligence-server. | `intelligence-server:latest` |
+
+### Service Account settings
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `serviceAccount.create` | Whether to create a service account. | `true` |
+| `serviceAccount.name` | The name of the service account to use. | `""` |
+| `serviceAccount.automountServiceAccountToken` | Whether to automount the service account token. | `true` |
+
+### RBAC settings
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `rbac.create` | Whether to create RBAC resources. | `true` |
+
+### Intelligence Server settings
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `intelligenceServer.replicaCount` | The number of replicas for the intelligence-server. | `1` |
+| `intelligenceServer.image.pullPolicy` | The pull policy for the intelligence-server image. | `IfNotPresent` |
+| `intelligenceServer.additionalLabels` | Additional labels for the intelligence-server deployment. | `{}` |
+| `intelligenceServer.affinity` | The affinity for the intelligence-server pods. | `{}` |
+| `intelligenceServer.nodeSelector` | The node selector for the intelligence-server pods. | `{}` |
+| `intelligenceServer.tolerations` | The tolerations for the intelligence-server pods. | `[]` |
+| `intelligenceServer.podSecurityContext` | The security context for the intelligence-server pod. | `{}` |
+| `intelligenceServer.containerSecurityContext` | The security context for the intelligence-server container. | `{}` |
+| `intelligenceServer.resources` | The resource requests and limits for the intelligence-server pods. | `{}` |
+| `intelligenceServer.service.type` | The type of service for the intelligence-server. | `ClusterIP` |
+| `intelligenceServer.service.port` | The port for the intelligence-server service. | `8282` |
+| `intelligenceServer.service.sessionAffinity` | The session affinity for the intelligence-server service. | `None` |
+| `intelligenceServer.service.externalTrafficPolicy` | The external traffic policy for the intelligence-server service. | `""` |
+| `intelligenceServer.service.internalTrafficPolicy` | The internal traffic policy for the intelligence-server service. | `""` |
+
+### Kafka settings
+
+The Intelligence Server requires a connection to a Kafka cluster. The following settings are used to configure the connection.
+
+| Parameter | Description | Default |
+| --- | --- | --- |
+| `intelligenceServer.kafka.autoDiscovery.enabled` | When enabled, an initContainer is used to discover Kafka broker external addresses. | `true` |
+| `intelligenceServer.kafka.autoDiscovery.image.repository` | The repository for the auto-discovery initContainer image. | `docker.io/bitnami/kubectl` |
+| `intelligenceServer.kafka.autoDiscovery.image.tag` | The tag for the auto-discovery initContainer image. | `1.33.3-debian-12-r0` |
+| `intelligenceServer.kafka.autoDiscovery.image.pullPolicy` | The pull policy for the auto-discovery initContainer image. | `IfNotPresent` |
+| `intelligenceServer.kafka.autoDiscovery.resources` | The resource requests and limits for the auto-discovery initContainer. | `{}` |
+| `intelligenceServer.kafka.externalAdvertisedBrokers` | A comma-separated list of external advertised Kafka brokers. | `""` |
+| `intelligenceServer.kafka.kafkaCa.caSecretName` | The name of the secret containing the Kafka CA certificate. | `""` |
+| `intelligenceServer.kafka.kafkaCa.passwordSecretName` | The name of the secret containing the password for the Kafka CA certificate. | `""` |
+| `intelligenceServer.kafka.kafkaCa.passwordSecretKey` | The key in the password secret that contains the password. | `keypass.txt` |
+
+**NOTE:** When this chart is used as a subchart, it requires Kafka configuration for its initContainer to discover brokers. The parent chart must provide these values under the `apim-intelligence.kafka` key.
+
+To avoid duplication, the parent chart's `values.yaml` can use a YAML alias:
+
+```yaml
+kafka: &kafka_config
+  #... kafka subchart values
+
+apim-intelligence:
+  kafka: *kafka_config
+```