Skip to content

feat/frontend: Add separate annotations and labels for the frontend-internal Service - #1022

Draft
marcleblanc2 wants to merge 2 commits into
marc/pvc-serviceaccount-labelsfrom
marc/frontend-internal-service-labels
Draft

marcleblanc2 wants to merge 2 commits into
marc/pvc-serviceaccount-labelsfrom
marc/frontend-internal-service-labels

Conversation

@marcleblanc2

@marcleblanc2 marcleblanc2 commented Nov 18, 2026 •

Copy link
Copy Markdown
Contributor

Problem

  • The sourcegraph-frontend-internal Service renders frontend.serviceAnnotations and frontend.serviceLabels, the sourcegraph-frontend Service's values
  • So load balancer annotations and service mesh labels meant for the external Service land on the internal ClusterIP Service too

Solution

  • New frontend.internalServiceAnnotations and frontend.internalServiceLabels, empty by default, are the only such values the internal Service renders
  • frontend.serviceAnnotations and frontend.serviceLabels now apply to the sourcegraph-frontend Service only

Upgrade impact

  • None with default values
  • A release that sets frontend.serviceAnnotations or frontend.serviceLabels loses them from the internal Service, in place, with no pod restart
  • Nothing in the chart or in Sourcegraph reads them there

Tested

  • New tests/frontendInternalService_test.yaml; 2 of its 3 tests fail against main's template
  • helm template with default values is byte-identical to feat/labels: Add labels to PVCs, ServiceAccounts, and RBAC objects #1008
  • With both frontend.service* values set: on main they are on the internal Service, on this branch they are not
  • helm unittest (277 tests), helm lint, helm-docs, and kubeconform -strict pass
  • Not deployed to a cluster

Amp threads

Changelog

  • Added frontend.internalServiceAnnotations and frontend.internalServiceLabels
  • The sourcegraph-frontend-internal Service no longer renders frontend.serviceAnnotations and frontend.serviceLabels

@github-actions

Copy link
Copy Markdown

marcleblanc2 and others added 2 commits November 18, 2026 14:31
…vice

The sourcegraph-frontend-internal Service has always rendered
frontend.serviceAnnotations and frontend.serviceLabels, the same values as
the sourcegraph-frontend Service. Load balancer annotations or a service
mesh label meant for the external Service therefore also landed on the
internal ClusterIP Service.

Add frontend.internalServiceAnnotations and frontend.internalServiceLabels.
Unset, the internal Service keeps getting the frontend Service's values, so
the default render and existing releases are unchanged. Set, even to {},
they replace the inherited values.

Co-authored-by: Amp <amp@ampcode.com>
Amp-Thread-ID: https://ampcode.com/threads/T-01a1902b-ece9-725c-863d-3e2bba35ee1d
…nd Service's values

The previous commit kept frontend.serviceAnnotations and
frontend.serviceLabels on the sourcegraph-frontend-internal Service unless
the new internal values were set, to leave existing releases unchanged.
Annotations and labels meant for the external Service were very likely
never wanted on the internal one, so that fallback is not worth carrying.

frontend.internalServiceAnnotations and frontend.internalServiceLabels now
default to {} and are the only values the internal Service renders.
frontend.serviceAnnotations and frontend.serviceLabels apply to the
sourcegraph-frontend Service only. The default render is unchanged.

Amp-Thread-ID: https://ampcode.com/threads/T-01a1902b-ece9-725c-863d-3e2bba35ee1d
Co-authored-by: Amp <amp@ampcode.com>
@marcleblanc2
marcleblanc2 force-pushed the marc/frontend-internal-service-labels branch from c4289c4 to 3cd2071 Compare November 18, 2026 20:32

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant