Commit a79cc4fb authored by Muhammad Umair Khan's avatar Muhammad Umair Khan
Browse files

fix: PyInfra & meepctl

parent eaa5cfd5

deploy/pyinfra/lib/operations/kernel.py

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
from pyinfra import host

from pyinfra.operations import files, server, systemd

from pyinfra.facts.server import Command



disable_swap = host.data.get('disable_swap', True)



if disable_swap:

    # Disable swap at runtime if enabled.

    # We check if there's any swap configured first.

    swap_total = host.get_fact(Command, "free -m | awk '/Swap/ {print $2}'")

    

    if swap_total and swap_total.strip() != "0":

        server.shell(

            name="Disable swap at runtime if enabled",

            commands=["swapoff -a"],

            _sudo=True

        )



    # Comment out any active swap entries in fstab

    files.replace(

        name="Comment out any active swap entries in fstab",

        path="/etc/fstab",

        text=r'^([^#].*\s+swap\s+.*)$',

        replace=r'# \1',

        _sudo=True

    )



# Ensure kernel modules are present

modules = ["overlay", "br_netfilter"]

for mod in modules:

    server.modprobe(

        name=f"Ensure kernel module {mod} is present",

        module=mod,

        present=True,

        _sudo=True

    )



# Persist kernel modules

files.template(

    name="Persist kernel modules",

    src="templates/k8s.conf.j2", # We will create a template or just write a file

    dest="/etc/modules-load.d/k8s.conf",

    mode="0644",

    _sudo=True

)





# Configure sysctl for Kubernetes networking

sysctl_vars = [

    ("net.bridge.bridge-nf-call-iptables", 1),

    ("net.bridge.bridge-nf-call-ip6tables", 1),

    ("net.ipv4.ip_forward", 1),

    ("net.ipv6.conf.all.disable_ipv6", 1),

    ("net.ipv6.conf.default.disable_ipv6", 1),

    ("net.ipv6.conf.lo.disable_ipv6", 1),

]



for name, value in sysctl_vars:

    server.sysctl(

        name=f"Configure sysctl {name}",

        key=name,

        value=value,

        persist=True,

        _sudo=True

    )



# Reload systemd (if needed)

systemd.daemon_reload(

    name="Reload systemd",

    _sudo=True

)



# Disable IPv6 at the kernel level via GRUB

files.replace(

    name="Disable IPv6 in GRUB",

    path="/etc/default/grub",

    text=r'^GRUB_CMDLINE_LINUX="((?!.*ipv6\.disable=1).*)"$',

    replace=r'GRUB_CMDLINE_LINUX="\1 ipv6.disable=1"',

    _sudo=True

)



server.shell(

    name="Update GRUB",

    commands=["update-grub"],

    _sudo=True

)

go-apps/meepctl/cmd/delete.go

+4 −8
Original line number Diff line number Diff line
@@ -18,12 +18,11 @@ package cmd 


import (

	"fmt"

	"os/exec"



	"sync"

	"time"



	"github.com/InterDigitalInc/AdvantEDGE/go-apps/meepctl/utils"



	"github.com/spf13/cobra"

)
@@ -172,14 +171,11 @@ func k8sDelete(component string, cobraCmd *cobra.Command) string { 
	if exist {

		switch component {

		case "meep-prometheus":

			cmd := exec.Command("kubectl", "delete", "pvc", "-l", "prometheus=meep-prometheus-prometheus", "--wait=false")

			_ = cmd.Run()

			// PVCs are created by StatefulSet and shouldn't be deleted manually if we want to retain data

		case "meep-thanos":

			cmd := exec.Command("kubectl", "delete", "pvc", "meep-thanos-rustfs-data", "meep-thanos-rustfs-logs", "--wait=false", "--ignore-not-found")

			_ = cmd.Run()

			// PVCs are kept by helm resource-policy, so we don't manually delete them

		case "meep-thanos-archive":

			cmd := exec.Command("kubectl", "delete", "pvc", "meep-thanos-archive-rustfs-data", "meep-thanos-archive-rustfs-logs", "--wait=false", "--ignore-not-found")

			_ = cmd.Run()

			// PVCs are kept by helm resource-policy, so we don't manually delete them

		}

		// Delete

		outDel, err := utils.HelmDelete(component, cobraCmd)