fix(clustertool): use different yaml lib

This commit is contained in:
Kjeld Schouten
2024-11-06 10:17:47 +01:00
parent d4d462d384
commit caa1a5fdb8
12 changed files with 13 additions and 13 deletions
+2 -2
View File
@@ -20,6 +20,7 @@ require (
github.com/siderolabs/talos/pkg/machinery v1.9.0-alpha.0 github.com/siderolabs/talos/pkg/machinery v1.9.0-alpha.0
github.com/spf13/cobra v1.8.1 github.com/spf13/cobra v1.8.1
golang.org/x/crypto v0.28.0 golang.org/x/crypto v0.28.0
gopkg.in/yaml.v3 v3.0.1
helm.sh/helm/v3 v3.16.2 helm.sh/helm/v3 v3.16.2
k8s.io/api v0.31.2 k8s.io/api v0.31.2
k8s.io/apimachinery v0.31.2 k8s.io/apimachinery v0.31.2
@@ -27,7 +28,6 @@ require (
sigs.k8s.io/controller-runtime v0.19.1 sigs.k8s.io/controller-runtime v0.19.1
sigs.k8s.io/kustomize/api v0.18.0 sigs.k8s.io/kustomize/api v0.18.0
sigs.k8s.io/kustomize/kyaml v0.18.1 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 replace github.com/imdario/mergo => github.com/imdario/mergo v0.3.16
@@ -274,7 +274,6 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/warnings.v0 v0.1.2 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.31.1 // indirect k8s.io/apiextensions-apiserver v0.31.1 // indirect
k8s.io/apiserver v0.31.1 // indirect k8s.io/apiserver v0.31.1 // indirect
k8s.io/cli-runtime v0.31.1 // indirect k8s.io/cli-runtime v0.31.1 // indirect
@@ -286,4 +285,5 @@ require (
oras.land/oras-go v1.2.5 // indirect oras.land/oras-go v1.2.5 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // 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/structured-merge-diff/v4 v4.4.1 // indirect
sigs.k8s.io/yaml v1.4.0 // indirect
) )
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"sync" "sync"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
type HelmChart struct { type HelmChart struct {
+1 -1
View File
@@ -6,7 +6,7 @@ import (
"strings" "strings"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
type HelmRepoMetadata struct { type HelmRepoMetadata struct {
+1 -1
View File
@@ -16,8 +16,8 @@ import (
"github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/helper"
"golang.org/x/crypto/ssh" "golang.org/x/crypto/ssh"
"gopkg.in/yaml.v3"
corev1 "k8s.io/api/core/v1" corev1 "k8s.io/api/core/v1"
"sigs.k8s.io/yaml"
) )
// Define a struct to map the YAML content // Define a struct to map the YAML content
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"path" "path"
"strings" "strings"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
// Node represents a node structure in the YAML file. // Node represents a node structure in the YAML file.
+1 -1
View File
@@ -4,7 +4,7 @@ import (
"bytes" "bytes"
"io" "io"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
// Encoder is a custom encoder for YAML that writes to an io.Writer. // Encoder is a custom encoder for YAML that writes to an io.Writer.
+1 -1
View File
@@ -13,7 +13,7 @@ import (
"time" "time"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
age "filippo.io/age" age "filippo.io/age"
"github.com/truecharts/public/clustertool/pkg/fluxhandler" "github.com/truecharts/public/clustertool/pkg/fluxhandler"
+1 -1
View File
@@ -9,6 +9,7 @@ import (
"path/filepath" "path/filepath"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"gopkg.in/yaml.v3"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/client-go/tools/clientcmd" "k8s.io/client-go/tools/clientcmd"
"k8s.io/client-go/util/homedir" "k8s.io/client-go/util/homedir"
@@ -16,7 +17,6 @@ import (
"sigs.k8s.io/kustomize/api/krusty" "sigs.k8s.io/kustomize/api/krusty"
"sigs.k8s.io/kustomize/kyaml/filesys" "sigs.k8s.io/kustomize/kyaml/filesys"
"sigs.k8s.io/kustomize/kyaml/kio" "sigs.k8s.io/kustomize/kyaml/kio"
"sigs.k8s.io/yaml"
) )
// getKubeClient initializes and returns a controller-runtime client.Client // getKubeClient initializes and returns a controller-runtime client.Client
+1 -1
View File
@@ -12,7 +12,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/truecharts/public/clustertool/pkg/fluxhandler" "github.com/truecharts/public/clustertool/pkg/fluxhandler"
"github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/helper"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
type RadarrConfig struct { type RadarrConfig struct {
+1 -1
View File
@@ -9,7 +9,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/helper"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
// EncrFileData holds information about a file and its encryption status. // EncrFileData holds information about a file and its encryption status.
+1 -1
View File
@@ -5,7 +5,7 @@ import (
"io/ioutil" "io/ioutil"
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
type SopsConfig struct { type SopsConfig struct {
@@ -6,7 +6,7 @@ import (
"github.com/rs/zerolog/log" "github.com/rs/zerolog/log"
"github.com/truecharts/public/clustertool/pkg/helper" "github.com/truecharts/public/clustertool/pkg/helper"
"sigs.k8s.io/yaml" "gopkg.in/yaml.v3"
) )
// Node represents the structure of each node in the YAML file // Node represents the structure of each node in the YAML file