Skip to content
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

support reservation #62

Merged
merged 5 commits into from
Oct 22, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
  •  
  •  
  •  
6 changes: 6 additions & 0 deletions cmd/binder/app/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,5 +68,11 @@ type CompletedConfig struct {

func (c *Config) Complete() CompletedConfig {
cc := completedConfig{c}
if c.InsecureServing != nil {
c.InsecureServing.Name = "healthz"
}
if c.InsecureMetricsServing != nil {
c.InsecureMetricsServing.Name = "metrics"
}
return CompletedConfig{&cc}
}
4 changes: 4 additions & 0 deletions cmd/binder/app/options/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ func (o *Options) Flags() (nfs cliflag.NamedFlagSets) {

fs.StringVar(o.BinderConfig.SchedulerName, "scheduler-name", *o.BinderConfig.SchedulerName, "components will deal with pods that pod.Spec.SchedulerName is equal to scheduler-name / is default-scheduler or empty.")
fs.Int64Var(&o.BinderConfig.VolumeBindingTimeoutSeconds, "volume-binding-timeout-seconds", o.BinderConfig.VolumeBindingTimeoutSeconds, "timeout for binding pod volumes")
fs.Int64Var(&o.BinderConfig.ReservationTimeOutSeconds, "reservation-ttl", o.BinderConfig.ReservationTimeOutSeconds, "how long resources will be reserved (for resource reservation).")

o.CombinedInsecureServing.AddFlags(nfs.FlagSet("insecure serving"))
o.BinderConfig.Tracer.AddFlags(nfs.FlagSet("tracer"))
Expand Down Expand Up @@ -211,6 +212,9 @@ func (o *Options) ApplyTo(c *binderappconfig.Config) error {
if *o.BinderConfig.Tracer.IDCName != binderconfig.DefaultIDC {
toUse.Tracer.IDCName = o.BinderConfig.Tracer.IDCName
}
if o.BinderConfig.ReservationTimeOutSeconds != binderconfig.DefaultReservationTimeOutSeconds {
toUse.ReservationTimeOutSeconds = o.BinderConfig.ReservationTimeOutSeconds
}
}
// 5. Godel Profiles (Default)
// nothing to overwrite in this version.
Expand Down
8 changes: 8 additions & 0 deletions cmd/binder/app/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import (
"net/http"
"os"
goruntime "runtime"
"time"

"github.com/spf13/cobra"

Expand Down Expand Up @@ -138,6 +139,12 @@ func runCommand(cmd *cobra.Command, opts *options.Options, args []string) error
// Get the completed config
cc := c.Complete()

if cz, err := configz.New(ComponentName); err == nil {
cz.Set(cc.BinderConfig)
} else {
return fmt.Errorf("unable to register configz: %s", err)
}

ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand All @@ -162,6 +169,7 @@ func Run(ctx context.Context, cc binderappconfig.CompletedConfig) error {
eventRecorder,
cc.BinderConfig.SchedulerName,
cc.BinderConfig.VolumeBindingTimeoutSeconds,
time.Duration(cc.BinderConfig.ReservationTimeOutSeconds)*time.Second,
binder.WithPluginsAndConfigs(cc.BinderConfig.Profile),
)
if err != nil {
Expand Down
71 changes: 71 additions & 0 deletions cmd/controller/app/config/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
/*
Copyright 2023 The Godel Scheduler 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 config

import (
apiserver "k8s.io/apiserver/pkg/server"
clientset "k8s.io/client-go/kubernetes"
restclient "k8s.io/client-go/rest"
"k8s.io/client-go/tools/record"

godelclient "github.com/kubewharf/godel-scheduler-api/pkg/client/clientset/versioned"
controllermanagerconfig "github.com/kubewharf/godel-scheduler/pkg/controller/apis/config"
)

// Config is the main context object for the controller manager.
type Config struct {
ComponentConfig *controllermanagerconfig.GodelControllerManagerConfiguration

SecureServing *apiserver.SecureServingInfo
InsecureServing *apiserver.DeprecatedInsecureServingInfo // nil will disable serving on an insecure port

// LoopbackClientConfig is a config for a privileged loopback connection
LoopbackClientConfig *restclient.Config

Authentication apiserver.AuthenticationInfo
Authorization apiserver.AuthorizationInfo

// the general kube client
Client *clientset.Clientset
GodelClient *godelclient.Clientset

// the rest config for the master
Kubeconfig *restclient.Config
CrdKubeconfig *restclient.Config

EventBroadcaster record.EventBroadcaster
EventRecorder record.EventRecorder
}

type completedConfig struct {
*Config
}

// CompletedConfig same as Config, just to swap private object.
type CompletedConfig struct {
// Embed a private pointer that cannot be instantiated outside of this package.
*completedConfig
}

// Complete fills in any fields not set that are required to have valid data. It's mutating the receiver.
func (c *Config) Complete() *CompletedConfig {
cc := completedConfig{c}

apiserver.AuthorizeClientBearerToken(c.LoopbackClientConfig, &c.Authentication, &c.Authorization)

return &CompletedConfig{&cc}
}
Loading
Loading