Skip to content

Commit 80fc258

Browse files
author
Christopher Pitstick
committed
Add bindPort
Allows customization of the metrics bind port for the operator container.
1 parent 339e5c8 commit 80fc258

File tree

5 files changed

+74
-70
lines changed

5 files changed

+74
-70
lines changed

‎chart/open-feature-operator/README.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -175,5 +175,6 @@ The command removes all the Kubernetes components associated with the chart and
175175
| `controllerManager.replicas` | Sets number of replicas of the OpenFeature operator pod. | `1` |
176176
| `managerConfig.flagsValidatonEnabled` | Enables the validating webhook for FeatureFlag CR. | `true` |
177177
| `managerConfig.controllerManagerConfigYaml.health.healthProbeBindAddress` | Sets the bind address for health probes. | `:8081` |
178-
| `managerConfig.controllerManagerConfigYaml.metrics.bindAddress` | Sets the bind address for metrics. | `127.0.0.1:8080` |
178+
| `managerConfig.controllerManagerConfigYaml.metrics.bindAddress` | Sets the bind address for metrics. | `127.0.0.1` |
179+
| `managerConfig.controllerManagerConfigYaml.metrics.bindPort` | Sets the bind port for metrics. Distinct from address | `:8080` |
179180
| `managerConfig.controllerManagerConfigYaml.webhook.port` | Sets the bind address for webhook. | `9443` |

‎chart/open-feature-operator/values.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,8 @@ managerConfig:
149149
healthProbeBindAddress: :8081
150150
metrics:
151151
## @param managerConfig.controllerManagerConfigYaml.metrics.bindAddress Sets the bind address for metrics.
152-
bindAddress: 127.0.0.1:8080
152+
bindAddress: 127.0.0.1
153+
bindPort: :8080
153154
webhook:
154155
## @param managerConfig.controllerManagerConfigYaml.webhook.port Sets the bind address for webhook.
155156
port: 9443

‎config/manager/controller_manager_config.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ kind: ControllerManagerConfig
33
health:
44
healthProbeBindAddress: :8081
55
metrics:
6-
bindAddress: 127.0.0.1:8080
6+
bindAddress: 127.0.0.1
7+
bindPort: :8080
78
webhook:
89
port: 9443
910
leaderElection:

‎config/overlays/helm/controller_manager_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: ControllerManagerConfig
33
health:
44
healthProbeBindAddress: "{{ .Values.managerConfig.controllerManagerConfigYaml.health.healthProbeBindAddress }}"
55
metrics:
6-
bindAddress: "{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindAddress }}"
6+
bindAddress: "{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindAddress }}{{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}"
77
webhook:
88
port: 0{{ .Values.managerConfig.controllerManagerConfigYaml.webhook.port }}

‎config/overlays/helm/manager.yaml

