Skip to content

Commit 93df72a

Browse files
committed
fix: Drop sudo
1 parent e7118f5 commit 93df72a

File tree

3 files changed

+24
-26
lines changed

3 files changed

+24
-26
lines changed
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
- name: Remove Docker's old versions if installed
2-
become: true
32
apt:
43
name: "{{ item }}"
54
state: absent
@@ -13,31 +12,31 @@
1312
ignore_errors: true
1413

1514
- name: Remove Docker's official GPG key if it exists
16-
shell: sudo rm -f /etc/apt/trusted.gpg.d/docker.gpg
15+
shell: rm -f /etc/apt/trusted.gpg.d/docker.gpg
1716
ignore_errors: true
1817

1918
- name: Add Docker's official GPG key
20-
shell: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmour -o /etc/apt/trusted.gpg.d/docker.gpg
19+
shell: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmour -o /etc/apt/trusted.gpg.d/docker.gpg
2120

2221
- name: Add Docker repository
23-
shell: sudo add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
22+
shell: add-apt-repository -y "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
2423

2524
- name: Install containerd
2625
shell: |
27-
sudo apt update
28-
sudo apt install -y containerd.io
26+
apt update
27+
apt install -y containerd.io
2928
3029
- name: Create containerd configuration directory
31-
shell: sudo mkdir -p /etc/containerd
30+
shell: mkdir -p /etc/containerd
3231

3332
- name: Generate containerd default configuration
3433
shell: |
35-
containerd config default | sudo tee /etc/containerd/config.toml
34+
containerd config default | tee /etc/containerd/config.toml
3635
3736
- name: Configure containerd to use systemd cgroup driver
38-
shell: sudo sed -i 's/SystemdCgroup \= false/SystemdCgroup \= true/g' /etc/containerd/config.toml
37+
shell: sed -i 's/SystemdCgroup \= false/SystemdCgroup \= true/g' /etc/containerd/config.toml
3938

4039
- name: Restart and enable containerd service
4140
shell: |
42-
sudo systemctl restart containerd
43-
sudo systemctl enable containerd
41+
systemctl restart containerd
42+
systemctl enable containerd
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
---
21
- name: Create keyrings directory
3-
shell: sudo mkdir -p /etc/apt/keyrings
2+
shell: mkdir -p /etc/apt/keyrings
43

54
- name: Download Kubernetes APT key
65
get_url:
@@ -9,19 +8,19 @@
98
mode: '0644'
109

1110
- name: Remove Kubernetes APT key if it exists
12-
shell: sudo rm -f /etc/apt/keyrings/kubernetes-apt-keyring.gpg
11+
shell: rm -f /etc/apt/keyrings/kubernetes-apt-keyring.gpg
1312

1413
- name: Add Kubernetes APT key
15-
shell: sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg /tmp/kubernetes.key
14+
shell: gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg /tmp/kubernetes.key
1615

1716
- name: Add Kubernetes APT repository
18-
shell: echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/{{ kubernetes_version }}/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
17+
shell: echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/{{ kubernetes_version }}/deb/ /' | tee /etc/apt/sources.list.d/kubernetes.list
1918

2019
- name: Update apt cache and install Kubernetes components
21-
shell: sudo apt update && sudo apt install -y kubelet kubeadm kubectl
20+
shell: apt update && apt install -y kubelet kubeadm kubectl
2221

2322
- name: Hold Kubernetes packages
24-
shell: sudo apt-mark hold kubelet kubeadm kubectl
23+
shell: apt-mark hold kubelet kubeadm kubectl
2524

2625
- name: Enable kubelet service
27-
shell: sudo systemctl enable kubelet
26+
shell: systemctl enable kubelet

infrastructure/server-setup/tasks/k8s/system-preparation.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
- name: Disable swap
2-
shell: sudo swapoff -a
2+
shell: swapoff -a
33

44
- name: Remove swap from fstab
5-
shell: sudo sed -i '/ swap / s/^\(.*\)$/#\1/g' /etc/fstab
5+
shell: sed -i '/ swap / s/^\(.*\)$/#\1/g' /etc/fstab
66

77
- name: Load required kernel modules
88
shell: |
9-
sudo tee /etc/modules-load.d/containerd.conf <<EOF
9+
tee /etc/modules-load.d/containerd.conf <<EOF
1010
overlay
1111
br_netfilter
1212
EOF
1313
1414
- name: Load overlay module
15-
shell: sudo modprobe overlay
15+
shell: modprobe overlay
1616

1717
- name: Load br_netfilter module
18-
shell: sudo modprobe br_netfilter
18+
shell: modprobe br_netfilter
1919

2020
- name: Configure kernel parameters for Kubernetes
2121
shell: |
22-
sudo tee /etc/sysctl.d/99-kubernetes-cri.conf <<EOF
22+
tee /etc/sysctl.d/99-kubernetes-cri.conf <<EOF
2323
net.bridge.bridge-nf-call-iptables = 1
2424
net.ipv4.ip_forward = 1
2525
net.bridge.bridge-nf-call-ip6tables = 1
@@ -36,4 +36,4 @@
3636
# EOF
3737

3838
- name: Apply sysctl settings
39-
shell: sudo sysctl --system
39+
shell: sysctl --system

0 commit comments

Comments
 (0)