From 8b691218f1495ad1539b38e4a4bdf80421b496be Mon Sep 17 00:00:00 2001 From: Kjeld Schouten Date: Thu, 17 Oct 2024 12:56:40 +0200 Subject: [PATCH] fix some go issues --- clustertool/README.md | 8 ++++---- clustertool/cmd/adv_bootstrap.go | 2 +- clustertool/cmd/adv_fluxbootstrap.go | 2 +- clustertool/cmd/adv_health.go | 6 +++--- clustertool/cmd/adv_precommit.go | 2 +- clustertool/cmd/adv_reset.go | 4 ++-- clustertool/cmd/adv_scaleexport.go | 2 +- clustertool/cmd/adv_scalemigrate.go | 2 +- clustertool/cmd/adv_testcmd.go | 4 ++-- clustertool/cmd/apply.go | 8 ++++---- clustertool/cmd/charts_bump.go | 2 +- clustertool/cmd/charts_deps.go | 4 ++-- clustertool/cmd/charts_genchangelog.go | 2 +- clustertool/cmd/charts_genchartlist.go | 4 ++-- clustertool/cmd/charts_genmeta.go | 4 ++-- clustertool/cmd/charts_tagclean.go | 2 +- clustertool/cmd/checkcrypt.go | 2 +- clustertool/cmd/decrypt.go | 2 +- clustertool/cmd/encrypt.go | 2 +- clustertool/cmd/genconfig.go | 8 ++++---- clustertool/cmd/helmrelease_install.go | 4 ++-- clustertool/cmd/helmrelease_upgrade.go | 4 ++-- clustertool/cmd/info.go | 2 +- clustertool/cmd/init.go | 4 ++-- clustertool/cmd/root.go | 2 +- clustertool/cmd/upgrade.go | 6 +++--- clustertool/embed/embed.go | 2 +- clustertool/go.mod | 2 +- clustertool/main.go | 6 +++--- clustertool/partial_builds/precommit/main.go | 2 +- clustertool/pkg/charts/changelog/changelog.go | 2 +- clustertool/pkg/charts/changelog/render.go | 2 +- clustertool/pkg/charts/chartFile/chart_file.go | 2 +- clustertool/pkg/charts/chartFile/updater.go | 8 ++++---- clustertool/pkg/charts/chartFile/updater_test.go | 2 +- clustertool/pkg/charts/deps/deps.go | 6 +++--- clustertool/pkg/fluxhandler/bootstrap.go | 4 ++-- clustertool/pkg/fluxhandler/helm.go | 2 +- clustertool/pkg/fluxhandler/sshsecretgen.go | 2 +- clustertool/pkg/gencmd/apply.go | 6 +++--- clustertool/pkg/gencmd/bootstrap.go | 12 ++++++------ clustertool/pkg/gencmd/execcmd.go | 4 ++-- clustertool/pkg/gencmd/genconfig.go | 6 +++--- clustertool/pkg/gencmd/health.go | 4 ++-- clustertool/pkg/gencmd/kubeconfig.go | 4 ++-- clustertool/pkg/gencmd/reset.go | 4 ++-- clustertool/pkg/gencmd/upgrade.go | 4 ++-- clustertool/pkg/initfiles/clusterenv.go | 2 +- clustertool/pkg/initfiles/initfiles.go | 4 ++-- clustertool/pkg/kubectlcmds/apply.go | 2 +- clustertool/pkg/nodestatus/status.go | 4 ++-- clustertool/pkg/scale/scale2flux.go | 4 ++-- clustertool/pkg/sops/checkencrypt.go | 2 +- clustertool/pkg/sops/decrypt.go | 2 +- clustertool/pkg/sops/encrypt.go | 2 +- clustertool/pkg/sops/wrapper.go | 2 +- .../pkg/talhelperutil/extractfromtalconfig.go | 2 +- 57 files changed, 103 insertions(+), 103 deletions(-) diff --git a/clustertool/README.md b/clustertool/README.md index 2790f812c76..98dfbce1b4c 100644 --- a/clustertool/README.md +++ b/clustertool/README.md @@ -2,16 +2,16 @@

clustertool

