Allow to customize archive storage setting

cetic · Nov 27, 2023 · cc952aa · cc952aa
1 parent a14efad
commit cc952aa
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -1,7 +1,7 @@
 ---
 apiVersion: v2
 name: nifi
-version: 1.1.5
+version: 1.1.6
 appVersion: 1.23.2
 description: Apache NiFi is a software project from the Apache Software Foundation designed to automate the flow of data between software systems.
 keywords:

diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ The following items can be set via `--set` flag during installation or configure
 #### Configure how to persist data
 
 - **Disable(default)**: The data does not survive the termination of a pod.
-- **Persistent Volume Claim**: Enable persistence so that data survives termination of the pod.  There is the choice of using one large persistent volume (using subPath) or seven separate persistent volumes for config, data, logs, repos, etc.  
+- **Persistent Volume Claim**: Enable persistence so that data survives termination of the pod.  There is the choice of using one large persistent volume (using subPath) or seven separate persistent volumes for config, data, logs, repos, etc.
   A default `StorageClass` is needed in the Kubernetes cluster to dynamically provision the volumes. Specify another StorageClass in the `persistence.storageClass` setting.
 
 #### Configure authentication
@@ -128,6 +128,8 @@ The following table lists the configurable parameters of the nifi chart and the
 | `properties.httpPort`                                                       | web properties HTTP port                                                                                           | `8080`                          |
 | `properties.httpsPort`                                                      | web properties HTTPS port                                                                                          | `null`                          |
 | `properties.clusterPort`                                                    | cluster node port                                                                                                  | `6007`                          |
+| `properties.archiveMaxRetentionPeriod`                                      | nifi content repository archive max retention period                                                               | `3 days`                           |
+| `properties.archiveMaxUsagePercentage`                                      |  nifi content repository archive max usage                                                                         | `85%`                           |
 | `properties.provenanceStorage`                                              | nifi provenance repository max storage size                                                                        | `8 GB`                          |
 | `properties.provenanceMaxStorageTime`                                       | nifi provenance repository max storage time                                                                        | `10 days`                          |
 | `properties.siteToSite.secure`                                              | Site to Site properties Secure mode                                                                                | `false`                         |
@@ -174,7 +176,7 @@ The following table lists the configurable parameters of the nifi chart and the
 | `service.processors.enabled`                                                | Enables additional port/ports to nifi service for internal processors                                              | `false`                         |
 | `service.processors.ports`                                                  | Specify "name/port/targetPort/nodePort" for processors  sockets                                                    | `[]`                            |
 | **ContainerPorts**       |                                                  |
-| `containerPorts`                                                            | Additional containerPorts for the nifi-container. Example is given in values.yaml  | `[]` 
+| `containerPorts`                                                            | Additional containerPorts for the nifi-container. Example is given in values.yaml  | `[]`
 | **Ingress**                                                                 |
 | `ingress.enabled`                                                           | Enables Ingress                                                                                                    | `false`                         |
 | `ingress.className`      | Ingress controller Class                                                                                   | `nginx`                                  |

diff --git a/configs/nifi.properties b/configs/nifi.properties
@@ -75,8 +75,8 @@ nifi.content.repository.implementation=org.apache.nifi.controller.repository.Fil
 nifi.content.claim.max.appendable.size=1 MB
 nifi.content.claim.max.flow.files=100
 nifi.content.repository.directory.default=../content_repository
-nifi.content.repository.archive.max.retention.period=3 days
-nifi.content.repository.archive.max.usage.percentage=85%
+nifi.content.repository.archive.max.retention.period={{.Values.properties.archiveMaxRetentionPeriod}}
+nifi.content.repository.archive.max.usage.percentage={{.Values.properties.archiveMaxUsagePercentage}}
 nifi.content.repository.archive.enabled=true
 nifi.content.repository.always.sync=false
 nifi.content.viewer.url=/nifi-content-viewer/

diff --git a/values.yaml b/values.yaml
@@ -95,6 +95,8 @@ properties:
   webProxyHost: # <clusterIP>:<NodePort> (If Nifi service is NodePort or LoadBalancer)
   clusterPort: 6007
   zkClientEnsembleTraker: false # https://issues.apache.org/jira/browse/NIFI-10481
+  archiveMaxRetentionPeriod: "3 days"
+  archiveMaxUsagePercentage: "85%"
   provenanceStorage: "8 GB"
   provenanceMaxStorageTime: "10 days"
   siteToSite:
@@ -150,7 +152,7 @@ auth:
     clientSecret: #<client_secret_in_oidc_provider>
     claimIdentifyingUser: email
     admin: [email protected]
-    preferredJwsAlgorithm: 
+    preferredJwsAlgorithm:
     ## Request additional scopes, for example profile
     additionalScopes:
 
@@ -211,11 +213,11 @@ service:
         port: 7002
         targetPort: 7002
         #nodePort: 30702
-## Configure containerPorts section with following attributes: name, containerport and protocol. 
+## Configure containerPorts section with following attributes: name, containerport and protocol.
 containerPorts: []
 # - name: example
 #   containerPort: 1111
-#   protocol: TCP 
+#   protocol: TCP
 
 ## Configure Ingress based on the documentation here: https://kubernetes.io/docs/concepts/services-networking/ingress/
 ##