diff --git a/acceptance/go.mod b/acceptance/go.mod index cc968ed6c..efb87c0ed 100644 --- a/acceptance/go.mod +++ b/acceptance/go.mod @@ -104,7 +104,6 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect - github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/huandu/xstrings v1.4.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect diff --git a/harpoon/go.mod b/harpoon/go.mod index 42a8f305f..0fece3383 100644 --- a/harpoon/go.mod +++ b/harpoon/go.mod @@ -2,11 +2,13 @@ module github.com/redpanda-data/redpanda-operator/harpoon go 1.23.2 +replace github.com/redpanda-data/redpanda-operator/pkg => ../pkg + require ( github.com/cucumber/godog v0.14.1 github.com/cucumber/messages/go/v21 v21.0.1 github.com/olekukonko/tablewriter v0.0.5 - github.com/redpanda-data/helm-charts v0.0.0-20241203151858-926cfe070c6e + github.com/redpanda-data/redpanda-operator/pkg v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.9.0 golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e k8s.io/api v0.30.3 @@ -27,7 +29,6 @@ require ( github.com/Microsoft/hcsshim v0.12.3 // indirect github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/cenkalti/backoff/v4 v4.3.0 // indirect github.com/cespare/xxhash/v2 v2.3.0 // indirect github.com/chai2010/gettext-go v1.0.2 // indirect github.com/cockroachdb/errors v1.11.1 // indirect @@ -39,7 +40,6 @@ require ( github.com/cucumber/gherkin/go/v26 v26.2.0 // indirect github.com/cyphar/filepath-securejoin v0.2.4 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/distribution/distribution/v3 v3.0.0-20230821124843-59dd684cc897 // indirect github.com/distribution/reference v0.6.0 // indirect github.com/docker/cli v25.0.1+incompatible // indirect github.com/docker/distribution v2.8.3+incompatible // indirect @@ -61,17 +61,14 @@ require ( github.com/go-openapi/jsonpointer v0.21.0 // indirect github.com/go-openapi/jsonreference v0.21.0 // indirect github.com/go-openapi/swag v0.23.0 // indirect - github.com/go-sql-driver/mysql v1.7.1 // indirect github.com/gobwas/glob v0.2.3 // indirect github.com/gofrs/uuid v4.4.0+incompatible // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect - github.com/gomodule/redigo v1.8.9 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.6.0 // indirect github.com/gorilla/mux v1.8.1 // indirect @@ -84,7 +81,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/hashicorp/go-uuid v1.0.3 // indirect github.com/hashicorp/golang-lru v1.0.2 // indirect - github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect + github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect github.com/huandu/xstrings v1.4.0 // indirect github.com/imdario/mergo v0.3.16 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect @@ -102,8 +99,6 @@ require ( github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.15 // indirect - github.com/mattn/go-sqlite3 v1.14.22 // indirect - github.com/miekg/dns v1.1.57 // indirect github.com/mitchellh/copystructure v1.2.0 // indirect github.com/mitchellh/go-wordwrap v1.0.1 // indirect github.com/mitchellh/reflectwalk v1.0.2 // indirect @@ -115,8 +110,6 @@ require ( github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect - github.com/onsi/ginkgo/v2 v2.19.0 // indirect - github.com/onsi/gomega v1.34.1 // indirect github.com/opencontainers/go-digest v1.0.1-0.20231025023718-d50d2fec9c98 // indirect github.com/opencontainers/image-spec v1.1.0 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect @@ -135,8 +128,6 @@ require ( github.com/spf13/cast v1.6.0 // indirect github.com/spf13/cobra v1.8.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/testcontainers/testcontainers-go v0.33.0 // indirect - github.com/tklauser/go-sysconf v0.3.14 // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect github.com/xeipuuv/gojsonschema v1.2.0 // indirect diff --git a/harpoon/go.sum b/harpoon/go.sum index fbff260bf..24c95fdaf 100644 --- a/harpoon/go.sum +++ b/harpoon/go.sum @@ -407,8 +407,6 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc= github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk= -github.com/redpanda-data/helm-charts v0.0.0-20241203151858-926cfe070c6e h1:UEzwEsi0nuT6qrDyDfpXjCm9DhjY4Cryj9XRPgjzpDs= -github.com/redpanda-data/helm-charts v0.0.0-20241203151858-926cfe070c6e/go.mod h1:maQmSf2TLXRGKLcDeCBO/zD+5/i+8NDNOkS2685/P9A= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= diff --git a/harpoon/internal/testing/helm.go b/harpoon/internal/testing/helm.go index 5edb779bb..7986b7d12 100644 --- a/harpoon/internal/testing/helm.go +++ b/harpoon/internal/testing/helm.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "k8s.io/client-go/rest" - "github.com/redpanda-data/helm-charts/pkg/helm" + "github.com/redpanda-data/redpanda-operator/pkg/helm" ) func (t *TestingT) InstallHelmChart(ctx context.Context, url, repo, chart string, options helm.InstallOptions) { diff --git a/harpoon/suite.go b/harpoon/suite.go index ed21a0722..84387f94d 100644 --- a/harpoon/suite.go +++ b/harpoon/suite.go @@ -22,7 +22,7 @@ import ( "github.com/cucumber/godog/colors" "k8s.io/apimachinery/pkg/runtime" - "github.com/redpanda-data/helm-charts/pkg/helm" + "github.com/redpanda-data/redpanda-operator/pkg/helm" internaltesting "github.com/redpanda-data/redpanda-operator/harpoon/internal/testing" "github.com/redpanda-data/redpanda-operator/harpoon/internal/tracking" ) diff --git a/harpoon/types.go b/harpoon/types.go index b38369750..f3c46d0fe 100644 --- a/harpoon/types.go +++ b/harpoon/types.go @@ -19,7 +19,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/redpanda-data/helm-charts/pkg/helm" + "github.com/redpanda-data/redpanda-operator/pkg/helm" internaltesting "github.com/redpanda-data/redpanda-operator/harpoon/internal/testing" )