diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index e7a7f3b6..056f2878 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -70,7 +70,7 @@ type ClusterSpec struct { DefaultPodSecurityPolicyTemplateName string `json:"defaultPodSecurityPolicyTemplateName,omitempty" norman:"type=reference[podSecurityPolicyTemplate]"` DefaultClusterRoleForProjectMembers string `json:"defaultClusterRoleForProjectMembers,omitempty" norman:"type=reference[roleTemplate]"` DockerRootDir string `json:"dockerRootDir,omitempty" norman:"default=/var/lib/docker"` - EnableNetworkPolicy *bool `json:"enableNetworkPolicy", norman:"nocreate,noupdate,default=false"` + EnableNetworkPolicy *bool `json:"enableNetworkPolicy" norman:"nocreate,noupdate,default=false"` } type ImportedConfig struct { @@ -97,7 +97,7 @@ type ClusterStatus struct { Limits v1.ResourceList `json:"limits,omitempty"` Version *version.Info `json:"version,omitempty"` AppliedPodSecurityPolicyTemplateName string `json:"appliedPodSecurityPolicyTemplateId"` - AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy", norman:"nocreate,noupdate,default=false"` + AppliedEnableNetworkPolicy bool `json:"appliedEnableNetworkPolicy" norman:"nocreate,noupdate,default=false"` } type ClusterComponentStatus struct { diff --git a/apis/management.cattle.io/v3/zz_generated_deepcopy.go b/apis/management.cattle.io/v3/zz_generated_deepcopy.go index 2c2ac169..3d1bd706 100644 --- a/apis/management.cattle.io/v3/zz_generated_deepcopy.go +++ b/apis/management.cattle.io/v3/zz_generated_deepcopy.go @@ -1421,6 +1421,15 @@ func (in *ClusterSpec) DeepCopyInto(out *ClusterSpec) { (*in).DeepCopyInto(*out) } } + if in.EnableNetworkPolicy != nil { + in, out := &in.EnableNetworkPolicy, &out.EnableNetworkPolicy + if *in == nil { + *out = nil + } else { + *out = new(bool) + **out = **in + } + } return } diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index 8101a4fb..827b6f95 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -11,6 +11,7 @@ const ( ClusterFieldAllocatable = "allocatable" ClusterFieldAmazonElasticContainerServiceConfig = "amazonElasticContainerServiceConfig" ClusterFieldAnnotations = "annotations" + ClusterFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy" ClusterFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId" ClusterFieldAppliedSpec = "appliedSpec" ClusterFieldAzureKubernetesServiceConfig = "azureKubernetesServiceConfig" @@ -26,6 +27,7 @@ const ( ClusterFieldDesiredAgentImage = "desiredAgentImage" ClusterFieldDockerRootDir = "dockerRootDir" ClusterFieldDriver = "driver" + ClusterFieldEnableNetworkPolicy = "enableNetworkPolicy" ClusterFieldFailedSpec = "failedSpec" ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterFieldImportedConfig = "importedConfig" @@ -51,6 +53,7 @@ type Cluster struct { Allocatable map[string]string `json:"allocatable,omitempty" yaml:"allocatable,omitempty"` AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `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"` AzureKubernetesServiceConfig *AzureKubernetesServiceConfig `json:"azureKubernetesServiceConfig,omitempty" yaml:"azureKubernetesServiceConfig,omitempty"` @@ -66,6 +69,7 @@ type Cluster struct { DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` + EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index a5a69a78..8329ba7d 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -10,6 +10,7 @@ const ( ClusterSpecFieldDesiredAgentImage = "desiredAgentImage" ClusterSpecFieldDisplayName = "displayName" ClusterSpecFieldDockerRootDir = "dockerRootDir" + ClusterSpecFieldEnableNetworkPolicy = "enableNetworkPolicy" ClusterSpecFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterSpecFieldImportedConfig = "importedConfig" ClusterSpecFieldInternal = "internal" @@ -25,6 +26,7 @@ type ClusterSpec struct { DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` + EnableNetworkPolicy *bool `json:"enableNetworkPolicy,omitempty" yaml:"enableNetworkPolicy,omitempty"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` ImportedConfig *ImportedConfig `json:"importedConfig,omitempty" yaml:"importedConfig,omitempty"` Internal bool `json:"internal,omitempty" yaml:"internal,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_status.go b/client/management/v3/zz_generated_cluster_status.go index 13bea22b..ffff5dc7 100644 --- a/client/management/v3/zz_generated_cluster_status.go +++ b/client/management/v3/zz_generated_cluster_status.go @@ -5,6 +5,7 @@ const ( ClusterStatusFieldAPIEndpoint = "apiEndpoint" ClusterStatusFieldAgentImage = "agentImage" ClusterStatusFieldAllocatable = "allocatable" + ClusterStatusFieldAppliedEnableNetworkPolicy = "appliedEnableNetworkPolicy" ClusterStatusFieldAppliedPodSecurityPolicyTemplateName = "appliedPodSecurityPolicyTemplateId" ClusterStatusFieldAppliedSpec = "appliedSpec" ClusterStatusFieldCACert = "caCert" @@ -22,6 +23,7 @@ type ClusterStatus struct { APIEndpoint string `json:"apiEndpoint,omitempty" yaml:"apiEndpoint,omitempty"` AgentImage string `json:"agentImage,omitempty" yaml:"agentImage,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"` AppliedSpec *ClusterSpec `json:"appliedSpec,omitempty" yaml:"appliedSpec,omitempty"` CACert string `json:"caCert,omitempty" yaml:"caCert,omitempty"`