From 154f11bae8128ef3b18ba79d29f9ff73efa20907 Mon Sep 17 00:00:00 2001 From: Graham McIntire Date: Fri, 13 Jun 2025 13:10:58 -0500 Subject: [PATCH] shuffle --- ansible/roles/common/tasks/main.yml | 15 +++++----- clusters/homelab/metallb-values.yaml | 29 +++++++++++++++++++ clusters/homelab/metallb/ipaddresspool.yaml | 8 +++++ clusters/homelab/metallb/kustomization.yaml | 8 +++++ clusters/homelab/metallb/l2advertisement.yaml | 8 +++++ {clusters => old}/k3s/argo/ingress.yaml | 0 .../k3s/cert-manager/cert-manager-issuer.yml | 0 .../dashboard/dashboard.admin-user-role.yml | 0 .../k3s/dashboard/dashboard.admin-user.yml | 0 {clusters => old}/k3s/ip/ip-deployment.yml | 0 {clusters => old}/k3s/ip/ip-headless.yml | 0 .../k3s/ip/ip-ingress-traefik-tls.yaml | 0 {clusters => old}/k3s/ip/ip-ingress.yml | 0 {clusters => old}/k3s/ip/ip-service.yml | 0 {clusters => old}/k3s/portal/deployment.yml | 0 {clusters => old}/k3s/portal/headless.yml | 0 {clusters => old}/k3s/portal/ingress.yml | 0 {clusters => old}/k3s/portal/pv.yaml | 0 {clusters => old}/k3s/portal/service.yml | 0 .../k3s/technitium-localstorage.yaml | 0 .../traefik/dashboard-auth-middleware.yaml | 0 .../k3s/traefik/dashboard-auth-secret.yaml | 0 .../k3s/traefik/letsencrypt-prod.yaml | 0 .../traefik/traefik-dashboard-ingress.yaml | 0 .../traefik/traefik-dashboard-service.yaml | 0 .../traefik-https-redirect-middleware.yaml | 0 .../k3s/whoami/whoami-deployment.yaml | 0 .../k3s/whoami/whoami-ingress-tls.yaml | 0 .../k3s/whoami/whoami-ingress.yaml | 0 .../k3s/whoami/whoami-service.yaml | 0 30 files changed, 60 insertions(+), 8 deletions(-) create mode 100644 clusters/homelab/metallb-values.yaml create mode 100644 clusters/homelab/metallb/ipaddresspool.yaml create mode 100644 clusters/homelab/metallb/kustomization.yaml create mode 100644 clusters/homelab/metallb/l2advertisement.yaml rename {clusters => old}/k3s/argo/ingress.yaml (100%) rename {clusters => old}/k3s/cert-manager/cert-manager-issuer.yml (100%) rename {clusters => old}/k3s/dashboard/dashboard.admin-user-role.yml (100%) rename {clusters => old}/k3s/dashboard/dashboard.admin-user.yml (100%) rename {clusters => old}/k3s/ip/ip-deployment.yml (100%) rename {clusters => old}/k3s/ip/ip-headless.yml (100%) rename {clusters => old}/k3s/ip/ip-ingress-traefik-tls.yaml (100%) rename {clusters => old}/k3s/ip/ip-ingress.yml (100%) rename {clusters => old}/k3s/ip/ip-service.yml (100%) rename {clusters => old}/k3s/portal/deployment.yml (100%) rename {clusters => old}/k3s/portal/headless.yml (100%) rename {clusters => old}/k3s/portal/ingress.yml (100%) rename {clusters => old}/k3s/portal/pv.yaml (100%) rename {clusters => old}/k3s/portal/service.yml (100%) rename {clusters => old}/k3s/technitium-localstorage.yaml (100%) rename {clusters => old}/k3s/traefik/dashboard-auth-middleware.yaml (100%) rename {clusters => old}/k3s/traefik/dashboard-auth-secret.yaml (100%) rename {clusters => old}/k3s/traefik/letsencrypt-prod.yaml (100%) rename {clusters => old}/k3s/traefik/traefik-dashboard-ingress.yaml (100%) rename {clusters => old}/k3s/traefik/traefik-dashboard-service.yaml (100%) rename {clusters => old}/k3s/traefik/traefik-https-redirect-middleware.yaml (100%) rename {clusters => old}/k3s/whoami/whoami-deployment.yaml (100%) rename {clusters => old}/k3s/whoami/whoami-ingress-tls.yaml (100%) rename {clusters => old}/k3s/whoami/whoami-ingress.yaml (100%) rename {clusters => old}/k3s/whoami/whoami-service.yaml (100%) diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml index 69a11d5..c9a3418 100644 --- a/ansible/roles/common/tasks/main.yml +++ b/ansible/roles/common/tasks/main.yml @@ -29,11 +29,10 @@ line: "Banner /etc/issue.net" state: present notify: Restart ssh - -- name: Disallow root SSH access - ansible.builtin.lineinfile: - dest: /etc/ssh/sshd_config - regexp: "^PermitRootLogin" - line: "PermitRootLogin no" - state: present - # notify: Restart ssh +# - name: Disallow root SSH access +# ansible.builtin.lineinfile: +# dest: /etc/ssh/sshd_config +# regexp: "^PermitRootLogin" +# line: "PermitRootLogin no" +# state: present +# notify: Restart ssh diff --git a/clusters/homelab/metallb-values.yaml b/clusters/homelab/metallb-values.yaml new file mode 100644 index 0000000..7b913d6 --- /dev/null +++ b/clusters/homelab/metallb-values.yaml @@ -0,0 +1,29 @@ +# MetalLB configuration for homelab cluster +# Using the new CRD-based configuration format (v0.13.0+) + +# Controller configuration +controller: + enabled: true + +# Speaker configuration +speaker: + enabled: true + +# FRR mode is disabled by default +frr: + enabled: false + +# Prometheus metrics +prometheus: + serviceMonitor: + enabled: false + prometheusRule: + enabled: false + +# Create the IPAddressPool and L2Advertisement resources +# These replace the deprecated configInline format +crds: + enabled: true +# Note: The actual IP address pool and L2 advertisement configuration +# must now be created as separate Kubernetes resources after MetalLB is installed. +# See the accompanying IPAddressPool and L2Advertisement manifests. diff --git a/clusters/homelab/metallb/ipaddresspool.yaml b/clusters/homelab/metallb/ipaddresspool.yaml new file mode 100644 index 0000000..7a95f15 --- /dev/null +++ b/clusters/homelab/metallb/ipaddresspool.yaml @@ -0,0 +1,8 @@ +apiVersion: metallb.io/v1beta1 +kind: IPAddressPool +metadata: + name: default + namespace: metallb-system +spec: + addresses: + - 10.0.19.1-10.0.19.199 diff --git a/clusters/homelab/metallb/kustomization.yaml b/clusters/homelab/metallb/kustomization.yaml new file mode 100644 index 0000000..967bff2 --- /dev/null +++ b/clusters/homelab/metallb/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +namespace: metallb-system + +resources: + - ipaddresspool.yaml + - l2advertisement.yaml diff --git a/clusters/homelab/metallb/l2advertisement.yaml b/clusters/homelab/metallb/l2advertisement.yaml new file mode 100644 index 0000000..ceb81f5 --- /dev/null +++ b/clusters/homelab/metallb/l2advertisement.yaml @@ -0,0 +1,8 @@ +apiVersion: metallb.io/v1beta1 +kind: L2Advertisement +metadata: + name: default + namespace: metallb-system +spec: + ipAddressPools: + - default diff --git a/clusters/k3s/argo/ingress.yaml b/old/k3s/argo/ingress.yaml similarity index 100% rename from clusters/k3s/argo/ingress.yaml rename to old/k3s/argo/ingress.yaml diff --git a/clusters/k3s/cert-manager/cert-manager-issuer.yml b/old/k3s/cert-manager/cert-manager-issuer.yml similarity index 100% rename from clusters/k3s/cert-manager/cert-manager-issuer.yml rename to old/k3s/cert-manager/cert-manager-issuer.yml diff --git a/clusters/k3s/dashboard/dashboard.admin-user-role.yml b/old/k3s/dashboard/dashboard.admin-user-role.yml similarity index 100% rename from clusters/k3s/dashboard/dashboard.admin-user-role.yml rename to old/k3s/dashboard/dashboard.admin-user-role.yml diff --git a/clusters/k3s/dashboard/dashboard.admin-user.yml b/old/k3s/dashboard/dashboard.admin-user.yml similarity index 100% rename from clusters/k3s/dashboard/dashboard.admin-user.yml rename to old/k3s/dashboard/dashboard.admin-user.yml diff --git a/clusters/k3s/ip/ip-deployment.yml b/old/k3s/ip/ip-deployment.yml similarity index 100% rename from clusters/k3s/ip/ip-deployment.yml rename to old/k3s/ip/ip-deployment.yml diff --git a/clusters/k3s/ip/ip-headless.yml b/old/k3s/ip/ip-headless.yml similarity index 100% rename from clusters/k3s/ip/ip-headless.yml rename to old/k3s/ip/ip-headless.yml diff --git a/clusters/k3s/ip/ip-ingress-traefik-tls.yaml b/old/k3s/ip/ip-ingress-traefik-tls.yaml similarity index 100% rename from clusters/k3s/ip/ip-ingress-traefik-tls.yaml rename to old/k3s/ip/ip-ingress-traefik-tls.yaml diff --git a/clusters/k3s/ip/ip-ingress.yml b/old/k3s/ip/ip-ingress.yml similarity index 100% rename from clusters/k3s/ip/ip-ingress.yml rename to old/k3s/ip/ip-ingress.yml diff --git a/clusters/k3s/ip/ip-service.yml b/old/k3s/ip/ip-service.yml similarity index 100% rename from clusters/k3s/ip/ip-service.yml rename to old/k3s/ip/ip-service.yml diff --git a/clusters/k3s/portal/deployment.yml b/old/k3s/portal/deployment.yml similarity index 100% rename from clusters/k3s/portal/deployment.yml rename to old/k3s/portal/deployment.yml diff --git a/clusters/k3s/portal/headless.yml b/old/k3s/portal/headless.yml similarity index 100% rename from clusters/k3s/portal/headless.yml rename to old/k3s/portal/headless.yml diff --git a/clusters/k3s/portal/ingress.yml b/old/k3s/portal/ingress.yml similarity index 100% rename from clusters/k3s/portal/ingress.yml rename to old/k3s/portal/ingress.yml diff --git a/clusters/k3s/portal/pv.yaml b/old/k3s/portal/pv.yaml similarity index 100% rename from clusters/k3s/portal/pv.yaml rename to old/k3s/portal/pv.yaml diff --git a/clusters/k3s/portal/service.yml b/old/k3s/portal/service.yml similarity index 100% rename from clusters/k3s/portal/service.yml rename to old/k3s/portal/service.yml diff --git a/clusters/k3s/technitium-localstorage.yaml b/old/k3s/technitium-localstorage.yaml similarity index 100% rename from clusters/k3s/technitium-localstorage.yaml rename to old/k3s/technitium-localstorage.yaml diff --git a/clusters/k3s/traefik/dashboard-auth-middleware.yaml b/old/k3s/traefik/dashboard-auth-middleware.yaml similarity index 100% rename from clusters/k3s/traefik/dashboard-auth-middleware.yaml rename to old/k3s/traefik/dashboard-auth-middleware.yaml diff --git a/clusters/k3s/traefik/dashboard-auth-secret.yaml b/old/k3s/traefik/dashboard-auth-secret.yaml similarity index 100% rename from clusters/k3s/traefik/dashboard-auth-secret.yaml rename to old/k3s/traefik/dashboard-auth-secret.yaml diff --git a/clusters/k3s/traefik/letsencrypt-prod.yaml b/old/k3s/traefik/letsencrypt-prod.yaml similarity index 100% rename from clusters/k3s/traefik/letsencrypt-prod.yaml rename to old/k3s/traefik/letsencrypt-prod.yaml diff --git a/clusters/k3s/traefik/traefik-dashboard-ingress.yaml b/old/k3s/traefik/traefik-dashboard-ingress.yaml similarity index 100% rename from clusters/k3s/traefik/traefik-dashboard-ingress.yaml rename to old/k3s/traefik/traefik-dashboard-ingress.yaml diff --git a/clusters/k3s/traefik/traefik-dashboard-service.yaml b/old/k3s/traefik/traefik-dashboard-service.yaml similarity index 100% rename from clusters/k3s/traefik/traefik-dashboard-service.yaml rename to old/k3s/traefik/traefik-dashboard-service.yaml diff --git a/clusters/k3s/traefik/traefik-https-redirect-middleware.yaml b/old/k3s/traefik/traefik-https-redirect-middleware.yaml similarity index 100% rename from clusters/k3s/traefik/traefik-https-redirect-middleware.yaml rename to old/k3s/traefik/traefik-https-redirect-middleware.yaml diff --git a/clusters/k3s/whoami/whoami-deployment.yaml b/old/k3s/whoami/whoami-deployment.yaml similarity index 100% rename from clusters/k3s/whoami/whoami-deployment.yaml rename to old/k3s/whoami/whoami-deployment.yaml diff --git a/clusters/k3s/whoami/whoami-ingress-tls.yaml b/old/k3s/whoami/whoami-ingress-tls.yaml similarity index 100% rename from clusters/k3s/whoami/whoami-ingress-tls.yaml rename to old/k3s/whoami/whoami-ingress-tls.yaml diff --git a/clusters/k3s/whoami/whoami-ingress.yaml b/old/k3s/whoami/whoami-ingress.yaml similarity index 100% rename from clusters/k3s/whoami/whoami-ingress.yaml rename to old/k3s/whoami/whoami-ingress.yaml diff --git a/clusters/k3s/whoami/whoami-service.yaml b/old/k3s/whoami/whoami-service.yaml similarity index 100% rename from clusters/k3s/whoami/whoami-service.yaml rename to old/k3s/whoami/whoami-service.yaml