e48b436680
Prior to this commit, NewConfig was setting up a new Config object and filling it with a new kubeconfig object. The process for creating a kubeconfig object has the potential to return an error. This commit removes the creation of that object from NewConfig, delegating creation of kubeconfig objects to more appropriate functions, such as LoadConfig. Change-Id: I57a040f2e76bbc003eb82171f382e80425b37870
72 lines
1.8 KiB
Go
72 lines
1.8 KiB
Go
/*
|
|
Copyright 2014 The Kubernetes 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
|
|
|
|
// NewConfig returns a newly initialized Config object
|
|
func NewConfig() *Config {
|
|
return &Config{
|
|
Kind: AirshipConfigKind,
|
|
APIVersion: AirshipConfigApiVersion,
|
|
Clusters: make(map[string]*ClusterPurpose),
|
|
Contexts: make(map[string]*Context),
|
|
AuthInfos: make(map[string]*AuthInfo),
|
|
Manifests: make(map[string]*Manifest),
|
|
ModulesConfig: NewModules(),
|
|
}
|
|
}
|
|
|
|
// NewContext is a convenience function that returns a new Context
|
|
func NewContext() *Context {
|
|
return &Context{}
|
|
}
|
|
|
|
// NewCluster is a convenience function that returns a new Cluster
|
|
func NewCluster() *Cluster {
|
|
return &Cluster{}
|
|
}
|
|
|
|
// NewManifest is a convenience function that returns a new Manifest
|
|
// object with non-nil maps
|
|
func NewManifest() *Manifest {
|
|
return &Manifest{
|
|
Repositories: make(map[string]*Repository),
|
|
}
|
|
}
|
|
|
|
func NewRepository() *Repository {
|
|
return &Repository{}
|
|
}
|
|
|
|
func NewAuthInfo() *AuthInfo {
|
|
return &AuthInfo{}
|
|
}
|
|
|
|
func NewModules() *Modules {
|
|
return &Modules{}
|
|
}
|
|
|
|
// NewClusterPurpose is a convenience function that returns a new ClusterPurpose
|
|
func NewClusterPurpose() *ClusterPurpose {
|
|
return &ClusterPurpose{
|
|
ClusterTypes: make(map[string]*Cluster),
|
|
}
|
|
}
|
|
|
|
func NewClusterComplexName() *ClusterComplexName {
|
|
return &ClusterComplexName{}
|
|
}
|