feat: add container logs max size to the kubeone API

docs/api_reference/v1beta1.en.md

@@ -1,6 +1,6 @@
 +++
 title = "v1beta1 API Reference"
-date = 2021-12-23T21:13:02+05:00
+date = 2022-01-28T02:22:19+04:00
 weight = 11
 +++
 ## v1beta1

docs/api_reference/v1beta2.en.md

@@ -1,6 +1,6 @@
 +++
 title = "v1beta2 API Reference"
-date = 2022-01-11T11:06:38+02:00
+date = 2022-01-28T02:22:19+04:00
 weight = 11
 +++
 ## v1beta2
@@ -40,6 +40,7 @@ weight = 11
 * [KubeOneCluster](#kubeonecluster)
 * [KubeProxyConfig](#kubeproxyconfig)
 * [KubeletConfig](#kubeletconfig)
+* [LoggingConfig](#loggingconfig)
 * [MachineControllerConfig](#machinecontrollerconfig)
 * [MetricsServer](#metricsserver)
 * [NoneSpec](#nonespec)
@@ -460,6 +461,7 @@ KubeOneCluster is KubeOne Cluster API Schema
 | addons | Addons are used to deploy additional manifests. | *[Addons](#addons) | false |
 | systemPackages | SystemPackages configure kubeone behaviour regarding OS packages. | *[SystemPackages](#systempackages) | false |
 | registryConfiguration | RegistryConfiguration configures how Docker images are pulled from an image registry | *[RegistryConfiguration](#registryconfiguration) | false |
+| loggingConfig | LoggingConfig configures the Kubelet's log configuration | [LoggingConfig](#loggingconfig) | false |
 
 [Back to Group](#v1beta2)
 
@@ -487,6 +489,16 @@ KubeletConfig provides some kubelet configuration options
 
 [Back to Group](#v1beta2)
 
+### LoggingConfig
+
+LoggingConfig configures the Kubelet's log rotation
+
+| Field | Description | Scheme | Required |
+| ----- | ----------- | ------ | -------- |
+| containerLogMaxSize | ContainerLogMaxSize configures the maximum size of container log file before it is rotated See more at: https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/ | string | false |
+
+[Back to Group](#v1beta2)
+
 ### MachineControllerConfig
 
 MachineControllerConfig configures kubermatic machine-controller deployment

pkg/apis/kubeone/config/config.go

@@ -237,6 +237,16 @@ func SetKubeOneClusterDynamicDefaults(cluster *kubeoneapi.KubeOneCluster, creden
 		}
 	}
 
+	// Default ContainerLogMaxSize.
+	// NB: We intentionally default here because LoggingConfig is not available in
+	// the v1beta1 API. If we would default in the v1beta2 API instead, this value would
+	// be empty when converting from v1beta1 to internal. This means that v1beta1 API
+	// users would depend on default values provided by Docker/upstream, which are
+	// different than our default values, so we want to avoid this.
+	if cluster.LoggingConfig.ContainerLogMaxSize == "" {
+		cluster.LoggingConfig.ContainerLogMaxSize = "100Mi"
+	}
+
 	// Default the AssetsConfiguration internal API
 	cluster.DefaultAssetConfiguration()
 

pkg/apis/kubeone/types.go

@@ -63,6 +63,15 @@ type KubeOneCluster struct {
 	AssetConfiguration AssetConfiguration `json:"assetConfiguration,omitempty"`
 	// RegistryConfiguration configures how Docker images are pulled from an image registry
 	RegistryConfiguration *RegistryConfiguration `json:"registryConfiguration,omitempty"`
+	// LoggingConfig configures the Kubelet's log rotation
+	LoggingConfig LoggingConfig `json:"loggingConfig,omitempty"`
+}
+
+// LoggingConfig configures the Kubelet's log rotation
+type LoggingConfig struct {
+	// ContainerLogMaxSize configures the maximum size of container log file before it is rotated
+	// See more at: https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/
+	ContainerLogMaxSize string `json:"containerLogMaxSize,omitempty"`
 }
 
 // ContainerRuntimeConfig

pkg/apis/kubeone/v1beta1/conversion.go

@@ -69,3 +69,8 @@ func Convert_kubeone_HostConfig_To_v1beta1_HostConfig(in *kubeone.HostConfig, ou
 	// explicitly skip kubelet conversion omitted in autoConvert_kubeone_HostConfig_To_v1beta1_HostConfig
 	return autoConvert_kubeone_HostConfig_To_v1beta1_HostConfig(in, out, scope)
 }
+
+func Convert_kubeone_KubeOneCluster_To_v1beta1_KubeOneCluster(in *kubeone.KubeOneCluster, out *KubeOneCluster, s conversion.Scope) error {
+	// LoggingConfig was introduced only in new v1beta2 API, so we skip it here
+	return autoConvert_kubeone_KubeOneCluster_To_v1beta1_KubeOneCluster(in, out, s)
+}

pkg/apis/kubeone/v1beta2/types.go

@@ -61,6 +61,15 @@ type KubeOneCluster struct {
 	SystemPackages *SystemPackages `json:"systemPackages,omitempty"`
 	// RegistryConfiguration configures how Docker images are pulled from an image registry
 	RegistryConfiguration *RegistryConfiguration `json:"registryConfiguration,omitempty"`
+	// LoggingConfig configures the Kubelet's log configuration
+	LoggingConfig LoggingConfig `json:"loggingConfig,omitempty"`
+}
+
+// LoggingConfig configures the Kubelet's log rotation
+type LoggingConfig struct {
+	// ContainerLogMaxSize configures the maximum size of container log file before it is rotated
+	// See more at: https://kubernetes.io/docs/reference/config-api/kubelet-config.v1beta1/
+	ContainerLogMaxSize string `json:"containerLogMaxSize,omitempty"`
 }
 
 // ContainerRuntimeConfig

pkg/cmd/config.go

@@ -79,6 +79,8 @@ type printOpts struct {
 	EnableEncryptionProviders bool `longflag:"enable-encryption-providers"`
 
 	DeployMachineController bool `longflag:"deploy-machine-controller"`
+
+	ContainerLogMaxSize string `longflag:"container-log-max-size"`
 }
 
 // configCmd setups the config command
@@ -174,6 +176,14 @@ func configPrintCmd() *cobra.Command {
 	// MachineController
 	cmd.Flags().BoolVar(&opts.DeployMachineController, longFlagName(opts, "DeployMachineController"), true, "deploy kubermatic machine-controller")
 
+	// LoggingConfig
+	cmd.Flags().StringVarP(
+		&opts.ContainerLogMaxSize,
+		longFlagName(opts, "ContainerLogMaxSize"),
+		shortFlagName(opts, "ContainerLogMaxSize"),
+		"100Mi",
+		"ContainerLogMaxSize")
+
 	return cmd
 }
 
@@ -370,6 +380,8 @@ func createAndPrintManifest(printOptions *printOpts) error {
 		cfg.Set(yamled.Path{"machineController", "deploy"}, printOptions.DeployMachineController)
 	}
 
+	cfg.Set(yamled.Path{"loggingConfig", "containerLogMaxSize"}, printOptions.ContainerLogMaxSize)
+
 	// Print the manifest
 	err := validateAndPrintConfig(cfg)
 	if err != nil {
@@ -972,4 +984,7 @@ machineController:
 #     operatingSystem: 'ubuntu'
 #     operatingSystemSpec:
 #       distUpgradeOnBoot: true
+
+loggingConfig:
+  containerLogMaxSize: "{{ .ContainerLogMaxSize }}"
 `

pkg/containerruntime/docker_config.go

@@ -18,6 +18,7 @@ package containerruntime
 
 import (
 	"encoding/json"
+	"strings"
 
 	"k8c.io/kubeone/pkg/apis/kubeone"
 )
@@ -32,12 +33,17 @@ type dockerConfig struct {
 }
 
 func marshalDockerConfig(cluster *kubeone.KubeOneCluster) (string, error) {
+	logSize := strings.ToLower(cluster.LoggingConfig.ContainerLogMaxSize)
+	logSize = strings.ReplaceAll(logSize, "ki", "k")
+	logSize = strings.ReplaceAll(logSize, "mi", "m")
+	logSize = strings.ReplaceAll(logSize, "gi", "g")
+
 	cfg := dockerConfig{
 		ExecOpts:      []string{"native.cgroupdriver=systemd"},
 		StorageDriver: "overlay2",
 		LogDriver:     "json-file",
 		LogOpts: map[string]string{
-			"max-size": "100m",
+			"max-size": logSize,
 		},
 	}