From 92ec91ad6fe7ac63102ae599512a542f171bb0d4 Mon Sep 17 00:00:00 2001 From: Jeroen Vermeulen Date: Mon, 28 Aug 2023 17:58:15 +0200 Subject: [PATCH] Submodule change --- .githooks/README.md | 4 ++++ .githooks/pre-commit | 38 +++++++++++++++++++++++++++++++ .gitmodules | 4 ++-- README.md | 6 ++--- inventory/customer_deovero.yml | 22 ++++++++++++++++++ inventory/group_vars/all.yml | 10 ++++++++ inventory/host_vars/localhost.yml | 4 ++++ roles/snel.kubernetes-cluster | 1 - site.yml | 4 ++++ 9 files changed, 87 insertions(+), 6 deletions(-) create mode 100644 .githooks/README.md create mode 100755 .githooks/pre-commit create mode 100644 inventory/customer_deovero.yml create mode 100644 inventory/group_vars/all.yml create mode 100644 inventory/host_vars/localhost.yml delete mode 160000 roles/snel.kubernetes-cluster create mode 100644 site.yml diff --git a/.githooks/README.md b/.githooks/README.md new file mode 100644 index 0000000..bb6ba2e --- /dev/null +++ b/.githooks/README.md @@ -0,0 +1,4 @@ +To install these hooks: +``` +git config core.hooksPath .githooks +``` \ No newline at end of file diff --git a/.githooks/pre-commit b/.githooks/pre-commit new file mode 100755 index 0000000..997f9b8 --- /dev/null +++ b/.githooks/pre-commit @@ -0,0 +1,38 @@ +#!/usr/bin/env zsh +set +o xtrace -o errexit -o nounset -o pipefail + +# +# Manual check in terminal: +# +# ansible-lint ./*.yml +# + +export ANSIBLE_ROLES_PATH="$PWD/roles" +FILES_PATTERN='\.yml$' +EXIT_CODE=0 + +# Output to stderr +exec 1>&2 + +CHANGED_FILES=() +for FILE in $(git diff --cached --name-only --diff-filter=ACM | grep --extended-regexp "${FILES_PATTERN}" | grep -Ev '^\.circleci'); do + CHANGED_FILES+=("${FILE}") +done + +if [ 0 -eq "${#CHANGED_FILES[@]}" ]; then + echo "No changed files matching '${FILES_PATTERN}'" +else + # echo "Running ansible-lint --write..." + # Have to add the playbooks in the root to make ansible-lint detect every problem + # ansible-lint -qq --write --nocolor "${CHANGED_FILES[@]}" >/dev/null && true + # ansible-lint -qq --skip-list 'yaml[line-length],jinja[spacing]' --write --nocolor ./*.yml + # git add "${CHANGED_FILES[@]}" + echo -e "Running ansible-lint...\n" + # set -o xtrace + ansible-lint --nocolor ./*.yml "${CHANGED_FILES[@]}" + { set +o xtrace; } 2>/dev/null + EXIT_CODE="$?" +fi + +echo "Exit code ${EXIT_CODE}" +exit "${EXIT_CODE}" diff --git a/.gitmodules b/.gitmodules index cba0dd9..237f7d1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ -[submodule "roles/snel.kubernetes-cluster"] - path = roles/snel.kubernetes-cluster +[submodule "playbooks/snel.kubernetes-cluster"] + path = playbooks/snel.kubernetes-cluster url = git@git.snel.com:snelcom-ansible/snel.kubernetes-cluster.git diff --git a/README.md b/README.md index 305f747..34744d9 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ git clone --recurse-submodules git@git.snel.com:snelcom-ansible/snel.ansible. ## Install on MacOS ```zsh brew install ansible ansible-lint packer jq siderolabs/talos/talosctl kubernetes-cli helm -./requirements.txt -./requirements.yml +python3 -m pip install --upgrade --requirement ./requirements.txt +ansible-galaxy install --force --role-file ./requirements.yml git config core.hooksPath .githooks grep 'OBJC_DISABLE_INITIALIZE_FORK_SAFETY' ~/.zshrc || echo "OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES" >> ~/.zshrc -source ~/.bash_profile +source ~/.zshrc ``` diff --git a/inventory/customer_deovero.yml b/inventory/customer_deovero.yml new file mode 100644 index 0000000..d2d595c --- /dev/null +++ b/inventory/customer_deovero.yml @@ -0,0 +1,22 @@ +--- +kubernetes: + children: + ansible_host: + hosts: + localhost: + talos: + children: + customer_deovero: + vars: + cluster_name: deovero.k8s.snel.com + hosts: + c1.deovero.k8s.snel.com: + ansible_remote: 185.62.56.239 + c2.deovero.k8s.snel.com: + ansible_remote: 185.62.58.208 + c3.deovero.k8s.snel.com: + ansible_remote: 185.62.56.102 + w1.deovero.k8s.snel.com: + ansible_remote: 185.62.58.15 + w2.deovero.k8s.snel.com: + ansible_remote: 185.62.56.96 diff --git a/inventory/group_vars/all.yml b/inventory/group_vars/all.yml new file mode 100644 index 0000000..245aaf6 --- /dev/null +++ b/inventory/group_vars/all.yml @@ -0,0 +1,10 @@ +--- +ansible_port: 22 +ansible_user: root +ntp_server: europe.pool.ntp.org +deb_architecture: + aarch64: "arm64" + armv6l: "armhf" + armv7l: "armhf" + i386: "i386" + x86_64: "amd64" diff --git a/inventory/host_vars/localhost.yml b/inventory/host_vars/localhost.yml new file mode 100644 index 0000000..16dd9c7 --- /dev/null +++ b/inventory/host_vars/localhost.yml @@ -0,0 +1,4 @@ +--- + +ansible_connection: local +ansible_python_interpreter: "{{ ansible_playbook_python }}" diff --git a/roles/snel.kubernetes-cluster b/roles/snel.kubernetes-cluster deleted file mode 160000 index 9351f64..0000000 --- a/roles/snel.kubernetes-cluster +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9351f64a03ffdfa0a57ab8c5ee7d06f3d8e00b42 diff --git a/site.yml b/site.yml new file mode 100644 index 0000000..1757509 --- /dev/null +++ b/site.yml @@ -0,0 +1,4 @@ +--- +# Prepare Ansible Controller +- name: Include playbook snel.kubernetes-cluster + ansible.builtin.import_playbook: playbooks/snel.kubernetes-cluster/playbook.yml