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

Merge 26032c826c into fe03f32597

Browse Source
This commit is contained in:
Aleksandar 2020-06-29 10:25:57 +03:00 committed by GitHub
commit 96d74bb8ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,9 +212,6 @@ func clusterTypes(schemas *types.Schemas) *types.Schemas {
AddMapperForType(&Version, v3.Cluster{},
&m.Embed{Field: "status"},
mapper.NewDropFromSchema("genericEngineConfig"),
mapper.NewDropFromSchema("googleKubernetesEngineConfig"),
mapper.NewDropFromSchema("azureKubernetesServiceConfig"),
mapper.NewDropFromSchema("amazonElasticContainerServiceConfig"),
m.DisplayName{},
).
AddMapperForType(&Version, v3.ClusterStatus{},

6
client/management/v3/zz_generated_cluster.go
View File

@ -11,11 +11,13 @@ const (
ClusterFieldAgentImage = "agentImage"
ClusterFieldAgentImageOverride = "agentImageOverride"
ClusterFieldAllocatable = "allocatable"
ClusterFieldAmazonElasticContainerServiceConfig = "amazonElasticContainerServiceConfig"
ClusterFieldAnnotations = "annotations"
ClusterFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy"
ClusterFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId"
ClusterFieldAppliedSpec = "appliedSpec"
ClusterFieldAuthImage = "authImage"
ClusterFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig"
ClusterFieldCACert = "caCert"
ClusterFieldCapabilities = "capabilities"
ClusterFieldCapacity = "capacity"
@ -40,6 +42,7 @@ const (
ClusterFieldEnableClusterMonitoring = "enableClusterMonitoring"
ClusterFieldEnableNetworkPolicy = "enableNetworkPolicy"
ClusterFieldFailedSpec = "failedSpec"
ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig"
ClusterFieldImportedConfig = "importedConfig"
ClusterFieldInternal = "internal"
ClusterFieldIstioEnabled = "istioEnabled"
@ -72,11 +75,13 @@ type Cluster struct {
AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,omitempty"`
AgentImageOverride string `json:"agentImageOverride,omitempty" yaml:"agentImageOverride,omitempty"`
Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"`
AmazonElasticContainerServiceConfig map[string]interface{} `json:"amazonElasticContainerServiceConfig,omitempty" yaml:"amazonElasticContainerServiceConfig,omitempty"`
Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"`
AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"`
AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId,omitempty" yaml:"appliedPodSecurityPolicyTemplateId,omitempty"`
AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"`
AuthImage string `json:"authImage,omitempty" yaml:"authImage,omitempty"`
AzureKubernetesServiceConfig map[string]interface{} `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"`
CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"`
Capabilities *Capabilities `json:"capabilities,omitempty" yaml:"capabilities,omitempty"`
Capacity map[string]string `json:"capacity,omitempty" yaml:"capacity,omitempty"`
@ -101,6 +106,7 @@ type Cluster struct {
EnableClusterMonitoring bool `json:"enableClusterMonitoring,omitempty" yaml:"enableClusterMonitoring,omitempty"`
EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"`
FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"`
GoogleKubernetesEngineConfig map[string]interface{} `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"`
ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"`
Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"`
IstioEnabled bool `json:"istioEnabled,omitempty" yaml:"istioEnabled,omitempty"`