diff --git a/apis/management.cattle.io/v3/cluster_types.go b/apis/management.cattle.io/v3/cluster_types.go index f4ec638e..9bf219ff 100644 --- a/apis/management.cattle.io/v3/cluster_types.go +++ b/apis/management.cattle.io/v3/cluster_types.go @@ -69,6 +69,7 @@ type ClusterSpec struct { AmazonElasticContainerServiceConfig *AmazonElasticContainerServiceConfig `json:"amazonElasticContainerServiceConfig,omitempty"` 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"` } type ImportedConfig struct { diff --git a/apis/management.cattle.io/v3/logging_types.go b/apis/management.cattle.io/v3/logging_types.go index 8422dc35..badba365 100644 --- a/apis/management.cattle.io/v3/logging_types.go +++ b/apis/management.cattle.io/v3/logging_types.go @@ -42,7 +42,6 @@ type LoggingCommonSpec struct { OutputFlushInterval int `json:"outputFlushInterval,omitempty" norman:"default=3"` OutputTags map[string]string `json:"outputTags,omitempty"` - DockerRootDir string `json:"dockerRootDir" norman:"default=/var/lib/docker/containers"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty"` SplunkConfig *SplunkConfig `json:"splunkConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty"` diff --git a/client/management/v3/zz_generated_cluster.go b/client/management/v3/zz_generated_cluster.go index ce6e56a6..8101a4fb 100644 --- a/client/management/v3/zz_generated_cluster.go +++ b/client/management/v3/zz_generated_cluster.go @@ -24,6 +24,7 @@ const ( ClusterFieldDefaultPodSecurityPolicyTemplateID = "defaultPodSecurityPolicyTemplateId" ClusterFieldDescription = "description" ClusterFieldDesiredAgentImage = "desiredAgentImage" + ClusterFieldDockerRootDir = "dockerRootDir" ClusterFieldDriver = "driver" ClusterFieldFailedSpec = "failedSpec" ClusterFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" @@ -63,6 +64,7 @@ type Cluster struct { DefaultPodSecurityPolicyTemplateID string `json:"defaultPodSecurityPolicyTemplateId,omitempty" yaml:"defaultPodSecurityPolicyTemplateId,omitempty"` Description string `json:"description,omitempty" yaml:"description,omitempty"` DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` Driver string `json:"driver,omitempty" yaml:"driver,omitempty"` FailedSpec *ClusterSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` GoogleKubernetesEngineConfig *GoogleKubernetesEngineConfig `json:"googleKubernetesEngineConfig,omitempty" yaml:"googleKubernetesEngineConfig,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_logging.go b/client/management/v3/zz_generated_cluster_logging.go index 3b767022..5b2966e7 100644 --- a/client/management/v3/zz_generated_cluster_logging.go +++ b/client/management/v3/zz_generated_cluster_logging.go @@ -12,7 +12,6 @@ const ( ClusterLoggingFieldConditions = "conditions" ClusterLoggingFieldCreated = "created" ClusterLoggingFieldCreatorID = "creatorId" - ClusterLoggingFieldDockerRootDir = "dockerRootDir" ClusterLoggingFieldElasticsearchConfig = "elasticsearchConfig" ClusterLoggingFieldEmbeddedConfig = "embeddedConfig" ClusterLoggingFieldFailedSpec = "failedSpec" @@ -40,7 +39,6 @@ type ClusterLogging struct { Conditions []LoggingCondition `json:"conditions,omitempty" yaml:"conditions,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` - DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` FailedSpec *ClusterLoggingSpec `json:"failedSpec,omitempty" yaml:"failedSpec,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_logging_spec.go b/client/management/v3/zz_generated_cluster_logging_spec.go index e6bda873..d0029f3f 100644 --- a/client/management/v3/zz_generated_cluster_logging_spec.go +++ b/client/management/v3/zz_generated_cluster_logging_spec.go @@ -4,7 +4,6 @@ const ( ClusterLoggingSpecType = "clusterLoggingSpec" ClusterLoggingSpecFieldClusterID = "clusterId" ClusterLoggingSpecFieldDisplayName = "displayName" - ClusterLoggingSpecFieldDockerRootDir = "dockerRootDir" ClusterLoggingSpecFieldElasticsearchConfig = "elasticsearchConfig" ClusterLoggingSpecFieldEmbeddedConfig = "embeddedConfig" ClusterLoggingSpecFieldKafkaConfig = "kafkaConfig" @@ -17,7 +16,6 @@ const ( type ClusterLoggingSpec struct { ClusterID string `json:"clusterId,omitempty" yaml:"clusterId,omitempty"` DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` - DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` EmbeddedConfig *EmbeddedConfig `json:"embeddedConfig,omitempty" yaml:"embeddedConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` diff --git a/client/management/v3/zz_generated_cluster_spec.go b/client/management/v3/zz_generated_cluster_spec.go index 3de763f2..a5a69a78 100644 --- a/client/management/v3/zz_generated_cluster_spec.go +++ b/client/management/v3/zz_generated_cluster_spec.go @@ -9,6 +9,7 @@ const ( ClusterSpecFieldDescription = "description" ClusterSpecFieldDesiredAgentImage = "desiredAgentImage" ClusterSpecFieldDisplayName = "displayName" + ClusterSpecFieldDockerRootDir = "dockerRootDir" ClusterSpecFieldGoogleKubernetesEngineConfig = "googleKubernetesEngineConfig" ClusterSpecFieldImportedConfig = "importedConfig" ClusterSpecFieldInternal = "internal" @@ -23,6 +24,7 @@ type ClusterSpec struct { Description string `json:"description,omitempty" yaml:"description,omitempty"` DesiredAgentImage string `json:"desiredAgentImage,omitempty" yaml:"desiredAgentImage,omitempty"` DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` + DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,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_project_logging.go b/client/management/v3/zz_generated_project_logging.go index d2375199..6bd70171 100644 --- a/client/management/v3/zz_generated_project_logging.go +++ b/client/management/v3/zz_generated_project_logging.go @@ -9,7 +9,6 @@ const ( ProjectLoggingFieldAnnotations = "annotations" ProjectLoggingFieldCreated = "created" ProjectLoggingFieldCreatorID = "creatorId" - ProjectLoggingFieldDockerRootDir = "dockerRootDir" ProjectLoggingFieldElasticsearchConfig = "elasticsearchConfig" ProjectLoggingFieldKafkaConfig = "kafkaConfig" ProjectLoggingFieldLabels = "labels" @@ -34,7 +33,6 @@ type ProjectLogging struct { Annotations map[string]string `json:"annotations,omitempty" yaml:"annotations,omitempty"` Created string `json:"created,omitempty" yaml:"created,omitempty"` CreatorID string `json:"creatorId,omitempty" yaml:"creatorId,omitempty"` - DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` Labels map[string]string `json:"labels,omitempty" yaml:"labels,omitempty"` diff --git a/client/management/v3/zz_generated_project_logging_spec.go b/client/management/v3/zz_generated_project_logging_spec.go index 1fe2b558..5059ac34 100644 --- a/client/management/v3/zz_generated_project_logging_spec.go +++ b/client/management/v3/zz_generated_project_logging_spec.go @@ -3,7 +3,6 @@ package client const ( ProjectLoggingSpecType = "projectLoggingSpec" ProjectLoggingSpecFieldDisplayName = "displayName" - ProjectLoggingSpecFieldDockerRootDir = "dockerRootDir" ProjectLoggingSpecFieldElasticsearchConfig = "elasticsearchConfig" ProjectLoggingSpecFieldKafkaConfig = "kafkaConfig" ProjectLoggingSpecFieldOutputFlushInterval = "outputFlushInterval" @@ -15,7 +14,6 @@ const ( type ProjectLoggingSpec struct { DisplayName string `json:"displayName,omitempty" yaml:"displayName,omitempty"` - DockerRootDir string `json:"dockerRootDir,omitempty" yaml:"dockerRootDir,omitempty"` ElasticsearchConfig *ElasticsearchConfig `json:"elasticsearchConfig,omitempty" yaml:"elasticsearchConfig,omitempty"` KafkaConfig *KafkaConfig `json:"kafkaConfig,omitempty" yaml:"kafkaConfig,omitempty"` OutputFlushInterval int64 `json:"outputFlushInterval,omitempty" yaml:"outputFlushInterval,omitempty"`