b2af034e57
This implementation creates named references between an airship
config file , and a user specified or system default kubeconfig file
airshipconfig location can be specified via an envirnment variable
or via
--airshipconf string Path to file for airshipctl configuration.
(default ".airship/config")
kubeconfig has to be explicitly stated using the argument below
--kubeconfig string Path to kubeconfig associated with airshipctl
configuration. (default ".airship/kubeconfig")
if the argument is not specified a default empty kubeconfig will be
used using the default ".airship/kubeconfig"
All subcommands exposed via airshipctl config will update airship
config and airship related kubeconfig
when appropriate.
This patchset adds :
- Config Struct (type)
- config cmd and pkg
- get_cluster : List a specific name cluster or
List all clusters if no name is provided.
- set-cluster : Create or Modify an existing cluster.
Review comment fixes as of Pathset 19
- Moved core functionality from cmd to pkg
- Encapsulate cmd needs in pck in nw files cmds, cmds_types and cmds_test .
Expectation is that other functions will need func an structs there.
- added test for GetCluster
- Added GetCluster method to config object to be used by get_cluster command
- Change ClusterNames func as per review suggestion
- Change TestEmpty Cluster to avoid pointing to non test kubecnfig by default
- Change constant AirshipConfigFilePath to AirshipConfigDir
- Renamed config_utils to utils
- Added config cmd output tests
- Changes to settings_test.go to clean after itself.
- Created new pkg/config/testdata/GoldenString for struct data comparison values to avoid confusion
- Fix small get_cluster no name issue when empty config
- Fix issue when reconciling a cluster info that only exists in airship config and not in kubeconfig
Increased coverage to: SUCCESS: Test coverage is at 84.2%,
Started to move all testdata to a single place under pkg/config for now.
Change-Id: I7aae1f15afaebc99407f7fabccecf86ab0923bc3
85 lines
2.1 KiB
Go
85 lines
2.1 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
|
|
|
|
import (
|
|
"path/filepath"
|
|
|
|
"k8s.io/client-go/tools/clientcmd"
|
|
)
|
|
|
|
// NewConfig is a convenience function that returns a new Config
|
|
// object with non-nill maps
|
|
func NewConfig() *Config {
|
|
conf := &Config{
|
|
Clusters: make(map[string]*ClusterPurpose),
|
|
Contexts: make(map[string]*Context),
|
|
AuthInfos: make(map[string]*AuthInfo),
|
|
Manifests: make(map[string]*Manifest),
|
|
}
|
|
conf.ModulesConfig = NewModules()
|
|
conf.Kind = AirshipConfigKind
|
|
conf.APIVersion = AirshipConfigApiVersion
|
|
|
|
conf.loadedConfigPath = filepath.Join(AirshipConfigDir, AirshipConfig)
|
|
conf.loadedPathOptions = clientcmd.NewDefaultPathOptions()
|
|
conf.kubeConfig, _ = conf.loadedPathOptions.GetStartingConfig()
|
|
return conf
|
|
|
|
}
|
|
|
|
// 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{}
|
|
}
|