Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/PR.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
- create-dev-cluster
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:stackrox-test-stable

steps:
- name: Checkout
Expand All @@ -65,7 +65,7 @@ jobs:
- create-dev-cluster
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.9
image: quay.io/stackrox-io/apollo-ci:stackrox-test-stable
env:
KUBECONFIG: /github/home/artifacts/kubeconfig
INFRA_TOKEN: ${{ secrets.INFRA_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-and-push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
build-and-push-server:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4
image: quay.io/stackrox-io/apollo-ci:stackrox-test-stable

steps:
- name: Checkout
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
build-and-push-certifier:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4
image: quay.io/stackrox-io/apollo-ci:stackrox-test-stable

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
shellcheck:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4
image: quay.io/stackrox-io/apollo-ci:stackrox-test-stable
steps:
- name: Checkout
uses: actions/checkout@v7
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
unit-test:
runs-on: ubuntu-latest
container:
image: quay.io/stackrox-io/apollo-ci:stackrox-test-0.4.4
image: quay.io/stackrox-io/apollo-ci:stackrox-test-stable

steps:
- name: Checkout
Expand Down
6 changes: 4 additions & 2 deletions chart/infra-server/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,13 @@ spec:
value: "{{ .Values.testMode }}"
readinessProbe:
httpGet:
path: /
path: /healthz
port: 8443
scheme: HTTPS
initialDelaySeconds: 5
periodSeconds: 5
periodSeconds: 10
timeoutSeconds: 5
failureThreshold: 3
command:
- /infra-server
- -config-dir
Expand Down
6 changes: 6 additions & 0 deletions pkg/server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,12 @@ func (s *server) RunServer() (<-chan error, error) {
routeMux.Handle("/v1/", gwMux)
s.oidc.Handle(routeMux)

// Dedicated health endpoint for Kubernetes readiness probes.
// Bypasses authentication and redirects to prevent probe timeouts.
Comment thread
tommartensen marked this conversation as resolved.
mux.HandleFunc("/healthz", func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusOK)
})

mux.Handle("/",
wrapHealthCheck(
wrapCanonicalRedirect(
Expand Down
Loading