From 885fb083e8b81be401e6a1f2b485f09442b29865 Mon Sep 17 00:00:00 2001 From: Patrick Spek Date: Thu, 4 Apr 2024 01:05:50 +0200 Subject: Remove unused k8s-master/node playbooks --- .../manifests.d/base-system/helm-controller.yaml | 23 ----- data.d/k8s-master/manifests.d/namespaces.yaml | 6 -- playbooks.d/k8s-master/description.txt | 1 - playbooks.d/k8s-master/etc/defaults | 4 - playbooks.d/k8s-master/playbook.bash | 115 --------------------- playbooks.d/k8s-node/description.txt | 1 - playbooks.d/k8s-node/etc/defaults | 4 - playbooks.d/k8s-node/playbook.bash | 103 ------------------ 8 files changed, 257 deletions(-) delete mode 100644 data.d/k8s-master/manifests.d/base-system/helm-controller.yaml delete mode 100644 data.d/k8s-master/manifests.d/namespaces.yaml delete mode 100644 playbooks.d/k8s-master/description.txt delete mode 100644 playbooks.d/k8s-master/etc/defaults delete mode 100644 playbooks.d/k8s-master/playbook.bash delete mode 100644 playbooks.d/k8s-node/description.txt delete mode 100644 playbooks.d/k8s-node/etc/defaults delete mode 100644 playbooks.d/k8s-node/playbook.bash diff --git a/data.d/k8s-master/manifests.d/base-system/helm-controller.yaml b/data.d/k8s-master/manifests.d/base-system/helm-controller.yaml deleted file mode 100644 index cd5895b..0000000 --- a/data.d/k8s-master/manifests.d/base-system/helm-controller.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: helm-controller - namespace: base-system - labels: - app: helm-controller -spec: - replicas: 1 - selector: - matchLabels: - app: helm-controller - template: - metadata: - labels: - app: helm-controller - spec: - containers: - - name: helm-controller - image: rancher/helm-controller:v0.12.1 - command: ["helm-controller"] -... diff --git a/data.d/k8s-master/manifests.d/namespaces.yaml b/data.d/k8s-master/manifests.d/namespaces.yaml deleted file mode 100644 index 78d7ab7..0000000 --- a/data.d/k8s-master/manifests.d/namespaces.yaml +++ /dev/null @@ -1,6 +0,0 @@ ---- -apiVersion: v1 -kind: Namespace -metadata: - name: base-system -... diff --git a/playbooks.d/k8s-master/description.txt b/playbooks.d/k8s-master/description.txt deleted file mode 100644 index 60693ef..0000000 --- a/playbooks.d/k8s-master/description.txt +++ /dev/null @@ -1 +0,0 @@ -Playbook for a Kubernetes master node diff --git a/playbooks.d/k8s-master/etc/defaults b/playbooks.d/k8s-master/etc/defaults deleted file mode 100644 index 9506887..0000000 --- a/playbooks.d/k8s-master/etc/defaults +++ /dev/null @@ -1,4 +0,0 @@ -pkg.containerd=containerd -pkg.kubeadm=kubeadm -pkg.kubectl=kubectl -pkg.kubelet=kubelet diff --git a/playbooks.d/k8s-master/playbook.bash b/playbooks.d/k8s-master/playbook.bash deleted file mode 100644 index f423c00..0000000 --- a/playbooks.d/k8s-master/playbook.bash +++ /dev/null @@ -1,115 +0,0 @@ -#!/usr/bin/env bash - -playbook_add() { - local version - - version="1.29" - - case "${BASHTARD_PLATFORM[key]}" in - linux-debian_gnu_linux) - # Fetch the apt key - info "$BASHTARD_PLAYBOOK" "Adding apt repository" - mkdir -pv -m 755 -- /etc/apt/keyrings - curl -fsSL "https://pkgs.k8s.io/core:/stable:/v$version/deb/Release.key" \ - | gpg --dearmor \ - > /etc/apt/keyrings/kubernetes-apt-keyring.gpg - printf "deb [signed-by=%s] %s /\n" \ - "/etc/apt/keyrings/kubernetes-apt-keyring.gpg" \ - "https://pkgs.k8s.io/core:/stable:/v$version/deb/" \ - > /etc/apt/sources.list.d/kubernetes.list - apt update - ;; - esac - - pkg install containerd - pkg install kubeadm - pkg install kubectl - pkg install kubelet - - info "$BASHTARD_PLAYBOOK" "Enabling forwarding" - cat <<-EOF > "$(config "fs.etcdir")/sysctl.d/kubernetes.conf" - net.bridge.bridge-nf-call-iptables = 1 - net.bridge.bridge-nf-call-ip6tables = 1 - net.ipv4.ip_forward = 1 - net.ipv6.conf.all.forwarding = 1 - EOF - - sysctl --system - - info "$BASHTARD_PLAYBOOK" "Enabling kernel modules" - cat <<-EOF > "$(config "fs.etcdir")/modules-load.d/kubernetes.conf" - br_netfilter - overlay - EOF - - modprobe overlay - modprobe br_netfilter - - notice "$BASHTARD_PLAYBOOK" "Creating data directories" - mkdir -pv -- "$(playbook_path "data")/manifests.d" - - if [[ "$(config "$BASHTARD_PLAYBOOK.flags.apiserver-advertise-address" "")" != "" ]] - then - notice "$BASHTARD_PLAYBOOK" "Setting node ip in $(config "fs.etcdir")/default/kubelet" - cat <<-EOF > "$(config "fs.etcdir")/default/kubelet" - KUBELET_EXTRA_ARGS="--node-ip=$(config "$BASHTARD_PLAYBOOK.flags.apiserver-advertise-address")" - EOF - fi - - notice "$BASHTARD_PLAYBOOK" "Initialize kubeadm" - kubeadm init \ - --apiserver-advertise-address="$(config "$BASHTARD_PLAYBOOK.flags.apiserver-advertise-address" "127.0.0.1")" \ - --apiserver-bind-port="$(config "$BASHTARD_PLAYBOOK.flags.apiserver-bind-port" "6443")" \ - --control-plane-endpoint="$(config "$BASHTARD_PLAYBOOK.flags.control-plane-endpoint" "localhost")" \ - --node-name="${BASHTARD_PLATFORM[fqdn]}" \ - --service-cidr="$(config "$BASHTARD_PLAYBOOK.flags.service-cidr" "10.96.0.0/12")" \ - --service-dns-domain="$(config "$BASHTARD_PLAYBOOK.flags.service-dns-domain" "cluster.local")" \ - --pod-network-cidr="$(config "$BASHTARD_PLAYBOOK.flags.pod-network-cidr" "10.0.0.0/12")" \ - || return 1 - - playbook_sync - - return 0 -} - -playbook_sync() { - local data - local kubeconfig - local manifest_prefix - local values - - data="$(playbook_path "data")" - kubeconfig="$(config "fs.etcdir")/kubernetes/admin.conf" - manifest_prefix="$(config "$BASHTARD_PLAYBOOK.manifest-prefix" "")" - - notice "$BASHTARD_PLAYBOOK/manifests" "Applying manifests.d" - kubectl --kubeconfig "$kubeconfig" apply --recursive --filename "$data/manifests.d/$manifest_prefix" -} - -playbook_del() { - kubeadm reset --force - iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X - ipvsadm -C - rm -fr -- \ - "$(config "fs.etcdir")/modules-load.d/kubernetes.conf" \ - "$(config "fs.etcdir")/sysctl.d/kubernetes.conf" \ - "$(config "fs.etcdir")/cni/net.d" \ - "$(config "fs.etcdir")/kubernetes" \ - "/var/lib/etcd" \ - "/var/lib/cni" - - pkg uninstall kubectl - pkg uninstall kubeadm - pkg uninstall kubelet - pkg uninstall containerd - - case "${BASHTARD_PLATFORM[key]}" in - linux-debian_gnu_linux) - # Fetch the apt key - info "$BASHTARD_PLAYBOOK" "Removing apt repository" - rm -fr -- \ - /etc/apt/keyrings/kubernetes-apt-keyring.gpg \ - /etc/apt/sources.list.d/kubernetes.list - ;; - esac -} diff --git a/playbooks.d/k8s-node/description.txt b/playbooks.d/k8s-node/description.txt deleted file mode 100644 index 60693ef..0000000 --- a/playbooks.d/k8s-node/description.txt +++ /dev/null @@ -1 +0,0 @@ -Playbook for a Kubernetes master node diff --git a/playbooks.d/k8s-node/etc/defaults b/playbooks.d/k8s-node/etc/defaults deleted file mode 100644 index 9506887..0000000 --- a/playbooks.d/k8s-node/etc/defaults +++ /dev/null @@ -1,4 +0,0 @@ -pkg.containerd=containerd -pkg.kubeadm=kubeadm -pkg.kubectl=kubectl -pkg.kubelet=kubelet diff --git a/playbooks.d/k8s-node/playbook.bash b/playbooks.d/k8s-node/playbook.bash deleted file mode 100644 index fbf49e9..0000000 --- a/playbooks.d/k8s-node/playbook.bash +++ /dev/null @@ -1,103 +0,0 @@ -#!/usr/bin/env bash - -BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.cert-hash]="required" -BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.master.address]="required" -BASHTARD_PLAYBOOK_VARS[$BASHTARD_PLAYBOOK.token]="required" - -playbook_add() { - local version - - version="1.29" - - case "${BASHTARD_PLATFORM[key]}" in - linux-debian_gnu_linux) - # Fetch the apt key - info "$BASHTARD_PLAYBOOK" "Adding apt repository" - mkdir -pv -m 755 -- /etc/apt/keyrings - curl -fsSL "https://pkgs.k8s.io/core:/stable:/v$version/deb/Release.key" \ - | gpg --dearmor \ - > /etc/apt/keyrings/kubernetes-apt-keyring.gpg - printf "deb [signed-by=%s] %s /\n" \ - "/etc/apt/keyrings/kubernetes-apt-keyring.gpg" \ - "https://pkgs.k8s.io/core:/stable:/v$version/deb/" \ - > /etc/apt/sources.list.d/kubernetes.list - apt update - ;; - esac - - pkg install containerd - pkg install kubeadm - pkg install kubectl - pkg install kubelet - - info "$BASHTARD_PLAYBOOK" "Enabling forwarding" - cat <<-EOF > "$(config "fs.etcdir")/sysctl.d/kubernetes.conf" - net.bridge.bridge-nf-call-iptables = 1 - net.bridge.bridge-nf-call-ip6tables = 1 - net.ipv4.ip_forward = 1 - net.ipv6.conf.all.forwarding = 1 - EOF - - sysctl --system - - info "$BASHTARD_PLAYBOOK" "Enabling kernel modules" - cat <<-EOF > "$(config "fs.etcdir")/modules-load.d/kubernetes.conf" - br_netfilter - overlay - EOF - - modprobe overlay - modprobe br_netfilter - - if [[ "$(config "$BASHTARD_PLAYBOOK.node-ip" "")" != "" ]] - then - notice "$BASHTARD_PLAYBOOK" "Setting node ip in $(config "fs.etcdir")/default/kubelet" - cat <<-EOF > "$(config "fs.etcdir")/default/kubelet" - KUBELET_EXTRA_ARGS="--node-ip=$(config "$BASHTARD_PLAYBOOK.node-ip")" - EOF - fi - - notice "$BASHTARD_PLAYBOOK" "Initialize kubeadm" - kubeadm join \ - --discovery-token-ca-cert-hash "$(config "$BASHTARD_PLAYBOOK.cert-hash")" \ - --node-name="${BASHTARD_PLATFORM[fqdn]}" \ - --token "$(config "$BASHTARD_PLAYBOOK.token")" \ - "$(config "$BASHTARD_PLAYBOOK.master.address"):$(config "$BASHTARD_PLAYBOOK.master.port" "6443")" -} - -playbook_sync() { - :; -} - -playbook_del() { - kubectl drain "${BASHTARD_PLATFORM[fqdn]}" \ - --delete-emptydir-data \ - --force \ - --ignore-daemonsets - - kubeadm reset --force - iptables -F && iptables -t nat -F && iptables -t mangle -F && iptables -X - ipvsadm -C - rm -fr -- \ - "$(config "fs.etcdir")/modules-load.d/kubernetes.conf" \ - "$(config "fs.etcdir")/sysctl.d/kubernetes.conf" \ - "$(config "fs.etcdir")/cni/net.d" \ - "$(config "fs.etcdir")/kubernetes" \ - "/var/lib/etcd" \ - "/var/lib/cni" - - pkg uninstall kubectl - pkg uninstall kubeadm - pkg uninstall kubelet - pkg uninstall containerd - - case "${BASHTARD_PLATFORM[key]}" in - linux-debian_gnu_linux) - # Fetch the apt key - info "$BASHTARD_PLAYBOOK" "Removing apt repository" - rm -fr -- \ - /etc/apt/keyrings/kubernetes-apt-keyring.gpg \ - /etc/apt/sources.list.d/kubernetes.list - ;; - esac -} -- cgit v1.1