Skip to content

✨ Add kubeconfig-host-override and kubeconfig-ca-file-override flags #6

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
merged 1 commit into from
Jan 13, 2025
Merged

✨ Add kubeconfig-host-override and kubeconfig-ca-file-override flags #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 17 additions & 4 deletions cmd/api-syncagent/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func run(ctx context.Context, log *zap.SugaredLogger, opts *Options) error {
log.Infow("Resolved APIExport", "apigroup", opts.APIExportRef, "workspace", lcPath, "logicalcluster", lcName)

// init the "permanent" platform cluster connection
platformCluster, err := setupPlatformCluster(platformRestConfig, opts.APIExportRef)
platformCluster, err := setupPlatformCluster(platformRestConfig, opts)
if err != nil {
return fmt.Errorf("failed to initialize platform cluster: %w", err)
}
Expand Down Expand Up @@ -149,8 +149,21 @@ func run(ctx context.Context, log *zap.SugaredLogger, opts *Options) error {

func setupLocalManager(ctx context.Context, opts *Options) (manager.Manager, error) {
scheme := runtime.NewScheme()
restConfig := ctrlruntime.GetConfigOrDie()

mgr, err := manager.New(ctrlruntime.GetConfigOrDie(), manager.Options{
if opts.KubeconfigHostOverride != "" {
restConfig.Host = opts.KubeconfigHostOverride
}

if opts.KubeconfigCAFileOverride != "" {
// override the caData if it exists.
if len(restConfig.TLSClientConfig.CAData) > 0 {
restConfig.TLSClientConfig.CAData = nil
}
restConfig.TLSClientConfig.CAFile = opts.KubeconfigCAFileOverride
}

mgr, err := manager.New(restConfig, manager.Options{
Scheme: scheme,
BaseContext: func() context.Context {
return ctx
Expand Down Expand Up @@ -220,7 +233,7 @@ func resolveAPIExport(ctx context.Context, restConfig *rest.Config, apiExportRef

// setupPlatformCluster sets up a plain, non-kcp-aware ctrl-runtime Cluster object
// that is solvely used to interact with the APIExport and APIResourceSchemas.
func setupPlatformCluster(restConfig *rest.Config, apiexportRef string) (cluster.Cluster, error) {
func setupPlatformCluster(restConfig *rest.Config, opts *Options) (cluster.Cluster, error) {
scheme := runtime.NewScheme()

if err := kcpdevv1alpha1.AddToScheme(scheme); err != nil {
Expand All @@ -239,7 +252,7 @@ func setupPlatformCluster(restConfig *rest.Config, apiexportRef string) (cluster
Scheme: scheme,
ByObject: map[ctrlruntimeclient.Object]cache.ByObject{
&kcpdevv1alpha1.APIExport{}: {
Field: fields.SelectorFromSet(fields.Set{"metadata.name": apiexportRef}),
Field: fields.SelectorFromSet(fields.Set{"metadata.name": opts.APIExportRef}),
},
},
}
Expand Down
5 changes: 5 additions & 0 deletions cmd/api-syncagent/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ type Options struct {
PublishedResourceSelectorString string
PublishedResourceSelector labels.Selector

KubeconfigHostOverride string
KubeconfigCAFileOverride string

LogOptions log.Options
}

Expand All @@ -80,6 +83,8 @@ func (o *Options) AddFlags(flags *pflag.FlagSet) {
flags.StringVar(&o.APIExportRef, "apiexport-ref", o.APIExportRef, "name of the APIExport in kcp that this Sync Agent is powering")
flags.StringVar(&o.PublishedResourceSelectorString, "published-resource-selector", o.PublishedResourceSelectorString, "restrict this Sync Agent to only process PublishedResources matching this label selector (optional)")
flags.BoolVar(&o.EnableLeaderElection, "enable-leader-election", o.EnableLeaderElection, "whether to perform leader election")
flags.StringVar(&o.KubeconfigHostOverride, "kubeconfig-host-override", o.KubeconfigHostOverride, "Override the host configured in the local kubeconfig")
flags.StringVar(&o.KubeconfigCAFileOverride, "kubeconfig-ca-file-override", o.KubeconfigCAFileOverride, "Override the server CA file configured in the local kubeconfig")
}

func (o *Options) Validate() error {
Expand Down
Loading