Skip to content

Commit

Permalink
updated clustertool
Browse files Browse the repository at this point in the history
  • Loading branch information
PrivatePuffin committed Nov 19, 2024
1 parent 47a809b commit 62d4a28
Show file tree
Hide file tree
Showing 11 changed files with 262 additions and 178 deletions.
15 changes: 15 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json",
"name": "ClusterTool Cluster",
"image": "tccr.io/tccr/devcontainer:v1.0.0-RC28",
"initializeCommand": "docker pull tccr.io/tccr/devcontainer:v1.0.0-RC28",
"postCreateCommand": {
"setup": "bash ${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh"
},
"postStartCommand": {
"git": "git config --global --add safe.directory ${containerWorkspaceFolder}"
},
"postAttachCommand": "fish",
"updateRemoteUserUID": false,
"runArgs": ["--privileged"]
}
18 changes: 18 additions & 0 deletions .devcontainer/postCreateCommand.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/usr/bin/env bash
set -e
set -o noglob

# Setup fisher plugin manager for fish and install plugins
/usr/bin/fish -c "
curl -sL https://git.io/fisher | source && fisher install jorgebucaran/fisher
fisher install decors/fish-colored-man
fisher install edc/bass
fisher install jorgebucaran/autopair.fish
fisher install nickeb96/puffer-fish
fisher install PatrickF1/fzf.fish
"

# Create/update virtual environment
if ! grep -q "venv /workspaces/" .venv/pyvenv.cfg; then
rm -rf .venv
fi
23 changes: 23 additions & 0 deletions .github/workflows/automerge.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Automerge and Approve

on:
workflow_run:
workflows: ["Placeholder"] # Name of the main CI workflow
types:
- completed

jobs:
automerge:
runs-on: ubuntu-latest
permissions:
contents: write
pull-requests: write
steps:
- id: automerge
name: automerge
uses: "pascalgn/[email protected]"
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
UPDATE_RETRIES: 24
UPDATE_RETRY_SLEEP: 60000
MERGE_METHOD: "squash"
19 changes: 19 additions & 0 deletions .github/workflows/placeholder.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: "Placeholder"

on:
pull_request:

concurrency:
group: ${{ github.head_ref }}-placeholder
# cancel-in-progress: true

jobs:

placeholder:
name: Placeholder PR Tests
runs-on: ubuntu-latest
if: always()
steps:
- name: Check Results
run: |
echo "Placeholder Finished"
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ kubeconfig
clustertool
sopssecret.yaml
.DS_Store
sopsscret.secret.yaml
sopsscret.secret.yaml
sopssecret.secret.yaml
147 changes: 75 additions & 72 deletions clusters/main/clusterenv.yaml

Large diffs are not rendered by default.

