rancher/types
1
0
Fork 0
mirror of https://github.com/rancher/types.git synced 2025-06-26 05:31:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1064 from luthermonson/override-spec-master

Browse Source 
[forwardport] Agent Override to Spec
This commit is contained in:
Luther Monson 2019-12-26 10:30:20 -07:00 committed by GitHub
commit 2acfcad7d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,7 @@ type Cluster struct {
type ClusterSpecBase struct {
DesiredAgentImage string `json:"desiredAgentImage"`
DesiredAuthImage string `json:"desiredAuthImage"`
AgentImageOverride string `json:"agentImageOverride"`
RancherKubernetesEngineConfig *RancherKubernetesEngineConfig `json:"rancherKubernetesEngineConfig,omitempty"`
DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"`
DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"`
@ -128,7 +129,6 @@ type ClusterStatus struct {
// https://kubernetes.io/docs/api-reference/v1.8/#componentstatus-v1-core
Driver string `json:"driver"`
AgentImage string `json:"agentImage"`
AgentImageOverride string `json:"agentImageOverride"`
AuthImage string `json:"authImage"`
ComponentStatuses []ClusterComponentStatus `json:"componentStatuses,omitempty"`
APIEndpoint string `json:"apiEndpoint,omitempty"`

2
client/management/v3/zz_generated_cluster_spec.go
View File

@ -2,6 +2,7 @@ package client
const (
ClusterSpecType = "clusterSpec"
ClusterSpecFieldAgentImageOverride = "agentImageOverride"
ClusterSpecFieldAmazonElasticContainerServiceConfig = "amazonElasticContainerServiceConfig"
ClusterSpecFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig"
ClusterSpecFieldClusterTemplateAnswers = "answers"
@ -28,6 +29,7 @@ const (
)
type ClusterSpec struct {
AgentImageOverride string `json:"agentImageOverride,omitempty" yaml:"agentImageOverride,omitempty"`
AmazonElasticContainerServiceConfig map[string]interface{} `json:"amazonElasticContainerServiceConfig,omitempty" yaml:"amazonElasticContainerServiceConfig,omitempty"`
AzureKubernetesServiceConfig map[string]interface{} `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"`
ClusterTemplateAnswers *Answer `json:"answers,omitempty" yaml:"answers,omitempty"`

2
client/management/v3/zz_generated_cluster_spec_base.go
View File

@ -2,6 +2,7 @@ package client
const (
ClusterSpecBaseType = "clusterSpecBase"
ClusterSpecBaseFieldAgentImageOverride = "agentImageOverride"
ClusterSpecBaseFieldDefaultClusterRoleForProjectMembers = "defaultClusterRoleForProjectMembers"
ClusterSpecBaseFieldDefaultPodSecurityPolicyTemplateID = "defaultPodSecurityPolicyTemplateId"
ClusterSpecBaseFieldDesiredAgentImage = "desiredAgentImage"
@ -16,6 +17,7 @@ const (
)
type ClusterSpecBase struct {
AgentImageOverride string `json:"agentImageOverride,omitempty" yaml:"agentImageOverride,omitempty"`
DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" yaml:"defaultClusterRoleForProjectMembers,omitempty"`
DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"`
DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"`

2
client/management/v3/zz_generated_cluster_status.go
View File

@ -4,7 +4,6 @@ const (
ClusterStatusType = "clusterStatus"
ClusterStatusFieldAPIEndpoint = "apiEndpoint"
ClusterStatusFieldAgentImage = "agentImage"
ClusterStatusFieldAgentImageOverride = "agentImageOverride"
ClusterStatusFieldAllocatable = "allocatable"
ClusterStatusFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy"
ClusterStatusFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId"
@ -28,7 +27,6 @@ const (
type ClusterStatus struct {
APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"`
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"`
AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy,omitempty" yaml:"appliedEnableNetworkPolicy,omitempty"`
AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId,omitempty" yaml:"appliedPodSecurityPolicyTemplateId,omitempty"`