mirror of
https://github.com/open-cluster-management-io/ocm.git
synced 2026-08-23 22:26:49 +00:00
Tesshu Flower
63632d11a7
* 🐛 Apply TLS profile to spoke agent serving endpoints The spoke agent binaries (klusterlet-agent, registration-agent, work-agent) receive --tls-min-version and --tls-cipher-suites flags from the klusterlet operator via deployment template rendering, but do not wire them to their own library-go GenericAPIServer serving endpoint on port 8443. Add ApplyTLSToCommand to all three spoke agent command constructors (NewKlusterletAgentCmd, NewRegistrationAgent, NewWorkAgent) so the TLS flags are consumed by the PersistentPreRunE hook and applied to the serving config. This matches the pattern already used by all hub component commands (registration-controller, placement, work, addon-manager, grpc-server). Signed-off-by: Tesshu Flower <tflower@redhat.com> * 🐛 Apply TLS profile to operator serving endpoints via ConfigMap The cluster-manager operator (hub) and klusterlet operator (spoke) serve a health/metrics endpoint on port 8443 via library-go's GenericAPIServer. Unlike the hub controllers and spoke agents they manage, these operator binaries do not receive --tls-min-version and --tls-cipher-suites flags from their deployment manifests -- no external component injects those flags into the operator pods. Instead, the operators have direct access to the ocm-tls-profile ConfigMap in their namespace at startup: - The cluster-manager operator reads it in RunClusterManagerOperator via StartTLSConfigMapWatcher and calls os.Exit(0) on changes to restart. - The klusterlet operator has a tls-profile-sync sidecar that writes the ConfigMap from the local OCP APIServer TLS profile and triggers pod restarts. Add ApplyTLSFromConfigMapToCommand to both operator commands. This installs a PersistentPreRunE hook that reads the ocm-tls-profile ConfigMap once (using an in-cluster kube client) before library-go's StartController creates the server, writes a minimal GenericOperatorConfig YAML to /tmp, and sets --config to point at it. This ensures the server's TLS config is set correctly from the first request, using the same restart-on-change mechanism already in place. The ConfigMap is optional: if not found (upstream deployments without the ACM sidecar) or if the in-cluster config is unavailable (local dev), the hook is a no-op and library-go defaults apply. Also add ApplyTLSToCommand call-site comments to the three spoke agent commands explaining the difference: agents receive TLS flags from their deployment manifests (injected by the klusterlet operator), while the operator itself reads the ConfigMap directly. Signed-off-by: Tesshu Flower <tflower@redhat.com> --------- Signed-off-by: Tesshu Flower <tflower@redhat.com>
50 lines
2.3 KiB
Go
50 lines
2.3 KiB
Go
package hub
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/spf13/cobra"
|
|
"k8s.io/utils/clock"
|
|
|
|
commonoptions "open-cluster-management.io/ocm/pkg/common/options"
|
|
"open-cluster-management.io/ocm/pkg/operator/helpers"
|
|
"open-cluster-management.io/ocm/pkg/operator/operators/clustermanager"
|
|
"open-cluster-management.io/ocm/pkg/version"
|
|
)
|
|
|
|
// NewHubOperatorCmd generate a command to start hub operator
|
|
func NewHubOperatorCmd() *cobra.Command {
|
|
opts := commonoptions.NewOptions()
|
|
cmOptions := clustermanager.Options{}
|
|
cmd := opts.
|
|
NewControllerCommandConfig("clustermanager", version.Get(), cmOptions.RunClusterManagerOperator, clock.RealClock{}).
|
|
NewCommandWithContext(context.TODO())
|
|
cmd.Use = "hub"
|
|
cmd.Short = "Start the cluster manager operator"
|
|
|
|
flags := cmd.Flags()
|
|
flags.BoolVar(&cmOptions.SkipRemoveCRDs, "skip-remove-crds", false, "Skip removing CRDs while ClusterManager is deleting.")
|
|
flags.StringVar(&cmOptions.ControlPlaneNodeLabelSelector, "control-plane-node-label-selector",
|
|
"node-role.kubernetes.io/master=", "control plane node labels, "+
|
|
"e.g. 'environment=production', 'tier notin (frontend,backend)'")
|
|
flags.Int32Var(&cmOptions.DeploymentReplicas, "deployment-replicas", 0,
|
|
"Number of deployment replicas, operator will automatically determine replicas if not set")
|
|
flags.BoolVar(&cmOptions.EnableSyncLabels, "enable-sync-labels", false,
|
|
"If set, will sync the labels of ClusterManager CR to all hub resources")
|
|
flags.StringVar(&cmOptions.ImagePullSecretName, "image-pull-secret-name", helpers.ImagePullSecret,
|
|
"The name of the image pull secret in the operator namespace to sync to hub components")
|
|
opts.AddFlags(flags)
|
|
// The cluster-manager operator does not receive --tls-min-version /
|
|
// --tls-cipher-suites flags from its deployment manifest (unlike the hub
|
|
// controllers it manages). Instead, it reads the ocm-tls-profile ConfigMap
|
|
// itself at runtime. ApplyTLSFromConfigMapToCommand installs a
|
|
// PersistentPreRunE hook that reads that ConfigMap once before
|
|
// library-go's StartController starts the health/metrics server (port 8443),
|
|
// so the server uses the cluster TLS profile from the first request.
|
|
// When the ConfigMap changes, RunClusterManagerOperator's watcher calls
|
|
// os.Exit(0), Kubernetes restarts the pod, and this hook re-reads the
|
|
// updated ConfigMap on the next startup.
|
|
opts.ApplyTLSFromConfigMapToCommand(cmd)
|
|
return cmd
|
|
}
|