-
Notifications
You must be signed in to change notification settings - Fork 40
Part3: Make backend universal and support kcp #276
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.
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
mjudeikis
merged 2 commits into
kbind-dev:main
from
mjudeikis:mjudeikis/kcp.backend.mcr.edition
Aug 19, 2025
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,158 @@ | ||
| /* | ||
| Copyright 2022 The Kube Bind Authors. | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package backend | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net/url" | ||
| "strings" | ||
|
|
||
| apisv1alpha1 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha1" | ||
| apisv1alpha2 "github.com/kcp-dev/kcp/sdk/apis/apis/v1alpha2" | ||
| "github.com/kcp-dev/multicluster-provider/apiexport" | ||
| apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| clientgoscheme "k8s.io/client-go/kubernetes/scheme" | ||
| "k8s.io/client-go/rest" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
| "k8s.io/utils/ptr" | ||
| ctrl "sigs.k8s.io/controller-runtime" | ||
| ctrlconfig "sigs.k8s.io/controller-runtime/pkg/config" | ||
| metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server" | ||
| mcmanager "sigs.k8s.io/multicluster-runtime/pkg/manager" | ||
| "sigs.k8s.io/multicluster-runtime/pkg/multicluster" | ||
|
|
||
| kuberesources "github.com/kube-bind/kube-bind/backend/kubernetes/resources" | ||
| "github.com/kube-bind/kube-bind/backend/options" | ||
| kubebindv1alpha1 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha1" | ||
| kubebindv1alpha2 "github.com/kube-bind/kube-bind/sdk/apis/kubebind/v1alpha2" | ||
| ) | ||
|
|
||
| type Config struct { | ||
| Options *options.CompletedOptions | ||
|
|
||
| Provider multicluster.Provider | ||
| ExternalAddressGenerator kuberesources.ExternalAddreesGeneratorFunc | ||
| Manager mcmanager.Manager | ||
| Scheme *runtime.Scheme | ||
|
|
||
| ClientConfig *rest.Config | ||
| } | ||
|
|
||
| func NewConfig(options *options.CompletedOptions) (*Config, error) { | ||
| config := &Config{ | ||
| Options: options, | ||
| } | ||
|
|
||
| // create clients | ||
| rules := clientcmd.NewDefaultClientConfigLoadingRules() | ||
| rules.ExplicitPath = options.KubeConfig | ||
| var err error | ||
| config.ClientConfig, err = clientcmd.NewNonInteractiveDeferredLoadingClientConfig(rules, nil).ClientConfig() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| config.ClientConfig = rest.CopyConfig(config.ClientConfig) | ||
| config.ClientConfig = rest.AddUserAgent(config.ClientConfig, "kube-bind-backend") | ||
|
|
||
| if options.ServerURL != "" { | ||
| config.ClientConfig.Host = options.ServerURL | ||
| } | ||
|
|
||
| // Set up controller-runtime manager | ||
| scheme := runtime.NewScheme() | ||
| if err := clientgoscheme.AddToScheme(scheme); err != nil { | ||
| return nil, fmt.Errorf("error adding client-go scheme: %w", err) | ||
| } | ||
| if err := apiextensionsv1.AddToScheme(scheme); err != nil { | ||
| return nil, fmt.Errorf("error adding apiextensions scheme: %w", err) | ||
| } | ||
| if err := kubebindv1alpha1.AddToScheme(scheme); err != nil { | ||
| return nil, fmt.Errorf("error adding kubebind scheme: %w", err) | ||
| } | ||
| if err := kubebindv1alpha2.AddToScheme(scheme); err != nil { | ||
| return nil, fmt.Errorf("error adding kubebind scheme: %w", err) | ||
| } | ||
|
|
||
| config.Scheme = scheme | ||
|
|
||
| switch options.Provider { | ||
| case "kcp": | ||
| if err := apisv1alpha1.AddToScheme(scheme); err != nil { | ||
| return nil, fmt.Errorf("error adding apis scheme: %w", err) | ||
| } | ||
| if err := apisv1alpha2.AddToScheme(scheme); err != nil { | ||
| return nil, fmt.Errorf("error adding apis scheme: %w", err) | ||
| } | ||
| provider, err := apiexport.New(config.ClientConfig, apiexport.Options{ | ||
| Scheme: scheme, | ||
| }) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error setting up kcp provider: %w", err) | ||
| } | ||
|
|
||
| config.ExternalAddressGenerator = parseKCPServerURL | ||
| config.Provider = provider | ||
| default: | ||
| config.ExternalAddressGenerator = kuberesources.DefaultExternalAddreesGenerator | ||
| config.Provider = nil | ||
| } | ||
|
|
||
| opts := ctrl.Options{ | ||
| Controller: ctrlconfig.Controller{ | ||
| SkipNameValidation: ptr.To(config.Options.ExtraOptions.TestingSkipNameValidation), | ||
| }, | ||
| Metrics: metricsserver.Options{ | ||
| BindAddress: "0", | ||
| }, | ||
| Scheme: scheme, | ||
| } | ||
|
|
||
| manager, err := mcmanager.New(config.ClientConfig, config.Provider, opts) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("error setting up controller manager: %w", err) | ||
| } | ||
|
|
||
| config.Manager = manager | ||
|
|
||
| return config, nil | ||
| } | ||
|
|
||
| func parseKCPServerURL(ctx context.Context, clusterConfig *rest.Config) (string, error) { | ||
| // In kcp case, we are talking via apiexport so clientconfig will be pointing to | ||
| // https://192.168.2.166:6443/services/apiexport/2sssrgg8ivlpw0cy/kube-bind.io/clusters/2p0rtkf7b697s6mj | ||
| // We need to extract host and /clusters/... part | ||
| u, err := url.Parse(clusterConfig.Host) | ||
| if err != nil { | ||
| return "", err | ||
| } | ||
|
|
||
| // Extract cluster ID from the path | ||
| // Path format: /services/apiexport/{export-id}/kube-bind.io/clusters/{cluster-id} | ||
| pathParts := strings.Split(strings.Trim(u.Path, "/"), "/") | ||
| if len(pathParts) < 5 || pathParts[4] != "clusters" { | ||
| return "", fmt.Errorf("invalid apiexport URL format") | ||
| } | ||
|
|
||
| clusterID := pathParts[5] | ||
|
|
||
| // Construct new URL with cluster path | ||
| u.Path = "/clusters/" + clusterID | ||
|
|
||
| return u.String(), nil | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do all of these still offer a real value, now that they are one-liners?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It just gives consistency in mocking. If one of these are more complex than one-line it makes sense to have all of them same so its just consistent.
We can always refactor these out if we see need. Now - it just change for sake of change :)