149 changes: 76 additions & 73 deletions clusters/main/kubernetes/flux-system/flux/clustersettings.secret.yaml

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions clusters/main/kubernetes/flux-system/flux/deploykey.secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ kind: Secret
metadata:
name: deploy-key
namespace: flux-system
data:
identity: ENC[AES256_GCM,data:yQYrBlUCyP6IiIsYkhk7Pk2iaU3VtTbIxcdk2HBQ3Kk2ELJqNKg2RXBlWMJ5krKKeVmOsaVfMmUdScdqZQmi7xZpfdE9IWmOD6q+CoKkL47MBze71Ki5omNEDNZkMV2wDjbG+6MJxOpuJlwiPmPSsOv2aktp3gvvSoY1THFhM/27t28E4cjRKf16On3+0aiEQd2jQ+eac6bX+9HEyDfHD1D2UVjaDoewjUV/XS7YGvJS0Q+YoWfHd80+kMzFnHqm3L+ZF4XPCB7fb14GJW+Qi3Sh+5bQp7dSsrGsqRFu+NqPMeOT5los5PVwm/beMxlG9Ad6jcOmWAbDbgzTw3C7r7/lmOLf5agLipREEEoLZHqC1dCxRm5uUV35EoMfTvzeAgOxqXKzL6Hq20fKCNF9PFAVhBSPmVRZ83RBF15NY7ad/4kUzWwKPcRkjXlga23t8pLavHLFF6x9EgYD/FCMUQhhQYFap4rpTGalhdgpJFOOtLVqVu6lIA/I7SlNTQ0LkfAcLvhXd1UdQ5JaeBUo9tAb8tQX7clm,iv:fZDJBXqfGfRF+EGrZqG2xn7FNy2Z1LkKZ1KHgoGkHjo=,tag:AFpnEUJY3d3n1fzcAD1uxQ==,type:str]
identity.pub: ENC[AES256_GCM,data:qga+hJnKdsU9Yn8+CtslGb2f78vhLWHaZBRPb3iX43WOcRl0edC07VQprZ9Wa2ajbOQ+LYTJ1ZGJZMwFIuvuialQitWlT2dTJtk0uPbmJeVxa5pSAYT589iJ97LMUULR4k+5n97OGDgvzj0m8ABHpDA26027VHMmlWmSb0zSlOEbRq/8ngrHnr0q2lJ1RCF57MPXSNYK5w++qBCw/9FJJ58UZUgk2Gxur+UaxHSgjgJn/sCJThLhqrzarkHr6crX6Ma+aJzwFRlzYu5X7Zfw2zQ+PwhN//M+zgcSzIY+AvOJBKJm8G/y//HDTSrC6IBalp5n8dpLHe/CejUihLi6RXmTn+AXgam+dtKp636M3LSc6azW,iv:LmcYr3jRaM924j6DXsI1XKvs4Ha2p4idTTOkp59chvo=,tag:UzXR/UTh1OMRBQkilb/dtQ==,type:str]
known_hosts: ENC[AES256_GCM,data:gTgKcM0Y3f1y5etPAbQ4Gv3+aLG6mR9H4eSTJhPJBEZJtk7aaLs6snUJwwkq+sw/Mzq1FhOdl/gKmRLII6HRN2LTvtbWzLXrwxl/ET0G8QJWbc924gnT2GLX+o21FI18vwnd/fYgACLowPG8px+IRFd1OqMPrZd42dBq+/Pxep3PPL3t+7UNcy3mc/MZbGY2nR6gE7xzO/Z/aofz/+TercpaCXBbnvASJLwEFxQDyBhp/AVFB3xzUE9uDKA4UwQwvbm0XhH6U5ZI1LmV4yVxNXLFtki8rBilTFx74IgN/Tg6sry3,iv:GumLmIesyKKdxkVupEdPIFy8lDolbA0YoaLqRNUpVkw=,tag:Cemr0zaWIETxaZY8qtTcmw==,type:str]
stringData:
identity: ENC[AES256_GCM,data:AWRb57f4n5kNgi12FVt59vtRyQEwi2ORXErQI80k0vRLLIViU4D6Jij4y72Qtw+/3GDHXVb9vqvqglgOknTAfvdCCV7zz03fW9ztVXSNhxFLxQJ0h1BRTlQwpDR9TM4s1SV+Ghc9WM8SGP6uQwbL2jiYkGOsX5vD2UeBHOIfVPkGMm9JE8C3RoIBj0hi2+3ZjzZGl6O4kdzzP/nOEUsldC9rQviVkiS7tT5J7lDUt5f5QMLi1lHfPJlAUaEdvvSTL/9lFpQv2zkOYfC9ryjahU49HsRNuc+HLPvHWTJ3YDrNmzFoDas2a3+oqeD05D1lJq0waoBBtSUwhMuM/gfFRxWkFVK+5rRL93xde9TMcrkF+IywWwLNjg3sCSygjKQr,iv:TFMPoMBhHaHsEKDyGSKoF8yMGkmmLY11b/gURRYY+o8=,tag:1USaia1LjDEGWgIvTGsPJQ==,type:str]
identity.pub: ENC[AES256_GCM,data:HrwEZ3wncxukF51XnVxZQRHa8ZCeWXNYlX/ewza6bQaJbNNF3GQjTZXyOCgvplxlFGMq+h8+E3XDsXOXrgSmbkunOzgCVS225Md//WCB+0G89KahvtycA9cRyeMDB8ojeRExW8kQsX4rJ4HmNlDdAWZpz4GR9XWP0WQ83jPoG2nogIf4WDJtVMKvUJXrGpbYtbdwpm3jWHKtiHcrHi6QSFd0p8nT2ULZCk5L8xfxrzhR7DoNJiUJr0rdy5So38kGgINNH7a5Wn1qf3Hwjg==,iv:B4DtZzRyU32w5XAOD5T/q6ATfLEMvlJsoz8Sx8EK8rE=,tag:vEmhGf1bdAPw/C+Poj5auw==,type:str]
known_hosts: ENC[AES256_GCM,data:zqmAWbLP0LrKabqEJhVETZN21ioCZ8SnqViKleE+vY4QphXz8Ye6YIqy+zw7TbmvSpPxtpvlnkDJEr62iR7Vtl2F3JNDuGnmD1RS8DH+iigICVhwaiCr7SU2j1qoXGztcX5ckp5Fwwn8qSc0DCR2US52tJVz6nsTxN6wfFsa+8X0plFsy73VpbV+ZbcWFCV6cq2tsRwKK1oDTFonP1Vhp1z2iH9eBqj42SEx,iv:YI5u3vOG8oreqiOzE6G5nl9FM+uXU3xK/mgieZ+JklE=,tag:JP7ZWZeMUfzi80/rNEtC+g==,type:str]
type: Opaque
sops:
shamir_threshold: 3
Expand All @@ -18,14 +18,14 @@ sops:
- recipient: age1uzy27yg04slm0t4naapemy207fd7uh4lda70dxnh932e5dd8n55skgcdrq
enc: |
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBnL2JHY0hEK3hvYzRqNFJ5
YWkvRjgyNjdpd2ppYW45ZCtlUzZiU1ZXdmhZClhiS0I3OGEzOTVhWUtmbDNuTzdh
WENmNEFoWHY2RjU2QnRsQTV6STFHcVEKLS0tIEpuUzl5V0NmK0ZMR3hPcjVWRHZz
MnBMckorK3dOTGFiZFBKa0piNExGQTAKBigkEBnvmsuX4e1TRVfQYo+zhR10evF3
+o4yTZlIgue74vGS0skTpV2I01HG/pp+ITMjSiPsjhWtn61j0BVdxg==
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSAvUWdJS1JBRmpUNFNPK1l2
YmprVVVuekx5dUpBOWhnM3ZtTFQxV0ZVeFcwCkoxOXd1QTZ1cnh3TUhuUU5DOTdP
WE1IdXpBOUVtOGo5ZEQyYkN1Mlp4R2sKLS0tIGFmTTJHTHhXUE9wUEpvQkdvV29X
K21aZTR6Y3hCelo5MzJvR2g0M21LRDQK91lJb/n1vKXMZpR3KbBk8E3qjN8pFTT6
S54KlnFW1IDUKHdV18zT2qsUVLnES9NEbPJEIrtfsbV8u/tT0Skdpw==
-----END AGE ENCRYPTED FILE-----
lastmodified: "2024-11-19T20:44:06Z"
mac: ENC[AES256_GCM,data:yhfjy3cFA7OAY2IK/2cuA6EvmUOrhoSM6+mwxmlZwZ7pE/mhbDp0gxv/ExvAtNaC0yeX7vFQZT3QCiRmrTD4d2ontImu5QY1XJDUsrIZeKuq/m+FlpTyX48hZk0RGdmrA0ccE5OVNHABgxd379pSyoKvZrC85ecJjrNpPHkL/i0=,iv:xJi0uweYlzjAz0tiQcCaYI2qmP5Xmq4qaa8W8MuFL2U=,tag:QP/KHzWSsysqf+wPMe+55A==,type:str]
lastmodified: "2024-11-19T20:53:55Z"
mac: ENC[AES256_GCM,data:w983sgDF9nHz29oJUnPtXnCpQnRiT0ziAiyO+YUOGleaNmHNO0RdwwwLoC3kHZxribNZuRsSafXEJZacqXcj0j8RsAK69GDcYWrb2w/nfEvwV95zHpqAHHn/yvIVrjCatMIOjb5zP/NuZ8dxnCFa0cTzbqDC+EMAtB/Vw6nZZws=,iv:ss7K/yF8X2xNjJIVrZHzM1/PUcaerL4/acEnyegrrE8=,tag:ncpEjEBSV5VvwHN0gHE6Mw==,type:str]
pgp: []
encrypted_regex: ((?i)(displayname|email|pass|ca|id|bootstraptoken|secretboxencryptionsecret|secrets|secrets|password|cert|secret($|[^N])|key|token|^data$|^stringData))
version: 3.9.1
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ resources:
- ./upgradesettings.yaml
- ./namespace.yaml
# - sopsscret.secret.yaml
# - sopssecret.secret.yaml
Loading

0 comments on commit 62d4a28

Please sign in to comment.