Skip to content

ci: merge main to release#7693

Merged
rjsparks merged 7 commits intoreleasefrom
main
Jul 15, 2024
Merged

ci: merge main to release#7693
rjsparks merged 7 commits intoreleasefrom
main

Conversation

@rjsparks
Copy link
Copy Markdown
Member

No description provided.

rjsparks and others added 7 commits July 15, 2024 12:16
…7684)

* fix: check correct state machine when clearing status change ballots

Fixes #7335

* fix: Improve ballot clearing tests

* fix: look at the right state machines for defer state for a ballot

* fix: also do the right thing with conflrev defers
* feat: nginx + robots.txt

* feat: minimal /health/ endpoint

* ci: startupProbe for datatracker pod

* ci: probe auth pod; set timeoutSeconds

* feat: add CSP and other headers to nginx

* fix: typo in nginx.conf

* feat: split auth/dt nginx confs

* test: test health endpoint

* ci: auth service on port 80

We'll remove http-old (8080) in the future.

* ci: rename auth container/nginx cfg
ci: merge main to release (#7682)
@rjsparks rjsparks merged commit 865bfb5 into release Jul 15, 2024
rjsparks added a commit that referenced this pull request Jul 15, 2024
ci: merge main to release (#7693)
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Jul 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants