Merge branch 'master' into eliminate-hardcoded-values

api/v1beta1/kafkacluster_types.go

@@ -1120,15 +1120,15 @@ func (eConfig *EnvoyConfig) GetEnvoyAdminPort() int32 {
  if eConfig.AdminPort != nil {
  return *eConfig.AdminPort
  }
- return DefaultEnvoyAdminPort
+ return defaultEnvoyAdminPort
 }
 
 // GetEnvoyHealthCheckPort returns the envoy admin port
 func (eConfig *EnvoyConfig) GetEnvoyHealthCheckPort() int32 {
  if eConfig.HealthCheckPort != nil {
  return *eConfig.HealthCheckPort
  }
- return DefaultEnvoyHealthCheckPort
+ return defaultEnvoyHealthCheckPort
 }
 
 // GetCCImage returns the used Cruise Control image

tests/e2e/go.mod

@@ -1,83 +1,56 @@
 module github.com/banzaicloud/koperator/tests/e2e
 
-go 1.20
+go 1.19
 
 require (
  emperror.dev/errors v0.8.1
- github.com/banzaicloud/koperator v0.25.0
+ github.com/Masterminds/sprig v2.22.0+incompatible
+ github.com/banzaicloud/koperator v0.25.1
+ github.com/banzaicloud/koperator/api v0.28.7
  github.com/cisco-open/k8s-objectmatcher v1.9.0
- github.com/gruntwork-io/terratest v0.41.24
+ github.com/gruntwork-io/terratest v0.41.26
  github.com/onsi/ginkgo/v2 v2.9.5
  github.com/onsi/gomega v1.27.6
  github.com/twmb/franz-go v1.13.5
- k8s.io/apiextensions-apiserver v0.27.2
- k8s.io/apimachinery v0.27.2
+ k8s.io/apiextensions-apiserver v0.26.4
+ k8s.io/apimachinery v0.26.4
  sigs.k8s.io/yaml v1.3.0
 )
 
 require (
+ github.com/Masterminds/goutils v1.1.1 // indirect
  github.com/Masterminds/semver v1.5.0 // indirect
  github.com/Shopify/sarama v1.36.0 // indirect
+ github.com/aws/aws-sdk-go v1.44.122 // indirect
  github.com/banzaicloud/istio-client-go v0.0.17 // indirect
  github.com/banzaicloud/koperator/properties v0.4.1 // indirect
  github.com/banzaicloud/operator-tools v0.28.0 // indirect
+ github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
  github.com/briandowns/spinner v1.12.0 // indirect
+ github.com/cert-manager/cert-manager v1.11.2 // indirect
  github.com/cisco-open/cluster-registry-controller/api v0.2.5 // indirect
  github.com/cppforlife/go-patch v0.2.0 // indirect
+ github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
+ github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/eapache/go-resiliency v1.3.0 // indirect
  github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
  github.com/eapache/queue v1.1.0 // indirect
- github.com/evanphx/json-patch/v5 v5.6.0 // indirect
- github.com/fatih/color v1.13.0 // indirect
- github.com/go-logr/zapr v1.2.3 // indirect
- github.com/golang/snappy v0.0.4 // indirect
- github.com/hashicorp/go-uuid v1.0.3 // indirect
- github.com/huandu/xstrings v1.3.3 // indirect
- github.com/iancoleman/orderedmap v0.2.0 // indirect
- github.com/jcmturner/aescts/v2 v2.0.0 // indirect
- github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
- github.com/jcmturner/gofork v1.7.6 // indirect
- github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
- github.com/jcmturner/rpc/v2 v2.0.3 // indirect
- github.com/klauspost/compress v1.16.3 // indirect
- github.com/mattn/go-colorable v0.1.13 // indirect
- github.com/mattn/go-isatty v0.0.16 // indirect
- github.com/mitchellh/copystructure v1.2.0 // indirect
- github.com/onsi/ginkgo v1.16.5 // indirect
- github.com/pavlo-v-chernykh/keystore-go/v4 v4.4.1 // indirect
- github.com/pierrec/lz4/v4 v4.1.17 // indirect
- github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
- github.com/spf13/cast v1.4.1 // indirect
- github.com/tidwall/gjson v1.9.3 // indirect
- github.com/tidwall/match v1.1.1 // indirect
- github.com/tidwall/pretty v1.2.0 // indirect
- github.com/twmb/franz-go/pkg/kmsg v1.4.0 // indirect
- github.com/wayneashleyberry/terminal-dimensions v1.0.0 // indirect
- go.uber.org/zap v1.24.0 // indirect
- sigs.k8s.io/controller-runtime v0.14.6 // indirect
-)
-
-require (
- github.com/Masterminds/goutils v1.1.1 // indirect
- github.com/Masterminds/sprig v2.22.0+incompatible
- github.com/aws/aws-sdk-go v1.44.122 // indirect
- github.com/banzaicloud/koperator/api v0.28.3
- github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc // indirect
- github.com/cert-manager/cert-manager v1.11.2 // indirect
- github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
- github.com/davecgh/go-spew v1.1.1 // indirect
  github.com/emicklei/go-restful/v3 v3.9.0 // indirect
  github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+ github.com/evanphx/json-patch/v5 v5.6.0 // indirect
+ github.com/fatih/color v1.13.0 // indirect
  github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
- github.com/go-errors/errors v1.4.2 // indirect
+ github.com/go-errors/errors v1.0.2-0.20180813162953-d98b870cc4e0 // indirect
  github.com/go-logr/logr v1.2.4 // indirect
- github.com/go-openapi/jsonpointer v0.19.6 // indirect
- github.com/go-openapi/jsonreference v0.20.1 // indirect
- github.com/go-openapi/swag v0.22.3 // indirect
+ github.com/go-logr/zapr v1.2.3 // indirect
+ github.com/go-openapi/jsonpointer v0.19.5 // indirect
+ github.com/go-openapi/jsonreference v0.20.0 // indirect
+ github.com/go-openapi/swag v0.19.14 // indirect
  github.com/go-sql-driver/mysql v1.4.1 // indirect
  github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
  github.com/gogo/protobuf v1.3.2 // indirect
  github.com/golang/protobuf v1.5.3 // indirect
+ github.com/golang/snappy v0.0.4 // indirect
  github.com/google/gnostic v0.6.9 // indirect
  github.com/google/go-cmp v0.5.9 // indirect
  github.com/google/gofuzz v1.2.0 // indirect
@@ -86,28 +59,52 @@ require (
  github.com/gruntwork-io/go-commons v0.8.0 // indirect
  github.com/hashicorp/errwrap v1.1.0 // indirect
  github.com/hashicorp/go-multierror v1.1.1 // indirect
+ github.com/hashicorp/go-uuid v1.0.3 // indirect
+ github.com/huandu/xstrings v1.3.3 // indirect
+ github.com/iancoleman/orderedmap v0.2.0 // indirect
  github.com/imdario/mergo v0.3.13 // indirect
+ github.com/jcmturner/aescts/v2 v2.0.0 // indirect
+ github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
+ github.com/jcmturner/gofork v1.7.6 // indirect
+ github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
+ github.com/jcmturner/rpc/v2 v2.0.3 // indirect
  github.com/jmespath/go-jmespath v0.4.0 // indirect
  github.com/josharian/intern v1.0.0 // indirect
  github.com/json-iterator/go v1.1.12 // indirect
- github.com/mailru/easyjson v0.7.7 // indirect
+ github.com/klauspost/compress v1.16.3 // indirect
+ github.com/mailru/easyjson v0.7.6 // indirect
+ github.com/mattn/go-colorable v0.1.13 // indirect
+ github.com/mattn/go-isatty v0.0.16 // indirect
  github.com/mattn/go-zglob v0.0.2-0.20190814121620-e3c945676326 // indirect
+ github.com/mitchellh/copystructure v1.2.0 // indirect
  github.com/mitchellh/go-homedir v1.1.0 // indirect
  github.com/mitchellh/reflectwalk v1.0.2 // indirect
  github.com/moby/spdystream v0.2.0 // indirect
  github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
  github.com/modern-go/reflect2 v1.0.2 // indirect
  github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+ github.com/onsi/ginkgo v1.16.5 // indirect
+ github.com/pavlo-v-chernykh/keystore-go/v4 v4.4.1 // indirect
+ github.com/pierrec/lz4/v4 v4.1.17 // indirect
  github.com/pkg/errors v0.9.1 // indirect
  github.com/pmezard/go-difflib v1.0.0 // indirect
  github.com/pquerna/otp v1.2.0 // indirect
+ github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
  github.com/russross/blackfriday/v2 v2.1.0 // indirect
+ github.com/spf13/cast v1.4.1 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/stretchr/testify v1.8.1 // indirect
+ github.com/tidwall/gjson v1.9.3 // indirect
+ github.com/tidwall/match v1.1.1 // indirect
+ github.com/tidwall/pretty v1.2.0 // indirect
+ github.com/twmb/franz-go/pkg/kmsg v1.4.0 // indirect
  github.com/urfave/cli v1.22.2 // indirect
+ github.com/wayneashleyberry/terminal-dimensions v1.0.0 // indirect
  go.uber.org/atomic v1.9.0 // indirect
  go.uber.org/multierr v1.6.0 // indirect
+ go.uber.org/zap v1.24.0 // indirect
  golang.org/x/crypto v0.7.0 // indirect
+ golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
  golang.org/x/net v0.10.0 // indirect
  golang.org/x/oauth2 v0.4.0 // indirect
  golang.org/x/sys v0.8.0 // indirect
@@ -120,11 +117,12 @@ require (
  gopkg.in/inf.v0 v0.9.1 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
  gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/api v0.27.2 // indirect
- k8s.io/client-go v0.27.2 // indirect
- k8s.io/klog/v2 v2.90.1 // indirect
- k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
- k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
- sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
+ k8s.io/api v0.26.4 // indirect
+ k8s.io/client-go v0.26.4 // indirect
+ k8s.io/klog/v2 v2.80.1 // indirect
+ k8s.io/kube-openapi v0.0.0-20221207184640-f3cff1453715 // indirect
+ k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
+ sigs.k8s.io/controller-runtime v0.14.6 // indirect
+ sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
  sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )