diff --git a/.github/workflows/PR.yaml b/.github/workflows/PR.yaml index d8cf388c7..ef0e2ab84 100644 --- a/.github/workflows/PR.yaml +++ b/.github/workflows/PR.yaml @@ -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 @@ -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 }} diff --git a/.github/workflows/build-and-push.yaml b/.github/workflows/build-and-push.yaml index 5f0103d79..00e61df30 100644 --- a/.github/workflows/build-and-push.yaml +++ b/.github/workflows/build-and-push.yaml @@ -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 @@ -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 diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 46cbab42f..982a1b852 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -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 diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml index 18d7e049b..4879c51c7 100644 --- a/.github/workflows/unit-tests.yaml +++ b/.github/workflows/unit-tests.yaml @@ -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 diff --git a/chart/infra-server/templates/deployment.yaml b/chart/infra-server/templates/deployment.yaml index 548efc08b..16c602062 100644 --- a/chart/infra-server/templates/deployment.yaml +++ b/chart/infra-server/templates/deployment.yaml @@ -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 diff --git a/pkg/server/server.go b/pkg/server/server.go index 0285f5e02..fabc0d8bb 100644 --- a/pkg/server/server.go +++ b/pkg/server/server.go @@ -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. + mux.HandleFunc("/healthz", func(w http.ResponseWriter, _ *http.Request) { + w.WriteHeader(http.StatusOK) + }) + mux.Handle("/", wrapHealthCheck( wrapCanonicalRedirect(