Skip to content

Commit

Permalink
fix: update flagd proxy env var prefix (#440)
Browse files Browse the repository at this point in the history
Signed-off-by: James Milligan <james@omnant.co.uk>
  • Loading branch information
james-milligan authored Apr 3, 2023
1 parent 3d1540c commit b451d47
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions config/overlays/helm/manager.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,15 @@ spec:
value: "{{ .Values.sidecarConfiguration.logFormat }}"
- name: SIDECAR_PROBES_ENABLED
value: "{{ .Values.sidecarConfiguration.probesEnabled }}"
- name: KUBE_PROXY_IMAGE
- name: FLAGD_PROXY_IMAGE
value: "{{ .Values.flagdProxyConfiguration.image.repository }}"
- name: KUBE_PROXY_TAG
- name: FLAGD_PROXY_TAG
value: "{{ .Values.flagdProxyConfiguration.image.tag }}"
- name: KUBE_PROXY_PORT
- name: FLAGD_PROXY_PORT
value: "{{ .Values.flagdProxyConfiguration.port }}"
- name: KUBE_PROXY_METRICS_PORT
- name: FLAGD_PROXY_METRICS_PORT
value: "{{ .Values.flagdProxyConfiguration.metricsPort }}"
- name: KUBE_PROXY_DEBUG_LOGGING
- name: FLAGD_PROXY_DEBUG_LOGGING
value: "{{ .Values.flagdProxyConfiguration.debugLogging }}"
- name: kube-rbac-proxy
image: "{{ .Values.controllerManager.kubeRbacProxy.image.repository }}:{{ .Values.controllerManager.kubeRbacProxy.image.tag }}"
Expand Down
12 changes: 6 additions & 6 deletions controllers/core/flagsourceconfiguration/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ const (
FlagdProxyServiceName = "flagd-proxy-svc"

envVarPodNamespace = "POD_NAMESPACE"
envVarProxyImage = "KUBE_PROXY_IMAGE"
envVarProxyTag = "KUBE_PROXY_TAG"
envVarProxyPort = "KUBE_PROXY_PORT"
envVarProxyMetricsPort = "KUBE_PROXY_METRICS_PORT"
envVarProxyDebugLogging = "KUBE_PROXY_DEBUG_LOGGING"
envVarProxyImage = "FLAGD_PROXY_IMAGE"
envVarProxyTag = "FLAGD_PROXY_TAG"
envVarProxyPort = "FLAGD_PROXY_PORT"
envVarProxyMetricsPort = "FLAGD_PROXY_METRICS_PORT"
envVarProxyDebugLogging = "FLAGD_PROXY_DEBUG_LOGGING"
defaultFlagdProxyImage = "ghcr.io/open-feature/flagd-proxy"
defaultFlagdProxyTag = "v0.2.0" //KUBE_PROXY_TAG_RENOVATE
defaultFlagdProxyTag = "v0.2.0" //FLAGD_PROXY_TAG_RENOVATE
defaultFlagdProxyPort = 8015
defaultFlagdProxyMetricsPort = 8016
defaultFlagdProxyDebugLogging = false
Expand Down
10 changes: 5 additions & 5 deletions docs/kube_flagd_proxy.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ The current implementation of the `flagd-proxy` allows for a set of basic config

| Environment variable | Behavior |
| ---------------------- | -------------------------|
| KUBE_PROXY_IMAGE | Allows for the default flagd-proxy image to be overwritten |
| KUBE_PROXY_TAG | Allows for the default flagd-proxy tag to be overwritten |
| KUBE_PROXY_PORT | Allows the default port of `8015` to eb overwritten |
| KUBE_PROXY_METRICS_PORT | Allows the default metrics port of `8016` to eb overwritten |
| KUBE_PROXY_DEBUG_LOGGING | Defaults to `"false"`, allows for the `--debug` flag to be set on the `flagd-proxy` container |
| FLAGD_PROXY_IMAGE | Allows for the default flagd-proxy image to be overwritten |
| FLAGD_PROXY_TAG | Allows for the default flagd-proxy tag to be overwritten |
| FLAGD_PROXY_PORT | Allows the default port of `8015` to eb overwritten |
| FLAGD_PROXY_METRICS_PORT | Allows the default metrics port of `8016` to eb overwritten |
| FLAGD_PROXY_DEBUG_LOGGING | Defaults to `"false"`, allows for the `--debug` flag to be set on the `flagd-proxy` container |
2 changes: 1 addition & 1 deletion renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
},
{
"fileMatch": ["^controllers/core/flagsourceconfiguration/controller.go$"],
"matchStrings": ["\"(?<currentValue>.*?)\" \\/\\/KUBE_PROXY_TAG_RENOVATE"],
"matchStrings": ["\"(?<currentValue>.*?)\" \\/\\/FLAGD_PROXY_TAG_RENOVATE"],
"depNameTemplate": "open-feature/flagd",
"datasourceTemplate": "github-releases",
"extractVersionTemplate": "^flagd-proxy/(?<version>.*)$"
Expand Down

0 comments on commit b451d47

Please sign in to comment.