mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2024-12-14 11:57:51 +00:00
Merge pull request #1948 from marquiz/devel/deprecate-separate-ports
Deprecate separate metrics and health port args
This commit is contained in:
commit
61ce3b3ce3
4 changed files with 13 additions and 7 deletions
|
@ -177,8 +177,8 @@ API's you need to install the prometheus operator in your cluster.
|
||||||
| `master.*` | dict | | NFD master deployment configuration |
|
| `master.*` | dict | | NFD master deployment configuration |
|
||||||
| `master.enable` | bool | true | Specifies whether nfd-master should be deployed |
|
| `master.enable` | bool | true | Specifies whether nfd-master should be deployed |
|
||||||
| `master.hostNetwork` | bool | false | Specifies whether to enable or disable running the container in the host's network namespace |
|
| `master.hostNetwork` | bool | false | Specifies whether to enable or disable running the container in the host's network namespace |
|
||||||
| `master.metricsPort` | integer | 8081 | Port on which to expose metrics from components to prometheus operator |
|
| `master.metricsPort` | integer | 8081 | Port on which to expose metrics from components to prometheus operator. **DEPRECATED**: will be replaced by `master.port` in NFD v0.18. |
|
||||||
| `master.healthPort` | integer | 8082 | Port on which to expose the grpc health endpoint, will be also used for the probes |
|
| `master.healthPort` | integer | 8082 | Port on which to expose the grpc health endpoint, will be also used for the probes. **DEPRECATED**: will be replaced by `master.port` in NFD v0.18. |
|
||||||
| `master.instance` | string | | Instance name. Used to separate annotation namespaces for multiple parallel deployments |
|
| `master.instance` | string | | Instance name. Used to separate annotation namespaces for multiple parallel deployments |
|
||||||
| `master.resyncPeriod` | string | | NFD API controller resync period. |
|
| `master.resyncPeriod` | string | | NFD API controller resync period. |
|
||||||
| `master.extraLabelNs` | array | [] | List of allowed extra label namespaces |
|
| `master.extraLabelNs` | array | [] | List of allowed extra label namespaces |
|
||||||
|
@ -230,8 +230,8 @@ API's you need to install the prometheus operator in your cluster.
|
||||||
| `worker.*` | dict | | NFD worker daemonset configuration |
|
| `worker.*` | dict | | NFD worker daemonset configuration |
|
||||||
| `worker.enable` | bool | true | Specifies whether nfd-worker should be deployed |
|
| `worker.enable` | bool | true | Specifies whether nfd-worker should be deployed |
|
||||||
| `worker.hostNetwork` | bool | false | Specifies whether to enable or disable running the container in the host's network namespace |
|
| `worker.hostNetwork` | bool | false | Specifies whether to enable or disable running the container in the host's network namespace |
|
||||||
| `worker.metricsPort` | int | 8081 | Port on which to expose metrics from components to prometheus operator |
|
| `worker.metricsPort` | int | 8081 | Port on which to expose metrics from components to prometheus operator. **DEPRECATED**: will be replaced by `worker.port` in NFD v0.18. |
|
||||||
| `worker.healthPort` | int | 8082 | Port on which to expose the grpc health endpoint, will be also used for the probes |
|
| `worker.healthPort` | int | 8082 | Port on which to expose the grpc health endpoint, will be also used for the probes. **DEPRECATED**: will be replaced by `worker.port` in NFD v0.18. |
|
||||||
| `worker.config` | dict | | NFD worker [configuration](../reference/worker-configuration-reference) |
|
| `worker.config` | dict | | NFD worker [configuration](../reference/worker-configuration-reference) |
|
||||||
| `worker.podSecurityContext` | dict | {} | [PodSecurityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) holds pod-level security attributes and common container settins |
|
| `worker.podSecurityContext` | dict | {} | [PodSecurityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) holds pod-level security attributes and common container settins |
|
||||||
| `worker.securityContext` | dict | {} | Container [security settings](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
|
| `worker.securityContext` | dict | {} | Container [security settings](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-container) |
|
||||||
|
@ -272,8 +272,8 @@ API's you need to install the prometheus operator in your cluster.
|
||||||
| `topologyUpdater.serviceAccount.annotations` | dict | {} | Annotations to add to the service account for topology updater |
|
| `topologyUpdater.serviceAccount.annotations` | dict | {} | Annotations to add to the service account for topology updater |
|
||||||
| `topologyUpdater.serviceAccount.name` | string | | The name of the service account for topology updater to use. If not set and create is true, a name is generated using the fullname template and `-topology-updater` suffix |
|
| `topologyUpdater.serviceAccount.name` | string | | The name of the service account for topology updater to use. If not set and create is true, a name is generated using the fullname template and `-topology-updater` suffix |
|
||||||
| `topologyUpdater.rbac.create` | bool | true | Specifies whether to create [RBAC][rbac] configuration for topology updater |
|
| `topologyUpdater.rbac.create` | bool | true | Specifies whether to create [RBAC][rbac] configuration for topology updater |
|
||||||
| `topologyUpdater.metricsPort` | integer | 8081 | Port on which to expose prometheus metrics |
|
| `topologyUpdater.metricsPort` | integer | 8081 | Port on which to expose prometheus metrics. **DEPRECATED**: will be replaced by `topologyUpdater.port` in NFD v0.18. |
|
||||||
| `topologyUpdater.healthPort` | integer | 8082 | Port on which to expose the grpc health endpoint, will be also used for the probes |
|
| `topologyUpdater.healthPort` | integer | 8082 | Port on which to expose the grpc health endpoint, will be also used for the probes. **DEPRECATED**: will be replaced by `topologyUpdater.port` in NFD v0.18. |
|
||||||
| `topologyUpdater.kubeletConfigPath` | string | "" | Specifies the kubelet config host path |
|
| `topologyUpdater.kubeletConfigPath` | string | "" | Specifies the kubelet config host path |
|
||||||
| `topologyUpdater.kubeletPodResourcesSockPath` | string | "" | Specifies the kubelet sock path to read pod resources |
|
| `topologyUpdater.kubeletPodResourcesSockPath` | string | "" | Specifies the kubelet sock path to read pod resources |
|
||||||
| `topologyUpdater.updateInterval` | string | 60s | Time to sleep between CR updates. Non-positive value implies no CR update. |
|
| `topologyUpdater.updateInterval` | string | 60s | Time to sleep between CR updates. Non-positive value implies no CR update. |
|
||||||
|
@ -318,7 +318,7 @@ API's you need to install the prometheus operator in your cluster.
|
||||||
| `gc.podSecurityContext` | dict | {} | [PodSecurityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) holds pod-level security attributes and common container settings |
|
| `gc.podSecurityContext` | dict | {} | [PodSecurityContext](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-pod) holds pod-level security attributes and common container settings |
|
||||||
| `gc.resources.limits` | dict | {memory: 1Gi} | NFD Garbage Collector pod [resources limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits) |
|
| `gc.resources.limits` | dict | {memory: 1Gi} | NFD Garbage Collector pod [resources limits](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits) |
|
||||||
| `gc.resources.requests` | dict | {cpu: 10m, memory: 128Mi} | NFD Garbage Collector pod [resources requests](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits) |
|
| `gc.resources.requests` | dict | {cpu: 10m, memory: 128Mi} | NFD Garbage Collector pod [resources requests](https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/#requests-and-limits) |
|
||||||
| `gc.metricsPort` | integer | 8081 | Port on which to serve Prometheus metrics |
|
| `gc.metricsPort` | integer | 8081 | Port on which to serve Prometheus metrics. **DEPRECATED**: will be replaced by `gc.port` in NFD v0.18. |
|
||||||
| `gc.nodeSelector` | dict | {} | Garbage collector pod [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) |
|
| `gc.nodeSelector` | dict | {} | Garbage collector pod [node selector](https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector) |
|
||||||
| `gc.tolerations` | dict | {} | Garbage collector pod [node tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |
|
| `gc.tolerations` | dict | {} | Garbage collector pod [node tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) |
|
||||||
| `gc.annotations` | dict | {} | Garbage collector pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
|
| `gc.annotations` | dict | {} | Garbage collector pod [annotations](https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/) |
|
||||||
|
|
|
@ -49,6 +49,8 @@ resources from all Node objects of the cluster and exit.
|
||||||
|
|
||||||
### -metrics
|
### -metrics
|
||||||
|
|
||||||
|
**DEPRECATED**: Will be removed in NFD v0.17 and replaced by `-port`.
|
||||||
|
|
||||||
The `-metrics` flag specifies the port on which to expose
|
The `-metrics` flag specifies the port on which to expose
|
||||||
[Prometheus](https://prometheus.io/) metrics. Setting this to 0 disables the
|
[Prometheus](https://prometheus.io/) metrics. Setting this to 0 disables the
|
||||||
metrics server on nfd-master.
|
metrics server on nfd-master.
|
||||||
|
|
|
@ -74,6 +74,8 @@ nfd-topology-updater -oneshot -no-publish
|
||||||
|
|
||||||
### -metrics
|
### -metrics
|
||||||
|
|
||||||
|
**DEPRECATED**: Will be removed in NFD v0.17 and replaced by `-port`.
|
||||||
|
|
||||||
The `-metrics` flag specifies the port on which to expose
|
The `-metrics` flag specifies the port on which to expose
|
||||||
[Prometheus](https://prometheus.io/) metrics. Setting this to 0 disables the
|
[Prometheus](https://prometheus.io/) metrics. Setting this to 0 disables the
|
||||||
metrics server on nfd-topology-updater.
|
metrics server on nfd-topology-updater.
|
||||||
|
|
|
@ -128,6 +128,8 @@ nfd-worker -label-sources=kernel,system,local
|
||||||
|
|
||||||
### -metrics
|
### -metrics
|
||||||
|
|
||||||
|
**DEPRECATED**: Will be removed in NFD v0.17 and replaced by `-port`.
|
||||||
|
|
||||||
The `-metrics` flag specifies the port on which to expose
|
The `-metrics` flag specifies the port on which to expose
|
||||||
[Prometheus](https://prometheus.io/) metrics. Setting this to 0 disables the
|
[Prometheus](https://prometheus.io/) metrics. Setting this to 0 disables the
|
||||||
metrics server on nfd-worker.
|
metrics server on nfd-worker.
|
||||||
|
|
Loading…
Reference in a new issue