Skip to content

Commit

Permalink
Fix helm chart service account name (#471)
Browse files Browse the repository at this point in the history 
* Bump version 1.11.0

* Update helm service account management & compatibily matrix & helm app version
  • Loading branch information
@juldrixx
juldrixx authored Oct 29, 2024
1 parent 5bfc3b8 commit fd7b3bc
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 6 deletions.
2 changes: 1 addition & 1 deletion helm/nifi-cluster/Chart.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ type: application
version: 1.11.0

# This is the NiFi version to be deployed
appVersion: "1.26.0"
appVersion: "1.28.0"
2 changes: 1 addition & 1 deletion helm/nifi-cluster/README.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# nifi-cluster

![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.26.0](https://img.shields.io/badge/AppVersion-1.26.0-informational?style=flat-square)
![Version: 1.11.0](https://img.shields.io/badge/Version-1.11.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.28.0](https://img.shields.io/badge/AppVersion-1.28.0-informational?style=flat-square)

A Helm chart for deploying NiFi clusters in Kubernetes

Expand Down
11 changes: 8 additions & 3 deletions helm/nifi-cluster/templates/nifi-cluster.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ spec:
{{- if .Values.cluster.manager }}
clusterManager: {{ .Values.cluster.manager }}
{{- end }}
{{- if eq .Values.cluster.manager "kubernetes" }}
serviceAccountName: {{ include "nifi-cluster.fullname" . }}
{{- else }}
{{- if ne .Values.cluster.manager "kubernetes" }}
zkAddress: {{ .Values.cluster.zkAddress }}
zkPath: {{ .Values.cluster.zkPath }}
{{- end }}
Expand Down Expand Up @@ -174,7 +172,14 @@ spec:
namespace: {{ .Release.Namespace }}
nifiJvmMemory: {{ .Values.cluster.bootstrapProperties.nifiJvmMemory }}
nodeConfigGroups:
{{- if empty .Values.cluster.nodeConfigGroups }}
{{- if eq .Values.cluster.manager "kubernetes" }}
default-group:
serviceAccountName: {{ include "nifi-cluster.fullname" . }}
{{- end }}
{{- else }}
{{- toYaml .Values.cluster.nodeConfigGroups | nindent 4 }}
{{- end }}
nodes:
{{- toYaml .Values.cluster.nodes | nindent 4 }}
propagateLabels: {{ .Values.cluster.propagateLabels }}
Expand Down
16 changes: 16 additions & 0 deletions site/docs/4_compatibility_versions.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ Nifikop supports the following NiFi cluster features:
| NiFi 1.24 | Yes | No | Yes | Yes | Yes | Yes | Yes | No |
| NiFi 1.25 | Yes | No | Yes | Yes | Yes | Yes | Yes | No |
| NiFi 1.26 | Yes | No | Yes | Yes | Yes | Yes | Yes | No |
| NiFi 1.27 | Yes | No | Yes | Yes | Yes | Yes | Yes | No |
| NiFi 1.28 | Yes | No | Yes | Yes | Yes | Yes | Yes | No |
| NiFi 2.0.0-M1 | Yes | No | Yes | Yes | Yes | Yes | Yes | No |
| NiFi 2.0.0-M2 | Yes | No | Yes | Yes | Yes | Yes | Yes | Yes |
| NiFi 2.0.0-M3 | Yes | No | Yes | Yes | Yes | Yes | Yes | Yes |
Expand All @@ -46,6 +48,8 @@ Nifikop supports the following features for externally deployed clusters:
| NiFi 1.24 | Yes | Yes |
| NiFi 1.25 | Yes | Yes |
| NiFi 1.26 | Yes | Yes |
| NiFi 1.27 | Yes | Yes |
| NiFi 1.28 | Yes | Yes |
| NiFi 2.0.0-M1 | Yes | Yes |
| NiFi 2.0.0-M2 | Yes | Yes |
| NiFi 2.0.0-M3 | Yes | Yes |
Expand All @@ -68,6 +72,8 @@ Nifikop supports the following features for configuring users and user policies:
| NiFi 1.24 | Yes | Yes |
| NiFi 1.25 | Yes | Yes |
| NiFi 1.26 | Yes | Yes |
| NiFi 1.27 | Yes | Yes |
| NiFi 1.28 | Yes | Yes |
| NiFi 2.0.0-M1 | Yes | Yes |
| NiFi 2.0.0-M2 | Yes | Yes |
| NiFi 2.0.0-M3 | Yes | Yes |
Expand All @@ -90,6 +96,8 @@ Nifikop supports the following features for configuring user groups:
| NiFi 1.24 | Yes | Yes |
| NiFi 1.25 | Yes | Yes |
| NiFi 1.26 | Yes | Yes |
| NiFi 1.27 | Yes | Yes |
| NiFi 1.28 | Yes | Yes |
| NiFi 2.0.0-M1 | Yes | Yes |
| NiFi 2.0.0-M2 | Yes | Yes |
| NiFi 2.0.0-M3 | Yes | Yes |
Expand All @@ -112,6 +120,8 @@ Nifikop supports the following features for managing dataflows:
| NiFi 1.24 | Yes | Yes | Yes | Yes |
| NiFi 1.25 | Yes | Yes | Yes | Yes |
| NiFi 1.26 | Yes | Yes | Yes | Yes |
| NiFi 1.27 | Yes | Yes | Yes | Yes |
| NiFi 1.28 | Yes | Yes | Yes | Yes |
| NiFi 2.0.0-M1 | Yes | Yes | Yes | Yes |
| NiFi 2.0.0-M2 | Yes | Yes | Yes | Yes |
| NiFi 2.0.0-M3 | Yes | Yes | Yes | Yes |
Expand All @@ -134,6 +144,8 @@ Nifikop supports the following features for managing parameter contexts:
| NiFi 1.24 | Yes | Yes | No |
| NiFi 1.25 | Yes | Yes | No |
| NiFi 1.26 | Yes | Yes | No |
| NiFi 1.27 | Yes | Yes | No |
| NiFi 1.28 | Yes | Yes | No |
| NiFi 2.0.0-M1 | Yes | Yes | No |
| NiFi 2.0.0-M2 | Yes | Yes | No |
| NiFi 2.0.0-M3 | Yes | Yes | No |
Expand All @@ -157,6 +169,8 @@ Nifikop supports the following features for cluster auto-scaling
| NiFi 1.24 | Yes | Yes |
| NiFi 1.25 | Yes | Yes |
| NiFi 1.26 | Yes | Yes |
| NiFi 1.27 | Yes | Yes |
| NiFi 1.28 | Yes | Yes |
| NiFi 2.0.0-M1 | Yes | Yes |
| NiFi 2.0.0-M2 | Yes | Yes |
| NiFi 2.0.0-M3 | Yes | Yes |
Expand All @@ -179,6 +193,8 @@ Nifikop supports for the following features for connecting two dataflows togethe
| NiFi 1.24 | Yes | Yes | No |
| NiFi 1.25 | Yes | Yes | No |
| NiFi 1.26 | Yes | Yes | No |
| NiFi 1.27 | Yes | Yes | No |
| NiFi 1.28 | Yes | Yes | No |
| NiFi 2.0.0-M1 | Yes | Yes | No |
| NiFi 2.0.0-M2 | Yes | Yes | No |
| NiFi 2.0.0-M3 | Yes | Yes | No |
Expand Down
2 changes: 1 addition & 1 deletion site/docs/5_references/1_nifi_cluster/1_nifi_cluster.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ spec:
- internalListenerName: http
port: 8080
type: ClusterIP
clusterImage: "apache/nifi:1.26.0"
clusterImage: "apache/nifi:1.28.0"
initContainerImage: "bash:5.2.2"
oneNifiNodePerNode: true
readOnlyConfig:
Expand Down

0 comments on commit fd7b3bc

Please sign in to comment.