Skip to content

Commit

Permalink
Merge pull request #16 from gianlucam76/main
Browse files Browse the repository at this point in the history
Merge dev to main
  • Loading branch information
gianlucam76 authored Jul 12, 2024
2 parents 3157d32 + d392841 commit b1e59cf
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ KIND := $(TOOLS_BIN_DIR)/kind
KUBECTL := $(TOOLS_BIN_DIR)/kubectl

GOLANGCI_LINT_VERSION := "v1.57.2"
CLUSTERCTL_VERSION := "v1.7.3"
CLUSTERCTL_VERSION := "v1.7.4"

$(GOLANGCI_LINT): # Build golangci-lint from tools folder.
cd $(TOOLS_DIR); ./get-golangci-lint.sh $(GOLANGCI_LINT_VERSION)
Expand Down
12 changes: 6 additions & 6 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@ require (
github.com/TwiN/go-color v1.4.1
github.com/onsi/ginkgo/v2 v2.19.0
github.com/onsi/gomega v1.33.1
github.com/projectsveltos/addon-controller v0.33.1-0.20240705125553-0befa1b74158
github.com/projectsveltos/event-manager v0.33.1-0.20240705132126-4d256b7478af
github.com/projectsveltos/libsveltos v0.33.1-0.20240704143403-57a4cb3560e3
github.com/projectsveltos/sveltosctl v0.33.1-0.20240705134210-051a9c4236c7
github.com/projectsveltos/addon-controller v0.34.1-0.20240712112802-b0184728192e
github.com/projectsveltos/event-manager v0.34.1-0.20240712115500-2c570234ae15
github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc
github.com/projectsveltos/sveltosctl v0.34.1-0.20240712120901-bd1bdc6dd661
github.com/spf13/pflag v1.0.5
k8s.io/api v0.30.2
k8s.io/apimachinery v0.30.2
k8s.io/client-go v0.30.2
k8s.io/component-base v0.30.2
k8s.io/klog/v2 v2.130.1
sigs.k8s.io/cluster-api v1.7.3
sigs.k8s.io/cluster-api v1.7.4
sigs.k8s.io/controller-runtime v0.18.4
)

Expand Down Expand Up @@ -72,7 +72,7 @@ require (
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/apiextensions-apiserver v0.30.2 // indirect
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // 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
Expand Down
24 changes: 12 additions & 12 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -88,14 +88,14 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/projectsveltos/addon-controller v0.33.1-0.20240705125553-0befa1b74158 h1:SQMrXsYMdwPGcbOVop/k79iR/2Ngg69pl0MG7OZ3saw=
github.com/projectsveltos/addon-controller v0.33.1-0.20240705125553-0befa1b74158/go.mod h1:UYDb/D7rJr6ZpsSyGcS9ioIJfwoNn9/vQrfcl4bfPs4=
github.com/projectsveltos/event-manager v0.33.1-0.20240705132126-4d256b7478af h1:GB0up7Bx3ChS5MlEw79NPwtObuZjzo0agIaMj/CIskA=
github.com/projectsveltos/event-manager v0.33.1-0.20240705132126-4d256b7478af/go.mod h1:Eiu4HH8YMEMEYNCw4ilt3iP/9UqaMZqMalXvDUS83W0=
github.com/projectsveltos/libsveltos v0.33.1-0.20240704143403-57a4cb3560e3 h1:FQaAXI+9K4SHLgWxV8OMEV1b/IO9G9/oIvM4p3v90og=
github.com/projectsveltos/libsveltos v0.33.1-0.20240704143403-57a4cb3560e3/go.mod h1:GRQ9Otq55Aii1icSvkrTjyDOniBZjYVA5018BRpMvdA=
github.com/projectsveltos/sveltosctl v0.33.1-0.20240705134210-051a9c4236c7 h1:AqdjsuVQ9hrmj8Nt3+5ySC7jrN94m1ug7SqmJis96B8=
github.com/projectsveltos/sveltosctl v0.33.1-0.20240705134210-051a9c4236c7/go.mod h1:lRiLMu/hg9aqt7D9v0/z2aZ9g/XbXNOsFsscwgXhLc8=
github.com/projectsveltos/addon-controller v0.34.1-0.20240712112802-b0184728192e h1:1I0Y+9j6ZxeInr0TOTZyuzSG7L/pmhRb4SQlS8c7vEM=
github.com/projectsveltos/addon-controller v0.34.1-0.20240712112802-b0184728192e/go.mod h1:STbHqcMKcbVcwyxnf3uDbUS1/fPgBmCbJWTmF8iiZ5w=
github.com/projectsveltos/event-manager v0.34.1-0.20240712115500-2c570234ae15 h1:kuAPQ7g2/Rg54zcou1D8MlMeMzgwJgxw+0GV7Q4DFWY=
github.com/projectsveltos/event-manager v0.34.1-0.20240712115500-2c570234ae15/go.mod h1:cyanWOnak+i8QTCWHcRXwEA1ltp0Q9hBn//y9zkKbyM=
github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc h1:qZB1eNQLeahLKF45SeMgMhzPGt5O/fU7u0p8I3lrn88=
github.com/projectsveltos/libsveltos v0.34.1-0.20240711155935-75fbc59d75dc/go.mod h1:U5pdpUNAgHaI5JAmZRHBu/Crf11h/wTAZ2H5cXef6bg=
github.com/projectsveltos/sveltosctl v0.34.1-0.20240712120901-bd1bdc6dd661 h1:ekzOk8o1ayoG4JY4J1Apv5XPjFi97eMR6a8QVb2J5oA=
github.com/projectsveltos/sveltosctl v0.34.1-0.20240712120901-bd1bdc6dd661/go.mod h1:qWy/pFC3Rkoa8pCaYQb744ww0fOmT++q5eBghY3xDJ8=
github.com/prometheus/client_golang v1.19.1 h1:wZWJDwK+NameRJuPGDhlnFgx8e8HN3XHQeLaYJFJBOE=
github.com/prometheus/client_golang v1.19.1/go.mod h1:mP78NwGzrVks5S2H6ab8+ZZGJLZUq1hoULYBAYBw1Ho=
github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw=
Expand Down Expand Up @@ -203,10 +203,10 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.7.3 h1:DsSRxsA+18jxLqPAo29abZ9kOPK1/xwhSuQb/MROzSs=
sigs.k8s.io/cluster-api v1.7.3/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 h1:pUdcCO1Lk/tbT5ztQWOBi5HBgbBP1J8+AsQnQCKsi8A=
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
sigs.k8s.io/cluster-api v1.7.4 h1:gT9WGbLXKE19pNR6s/cTLRqK2G0EbwxxQrUrw7/w5P4=
sigs.k8s.io/cluster-api v1.7.4/go.mod h1:V9ZhKLvQtsDODwjXOKgbitjyCmC71yMBwDcMyNNIov0=
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
Expand Down

0 comments on commit b1e59cf

Please sign in to comment.