Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cli/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.25.7

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

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions cli/go.sum
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
carvel.dev/kapp-controller v0.59.0 h1:Y2KUJbC1lYiWJk/56SKResvhVSDkoAuM1lagewZS8LE=
carvel.dev/kapp-controller v0.59.0/go.mod h1:EHK86H6qYe0pBhA0QuW4lkO9KL3p0RseAZ81PR9LwNc=
carvel.dev/vendir v0.45.2 h1:oaOqEVgw/z4AZgCvZPgfY+JUFf3YGJSUTH2QLTyIV5A=
carvel.dev/vendir v0.45.2/go.mod h1:R6wZyF61/mbTe4VpXBky0FiDNoCSIND+/LQvUJkkQVQ=
carvel.dev/vendir v0.45.3 h1:crIwlGpsdvABTiUM71IbAaanavyET7+FhnI8hrd3x3U=
carvel.dev/vendir v0.45.3/go.mod h1:ulOigkUjXfCYidNbHqNAtEf0MFnuwG4jhoEqG2giOnU=
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 h1:F4rZiMGZyC66j9VB7doVOE4tFHF1yNEihQlOuht4jmM=
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 h1:LP+GFDwgIBQFld1EhQt3UaN1typu03sqU3eWCKM5Isk=
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef h1:de10GNLe45JTMghl2qf9WH17H/BjGShK41X3vKAsPJA=
Expand Down
117 changes: 85 additions & 32 deletions cli/vendor/github.com/carvel-dev/semver/v4/semver.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cli/vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ carvel.dev/kapp-controller/pkg/reconciler
carvel.dev/kapp-controller/pkg/reftracker
carvel.dev/kapp-controller/pkg/satoken
carvel.dev/kapp-controller/pkg/template
# carvel.dev/vendir v0.45.2
# carvel.dev/vendir v0.45.3
## explicit; go 1.25.7
carvel.dev/vendir/pkg/vendir/config
carvel.dev/vendir/pkg/vendir/version
Expand All @@ -57,7 +57,7 @@ carvel.dev/vendir/pkg/vendir/versions/v1alpha1
# github.com/beorn7/perks v1.0.1
## explicit; go 1.11
github.com/beorn7/perks/quantile
# github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4
# github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02
## explicit; go 1.14
github.com/carvel-dev/semver/v4
# github.com/cespare/xxhash/v2 v2.3.0
Expand Down
5 changes: 2 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module carvel.dev/kapp-controller
go 1.25.7

require (
carvel.dev/vendir v0.45.2
carvel.dev/vendir v0.45.3
Comment thread
sameerforge marked this conversation as resolved.
github.com/fatih/color v1.18.0 // indirect
github.com/gogo/protobuf v1.3.2
github.com/google/go-cmp v0.7.0 // indirect
Expand All @@ -27,9 +27,9 @@ require (

require (
github.com/blang/semver v3.5.1+incompatible
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02
github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663
github.com/go-logr/logr v1.4.3
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115
github.com/prometheus/client_model v0.5.0
github.com/spf13/cobra v1.9.1
golang.org/x/sync v0.18.0
Expand All @@ -45,7 +45,6 @@ require (
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/blang/semver/v4 v4.0.0 // indirect
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/coreos/go-semver v0.3.1 // indirect
Expand Down
10 changes: 4 additions & 6 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
carvel.dev/vendir v0.45.2 h1:oaOqEVgw/z4AZgCvZPgfY+JUFf3YGJSUTH2QLTyIV5A=
carvel.dev/vendir v0.45.2/go.mod h1:R6wZyF61/mbTe4VpXBky0FiDNoCSIND+/LQvUJkkQVQ=
carvel.dev/vendir v0.45.3 h1:crIwlGpsdvABTiUM71IbAaanavyET7+FhnI8hrd3x3U=
carvel.dev/vendir v0.45.3/go.mod h1:ulOigkUjXfCYidNbHqNAtEf0MFnuwG4jhoEqG2giOnU=
cloud.google.com/go v0.60.0/go.mod h1:yw2G51M9IfRboUH61Us8GqCeF1PzPblB823Mn2q2eAU=
cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
Expand Down Expand Up @@ -57,8 +57,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn
github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 h1:F4rZiMGZyC66j9VB7doVOE4tFHF1yNEihQlOuht4jmM=
github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02 h1:LP+GFDwgIBQFld1EhQt3UaN1typu03sqU3eWCKM5Isk=
github.com/carvel-dev/semver/v4 v4.0.1-0.20260413160702-f136b2e8bf02/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI=
github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
Expand Down Expand Up @@ -310,8 +310,6 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 h1:wKSifC/VbCaQMqXYn6/gSFqle82OX4bE3KYALDU9FlU=
github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115/go.mod h1:mGrnmO5qnhJIaSiwMo05cvRL6Ww9ccYbTgNFcm6RHZQ=
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/apis/datapackaging/validation/validations.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (

"carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging"
"carvel.dev/vendir/pkg/vendir/versions"
semver "github.com/k14s/semver/v4"
semver "github.com/carvel-dev/semver/v4"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/validation/field"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/apiserver/apiserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import (
"carvel.dev/kapp-controller/pkg/apiserver/openapi"
packagerest "carvel.dev/kapp-controller/pkg/apiserver/registry/datapackaging"
kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned"
"github.com/carvel-dev/semver/v4"
"github.com/go-logr/logr"
"github.com/k14s/semver/v4"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"carvel.dev/kapp-controller/pkg/metrics"
"carvel.dev/kapp-controller/pkg/reftracker"
"carvel.dev/kapp-controller/pkg/template"
"github.com/carvel-dev/semver/v4"
"github.com/go-logr/logr"
"github.com/k14s/semver/v4"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/app_reconcile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"carvel.dev/kapp-controller/pkg/kubeconfig"
"carvel.dev/kapp-controller/pkg/metrics"
"carvel.dev/kapp-controller/pkg/template"
"github.com/k14s/semver/v4"
"github.com/carvel-dev/semver/v4"
"github.com/stretchr/testify/assert"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/app_template_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"carvel.dev/kapp-controller/pkg/kubeconfig"
"carvel.dev/kapp-controller/pkg/metrics"
"carvel.dev/kapp-controller/pkg/template"
"github.com/k14s/semver/v4"
"github.com/carvel-dev/semver/v4"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8sfake "k8s.io/client-go/kubernetes/fake"
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/app_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"carvel.dev/kapp-controller/pkg/metrics"
"carvel.dev/kapp-controller/pkg/reftracker"
"carvel.dev/kapp-controller/pkg/template"
"github.com/k14s/semver/v4"
"github.com/carvel-dev/semver/v4"
"github.com/stretchr/testify/assert"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/componentinfo/component_info.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (

"carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1"
"carvel.dev/kapp-controller/pkg/kubeconfig"
"github.com/k14s/semver/v4"
"github.com/carvel-dev/semver/v4"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion pkg/packageinstall/packageinstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"carvel.dev/kapp-controller/pkg/reconciler"
"carvel.dev/vendir/pkg/vendir/versions"
verv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
semver "github.com/carvel-dev/semver/v4"
"github.com/go-logr/logr"
semver "github.com/k14s/semver/v4"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
"k8s.io/apimachinery/pkg/api/errors"
Expand Down
2 changes: 1 addition & 1 deletion pkg/packageinstall/packageinstall_deletion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
fakekappctrl "carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake"
"carvel.dev/kapp-controller/pkg/metrics"
versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
"github.com/k14s/semver/v4"
"github.com/carvel-dev/semver/v4"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes/fake"
Expand Down
Loading
Loading