Skip to content

Conversation

@DaedalusG
Copy link
Contributor

Test plan: automated release PR, CI will perform additional checks

Minor fixes to the ordering of attributes in the generated template, to make them more consistent, thus easier to read

### Checklist

- [x] Follow the [manual testing
process](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/TEST.md)
- [ ] Update
[changelog](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG.md)
- [ ] Update [Kubernetes update
doc](https://docs.sourcegraph.com/admin/updates/kubernetes)

### Test plan

Tested on branch
[marc-test-helm-fixes](https://github.com/sourcegraph/deploy-sourcegraph-helm/tree/marc-test-helm-fixes)
on my EKS test instance, works great, no errors


 <br> Backport 604350a from #773

Co-authored-by: Marc <[email protected]>
see comments 

### Test plan

CI pass now
 <br> Backport b9369b8 from #787

Co-authored-by: Michael Lin <[email protected]>
Linear issue [FEIE-297: Add `priorityClassName` to remaining
pods](https://linear.app/sourcegraph/issue/FEIE-297/add-priorityclassname-to-remaining-pods)

- Customer's Kubernetes cluster policy blocks pods from starting if they do not have a priorityClassName in their config.
- We already had support for priorityClassName, but only for ~5 pods, need to add this for all remaining pods
- Added logic so that priorityClassName could be defined once, under the `sourcegraph` top level key, and / or under each pod's top-level key, which would override the config on the `sourcegraph` top level key, so the customer could configure:

```yaml
sourcegraph:
  priorityClassName: p2

pgsql:
  priorityClassName: p1
```

### Checklist

- [x] Follow the [manual testing
process](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/TEST.md)
- [ ] Update
[changelog](https://github.com/sourcegraph/deploy-sourcegraph-helm/blob/main/charts/sourcegraph/CHANGELOG.md)
- [ ] Update [Kubernetes update
doc](https://docs.sourcegraph.com/admin/updates/kubernetes)

### Test plan

- Tested with Helm template
- Followed the manual testing process
- Deployed it on my test cluster, with the following override file:

```yaml
priorityClasses:
- name: test
  value: 100
  preemptionPolicy: Never
  description: &quot;test&quot;
- name: test2
  value: 102
  preemptionPolicy: Never
  description: &quot;test2&quot;

sourcegraph:
  image:
    defaultTag: 6.10.3349
    useGlobalTagAsDefault: true
  priorityClassName: test
```

- Then re-applied, adding:

```yaml
gitserver:
  priorityClassName: test2
```

- Both worked, output:

```
[2025-12-15 03:58:52] config % kubectl get pods -o custom-columns=NAME:.metadata.name,PRIORITY_CLASS:.spec.priorityClassName,PRIORITY_VALUE:.spec.priority
NAME                                         PRIORITY_CLASS   PRIORITY_VALUE
blobstore-579cbc4cb9-2gn69                   test             100
codeinsights-db-0                            test             100
codeintel-db-0                               test             100
gitserver-0                                  test2            102
gitserver-1                                  test2            102
grafana-0                                    test             100
indexed-search-0                             test             100
pgsql-0                                      test             100
precise-code-intel-worker-5b6bd8d898-9zrbg   test             100
prometheus-65468d765d-j4rgw                  test             100
redis-cache-595c746f84-2wxtf                 test             100
redis-store-5f4b87dbf4-8n24m                 test             100
searcher-0                                   test             100
sourcegraph-frontend-677d647479-77zrl        test             100
syntect-server-657b89b6f4-p59x6              test             100
worker-6d68db5b5c-twxkk                      test             100
``` 

<br> Backport a49fce2 from #778

Co-authored-by: Marc <[email protected]>
{"version":"v6.11.2752","inputs":"server=6.11.2752","type":"patch"}
@sourcegraph-buildkite
Copy link

  • 🟢 Internal release is ready for promotion!
  • ⚠️ Do not close/merge the pull request or delete the associated branch if you intend to promote it.

@sourcegraph-buildkite
Copy link

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.

4 participants