Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Release-1.26] Write pod-manifests as 0600 in cis mode #4839

Merged
merged 1 commit into from
Oct 5, 2023
Merged

[Release-1.26] Write pod-manifests as 0600 in cis mode #4839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/podexecutor/staticpod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ func (s *StaticPodConfig) KubeProxy(_ context.Context, args []string) error {
Command: "kube-proxy",
Args: args,
Image: image,
CISMode: s.CISMode,
HealthPort: 10256,
HealthProto: "HTTP",
CPURequest: s.ControlPlaneResources.KubeProxyCPURequest,
Expand Down Expand Up @@ -318,6 +319,7 @@ func (s *StaticPodConfig) APIServer(_ context.Context, etcdReady <-chan struct{}
Args: args,
Image: image,
Dirs: dirs,
CISMode: s.CISMode,
CPURequest: s.ControlPlaneResources.KubeAPIServerCPURequest,
CPULimit: s.ControlPlaneResources.KubeAPIServerCPULimit,
MemoryRequest: s.ControlPlaneResources.KubeAPIServerMemoryRequest,
Expand Down Expand Up @@ -370,6 +372,7 @@ func (s *StaticPodConfig) Scheduler(_ context.Context, apiReady <-chan struct{},
Command: "kube-scheduler",
Args: args,
Image: image,
CISMode: s.CISMode,
HealthPort: 10259,
HealthProto: "HTTPS",
CPURequest: s.ControlPlaneResources.KubeSchedulerCPURequest,
Expand Down Expand Up @@ -439,6 +442,7 @@ func (s *StaticPodConfig) ControllerManager(_ context.Context, apiReady <-chan s
Args: args,
Image: image,
Dirs: onlyExisting(ssldirs),
CISMode: s.CISMode,
HealthPort: 10257,
HealthProto: "HTTPS",
CPURequest: s.ControlPlaneResources.KubeControllerManagerCPURequest,
Expand Down Expand Up @@ -469,6 +473,7 @@ func (s *StaticPodConfig) CloudControllerManager(_ context.Context, ccmRBACReady
Args: args,
Image: image,
Dirs: onlyExisting(ssldirs),
CISMode: s.CISMode,
HealthPort: 10258,
HealthProto: "HTTPS",
CPURequest: s.ControlPlaneResources.CloudControllerManagerCPURequest,
Expand Down Expand Up @@ -542,6 +547,7 @@ func (s *StaticPodConfig) ETCD(ctx context.Context, args executor.ETCDConfig, ex
args.PeerTrust.KeyFile,
args.PeerTrust.TrustedCAFile,
},
CISMode: s.CISMode,
HealthPort: 2381,
HealthPath: "/health?serializable=true",
HealthProto: "HTTP",
Expand Down
11 changes: 8 additions & 3 deletions pkg/staticpod/staticpod.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"encoding/hex"
"fmt"
"io"
"io/fs"
"io/ioutil"
"os"
"path/filepath"
Expand Down Expand Up @@ -50,6 +51,7 @@ type Args struct {
Image name.Reference
Dirs []string
Files []string
CISMode bool // CIS requires that the manifest be saved with 600 permissions
ExcludeFiles []string
HealthExec []string
HealthPort int32
Expand Down Expand Up @@ -123,10 +125,13 @@ func Run(dir string, args Args) error {
if err != nil {
return err
}
return writeFile(manifestPath, b)
if args.CISMode {
return writeFile(manifestPath, b, 0600)
}
return writeFile(manifestPath, b, 0644)
}

func writeFile(dest string, content []byte) error {
func writeFile(dest string, content []byte, perm fs.FileMode) error {
name := filepath.Base(dest)
dir := filepath.Dir(dest)
if err := os.MkdirAll(dir, 0700); err != nil {
Expand All @@ -149,7 +154,7 @@ func writeFile(dest string, content []byte) error {
defer os.RemoveAll(tmpdir)

tmp := filepath.Join(tmpdir, name)
if err := ioutil.WriteFile(tmp, content, 0644); err != nil {
if err := os.WriteFile(tmp, content, perm); err != nil {
return err
}
return os.Rename(tmp, dest)
Expand Down
5 changes: 5 additions & 0 deletions tests/e2e/vagrantdefaults.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,9 @@ def getInstallType(vm, version, branch)
scripts_location = Dir.exists?("./scripts") ? "./scripts" : "../scripts"
vm.provision "shell", path: scripts_location + "/latest_commit.sh", args: [branch, "/tmp/rke2_commits"]
return "INSTALL_RKE2_COMMIT=$(head\ -n\ 1\ /tmp/rke2_commits)"
end

def cisPrep(vm)
vm.provision "shell", inline: "useradd -r -c 'etcd user' -s /sbin/nologin -M etcd -U"
vm.provision "shell", inline: "printf 'vm.panic_on_oom=0\nvm.overcommit_memory=1\nkernel.panic=10\nkernel.panic_on_oops=1' > /etc/sysctl.d/60-rke2-cis.conf; systemctl restart systemd-sysctl"
end