diff --git a/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2 b/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2 index 54243958..9762d93a 100644 --- a/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2 +++ b/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2 @@ -93,7 +93,7 @@ - name: Remove local storage path ansible.builtin.file: - path: "#{ bootstrap_advanced_flags.local_storage_path|default('/var/openebs/local', true) }#" + path: /var/openebs/local state: absent - name: Reboot diff --git a/bootstrap/templates/ansible/playbooks/cluster-prepare.yaml.j2 b/bootstrap/templates/ansible/playbooks/cluster-prepare.yaml.j2 index f06c3d39..ee4cb1c0 100644 --- a/bootstrap/templates/ansible/playbooks/cluster-prepare.yaml.j2 +++ b/bootstrap/templates/ansible/playbooks/cluster-prepare.yaml.j2 @@ -23,23 +23,11 @@ - name: Packages | Install ansible.builtin.apt: name: apt-transport-https,ca-certificates,conntrack,curl,dirmngr,gdisk,gnupg,hdparm,htop, - iptables,iputils-ping,ipvsadm,libseccomp2,lm-sensors,neofetch,net-tools,nfs-common, + iptables,iputils-ping,ipvsadm,libseccomp2,lm-sensors,net-tools,nfs-common, nvme-cli,open-iscsi,parted,psmisc,python3,python3-apt,python3-kubernetes,python3-yaml, smartmontools,socat,software-properties-common,unzip,util-linux install_recommends: false - - name: User Configuration - block: - - name: User Configuration | Silence login - ansible.builtin.file: - dest: "{{ '/home/' + ansible_user if ansible_user != 'root' else '/root' }}/.hushlogin" - state: touch - owner: "{{ ansible_user }}" - group: "{{ ansible_user }}" - mode: "0644" - modification_time: preserve - access_time: preserve - - name: Network Configuration notify: Reboot block: @@ -82,11 +70,6 @@ - name: System Configuration notify: Reboot block: - - name: System Configuration | Neofetch - ansible.builtin.copy: - dest: /etc/profile.d/neofetch.sh - mode: "0755" - content: neofetch --config none - name: System Configuration | Disable apparmor when: ansible_facts.services['apparmor.service'] is defined ansible.builtin.systemd: diff --git a/bootstrap/templates/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 index 0cd13e40..3eb8f347 100644 --- a/bootstrap/templates/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/kubernetes/apps/openebs-system/openebs/app/helmrelease.yaml.j2 @@ -28,4 +28,4 @@ spec: enabled: true name: openebs-hostpath isDefaultClass: false - basePath: "#{ bootstrap_advanced_flags.local_storage_path|default('/var/openebs/local', true) }#" + basePath: /var/openebs/local diff --git a/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 b/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 index b89cb109..20d35ce1 100644 --- a/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 +++ b/bootstrap/templates/kubernetes/k0s/k0sctl.yaml.j2 @@ -13,31 +13,37 @@ spec: installFlags: - --disable-components=metrics-server - --no-taints + files: + - name: bootstrap-scripts + src: scripts hooks: apply: before: - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/apply-system.sh | INSTALL_K0S_HOSTNAME="#{ item.name }#" bash -s - - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/apply-kube-vip.sh | bash -s - + - bash apply-system.sh "#{ item.name }#" + - bash apply-kube-vip.sh reset: before: - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/reset-cilium.sh | bash -s - + - bash reset-cilium.sh after: - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/reset-system.sh | bash -s - + - bash reset-system.sh #% endfor %# #% for item in bootstrap_nodes.worker %# - role: worker ssh: address: "#{ item.address }#" user: "#{ item.ssh.username }#" + files: + - name: bootstrap-scripts + src: scripts hooks: apply: before: - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/apply-system.sh | INSTALL_K0S_HOSTNAME="#{ item.name }#" bash -s - + - bash apply-system.sh "#{ item.name }#" reset: before: - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/reset-cilium.sh | bash -s - + - bash reset-cilium.sh after: - - curl -sfL https://raw.githubusercontent.com/#{ bootstrap_github_username }#/#{ bootstrap_github_repository_name }#/#{ bootstrap_advanced_flags.github_repository_branch|default('main', true) }#/kubernetes/k0s/resources/reset-system.sh | bash -s - + - bash reset-system.sh #% endfor %# k0s: # renovate: datasource=github-releases depName=k0sproject/k0s diff --git a/bootstrap/templates/kubernetes/k0s/resources/apply-kube-vip.sh.j2 b/bootstrap/templates/kubernetes/k0s/scripts/apply-kube-vip.sh.j2 similarity index 68% rename from bootstrap/templates/kubernetes/k0s/resources/apply-kube-vip.sh.j2 rename to bootstrap/templates/kubernetes/k0s/scripts/apply-kube-vip.sh.j2 index c8b12a34..2578fb5a 100755 --- a/bootstrap/templates/kubernetes/k0s/resources/apply-kube-vip.sh.j2 +++ b/bootstrap/templates/kubernetes/k0s/scripts/apply-kube-vip.sh.j2 @@ -8,11 +8,11 @@ set -o noglob mkdir -p /var/lib/k0s/manifests/kube-vip # Create kube-vip rbac -tee /var/lib/k0s/manifests/kube-vip/kube-vip-rbac.yaml > /dev/null </var/lib/k0s/manifests/kube-vip/kube-vip-rbac.yaml < /dev/null </var/lib/k0s/manifests/kube-vip/kube-vip-ds.yaml < /dev/null </etc/hosts < /dev/null </etc/resolv.conf < /dev/null </etc/sysctl.d/99-kubernetes.conf < /dev/null < /dev/null </etc/k0s/containerd.d/default.toml </dev/null | grep 'cilium' | while read ignore iface ignore; do iface=${iface%%@*} - [ -z "$iface" ] || ip link delete $iface + [ -z "$iface" ] || (ip link delete $iface || true) done } diff --git a/bootstrap/templates/kubernetes/k0s/resources/reset-system.sh.j2 b/bootstrap/templates/kubernetes/k0s/scripts/reset-system.sh.j2 similarity index 68% rename from bootstrap/templates/kubernetes/k0s/resources/reset-system.sh.j2 rename to bootstrap/templates/kubernetes/k0s/scripts/reset-system.sh.j2 index c09acf48..258ee9d5 100755 --- a/bootstrap/templates/kubernetes/k0s/resources/reset-system.sh.j2 +++ b/bootstrap/templates/kubernetes/k0s/scripts/reset-system.sh.j2 @@ -8,7 +8,7 @@ set -o noglob rm -rf /etc/k0s/containerd.d # Remove local storage data -rm -rf "#{ bootstrap_advanced_flags.local_storage_path|default('/var/openebs/local', true) }#" +rm -rf /var/openebs/local # Reboot (sleep 10 && systemctl reboot)& diff --git a/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 b/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 index 8a471d4f..f5546741 100644 --- a/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 +++ b/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 @@ -82,7 +82,7 @@ l2announcements: #% endif %# loadBalancer: algorithm: maglev - mode: "#{ bootstrap_advanced_flags.cilium_loadbalancer_mode|default('dsr', true) }#" + mode: dsr localRedirectPolicy: true operator: replicas: 1 diff --git a/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 b/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 index 4ffdec89..8d853650 100644 --- a/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 +++ b/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 @@ -50,7 +50,7 @@ l2announcements: #% endif %# loadBalancer: algorithm: maglev - mode: "#{ bootstrap_advanced_flags.cilium_loadbalancer_mode|default('dsr', true) }#" + mode: dsr localRedirectPolicy: true operator: replicas: 1 diff --git a/bootstrap/vars/config.sample.yaml b/bootstrap/vars/config.sample.yaml index 18b27296..8c15a7c9 100644 --- a/bootstrap/vars/config.sample.yaml +++ b/bootstrap/vars/config.sample.yaml @@ -102,15 +102,6 @@ bootstrap_nodes: # # Disable to prevent changes to nodes /etc/resolv.conf # update_resolv_conf: true # -# # Cilium load balancer mode, choose either 'dsr' or 'snat' -# # Due to unknown reasons some people need this set to 'snat' in order -# # for Cilium L2 announcements to work properly. Keep this dsr unless -# # you have issues with connecting to Cilium L2 announcements. -# cilium_loadbalancer_mode: dsr -# -# # Path for openebs openebs-hostpath to use for storage on ALL nodes -# local_storage_path: /var/openebs/local -# # # Enable Dual Stack IPv4 first # # IMPORTANT: I am looking for people to help maintain IPv6 support since I cannot test it. # # https://github.com/onedr0p/flux-cluster-template/issues/1148