rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-07-10 20:13:04 +00:00
Code Issues Releases Wiki Activity

Make cluster name generated

Browse Source
This commit is contained in:
Darren Shepherd 2018-01-12 15:02:18 -07:00
parent fff1769c30
commit eb54542307
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apis/management.cattle.io/v3/cluster_types.go
View File

@ -43,6 +43,7 @@ type Cluster struct {
type ClusterSpec struct {
Nodes []MachineConfig `json:"nodes"`
DisplayName string `json:"displayName"`
Description string `json:"description"`
Internal bool `json:"internal" norman:"nocreate,noupdate"`
GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty"`

3
apis/management.cattle.io/v3/schema/schema.go
View File

@ -50,6 +50,7 @@ func clusterTypes(schemas *types.Schemas) *types.Schemas {
return schemas.
AddMapperForType(&Version, v3.Cluster{},
&m.Embed{Field: "status"},
m.DisplayName{},
).
AddMapperForType(&Version, v3.ClusterStatus{},
m.Drop{Field: "appliedSpec"},
@ -162,6 +163,8 @@ func machineTypes(schemas *types.Schemas) *types.Schemas {
&m.Drop{Field: "machineDriverConfig"},
&m.Embed{Field: "nodeStatus"},
&m.SliceMerge{From: []string{"conditions", "nodeConditions"}, To: "conditions"}).
AddMapperForType(&Version, v3.MachineConfig{},
&m.Drop{Field: "clusterName"}).
AddMapperForType(&Version, v3.Machine{},
&m.Embed{Field: "status"},
m.DisplayName{}).