diff --git a/components/buildless-serverless/internal/config/file_test.go b/components/buildless-serverless/internal/config/file_test.go index 9f7791b35..9526aec15 100644 --- a/components/buildless-serverless/internal/config/file_test.go +++ b/components/buildless-serverless/internal/config/file_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func TestRunOnConfigChange(t *testing.T) { diff --git a/components/buildless-serverless/internal/config/function_config.go b/components/buildless-serverless/internal/config/function_config.go index 13dfd67fe..3908c44bc 100644 --- a/components/buildless-serverless/internal/config/function_config.go +++ b/components/buildless-serverless/internal/config/function_config.go @@ -7,7 +7,7 @@ import ( "github.com/pkg/errors" "github.com/vrischmann/envconfig" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/components/buildless-serverless/internal/config/log_config.go b/components/buildless-serverless/internal/config/log_config.go index c4b327b9b..45e4cbe17 100644 --- a/components/buildless-serverless/internal/config/log_config.go +++ b/components/buildless-serverless/internal/config/log_config.go @@ -1,9 +1,10 @@ package config import ( - "gopkg.in/yaml.v2" "os" "path/filepath" + + "gopkg.in/yaml.v3" ) type Config struct { diff --git a/components/buildless-serverless/internal/controller/state/deployment_status.go b/components/buildless-serverless/internal/controller/state/deployment_status.go index 8fc4f17c9..4329e19a2 100644 --- a/components/buildless-serverless/internal/controller/state/deployment_status.go +++ b/components/buildless-serverless/internal/controller/state/deployment_status.go @@ -8,7 +8,7 @@ import ( "github.com/kyma-project/serverless/components/buildless-serverless/internal/controller/fsm" "github.com/kyma-project/serverless/components/buildless-serverless/internal/controller/metrics" "github.com/pkg/errors" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/components/buildless-serverless/internal/controller/state/deployment_status_test.go b/components/buildless-serverless/internal/controller/state/deployment_status_test.go index 84a822cdb..f8bb9b97d 100644 --- a/components/buildless-serverless/internal/controller/state/deployment_status_test.go +++ b/components/buildless-serverless/internal/controller/state/deployment_status_test.go @@ -10,7 +10,7 @@ import ( "github.com/kyma-project/serverless/components/buildless-serverless/internal/controller/resources" "github.com/stretchr/testify/require" "go.uber.org/zap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/components/buildless-serverless/internal/endpoint/runtime/resources.go b/components/buildless-serverless/internal/endpoint/runtime/resources.go index 7e9df8b1d..c8d09a425 100644 --- a/components/buildless-serverless/internal/endpoint/runtime/resources.go +++ b/components/buildless-serverless/internal/endpoint/runtime/resources.go @@ -1,6 +1,7 @@ package runtime import ( + "bytes" "encoding/base64" "encoding/json" "fmt" @@ -10,7 +11,7 @@ import ( "github.com/kyma-project/serverless/components/buildless-serverless/internal/controller/resources" "github.com/kyma-project/serverless/components/buildless-serverless/internal/endpoint/types" "github.com/pkg/errors" - "go.yaml.in/yaml/v2" + "go.yaml.in/yaml/v3" ) func BuildResources(functionConfig *config.FunctionConfig, f *v1alpha2.Function, appName string) ([]types.FileResponse, error) { @@ -106,10 +107,14 @@ func convertK8SObjectToYaml(obj interface{}) ([]byte, error) { return nil, err } - yamlBytes, err := yaml.Marshal(jsonObj) + yamlBytes := bytes.Buffer{} + e := yaml.NewEncoder(&yamlBytes) + e.SetIndent(2) + e.Encode(jsonObj) + err = e.Encode(jsonObj) if err != nil { return nil, err } - return yamlBytes, nil + return yamlBytes.Bytes(), nil } diff --git a/components/operator/internal/config/file_test.go b/components/operator/internal/config/file_test.go index 38a6fcc1d..762cf65da 100644 --- a/components/operator/internal/config/file_test.go +++ b/components/operator/internal/config/file_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func TestRunOnConfigChange(t *testing.T) { diff --git a/components/operator/internal/config/log_config.go b/components/operator/internal/config/log_config.go index c4b327b9b..45e4cbe17 100644 --- a/components/operator/internal/config/log_config.go +++ b/components/operator/internal/config/log_config.go @@ -1,9 +1,10 @@ package config import ( - "gopkg.in/yaml.v2" "os" "path/filepath" + + "gopkg.in/yaml.v3" ) type Config struct { diff --git a/components/serverless/internal/config/file_test.go b/components/serverless/internal/config/file_test.go index 9f7791b35..9526aec15 100644 --- a/components/serverless/internal/config/file_test.go +++ b/components/serverless/internal/config/file_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func TestRunOnConfigChange(t *testing.T) { diff --git a/components/serverless/internal/config/log.go b/components/serverless/internal/config/log.go index c4b327b9b..45e4cbe17 100644 --- a/components/serverless/internal/config/log.go +++ b/components/serverless/internal/config/log.go @@ -1,9 +1,10 @@ package config import ( - "gopkg.in/yaml.v2" "os" "path/filepath" + + "gopkg.in/yaml.v3" ) type Config struct { diff --git a/components/serverless/internal/controllers/serverless/config.go b/components/serverless/internal/controllers/serverless/config.go index a18186f8e..fdb0272b4 100644 --- a/components/serverless/internal/controllers/serverless/config.go +++ b/components/serverless/internal/controllers/serverless/config.go @@ -5,7 +5,7 @@ import ( "github.com/pkg/errors" "github.com/vrischmann/envconfig" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/components/serverless/internal/controllers/serverless/deployment.go b/components/serverless/internal/controllers/serverless/deployment.go index fad279c7c..03e99870f 100644 --- a/components/serverless/internal/controllers/serverless/deployment.go +++ b/components/serverless/internal/controllers/serverless/deployment.go @@ -6,7 +6,7 @@ import ( serverlessv1alpha2 "github.com/kyma-project/serverless/components/serverless/pkg/apis/serverless/v1alpha2" "github.com/pkg/errors" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" k8serrors "k8s.io/apimachinery/pkg/api/errors" diff --git a/components/serverless/internal/webhook/webhook_config.go b/components/serverless/internal/webhook/webhook_config.go index ec5509653..2cb6efdf3 100644 --- a/components/serverless/internal/webhook/webhook_config.go +++ b/components/serverless/internal/webhook/webhook_config.go @@ -6,7 +6,7 @@ import ( "github.com/kyma-project/serverless/components/serverless/pkg/apis/serverless/v1alpha2" "github.com/pkg/errors" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) type FunctionResources struct { diff --git a/go.mod b/go.mod index 9b66706ee..249e6f691 100644 --- a/go.mod +++ b/go.mod @@ -21,16 +21,16 @@ require ( github.com/onsi/gomega v1.38.3 github.com/pkg/errors v0.9.1 github.com/prometheus/client_golang v1.23.2 + github.com/prometheus/client_model v0.6.2 github.com/sirupsen/logrus v1.9.3 github.com/spf13/pflag v1.0.10 github.com/stretchr/testify v1.11.1 github.com/vrischmann/envconfig v1.4.1 go.uber.org/zap v1.27.1 - go.yaml.in/yaml/v2 v2.4.3 + go.yaml.in/yaml/v3 v3.0.4 golang.org/x/crypto v0.46.0 golang.org/x/sync v0.19.0 golang.org/x/time v0.14.0 - gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 helm.sh/helm/v3 v3.18.6 k8s.io/api v0.33.7 @@ -123,7 +123,6 @@ require ( github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pjbgf/sha1cd v0.3.2 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/prometheus/client_model v0.6.2 // indirect github.com/prometheus/common v0.66.1 // indirect github.com/prometheus/procfs v0.16.1 // indirect github.com/rivo/uniseg v0.2.0 // indirect @@ -140,7 +139,7 @@ require ( github.com/xanzy/ssh-agent v0.3.3 // indirect github.com/xlab/treeprint v1.2.0 // indirect go.uber.org/multierr v1.11.0 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect + go.yaml.in/yaml/v2 v2.4.3 // indirect golang.org/x/mod v0.30.0 // indirect golang.org/x/net v0.47.0 // indirect golang.org/x/oauth2 v0.30.0 // indirect