From 3be437bafe8a08bbcf4390e140e62fb00771470f Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Wed, 29 Jan 2025 12:17:49 -0800 Subject: [PATCH] fix: add disk swap disable stage (#78) * fix: add log rotation and version in logging Signed-off-by: Nianyu Shen * fix: add disk swap disable stage Signed-off-by: Nianyu Shen --------- Signed-off-by: Nianyu Shen --- pkg/log/log.go | 6 +++--- pkg/provider/provider.go | 12 ++++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/log/log.go b/pkg/log/log.go index d74aa79..911f9bc 100644 --- a/pkg/log/log.go +++ b/pkg/log/log.go @@ -22,18 +22,18 @@ func InitLogger(path string) { } logrus.SetOutput(logfile) - logrus.SetFormatter(KubeadmLogger{ + logrus.SetFormatter(RKE2Logger{ Version: version.Version, Formatter: logrus.StandardLogger().Formatter, }) } -type KubeadmLogger struct { +type RKE2Logger struct { Version string Formatter logrus.Formatter } -func (l KubeadmLogger) Format(entry *logrus.Entry) ([]byte, error) { +func (l RKE2Logger) Format(entry *logrus.Entry) ([]byte, error) { entry.Data["version"] = l.Version return l.Formatter.Format(entry) } diff --git a/pkg/provider/provider.go b/pkg/provider/provider.go index c890ea8..517e90b 100644 --- a/pkg/provider/provider.go +++ b/pkg/provider/provider.go @@ -22,6 +22,8 @@ func ClusterProvider(cluster clusterplugin.Cluster) yip.YipConfig { var stages []yip.Stage clusterRootPath := getClusterRootPath(cluster) + stages = append(stages, getSwapDisableStage()) + rke2Config := types.RKE2Config{ Token: cluster.ClusterToken, // RKE2 server listens on 9345 for node registration https://docs.rke2.io/install/quickstart/#3-configure-the-rke2-agent-service @@ -204,3 +206,13 @@ func getNodeCIDR() string { func getClusterRootPath(cluster clusterplugin.Cluster) string { return cluster.ProviderOptions[constants.ClusterRootPath] } + +func getSwapDisableStage() yip.Stage { + return yip.Stage{ + Name: "disable disk swap", + Commands: []string{ + "sed -i '/ swap / s/^\\(.*\\)$/#\\1/g' /etc/fstab", + "swapoff -a", + }, + } +}