Skip to content

Commit 15ca1f1

Browse files
committed
Unify semver library to carvel-dev/semver/v4 for kapp-controller root
Signed-off-by: Sameer <sameer.khan@broadcom.com>
1 parent cf89244 commit 15ca1f1

20 files changed

Lines changed: 12 additions & 1059 deletions

File tree

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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.20260413160702-f136b2e8bf02 // 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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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"

pkg/app/app_template_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"carvel.dev/kapp-controller/pkg/kubeconfig"
1515
"carvel.dev/kapp-controller/pkg/metrics"
1616
"carvel.dev/kapp-controller/pkg/template"
17-
"github.com/k14s/semver/v4"
17+
"github.com/carvel-dev/semver/v4"
1818
"github.com/stretchr/testify/assert"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
k8sfake "k8s.io/client-go/kubernetes/fake"

pkg/app/app_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"carvel.dev/kapp-controller/pkg/metrics"
1717
"carvel.dev/kapp-controller/pkg/reftracker"
1818
"carvel.dev/kapp-controller/pkg/template"
19-
"github.com/k14s/semver/v4"
19+
"github.com/carvel-dev/semver/v4"
2020
"github.com/stretchr/testify/assert"
2121
v1 "k8s.io/api/core/v1"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pkg/componentinfo/component_info.go

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

1111
"carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1"
1212
"carvel.dev/kapp-controller/pkg/kubeconfig"
13-
"github.com/k14s/semver/v4"
13+
"github.com/carvel-dev/semver/v4"
1414
v1 "k8s.io/api/core/v1"
1515
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1616
"k8s.io/client-go/kubernetes"

pkg/packageinstall/packageinstall.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import (
1919
"carvel.dev/kapp-controller/pkg/reconciler"
2020
"carvel.dev/vendir/pkg/vendir/versions"
2121
verv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1"
22+
semver "github.com/carvel-dev/semver/v4"
2223
"github.com/go-logr/logr"
23-
semver "github.com/k14s/semver/v4"
2424
corev1 "k8s.io/api/core/v1"
2525
"k8s.io/apimachinery/pkg/api/equality"
2626
"k8s.io/apimachinery/pkg/api/errors"

0 commit comments

Comments
 (0)