Skip to content

OCPBUGS-66898: Implement mTLS authentication and authorization for CVO metrics endpoint #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DavidHurta wants to merge 17 commits into
base: main
Choose a base branch
from
Open

OCPBUGS-66898: Implement mTLS authentication and authorization for CVO metrics endpoint #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7d2ed9a
Run `go mod tidy & go mod vendor`
DavidHurta Dec 10, 2025
e879db6
pkg/cvo/metrics: Utilize dynamiccertificates package for certificate …
DavidHurta Dec 10, 2025
68f0e90
pkg/cvo/metrics: Authenticate clients using mTLS
DavidHurta Dec 11, 2025
a84fe25
install/servicemonitor: Instruct Prometheus to use mTLS instead of be…
DavidHurta Dec 10, 2025
3ade90a
pkg/cvo/metrics: Authorize using CN verification
DavidHurta Dec 11, 2025
9a1fb73
pkg/cvo/metrics_test: Test CN verification authorization handler
DavidHurta Dec 10, 2025
e3ce59c
pkg/start/start: Use directly HyperShift flag
DavidHurta Dec 12, 2025
e6d288b
pkg: Introduce options to disable granularly authn/authz for metrics
DavidHurta Dec 19, 2025
290ee8b
pkg/cvo/metrics: Authorize during TLS handshake
DavidHurta Jan 5, 2026
c46a6cf
Revert "pkg/cvo/metrics: Authorize during TLS handshake"
DavidHurta Jan 13, 2026
d4bdd70
pkg/cvo/metrics: Add auth handler description
DavidHurta Jan 13, 2026
f49bde3
pkg/cvo/metrics: Clarify shutdown requested logging
DavidHurta Jan 13, 2026
86fcd9a
pkg/cvo/metrics: Simplify code
DavidHurta Jan 13, 2026
021e46f
pkg/cvo/metrics: Fix error returned when listen address is empty
DavidHurta Jan 13, 2026
534feae
pkg/cvo/metrics: Use full name instead of abbreviation of common name
DavidHurta Jan 13, 2026
9ad1d4e
pkg/cvo/metrics: Update RunMetrics description
DavidHurta Jan 13, 2026
6b7c8db
pkg/cvo/metrics: Log certificate controller events into stdout
DavidHurta Jan 14, 2026
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 go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ require (
golang.org/x/crypto v0.42.0
golang.org/x/net v0.43.0
golang.org/x/time v0.9.0
gopkg.in/fsnotify.v1 v1.4.7
k8s.io/api v0.34.1
k8s.io/apiextensions-apiserver v0.34.1
k8s.io/apimachinery v0.34.1
k8s.io/apiserver v0.34.1
k8s.io/client-go v0.34.1
k8s.io/klog/v2 v2.130.1
k8s.io/kube-aggregator v0.34.1
Expand All @@ -39,6 +39,7 @@ require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
Expand Down Expand Up @@ -82,7 +83,6 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiserver v0.34.1 // indirect
k8s.io/component-base v0.34.1 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
sigs.k8s.io/controller-runtime v0.12.1 // indirect
Expand Down
2 changes: 0 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
Expand Down
5 changes: 3 additions & 2 deletions install/0000_90_cluster-version-operator_02_servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,14 @@ metadata:
include.release.openshift.io/self-managed-high-availability: "true"
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
interval: 30s
- interval: 30s
port: metrics
scheme: https
tlsConfig:
caFile: /etc/prometheus/configmaps/serving-certs-ca-bundle/service-ca.crt
serverName: cluster-version-operator.openshift-cluster-version.svc
certFile: /etc/prometheus/secrets/metrics-client-certs/tls.crt
keyFile: /etc/prometheus/secrets/metrics-client-certs/tls.key
namespaceSelector:
matchNames:
- openshift-cluster-version
Expand Down
Loading