diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 76444c92aae9e..972b6db66ae65 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,7 +1,7 @@ { "$schema": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainer.schema.json", "name": "TrueCharts", - "image": "tccr.io/tccr/devcontainer:v1.0.0-RC28", + "image": "tccr.io/tccr/devcontainer:v1.0.0-RC28@sha256:db6cfe23d21a42e9486d05af4220fcc7a8ffd0290c43e06ac02bfd2d9b52e631", "initializeCommand": "docker pull tccr.io/tccr/devcontainer:v1.0.0-RC28", "postCreateCommand": { "setup": "bash ${containerWorkspaceFolder}/.devcontainer/postCreateCommand.sh" diff --git a/.github/workflows/clustertool.release.yaml b/.github/workflows/clustertool.release.yaml index d16e186507354..a3b95a54a389e 100644 --- a/.github/workflows/clustertool.release.yaml +++ b/.github/workflows/clustertool.release.yaml @@ -23,7 +23,7 @@ jobs: **/go.sum # - name: Install Syft # run: sudo curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin - - uses: goreleaser/goreleaser-action@286f3b13b1b49da4ac219696163fb8c1c93e1200 # v6 + - uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6 with: args: release --clean distribution: goreleaser # or 'goreleaser-pro' diff --git a/charts/incubator/lyrion-music-server/Chart.yaml b/charts/incubator/lyrion-music-server/Chart.yaml index 00e8eb389c34d..0ec812e2c6e6a 100644 --- a/charts/incubator/lyrion-music-server/Chart.yaml +++ b/charts/incubator/lyrion-music-server/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/lyrion-music-server - https://hub.docker.com/r/lmscommunity/lyrionmusicserver type: application -version: 3.2.21 +version: 3.2.23 diff --git a/charts/incubator/lyrion-music-server/values.yaml b/charts/incubator/lyrion-music-server/values.yaml index 62e9674f956bd..adbae6d55fefd 100644 --- a/charts/incubator/lyrion-music-server/values.yaml +++ b/charts/incubator/lyrion-music-server/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/lmscommunity/lyrionmusicserver pullPolicy: IfNotPresent - tag: 9.0.0@sha256:a961f860301734bf6002d69bad601de0c4a8936732254ce6671aa5c767ea27b0 + tag: 9.0.0@sha256:f720634411d403ac79438f899c5e1e2d9b67b2e4189a28bf6716176c610f7b32 service: main: ports: diff --git a/charts/incubator/manyfold/Chart.yaml b/charts/incubator/manyfold/Chart.yaml index 3551bce8076f2..8b1bfbff29428 100644 --- a/charts/incubator/manyfold/Chart.yaml +++ b/charts/incubator/manyfold/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: incubator apiVersion: v2 -appVersion: 0.86.0 +appVersion: 0.87.1 dependencies: - name: common version: 25.1.5 @@ -40,4 +40,4 @@ sources: - https://github.com/Floppy/van_dam - https://github.com/truecharts/charts/tree/master/charts/incubator/van-dam type: application -version: 0.12.2 +version: 0.13.0 diff --git a/charts/incubator/manyfold/values.yaml b/charts/incubator/manyfold/values.yaml index 472c89e8a2c0c..35b46fbf4d665 100644 --- a/charts/incubator/manyfold/values.yaml +++ b/charts/incubator/manyfold/values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/manyfold3d/manyfold - tag: 0.86.0@sha256:3e891f3ff1da8ad7b1850c06f94a06b81d8a1581f967ce13b2b3c141217ffaaa + tag: 0.87.1@sha256:0a5830c386b8c5929adf7f697ae8e236e58d921a2127dc0eb945c51c96944a51 pullPolicy: IfNotPresent securityContext: diff --git a/charts/incubator/peppermint/Chart.yaml b/charts/incubator/peppermint/Chart.yaml index 975e99d27bffe..41139e857929d 100644 --- a/charts/incubator/peppermint/Chart.yaml +++ b/charts/incubator/peppermint/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/peppermint - https://hub.docker.com/r/pepperlabs/peppermint type: application -version: 2.2.17 +version: 2.2.20 diff --git a/charts/incubator/peppermint/values.yaml b/charts/incubator/peppermint/values.yaml index a118589c82474..04ae6c92b14be 100644 --- a/charts/incubator/peppermint/values.yaml +++ b/charts/incubator/peppermint/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/pepperlabs/peppermint pullPolicy: IfNotPresent - tag: latest@sha256:571b8fabf9157c8400915e5b17256b5c61531b3d33469d2de38037baca6e31fd + tag: latest@sha256:c64045788ccc295f3722148a137c6c7485196e856cf39cedf2f6c0e084015a4f securityContext: container: diff --git a/charts/incubator/sd-webui/Chart.yaml b/charts/incubator/sd-webui/Chart.yaml index 93c2b333cc452..25cace0c8c3ad 100644 --- a/charts/incubator/sd-webui/Chart.yaml +++ b/charts/incubator/sd-webui/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://github.com/ahmetoner/sd-webui-docker/ - https://github.com/truecharts/charts/tree/master/charts/incubator/sd-webui-docker type: application -version: 2.2.34 +version: 2.2.36 diff --git a/charts/incubator/sd-webui/values.yaml b/charts/incubator/sd-webui/values.yaml index 4a189abb5f7d1..b2d02ff74d3f5 100644 --- a/charts/incubator/sd-webui/values.yaml +++ b/charts/incubator/sd-webui/values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/neggles/sd-webui-docker - tag: latest@sha256:9c5ef1052f5a28f0a7cdec6956406771ae4e7ca6f1ab43ae7a553e53e29b7d05 + tag: latest@sha256:d34a1a02e2d1091ae8f3ab5b72ee21aa3aeae1fbbc5bc74eb02818a2f3dd682c pullPolicy: Always vladImage: repository: ghcr.io/neggles/sd-webui-docker diff --git a/charts/premium/prometheus/Chart.yaml b/charts/premium/prometheus/Chart.yaml index c7ef2cd91ff7e..10f0652502caa 100644 --- a/charts/premium/prometheus/Chart.yaml +++ b/charts/premium/prometheus/Chart.yaml @@ -16,7 +16,7 @@ dependencies: tags: [] import-values: [] - name: kube-prometheus-stack - version: 65.7.0 + version: 65.8.1 repository: oci://ghcr.io/prometheus-community/charts condition: "" alias: kps @@ -42,4 +42,4 @@ sources: - https://hub.docker.com/r/bitnami/prometheus - https://quay.io/thanos/thanos type: application -version: 19.28.1 +version: 19.29.2 diff --git a/charts/premium/prometheus/values.yaml b/charts/premium/prometheus/values.yaml index 283b5034425c3..763c043db19ad 100644 --- a/charts/premium/prometheus/values.yaml +++ b/charts/premium/prometheus/values.yaml @@ -1,12 +1,12 @@ image: repository: docker.io/bitnami/prometheus - tag: 2.55.1@sha256:e1b80433936518a73a74ded46d67bf92036b3c138f6c5984adc19ec742ceec95 + tag: 2.55.1@sha256:2353ece84d3dc5ea8cb5258da9f2a2a4e8954768701695944c95e1d8ba583372 thanosImage: repository: quay.io/thanos/thanos tag: v0.36.1@sha256:e542959e1b36d5046083d1b64a7049c356b68a44a173c58b3ae7c0c9ada932d5 alertmanagerImage: repository: docker.io/bitnami/alertmanager - tag: 0.27.0@sha256:3debfa7e4147bbb26c33b73b69bcc6a3ae093c47d6cd4a363e37ab7492260dba + tag: 0.27.0@sha256:69ec59cb8b1a01988c93d1c4c135e26873325ded0ad0e38b187e9f7c3fef90f3 global: labels: {} workload: diff --git a/charts/stable/anything-llm/Chart.yaml b/charts/stable/anything-llm/Chart.yaml index 605b41fed2bbe..e949bdafd5050 100644 --- a/charts/stable/anything-llm/Chart.yaml +++ b/charts/stable/anything-llm/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/Mintplex-Labs/anything-llm - https://github.com/truecharts/charts/tree/master/charts/stable/anything-llm type: application -version: 3.2.21 +version: 3.2.25 diff --git a/charts/stable/anything-llm/values.yaml b/charts/stable/anything-llm/values.yaml index 153e1be909082..af4023f6a83a6 100644 --- a/charts/stable/anything-llm/values.yaml +++ b/charts/stable/anything-llm/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/mintplex-labs/anything-llm pullPolicy: IfNotPresent - tag: latest@sha256:219fc24c6721725b783997ad0fc2f2b0f7ea2f7cf6e3f0973b86d8156915409e + tag: latest@sha256:3a8b43bb71d5995367544663be49c627d28902d74a673d3cd397ba95029ce83f securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/stable/autobrr/Chart.yaml b/charts/stable/autobrr/Chart.yaml index 0cce2eec18f7d..63f6913b098c0 100644 --- a/charts/stable/autobrr/Chart.yaml +++ b/charts/stable/autobrr/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.48.0 +appVersion: 1.49.0 dependencies: - name: common version: 25.1.5 @@ -33,4 +33,4 @@ sources: - https://github.com/autobrr/autobrr - https://github.com/truecharts/charts/tree/master/charts/stable/autobrr type: application -version: 10.8.1 +version: 10.9.0 diff --git a/charts/stable/autobrr/values.yaml b/charts/stable/autobrr/values.yaml index abd7b498a024f..43417b747bb5d 100644 --- a/charts/stable/autobrr/values.yaml +++ b/charts/stable/autobrr/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/autobrr/autobrr pullPolicy: IfNotPresent - tag: v1.48.0@sha256:0ae19e3beedf491396e450b024c23e9e24df4d692286c0442a81fa699493def0 + tag: v1.49.0@sha256:dc2195ccabf8438a8f8eb0581c5e6d2a40c061754e57552bc4f67f1b20a71970 service: main: diff --git a/charts/stable/automatic-ripping-machine/Chart.yaml b/charts/stable/automatic-ripping-machine/Chart.yaml index f3ecfe8098a38..c4b9ffc852062 100644 --- a/charts/stable/automatic-ripping-machine/Chart.yaml +++ b/charts/stable/automatic-ripping-machine/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/automatic-ripping-machine - https://hub.docker.com/r/automaticrippingmachine/automatic-ripping-machine type: application -version: 5.5.22 +version: 5.5.24 diff --git a/charts/stable/automatic-ripping-machine/values.yaml b/charts/stable/automatic-ripping-machine/values.yaml index ed52984089049..0953b4f7b27c8 100644 --- a/charts/stable/automatic-ripping-machine/values.yaml +++ b/charts/stable/automatic-ripping-machine/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/automaticrippingmachine/automatic-ripping-machine pullPolicy: IfNotPresent - tag: 2.9.0@sha256:b0d70b1bd511f6d219218e6a7a0b34f0dfb1b6032618348d2becd4a49d5a0c0e + tag: 2.9.0@sha256:6616a6eebcaad66bce1e242316796d9ed9a34bf3642cde6bb6ab1a6a29ba58e0 securityContext: container: diff --git a/charts/stable/babybuddy/Chart.yaml b/charts/stable/babybuddy/Chart.yaml index 87be1f4748e77..bafc3404d297a 100644 --- a/charts/stable/babybuddy/Chart.yaml +++ b/charts/stable/babybuddy/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2.6.1 +appVersion: 2.6.3 dependencies: - name: common version: 25.1.5 @@ -36,4 +36,4 @@ sources: - https://github.com/babybuddy/babybuddy - https://github.com/truecharts/charts/tree/master/charts/stable/babybuddy type: application -version: 18.4.6 +version: 18.4.7 diff --git a/charts/stable/babybuddy/values.yaml b/charts/stable/babybuddy/values.yaml index 8f849279c6fc9..ec54fe9c376c6 100644 --- a/charts/stable/babybuddy/values.yaml +++ b/charts/stable/babybuddy/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/babybuddy pullPolicy: IfNotPresent - tag: 2.6.1@sha256:b911f629946a2d31195134a2edce40b833218395e32888f54cf0748f2df69128 + tag: 2.6.3@sha256:665cae68ad0e200741f4d0492db8c97100d08e5bc5631d3edf4c26d497f716f9 securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/stable/blender/Chart.yaml b/charts/stable/blender/Chart.yaml index 6dd309afa4cc7..44acf1761e8c4 100644 --- a/charts/stable/blender/Chart.yaml +++ b/charts/stable/blender/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/blender - https://www.blender.org/ type: application -version: 7.2.6 +version: 7.2.7 diff --git a/charts/stable/blender/values.yaml b/charts/stable/blender/values.yaml index 01c1824d488cd..2a9c19b2fdcba 100644 --- a/charts/stable/blender/values.yaml +++ b/charts/stable/blender/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: lscr.io/linuxserver/blender - tag: latest@sha256:1d52839686569b3822fcd3e2c0a2cc914501a1a9cada6219b2b2509a5f3b135e + tag: latest@sha256:b59458e78f1b9a0bd5e019bf436b3b8ddb62acc1aab2d33094a84d769c901083 persistence: config: enabled: true diff --git a/charts/stable/calibre/Chart.yaml b/charts/stable/calibre/Chart.yaml index b03c11830cceb..2f37c559a5bd3 100644 --- a/charts/stable/calibre/Chart.yaml +++ b/charts/stable/calibre/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 7.20.0 +appVersion: 7.21.0 dependencies: - name: common version: 25.1.5 @@ -32,4 +32,4 @@ sources: - https://github.com/kovidgoyal/calibre/ - https://github.com/truecharts/charts/tree/master/charts/stable/calibre type: application -version: 16.9.3 +version: 16.10.0 diff --git a/charts/stable/calibre/values.yaml b/charts/stable/calibre/values.yaml index 20217d33081a5..f1d6c2e042a1e 100644 --- a/charts/stable/calibre/values.yaml +++ b/charts/stable/calibre/values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/linuxserver/calibre - tag: 7.20.0@sha256:af61bfbfae6152140a793bfa13117bc95938d1d0b4f03647e685f42d2522f80c + tag: 7.21.0@sha256:759773a89c64ceb77e4ffdbace0bb70c8266b1f58aaaa3937d45b45ac8fab8ae pullPolicy: IfNotPresent securityContext: container: diff --git a/charts/stable/changedetection-io/Chart.yaml b/charts/stable/changedetection-io/Chart.yaml index 2a1c10b13cd9c..2f3d9274b6d25 100644 --- a/charts/stable/changedetection-io/Chart.yaml +++ b/charts/stable/changedetection-io/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 0.47.05 +appVersion: 0.47.06 dependencies: - name: common version: 25.1.5 @@ -35,4 +35,4 @@ sources: - https://github.com/dgtlmoon/changedetection.io/tree/master - https://github.com/truecharts/charts/tree/master/charts/stable/changedetection-io type: application -version: 4.4.4 +version: 4.4.5 diff --git a/charts/stable/changedetection-io/values.yaml b/charts/stable/changedetection-io/values.yaml index c3c0c35f09a0e..a45c8ca88ce69 100644 --- a/charts/stable/changedetection-io/values.yaml +++ b/charts/stable/changedetection-io/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/dgtlmoon/changedetection.io pullPolicy: IfNotPresent - tag: 0.47.05@sha256:e7e886dfa8917962206aa5a80deeb47b5a29b6736a3c862e499a5252d1ebbafc + tag: 0.47.06@sha256:6e9dcf4abc1cfb0b1eeba6b6ff52a4b6f790110d6cdc8b7942c6cecf34e56265 service: main: diff --git a/charts/stable/code-server/Chart.yaml b/charts/stable/code-server/Chart.yaml index 2fdbc3f0335ee..e87ba1ccaa61f 100644 --- a/charts/stable/code-server/Chart.yaml +++ b/charts/stable/code-server/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 4.93.1 +appVersion: 4.95.1 dependencies: - name: common version: 25.1.5 @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/code-server - https://hub.docker.com/r/codercom/code-server type: application -version: 13.6.1 +version: 13.7.0 diff --git a/charts/stable/code-server/values.yaml b/charts/stable/code-server/values.yaml index b36a551b5cebb..8813e6d5e721a 100644 --- a/charts/stable/code-server/values.yaml +++ b/charts/stable/code-server/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/codercom/code-server pullPolicy: IfNotPresent - tag: 4.93.1@sha256:c69e398d1b64589b3b77a7becfd03f4ec524982def20e6bffbb51b1b839e72ba + tag: 4.95.1@sha256:d9bc7797d997e1b199e333676732e075bac4bae276dc0fe1baece2e313edfa09 securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/stable/ddns-go/Chart.yaml b/charts/stable/ddns-go/Chart.yaml index b6f19b6710440..9f46bb507e6b0 100644 --- a/charts/stable/ddns-go/Chart.yaml +++ b/charts/stable/ddns-go/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 6.7.5 +appVersion: 6.7.6 dependencies: - name: common version: 25.1.5 @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/ddns-go - https://hub.docker.com/r/jeessy/ddns-go type: application -version: 12.3.5 +version: 12.3.6 diff --git a/charts/stable/ddns-go/values.yaml b/charts/stable/ddns-go/values.yaml index c1ff597495f6b..fe8c5be625d0d 100644 --- a/charts/stable/ddns-go/values.yaml +++ b/charts/stable/ddns-go/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/jeessy/ddns-go pullPolicy: IfNotPresent - tag: v6.7.5@sha256:7da6ff9d3f11d079581ab77be1730ff7f4072b3c1d345dc37b6d8dca6139d8c9 + tag: v6.7.6@sha256:b69171a606fdbcf28b642cdb4cf03a224942b16e43ad87815525cd17026785d3 securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/stable/docker/Chart.yaml b/charts/stable/docker/Chart.yaml index 9e6a2dff7a027..eb5d3df69a01a 100644 --- a/charts/stable/docker/Chart.yaml +++ b/charts/stable/docker/Chart.yaml @@ -31,4 +31,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/docker - https://hub.docker.com/_/docker type: application -version: 9.4.5 +version: 9.4.6 diff --git a/charts/stable/docker/values.yaml b/charts/stable/docker/values.yaml index f2cf06459ed0a..38550956774d6 100644 --- a/charts/stable/docker/values.yaml +++ b/charts/stable/docker/values.yaml @@ -1,7 +1,7 @@ image: repository: docker pullPolicy: IfNotPresent - tag: 27.3.1-dind@sha256:25654f4044cf31ea6ca67707a767c2e7773a5266762aeba44e77307f2166ae2d + tag: 27.3.1-dind@sha256:ccfd877fe10a2fe0cdb1f35c43aba2fed90007dbf7e0678b1951297c72296e8d hostNetwork: true securityContext: container: diff --git a/charts/stable/doublecommander/Chart.yaml b/charts/stable/doublecommander/Chart.yaml index a6155690d6c3a..205d62dbee3ee 100644 --- a/charts/stable/doublecommander/Chart.yaml +++ b/charts/stable/doublecommander/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/linuxserver/docker-doublecommander - https://github.com/truecharts/charts/tree/master/charts/stable/doublecommander type: application -version: 14.2.6 +version: 14.2.7 diff --git a/charts/stable/doublecommander/values.yaml b/charts/stable/doublecommander/values.yaml index 2b8510784b5fb..60981fb7df895 100644 --- a/charts/stable/doublecommander/values.yaml +++ b/charts/stable/doublecommander/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/doublecommander pullPolicy: IfNotPresent - tag: latest@sha256:367466188eca675dabf4d39f3115b09de65fd8046bc62765c6499335d7aa0763 + tag: latest@sha256:558e5e93435cf12cb3e67025b359962d5ac583407bd2480616cc4493b5c8df08 securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/stable/emby/Chart.yaml b/charts/stable/emby/Chart.yaml index 2aef00ba97bdd..ce4eb7d37c5a5 100644 --- a/charts/stable/emby/Chart.yaml +++ b/charts/stable/emby/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 4.9.0.30 +appVersion: 4.9.0.31 dependencies: - name: common version: 25.1.5 @@ -34,4 +34,4 @@ sources: - https://github.com/linuxserver/docker-emby.git - https://github.com/truecharts/charts/tree/master/charts/stable/emby type: application -version: 22.0.2 +version: 22.0.3 diff --git a/charts/stable/emby/values.yaml b/charts/stable/emby/values.yaml index 569eedcf0b165..44694536accf1 100644 --- a/charts/stable/emby/values.yaml +++ b/charts/stable/emby/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/elfhosted/emby pullPolicy: IfNotPresent - tag: 4.9.0.30@sha256:bfe7f625df28b35f89ed7fabe2181bbcd180541902f28aa853626a6f966b2256 + tag: 4.9.0.31@sha256:e7cd9ebe85d4b7d2f4a43fd190377d9b687ca0debebf73ff2f9b77f4268b8d57 securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/stable/emulatorjs/Chart.yaml b/charts/stable/emulatorjs/Chart.yaml index 84322de1472fc..53ee383e8c8e1 100644 --- a/charts/stable/emulatorjs/Chart.yaml +++ b/charts/stable/emulatorjs/Chart.yaml @@ -31,4 +31,4 @@ sources: - https://ghcr.io/linuxserver/emulatorjs - https://github.com/truecharts/charts/tree/master/charts/stable/emulatorjs type: application -version: 11.2.6 +version: 11.2.7 diff --git a/charts/stable/emulatorjs/values.yaml b/charts/stable/emulatorjs/values.yaml index f2c1e4cc01718..ab0e4524c31c3 100644 --- a/charts/stable/emulatorjs/values.yaml +++ b/charts/stable/emulatorjs/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/emulatorjs pullPolicy: IfNotPresent - tag: 1.9.2@sha256:a2a18bd2d2bbeb94fab10915e4e78970a9acf121877e7d04ea2ac3030d21ec07 + tag: 1.9.2@sha256:86d7f978daa524131a5d65aceb6c36f857ea99f946e6224c8d8110d8efdb48bd securityContext: container: runAsNonRoot: false diff --git a/charts/stable/filestash/Chart.yaml b/charts/stable/filestash/Chart.yaml index 79dd833090a06..2d19455816f99 100644 --- a/charts/stable/filestash/Chart.yaml +++ b/charts/stable/filestash/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://hub.docker.com/r/machines/filestash - https://www.filestash.app/ type: application -version: 8.2.30 +version: 8.2.31 diff --git a/charts/stable/filestash/values.yaml b/charts/stable/filestash/values.yaml index db51f683fece4..e9f4726b3fed6 100644 --- a/charts/stable/filestash/values.yaml +++ b/charts/stable/filestash/values.yaml @@ -1,6 +1,6 @@ image: repository: docker.io/machines/filestash - tag: latest@sha256:e45d0b8cfdbb6c2c41b7a0e6442eb2f0665c25bf527a8d87b6ae67c962ea1c81 + tag: latest@sha256:1def2bb8ba5c4a6468b3dfd0db8c1995f7a3c2331c4f277b8bb36d91215c9a80 pullPolicy: IfNotPresent securityContext: diff --git a/charts/stable/fluidd/Chart.yaml b/charts/stable/fluidd/Chart.yaml index 7b1e1266c0493..2da2ea14f3866 100644 --- a/charts/stable/fluidd/Chart.yaml +++ b/charts/stable/fluidd/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.30.5 +appVersion: 1.30.6 dependencies: - name: common version: 25.1.5 @@ -32,4 +32,4 @@ sources: - https://github.com/fluidd-core/fluidd - https://github.com/truecharts/charts/tree/master/charts/stable/fluidd type: application -version: 11.2.2 +version: 11.2.3 diff --git a/charts/stable/fluidd/values.yaml b/charts/stable/fluidd/values.yaml index 3dd3428700e04..96ece9a3b6fdc 100644 --- a/charts/stable/fluidd/values.yaml +++ b/charts/stable/fluidd/values.yaml @@ -1,6 +1,6 @@ image: repository: ghcr.io/fluidd-core/fluidd - tag: v1.30.5@sha256:ca5a439eedf86e0eeebb5e246a4a98215c677c261c72b174b48ad18faf5c92cc + tag: v1.30.6@sha256:556029c1a9a7b8bc85ede6d6c4c8f42cbb9c1e46bb05e1b4f97b8da15b3734fe pullPolicy: IfNotPresent securityContext: container: diff --git a/charts/stable/ghostfolio/Chart.yaml b/charts/stable/ghostfolio/Chart.yaml index a7cf93bd6e013..53bd07928770e 100644 --- a/charts/stable/ghostfolio/Chart.yaml +++ b/charts/stable/ghostfolio/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2.121.1 +appVersion: 2.122.0 dependencies: - name: common version: 25.1.5 @@ -41,4 +41,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/ghostfolio - https://hub.docker.com/r/ghostfolio/ghostfolio type: application -version: 6.36.0 +version: 6.37.0 diff --git a/charts/stable/ghostfolio/values.yaml b/charts/stable/ghostfolio/values.yaml index ef81d6bfb7542..fbd8a48a2b217 100644 --- a/charts/stable/ghostfolio/values.yaml +++ b/charts/stable/ghostfolio/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/ghostfolio/ghostfolio pullPolicy: IfNotPresent - tag: 2.121.1@sha256:4164c03991149160aca84b5e9dca688223ef050dc1e9a3967ac3341b9aaf5c55 + tag: 2.122.0@sha256:b2a4e21a1dcd19e54b70e33d19bb845c3058f740f0f54c2f9dbd5dc8927328db securityContext: container: runAsNonRoot: false diff --git a/charts/stable/home-assistant/Chart.yaml b/charts/stable/home-assistant/Chart.yaml index 55ae070cb24d3..d7df6d5e75e3a 100644 --- a/charts/stable/home-assistant/Chart.yaml +++ b/charts/stable/home-assistant/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2024.10.4 +appVersion: 2024.11.0 dependencies: - name: common version: 25.1.5 @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/home-assistant - https://hub.docker.com/r/homeassistant/home-assistant type: application -version: 26.7.5 +version: 26.8.0 diff --git a/charts/stable/home-assistant/values.yaml b/charts/stable/home-assistant/values.yaml index 00afa0105a0ad..afdf8be71e3f9 100644 --- a/charts/stable/home-assistant/values.yaml +++ b/charts/stable/home-assistant/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/homeassistant/home-assistant pullPolicy: IfNotPresent - tag: 2024.10.4@sha256:408a5a63e3e9a89ceb6ecd98345e54c86073314b4d94e217cd54f7208307406d + tag: 2024.11.0@sha256:0f357468558aa24858af7470f5942ae740d8472d892e7838111ee0f71110e78b service: main: ports: diff --git a/charts/stable/immich/Chart.yaml b/charts/stable/immich/Chart.yaml index 6dfc4d7e86396..dc9d3526f71bb 100644 --- a/charts/stable/immich/Chart.yaml +++ b/charts/stable/immich/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.119.1 +appVersion: 1.120.1 dependencies: - name: common version: 25.1.5 @@ -40,4 +40,4 @@ sources: - https://github.com/immich-app/immich - https://github.com/truecharts/charts/tree/master/charts/stable/immich type: application -version: 17.19.4 +version: 17.23.4 diff --git a/charts/stable/immich/values.yaml b/charts/stable/immich/values.yaml index b608c1d956f06..7ff7bffd646d7 100644 --- a/charts/stable/immich/values.yaml +++ b/charts/stable/immich/values.yaml @@ -1,22 +1,22 @@ image: repository: ghcr.io/immich-app/immich-server - tag: v1.119.1@sha256:d63feeee7a41095b3c1b18607d86a1264bcac53728a19f538a77a6e66043f492 + tag: v1.120.1@sha256:4193f3cc99bb4d99f53007f07d45e2efbcd531f4e81a765470b2cce433f33131 pullPolicy: IfNotPresent mlImage: repository: ghcr.io/immich-app/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.119.1@sha256:e8c416445db60c0ec94394c1e0e672b78409664f17de78787c62f6d13d3f6d92 + tag: v1.120.1@sha256:0a5d8d75f026342a56e1065613e565ec40a05f4042dc7fead1dcfd66d539fef3 mlCudaImage: repository: ghcr.io/immich-app/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.119.1-cuda@sha256:96ea9c9fbce58351803cb0c067fb4af3a627f85b5715fd2b9c3d976838085601 + tag: v1.120.1-cuda@sha256:e25392f2b61ef07e9f9aaedabdea1d87c1b66338af311eee0f382a78381db632 mlOpenvinoImage: repository: ghcr.io/immich-app/immich-machine-learning pullPolicy: IfNotPresent - tag: v1.119.1-openvino@sha256:677f1845bca75deae593a9bc4172ad8cb668c92c39e6d3ea292456cdfab99892 + tag: v1.120.1-openvino@sha256:c2d95ceaaab1b388a95f6f92058b9bae4e283d22de4e2e72a3a0264eb1dc3be7 securityContext: container: diff --git a/charts/stable/iyuuplus/Chart.yaml b/charts/stable/iyuuplus/Chart.yaml index a6c9b5b40c4df..8f9133e9ece02 100644 --- a/charts/stable/iyuuplus/Chart.yaml +++ b/charts/stable/iyuuplus/Chart.yaml @@ -32,4 +32,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/iyuuplus - https://hub.docker.com/r/iyuucn/iyuuplus type: application -version: 11.2.7 +version: 11.2.8 diff --git a/charts/stable/iyuuplus/values.yaml b/charts/stable/iyuuplus/values.yaml index 7a2e817a6f0a5..ab5f26519ff43 100644 --- a/charts/stable/iyuuplus/values.yaml +++ b/charts/stable/iyuuplus/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/iyuucn/iyuuplus pullPolicy: IfNotPresent - tag: latest@sha256:64aaa268d43953b4594f6069b9fbc8bd02c4babf501e798ce5d00a9245be3b46 + tag: latest@sha256:33b6444386f77bc2162b3dfb3f6d7757b88bf638c1231ff734212cee268a011f service: main: ports: diff --git a/charts/stable/jackett/Chart.yaml b/charts/stable/jackett/Chart.yaml index adf04e315ec65..b8968584a81de 100644 --- a/charts/stable/jackett/Chart.yaml +++ b/charts/stable/jackett/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 0.22.885 +appVersion: 0.22.893 dependencies: - name: common version: 25.1.5 @@ -35,4 +35,4 @@ sources: - https://github.com/geek-cookbook/containers/pkgs/container/jackett - https://github.com/truecharts/charts/tree/master/charts/stable/jackett type: application -version: 23.0.37 +version: 23.0.39 diff --git a/charts/stable/jackett/values.yaml b/charts/stable/jackett/values.yaml index 630e6a4370074..abd0d5b8a985c 100644 --- a/charts/stable/jackett/values.yaml +++ b/charts/stable/jackett/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/elfhosted/jackett pullPolicy: IfNotPresent - tag: 0.22.885@sha256:ae7424df108fecfe12e99a93be0cff67ab55e8d827c45370be14cd11e83c9315 + tag: 0.22.893@sha256:1bbd151284bf529d723a6414d821adcb351ff8e712ccdf8f5852d75046daf299 service: main: ports: diff --git a/charts/stable/jelu/Chart.yaml b/charts/stable/jelu/Chart.yaml index 3eaa40f6cedc4..0964fa12dbdbd 100644 --- a/charts/stable/jelu/Chart.yaml +++ b/charts/stable/jelu/Chart.yaml @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/jelu - https://hub.docker.com/r/wabayang/jelu type: application -version: 7.2.4 +version: 7.2.5 diff --git a/charts/stable/jelu/values.yaml b/charts/stable/jelu/values.yaml index 071424365e0cc..7136f18549383 100644 --- a/charts/stable/jelu/values.yaml +++ b/charts/stable/jelu/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: docker.io/wabayang/jelu - tag: latest@sha256:c994f036afd4cca9ed8bd4d86305dc031b1aab1a2a4932f77cbf6c76dddbca7d + tag: latest@sha256:d792a682226609b2c54f3a7740b900b7813635793d2bbbeae4f565ffa49de89c persistence: config: enabled: true diff --git a/charts/stable/lazylibrarian/Chart.yaml b/charts/stable/lazylibrarian/Chart.yaml index 5444b30e0aaa1..7a174d0ee5e19 100644 --- a/charts/stable/lazylibrarian/Chart.yaml +++ b/charts/stable/lazylibrarian/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://gitlab.com/LazyLibrarian/LazyLibrarian.git - https://lazylibrarian.gitlab.io type: application -version: 20.2.6 +version: 20.2.7 diff --git a/charts/stable/lazylibrarian/values.yaml b/charts/stable/lazylibrarian/values.yaml index 624296181cbbf..0ede5a438d802 100644 --- a/charts/stable/lazylibrarian/values.yaml +++ b/charts/stable/lazylibrarian/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/lazylibrarian pullPolicy: IfNotPresent - tag: latest@sha256:7171acb040aad103759b9034063a706e219ff0af88e297e312f88ce5ef7d565c + tag: latest@sha256:4f7a66081dcb2b97a7924e51a7525cf04a9ceac0b9688b245b7759e09df238a1 service: main: ports: diff --git a/charts/stable/maintainerr/Chart.yaml b/charts/stable/maintainerr/Chart.yaml index feaff03fdc325..1f04a2ba197db 100644 --- a/charts/stable/maintainerr/Chart.yaml +++ b/charts/stable/maintainerr/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 2.2.0 +appVersion: 2.2.1 dependencies: - name: common version: 25.1.5 @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/maintainerr - https://hub.docker.com/r/jorenn92/maintainerr type: application -version: 4.4.0 +version: 4.4.1 diff --git a/charts/stable/maintainerr/values.yaml b/charts/stable/maintainerr/values.yaml index 6772c96d0443d..30f3cfd126f42 100644 --- a/charts/stable/maintainerr/values.yaml +++ b/charts/stable/maintainerr/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/jorenn92/maintainerr pullPolicy: IfNotPresent - tag: 2.2.0@sha256:4836d12d0d33b73f769d82ff66e96e018c26bc17e65025a80864bca94b993b79 + tag: 2.2.1@sha256:c6a3a886e20e39759014a7bf3d2843068e722d9ec2138ac43acc7a283de92bd0 securityContext: container: diff --git a/charts/stable/minecraft-gate/Chart.yaml b/charts/stable/minecraft-gate/Chart.yaml index c857bedcd69fb..09ab4a23fa94e 100644 --- a/charts/stable/minecraft-gate/Chart.yaml +++ b/charts/stable/minecraft-gate/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://github.com/minekube/gate - https://github.com/truecharts/charts/tree/master/charts/stable/minecraft-gate type: application -version: 1.0.1 +version: 1.0.2 diff --git a/charts/stable/minecraft-gate/values.yaml b/charts/stable/minecraft-gate/values.yaml index 490d5760550af..7632d280f589e 100644 --- a/charts/stable/minecraft-gate/values.yaml +++ b/charts/stable/minecraft-gate/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/minekube/gate pullPolicy: IfNotPresent - tag: latest@sha256:706997d1a8f626bc83878cd290769f587b61a881882e05fc89cf9e11d3e48f6b + tag: latest@sha256:07647d10593a30fb34535ea22160b6dc873a16263e82a8a1375286f358fcde4b service: main: enabled: true diff --git a/charts/stable/minetest/Chart.yaml b/charts/stable/minetest/Chart.yaml index 08632fc355a21..833494257be32 100644 --- a/charts/stable/minetest/Chart.yaml +++ b/charts/stable/minetest/Chart.yaml @@ -31,4 +31,4 @@ sources: - https://ghcr.io/linuxserver/minetest - https://github.com/truecharts/charts/tree/master/charts/stable/minetest type: application -version: 10.3.3 +version: 10.3.4 diff --git a/charts/stable/minetest/values.yaml b/charts/stable/minetest/values.yaml index 7a1d1ef647b1f..553596f3cd722 100644 --- a/charts/stable/minetest/values.yaml +++ b/charts/stable/minetest/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/minetest pullPolicy: IfNotPresent - tag: 5.9.1@sha256:9dc91f5dc19d2f00ac5d442f5b03dff2b51cccd34c40ed53a9218d1a78e86f37 + tag: 5.9.1@sha256:d9e08faf52fea9b9e09efe3b717e2a0a75df86c738e864d742fc36ecad7c2435 service: main: ports: diff --git a/charts/stable/mstream/Chart.yaml b/charts/stable/mstream/Chart.yaml index 143559488feea..605bcccfb530a 100644 --- a/charts/stable/mstream/Chart.yaml +++ b/charts/stable/mstream/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/mstream - https://mstream.io/ type: application -version: 12.2.6 +version: 12.2.7 diff --git a/charts/stable/mstream/values.yaml b/charts/stable/mstream/values.yaml index 9175e020de8bd..0e4ba00d88504 100644 --- a/charts/stable/mstream/values.yaml +++ b/charts/stable/mstream/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/mstream pullPolicy: IfNotPresent - tag: 5.12.2@sha256:ac15b20f6c04b94b99d07b717c372bd667dcfeb844c2348098638d15ea61b341 + tag: 5.12.2@sha256:c59399cd637933a5b2a7350a8e65c03612f079f15fb3b68a6f2fe61b726931b6 service: main: ports: diff --git a/charts/stable/muse/Chart.yaml b/charts/stable/muse/Chart.yaml index 9b5ca2a1981be..8a50024d4b4a9 100644 --- a/charts/stable/muse/Chart.yaml +++ b/charts/stable/muse/Chart.yaml @@ -30,8 +30,8 @@ maintainers: url: https://truecharts.org name: muse sources: - - https://github.com/codetheweb/muse + - https://ghcr.io/museofficial/muse + - https://github.com/museofficial/muse - https://github.com/truecharts/charts/tree/master/charts/stable/muse - - https://hub.docker.com/r/codetheweb/muse type: application -version: 7.4.0 +version: 7.5.0 diff --git a/charts/stable/muse/values.yaml b/charts/stable/muse/values.yaml index b435cf8b07a27..f88d1db5022cb 100644 --- a/charts/stable/muse/values.yaml +++ b/charts/stable/muse/values.yaml @@ -1,5 +1,5 @@ image: - repository: docker.io/codetheweb/muse + repository: ghcr.io/museofficial/muse pullPolicy: IfNotPresent tag: 2.10.0@sha256:28e58e69df8613285cd2922c6c0ecdaa3c5a9992753bccfc678f031a5d2867b1 securityContext: @@ -14,6 +14,35 @@ service: ports: main: enabled: false +muse: + discord: + token: "" + spotify: + client: + id: "" + secret: "" + youtube: + key: "" + bot: + # online (Online) + # idle (Away) + # dnd (Do not Disturb) + status: "online" + # PLAYING (Playing XYZ) + # LISTENING (Listening to XYZ) + # WATCHING (Watching XYZ) + # STREAMING (Streaming XYZ) + activity: + type: "PLAYING" + detail: "A helm chart" + url: "https://www.youtube.com/truecharts" + # If you have Muse running in a lot of guilds (10+) + # you may want to set to true to registering commands bot-wide + # rather than for each guild (may take hours for commands to propagate) + register_commands: false + cache: + # 512MB | 10GB + limit: 2GB workload: main: podSpec: @@ -27,16 +56,18 @@ workload: startup: enabled: false env: - DATA_DIR: /config - DISCORD_TOKEN: "" - SPOTIFY_CLIENT_ID: "" - SPOTIFY_CLIENT_SECRET: "" - YOUTUBE_API_KEY: "" - # CACHE_LIMIT: 2GB - # BOT_STATUS: online - # BOT_ACTIVITY_TYPE: PLAYING - # BOT_ACTIVITY: A incubator app - # BOT_ACTIVITY_URL: https://www.youtube.com/truecharts + DATA_DIR: "{{.Values.persistence.config.mountPath }}" + DISCORD_TOKEN: "{{.Values.muse.discord.token }}" + SPOTIFY_CLIENT_ID: "{{.Values.muse.spotify.client.id }}" + SPOTIFY_CLIENT_SECRET: "{{.Values.muse.spotify.client.secret }}" + YOUTUBE_API_KEY: "{{.Values.muse.youtube.key }}" + BOT_STATUS: "{{.Values.muse.bot.status }}" + BOT_ACTIVITY_TYPE: "{{.Values.muse.bot.activity.type }}" + BOT_ACTIVITY: "{{.Values.muse.bot.activity.detail }}" + BOT_ACTIVITY_URL: "{{.Values.muse.bot.activity.url }}" + REGISTER_COMMANDS_ON_BOT: "{{.Values.muse.bot.register_commands }}" + CACHE_LIMIT: "{{.Values.muse.cache.limit }}" + persistence: config: enabled: true diff --git a/charts/stable/n8n/Chart.yaml b/charts/stable/n8n/Chart.yaml index 293f6d72c8022..9f290638b7490 100644 --- a/charts/stable/n8n/Chart.yaml +++ b/charts/stable/n8n/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 1.66.0 +appVersion: 1.67.1 dependencies: - name: common version: 25.1.5 @@ -41,4 +41,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/n8n - https://hub.docker.com/r/n8nio/n8n type: application -version: 15.24.0 +version: 15.25.1 diff --git a/charts/stable/n8n/values.yaml b/charts/stable/n8n/values.yaml index b55a2e1e6c823..b7fe37becb5e1 100644 --- a/charts/stable/n8n/values.yaml +++ b/charts/stable/n8n/values.yaml @@ -1,6 +1,6 @@ image: repository: docker.io/n8nio/n8n - tag: 1.66.0@sha256:35379582637e089e56cc0f88aed8b18f7d1698176387a5e870ece5fc605c1891 + tag: 1.67.1@sha256:ee4ef2c8a4439ca01efe60d7c56cd678facdce2b411a1e338bd446e6deb8e061 pullPolicy: IfNotPresent timezoneandlocale: {} # N8N_DEFAULT_LOCALE: "en" diff --git a/charts/stable/ollama/Chart.yaml b/charts/stable/ollama/Chart.yaml index 0648045c15316..f8e816177988d 100644 --- a/charts/stable/ollama/Chart.yaml +++ b/charts/stable/ollama/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 0.3.14 +appVersion: 0.4.0 dependencies: - name: common version: 25.1.5 @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/ollama - https://hub.docker.com/r/ollama/ollama type: application -version: 7.4.13 +version: 7.6.0 diff --git a/charts/stable/ollama/values.yaml b/charts/stable/ollama/values.yaml index 26cae7dd683ed..21beb13e9da8e 100644 --- a/charts/stable/ollama/values.yaml +++ b/charts/stable/ollama/values.yaml @@ -1,11 +1,11 @@ image: repository: docker.io/ollama/ollama pullPolicy: IfNotPresent - tag: 0.3.14@sha256:e1ce9edb7ccd60ef8b4d99fffe7afdc67edfd1f4d7c6028a4253e6efa82f7e60 + tag: 0.4.0@sha256:2e7ce379d73833c6d25c30cd1bf2d3837a3c37d16e143e9b61cf8f42ba14ba9e rocmImage: repository: docker.io/ollama/ollama pullPolicy: IfNotPresent - tag: 0.3.14-rocm@sha256:19fd25f6513b687755daffaacc9c8342e73d02d3fee50e6441273a20eb01baea + tag: 0.4.0-rocm@sha256:35f020f65519bcc095951609d418698b17d5d7e3172edfb06c389d80e1d2a203 uiImage: repository: ghcr.io/open-webui/open-webui pullPolicy: IfNotPresent diff --git a/charts/stable/redmine/Chart.yaml b/charts/stable/redmine/Chart.yaml index ab3f99c03adbc..867c0a13204c7 100644 --- a/charts/stable/redmine/Chart.yaml +++ b/charts/stable/redmine/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/redmine - https://hub.docker.com/_/redmine type: application -version: 13.2.9 +version: 13.2.10 diff --git a/charts/stable/redmine/values.yaml b/charts/stable/redmine/values.yaml index 90fc856734323..f541f683a7ad4 100644 --- a/charts/stable/redmine/values.yaml +++ b/charts/stable/redmine/values.yaml @@ -1,7 +1,7 @@ image: repository: redmine pullPolicy: IfNotPresent - tag: 5.1.4@sha256:a1725872fff0953aff573b3c50aa2c67bd8e2d6b2cb7b4e9bca5c0a261c170c2 + tag: 5.1.4@sha256:b9e5482a08e0641316d000a090049741e3343d696406f52070adca2e83e11446 redmine: plugins_migrate: true no_db_migrate: false diff --git a/charts/stable/rsshub/Chart.yaml b/charts/stable/rsshub/Chart.yaml index d08e7d24a64fa..1bef849166a94 100644 --- a/charts/stable/rsshub/Chart.yaml +++ b/charts/stable/rsshub/Chart.yaml @@ -42,4 +42,4 @@ sources: - https://hub.docker.com/r/browserless/chrome - https://hub.docker.com/r/diygod/rsshub type: application -version: 14.5.94 +version: 14.5.100 diff --git a/charts/stable/rsshub/values.yaml b/charts/stable/rsshub/values.yaml index 8a84167fa9685..4f11606cba795 100644 --- a/charts/stable/rsshub/values.yaml +++ b/charts/stable/rsshub/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/diygod/rsshub pullPolicy: IfNotPresent - tag: latest@sha256:cb1b81775bdb20e13f23fb1a319678d1511af8d1dc86ec5c0451e44be3a608ea + tag: latest@sha256:a541b6568a86ebba178a08371d05c1ef4df50c162ee64ccf87d377744e592f01 browserlessImage: repository: docker.io/browserless/chrome tag: 1.61.1-chrome-stable@sha256:efac47cfff3830d9a50b27d29f8bbb61949058ae336c823fbe9bd3c0d1debcc8 diff --git a/charts/stable/rustdesk/icon-small.webp b/charts/stable/rustdesk/icon-small.webp new file mode 100644 index 0000000000000..a8cfb184f3a69 Binary files /dev/null and b/charts/stable/rustdesk/icon-small.webp differ diff --git a/charts/stable/rustdesk/icon.png b/charts/stable/rustdesk/icon.png deleted file mode 100644 index 5c2b8f844c21a..0000000000000 Binary files a/charts/stable/rustdesk/icon.png and /dev/null differ diff --git a/charts/stable/rustdesk/icon.webp b/charts/stable/rustdesk/icon.webp new file mode 100644 index 0000000000000..bde18ffc74840 Binary files /dev/null and b/charts/stable/rustdesk/icon.webp differ diff --git a/charts/stable/searxng/Chart.yaml b/charts/stable/searxng/Chart.yaml index d80bd8f789fc2..263862bfa692b 100644 --- a/charts/stable/searxng/Chart.yaml +++ b/charts/stable/searxng/Chart.yaml @@ -34,4 +34,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/searxng - https://hub.docker.com/r/searxng/searxng type: application -version: 9.2.18 +version: 9.2.20 diff --git a/charts/stable/searxng/values.yaml b/charts/stable/searxng/values.yaml index 4286105cbe56f..05bcb46924c5b 100644 --- a/charts/stable/searxng/values.yaml +++ b/charts/stable/searxng/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: docker.io/searxng/searxng - tag: latest@sha256:fc0acbfae4b0b99f3c09e9997e723b8683bd6b9451e2c08f0bb555d48cc3b7f7 + tag: latest@sha256:8a91b62f284b7eb0becb41e1ac5d3f4cb8206cc8a2406c0c719ca1543046ccfa workload: main: podSpec: diff --git a/charts/stable/sickchill/Chart.yaml b/charts/stable/sickchill/Chart.yaml index 502c4a9f7334f..989c6850fa6f7 100644 --- a/charts/stable/sickchill/Chart.yaml +++ b/charts/stable/sickchill/Chart.yaml @@ -36,4 +36,4 @@ sources: - https://github.com/linuxserver/docker-sickchill - https://github.com/truecharts/charts/tree/master/charts/stable/sickchill type: application -version: 13.2.5 +version: 13.2.6 diff --git a/charts/stable/sickchill/values.yaml b/charts/stable/sickchill/values.yaml index 87b60637e112f..6db68030e4028 100644 --- a/charts/stable/sickchill/values.yaml +++ b/charts/stable/sickchill/values.yaml @@ -1,7 +1,7 @@ image: repository: ghcr.io/linuxserver/sickchill pullPolicy: IfNotPresent - tag: 2024.3.1@sha256:e8ae2e9bfee6a0a36b2b922127d875651ba0ed8a666dd54467cb4c8d44b8181e + tag: 2024.3.1@sha256:03c238870f993473483c68c4828627dba867e306ee0832fa9b97b0a102e2225e service: main: ports: diff --git a/charts/stable/sourcegraph/Chart.yaml b/charts/stable/sourcegraph/Chart.yaml index 51169d01c447c..7625e02a5c553 100644 --- a/charts/stable/sourcegraph/Chart.yaml +++ b/charts/stable/sourcegraph/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 5.9.45 +appVersion: 5.9.347 dependencies: - name: common version: 25.1.5 @@ -36,4 +36,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/sourcegraph - https://hub.docker.com/r/sourcegraph/server type: application -version: 7.7.0 +version: 7.7.1 diff --git a/charts/stable/sourcegraph/values.yaml b/charts/stable/sourcegraph/values.yaml index 8d36487a7ce2e..7363a294557a2 100644 --- a/charts/stable/sourcegraph/values.yaml +++ b/charts/stable/sourcegraph/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: docker.io/sourcegraph/server - tag: 5.9.45@sha256:5f69260721498d0dc2e3806ca4532eba3434811289ddbabcd0e662e0689a5fc8 + tag: 5.9.347@sha256:b565557f17aeedb576bf6803237ce910088763f28c6f76b0e1e37e122665a625 persistence: applicationdatastoragepath: enabled: true diff --git a/charts/stable/tar1090/Chart.yaml b/charts/stable/tar1090/Chart.yaml index 7a9c1fec3a3c8..a68e7be2e0f03 100644 --- a/charts/stable/tar1090/Chart.yaml +++ b/charts/stable/tar1090/Chart.yaml @@ -32,4 +32,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/tar1090 - https://hub.docker.com/r/mikenye/tar1090 type: application -version: 7.2.21 +version: 7.2.22 diff --git a/charts/stable/tar1090/values.yaml b/charts/stable/tar1090/values.yaml index dc7dce685fbeb..056de51e0bd81 100644 --- a/charts/stable/tar1090/values.yaml +++ b/charts/stable/tar1090/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: docker.io/mikenye/tar1090 - tag: latest@sha256:473e4c5231acb57fe026197c8481427d7725cfb383bc6b557f77d3670cdabdc4 + tag: latest@sha256:68ac5866558697cf534928855c41646afe987b604ea66c96a49357ca268879e2 persistence: {} portal: open: diff --git a/charts/stable/twonky-server/Chart.yaml b/charts/stable/twonky-server/Chart.yaml index b54515f113395..1c5b40690fcdb 100644 --- a/charts/stable/twonky-server/Chart.yaml +++ b/charts/stable/twonky-server/Chart.yaml @@ -35,4 +35,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/twonky-server - https://hub.docker.com/r/dtjs48jkt/twonkyserver type: application -version: 7.2.5 +version: 7.2.6 diff --git a/charts/stable/twonky-server/values.yaml b/charts/stable/twonky-server/values.yaml index faf50a9ee7784..4b6cfe53ebc34 100644 --- a/charts/stable/twonky-server/values.yaml +++ b/charts/stable/twonky-server/values.yaml @@ -1,7 +1,7 @@ image: pullPolicy: IfNotPresent repository: docker.io/dtjs48jkt/twonkyserver - tag: latest@sha256:66fe0204d02c5d3e21bf5b789413fe426b700fbd092ee7fe517b16b176b18abb + tag: latest@sha256:c5a176b7ceb57b5e3ea910c00f9b8c857121915d6df9b3f34a9126890ae25f70 persistence: config: enabled: true diff --git a/charts/stable/vocechat-server/Chart.yaml b/charts/stable/vocechat-server/Chart.yaml index ff56bf5426599..467319c4c5a40 100644 --- a/charts/stable/vocechat-server/Chart.yaml +++ b/charts/stable/vocechat-server/Chart.yaml @@ -6,7 +6,7 @@ annotations: truecharts.org/min_helm_version: "3.11" truecharts.org/train: stable apiVersion: v2 -appVersion: 0.3.57 +appVersion: 0.4.0 dependencies: - name: common version: 25.1.5 @@ -33,4 +33,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/stable/vocechat-server - https://hub.docker.com/r/privoce/vocechat-server type: application -version: 5.2.3 +version: 5.3.0 diff --git a/charts/stable/vocechat-server/values.yaml b/charts/stable/vocechat-server/values.yaml index d3c4e0b66ddb6..c9961a0aa6a83 100644 --- a/charts/stable/vocechat-server/values.yaml +++ b/charts/stable/vocechat-server/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/privoce/vocechat-server pullPolicy: IfNotPresent - tag: v0.3.57@sha256:45daa3e9cb2716bd86463fac3b5224449169e892423258eb1dac0f8328d71388 + tag: v0.4.0@sha256:b97b87746680fb382251f327181405fb5e3f73eeb122ad31ca334db5fa58f48d service: main: diff --git a/charts/stable/wordpress/Chart.yaml b/charts/stable/wordpress/Chart.yaml index 4e7cd1f7d388d..ac2f48dd1dd55 100644 --- a/charts/stable/wordpress/Chart.yaml +++ b/charts/stable/wordpress/Chart.yaml @@ -40,4 +40,4 @@ sources: - https://hub.docker.com/r/bitnami/wordpress - https://www.wordpress.org type: application -version: 9.7.12 +version: 9.7.14 diff --git a/charts/stable/wordpress/values.yaml b/charts/stable/wordpress/values.yaml index fd0f2b3452a56..cf44eb4f9270a 100644 --- a/charts/stable/wordpress/values.yaml +++ b/charts/stable/wordpress/values.yaml @@ -1,7 +1,7 @@ image: repository: docker.io/bitnami/wordpress pullPolicy: IfNotPresent - tag: 6.6.2@sha256:94127ed899b70e59ca601f7ffeb8e11332811d0c6e95918cfdc6373cf8162acc + tag: 6.6.2@sha256:e268136695b1caca8f03da55c645967d26a4793775bfd7fa524ec95089f06828 securityContext: container: readOnlyRootFilesystem: false diff --git a/charts/system/prometheus-operator/Chart.yaml b/charts/system/prometheus-operator/Chart.yaml index a4394adc75491..6303d4663d710 100644 --- a/charts/system/prometheus-operator/Chart.yaml +++ b/charts/system/prometheus-operator/Chart.yaml @@ -16,7 +16,7 @@ dependencies: tags: [] import-values: [] - name: kube-prometheus-stack - version: 65.7.0 + version: 65.8.1 repository: oci://ghcr.io/prometheus-community/charts condition: "" alias: kps @@ -41,4 +41,4 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/system/prometheus-operator - https://github.com/truecharts/containers/tree/master/apps/scratch type: application -version: 8.10.0 +version: 8.11.0 diff --git a/clusters/main/kubernetes/apps/jackett/app/helm-release.yaml b/clusters/main/kubernetes/apps/jackett/app/helm-release.yaml index 86ccfd87edd2f..7cf4c23be0931 100644 --- a/clusters/main/kubernetes/apps/jackett/app/helm-release.yaml +++ b/clusters/main/kubernetes/apps/jackett/app/helm-release.yaml @@ -10,7 +10,7 @@ spec: chart: spec: chart: jackett - version: 23.0.37 + version: 23.0.38 sourceRef: kind: HelmRepository name: truecharts diff --git a/clustertool/.gitignore b/clustertool/.gitignore index 7b369358bb941..145b4f56af080 100644 --- a/clustertool/.gitignore +++ b/clustertool/.gitignore @@ -26,3 +26,4 @@ embeded/darwin* embeded/windows* embeded/freebsd* .devcontainer +.envrc diff --git a/clustertool/cmd/adv_testcmd.go b/clustertool/cmd/adv_testcmd.go index 26d022dfd6243..6063166457491 100644 --- a/clustertool/cmd/adv_testcmd.go +++ b/clustertool/cmd/adv_testcmd.go @@ -1,10 +1,17 @@ package cmd import ( + "context" + "os" + "path/filepath" "strings" + "github.com/rs/zerolog/log" "github.com/spf13/cobra" + "github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/kubectlcmds" + "github.com/truecharts/public/clustertool/pkg/talassist" ) var advTestCmdlongHelp = strings.TrimSpace(` @@ -16,11 +23,25 @@ var testcmd = &cobra.Command{ Short: "tests specific code for developer usages", Long: advTestCmdlongHelp, Run: func(cmd *cobra.Command, args []string) { + ctx := context.Background() initfiles.LoadTalEnv(false) + talassist.LoadTalConfig() // err := fluxhandler.ProcessJSONFiles("./testdata/truenas_exports") // if err != nil { // log.Info().Msg("Error:", err) // } + var manifestPaths = []string{ + filepath.Join(helper.KubernetesPath, "flux-system", "flux", "sopssecret.secret.yaml"), + filepath.Join(helper.KubernetesPath, "flux-system", "flux", "deploykey.secret.yaml"), + filepath.Join(helper.KubernetesPath, "flux-system", "flux", "clustersettings.secret.yaml"), + } + for _, filePath := range manifestPaths { + log.Info().Msgf("Bootstrap: Loading Manifest: %v", filePath) + if err := kubectlcmds.KubectlApply(ctx, filePath); err != nil { + log.Info().Msgf("Error applying manifest for %s: %v\n", filepath.Base(filePath), err) + os.Exit(1) + } + } }, } diff --git a/clustertool/cmd/checkcrypt.go b/clustertool/cmd/checkcrypt.go index 2ed34dd69527e..2ad325a35db38 100644 --- a/clustertool/cmd/checkcrypt.go +++ b/clustertool/cmd/checkcrypt.go @@ -19,6 +19,7 @@ This tool can, for example, be used as a pre-commit check and will fail with a n var checkcrypt = &cobra.Command{ Use: "checkcrypt", Short: "Checks if all files are encrypted correctly in accordance with .sops.yaml", + Aliases: []string{"checkencrypt"}, Example: "clustertool checkcrypt", Long: checkcyptLongHelp, Run: func(cmd *cobra.Command, args []string) { diff --git a/clustertool/cmd/helmrelease_upgrade.go b/clustertool/cmd/helmrelease_upgrade.go index c5248852e5766..614575324298b 100644 --- a/clustertool/cmd/helmrelease_upgrade.go +++ b/clustertool/cmd/helmrelease_upgrade.go @@ -16,6 +16,7 @@ var hrUpgradeLongHelp = strings.TrimSpace(` var hrupgrade = &cobra.Command{ Use: "upgrade", Short: "run helm-upgrade using a helm-release file without flux", + Aliases: []string{"update", "edit"}, Example: "clustertool helmrelease upgrade", Long: hrUpgradeLongHelp, Run: func(cmd *cobra.Command, args []string) { diff --git a/clustertool/cmd/talos_apply.go b/clustertool/cmd/talos_apply.go index c511c47c36886..1b8742582b173 100644 --- a/clustertool/cmd/talos_apply.go +++ b/clustertool/cmd/talos_apply.go @@ -47,6 +47,7 @@ Not any contained helm-charts var apply = &cobra.Command{ Use: "apply", Short: "apply", + Aliases: []string{"apply-config"}, Example: "clustertool apply ", Long: applyLongHelp, Run: func(cmd *cobra.Command, args []string) { diff --git a/clustertool/cmd/talos_bootstrap.go b/clustertool/cmd/talos_bootstrap.go index ef1d82d90548c..ca7ba992c7613 100644 --- a/clustertool/cmd/talos_bootstrap.go +++ b/clustertool/cmd/talos_bootstrap.go @@ -17,7 +17,7 @@ var advBootstrapLongHelp = strings.TrimSpace(` var bootstrap = &cobra.Command{ Use: "bootstrap", Short: "bootstrap first Talos Node", - Example: "clustertool adv bootstrap", + Example: "clustertool talos bootstrap", Long: advBootstrapLongHelp, Run: bootstrapfunc, } diff --git a/clustertool/cmd/talos_health.go b/clustertool/cmd/talos_health.go index f2f3ee330ddcb..91bf17b20a9d8 100644 --- a/clustertool/cmd/talos_health.go +++ b/clustertool/cmd/talos_health.go @@ -7,7 +7,9 @@ import ( "github.com/spf13/cobra" "github.com/truecharts/public/clustertool/pkg/gencmd" "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/initfiles" "github.com/truecharts/public/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/talassist" ) var advHealthLongHelp = strings.TrimSpace(` @@ -17,12 +19,14 @@ var advHealthLongHelp = strings.TrimSpace(` var health = &cobra.Command{ Use: "health", Short: "Check Talos Cluster Health", - Example: "clustertool adv health", + Example: "clustertool talos health", Long: advHealthLongHelp, Run: func(cmd *cobra.Command, args []string) { if err := sops.DecryptFiles(); err != nil { log.Info().Msgf("Error decrypting files: %v\n", err) } + initfiles.LoadTalEnv(false) + talassist.LoadTalConfig() log.Info().Msg("Running Cluster HealthCheck") healthcmd := gencmd.GenPlain("health", helper.TalEnv["VIP_IP"], []string{}) gencmd.ExecCmd(healthcmd[0]) diff --git a/clustertool/cmd/talos_kubeconfig.go b/clustertool/cmd/talos_kubeconfig.go new file mode 100644 index 0000000000000..7d62e6619976d --- /dev/null +++ b/clustertool/cmd/talos_kubeconfig.go @@ -0,0 +1,52 @@ +package cmd + +import ( + "strings" + + "github.com/rs/zerolog/log" + "github.com/spf13/cobra" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/talassist" +) + +var advKubeconfigLongHelp = strings.TrimSpace(` + +`) + +var kubeconfig = &cobra.Command{ + Use: "kubeconfig", + Short: "kubeconfig for Talos Cluster", + Example: "clustertool talos kubeconfig ", + Long: advResetLongHelp, + Run: func(cmd *cobra.Command, args []string) { + var extraArgs []string + node := "" + + if len(args) > 1 { + extraArgs = args[1:] + } + if len(args) >= 1 { + node = args[0] + if args[0] == "all" { + node = "" + } + } + + if err := sops.DecryptFiles(); err != nil { + log.Info().Msgf("Error decrypting files: %v\n", err) + } + initfiles.LoadTalEnv(false) + talassist.LoadTalConfig() + log.Info().Msg("Running Cluster kubeconfig") + + taloscmds := gencmd.GenPlain("kubeconfig", node, extraArgs) + gencmd.ExecCmds(taloscmds, true) + + }, +} + +func init() { + talosCmd.AddCommand(kubeconfig) +} diff --git a/clustertool/cmd/talos_reset.go b/clustertool/cmd/talos_reset.go index bcf9c6eae0dd7..40cdbc5d7f2b3 100644 --- a/clustertool/cmd/talos_reset.go +++ b/clustertool/cmd/talos_reset.go @@ -6,7 +6,9 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/initfiles" "github.com/truecharts/public/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/talassist" ) var advResetLongHelp = strings.TrimSpace(` @@ -16,7 +18,7 @@ var advResetLongHelp = strings.TrimSpace(` var reset = &cobra.Command{ Use: "reset", Short: "Reset Talos Nodes and Kubernetes", - Example: "clustertool adv reset ", + Example: "clustertool talos reset ", Long: advResetLongHelp, Run: func(cmd *cobra.Command, args []string) { var extraArgs []string @@ -35,6 +37,8 @@ var reset = &cobra.Command{ if err := sops.DecryptFiles(); err != nil { log.Info().Msgf("Error decrypting files: %v\n", err) } + initfiles.LoadTalEnv(false) + talassist.LoadTalConfig() log.Info().Msg("Running Cluster node Reset") diff --git a/clustertool/cmd/talos_upgrade.go b/clustertool/cmd/talos_upgrade.go index 86f11fb251d80..9a30c700289cf 100644 --- a/clustertool/cmd/talos_upgrade.go +++ b/clustertool/cmd/talos_upgrade.go @@ -7,7 +7,9 @@ import ( "github.com/spf13/cobra" "github.com/truecharts/public/clustertool/pkg/gencmd" "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/initfiles" "github.com/truecharts/public/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/talassist" ) var upgradeLongHelp = strings.TrimSpace(` @@ -21,7 +23,7 @@ On top of this, after upgrading Talos on all nodes, it also executes kubernetes- var upgrade = &cobra.Command{ Use: "upgrade", Short: "Upgrade Talos Nodes and Kubernetes", - Example: "clustertool upgrade ", + Example: "clustertool talos upgrade ", Long: upgradeLongHelp, Run: func(cmd *cobra.Command, args []string) { var extraArgs []string @@ -40,6 +42,8 @@ var upgrade = &cobra.Command{ if err := sops.DecryptFiles(); err != nil { log.Info().Msgf("Error decrypting files: %v\n", err) } + initfiles.LoadTalEnv(false) + talassist.LoadTalConfig() log.Info().Msg("Running Cluster Upgrade") diff --git a/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml b/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml index 634984448cf26..34ca75d95691f 100644 --- a/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml +++ b/clustertool/embed/generic/kubernetes/system/prometheus-operator/app/helm-release.yaml @@ -9,7 +9,7 @@ spec: spec: chart: prometheus-operator - version: 8.10.0 + version: 8.11.0 sourceRef: kind: HelmRepository name: truecharts diff --git a/clustertool/go.mod b/clustertool/go.mod index 7effb38f40d34..e086eb221465f 100644 --- a/clustertool/go.mod +++ b/clustertool/go.mod @@ -3,31 +3,33 @@ module github.com/truecharts/public/clustertool go 1.23.2 require ( - filippo.io/age v1.2.0 - github.com/Masterminds/semver/v3 v3.3.0 - github.com/beevik/ntp v1.4.3 - github.com/budimanjojo/talhelper/v3 v3.0.8 - github.com/getsops/sops/v3 v3.9.1 - github.com/go-git/go-git/v5 v5.12.0 - github.com/go-playground/validator/v10 v10.22.1 - github.com/invopop/jsonschema v0.12.0 - github.com/joho/godotenv v1.5.1 - github.com/knadh/koanf/parsers/yaml v0.1.0 - github.com/knadh/koanf/providers/file v1.1.2 - github.com/knadh/koanf/v2 v2.1.2 - github.com/leaanthony/debme v1.2.1 - github.com/rs/zerolog v1.33.0 - github.com/siderolabs/talos/pkg/machinery v1.9.0-alpha.0 - github.com/spf13/cobra v1.8.1 - golang.org/x/crypto v0.28.0 - gopkg.in/yaml.v3 v3.0.1 - helm.sh/helm/v3 v3.16.2 - k8s.io/api v0.31.2 - k8s.io/apimachinery v0.31.2 - k8s.io/client-go v0.31.2 - sigs.k8s.io/controller-runtime v0.19.1 - sigs.k8s.io/kustomize/api v0.18.0 - sigs.k8s.io/kustomize/kyaml v0.18.1 + filippo.io/age v1.2.0 + github.com/Masterminds/semver/v3 v3.3.0 + github.com/beevik/ntp v1.4.3 + github.com/budimanjojo/talhelper/v3 v3.0.8 + github.com/getsops/sops/v3 v3.9.1 + github.com/go-git/go-git/v5 v5.12.0 + github.com/go-logr/zerologr v1.2.3 + github.com/go-playground/validator/v10 v10.22.1 + github.com/invopop/jsonschema v0.12.0 + github.com/joho/godotenv v1.5.1 + github.com/knadh/koanf/parsers/yaml v0.1.0 + github.com/knadh/koanf/providers/file v1.1.2 + github.com/knadh/koanf/v2 v2.1.2 + github.com/leaanthony/debme v1.2.1 + github.com/rs/zerolog v1.33.0 + github.com/siderolabs/talos/pkg/machinery v1.9.0-alpha.0 + github.com/spf13/cobra v1.8.1 + golang.org/x/crypto v0.29.0 + gopkg.in/yaml.v3 v3.0.1 + helm.sh/helm/v3 v3.16.2 + k8s.io/api v0.31.2 + k8s.io/apimachinery v0.31.2 + k8s.io/client-go v0.31.2 + sigs.k8s.io/controller-runtime v0.19.1 + sigs.k8s.io/kustomize/api v0.18.0 + sigs.k8s.io/kustomize/kyaml v0.18.1 + sigs.k8s.io/yaml v1.4.0 ) replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 @@ -35,255 +37,254 @@ replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16 replace go.mozilla.org/sops/v3 => github.com/getsops/sops/v3 v3.9.1 require ( - cloud.google.com/go v0.115.1 // indirect - cloud.google.com/go/auth v0.9.7 // indirect - cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect - cloud.google.com/go/compute/metadata v0.5.2 // indirect - cloud.google.com/go/iam v1.2.1 // indirect - cloud.google.com/go/kms v1.20.0 // indirect - cloud.google.com/go/longrunning v0.6.1 // indirect - cloud.google.com/go/storage v1.43.0 // indirect - dario.cat/mergo v1.0.1 // indirect - github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 // indirect - github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 // indirect - github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect - github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect - github.com/BurntSushi/toml v1.4.0 // indirect - github.com/MakeNowJust/heredoc v1.0.0 // indirect - github.com/Masterminds/goutils v1.1.1 // indirect - github.com/Masterminds/sprig/v3 v3.3.0 // indirect - github.com/Masterminds/squirrel v1.5.4 // indirect - github.com/Microsoft/go-winio v0.6.2 // indirect - github.com/ProtonMail/go-crypto v1.1.0-beta.0-proton // indirect - github.com/a8m/envsubst v1.4.2 // indirect - github.com/antlr4-go/antlr/v4 v4.13.0 // indirect - github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect - github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect - github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect - github.com/aws/aws-sdk-go-v2/config v1.27.39 // indirect - github.com/aws/aws-sdk-go-v2/credentials v1.17.37 // indirect - github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect - github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.25 // indirect - github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect - github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect - github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect - github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect - github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect - github.com/aws/aws-sdk-go-v2/service/kms v1.36.3 // indirect - github.com/aws/aws-sdk-go-v2/service/s3 v1.63.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect - github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect - github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 // indirect - github.com/aws/smithy-go v1.21.0 // indirect - github.com/bahlo/generic-list-go v0.2.0 // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/blang/semver v3.5.1+incompatible // indirect - github.com/blang/semver/v4 v4.0.0 // indirect - github.com/buger/jsonparser v1.1.1 // indirect - github.com/cenkalti/backoff/v4 v4.3.0 // indirect - github.com/cespare/xxhash/v2 v2.3.0 // indirect - github.com/chai2010/gettext-go v1.0.3 // indirect - github.com/cloudflare/circl v1.4.0 // indirect - github.com/containerd/containerd v1.7.20 // indirect - github.com/containerd/errdefs v0.1.0 // indirect - github.com/containerd/go-cni v1.1.10 // indirect - github.com/containerd/log v0.1.0 // indirect - github.com/containerd/platforms v0.2.1 // indirect - github.com/containernetworking/cni v1.2.3 // indirect - github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect - github.com/cyphar/filepath-securejoin v0.3.1 // indirect - github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/distribution/distribution/v3 v3.0.0-alpha.1 // indirect - github.com/distribution/reference v0.6.0 // indirect - github.com/docker/cli v27.3.1+incompatible // indirect - github.com/docker/distribution v2.8.3+incompatible // indirect - github.com/docker/docker v27.3.1+incompatible // indirect - github.com/docker/docker-credential-helpers v0.8.2 // indirect - github.com/docker/go-connections v0.5.0 // indirect - github.com/docker/go-metrics v0.0.1 // indirect - github.com/dustin/go-humanize v1.0.1 // indirect - github.com/emicklei/go-restful/v3 v3.12.0 // indirect - github.com/emirpasic/gods v1.18.1 // indirect - github.com/evanphx/json-patch v5.9.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.9.0 // indirect - github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect - github.com/fatih/color v1.18.0 // indirect - github.com/felixge/httpsnoop v1.0.4 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect - github.com/fxamacker/cbor/v2 v2.7.0 // indirect - github.com/gabriel-vasile/mimetype v1.4.3 // indirect - github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe // indirect - github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-errors/errors v1.5.1 // indirect - github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect - github.com/go-git/go-billy/v5 v5.5.0 // indirect - github.com/go-gorp/gorp/v3 v3.1.0 // indirect - github.com/go-jose/go-jose/v4 v4.0.4 // indirect - github.com/go-logr/logr v1.4.2 // indirect - github.com/go-logr/stdr v1.2.2 // indirect - github.com/go-openapi/jsonpointer v0.21.0 // indirect - github.com/go-openapi/jsonreference v0.21.0 // indirect - github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-playground/locales v0.14.1 // indirect - github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-viper/mapstructure/v2 v2.2.1 // indirect - github.com/gobwas/glob v0.2.3 // indirect - github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang-jwt/jwt/v5 v5.2.1 // indirect - github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.4 // indirect - github.com/google/btree v1.1.2 // indirect - github.com/google/cel-go v0.21.0 // indirect - github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect - github.com/google/go-cmp v0.6.0 // indirect - github.com/google/gofuzz v1.2.0 // indirect - github.com/google/s2a-go v0.1.8 // indirect - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect - github.com/google/uuid v1.6.0 // indirect - github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect - github.com/googleapis/gax-go/v2 v2.13.0 // indirect - github.com/gookit/filter v1.2.1 // indirect - github.com/gookit/goutil v0.6.15 // indirect - github.com/gookit/validate v1.5.2 // indirect - github.com/gorilla/mux v1.8.1 // indirect - github.com/gorilla/websocket v1.5.1 // indirect - github.com/gosuri/uitable v0.0.4 // indirect - github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect - github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect - github.com/hashicorp/errwrap v1.1.0 // indirect - github.com/hashicorp/go-cleanhttp v0.5.2 // indirect - github.com/hashicorp/go-multierror v1.1.1 // indirect - github.com/hashicorp/go-retryablehttp v0.7.7 // indirect - github.com/hashicorp/go-rootcerts v1.0.2 // indirect - github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect - github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect - github.com/hashicorp/go-sockaddr v1.0.7 // indirect - github.com/hashicorp/hcl v1.0.1-vault-5 // indirect - github.com/hashicorp/vault/api v1.15.0 // indirect - github.com/hexops/gotextdiff v1.0.3 // indirect - github.com/huandu/xstrings v1.5.0 // indirect - github.com/imdario/mergo v1.0.0 // indirect - github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect - github.com/jmoiron/sqlx v1.4.0 // indirect - github.com/josharian/intern v1.0.0 // indirect - github.com/josharian/native v1.1.0 // indirect - github.com/jsimonetti/rtnetlink/v2 v2.0.2 // indirect - github.com/json-iterator/go v1.1.12 // indirect - github.com/kevinburke/ssh_config v1.2.0 // indirect - github.com/klauspost/compress v1.17.9 // indirect - github.com/knadh/koanf/maps v0.1.1 // indirect - github.com/kylelemons/godebug v1.1.0 // indirect - github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect - github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect - github.com/leodido/go-urn v1.4.0 // indirect - github.com/lib/pq v1.10.9 // indirect - github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect - github.com/mailru/easyjson v0.7.7 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/mdlayher/ethtool v0.2.0 // indirect - github.com/mdlayher/genetlink v1.3.2 // indirect - github.com/mdlayher/netlink v1.7.2 // indirect - github.com/mdlayher/socket v0.5.1 // indirect - github.com/miekg/dns v1.1.59 // indirect - github.com/mitchellh/copystructure v1.2.0 // indirect - github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/mitchellh/go-wordwrap v1.0.1 // indirect - github.com/mitchellh/mapstructure v1.5.0 // indirect - github.com/mitchellh/reflectwalk v1.0.2 // indirect - github.com/moby/locker v1.0.1 // indirect - github.com/moby/spdystream v0.4.0 // indirect - github.com/moby/term v0.5.0 // indirect - github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.2 // indirect - github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect - github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect - github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/opencontainers/go-digest v1.0.0 // indirect - github.com/opencontainers/image-spec v1.1.0 // indirect - github.com/opencontainers/runtime-spec v1.2.0 // indirect - github.com/peterbourgon/diskv v2.0.1+incompatible // indirect - github.com/pjbgf/sha1cd v0.3.0 // indirect - github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect - github.com/prometheus/client_golang v1.20.2 // indirect - github.com/prometheus/client_model v0.6.1 // indirect - github.com/prometheus/common v0.55.0 // indirect - github.com/prometheus/procfs v0.15.1 // indirect - github.com/rivo/uniseg v0.4.7 // indirect - github.com/rubenv/sql-migrate v1.7.0 // indirect - github.com/russross/blackfriday/v2 v2.1.0 // indirect - github.com/ryanuber/go-glob v1.0.0 // indirect - github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect - github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect - github.com/shopspring/decimal v1.4.0 // indirect - github.com/siderolabs/crypto v0.5.0 // indirect - github.com/siderolabs/gen v0.5.0 // indirect - github.com/siderolabs/go-blockdevice v0.4.8 // indirect - github.com/siderolabs/go-blockdevice/v2 v2.0.2 // indirect - github.com/siderolabs/go-pointer v1.0.0 // indirect - github.com/siderolabs/image-factory v0.5.0 // indirect - github.com/siderolabs/net v0.4.0 // indirect - github.com/siderolabs/protoenc v0.2.1 // indirect - github.com/sirupsen/logrus v1.9.3 // indirect - github.com/skeema/knownhosts v1.2.2 // indirect - github.com/spf13/cast v1.7.0 // indirect - github.com/spf13/pflag v1.0.5 // indirect - github.com/stoewer/go-strcase v1.3.0 // indirect - github.com/urfave/cli v1.22.15 // indirect - github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect - github.com/x448/float16 v0.8.4 // indirect - github.com/xanzy/ssh-agent v0.3.3 // indirect - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect - github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect - github.com/xeipuuv/gojsonschema v1.2.0 // indirect - github.com/xlab/treeprint v1.2.0 // indirect - go.opencensus.io v0.24.0 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect - go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect - go.opentelemetry.io/otel v1.30.0 // indirect - go.opentelemetry.io/otel/metric v1.30.0 // indirect - go.opentelemetry.io/otel/trace v1.30.0 // indirect - golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect - golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.30.0 // indirect - golang.org/x/oauth2 v0.23.0 // indirect - golang.org/x/sync v0.8.0 // indirect - golang.org/x/sys v0.26.0 // indirect - golang.org/x/term v0.25.0 // indirect - golang.org/x/text v0.19.0 // indirect - golang.org/x/time v0.7.0 // indirect - google.golang.org/api v0.199.0 // indirect - google.golang.org/genproto v0.0.0-20240930140551-af27646dc61f // indirect - google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect - google.golang.org/grpc v1.67.1 // indirect - google.golang.org/protobuf v1.35.1 // indirect - gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect - gopkg.in/inf.v0 v0.9.1 // indirect - gopkg.in/ini.v1 v1.67.0 // indirect - gopkg.in/warnings.v0 v0.1.2 // indirect - gopkg.in/yaml.v2 v2.4.0 // indirect - k8s.io/apiextensions-apiserver v0.31.1 // indirect - k8s.io/apiserver v0.31.1 // indirect - k8s.io/cli-runtime v0.31.1 // indirect - k8s.io/component-base v0.31.1 // indirect - k8s.io/klog/v2 v2.130.1 // indirect - k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect - k8s.io/kubectl v0.31.1 // indirect - k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect - oras.land/oras-go v1.2.5 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect - sigs.k8s.io/yaml v1.4.0 // indirect + cloud.google.com/go v0.115.1 // indirect + cloud.google.com/go/auth v0.9.7 // indirect + cloud.google.com/go/auth/oauth2adapt v0.2.4 // indirect + cloud.google.com/go/compute/metadata v0.5.2 // indirect + cloud.google.com/go/iam v1.2.1 // indirect + cloud.google.com/go/kms v1.20.0 // indirect + cloud.google.com/go/longrunning v0.6.1 // indirect + cloud.google.com/go/storage v1.43.0 // indirect + dario.cat/mergo v1.0.1 // indirect + github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azcore v1.14.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.1.0 // indirect + github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.1 // indirect + github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect + github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect + github.com/BurntSushi/toml v1.4.0 // indirect + github.com/MakeNowJust/heredoc v1.0.0 // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/sprig/v3 v3.3.0 // indirect + github.com/Masterminds/squirrel v1.5.4 // indirect + github.com/Microsoft/go-winio v0.6.2 // indirect + github.com/ProtonMail/go-crypto v1.1.0-beta.0-proton // indirect + github.com/a8m/envsubst v1.4.2 // indirect + github.com/antlr4-go/antlr/v4 v4.13.0 // indirect + github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect + github.com/aws/aws-sdk-go-v2 v1.31.0 // indirect + github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.5 // indirect + github.com/aws/aws-sdk-go-v2/config v1.27.39 // indirect + github.com/aws/aws-sdk-go-v2/credentials v1.17.37 // indirect + github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.14 // indirect + github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.25 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.18 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.18 // indirect + github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.18 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.5 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.3.20 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.20 // indirect + github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.17.18 // indirect + github.com/aws/aws-sdk-go-v2/service/kms v1.36.3 // indirect + github.com/aws/aws-sdk-go-v2/service/s3 v1.63.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sso v1.23.3 // indirect + github.com/aws/aws-sdk-go-v2/service/ssooidc v1.27.3 // indirect + github.com/aws/aws-sdk-go-v2/service/sts v1.31.3 // indirect + github.com/aws/smithy-go v1.21.0 // indirect + github.com/bahlo/generic-list-go v0.2.0 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/blang/semver v3.5.1+incompatible // indirect + github.com/blang/semver/v4 v4.0.0 // indirect + github.com/buger/jsonparser v1.1.1 // indirect + github.com/cenkalti/backoff/v4 v4.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // indirect + github.com/chai2010/gettext-go v1.0.3 // indirect + github.com/cloudflare/circl v1.4.0 // indirect + github.com/containerd/containerd v1.7.20 // indirect + github.com/containerd/errdefs v0.1.0 // indirect + github.com/containerd/go-cni v1.1.10 // indirect + github.com/containerd/log v0.1.0 // indirect + github.com/containerd/platforms v0.2.1 // indirect + github.com/containernetworking/cni v1.2.3 // indirect + github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect + github.com/cyphar/filepath-securejoin v0.3.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/distribution/distribution/v3 v3.0.0-alpha.1 // indirect + github.com/distribution/reference v0.6.0 // indirect + github.com/docker/cli v27.3.1+incompatible // indirect + github.com/docker/distribution v2.8.3+incompatible // indirect + github.com/docker/docker v27.3.1+incompatible // indirect + github.com/docker/docker-credential-helpers v0.8.2 // indirect + github.com/docker/go-connections v0.5.0 // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/dustin/go-humanize v1.0.1 // indirect + github.com/emicklei/go-restful/v3 v3.12.0 // indirect + github.com/emirpasic/gods v1.18.1 // indirect + github.com/evanphx/json-patch v5.9.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect + github.com/fatih/color v1.18.0 // indirect + github.com/felixge/httpsnoop v1.0.4 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.3 // indirect + github.com/getsops/gopgagent v0.0.0-20240527072608-0c14999532fe // indirect + github.com/ghodss/yaml v1.0.0 // indirect + github.com/go-errors/errors v1.5.1 // indirect + github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 // indirect + github.com/go-git/go-billy/v5 v5.5.0 // indirect + github.com/go-gorp/gorp/v3 v3.1.0 // indirect + github.com/go-jose/go-jose/v4 v4.0.4 // indirect + github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-openapi/jsonpointer v0.21.0 // indirect + github.com/go-openapi/jsonreference v0.21.0 // indirect + github.com/go-openapi/swag v0.23.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-viper/mapstructure/v2 v2.2.1 // indirect + github.com/gobwas/glob v0.2.3 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt/v5 v5.2.1 // indirect + github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/btree v1.1.2 // indirect + github.com/google/cel-go v0.21.0 // indirect + github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect + github.com/google/go-cmp v0.6.0 // indirect + github.com/google/gofuzz v1.2.0 // indirect + github.com/google/s2a-go v0.1.8 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/google/uuid v1.6.0 // indirect + github.com/googleapis/enterprise-certificate-proxy v0.3.4 // indirect + github.com/googleapis/gax-go/v2 v2.13.0 // indirect + github.com/gookit/filter v1.2.1 // indirect + github.com/gookit/goutil v0.6.15 // indirect + github.com/gookit/validate v1.5.2 // indirect + github.com/gorilla/mux v1.8.1 // indirect + github.com/gorilla/websocket v1.5.1 // indirect + github.com/gosuri/uitable v0.0.4 // indirect + github.com/goware/prefixer v0.0.0-20160118172347-395022866408 // indirect + github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect + github.com/hashicorp/go-cleanhttp v0.5.2 // indirect + github.com/hashicorp/go-multierror v1.1.1 // indirect + github.com/hashicorp/go-retryablehttp v0.7.7 // indirect + github.com/hashicorp/go-rootcerts v1.0.2 // indirect + github.com/hashicorp/go-secure-stdlib/parseutil v0.1.8 // indirect + github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 // indirect + github.com/hashicorp/go-sockaddr v1.0.7 // indirect + github.com/hashicorp/hcl v1.0.1-vault-5 // indirect + github.com/hashicorp/vault/api v1.15.0 // indirect + github.com/hexops/gotextdiff v1.0.3 // indirect + github.com/huandu/xstrings v1.5.0 // indirect + github.com/imdario/mergo v1.0.0 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jmoiron/sqlx v1.4.0 // indirect + github.com/josharian/intern v1.0.0 // indirect + github.com/josharian/native v1.1.0 // indirect + github.com/jsimonetti/rtnetlink/v2 v2.0.2 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/kevinburke/ssh_config v1.2.0 // indirect + github.com/klauspost/compress v1.17.9 // indirect + github.com/knadh/koanf/maps v0.1.1 // indirect + github.com/kylelemons/godebug v1.1.0 // indirect + github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect + github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/lib/pq v1.10.9 // indirect + github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect + github.com/mdlayher/ethtool v0.2.0 // indirect + github.com/mdlayher/genetlink v1.3.2 // indirect + github.com/mdlayher/netlink v1.7.2 // indirect + github.com/mdlayher/socket v0.5.1 // indirect + github.com/miekg/dns v1.1.59 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/go-wordwrap v1.0.1 // indirect + github.com/mitchellh/mapstructure v1.5.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/spdystream v0.4.0 // indirect + github.com/moby/term v0.5.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect + github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect + github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.1.0 // indirect + github.com/opencontainers/runtime-spec v1.2.0 // indirect + github.com/peterbourgon/diskv v2.0.1+incompatible // indirect + github.com/pjbgf/sha1cd v0.3.0 // indirect + github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect + github.com/prometheus/client_golang v1.20.2 // indirect + github.com/prometheus/client_model v0.6.1 // indirect + github.com/prometheus/common v0.55.0 // indirect + github.com/prometheus/procfs v0.15.1 // indirect + github.com/rivo/uniseg v0.4.7 // indirect + github.com/rubenv/sql-migrate v1.7.0 // indirect + github.com/russross/blackfriday/v2 v2.1.0 // indirect + github.com/ryanuber/go-glob v1.0.0 // indirect + github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 // indirect + github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect + github.com/shopspring/decimal v1.4.0 // indirect + github.com/siderolabs/crypto v0.5.0 // indirect + github.com/siderolabs/gen v0.5.0 // indirect + github.com/siderolabs/go-blockdevice v0.4.8 // indirect + github.com/siderolabs/go-blockdevice/v2 v2.0.2 // indirect + github.com/siderolabs/go-pointer v1.0.0 // indirect + github.com/siderolabs/image-factory v0.5.0 // indirect + github.com/siderolabs/net v0.4.0 // indirect + github.com/siderolabs/protoenc v0.2.1 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect + github.com/skeema/knownhosts v1.2.2 // indirect + github.com/spf13/cast v1.7.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stoewer/go-strcase v1.3.0 // indirect + github.com/urfave/cli v1.22.15 // indirect + github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect + github.com/x448/float16 v0.8.4 // indirect + github.com/xanzy/ssh-agent v0.3.3 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + github.com/xlab/treeprint v1.2.0 // indirect + go.opencensus.io v0.24.0 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.55.0 // indirect + go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.55.0 // indirect + go.opentelemetry.io/otel v1.30.0 // indirect + go.opentelemetry.io/otel/metric v1.30.0 // indirect + go.opentelemetry.io/otel/trace v1.30.0 // indirect + golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect + golang.org/x/mod v0.21.0 // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/oauth2 v0.23.0 // indirect + golang.org/x/sync v0.9.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/term v0.26.0 // indirect + golang.org/x/text v0.20.0 // indirect + golang.org/x/time v0.7.0 // indirect + google.golang.org/api v0.199.0 // indirect + google.golang.org/genproto v0.0.0-20240930140551-af27646dc61f // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect + google.golang.org/grpc v1.67.1 // indirect + google.golang.org/protobuf v1.35.1 // indirect + gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/ini.v1 v1.67.0 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/apiextensions-apiserver v0.31.1 // indirect + k8s.io/apiserver v0.31.1 // indirect + k8s.io/cli-runtime v0.31.1 // indirect + k8s.io/component-base v0.31.1 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/kube-openapi v0.0.0-20240709000822-3c01b740850f // indirect + k8s.io/kubectl v0.31.1 // indirect + k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect + oras.land/oras-go v1.2.5 // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) diff --git a/clustertool/go.sum b/clustertool/go.sum index 7324e8490be76..9ba0fab07e09f 100644 --- a/clustertool/go.sum +++ b/clustertool/go.sum @@ -277,6 +277,8 @@ github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg= +github.com/go-logr/zerologr v1.2.3 h1:up5N9vcH9Xck3jJkXzgyOxozT14R47IyDODz8LM1KSs= +github.com/go-logr/zerologr v1.2.3/go.mod h1:BxwGo7y5zgSHYR1BjbnHPyF/5ZjVKfKxAZANVu6E8Ho= github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ= github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY= github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ= @@ -448,8 +450,6 @@ github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY= github.com/knadh/koanf/providers/file v1.1.2 h1:aCC36YGOgV5lTtAFz2qkgtWdeQsgfxUkxDOe+2nQY3w= github.com/knadh/koanf/providers/file v1.1.2/go.mod h1:/faSBcv2mxPVjFrXck95qeoyoZ5myJ6uxN8OOVNJJCI= -github.com/knadh/koanf/v2 v2.1.1 h1:/R8eXqasSTsmDCsAyYj+81Wteg8AqrV9CP6gvsTsOmM= -github.com/knadh/koanf/v2 v2.1.1/go.mod h1:4mnTRbZCK+ALuBXHZMjDfG9y714L7TykVnZkXbMU3Es= github.com/knadh/koanf/v2 v2.1.2 h1:I2rtLRqXRy1p01m/utEtpZSSA6dcJbgGVuE27kW2PzQ= github.com/knadh/koanf/v2 v2.1.2/go.mod h1:Gphfaen0q1Fc1HTgJgSTC4oRX9R2R5ErYMZJy8fLJBo= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -738,6 +738,8 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ= +golang.org/x/crypto v0.29.0/go.mod h1:+F4F4N5hv6v38hfeYwTdx20oUvLLc+QfrE9Ax9HtgRg= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 h1:vr/HnozRka3pE4EsMEg1lgkXJkTFJCVUX+S/ZT6wYzM= golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc= @@ -773,6 +775,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ= golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ= +golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -793,14 +797,20 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo= golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.26.0 h1:WEQa6V3Gja/BhNxg540hBip/kkaYtRg3cxg4oXSw4AU= +golang.org/x/term v0.26.0/go.mod h1:Si5m1o57C5nBNQo5z1iq+XDijt21BDBDp2bK0QI8e3E= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/time v0.7.0 h1:ntUhktv3OPE6TgYxXWv9vKvUSJyIFJlyohwbkEwPrKQ= golang.org/x/time v0.7.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/clustertool/main.go b/clustertool/main.go index 1e40441888857..83c16a0a4b787 100644 --- a/clustertool/main.go +++ b/clustertool/main.go @@ -8,9 +8,11 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" + "github.com/go-logr/zerologr" "github.com/truecharts/public/clustertool/cmd" "github.com/truecharts/public/clustertool/embed" "github.com/truecharts/public/clustertool/pkg/helper" + k8slog "sigs.k8s.io/controller-runtime/pkg/log" ) var Version = "dev" @@ -54,6 +56,15 @@ func main() { NoColor: noColor, // Set to true if you prefer no color }) + // Initialize zerolog with console output + zlogger := zerolog.New(os.Stderr).With().Timestamp().Logger() + + // Wrap zerolog with zerologr to create a logr.Logger + logger := zerologr.New(&zlogger) + + // Set this logger for dependencies expecting log.SetLogger + k8slog.SetLogger(logger) + fmt.Printf("\n%s\n", helper.Logo) fmt.Printf("---\nClustertool Version: %s\n---\n", Version) diff --git a/clustertool/pkg/gencmd/apply.go b/clustertool/pkg/gencmd/apply.go index d3554b6e5c6fa..378e3c32ffc6e 100644 --- a/clustertool/pkg/gencmd/apply.go +++ b/clustertool/pkg/gencmd/apply.go @@ -1,30 +1,43 @@ package gencmd import ( + "os" "path/filepath" + "github.com/rs/zerolog/log" "github.com/truecharts/public/clustertool/embed" "github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/talassist" ) -func GenApply(node string, extraFlags []string) []string { +func GenApply(node string, extraArgs []string) []string { commands := []string{} - //extraFlags = append(extraFlags, "--preserve") talosPath := embed.GetTalosExec() if node == "" { for _, noderef := range talassist.TalConfig.Nodes { - // TODO add extraFlags filename := talassist.TalConfig.ClusterName + "-" + noderef.Hostname + ".yaml" - cmd := talosPath + " " + "apply-config" + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress + " " + "--file=" + filepath.Join(helper.TalosGenerated, filename) + cmd := talosPath + " " + "apply machineconfig" + " -f " + filepath.Join(helper.TalosGenerated, filename) + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress // + " " + strings.Join(extraArgs, " ") commands = append(commands, cmd) } } else { - cmd := talosPath + " " + "apply-config" + " --talosconfig " + helper.TalosConfigFile + " -n " + node + " " + nodename := "" + for _, noderef := range talassist.TalConfig.Nodes { + if noderef.IPAddress == node { + nodename = noderef.Hostname + } + } + if nodename == "" { + log.Error().Msgf("Node IP %s, does not match any node in talconfig. Exiting...", node) + os.Exit(1) + } + + filename := talassist.TalConfig.ClusterName + "-" + nodename + ".yaml" + cmd := talosPath + " " + "apply machineconfig" + " -f " + filepath.Join(helper.TalosGenerated, filename) + " --talosconfig " + helper.TalosConfigFile + " -n " + node // + " " + strings.Join(extraArgs, " ") commands = append(commands, cmd) } + log.Debug().Msgf("Apply Commands rendered: %s", commands) return commands } diff --git a/clustertool/pkg/gencmd/bootstrap.go b/clustertool/pkg/gencmd/bootstrap.go index e842c0ef9ecad..dd75eb7217021 100644 --- a/clustertool/pkg/gencmd/bootstrap.go +++ b/clustertool/pkg/gencmd/bootstrap.go @@ -34,11 +34,11 @@ func RunBootstrap(args []string) { } bootstrapNode := talassist.TalConfig.Nodes[0].IPAddress - bootstrapcmds := GenPlain("bootstrap", bootstrapNode, extraArgs) nodestatus.WaitForHealth(bootstrapNode, []string{"maintenance"}) taloscmds := GenApply(bootstrapNode, extraArgs) + ExecCmds(taloscmds, false) nodestatus.WaitForHealth(bootstrapNode, []string{"booting"}) @@ -46,14 +46,16 @@ func RunBootstrap(args []string) { log.Info().Msgf("Bootstrap: At this point your system is installed to disk, please make sure not to reboot into the installer ISO/USB %s", bootstrapNode) log.Info().Msgf("Bootstrap: running bootstrap on node: %s", bootstrapNode) + bootstrapcmds := GenPlain("bootstrap", bootstrapNode, extraArgs) + ExecCmd(bootstrapcmds[0]) log.Info().Msgf("Bootstrap: waiting for VIP %v to come online...", helper.TalEnv["VIP_IP"]) nodestatus.WaitForHealth(helper.TalEnv["VIP_IP"], []string{"running"}) - log.Info().Msgf("Bootstrap: Configuring kubectl for VIP: %v", helper.TalEnv["VIP_IP"]) + log.Info().Msgf("Bootstrap: Configuring kubeconfig/kubectl for VIP: %v", helper.TalEnv["VIP_IP"]) // Ensure kubeconfig is loaded - kubeconfigcmds := GenPlain("health", helper.TalEnv["VIP_IP"], extraArgs) + kubeconfigcmds := GenPlain("kubeconfig", helper.TalEnv["VIP_IP"], extraArgs) ExecCmd(kubeconfigcmds[0]) // Desired pod names diff --git a/clustertool/pkg/gencmd/execcmd.go b/clustertool/pkg/gencmd/execcmd.go index d152c172f77e1..67f53a07c1f6f 100644 --- a/clustertool/pkg/gencmd/execcmd.go +++ b/clustertool/pkg/gencmd/execcmd.go @@ -12,7 +12,7 @@ import ( func ExecCmd(cmd string) { argslice := strings.Split(cmd, " ") - // log.Info().Msgf("Running: %s\n", argslice[0:]) + log.Trace().Msgf("command", argslice[:]) // log.Info().Msg("test", strings.Join(argslice, " ")) out, err := helper.RunCommand(argslice, false) @@ -47,7 +47,7 @@ func ExecCmd(cmd string) { } func ExecCmds(taloscmds []string, healthcheck bool) error { - log.Info().Msg("Regenerating config prior to apply...") + log.Info().Msg("Regenerating config prior to commands...") GenConfig([]string{}) var todocmds []string var healthcmd string @@ -56,6 +56,7 @@ func ExecCmds(taloscmds []string, healthcheck bool) error { log.Info().Msg("Pre-Run Healthchecks...") for _, command := range taloscmds { + node := helper.ExtractNode(command) log.Info().Msgf("checking node availability: %v", node) err := nodestatus.CheckHealth(node, "", false) @@ -92,10 +93,12 @@ func ExecCmds(taloscmds []string, healthcheck bool) error { log.Info().Msgf("Executing commands on node: %v", node) argslice := strings.Split(string(command), " ") // log.Info().Msg("test", strings.Join(argslice, " ")) + log.Debug().Msgf("running command: %s", command) out, err := helper.RunCommand(argslice, false) if err != nil { if strings.Contains(string(out), "certificate signed by unknown authority") { argslice = append(argslice, "--insecure") + log.Debug().Msgf("Re-Running command using insecure flag: %s", command) _, err2 := helper.RunCommand(argslice, false) if err2 != nil { log.Info().Msgf("err: %v", err2) diff --git a/clustertool/pkg/gencmd/plain.go b/clustertool/pkg/gencmd/plain.go index ff17742b0796f..f28f395035b6f 100644 --- a/clustertool/pkg/gencmd/plain.go +++ b/clustertool/pkg/gencmd/plain.go @@ -1,27 +1,27 @@ package gencmd import ( + "github.com/rs/zerolog/log" "github.com/truecharts/public/clustertool/embed" "github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/talassist" ) -func GenPlain(command string, node string, extraFlags []string) []string { +func GenPlain(command string, node string, extraArgs []string) []string { commands := []string{} - //extraFlags = append(extraFlags, "--preserve") talosPath := embed.GetTalosExec() if node == "" { for _, noderef := range talassist.TalConfig.Nodes { - // TODO add extraFlags - cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress + " " + cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + noderef.IPAddress // + " " + strings.Join(extraArgs, " ") commands = append(commands, cmd) } } else { - cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + node + " " + cmd := talosPath + " " + command + " --talosconfig " + helper.TalosConfigFile + " -n " + node // + " " + strings.Join(extraArgs, " ") commands = append(commands, cmd) } + log.Debug().Msgf("%s Command rendered: %s", command, commands) return commands } diff --git a/clustertool/pkg/helper/runcmd.go b/clustertool/pkg/helper/runcmd.go index 6930feb444171..91a34729ceba5 100644 --- a/clustertool/pkg/helper/runcmd.go +++ b/clustertool/pkg/helper/runcmd.go @@ -6,6 +6,8 @@ import ( "os" "os/exec" "strings" + + "github.com/rs/zerolog/log" ) type filteredWriter struct { @@ -33,6 +35,10 @@ func (fw *filteredWriter) Write(p []byte) (n int, err error) { func RunCommand(commandSlice []string, silent bool) (string, error) { filters := []string{"certificate signed by unknown authority", "bootstrap is not available yet"} + log.Trace().Msg("Command slice structure:") + for i, s := range commandSlice { + log.Trace().Msgf("Index: %d, Value: %s\n", i, s) + } cmd := exec.Command(commandSlice[0], commandSlice[1:]...) var stdoutBuf, stderrBuf bytes.Buffer diff --git a/clustertool/pkg/kubectlcmds/apply.go b/clustertool/pkg/kubectlcmds/apply.go index 5c9c032810ba9..ac0f16964403a 100644 --- a/clustertool/pkg/kubectlcmds/apply.go +++ b/clustertool/pkg/kubectlcmds/apply.go @@ -9,7 +9,6 @@ import ( "path/filepath" "github.com/rs/zerolog/log" - "gopkg.in/yaml.v3" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/util/homedir" @@ -17,6 +16,7 @@ import ( "sigs.k8s.io/kustomize/api/krusty" "sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/kio" + "sigs.k8s.io/yaml" ) // getKubeClient initializes and returns a controller-runtime client.Client diff --git a/clustertool/pkg/nodestatus/health.go b/clustertool/pkg/nodestatus/health.go index 8b562ecf18b51..6a0263712ad8e 100644 --- a/clustertool/pkg/nodestatus/health.go +++ b/clustertool/pkg/nodestatus/health.go @@ -15,8 +15,8 @@ func CheckHealth(node string, status string, silent bool) error { if err != nil { errstring := "healthcheck failed. status: " + string(out) + " error: " + err.Error() if !silent { - log.Info().Msgf("Healthcheck: check on node : failed %v", node) - log.Info().Msgf("failed with error: %s", errstring) + log.Error().Msgf("Healthcheck: check on node : failed %v", node) + log.Error().Msgf("failed with error: %s", errstring) } log.Error().Err(err).Str("node", node).Msg("Healthcheck failed") return errors.New(errstring) @@ -36,17 +36,22 @@ func CheckHealth(node string, status string, silent bool) error { response := "Healthcheck: WARN detected node " + node + " in mode " + "maintenance" + ".\nLikely a new node, so trying commands anyway. Continuing..." log.Warn().Msg(response) } else if status == "" && strings.Contains(out, "running") { - _, err = CheckReadyStatus(node) + _, err = CheckReadyStatus(node, silent) if err != nil { + errstring := "healthcheck failed. status: " + string(out) + " error: " + err.Error() - log.Error().Err(err).Str("node", node).Msg("Healthcheck failed while checking readiness") + + if !silent { + log.Error().Err(err).Str("node", node).Msg("Healthcheck failed while checking readiness") + } return errors.New(errstring) } } else { if !silent { log.Info().Msgf("Healthcheck: check on node : failed %v", node) + log.Error().Str("node", node).Msg("Healthcheck failed with unexpected status") } - log.Error().Str("node", node).Msg("Healthcheck failed with unexpected status") + return errors.New("healthcheck failed") } log.Debug().Str("node", node).Msg("Health check completed successfully") @@ -83,7 +88,7 @@ func WaitForHealth(node string, status []string) (string, error) { log.Debug().Str("node", node).Str("check", check).Msg("Performing initial health check") err := CheckHealth(node, check, true) if err == nil { - log.Info().Str("node", node).Str("status", check).Msg("Initial health check passed") + log.Debug().Str("node", node).Str("status", check).Msg("Initial health check passed") return check, nil } } diff --git a/clustertool/pkg/nodestatus/status.go b/clustertool/pkg/nodestatus/status.go index 313f0c944e853..52ff7d510d7b7 100644 --- a/clustertool/pkg/nodestatus/status.go +++ b/clustertool/pkg/nodestatus/status.go @@ -75,7 +75,7 @@ func CheckStatus(node string) (string, error) { return string(out), nil } -func CheckReadyStatus(node string) (string, error) { +func CheckReadyStatus(node string, silent bool) (string, error) { log.Info().Str("node", node).Msg("Checking node readiness status") argsslice := append(baseStatusCMD(node), "-o", "jsonpath={.spec.status.ready}") @@ -83,7 +83,9 @@ func CheckReadyStatus(node string) (string, error) { if err != nil { errstring := "status: " + string(out) + " error: " + err.Error() - log.Error().Msg(errstring) + if !silent { + log.Error().Msg(errstring) + } return "ERROR", errors.New(errstring) } if strings.Contains(string(out), "true") { diff --git a/clustertool/pkg/sops/checkencrypt.go b/clustertool/pkg/sops/checkencrypt.go index 2ee9f0700fcc8..0a65d6b8472f3 100644 --- a/clustertool/pkg/sops/checkencrypt.go +++ b/clustertool/pkg/sops/checkencrypt.go @@ -1,11 +1,13 @@ package sops import ( + "bufio" "bytes" "fmt" "os" "path/filepath" "regexp" + "strings" "github.com/rs/zerolog/log" "github.com/truecharts/public/clustertool/pkg/helper" @@ -179,6 +181,7 @@ func CheckFilesAndReportEncryption(tryEncrypt bool, checkStaged bool) error { log.Fatal().Msg("Exiting due to unencrypted files after encryption attempt") os.Exit(1) } + shamCheck() } } @@ -190,6 +193,33 @@ func CheckFilesAndReportEncryption(tryEncrypt bool, checkStaged bool) error { return nil } +// shamCheck checks if clusterenv contains the phrase "shamir_threshold" indicating it is indeed encrypted +func shamCheck() { + log.Debug().Msg("Checking if clusterenv contains shamir_threshold to ensure encryption...") + file, err := os.Open(helper.ClusterEnvFile) + if err != nil { + log.Error().Err(err).Msgf("error opening file: %w", err) + } + defer file.Close() + + scanner := bufio.NewScanner(file) + for scanner.Scan() { + if strings.Contains(scanner.Text(), "shamir_threshold") { + log.Debug().Msg("clusterenv contains shamir_threshold, continuing...") + return + } else { + log.Error().Msg("clusterenv is NOT encrypted and encryption-check failed!\n DO NOT UPLOAD!") + os.Exit(1) + } + } + + if err := scanner.Err(); err != nil { + log.Error().Err(err).Msgf("error reading file: %w", err) + } + + return +} + // filesToCheck returns a list of files to check for encryption based on the logic in .sops.yaml. func filesToCheck(config SopsConfig) ([]EncrFileData, error) { log.Debug().Msg("Starting filesToCheck") diff --git a/clustertool/pkg/sops/loadsops.go b/clustertool/pkg/sops/loadsops.go index 77a7565b329aa..7e6c8341e53ac 100644 --- a/clustertool/pkg/sops/loadsops.go +++ b/clustertool/pkg/sops/loadsops.go @@ -3,6 +3,7 @@ package sops import ( "fmt" "io/ioutil" + "os" "github.com/rs/zerolog/log" "gopkg.in/yaml.v3" @@ -19,6 +20,15 @@ type SopsConfig struct { func LoadSopsConfig() (SopsConfig, error) { log.Trace().Msg("Starting LoadSopsConfig function") + if _, err := os.Stat(".sops.yaml"); os.IsNotExist(err) { + log.Info().Msg(".sops.yaml file does not exist, skipping loading SOPS....") + return SopsConfig{}, fmt.Errorf("error reading file: %v", err) + } else if err != nil { + log.Error().Msgf("Error checking .sops.yaml file :", err) + } else { + log.Debug().Msg(".sops.yaml File exists.") + } + // Read .sops.yaml file data, err := ioutil.ReadFile(".sops.yaml") if err != nil { diff --git a/containers/apps/code-server/Dockerfile b/containers/apps/code-server/Dockerfile index 834c5e7ebbec5..715dbb618f813 100644 --- a/containers/apps/code-server/Dockerfile +++ b/containers/apps/code-server/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/codercom/code-server:4.93.1@sha256:c69e398d1b64589b3b77a7becfd03f4ec524982def20e6bffbb51b1b839e72ba +FROM docker.io/codercom/code-server:4.95.1@sha256:d9bc7797d997e1b199e333676732e075bac4bae276dc0fe1baece2e313edfa09 LABEL "org.opencontainers.image.source"="https://github.com/truecharts/containers" diff --git a/containers/apps/devcontainer/Dockerfile b/containers/apps/devcontainer/Dockerfile index 7c345d9b3d381..984782b1b9eee 100644 --- a/containers/apps/devcontainer/Dockerfile +++ b/containers/apps/devcontainer/Dockerfile @@ -1,5 +1,5 @@ # hadolint ignore=DL3007 -FROM ghcr.io/onedr0p/cluster-template/devcontainer:latest@sha256:2eba37d8623f2e69badb3ec5bdb067a760bd511732016480f989e4279680d57b +FROM ghcr.io/onedr0p/cluster-template/devcontainer:latest@sha256:29c7f2b152cd92a05f454c21991b0f76dd95b410dde159e3be31a6277b0c15d0 ARG VERSION ARG CONTAINER_NAME diff --git a/website/src/content/docs/clustertool/getting-started.md b/website/src/content/docs/clustertool/getting-started.md index 42b1c90b22dab..23a0ce3139a40 100644 --- a/website/src/content/docs/clustertool/getting-started.md +++ b/website/src/content/docs/clustertool/getting-started.md @@ -168,11 +168,11 @@ To ensure stability, we will first apply the configuration to the first ControlP For this, in a terminal, run: -`ClusterTool apply` +`ClusterTool talos apply` or, on Windows: -`ClusterTool.exe apply` +`ClusterTool.exe talos apply` You will be asked if you want to bootstrap the cluster, to do this enter `y` or `yes` After this is finished successfully, make sure the node is running correctly. It should have everything loaded already. @@ -183,8 +183,8 @@ Now we can continue to add more nodes to the cluster. This is completely automat In a terminal, run: -`ClusterTool apply` +`ClusterTool talos apply` or, on Windows: -`ClusterTool.exe apply` +`ClusterTool.exe talos apply` diff --git a/website/src/content/docs/clustertool/migrations/scale.md b/website/src/content/docs/clustertool/migrations/scale.md index 0146d5e7399e9..cd94a083a220c 100644 --- a/website/src/content/docs/clustertool/migrations/scale.md +++ b/website/src/content/docs/clustertool/migrations/scale.md @@ -104,9 +104,20 @@ Afterwards, ensure you run `git add . && git commit -m "Exported SCALE App confi ### Converting SCALE Apps to Helm-Release files +:::danger + +MANUALLY CHECK YOUR VALUES +Get rid of as much as possible. + +Remember: the default values file would be completely empty. +Only add things you also explicitly and manually have added to SCALE before. + +::: + - Move back to your main machine running ClusterTool and ensure your gotten your latest additions to your Cluster GIT repository, by running: `git pull` - Run `./clustertool scale migrate` to convert all exported SCALE Apps to ClusterTool/FluxCD compatible Helm-Releases - Remove any, unwanted, changes (or duplicates of) to any charts included by clustertool by default. +- Please do a first setup without any addons and, where possible and reasonable, without ingress. - run `./clustertool init` and `./clustertool genconfig` again to ensure a fluxcd compatible directory structure is loaded ### Alterations for CNPG restore diff --git a/website/src/content/docs/clustertool/virtual-machines/truenas-scale.mdx b/website/src/content/docs/clustertool/virtual-machines/truenas-scale.mdx index b0d951c01ca19..35ced44acf092 100644 --- a/website/src/content/docs/clustertool/virtual-machines/truenas-scale.mdx +++ b/website/src/content/docs/clustertool/virtual-machines/truenas-scale.mdx @@ -327,6 +327,12 @@ Workernodes can be pretty basic and should "just work". size: <= 600GB ``` +### Post-Installation steps + +To make sure your Talos cluster starts correctly after restarting the VM, don't forget to remove the Installation Media ISO after you initialized the cluster. + +You can do this by going to `Virtualization` > Expand your VM > `Devices` and then delete the "CD Rom"-device. + ### GPU pass-through Caveats