From a419273f5bf478acb7fa6376d30e0d75b42ce4da Mon Sep 17 00:00:00 2001 From: Joseph Hanson Date: Sun, 25 Feb 2024 10:39:29 -0600 Subject: [PATCH] Removing Ansible scripts and taskfiles. --- .../.taskfiles}/Ansible/Taskfile.yaml | 0 .../ansible}/cilium-install.sh | 0 {ansible => .archive/ansible}/main/.envrc | 0 .../main/inventory/group_vars/all/main.yaml | 0 .../group_vars/all/supplemental.yaml | 0 .../inventory/group_vars/master/main.yaml | 0 .../inventory/group_vars/worker/main.yaml | 0 .../ansible}/main/inventory/hosts.yaml | 0 .../main/playbooks/cluster-add-user.yaml | 0 .../main/playbooks/cluster-ceph-reset.yaml | 0 .../main/playbooks/cluster-installation.yaml | 0 .../ansible}/main/playbooks/cluster-nuke.yaml | 0 .../main/playbooks/cluster-prepare.yaml | 0 .../playbooks/cluster-rollout-update.yaml | 0 .../ansible}/main/playbooks/files/.vimrc | 0 .../playbooks/files/config.nvidia.toml.tmpl | 0 .../main/playbooks/files/config.toml.tmpl | 0 .../playbooks/files/stale-containers.service | 0 .../playbooks/files/stale-containers.timer | 0 .../ansible}/main/playbooks/tasks/cilium.yaml | 0 .../main/playbooks/tasks/coredns.yaml | 0 .../ansible}/main/playbooks/tasks/cruft.yaml | 0 .../main/playbooks/tasks/helm_controller.yaml | 0 .../playbooks/tasks/stale_containers.yaml | 0 .../templates/custom-cilium-helmchart.yaml.j2 | 0 .../custom-coredns-helmchart.yaml.j2 | 0 .../ansible}/requirements.txt | 0 .../ansible}/requirements.yaml | 0 .task/checksum/ansible--venv | 1 - Taskfile.yaml | 41 ------------------- 30 files changed, 42 deletions(-) rename {.taskfiles => .archive/.taskfiles}/Ansible/Taskfile.yaml (100%) rename {ansible => .archive/ansible}/cilium-install.sh (100%) rename {ansible => .archive/ansible}/main/.envrc (100%) rename {ansible => .archive/ansible}/main/inventory/group_vars/all/main.yaml (100%) rename {ansible => .archive/ansible}/main/inventory/group_vars/all/supplemental.yaml (100%) rename {ansible => .archive/ansible}/main/inventory/group_vars/master/main.yaml (100%) rename {ansible => .archive/ansible}/main/inventory/group_vars/worker/main.yaml (100%) rename {ansible => .archive/ansible}/main/inventory/hosts.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/cluster-add-user.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/cluster-ceph-reset.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/cluster-installation.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/cluster-nuke.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/cluster-prepare.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/cluster-rollout-update.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/files/.vimrc (100%) rename {ansible => .archive/ansible}/main/playbooks/files/config.nvidia.toml.tmpl (100%) rename {ansible => .archive/ansible}/main/playbooks/files/config.toml.tmpl (100%) rename {ansible => .archive/ansible}/main/playbooks/files/stale-containers.service (100%) rename {ansible => .archive/ansible}/main/playbooks/files/stale-containers.timer (100%) rename {ansible => .archive/ansible}/main/playbooks/tasks/cilium.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/tasks/coredns.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/tasks/cruft.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/tasks/helm_controller.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/tasks/stale_containers.yaml (100%) rename {ansible => .archive/ansible}/main/playbooks/templates/custom-cilium-helmchart.yaml.j2 (100%) rename {ansible => .archive/ansible}/main/playbooks/templates/custom-coredns-helmchart.yaml.j2 (100%) rename {ansible => .archive/ansible}/requirements.txt (100%) rename {ansible => .archive/ansible}/requirements.yaml (100%) delete mode 100644 .task/checksum/ansible--venv diff --git a/.taskfiles/Ansible/Taskfile.yaml b/.archive/.taskfiles/Ansible/Taskfile.yaml similarity index 100% rename from .taskfiles/Ansible/Taskfile.yaml rename to .archive/.taskfiles/Ansible/Taskfile.yaml diff --git a/ansible/cilium-install.sh b/.archive/ansible/cilium-install.sh similarity index 100% rename from ansible/cilium-install.sh rename to .archive/ansible/cilium-install.sh diff --git a/ansible/main/.envrc b/.archive/ansible/main/.envrc similarity index 100% rename from ansible/main/.envrc rename to .archive/ansible/main/.envrc diff --git a/ansible/main/inventory/group_vars/all/main.yaml b/.archive/ansible/main/inventory/group_vars/all/main.yaml similarity index 100% rename from ansible/main/inventory/group_vars/all/main.yaml rename to .archive/ansible/main/inventory/group_vars/all/main.yaml diff --git a/ansible/main/inventory/group_vars/all/supplemental.yaml b/.archive/ansible/main/inventory/group_vars/all/supplemental.yaml similarity index 100% rename from ansible/main/inventory/group_vars/all/supplemental.yaml rename to .archive/ansible/main/inventory/group_vars/all/supplemental.yaml diff --git a/ansible/main/inventory/group_vars/master/main.yaml b/.archive/ansible/main/inventory/group_vars/master/main.yaml similarity index 100% rename from ansible/main/inventory/group_vars/master/main.yaml rename to .archive/ansible/main/inventory/group_vars/master/main.yaml diff --git a/ansible/main/inventory/group_vars/worker/main.yaml b/.archive/ansible/main/inventory/group_vars/worker/main.yaml similarity index 100% rename from ansible/main/inventory/group_vars/worker/main.yaml rename to .archive/ansible/main/inventory/group_vars/worker/main.yaml diff --git a/ansible/main/inventory/hosts.yaml b/.archive/ansible/main/inventory/hosts.yaml similarity index 100% rename from ansible/main/inventory/hosts.yaml rename to .archive/ansible/main/inventory/hosts.yaml diff --git a/ansible/main/playbooks/cluster-add-user.yaml b/.archive/ansible/main/playbooks/cluster-add-user.yaml similarity index 100% rename from ansible/main/playbooks/cluster-add-user.yaml rename to .archive/ansible/main/playbooks/cluster-add-user.yaml diff --git a/ansible/main/playbooks/cluster-ceph-reset.yaml b/.archive/ansible/main/playbooks/cluster-ceph-reset.yaml similarity index 100% rename from ansible/main/playbooks/cluster-ceph-reset.yaml rename to .archive/ansible/main/playbooks/cluster-ceph-reset.yaml diff --git a/ansible/main/playbooks/cluster-installation.yaml b/.archive/ansible/main/playbooks/cluster-installation.yaml similarity index 100% rename from ansible/main/playbooks/cluster-installation.yaml rename to .archive/ansible/main/playbooks/cluster-installation.yaml diff --git a/ansible/main/playbooks/cluster-nuke.yaml b/.archive/ansible/main/playbooks/cluster-nuke.yaml similarity index 100% rename from ansible/main/playbooks/cluster-nuke.yaml rename to .archive/ansible/main/playbooks/cluster-nuke.yaml diff --git a/ansible/main/playbooks/cluster-prepare.yaml b/.archive/ansible/main/playbooks/cluster-prepare.yaml similarity index 100% rename from ansible/main/playbooks/cluster-prepare.yaml rename to .archive/ansible/main/playbooks/cluster-prepare.yaml diff --git a/ansible/main/playbooks/cluster-rollout-update.yaml b/.archive/ansible/main/playbooks/cluster-rollout-update.yaml similarity index 100% rename from ansible/main/playbooks/cluster-rollout-update.yaml rename to .archive/ansible/main/playbooks/cluster-rollout-update.yaml diff --git a/ansible/main/playbooks/files/.vimrc b/.archive/ansible/main/playbooks/files/.vimrc similarity index 100% rename from ansible/main/playbooks/files/.vimrc rename to .archive/ansible/main/playbooks/files/.vimrc diff --git a/ansible/main/playbooks/files/config.nvidia.toml.tmpl b/.archive/ansible/main/playbooks/files/config.nvidia.toml.tmpl similarity index 100% rename from ansible/main/playbooks/files/config.nvidia.toml.tmpl rename to .archive/ansible/main/playbooks/files/config.nvidia.toml.tmpl diff --git a/ansible/main/playbooks/files/config.toml.tmpl b/.archive/ansible/main/playbooks/files/config.toml.tmpl similarity index 100% rename from ansible/main/playbooks/files/config.toml.tmpl rename to .archive/ansible/main/playbooks/files/config.toml.tmpl diff --git a/ansible/main/playbooks/files/stale-containers.service b/.archive/ansible/main/playbooks/files/stale-containers.service similarity index 100% rename from ansible/main/playbooks/files/stale-containers.service rename to .archive/ansible/main/playbooks/files/stale-containers.service diff --git a/ansible/main/playbooks/files/stale-containers.timer b/.archive/ansible/main/playbooks/files/stale-containers.timer similarity index 100% rename from ansible/main/playbooks/files/stale-containers.timer rename to .archive/ansible/main/playbooks/files/stale-containers.timer diff --git a/ansible/main/playbooks/tasks/cilium.yaml b/.archive/ansible/main/playbooks/tasks/cilium.yaml similarity index 100% rename from ansible/main/playbooks/tasks/cilium.yaml rename to .archive/ansible/main/playbooks/tasks/cilium.yaml diff --git a/ansible/main/playbooks/tasks/coredns.yaml b/.archive/ansible/main/playbooks/tasks/coredns.yaml similarity index 100% rename from ansible/main/playbooks/tasks/coredns.yaml rename to .archive/ansible/main/playbooks/tasks/coredns.yaml diff --git a/ansible/main/playbooks/tasks/cruft.yaml b/.archive/ansible/main/playbooks/tasks/cruft.yaml similarity index 100% rename from ansible/main/playbooks/tasks/cruft.yaml rename to .archive/ansible/main/playbooks/tasks/cruft.yaml diff --git a/ansible/main/playbooks/tasks/helm_controller.yaml b/.archive/ansible/main/playbooks/tasks/helm_controller.yaml similarity index 100% rename from ansible/main/playbooks/tasks/helm_controller.yaml rename to .archive/ansible/main/playbooks/tasks/helm_controller.yaml diff --git a/ansible/main/playbooks/tasks/stale_containers.yaml b/.archive/ansible/main/playbooks/tasks/stale_containers.yaml similarity index 100% rename from ansible/main/playbooks/tasks/stale_containers.yaml rename to .archive/ansible/main/playbooks/tasks/stale_containers.yaml diff --git a/ansible/main/playbooks/templates/custom-cilium-helmchart.yaml.j2 b/.archive/ansible/main/playbooks/templates/custom-cilium-helmchart.yaml.j2 similarity index 100% rename from ansible/main/playbooks/templates/custom-cilium-helmchart.yaml.j2 rename to .archive/ansible/main/playbooks/templates/custom-cilium-helmchart.yaml.j2 diff --git a/ansible/main/playbooks/templates/custom-coredns-helmchart.yaml.j2 b/.archive/ansible/main/playbooks/templates/custom-coredns-helmchart.yaml.j2 similarity index 100% rename from ansible/main/playbooks/templates/custom-coredns-helmchart.yaml.j2 rename to .archive/ansible/main/playbooks/templates/custom-coredns-helmchart.yaml.j2 diff --git a/ansible/requirements.txt b/.archive/ansible/requirements.txt similarity index 100% rename from ansible/requirements.txt rename to .archive/ansible/requirements.txt diff --git a/ansible/requirements.yaml b/.archive/ansible/requirements.yaml similarity index 100% rename from ansible/requirements.yaml rename to .archive/ansible/requirements.yaml diff --git a/.task/checksum/ansible--venv b/.task/checksum/ansible--venv deleted file mode 100644 index aa1be3f..0000000 --- a/.task/checksum/ansible--venv +++ /dev/null @@ -1 +0,0 @@ -7cc8dd1959207470e1da885dcb6fda02 diff --git a/Taskfile.yaml b/Taskfile.yaml index 16ecb5b..2178508 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -2,10 +2,7 @@ version: "3" vars: - PYTHON_BIN: python3 - ANSIBLE_DIR: "{{.ROOT_DIR}}/ansible" KUBERNETES_DIR: "{{.ROOT_DIR}}/kubernetes" - TERRAFORM_DIR: "{{.ROOT_DIR}}/terraform" CLUSTER_SECRETS_FILE: "{{.CLUSTER_DIR}}/flux/vars/cluster-secrets.sops.env" CLUSTER_SETTINGS_FILE: "{{.CLUSTER_DIR}}/flux/vars/cluster-settings.env" @@ -13,14 +10,9 @@ env: KUBECONFIG: "{{.ROOT_DIR}}/kubeconfig" SOPS_AGE_KEY_FILE: "{{.ROOT_DIR}}/age.key" PATH: "{{.ROOT_DIR}}/.venv/bin:$PATH" - VIRTUAL_ENV: "{{.ROOT_DIR}}/.venv" - ANSIBLE_COLLECTIONS_PATH: "{{.ROOT_DIR}}/.venv/galaxy" - ANSIBLE_ROLES_PATH: "{{.ROOT_DIR}}/.venv/galaxy/ansible_roles" - ANSIBLE_VARS_ENABLED: "host_group_vars,community.sops.sops" K8S_AUTH_KUBECONFIG: "{{.ROOT_DIR}}/kubeconfig" includes: - ansible: .taskfiles/Ansible/Taskfile.yaml volsync: .taskfiles/VolSync/Tasks.yaml precommit: .taskfiles/PreCommit/Tasks.yaml k8s: .taskfiles/k8s/Taskfile.yaml @@ -32,7 +24,6 @@ includes: taskfile: .taskfiles/flux tasks: - default: silent: true cmds: ["task -l"] @@ -69,27 +60,6 @@ tasks: yamllint yq - configure-venv: - desc: Install or upgrade the Python virtual env - cmds: - - "{{.PYTHON_BIN}} -m venv {{.ROOT_DIR}}/.venv" - - .venv/bin/python3 -m pip install --upgrade pip setuptools wheel - - .venv/bin/python3 -m pip install --upgrade --requirement "{{.ROOT_DIR}}/requirements.txt" - - .venv/bin/ansible-galaxy install --role-file "{{.ANSIBLE_DIR}}/requirements.yaml" --force - - flux-apply: - desc: Apply a resource path that contains Flux substitution variables - dotenv: ['{{.CLUSTER_SETTINGS_FILE}}'] - vars: - ks: '{{ or .ks (fail "Missing path (`ks` var)") }}' - cmd: | - sops exec-env {{.CLUSTER_SECRETS_FILE}} \ - "kustomize build --load-restrictor=LoadRestrictionsNone {{.ks}} | \ - envsubst | kubectl apply --server-side --field-manager=kustomize-controller -f -" - preconditions: - - sh: test -f {{.CLUSTER_SECRETS_FILE}} - - sh: test -f {{.CLUSTER_SETTINGS_FILE}} - sync-secrets: desc: Sync ExternalSecret resources vars: @@ -145,14 +115,3 @@ tasks: }' preconditions: - kubectl -n {{.namespace}} get pvc {{.claim}} - - # https://github.com/fluxcd/helm-controller/issues/644 - "644": - cmds: - - kubectl -n {{.namespace}} delete secret -l owner=helm,name={{.release}},status=pending-upgrade - - flux -n {{.namespace}} reconcile hr {{.release}} - vars: - release: '{{ or .release (fail "HelmRelease `release` is required") }}' - namespace: '{{.namespace | default "default"}}' - preconditions: - - flux -n {{.namespace}} get hr {{.release}}