From e450c4534df5d7db2b211286b47265c1d2c3f558 Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Mon, 23 Dec 2019 17:27:48 -0700 Subject: [PATCH 1/2] moving agent override to spec --- apis/management.cattle.io/v3/cluster_types.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index 1a61d1bf..6ca0c0ae 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -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"` From 63594bb26a8227c44bf95ff38972b01feeb4bf0c Mon Sep 17 00:00:00 2001 From: Luther Monson Date: Thu, 26 Dec 2019 10:14:53 -0700 Subject: [PATCH 2/2] generated --- client/management/v3/zz_generated_cluster_spec.go | 2 ++ client/management/v3/zz_generated_cluster_spec_base.go | 2 ++ client/management/v3/zz_generated_cluster_status.go | 2 -- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index 5022ac75..ba5dad08 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -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"` diff --git a/client/management/v3/zz_generated_cluster_spec_base.go b/client/management/v3/zz_generated_cluster_spec_base.go index c6a6b4bd..40322e6b 100644 --- a/client/management/v3/zz_generated_cluster_spec_base.go +++ b/client/management/v3/zz_generated_cluster_spec_base.go @@ -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"` diff --git a/client/management/v3/zz_generated_cluster_status.go b/client/management/v3/zz_generated_cluster_status.go index 3b051ff0..793d46c5 100644 --- a/client/management/v3/zz_generated_cluster_status.go +++ b/client/management/v3/zz_generated_cluster_status.go @@ -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"`