Skip to content
This repository was archived by the owner on Mar 25, 2024. It is now read-only.

Don't drop gke/aks/eks fields #1158

Open
vulkoingim wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Don't drop gke/aks/eks fields #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 0 additions & 3 deletions apis/management.cattle.io/v3/schema/schema.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,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{},
Expand Down
6 changes: 6 additions & 0 deletions client/management/v3/zz_generated_cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -40,6 +42,7 @@ const (
ClusterFieldEnableClusterMonitoring = "enableClusterMonitoring"
ClusterFieldEnableNetworkPolicy = "enableNetworkPolicy"
ClusterFieldFailedSpec = "failedSpec"
ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig"
ClusterFieldImportedConfig = "importedConfig"
ClusterFieldInternal = "internal"
ClusterFieldIstioEnabled = "istioEnabled"
Expand Down Expand Up @@ -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"`
Expand All @@ -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"`
Expand Down