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

Add EXTERNAL_IMPORT_ENABLED environment variables #102

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
32 changes: 22 additions & 10 deletions config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@ var ErrEmptyEnv = errors.New("env is needed, but empty")

// Config is configuration for simulator.
type Config struct {
Port int
KubeAPIServerURL string
EtcdURL string
FrontendURL string
InitialSchedulerCfg *v1beta2config.KubeSchedulerConfiguration
Port int
KubeAPIServerURL string
EtcdURL string
FrontendURL string
// ExternalImportEnabled indicates whether the simulator will import resources from an existing cluster or not.
ExternalImportEnabled bool
InitialSchedulerCfg *v1beta2config.KubeSchedulerConfiguration
}

// NewConfig gets some settings from environment variables.
Expand All @@ -43,17 +45,20 @@ func NewConfig() (*Config, error) {

apiurl := getKubeAPIServerURL()

externalimportenabled := getExternalImportEnabled()

initialschedulerCfg, err := getSchedulerCfg()
if err != nil {
return nil, xerrors.Errorf("get SchedulerCfg: %w", err)
}

return &Config{
Port: port,
KubeAPIServerURL: apiurl,
EtcdURL: etcdurl,
FrontendURL: frontendurl,
InitialSchedulerCfg: initialschedulerCfg,
Port: port,
KubeAPIServerURL: apiurl,
EtcdURL: etcdurl,
FrontendURL: frontendurl,
InitialSchedulerCfg: initialschedulerCfg,
ExternalImportEnabled: externalimportenabled,
}, nil
}

Expand Down Expand Up @@ -131,6 +136,13 @@ func getSchedulerCfg() (*v1beta2config.KubeSchedulerConfiguration, error) {
return sc, nil
}

// getExternalImportEnabled reads EXTERNAL_IMPORT_ENABLED and convert it to bool.
// This function will return `true` if `EXTERNAL_IMPORT_ENABLED` is "1".
func getExternalImportEnabled() bool {
i := os.Getenv("EXTERNAL_IMPORT_ENABLED")
return i == "1"
}

func decodeSchedulerCfg(buf []byte) (*v1beta2config.KubeSchedulerConfiguration, error) {
decoder := scheme.Codecs.UniversalDeserializer()
obj, _, err := decoder.Decode(buf, nil, nil)
Expand Down
2 changes: 1 addition & 1 deletion server/di/di.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ type Container struct {

// NewDIContainer initializes Container.
// It initializes all service and puts to Container.
func NewDIContainer(client clientset.Interface, restclientCfg *restclient.Config, initialSchedulerCfg *v1beta2config.KubeSchedulerConfiguration) *Container {
func NewDIContainer(client clientset.Interface, restclientCfg *restclient.Config, initialSchedulerCfg *v1beta2config.KubeSchedulerConfiguration, externalImportEnabled bool) *Container {
c := &Container{}

// initializes each service
Expand Down
2 changes: 1 addition & 1 deletion simulator.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func startSimulator() error {
}
defer pvshutdown()

dic := di.NewDIContainer(client, restclientCfg, cfg.InitialSchedulerCfg)
dic := di.NewDIContainer(client, restclientCfg, cfg.InitialSchedulerCfg, cfg.ExternalImportEnabled)

if err := dic.SchedulerService().StartScheduler(cfg.InitialSchedulerCfg); err != nil {
return xerrors.Errorf("start scheduler: %w", err)
Expand Down