Skip to content

[cluster-proxy] Support setting tls profile #285

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

Merged
xuezhaojun merged 6 commits into from
Apr 25, 2026
Merged

[cluster-proxy] Support setting tls profile #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e105bcd
feat: add TLS profile support to user-server
tesshuflower Apr 21, 2026
66193f1
health probes pass tlsconfig for consistency
tesshuflower Apr 22, 2026
d1048f2
feat: add TLS profile support to service-proxy
tesshuflower Apr 22, 2026
d24461c
feat: add TLS profile support to addon-manager (proxy-server)
tesshuflower Apr 22, 2026
70a6ed8
Update ensure to propagate TLS config changes to proxy-server deployment
tesshuflower Apr 23, 2026
08142ad
address some nitpick comments
tesshuflower Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions charts/cluster-proxy/templates/manager-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ spec:
{{- if .Values.featureGates }}
- --feature-gates=ClusterProfile={{ .Values.featureGates.clusterProfile | default false}}
{{- end}}
env:
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
5 changes: 5 additions & 0 deletions charts/cluster-proxy/templates/user-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ spec:
- --server-cert=/user-tls/tls.crt
- --service-proxy-ca-cert=/proxy-ca/ca.crt
- --agent-install-namespace=open-cluster-management-agent-addon
env:
- name: POD_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
securityContext:
allowPrivilegeEscalation: false
capabilities:
Expand Down
28 changes: 26 additions & 2 deletions cmd/addon-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ import (
"open-cluster-management.io/cluster-proxy/pkg/proxyagent/agent"
"open-cluster-management.io/cluster-proxy/pkg/proxyserver/controllers"
"open-cluster-management.io/cluster-proxy/pkg/proxyserver/operator/authentication/selfsigned"
sdktls "open-cluster-management.io/sdk-go/pkg/tls"
//+kubebuilder:scaffold:imports
)

Expand Down Expand Up @@ -165,13 +166,38 @@ func main() {
os.Exit(1)
}

ctx, cancel := context.WithCancel(ctrl.SetupSignalHandler())
defer cancel()

podNamespace := os.Getenv("POD_NAMESPACE")
if len(podNamespace) == 0 {
klog.Fatalf("Pod namespace is empty, please set the ENV for POD_NAMESPACE")
}

// Using common code to watch for the TLS Profile configmap and restart.
// Note that technically this addon-manager does not serve any thing with tls directly and only
// updates the configuration in the proxyServer via the RegisterClusterManagementAddonReconciler.
// So we could alternatively add a watch there on the configmap and simply reconcile.
// This way keeps it simpler with common code, but does restart when the configmap changes
sdkTLSConfig, err := sdktls.StartTLSConfigMapWatcher(ctx, nativeClient, podNamespace, func() {
klog.Info("TLS ConfigMap changed, restarting")
os.Exit(0)
})
if err != nil {
setupLog.Error(err, "failed to start TLS ConfigMap watcher")
os.Exit(1)
}
klog.Infof("TLS config loaded: minVersion=%s, ciphersuites=%s", sdktls.VersionToString(sdkTLSConfig.MinVersion),
sdktls.CipherSuitesToString(sdkTLSConfig.CipherSuites))
Comment on lines +177 to +191
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Restart-on-change semantics rely on leader election / replica count.

os.Exit(0) on ConfigMap change is fine for a single-replica Deployment, but if replicas > 1 or leader election is enabled (--leader-elect=true per the chart), only the pod whose watcher fires will exit — other replicas may still run with stale TLS config for up to the informer resync interval. Since this addon-manager runs leader-elected and doesn't itself terminate TLS, the practical impact is low (it only influences the rendered proxy-server Deployment via the hash annotation, which each replica would recompute on its own watcher event). Worth a comment clarifying the assumption, or verifying all replicas observe the event promptly.


if err := controllers.RegisterClusterManagementAddonReconciler(
mgr,
selfSigner,
nativeClient,
nativeInformer.Core().V1().Secrets(),
imagePullPolicy,
ownerRef,
sdkTLSConfig,
); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "ClusterManagementAddonReconciler")
os.Exit(1)
Expand Down Expand Up @@ -220,8 +246,6 @@ func main() {
os.Exit(1)
}

