This is an automated email from the ASF dual-hosted git repository.
squakez pushed a commit to branch v3
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/v3 by this push:
new 1094cf96a chore(deps): remove deprecated libraries
1094cf96a is described below
commit 1094cf96a2d1e324f91f3cc1cad62307fc6262dc
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Sat Nov 7 14:17:55 2026 +0100
chore(deps): remove deprecated libraries
---
go.mod | 5 ++---
go.sum | 5 ++---
pkg/apis/camel/v1/integration_types_support.go | 4 ++--
pkg/client/client.go | 6 +++---
pkg/client/fastmapper.go | 6 ++----
pkg/cmd/util_config.go | 3 +--
pkg/trait/trait_test.go | 2 +-
pkg/util/camel/catalog.go | 7 +++----
pkg/util/dsl/template.go | 5 ++---
pkg/util/kubernetes/log/annotation_scraper.go | 7 ++-----
pkg/util/kubernetes/log/pod_scraper.go | 6 +-----
pkg/util/registry/registry.go | 8 ++++----
pkg/util/source/inspector_yaml.go | 9 ++++-----
pkg/util/util.go | 10 ++++------
14 files changed, 33 insertions(+), 50 deletions(-)
diff --git a/go.mod b/go.mod
index 16b4da882..843f628c1 100644
--- a/go.mod
+++ b/go.mod
@@ -21,21 +21,18 @@ require (
github.com/prometheus/client_model v0.6.3
github.com/prometheus/common v0.72.1
github.com/rs/xid v1.6.0
- github.com/sirupsen/logrus v1.10.2
github.com/spf13/cobra v1.10.2
github.com/spf13/pflag v1.0.10
github.com/spf13/viper v1.21.0
github.com/stoewer/go-strcase v1.3.1
github.com/stretchr/testify v1.12.1
go.uber.org/automaxprocs v1.6.0
- go.uber.org/multierr v1.11.0
go.uber.org/zap v1.28.0
golang.org/x/oauth2 v0.37.0
golang.org/x/sync v0.24.0
golang.org/x/term v0.47.0
golang.org/x/text v0.43.0
golang.org/x/time v0.16.0
- gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.37.0
k8s.io/apimachinery v0.37.0
k8s.io/cli-runtime v0.37.0
@@ -102,6 +99,7 @@ require (
github.com/prometheus/procfs v0.22.0 // indirect
github.com/sagikazarmark/locafero v0.11.0 // indirect
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 //
indirect
+ github.com/sirupsen/logrus v1.9.4 // indirect
github.com/skeema/knownhosts v1.3.1 // indirect
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 //
indirect
github.com/spf13/afero v1.15.0 // indirect
@@ -109,6 +107,7 @@ require (
github.com/subosito/gotenv v1.6.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
github.com/xanzy/ssh-agent v0.3.3 // indirect
+ go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.4 // indirect
go.yaml.in/yaml/v3 v3.0.5 // indirect
golang.org/x/crypto v0.58.0 // indirect
diff --git a/go.sum b/go.sum
index b06aace2f..e2af6c5c4 100644
--- a/go.sum
+++ b/go.sum
@@ -200,8 +200,8 @@ github.com/sagikazarmark/locafero v0.11.0/go.mod
h1:nVIGvgyzw595SUSUE6tvCp3YYTeH
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3
h1:n661drycOFuPLCN3Uc8sB6B/s6Z4t2xvBgU1htSHuq8=
github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3/go.mod
h1:A0bzQcvG0E7Rwjx0REVgAGH58e96+X0MeOfepqsbeW4=
github.com/sirupsen/logrus v1.7.0/go.mod
h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.10.2
h1:G2SED73/qrAu6YwbdxOD6peLkCBI3z7L+ykJFTXJBBo=
-github.com/sirupsen/logrus v1.10.2/go.mod
h1:SLEg8TqYulVKKfIGHldVp2K2aYz2DKSVBq4g/H5bR7Q=
+github.com/sirupsen/logrus v1.9.4
h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
+github.com/sirupsen/logrus v1.9.4/go.mod
h1:ftWc9WdOfJ0a92nsE2jF5u5ZwH8Bv2zdeOC42RjbV2g=
github.com/skeema/knownhosts v1.3.1
h1:X2osQ+RAjK76shCbvhHHHVl3ZlgDm8apHEHFqRjnBY8=
github.com/skeema/knownhosts v1.3.1/go.mod
h1:r7KTdC8l4uxWRyK2TpQZ/1o5HaSzh06ePQNxPwTcfiY=
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8
h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
@@ -317,7 +317,6 @@ gopkg.in/warnings.v0 v0.1.2
h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
gopkg.in/warnings.v0 v0.1.2/go.mod
h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod
h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/pkg/apis/camel/v1/integration_types_support.go
b/pkg/apis/camel/v1/integration_types_support.go
index ea50653ce..ea3a4a864 100644
--- a/pkg/apis/camel/v1/integration_types_support.go
+++ b/pkg/apis/camel/v1/integration_types_support.go
@@ -26,10 +26,10 @@ import (
"slices"
"strings"
- yaml2 "gopkg.in/yaml.v2"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/yaml"
+ k8syaml "sigs.k8s.io/yaml/goyaml.v2"
)
const (
@@ -513,7 +513,7 @@ func ToYamlDSL(flows []Flow) ([]byte, error) {
if err := d.Decode(&jsondata); err != nil {
return nil, fmt.Errorf("error unmarshalling json: %w", err)
}
- yamldata, err := yaml2.Marshal(&jsondata)
+ yamldata, err := k8syaml.Marshal(&jsondata)
if err != nil {
return nil, fmt.Errorf("error marshalling to yaml: %w", err)
}
diff --git a/pkg/client/client.go b/pkg/client/client.go
index db15ff9d3..149783c9b 100644
--- a/pkg/client/client.go
+++ b/pkg/client/client.go
@@ -24,7 +24,6 @@ import (
"path/filepath"
"sync"
- "github.com/sirupsen/logrus"
"k8s.io/client-go/scale"
"k8s.io/apimachinery/pkg/api/meta"
@@ -47,6 +46,7 @@ import (
camel
"github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned"
camelv1
"github.com/apache/camel-k/v2/pkg/client/camel/clientset/versioned/typed/camel/v1"
"github.com/apache/camel-k/v2/pkg/util"
+ "github.com/apache/camel-k/v2/pkg/util/log"
)
const (
@@ -202,7 +202,7 @@ func initialize(kubeconfig string) {
if kc, err := shouldUseContainerMode(); kc && err == nil {
return
} else if err != nil {
- logrus.Errorf("could not determine if running in a
container: %v", err)
+ log.Error(err, "could not determine if running in a
container")
}
var err error
kubeconfig, err = getDefaultKubeConfigFile()
@@ -240,7 +240,7 @@ func GetCurrentNamespace(kubeconfig string) (string, error)
{
var err error
kubeconfig, err = getDefaultKubeConfigFile()
if err != nil {
- logrus.Errorf("Cannot get information about current
user: %v", err)
+ log.Error(err, "Cannot get information about current
user")
}
}
if kubeconfig == "" {
diff --git a/pkg/client/fastmapper.go b/pkg/client/fastmapper.go
index d6c82d9ee..6f2312e9c 100644
--- a/pkg/client/fastmapper.go
+++ b/pkg/client/fastmapper.go
@@ -18,7 +18,7 @@ limitations under the License.
package client
import (
- "github.com/sirupsen/logrus"
+ "github.com/apache/camel-k/v2/pkg/util/log"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/discovery"
@@ -65,7 +65,6 @@ func newFastDiscoveryRESTMapperWithFilter(config
*rest.Config, filter func(*meta
for _, group := range groups.Groups {
pinnedGroup := group
pick := filter(&pinnedGroup)
- logrus.Debugf("Group: %s %v", group.Name, pick)
totalCount++
if !pick {
continue
@@ -79,7 +78,6 @@ func newFastDiscoveryRESTMapperWithFilter(config
*rest.Config, filter func(*meta
wg.Start(func() { discoverGroupResources(dc, gr) })
}
wg.Wait()
- logrus.Debugf("Picked %d/%d", pickedCount, totalCount)
return restmapper.NewDiscoveryRESTMapper(grs), nil
}
@@ -88,7 +86,7 @@ func discoverGroupResources(dc discovery.DiscoveryInterface,
gr *restmapper.APIG
for _, version := range gr.Group.Versions {
resources, err :=
dc.ServerResourcesForGroupVersion(version.GroupVersion)
if err != nil {
- logrus.Fatal(err, version.GroupVersion)
+ log.Error(err, version.GroupVersion)
}
gr.VersionedResources[version.Version] = resources.APIResources
}
diff --git a/pkg/cmd/util_config.go b/pkg/cmd/util_config.go
index 7051350f0..3cffad668 100644
--- a/pkg/cmd/util_config.go
+++ b/pkg/cmd/util_config.go
@@ -31,8 +31,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/viper"
-
- yaml "gopkg.in/yaml.v2"
+ yaml "sigs.k8s.io/yaml/goyaml.v2"
)
const (
diff --git a/pkg/trait/trait_test.go b/pkg/trait/trait_test.go
index e590e9b29..8a7d22000 100644
--- a/pkg/trait/trait_test.go
+++ b/pkg/trait/trait_test.go
@@ -24,12 +24,12 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
- "gopkg.in/yaml.v2"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
+ yaml "sigs.k8s.io/yaml/goyaml.v2"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
diff --git a/pkg/util/camel/catalog.go b/pkg/util/camel/catalog.go
index bc17f2e70..cbf34c169 100644
--- a/pkg/util/camel/catalog.go
+++ b/pkg/util/camel/catalog.go
@@ -21,8 +21,6 @@ import (
"context"
"path/filepath"
- yaml2 "gopkg.in/yaml.v2"
-
ctrl "sigs.k8s.io/controller-runtime/pkg/client"
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
@@ -32,6 +30,7 @@ import (
"github.com/apache/camel-k/v2/pkg/util/jvm"
"github.com/apache/camel-k/v2/pkg/util/kubernetes"
"github.com/apache/camel-k/v2/pkg/util/maven"
+ yaml "sigs.k8s.io/yaml/goyaml.v2"
)
func DefaultCatalog() (*RuntimeCatalog, error) {
@@ -57,7 +56,7 @@ func catalogForRuntimeProvider(provider v1.RuntimeProvider)
(*RuntimeCatalog, er
}
var c v1.CamelCatalog
- if err := yaml2.Unmarshal(content, &c); err != nil {
+ if err := yaml.Unmarshal(content, &c); err != nil {
return nil, err
}
@@ -156,7 +155,7 @@ func GenerateCatalogCommon(
return err
}
- return yaml2.Unmarshal(content, &catalog)
+ return yaml.Unmarshal(content, &catalog)
})
return NewRuntimeCatalog(catalog), err
diff --git a/pkg/util/dsl/template.go b/pkg/util/dsl/template.go
index 3fb5138db..6a9857e5b 100644
--- a/pkg/util/dsl/template.go
+++ b/pkg/util/dsl/template.go
@@ -21,9 +21,8 @@ import (
"encoding/json"
"fmt"
- yaml2 "gopkg.in/yaml.v2"
-
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
+ yaml "sigs.k8s.io/yaml/goyaml.v2"
)
// TemplateToYamlDSL converts a kamelet template into its Camel YAML DSL
equivalent.
@@ -44,7 +43,7 @@ func TemplateToYamlDSL(template v1.Template, id string)
([]byte, error) {
templateWrapper["routeTemplate"] = jsondata
listWrapper := make([]any, 0, 1)
listWrapper = append(listWrapper, templateWrapper)
- yamldata, err := yaml2.Marshal(listWrapper)
+ yamldata, err := yaml.Marshal(listWrapper)
if err != nil {
return nil, fmt.Errorf("error marshalling to yaml: %w", err)
}
diff --git a/pkg/util/kubernetes/log/annotation_scraper.go
b/pkg/util/kubernetes/log/annotation_scraper.go
index 6857516ae..661491039 100644
--- a/pkg/util/kubernetes/log/annotation_scraper.go
+++ b/pkg/util/kubernetes/log/annotation_scraper.go
@@ -20,14 +20,13 @@ package log
import (
"bufio"
"context"
+ "errors"
"io"
"strconv"
"sync"
"sync/atomic"
"time"
- "go.uber.org/multierr"
-
klog "github.com/apache/camel-k/v2/pkg/util/log"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -71,9 +70,7 @@ func (s *SelectorScraper) Start(ctx context.Context)
*bufio.Reader {
bufPipeIn := bufio.NewReader(pipeIn)
bufPipeOut := bufio.NewWriter(pipeOut)
closeFun := func() error {
- return multierr.Append(
- bufPipeOut.Flush(),
- pipeOut.Close())
+ return errors.Join(bufPipeOut.Flush(), pipeOut.Close())
}
go s.periodicSynchronize(ctx, bufPipeOut, closeFun)
diff --git a/pkg/util/kubernetes/log/pod_scraper.go
b/pkg/util/kubernetes/log/pod_scraper.go
index 650b4cbaf..5221f2fd1 100644
--- a/pkg/util/kubernetes/log/pod_scraper.go
+++ b/pkg/util/kubernetes/log/pod_scraper.go
@@ -24,8 +24,6 @@ import (
"io"
"time"
- "go.uber.org/multierr"
-
klog "github.com/apache/camel-k/v2/pkg/util/log"
corev1 "k8s.io/api/core/v1"
@@ -72,9 +70,7 @@ func (s *PodScraper) Start(ctx context.Context) *bufio.Reader
{
bufPipeIn := bufio.NewReader(pipeIn)
bufPipeOut := bufio.NewWriter(pipeOut)
closeFun := func() error {
- return multierr.Append(
- bufPipeOut.Flush(),
- pipeOut.Close())
+ return errors.Join(bufPipeOut.Flush(), pipeOut.Close())
}
go s.doScrape(ctx, bufPipeOut, closeFun)
diff --git a/pkg/util/registry/registry.go b/pkg/util/registry/registry.go
index 088dd7186..761fd6f73 100644
--- a/pkg/util/registry/registry.go
+++ b/pkg/util/registry/registry.go
@@ -19,13 +19,13 @@ package registry
import (
"context"
+ "errors"
"os"
"path/filepath"
"github.com/apache/camel-k/v2/pkg/util/io"
"github.com/apache/camel-k/v2/pkg/client"
- "go.uber.org/multierr"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@@ -50,7 +50,7 @@ func MountSecretRegistryConfig(ctx context.Context, c
client.Client, namespace,
secret, err := c.CoreV1().Secrets(namespace).Get(ctx, name,
metav1.GetOptions{})
if err != nil {
if removeErr := os.RemoveAll(dir); removeErr != nil {
- err = multierr.Append(err, removeErr)
+ err = errors.Join(err, removeErr)
}
return "", err
@@ -59,7 +59,7 @@ func MountSecretRegistryConfig(ctx context.Context, c
client.Client, namespace,
for file, content := range secret.Data {
if err := os.WriteFile(filepath.Join(dir, remap(file)),
content, io.FilePerm600); err != nil {
if removeErr := os.RemoveAll(dir); removeErr != nil {
- err = multierr.Append(err, removeErr)
+ err = errors.Join(err, removeErr)
}
return "", err
@@ -75,7 +75,7 @@ func mountSecretRegistryConfigFromEnvVar(dir string) (string,
error) {
// #nosec G703 -- jibConfigExtension is a fixed filename; dir is a
trusted directory.
if err := os.WriteFile(filepath.Join(dir, jibConfigExtension),
[]byte(registrySecretValue), io.FilePerm600); err != nil {
if removeErr := os.RemoveAll(dir); removeErr != nil {
- err = multierr.Append(err, removeErr)
+ err = errors.Join(err, removeErr)
}
return "", err
diff --git a/pkg/util/source/inspector_yaml.go
b/pkg/util/source/inspector_yaml.go
index b326626c5..3614d7332 100644
--- a/pkg/util/source/inspector_yaml.go
+++ b/pkg/util/source/inspector_yaml.go
@@ -21,10 +21,9 @@ import (
"fmt"
"strings"
- yaml2 "gopkg.in/yaml.v2"
-
v1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1"
"github.com/apache/camel-k/v2/pkg/util/uri"
+ yaml "sigs.k8s.io/yaml/goyaml.v2"
)
// YAMLInspector inspects YAML DSL spec.
@@ -36,7 +35,7 @@ type YAMLInspector struct {
func (i YAMLInspector) Extract(source v1.SourceSpec, meta *Metadata) error {
definitions := make([]map[string]any, 0)
- if err := yaml2.Unmarshal([]byte(source.Content), &definitions); err !=
nil {
+ if err := yaml.Unmarshal([]byte(source.Content), &definitions); err !=
nil {
return err
}
@@ -242,7 +241,7 @@ func (i YAMLInspector) parseStepsParam(steps []any, meta
*Metadata) error {
func (i YAMLInspector) ReplaceFromURI(source *v1.SourceSpec, newFromURI
string) (bool, error) {
definitions := make([]map[string]any, 0)
- if err := yaml2.Unmarshal([]byte(source.Content), &definitions); err !=
nil {
+ if err := yaml.Unmarshal([]byte(source.Content), &definitions); err !=
nil {
return false, err
}
@@ -271,7 +270,7 @@ func (i YAMLInspector) ReplaceFromURI(source
*v1.SourceSpec, newFromURI string)
}
}
- newContentRaw, err := yaml2.Marshal(definitions)
+ newContentRaw, err := yaml.Marshal(definitions)
if err != nil {
return false, err
}
diff --git a/pkg/util/util.go b/pkg/util/util.go
index b92d6ed4f..06222ebe2 100644
--- a/pkg/util/util.go
+++ b/pkg/util/util.go
@@ -40,9 +40,7 @@ import (
io2 "github.com/apache/camel-k/v2/pkg/util/io"
"github.com/apache/camel-k/v2/pkg/util/sets"
- "go.uber.org/multierr"
-
- yaml2 "gopkg.in/yaml.v2"
+ yaml "sigs.k8s.io/yaml/goyaml.v2"
)
// ListOfLazyEvaluatedEnvVars -- List of unevaluated environment variables.
@@ -341,7 +339,7 @@ func JSONToMap(src []byte) (map[string]any, error) {
}
func MapToYAML(src map[string]any) ([]byte, error) {
- yamldata, err := yaml2.Marshal(&src)
+ yamldata, err := yaml.Marshal(&src)
if err != nil {
return nil, fmt.Errorf("error marshalling to yaml: %w", err)
}
@@ -379,7 +377,7 @@ func ReadFile(filename string) ([]byte, error) {
}
func Close(err error, closer io.Closer) error {
- return multierr.Append(err, closer.Close())
+ return errors.Join(err, closer.Close())
}
// CloseQuietly unconditionally close an io.Closer
@@ -456,7 +454,7 @@ func WithTempDir(pattern string, consumer func(string)
error) error {
consumerErr := consumer(tmpDir)
removeErr := os.RemoveAll(tmpDir)
- return multierr.Append(consumerErr, removeErr)
+ return errors.Join(consumerErr, removeErr)
}
var propertyRegex = regexp.MustCompile("'.+'|\".+\"|[^.]+")