- [![GitHub release (release name instead of tag name)](https://img.shields.io/github/v/release/truecharts/clustertool?include_prereleases)](https://github.com/truecharts/private/clustertool/releases) - [![GitHub issues](https://img.shields.io/github/issues/truecharts/clustertool)](https://github.com/truecharts/private/clustertool/issues) + [![GitHub release (release name instead of tag name)](https://img.shields.io/github/v/release/truecharts/clustertool?include_prereleases)](https://github.com/truecharts/public/clustertool/releases) + [![GitHub issues](https://img.shields.io/github/issues/truecharts/clustertool)](https://github.com/truecharts/public/clustertool/issues)

A helper tool to help building TrueCharts helm charts
· - Report Bug + Report Bug · - Request Feature + Request Feature

diff --git a/clustertool/cmd/adv_bootstrap.go b/clustertool/cmd/adv_bootstrap.go index e9aa033342b..332acefe0ee 100644 --- a/clustertool/cmd/adv_bootstrap.go +++ b/clustertool/cmd/adv_bootstrap.go @@ -2,7 +2,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/gencmd" ) var bootstrap = &cobra.Command{ diff --git a/clustertool/cmd/adv_fluxbootstrap.go b/clustertool/cmd/adv_fluxbootstrap.go index 8af2a45d3c8..8381941b643 100644 --- a/clustertool/cmd/adv_fluxbootstrap.go +++ b/clustertool/cmd/adv_fluxbootstrap.go @@ -4,7 +4,7 @@ import ( "context" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" ) var fluxbootstrap = &cobra.Command{ diff --git a/clustertool/cmd/adv_health.go b/clustertool/cmd/adv_health.go index 1c494b22bf8..7b68e952fe6 100644 --- a/clustertool/cmd/adv_health.go +++ b/clustertool/cmd/adv_health.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/sops" ) var health = &cobra.Command{ diff --git a/clustertool/cmd/adv_precommit.go b/clustertool/cmd/adv_precommit.go index c6c877b03ee..3c939a054d1 100644 --- a/clustertool/cmd/adv_precommit.go +++ b/clustertool/cmd/adv_precommit.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/sops" ) var precommit = &cobra.Command{ diff --git a/clustertool/cmd/adv_reset.go b/clustertool/cmd/adv_reset.go index af6a20fc11e..bf101e0e19f 100644 --- a/clustertool/cmd/adv_reset.go +++ b/clustertool/cmd/adv_reset.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/sops" ) var reset = &cobra.Command{ diff --git a/clustertool/cmd/adv_scaleexport.go b/clustertool/cmd/adv_scaleexport.go index c510d0dbf14..de5f57a6def 100644 --- a/clustertool/cmd/adv_scaleexport.go +++ b/clustertool/cmd/adv_scaleexport.go @@ -2,7 +2,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/scale" + "github.com/truecharts/public/clustertool/pkg/scale" ) var scaleexport = &cobra.Command{ diff --git a/clustertool/cmd/adv_scalemigrate.go b/clustertool/cmd/adv_scalemigrate.go index 201b604e088..2e697033a97 100644 --- a/clustertool/cmd/adv_scalemigrate.go +++ b/clustertool/cmd/adv_scalemigrate.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/scale" + "github.com/truecharts/public/clustertool/pkg/scale" ) var scalemigrate = &cobra.Command{ diff --git a/clustertool/cmd/adv_testcmd.go b/clustertool/cmd/adv_testcmd.go index 4c4686a3288..f53af95c6cc 100644 --- a/clustertool/cmd/adv_testcmd.go +++ b/clustertool/cmd/adv_testcmd.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" - "github.com/truecharts/private/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/initfiles" ) var testcmd = &cobra.Command{ diff --git a/clustertool/cmd/apply.go b/clustertool/cmd/apply.go index ee5facd5317..5729b903ebc 100644 --- a/clustertool/cmd/apply.go +++ b/clustertool/cmd/apply.go @@ -3,10 +3,10 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/nodestatus" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/nodestatus" + "github.com/truecharts/public/clustertool/pkg/sops" ) var apply = &cobra.Command{ diff --git a/clustertool/cmd/charts_bump.go b/clustertool/cmd/charts_bump.go index fcbe987eb61..409342325c7 100644 --- a/clustertool/cmd/charts_bump.go +++ b/clustertool/cmd/charts_bump.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/charts/version" + "github.com/truecharts/public/clustertool/pkg/charts/version" ) var bumper = &cobra.Command{ diff --git a/clustertool/cmd/charts_deps.go b/clustertool/cmd/charts_deps.go index 81faa9472fc..cbb77ec322f 100644 --- a/clustertool/cmd/charts_deps.go +++ b/clustertool/cmd/charts_deps.go @@ -3,8 +3,8 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/charts/deps" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/charts/deps" + "github.com/truecharts/public/clustertool/pkg/helper" ) var depsCmd = &cobra.Command{ diff --git a/clustertool/cmd/charts_genchangelog.go b/clustertool/cmd/charts_genchangelog.go index 2de816597c1..2da62130722 100644 --- a/clustertool/cmd/charts_genchangelog.go +++ b/clustertool/cmd/charts_genchangelog.go @@ -4,7 +4,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/charts/changelog" + "github.com/truecharts/public/clustertool/pkg/charts/changelog" ) var genChangelogCmd = &cobra.Command{ diff --git a/clustertool/cmd/charts_genchartlist.go b/clustertool/cmd/charts_genchartlist.go index 6cbe61b2e64..b5dfe00a5d4 100644 --- a/clustertool/cmd/charts_genchartlist.go +++ b/clustertool/cmd/charts_genchartlist.go @@ -4,8 +4,8 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/charts/website" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/charts/website" + "github.com/truecharts/public/clustertool/pkg/helper" ) var genChartListCmd = &cobra.Command{ diff --git a/clustertool/cmd/charts_genmeta.go b/clustertool/cmd/charts_genmeta.go index b2fd413bd2a..ae463a3323b 100644 --- a/clustertool/cmd/charts_genmeta.go +++ b/clustertool/cmd/charts_genmeta.go @@ -6,8 +6,8 @@ import ( "slices" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/charts/chartFile" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/charts/chartFile" + "github.com/truecharts/public/clustertool/pkg/helper" ) var genMetaCmd = &cobra.Command{ diff --git a/clustertool/cmd/charts_tagclean.go b/clustertool/cmd/charts_tagclean.go index f9cb4dbc87b..0ac5c9e222b 100644 --- a/clustertool/cmd/charts_tagclean.go +++ b/clustertool/cmd/charts_tagclean.go @@ -4,7 +4,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/charts/image" + "github.com/truecharts/public/clustertool/pkg/charts/image" ) var tagCleaner = &cobra.Command{ diff --git a/clustertool/cmd/checkcrypt.go b/clustertool/cmd/checkcrypt.go index d97fe6266bf..b1b524bf38f 100644 --- a/clustertool/cmd/checkcrypt.go +++ b/clustertool/cmd/checkcrypt.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/sops" ) var checkcrypt = &cobra.Command{ diff --git a/clustertool/cmd/decrypt.go b/clustertool/cmd/decrypt.go index 269220b3ee7..0aecca3539f 100644 --- a/clustertool/cmd/decrypt.go +++ b/clustertool/cmd/decrypt.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/sops" ) var decrypt = &cobra.Command{ diff --git a/clustertool/cmd/encrypt.go b/clustertool/cmd/encrypt.go index 1d13719a4e8..aeff9e125ac 100644 --- a/clustertool/cmd/encrypt.go +++ b/clustertool/cmd/encrypt.go @@ -3,7 +3,7 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/sops" ) var encrypt = &cobra.Command{ diff --git a/clustertool/cmd/genconfig.go b/clustertool/cmd/genconfig.go index 60f4193c6d1..a819724ce59 100644 --- a/clustertool/cmd/genconfig.go +++ b/clustertool/cmd/genconfig.go @@ -5,10 +5,10 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/nodestatus" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/nodestatus" + "github.com/truecharts/public/clustertool/pkg/sops" ) var genConfigLongHelp = strings.TrimSpace(` diff --git a/clustertool/cmd/helmrelease_install.go b/clustertool/cmd/helmrelease_install.go index e780198067f..54700bba812 100644 --- a/clustertool/cmd/helmrelease_install.go +++ b/clustertool/cmd/helmrelease_install.go @@ -4,8 +4,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/initfiles" ) var hrinstall = &cobra.Command{ diff --git a/clustertool/cmd/helmrelease_upgrade.go b/clustertool/cmd/helmrelease_upgrade.go index 3ffeeb4dd1f..3b24d302381 100644 --- a/clustertool/cmd/helmrelease_upgrade.go +++ b/clustertool/cmd/helmrelease_upgrade.go @@ -4,8 +4,8 @@ import ( "path/filepath" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/initfiles" ) var hrupgrade = &cobra.Command{ diff --git a/clustertool/cmd/info.go b/clustertool/cmd/info.go index 359cad02fc3..2c7fd0fddb6 100644 --- a/clustertool/cmd/info.go +++ b/clustertool/cmd/info.go @@ -2,7 +2,7 @@ package cmd import ( "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/info" + "github.com/truecharts/public/clustertool/pkg/info" ) var infoCmd = &cobra.Command{ diff --git a/clustertool/cmd/init.go b/clustertool/cmd/init.go index aff275cc2a1..4b1967787ed 100644 --- a/clustertool/cmd/init.go +++ b/clustertool/cmd/init.go @@ -4,8 +4,8 @@ import ( "strings" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/initfiles" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/sops" ) var initLongHelp = strings.TrimSpace(` diff --git a/clustertool/cmd/root.go b/clustertool/cmd/root.go index 6b52429e048..6deea57488b 100644 --- a/clustertool/cmd/root.go +++ b/clustertool/cmd/root.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) var thisversion string diff --git a/clustertool/cmd/upgrade.go b/clustertool/cmd/upgrade.go index 84bf58383d7..c1778f4e802 100644 --- a/clustertool/cmd/upgrade.go +++ b/clustertool/cmd/upgrade.go @@ -3,9 +3,9 @@ package cmd import ( "github.com/rs/zerolog/log" "github.com/spf13/cobra" - "github.com/truecharts/private/clustertool/pkg/gencmd" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/gencmd" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/sops" ) var upgrade = &cobra.Command{ diff --git a/clustertool/embed/embed.go b/clustertool/embed/embed.go index 2e92c16028e..33b73e2ae6d 100644 --- a/clustertool/embed/embed.go +++ b/clustertool/embed/embed.go @@ -10,7 +10,7 @@ import ( "github.com/rs/zerolog/log" "github.com/leaanthony/debme" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) //go:embed generic/* diff --git a/clustertool/go.mod b/clustertool/go.mod index bb36710a55b..a7cd02edca4 100644 --- a/clustertool/go.mod +++ b/clustertool/go.mod @@ -1,4 +1,4 @@ -module github.com/truecharts/private/clustertool +module github.com/truecharts/public/clustertool go 1.23.0 diff --git a/clustertool/main.go b/clustertool/main.go index 94c9513e997..929b2e34cf7 100644 --- a/clustertool/main.go +++ b/clustertool/main.go @@ -7,9 +7,9 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/cmd" - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/cmd" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" "go.uber.org/zap" "go.uber.org/zap/zapcore" ctrllog "sigs.k8s.io/controller-runtime/pkg/log" diff --git a/clustertool/partial_builds/precommit/main.go b/clustertool/partial_builds/precommit/main.go index 38f276eb9da..f2d979812a9 100644 --- a/clustertool/partial_builds/precommit/main.go +++ b/clustertool/partial_builds/precommit/main.go @@ -4,7 +4,7 @@ import ( "os" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/pkg/sops" ) func main() { diff --git a/clustertool/pkg/charts/changelog/changelog.go b/clustertool/pkg/charts/changelog/changelog.go index 69ebf481fc1..727a7924de0 100644 --- a/clustertool/pkg/charts/changelog/changelog.go +++ b/clustertool/pkg/charts/changelog/changelog.go @@ -9,7 +9,7 @@ import ( "github.com/Masterminds/semver/v3" "github.com/go-git/go-git/v5" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) type ChangelogOptions struct { diff --git a/clustertool/pkg/charts/changelog/render.go b/clustertool/pkg/charts/changelog/render.go index 3df9180d137..5e08d814e34 100644 --- a/clustertool/pkg/charts/changelog/render.go +++ b/clustertool/pkg/charts/changelog/render.go @@ -9,7 +9,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) func (o *ChangelogOptions) Render() error { diff --git a/clustertool/pkg/charts/chartFile/chart_file.go b/clustertool/pkg/charts/chartFile/chart_file.go index 6c117e27fa7..03ea655988e 100644 --- a/clustertool/pkg/charts/chartFile/chart_file.go +++ b/clustertool/pkg/charts/chartFile/chart_file.go @@ -6,7 +6,7 @@ import ( "os" "github.com/go-playground/validator/v10" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" "github.com/knadh/koanf/parsers/yaml" "github.com/knadh/koanf/providers/file" diff --git a/clustertool/pkg/charts/chartFile/updater.go b/clustertool/pkg/charts/chartFile/updater.go index b0a1ca151a9..2af85141da2 100644 --- a/clustertool/pkg/charts/chartFile/updater.go +++ b/clustertool/pkg/charts/chartFile/updater.go @@ -8,10 +8,10 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/charts/helmignore" - "github.com/truecharts/private/clustertool/pkg/charts/image" - "github.com/truecharts/private/clustertool/pkg/charts/readme" - "github.com/truecharts/private/clustertool/pkg/charts/version" + "github.com/truecharts/public/clustertool/pkg/charts/helmignore" + "github.com/truecharts/public/clustertool/pkg/charts/image" + "github.com/truecharts/public/clustertool/pkg/charts/readme" + "github.com/truecharts/public/clustertool/pkg/charts/version" ) // UpdateChartFile updates the specified Chart.yaml file with an optional bump parameter. diff --git a/clustertool/pkg/charts/chartFile/updater_test.go b/clustertool/pkg/charts/chartFile/updater_test.go index 72d696960f6..322258ad9fa 100644 --- a/clustertool/pkg/charts/chartFile/updater_test.go +++ b/clustertool/pkg/charts/chartFile/updater_test.go @@ -4,7 +4,7 @@ import ( "reflect" "testing" - "github.com/truecharts/private/clustertool/pkg/charts/image" + "github.com/truecharts/public/clustertool/pkg/charts/image" ) func TestSetAppVersionFromImage(t *testing.T) { diff --git a/clustertool/pkg/charts/deps/deps.go b/clustertool/pkg/charts/deps/deps.go index 19c18db225f..f3910fc1e91 100644 --- a/clustertool/pkg/charts/deps/deps.go +++ b/clustertool/pkg/charts/deps/deps.go @@ -11,9 +11,9 @@ import ( "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/charts/chartFile" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/charts/chartFile" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/helper" ) func LoadGPGKey() error { diff --git a/clustertool/pkg/fluxhandler/bootstrap.go b/clustertool/pkg/fluxhandler/bootstrap.go index 5708604f453..96332904e7b 100644 --- a/clustertool/pkg/fluxhandler/bootstrap.go +++ b/clustertool/pkg/fluxhandler/bootstrap.go @@ -7,8 +7,8 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/kubectlcmds" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/kubectlcmds" ) func init() { diff --git a/clustertool/pkg/fluxhandler/helm.go b/clustertool/pkg/fluxhandler/helm.go index 2ca512a668c..5c5a2957017 100644 --- a/clustertool/pkg/fluxhandler/helm.go +++ b/clustertool/pkg/fluxhandler/helm.go @@ -11,7 +11,7 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" "helm.sh/helm/v3/pkg/action" "helm.sh/helm/v3/pkg/chart/loader" "helm.sh/helm/v3/pkg/cli" diff --git a/clustertool/pkg/fluxhandler/sshsecretgen.go b/clustertool/pkg/fluxhandler/sshsecretgen.go index e57f7428714..683887cfbe3 100644 --- a/clustertool/pkg/fluxhandler/sshsecretgen.go +++ b/clustertool/pkg/fluxhandler/sshsecretgen.go @@ -14,7 +14,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" "golang.org/x/crypto/ssh" corev1 "k8s.io/api/core/v1" "sigs.k8s.io/yaml" diff --git a/clustertool/pkg/gencmd/apply.go b/clustertool/pkg/gencmd/apply.go index 9d1e2fd5248..8656c2aa542 100644 --- a/clustertool/pkg/gencmd/apply.go +++ b/clustertool/pkg/gencmd/apply.go @@ -9,9 +9,9 @@ import ( talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config" "github.com/budimanjojo/talhelper/v3/pkg/generate" - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/initfiles" ) func GenApply(node string, extraFlags []string) []string { diff --git a/clustertool/pkg/gencmd/bootstrap.go b/clustertool/pkg/gencmd/bootstrap.go index f847c9a83a6..c324260c73b 100644 --- a/clustertool/pkg/gencmd/bootstrap.go +++ b/clustertool/pkg/gencmd/bootstrap.go @@ -12,12 +12,12 @@ import ( talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config" "github.com/budimanjojo/talhelper/v3/pkg/generate" - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/kubectlcmds" - "github.com/truecharts/private/clustertool/pkg/nodestatus" - "github.com/truecharts/private/clustertool/pkg/sops" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/kubectlcmds" + "github.com/truecharts/public/clustertool/pkg/nodestatus" + "github.com/truecharts/public/clustertool/pkg/sops" ) var HelmRepos map[string]*fluxhandler.HelmRepo diff --git a/clustertool/pkg/gencmd/execcmd.go b/clustertool/pkg/gencmd/execcmd.go index 052ccd07189..90b27fe2874 100644 --- a/clustertool/pkg/gencmd/execcmd.go +++ b/clustertool/pkg/gencmd/execcmd.go @@ -6,8 +6,8 @@ import ( "time" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/nodestatus" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/nodestatus" ) func ExecCmd(cmd string) { diff --git a/clustertool/pkg/gencmd/genconfig.go b/clustertool/pkg/gencmd/genconfig.go index 1b333c565c4..2961d6b4137 100644 --- a/clustertool/pkg/gencmd/genconfig.go +++ b/clustertool/pkg/gencmd/genconfig.go @@ -17,9 +17,9 @@ import ( "github.com/fatih/color" sideroConfig "github.com/siderolabs/talos/pkg/machinery/config" "github.com/siderolabs/talos/pkg/machinery/config/generate/secrets" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/helper" - "github.com/truecharts/private/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/initfiles" "gopkg.in/yaml.v3" ) diff --git a/clustertool/pkg/gencmd/health.go b/clustertool/pkg/gencmd/health.go index bde930622c3..2fdc8fbe3c2 100644 --- a/clustertool/pkg/gencmd/health.go +++ b/clustertool/pkg/gencmd/health.go @@ -1,8 +1,8 @@ package gencmd import ( - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" ) func GenHealth(node string) string { diff --git a/clustertool/pkg/gencmd/kubeconfig.go b/clustertool/pkg/gencmd/kubeconfig.go index 9d8b7b516f8..3000948766c 100644 --- a/clustertool/pkg/gencmd/kubeconfig.go +++ b/clustertool/pkg/gencmd/kubeconfig.go @@ -1,8 +1,8 @@ package gencmd import ( - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" ) func GenKubeConfig(node string) string { diff --git a/clustertool/pkg/gencmd/reset.go b/clustertool/pkg/gencmd/reset.go index 32579d62c5f..9c3f0e5987e 100644 --- a/clustertool/pkg/gencmd/reset.go +++ b/clustertool/pkg/gencmd/reset.go @@ -9,8 +9,8 @@ import ( talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config" "github.com/budimanjojo/talhelper/v3/pkg/generate" - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" ) func GenReset(node string, extraFlags []string) []string { diff --git a/clustertool/pkg/gencmd/upgrade.go b/clustertool/pkg/gencmd/upgrade.go index 8862721d741..4b33a1032dd 100644 --- a/clustertool/pkg/gencmd/upgrade.go +++ b/clustertool/pkg/gencmd/upgrade.go @@ -9,8 +9,8 @@ import ( talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config" "github.com/budimanjojo/talhelper/v3/pkg/generate" - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" ) func GenUpgrade(node string, extraFlags []string) []string { diff --git a/clustertool/pkg/initfiles/clusterenv.go b/clustertool/pkg/initfiles/clusterenv.go index fb47a1044dc..fad4d2e463f 100644 --- a/clustertool/pkg/initfiles/clusterenv.go +++ b/clustertool/pkg/initfiles/clusterenv.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) func LoadTalEnv() error { diff --git a/clustertool/pkg/initfiles/initfiles.go b/clustertool/pkg/initfiles/initfiles.go index 76ba35ed127..817ac478fb5 100644 --- a/clustertool/pkg/initfiles/initfiles.go +++ b/clustertool/pkg/initfiles/initfiles.go @@ -18,8 +18,8 @@ import ( age "filippo.io/age" talhelperCfg "github.com/budimanjojo/talhelper/v3/pkg/config" "github.com/invopop/jsonschema" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/helper" ) func InitFiles() error { diff --git a/clustertool/pkg/kubectlcmds/apply.go b/clustertool/pkg/kubectlcmds/apply.go index 1267e92dc6b..0c096589c77 100644 --- a/clustertool/pkg/kubectlcmds/apply.go +++ b/clustertool/pkg/kubectlcmds/apply.go @@ -11,7 +11,7 @@ import ( "github.com/go-logr/logr" "github.com/go-logr/zapr" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" "go.uber.org/zap" "go.uber.org/zap/zapcore" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/clustertool/pkg/nodestatus/status.go b/clustertool/pkg/nodestatus/status.go index 7f348fc2025..dc735eb2ca9 100644 --- a/clustertool/pkg/nodestatus/status.go +++ b/clustertool/pkg/nodestatus/status.go @@ -6,8 +6,8 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/embed" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/embed" + "github.com/truecharts/public/clustertool/pkg/helper" ) func baseStatusCMD(node string) []string { diff --git a/clustertool/pkg/scale/scale2flux.go b/clustertool/pkg/scale/scale2flux.go index dca6c9c5c6d..2858f9c4610 100644 --- a/clustertool/pkg/scale/scale2flux.go +++ b/clustertool/pkg/scale/scale2flux.go @@ -10,8 +10,8 @@ import ( "strings" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/fluxhandler" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/fluxhandler" + "github.com/truecharts/public/clustertool/pkg/helper" "gopkg.in/yaml.v3" ) diff --git a/clustertool/pkg/sops/checkencrypt.go b/clustertool/pkg/sops/checkencrypt.go index a4d483de474..fd9f6a0a449 100644 --- a/clustertool/pkg/sops/checkencrypt.go +++ b/clustertool/pkg/sops/checkencrypt.go @@ -8,7 +8,7 @@ import ( "regexp" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" "sigs.k8s.io/yaml" ) diff --git a/clustertool/pkg/sops/decrypt.go b/clustertool/pkg/sops/decrypt.go index 3cc01f51569..d856f702ac0 100644 --- a/clustertool/pkg/sops/decrypt.go +++ b/clustertool/pkg/sops/decrypt.go @@ -7,7 +7,7 @@ import ( "github.com/getsops/sops/v3/decrypt" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/initfiles" + "github.com/truecharts/public/clustertool/pkg/initfiles" ) // Custom error type for MAC failures diff --git a/clustertool/pkg/sops/encrypt.go b/clustertool/pkg/sops/encrypt.go index 18148cf1a84..3cb87e3c9ce 100644 --- a/clustertool/pkg/sops/encrypt.go +++ b/clustertool/pkg/sops/encrypt.go @@ -6,7 +6,7 @@ import ( "regexp" "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) // EncryptAllFiles encrypts all unencrypted files as specified in the .sops.yaml configuration. diff --git a/clustertool/pkg/sops/wrapper.go b/clustertool/pkg/sops/wrapper.go index 3a14af1c83d..46e8bce5bf7 100644 --- a/clustertool/pkg/sops/wrapper.go +++ b/clustertool/pkg/sops/wrapper.go @@ -14,7 +14,7 @@ import ( "github.com/getsops/sops/v3/keys" "github.com/getsops/sops/v3/keyservice" "github.com/getsops/sops/v3/version" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" ) var encrConfig *EncryptionConfig diff --git a/clustertool/pkg/talhelperutil/extractfromtalconfig.go b/clustertool/pkg/talhelperutil/extractfromtalconfig.go index a0eb33539cb..53cd268fee7 100644 --- a/clustertool/pkg/talhelperutil/extractfromtalconfig.go +++ b/clustertool/pkg/talhelperutil/extractfromtalconfig.go @@ -5,7 +5,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/truecharts/private/clustertool/pkg/helper" + "github.com/truecharts/public/clustertool/pkg/helper" "gopkg.in/yaml.v3" )