Skip to content

Commit 7bbab5a

Browse files
joaopapereirajoaopapereira
authored
Merge pull request #1815 from sameerforge/bump-vendir
Bump Vendir to v0.45.3 & Update root directory imports from k14s/semver to carvel-dev/semver.
2 parents 32fc399 + 15ca1f1 commit 7bbab5a

25 files changed

Lines changed: 197 additions & 1138 deletions

File tree

‎cli/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25.7
44

55
require (
66
carvel.dev/kapp-controller v0.59.0
7-
carvel.dev/vendir v0.45.2
7+
carvel.dev/vendir v0.45.3
88
github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef
99
github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835
1010
github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663
@@ -29,7 +29,7 @@ require (
2929

3030
require (
3131
github.com/beorn7/perks v1.0.1 // indirect
32-
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
32+
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 // indirect
3333
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3434
github.com/davecgh/go-spew v1.1.1 // indirect
3535
github.com/emicklei/go-restful/v3 v3.11.0 // indirect

‎cli/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
carvel.dev/kapp-controller v0.59.0 h1:Y2KUJbC1lYiWJk/56SKResvhVSDkoAuM1lagewZS8LE=
22
carvel.dev/kapp-controller v0.59.0/go.mod h1:EHK86H6qYe0pBhA0QuW4lkO9KL3p0RseAZ81PR9LwNc=
3-
carvel.dev/vendir v0.45.2 h1:oaOqEVgw/z4AZgCvZPgfY+JUFf3YGJSUTH2QLTyIV5A=
4-
carvel.dev/vendir v0.45.2/go.mod h1:R6wZyF61/mbTe4VpXBky0FiDNoCSIND+/LQvUJkkQVQ=
3+
carvel.dev/vendir v0.45.3 h1:crIwlGpsdvABTiUM71IbAaanavyET7+FhnI8hrd3x3U=
4+
carvel.dev/vendir v0.45.3/go.mod h1:ulOigkUjXfCYidNbHqNAtEf0MFnuwG4jhoEqG2giOnU=
55
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
66
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
7-
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 h1:F4rZiMGZyC66j9VB7doVOE4tFHF1yNEihQlOuht4jmM=
8-
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
7+
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 h1:LP+GFDwgIBQFld1EhQt3UaN1typu03sqU3eWCKM5Isk=
8+
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
99
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
1010
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
1111
github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef h1:de10GNLe45JTMghl2qf9WH17H/BjGShK41X3vKAsPJA=

‎cli/vendor/github.com/carvel-dev/semver/v4/semver.go‎

Lines changed: 85 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cli/vendor/modules.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ carvel.dev/kapp-controller/pkg/reconciler
4848
carvel.dev/kapp-controller/pkg/reftracker
4949
carvel.dev/kapp-controller/pkg/satoken
5050
carvel.dev/kapp-controller/pkg/template
51-
# carvel.dev/vendir v0.45.2
51+
# carvel.dev/vendir v0.45.3
5252
## explicit; go 1.25.7
5353
carvel.dev/vendir/pkg/vendir/config
5454
carvel.dev/vendir/pkg/vendir/version
@@ -57,7 +57,7 @@ carvel.dev/vendir/pkg/vendir/versions/v1alpha1
5757
# github.com/beorn7/perks v1.0.1
5858
## explicit; go 1.11
5959
github.com/beorn7/perks/quantile
60-
# github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4
60+
# github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02
6161
## explicit; go 1.14
6262
github.com/carvel-dev/semver/v4
6363
# github.com/cespare/xxhash/v2 v2.3.0

‎go.mod‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module carvel.dev/kapp-controller
33
go 1.25.7
44

55
require (
6-
carvel.dev/vendir v0.45.2
6+
carvel.dev/vendir v0.45.3
77
github.com/fatih/color v1.18.0 // indirect
88
github.com/gogo/protobuf v1.3.2
99
github.com/google/go-cmp v0.7.0 // indirect
@@ -27,9 +27,9 @@ require (
2727

2828
require (
2929
github.com/blang/semver v3.5.1+incompatible
30+
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02
3031
github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663
3132
github.com/go-logr/logr v1.4.3
32-
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
3333
github.com/prometheus/client_model v0.5.0
3434
github.com/spf13/cobra v1.9.1
3535
golang.org/x/sync v0.18.0
@@ -45,7 +45,6 @@ require (
4545
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
4646
github.com/beorn7/perks v1.0.1 // indirect
4747
github.com/blang/semver/v4 v4.0.0 // indirect
48-
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
4948
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
5049
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5150
github.com/coreos/go-semver v0.3.1 // indirect

‎go.sum‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
carvel.dev/vendir v0.45.2 h1:oaOqEVgw/z4AZgCvZPgfY+JUFf3YGJSUTH2QLTyIV5A=
2-
carvel.dev/vendir v0.45.2/go.mod h1:R6wZyF61/mbTe4VpXBky0FiDNoCSIND+/LQvUJkkQVQ=
1+
carvel.dev/vendir v0.45.3 h1:crIwlGpsdvABTiUM71IbAaanavyET7+FhnI8hrd3x3U=
2+
carvel.dev/vendir v0.45.3/go.mod h1:ulOigkUjXfCYidNbHqNAtEf0MFnuwG4jhoEqG2giOnU=
33
cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU=
44
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
55
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
@@ -57,8 +57,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
5757
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
5858
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
5959
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
60-
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 h1:F4rZiMGZyC66j9VB7doVOE4tFHF1yNEihQlOuht4jmM=
61-
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
60+
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 h1:LP+GFDwgIBQFld1EhQt3UaN1typu03sqU3eWCKM5Isk=
61+
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
6262
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
6363
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
6464
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
@@ -310,8 +310,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
310310
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
311311
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
312312
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
313-
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 h1:wKSifC/VbCaQMqXYn6/gSFqle82OX4bE3KYALDU9FlU=
314-
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115/go.mod h1:mGrnmO5qnhJIaSiwMo05cvRL6Ww9ccYbTgNFcm6RHZQ=
315313
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
316314
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
317315
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

‎pkg/apiserver/apis/datapackaging/validation/validations.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99

1010
"carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging"
1111
"carvel.dev/vendir/pkg/vendir/versions"
12-
semver "github.com/k14s/semver/v4"
12+
semver "github.com/carvel-dev/semver/v4"
1313
"k8s.io/apimachinery/pkg/util/validation"
1414
"k8s.io/apimachinery/pkg/util/validation/field"
1515
)

‎pkg/apiserver/apiserver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ import (
1818
"carvel.dev/kapp-controller/pkg/apiserver/openapi"
1919
packagerest "carvel.dev/kapp-controller/pkg/apiserver/registry/datapackaging"
2020
kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned"
21+
"github.com/carvel-dev/semver/v4"
2122
"github.com/go-logr/logr"
22-
"github.com/k14s/semver/v4"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
"k8s.io/apimachinery/pkg/runtime"
2525
"k8s.io/apimachinery/pkg/runtime/schema"

‎pkg/app/app.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"carvel.dev/kapp-controller/pkg/metrics"
1414
"carvel.dev/kapp-controller/pkg/reftracker"
1515
"carvel.dev/kapp-controller/pkg/template"
16+
"github.com/carvel-dev/semver/v4"
1617
"github.com/go-logr/logr"
17-
"github.com/k14s/semver/v4"
1818
v1 "k8s.io/api/core/v1"
1919
"k8s.io/apimachinery/pkg/api/errors"
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

‎pkg/app/app_reconcile_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"carvel.dev/kapp-controller/pkg/kubeconfig"
1818
"carvel.dev/kapp-controller/pkg/metrics"
1919
"carvel.dev/kapp-controller/pkg/template"
20-
"github.com/k14s/semver/v4"
20+
"github.com/carvel-dev/semver/v4"
2121
"github.com/stretchr/testify/assert"
2222
corev1 "k8s.io/api/core/v1"
2323
v1 "k8s.io/api/core/v1"

0 commit comments

Comments
 (0)