Skip to content

WPB-24481 helm make proxy deployment optional#5161

Merged
battermann merged 9 commits intodevelopfrom
WPB-24481-helm-make-proxy-deployment-optional
Apr 2, 2026
Merged

WPB-24481 helm make proxy deployment optional#5161
battermann merged 9 commits intodevelopfrom
WPB-24481-helm-make-proxy-deployment-optional

Conversation

@battermann
Copy link
Copy Markdown
Contributor

@battermann battermann commented Mar 31, 2026

https://wearezeta.atlassian.net/browse/WPB-24481

Checklist

  • Add a new entry in an appropriate subdirectory of changelog.d
  • Read and follow the PR guidelines

@battermann battermann marked this pull request as ready for review March 31, 2026 11:35
@battermann battermann requested review from a team as code owners March 31, 2026 11:35
@zebot zebot added the ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist label Mar 31, 2026
@battermann
Copy link
Copy Markdown
Contributor Author

I have run the make diff-live-manifest target and the diff looks clean, only diffs spotted are chart version, checksum, and some null vs missing values, which are equivalent.

@battermann battermann requested a review from smatting March 31, 2026 11:57
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Makes the proxy Helm chart a first-class (and tag-controlled) dependency of the wire-server umbrella chart, so operators can enable/disable proxy via tags.proxy.

Changes:

  • Add a new charts/proxy chart and wire it into charts/wire-server/requirements.yaml under the proxy tag.
  • Update CI/integration values generation to include tags.proxy (and adjust helper scripts to account for proxy being a standalone chart again).
  • Add release notes describing the upgrade consideration around tags.proxy.

Reviewed changes

Copilot reviewed 15 out of 16 changed files in this pull request and generated 1 comment.

Show a summary per file
File Description
Makefile Fix render-ci-manifest to run the values render step and manifest render step as separate commands.
hack/helm_vars/wire-server/values.yaml.gotmpl Enable tags.proxy in CI-rendered values.
hack/bin/set-wire-server-image-version.sh Include the new proxy chart when bumping image tags in .local/charts.
charts/wire-server/templates/proxy/configmap.yaml Remove the in-umbrella proxy ConfigMap template (now owned by the proxy subchart).
charts/wire-server/requirements.yaml Add proxy as a dependency controlled by the proxy tag.
charts/proxy/Chart.yaml Introduce the new proxy chart definition.
charts/proxy/.helmignore Add Helm ignore patterns for the new chart.
charts/proxy/values.yaml Add default values for the new proxy chart.
charts/proxy/templates/deployment.yaml Create proxy Deployment using top-level values (no .Values.proxy.* nesting).
charts/proxy/templates/service.yaml Create proxy Service using top-level values.
charts/proxy/templates/secret.yaml Create proxy Secret from chart values.
charts/proxy/templates/configmap.yaml Create proxy ConfigMap using chart config values.
charts/proxy/templates/poddisruptionbudget.yaml Add PDB for proxy based on replicaCount.
charts/proxy/templates/servicemonitor.yaml Add optional ServiceMonitor controlled by metrics.serviceMonitor.enabled.
charts/proxy/templates/_helpers.tpl Add helper to conditionally include securityContext based on Kubernetes version.
changelog.d/0-release-notes/WPB-24481 Document upgrade behavior regarding tags.proxy.
Comments suppressed due to low confidence (1)

charts/proxy/templates/secret.yaml:12

  • proxy.config is rendered from .Values.secrets.proxy_config without any guard/required, but the chart's default values don't define secrets/proxy_config. This makes helm template/helm lint fail with a low-signal b64enc error when the value is omitted. Consider adding a required with a helpful message (and/or a for_helm_linting pattern like charts/nginz/templates/secret.yaml) and documenting the expected secrets.proxy_config in charts/proxy/values.yaml.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread charts/proxy/values.yaml Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Comment thread changelog.d/0-release-notes/WPB-24481 Outdated
Co-authored-by: Sven Tennie <sven.tennie@wire.com>
Comment thread Makefile Outdated
Comment thread Makefile Outdated
Copy link
Copy Markdown
Contributor

@supersven supersven left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, this should be fine as it's only re-introducing previously existing code.

I hope, we haven't forgotten anything. 🤞 (However, at least staging deployment/testing should reveal that.)

The comments I've added are probably worth considering, though.

@smatting
Copy link
Copy Markdown
Contributor

can't we leave the proxy chart part of wire-server and just make it disabled by default?

@battermann battermann merged commit d4a86c3 into develop Apr 2, 2026
9 checks passed
@battermann battermann deleted the WPB-24481-helm-make-proxy-deployment-optional branch April 2, 2026 13:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ok-to-test Approved for running tests in CI, overrides not-ok-to-test if both labels exist

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants