Merge pull request #1475 from mjura/maintenance-caasp-v4.2

Revoke systemd cgroup driver
SUSE · Jan 17, 2022 · 9887351 · 9887351
2 parents a89caf2 + 7b6061f
commit 9887351
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 6 deletions.
diff --git a/internal/pkg/skuba/node/config_test.go b/internal/pkg/skuba/node/config_test.go
@@ -43,7 +43,6 @@ nodeRegistration:
  cni-bin-dir: /usr/lib/cni
  hostname-override: worker-0
  pod-infra-container-image: registry.suse.de/devel/caasp/4.0/containers/containers/caasp/v4/pause:3.1
- cgroup-driver: systemd
  name: worker-0
 `
 
@@ -163,7 +162,6 @@ func Test_documentMapToJoinConfiguration(t *testing.T) {
  "cni-bin-dir": "/usr/lib/cni",
  "hostname-override": "worker-0",
  "pod-infra-container-image": "registry.suse.de/devel/caasp/4.0/containers/containers/caasp/v4/pause:3.1",
- "cgroup-driver": "systemd",
  },
  },
  CACertPath: "/etc/kubernetes/pki/ca.crt",

diff --git a/internal/pkg/skuba/node/node.go b/internal/pkg/skuba/node/node.go
@@ -34,7 +34,6 @@ func AddTargetInformationToInitConfigurationWithClusterVersion(target *deploymen
  initConfiguration.NodeRegistration.CRISocket = skuba.CRISocket
  initConfiguration.NodeRegistration.KubeletExtraArgs["hostname-override"] = target.Nodename
  initConfiguration.NodeRegistration.KubeletExtraArgs["pod-infra-container-image"] = kubernetes.ComponentContainerImageForClusterVersion(kubernetes.Pause, clusterVersion)
- initConfiguration.NodeRegistration.KubeletExtraArgs["cgroup-driver"] = skuba.CGroupDriver
  isSUSE, err := target.IsSUSEOS()
  if err != nil {
  return err

diff --git a/internal/pkg/skuba/node/testdata/join.conf b/internal/pkg/skuba/node/testdata/join.conf
@@ -14,5 +14,4 @@ nodeRegistration:
  cni-bin-dir: /usr/lib/cni
  hostname-override: worker-0
  pod-infra-container-image: registry.suse.de/devel/caasp/4.0/containers/containers/caasp/v4/pause:3.1
- cgroup-driver: systemd
  name: worker-0
diff --git a/pkg/skuba/actions/node/join/join.go b/pkg/skuba/actions/node/join/join.go
@@ -177,7 +177,6 @@ func addTargetInformationToJoinConfiguration(target *deployments.Target, role de
  joinConfiguration.NodeRegistration.CRISocket = skuba.CRISocket
  joinConfiguration.NodeRegistration.KubeletExtraArgs["hostname-override"] = target.Nodename
  joinConfiguration.NodeRegistration.KubeletExtraArgs["pod-infra-container-image"] = kubernetes.ComponentContainerImageForClusterVersion(kubernetes.Pause, clusterVersion)
- joinConfiguration.NodeRegistration.KubeletExtraArgs["cgroup-driver"] = skuba.CGroupDriver
  isSUSE, err := target.IsSUSEOS()
  if err != nil {
  return errors.Wrap(err, "unable to get os info")

diff --git a/pkg/skuba/constants.go b/pkg/skuba/constants.go
@@ -32,7 +32,6 @@ const (
  SUSECNIDir = "/usr/lib/cni"
  // MaxNodeNameLength is the maximum node name length accepted by kubelet.
  MaxNodeNameLength = 63
- CGroupDriver = "systemd"
 )
 
 func KubeadmInitConfFile() string {