Skip to content
This repository has been archived by the owner on Jun 25, 2020. It is now read-only.

Commit

Permalink
Enable Docker and Helm support for Kafka configuration
Browse files Browse the repository at this point in the history
  • Loading branch information
kimtore committed Oct 2, 2019
1 parent 2c28a10 commit 7f30014
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ WORKDIR /app

COPY naisd .

CMD /app/naisd --fasit-url=$fasit_url --cluster-subdomain=$cluster_subdomain --clustername=$clustername --istio-enabled=$istio_enabled --authentication-enabled=$authentication_enabled --logtostderr=true
CMD /app/naisd --fasit-url=$fasit_url --cluster-subdomain=$cluster_subdomain --clustername=$clustername --istio-enabled=$istio_enabled --authentication-enabled=$authentication_enabled --logtostderr=true --kafka.tls.enabled=true --kafka.enabled=$kafka_enabled --kafka.brokers=$kafka_brokers --kafka.topic=$kafka_topic
6 changes: 6 additions & 0 deletions helm/naisd/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ spec:
value: "{{ .Values.authenticationEnabled }}"
- name: istio_enabled
value: "{{ .Values.istioEnabled }}"
- name: kafka_enabled
value: "{{ .Values.KafkaEnabled }}"
- name: kafka_brokers
value: "{{ .Values.KafkaBrokers }}"
- name: kafka_topic
value: "{{ .Values.KafkaTopic }}"
- name: NAISD_VAULT_ADDR
value: "{{ .Values.vaultAddr }}"
- name: NAISD_VAULT_INIT_CONTAINER_IMAGE
Expand Down
2 changes: 2 additions & 0 deletions helm/naisd/templates/secrets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ data:
AZURE_AD_SERVICE_PRINCIPAL_APP_ID: {{ .Values.AzureAdServicePrincipalAppId | b64enc }}
AZURE_AD_SERVICE_PRINCIPAL_PASSWORD: {{ .Values.AzureAdServicePrincipalPassword | b64enc }}
AZURE_AD_SERVICE_PRINCIPAL_TENANT: {{ .Values.AzureAdServicePrincipalTenant | b64enc }}
KAFKA_SASL_USERNAME: {{ .Values.KafkaSaslUsername | b64enc }}
KAFKA_SASL_PASSWORD: {{ .Values.KafkaSaslPassword | b64enc }}

5 changes: 5 additions & 0 deletions helm/naisd/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,9 @@ vaultInitContainerImage: navikt/vks:29
AzureAdServicePrincipalAppId: "386c9be4-a762-457e-9fd6-b48fe773f333"
AzureAdServicePrincipalPassword: ""
AzureAdServicePrincipalTenant: "62366534-1ec3-4962-8869-9b5535279d0b"
KafkaEnabled: false
KafkaBrokers: localhost:9092
KafkaTopic: deployment-events
KafkaSaslUsername: ""
KafkaSaslPassword: ""
version: 342.0.0

0 comments on commit 7f30014

Please sign in to comment.