Skip to content

Commit

Permalink
refactor: Move terraform and ansible to provision dir
Browse files Browse the repository at this point in the history
Signed-off-by: Devin Buhl <[email protected]>
  • Loading branch information
onedr0p committed Feb 27, 2023
1 parent e2aed50 commit 7fd9908
Show file tree
Hide file tree
Showing 202 changed files with 20 additions and 4,744 deletions.
2 changes: 1 addition & 1 deletion .envrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#shellcheck disable=SC2148,SC2155
export KUBECONFIG=$(expand_path ./ansible/kubernetes/kubeconfig)
export KUBECONFIG=$(expand_path ./provision/kubernetes/ansible/kubeconfig)
export KUBECTL_EXTERNAL_DIFF="dyff between --omit-header --set-exit-code"
export SOPS_AGE_KEY_FILE=$(expand_path ~/.config/sops/age/keys.txt)
7 changes: 2 additions & 5 deletions .github/workflows/publish-terraform-oci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ on:
branches: ["main"]
paths: ["terraform/**"]

env:
IMAGE_REGISTRY: ghcr.io

jobs:
changed-files:
name: Generate Build Matrix
Expand Down Expand Up @@ -38,7 +35,7 @@ jobs:
dir_names_max_depth: 2
json: true
files: |
terraform/**
provision/**
- name: List all changed files
run: |
Expand Down Expand Up @@ -85,7 +82,7 @@ jobs:

- name: Generate OCI tag
id: generate-tag
run: echo "tag=${{ env.IMAGE_REGISTRY }}/${{ github.repository_owner }}/terraform-$(basename ${{ matrix.project }})-oci:$(git rev-parse --short HEAD)" >> "${GITHUB_OUTPUT}"
run: echo "tag=ghcr.io/${{ github.repository_owner }}/provision-$(basename ${{ matrix.project }})-oci:$(git rev-parse --short HEAD)" >> "${GITHUB_OUTPUT}"

- name: Publish OCI
run: |
Expand Down
6 changes: 1 addition & 5 deletions .sops.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,7 @@ creation_rules:
key_groups:
- age:
- age15uzrw396e67z9wdzsxzdk7ka0g2gr3l460e0slaea563zll3hdfqwqxdta
- path_regex: ansible/.*\.sops\.ya?ml
key_groups:
- age:
- age15uzrw396e67z9wdzsxzdk7ka0g2gr3l460e0slaea563zll3hdfqwqxdta
- path_regex: terraform/.*\.sops\.ya?ml
- path_regex: provision/.*\.sops\.ya?ml
key_groups:
- age:
- age15uzrw396e67z9wdzsxzdk7ka0g2gr3l460e0slaea563zll3hdfqwqxdta
5 changes: 2 additions & 3 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
version: "3"

vars:
ANSIBLE_DIR: "{{.ROOT_DIR}}/ansible"
CLUSTER_DIR: "{{.ROOT_DIR}}/kubernetes"
PROVISION_DIR: "{{.ROOT_DIR}}/provision"

env:
KUBECONFIG: "{{.ANSIBLE_DIR}}/kubernetes/kubeconfig"
KUBECONFIG: "{{.PROVISION_DIR}}/kubernetes/ansible/kubeconfig"

includes:
an: .taskfiles/Ansible/Tasks.yml
es: .taskfiles/ExternalSecrets/Tasks.yml
fx: .taskfiles/Flux/Tasks.yml
ku: .taskfiles/Kubernetes/Tasks.yml
Expand Down
91 changes: 0 additions & 91 deletions archive/default/audiobookshelf/app/helmrelease.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions archive/default/audiobookshelf/app/kustomization.yaml

This file was deleted.

45 changes: 0 additions & 45 deletions archive/default/audiobookshelf/app/volsync.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions archive/default/audiobookshelf/ks.yaml

This file was deleted.

83 changes: 0 additions & 83 deletions archive/default/echo-server/app/helmrelease.yaml

This file was deleted.

7 changes: 0 additions & 7 deletions archive/default/echo-server/app/kustomization.yaml

This file was deleted.

21 changes: 0 additions & 21 deletions archive/default/echo-server/ks.yaml

This file was deleted.

18 changes: 0 additions & 18 deletions archive/default/emqx/app/externalsecret.yaml

This file was deleted.

Loading

0 comments on commit 7fd9908

Please sign in to comment.