ctx, cancel := context.WithCancel(ctrl.SetupSignalHandler())
defer cancel()
go nativeInformer.Start(ctx.Done())
go func() {
<-mgr.Elected()
Expand Down
46 changes: 23 additions & 23 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ module open-cluster-management.io/cluster-proxy
go 1.25.0

require (
github.com/onsi/ginkgo/v2 v2.22.0
github.com/onsi/gomega v1.36.1
github.com/onsi/ginkgo/v2 v2.27.2
github.com/onsi/gomega v1.38.2
github.com/openshift/library-go v0.0.0-20250711143941-47604345e7ea
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.11.1
google.golang.org/grpc v1.76.0
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Apr 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
curl -s https://api.osv.dev/v1/query -d '{"package":{"name":"google.golang.org/grpc","ecosystem":"Go"},"version":"1.76.0"}' | jq '.vulns[] | {id, summary, affected: .affected[0].ranges}'

Repository: open-cluster-management-io/cluster-proxy

Length of output: 700

🏁 Script executed:

cat -n go.mod | head -20

Repository: open-cluster-management-io/cluster-proxy

Length of output: 933

Critical: grpc v1.76.0 has a known authorization bypass vulnerability.

google.golang.org/grpc v1.76.0 is affected by GO-2026-4762 / GHSA-p77j-4mvh-x3m3 (authorization bypass via missing leading slash in :path). Bump to v1.79.3 or later.

🧰 Tools
🪛 OSV Scanner (2.3.5)

[CRITICAL] 11-11: google.golang.org/grpc 1.76.0: Authorization bypass in gRPC-Go via missing leading slash in :path in google.golang.org/grpc

(GO-2026-4762)

[CRITICAL] 11-11: google.golang.org/grpc 1.76.0: gRPC-Go has an authorization bypass via missing leading slash in :path

(GHSA-p77j-4mvh-x3m3)

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@go.mod` at line 11, The go.mod currently pins the vulnerable module
"google.golang.org/grpc v1.76.0"; update that dependency to v1.79.3 or later
(replace the version string "google.golang.org/grpc v1.76.0" with
"google.golang.org/grpc v1.79.3" or higher), run `go get
google.golang.org/grpc@v1.79.3` (or `go get ./...`) to update go.sum, then run
`go mod tidy` and your test suite to ensure no breaking changes; ensure any CI
caching or vendoring is refreshed so the updated "google.golang.org/grpc"
version is used.

k8s.io/api v0.34.2
k8s.io/apimachinery v0.34.2
k8s.io/client-go v0.34.2
k8s.io/api v0.35.2
k8s.io/apimachinery v0.35.2
k8s.io/client-go v0.35.2
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
open-cluster-management.io/addon-framework v1.2.0
open-cluster-management.io/api v1.2.0
open-cluster-management.io/sdk-go v1.2.0
open-cluster-management.io/api v1.2.1-0.20260305075857-4d5f387ec6be
open-cluster-management.io/sdk-go v1.2.1-0.20260331032456-0cc72e52e4f2
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/controller-runtime v0.23.1
)

require (
github.com/spf13/cobra v1.10.1
github.com/spf13/pflag v1.0.10
k8s.io/apiserver v0.34.2
k8s.io/component-base v0.34.2
k8s.io/apiserver v0.35.0
k8s.io/component-base v0.35.2
sigs.k8s.io/apiserver-network-proxy v0.33.0
sigs.k8s.io/cluster-inventory-api v0.0.0-20251124125836-445319b6307a
)
Expand Down Expand Up @@ -53,11 +53,10 @@ require (
github.com/go-openapi/swag v0.23.1 // indirect
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
github.com/gobwas/glob v0.2.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/huandu/xstrings v1.5.0 // indirect
Expand All @@ -73,10 +72,10 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.22.0 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.63.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/prometheus/procfs v0.16.1 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
Expand All @@ -85,9 +84,10 @@ require (
go.opentelemetry.io/otel/trace v1.37.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.27.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.46.0 // indirect
golang.org/x/mod v0.30.0 // indirect
golang.org/x/net v0.47.0 // indirect
golang.org/x/oauth2 v0.32.0 // indirect
golang.org/x/sync v0.19.0 // indirect
Expand All @@ -99,14 +99,14 @@ require (
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
google.golang.org/protobuf v1.36.10 // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
helm.sh/helm/v3 v3.19.4 // indirect
k8s.io/apiextensions-apiserver v0.34.2 // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
k8s.io/apiextensions-apiserver v0.35.0 // indirect
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.2-0.20260122202528-d9cc6641c482 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
)
Loading
Loading