Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multiple fixes related to secure clusters #1

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Multiple fixes related to secure clusters #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
345059c
Use the proper port variable when clusterSecure is enabled.
Subv Oct 11, 2020
91d6a4f
Bump chart version to 0.5.5
Subv Oct 11, 2020
c5322c5
Leave all the security configurations blank in nifi.properties by def…
Subv Oct 11, 2020
b91ed52
Set the keystore and truststore types to jks when clusterSecure is true
Subv Oct 11, 2020
39f987d
Corrected the label key for the soft antiAffinity configuration
Subv Oct 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
apiVersion: v2
name: nifi
version: 0.5.4
version: 0.5.5
appVersion: 1.12.1
description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems.
keywords:
Expand Down
4 changes: 2 additions & 2 deletions configs/nifi.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,11 +151,11 @@ nifi.sensitive.props.provider=BC
nifi.sensitive.props.additional.keys=

nifi.security.keystore=
nifi.security.keystoreType=jks
nifi.security.keystoreType=
nifi.security.keystorePasswd=
nifi.security.keyPasswd=
nifi.security.truststore=
nifi.security.truststoreType=jks
nifi.security.truststoreType=
nifi.security.truststorePasswd=
nifi.security.needClientAuth={{.Values.properties.needClientAuth}}
nifi.security.user.authorizer={{.Values.properties.authorizer}}
Expand Down
4 changes: 4 additions & 0 deletions templates/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
{{- if .Values.ingress.enabled -}}
{{- $fullName := include "apache-nifi.fullname" . -}}
{{- $ingressPath := .Values.ingress.path -}}
{{- if .Values.properties.clusterSecure -}}
{{- $ingressPort := .Values.service.httpsPort -}}
{{- else }}
{{- $ingressPort := .Values.service.httpPort -}}
{{- end }}
apiVersion: extensions/v1beta1
kind: Ingress
metadata:
Expand Down
4 changes: 3 additions & 1 deletion templates/statefulset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
podAffinityTerm:
labelSelector:
matchExpressions:
- key: "component"
- key: "app"
operator: In
values:
- {{ include "apache-nifi.name" . | quote }}
Expand Down Expand Up @@ -188,9 +188,11 @@ spec:
{{- if .Values.properties.clusterSecure }}
# Update nifi.properties for security properties
prop_replace nifi.web.https.host ${FQDN}
prop_replace nifi.security.keystoreType jks
prop_replace nifi.security.keystore ${NIFI_HOME}/config-data/certs/keystore.jks
prop_replace nifi.security.keystorePasswd $(jq -r .keyStorePassword ${NIFI_HOME}/config-data/certs/config.json)
prop_replace nifi.security.keyPasswd $(jq -r .keyPassword ${NIFI_HOME}/config-data/certs/config.json)
prop_replace nifi.security.truststoreType jks
prop_replace nifi.security.truststore ${NIFI_HOME}/config-data/certs/truststore.jks
prop_replace nifi.security.truststorePasswd $(jq -r .trustStorePassword ${NIFI_HOME}/config-data/certs/config.json)

Expand Down