+67-66
Original file line numberDiff line numberDiff line change
@@ -20,79 +20,80 @@ spec:
2020
cpu: "{{ .Values.controllerManager.manager.resources.requests.cpu }}"
2121
memory: "{{ .Values.controllerManager.manager.resources.requests.memory }}"
2222
env:
23-
- name: SIDECAR_MANAGEMENT_PORT
24-
value: "{{ .Values.sidecarConfiguration.managementPort }}"
25-
- name: SIDECAR_PORT
26-
value: "{{ .Values.sidecarConfiguration.port }}"
27-
- name: SIDECAR_SOCKET_PATH
28-
value: "{{ .Values.sidecarConfiguration.socketPath }}"
29-
- name: SIDECAR_IMAGE
30-
value: "{{ .Values.sidecarConfiguration.image.repository }}"
31-
- name: SIDECAR_TAG
32-
value: "{{ .Values.sidecarConfiguration.image.tag }}"
33-
- name: SIDECAR_PROVIDER_ARGS
34-
value: "{{ .Values.sidecarConfiguration.providerArgs }}"
35-
- name: SIDECAR_ENV_VAR_PREFIX
36-
value: "{{ .Values.sidecarConfiguration.envVarPrefix }}"
37-
- name: SIDECAR_SYNC_PROVIDER
38-
value: "{{ .Values.sidecarConfiguration.defaultSyncProvider }}"
39-
- name: SIDECAR_EVALUATOR
40-
value: "{{ .Values.sidecarConfiguration.evaluator }}"
41-
- name: SIDECAR_LOG_FORMAT
42-
value: "{{ .Values.sidecarConfiguration.logFormat }}"
43-
- name: SIDECAR_PROBES_ENABLED
44-
value: "{{ .Values.sidecarConfiguration.probesEnabled }}"
45-
- name: FLAGD_PROXY_IMAGE
46-
value: "{{ .Values.flagdProxyConfiguration.image.repository }}"
47-
- name: FLAGD_PROXY_TAG
48-
value: "{{ .Values.flagdProxyConfiguration.image.tag }}"
49-
- name: FLAGD_PROXY_PORT
50-
value: "{{ .Values.flagdProxyConfiguration.port }}"
51-
- name: FLAGD_PROXY_MANAGEMENT_PORT
52-
value: "{{ .Values.flagdProxyConfiguration.managementPort }}"
53-
- name: FLAGD_PROXY_DEBUG_LOGGING
54-
value: "{{ .Values.flagdProxyConfiguration.debugLogging }}"
55-
- name: FLAGD_IMAGE
56-
value: "{{ .Values.flagdConfiguration.image.repository }}"
57-
- name: FLAGD_TAG
58-
value: "{{ .Values.flagdConfiguration.image.tag }}"
59-
- name: FLAGD_PORT
60-
value: "{{ .Values.flagdConfiguration.port }}"
61-
- name: FLAGD_OFREP_PORT
62-
value: "{{ .Values.flagdConfiguration.ofrepPort }}"
63-
- name: FLAGD_SYNC_PORT
64-
value: "{{ .Values.flagdConfiguration.syncPort }}"
65-
- name: FLAGD_MANAGEMENT_PORT
66-
value: "{{ .Values.flagdConfiguration.managementPort }}"
67-
- name: FLAGD_DEBUG_LOGGING
68-
value: "{{ .Values.flagdConfiguration.debugLogging }}"
69-
- name: FLAGS_VALIDATION_ENABLED
70-
value: "{{ .Values.managerConfig.flagsValidatonEnabled }}"
71-
- name: IN_PROCESS_PORT
72-
value: "{{ .Values.inProcessConfiguration.port }}"
73-
- name: IN_PROCESS_HOST
74-
value: "{{ .Values.inProcessConfiguration.host }}"
75-
- name: IN_PROCESS_SOCKET_PATH
76-
value: "{{ .Values.inProcessConfiguration.socketPath }}"
77-
- name: IN_PROCESS_TLS
78-
value: "{{ .Values.inProcessConfiguration.tls }}"
79-
- name: IN_PROCESS_OFFLINE_FLAG_SOURCE_PATH
80-
value: "{{ .Values.inProcessConfiguration.offlineFlagSourcePath }}"
81-
- name: IN_PROCESS_SELECTOR
82-
value: "{{ .Values.inProcessConfiguration.selector }}"
83-
- name: IN_PROCESS_CACHE
84-
value: "{{ .Values.inProcessConfiguration.cache.type }}"
85-
- name: IN_PROCESS_ENV_VAR_PREFIX
86-
value: "{{ .Values.inProcessConfiguration.envVarPrefix }}"
87-
- name: IN_PROCESS_CACHE_MAX_SIZE
88-
value: "{{ .Values.inProcessConfiguration.cache.size }}"
23+
- name: SIDECAR_MANAGEMENT_PORT
24+
value: "{{ .Values.sidecarConfiguration.managementPort }}"
25+
- name: SIDECAR_PORT
26+
value: "{{ .Values.sidecarConfiguration.port }}"
27+
- name: SIDECAR_SOCKET_PATH
28+
value: "{{ .Values.sidecarConfiguration.socketPath }}"
29+
- name: SIDECAR_IMAGE
30+
value: "{{ .Values.sidecarConfiguration.image.repository }}"
31+
- name: SIDECAR_TAG
32+
value: "{{ .Values.sidecarConfiguration.image.tag }}"
33+
- name: SIDECAR_PROVIDER_ARGS
34+
value: "{{ .Values.sidecarConfiguration.providerArgs }}"
35+
- name: SIDECAR_ENV_VAR_PREFIX
36+
value: "{{ .Values.sidecarConfiguration.envVarPrefix }}"
37+
- name: SIDECAR_SYNC_PROVIDER
38+
value: "{{ .Values.sidecarConfiguration.defaultSyncProvider }}"
39+
- name: SIDECAR_EVALUATOR
40+
value: "{{ .Values.sidecarConfiguration.evaluator }}"
41+
- name: SIDECAR_LOG_FORMAT
42+
value: "{{ .Values.sidecarConfiguration.logFormat }}"
43+
- name: SIDECAR_PROBES_ENABLED
44+
value: "{{ .Values.sidecarConfiguration.probesEnabled }}"
45+
- name: FLAGD_PROXY_IMAGE
46+
value: "{{ .Values.flagdProxyConfiguration.image.repository }}"
47+
- name: FLAGD_PROXY_TAG
48+
value: "{{ .Values.flagdProxyConfiguration.image.tag }}"
49+
- name: FLAGD_PROXY_PORT
50+
value: "{{ .Values.flagdProxyConfiguration.port }}"
51+
- name: FLAGD_PROXY_MANAGEMENT_PORT
52+
value: "{{ .Values.flagdProxyConfiguration.managementPort }}"
53+
- name: FLAGD_PROXY_DEBUG_LOGGING
54+
value: "{{ .Values.flagdProxyConfiguration.debugLogging }}"
55+
- name: FLAGD_IMAGE
56+
value: "{{ .Values.flagdConfiguration.image.repository }}"
57+
- name: FLAGD_TAG
58+
value: "{{ .Values.flagdConfiguration.image.tag }}"
59+
- name: FLAGD_PORT
60+
value: "{{ .Values.flagdConfiguration.port }}"
61+
- name: FLAGD_OFREP_PORT
62+
value: "{{ .Values.flagdConfiguration.ofrepPort }}"
63+
- name: FLAGD_SYNC_PORT
64+
value: "{{ .Values.flagdConfiguration.syncPort }}"
65+
- name: FLAGD_MANAGEMENT_PORT
66+
value: "{{ .Values.flagdConfiguration.managementPort }}"
67+
- name: FLAGD_DEBUG_LOGGING
68+
value: "{{ .Values.flagdConfiguration.debugLogging }}"
69+
- name: FLAGS_VALIDATION_ENABLED
70+
value: "{{ .Values.managerConfig.flagsValidatonEnabled }}"
71+
- name: IN_PROCESS_PORT
72+
value: "{{ .Values.inProcessConfiguration.port }}"
73+
- name: IN_PROCESS_HOST
74+
value: "{{ .Values.inProcessConfiguration.host }}"
75+
- name: IN_PROCESS_SOCKET_PATH
76+
value: "{{ .Values.inProcessConfiguration.socketPath }}"
77+
- name: IN_PROCESS_TLS
78+
value: "{{ .Values.inProcessConfiguration.tls }}"
79+
- name: IN_PROCESS_OFFLINE_FLAG_SOURCE_PATH
80+
value: "{{ .Values.inProcessConfiguration.offlineFlagSourcePath }}"
81+
- name: IN_PROCESS_SELECTOR
82+
value: "{{ .Values.inProcessConfiguration.selector }}"
83+
- name: IN_PROCESS_CACHE
84+
value: "{{ .Values.inProcessConfiguration.cache.type }}"
85+
- name: IN_PROCESS_ENV_VAR_PREFIX
86+
value: "{{ .Values.inProcessConfiguration.envVarPrefix }}"
87+
- name: IN_PROCESS_CACHE_MAX_SIZE
88+
value: "{{ .Values.inProcessConfiguration.cache.size }}"
8989
args:
9090
- --leader-elect
9191
- --sidecar-cpu-limit={{ .Values.sidecarConfiguration.resources.limits.cpu }}
9292
- --sidecar-ram-limit={{ .Values.sidecarConfiguration.resources.limits.memory }}
9393
- --sidecar-cpu-request={{ .Values.sidecarConfiguration.resources.requests.cpu }}
9494
- --sidecar-ram-request={{ .Values.sidecarConfiguration.resources.requests.memory }}
9595
- --image-pull-secrets={{ range .Values.imagePullSecrets }}{{ .name }},{{- end }}
96+
- --metrics-bind-address={{ .Values.managerConfig.controllerManagerConfigYaml.metrics.bindPort }}
9697
- name: kube-rbac-proxy
9798
image: "{{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag }}"
9899
resources:

0 commit comments

Comments
 (0)