helm: allow overriding default config group label.

Signed-off-by: Krisztian Litkey <[email protected]>
containers · Jan 12, 2024 · 20d0eb2 · 20d0eb2
1 parent 7d8cd81
commit 20d0eb2
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 0 deletions.
diff --git a/deployment/helm/balloons/README.md b/deployment/helm/balloons/README.md
@@ -97,6 +97,7 @@ customize with their own values, along with the default values.
 | `resources.memory`       | 512Mi                                                                                                                         | memory qouta for the Pod                             |
 | `hostPort`               | 8891                                                                                                                          | metrics port to expose on the host                   |
 | `config`                 | see [helm chart values](tree:/deployment/helm/balloons/values.yaml) for the default configuration                       | plugin configuration data                            |
+| `configGroupLabel`       | config.nri/group                                                                                                        | node label for grouping configuration                |
 | `nri.patchRuntimeConfig` | false                                                                                                                         | enable NRI in containerd or CRI-O                    |
 | `nri.pluginIndex`        | 90                                                                                                                            | NRI plugin index to register with                    |
 | `initImage.name`         | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager)                        | init container image name                            |

diff --git a/deployment/helm/balloons/templates/daemonset.yaml b/deployment/helm/balloons/templates/daemonset.yaml
@@ -56,6 +56,10 @@ spec:
             - 5s
             - --nri-plugin-index
             - "{{ printf "%02d" .Values.nri.pluginIndex }}"
+            {{- if .Values.configGroupLabel }}
+            - --config-group-label
+            - {{ .Values.configGroupLabel }}
+            {{- end }}
           ports:
             - containerPort: 8891
               protocol: TCP

diff --git a/deployment/helm/balloons/values.schema.json b/deployment/helm/balloons/values.schema.json
@@ -44,6 +44,9 @@
                 }
             }
         },
+        "configGroupLabel": {
+            "type": "string"
+        },
         "resources": {
             "type": "object",
             "required": [

diff --git a/deployment/helm/balloons/values.yaml b/deployment/helm/balloons/values.yaml
@@ -31,6 +31,8 @@ config:
     reportPeriod: 60s
     samplingRatePerMillion: 0
 
+# configGroupLabel: config.nri/group
+
 plugin-test:
   enableAPIs: false
 

diff --git a/deployment/helm/template/README.md b/deployment/helm/template/README.md
@@ -97,6 +97,7 @@ customize with their own values, along with the default values.
 | `resources.memory`       | 512Mi                                                                                                                         | memory qouta for the Pod                             |
 | `hostPort`               | 8891                                                                                                                          | metrics port to expose on the host                   |
 | `config`                 | see [helm chart values](tree:/deployment/helm/template/values.yaml) for the default configuration                       | plugin configuration data                            |
+| `configGroupLabel`       | config.nri/group                                                                                                        | node label for grouping configuration                |
 | `nri.patchRuntimeConfig` | false                                                                                                                         | enable NRI in containerd or CRI-O                    |
 | `nri.pluginIndex`        | 90                                                                                                                            | NRI plugin index to register with                    |
 | `initImage.name`         | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager)                                | init container image name                            |

diff --git a/deployment/helm/template/templates/daemonset.yaml b/deployment/helm/template/templates/daemonset.yaml
@@ -49,6 +49,10 @@ spec:
             - 5s
             - --nri-plugin-index
             - "{{ printf "%02d" .Values.nri.pluginIndex }}"
+            {{- if .Values.configGroupLabel }}
+            - --config-group-label
+            - {{ .Values.configGroupLabel }}
+            {{- end }}
           ports:
             - containerPort: 8891
               protocol: TCP

diff --git a/deployment/helm/template/values.schema.json b/deployment/helm/template/values.schema.json
@@ -44,6 +44,9 @@
                 }
             }
         },
+        "configGroupLabel": {
+            "type": "string"
+        },
         "resources": {
             "type": "object",
             "required": [

diff --git a/deployment/helm/template/values.yaml b/deployment/helm/template/values.yaml
@@ -19,6 +19,8 @@ config:
     reportPeriod: 60s
     samplingRatePerMillion: 0
 
+# configGroupLabel: config.nri/group
+
 plugin-test:
     enableAPIs: false
 

diff --git a/deployment/helm/topology-aware/README.md b/deployment/helm/topology-aware/README.md
@@ -98,6 +98,7 @@ customize with their own values, along with the default values.
 | `resources.memory`       | 512Mi                                                                                                                         | memory qouta for the Pod                             |
 | `hostPort`               | 8891                                                                                                                          | metrics port to expose on the host                   |
 | `config`                 | see [helm chart values](tree:/deployment/helm/topology-aware/values.yaml) for the default configuration                       | plugin configuration data                            |
+| `configGroupLabel`       | config.nri/group                                                                                                        | node label for grouping configuration                |
 | `nri.patchRuntimeConfig` | false                                                                                                                         | enable NRI in containerd or CRI-O                    |
 | `nri.pluginIndex`        | 90                                                                                                                            | NRI plugin index to register with                    |
 | `initImage.name`         | [ghcr.io/containers/nri-plugins/config-manager](https://ghcr.io/containers/nri-plugins/config-manager)                        | init container image name                            |

diff --git a/deployment/helm/topology-aware/templates/daemonset.yaml b/deployment/helm/topology-aware/templates/daemonset.yaml
@@ -56,6 +56,10 @@ spec:
             - 5s
             - --nri-plugin-index
             - "{{ printf "%02d" .Values.nri.pluginIndex }}"
+            {{- if .Values.configGroupLabel }}
+            - --config-group-label
+            - {{ .Values.configGroupLabel }}
+            {{- end }}
           ports:
             - containerPort: 8891
               protocol: TCP

diff --git a/deployment/helm/topology-aware/values.schema.json b/deployment/helm/topology-aware/values.schema.json
@@ -44,6 +44,9 @@
                 }
             }
         },
+        "configGroupLabel": {
+            "type": "string"
+        },
         "resources": {
             "type": "object",
             "required": [

diff --git a/deployment/helm/topology-aware/values.yaml b/deployment/helm/topology-aware/values.yaml
@@ -19,6 +19,8 @@ config:
     reportPeriod: 60s
     samplingRatePerMillion: 0
 
+# configGroupLabel: config.nri/group
+
 plugin-test:
   enableAPIs: false