upgrade m3 version

.golangci.yml

@@ -215,6 +215,12 @@ linters:
     # This linter isn't that helpful since it's not immediately obvious how to
     # address its lints (for cyclomatic complexity).
     - gocyclo
+    # There are some cases where a single letter variable name is totally fine.
+    - varnamelen
+    # Returning an interface should not be a crime.
+    - ireturn
+    # Allow replace directives in go.mod files.
+    - gomoddirectives
   disable-all: false
   presets:
     # bodyclose, errcheck, gosec, govet, scopelint, staticcheck, typecheck

go.mod

@@ -4,35 +4,45 @@ go 1.16
 
 require (
 	github.com/ant31/crd-validation v0.0.0-20180801212718-38f6a293f140
+	github.com/apex/log v1.3.0 // indirect
 	github.com/axw/gocov v1.0.0
+	github.com/bmatcuk/doublestar v1.3.1 // indirect
+	github.com/briandowns/spinner v1.11.1 // indirect
+	github.com/cheekybits/genny v1.0.0 // indirect
 	github.com/cirocosta/grafana-sync v0.0.0-20181123215626-6cbb4a9501c1
 	github.com/d4l3k/messagediff v1.2.1
 	github.com/emicklei/go-restful v2.9.6+incompatible // indirect
 	github.com/evanphx/json-patch v4.11.0+incompatible
-	github.com/fortytw2/leaktest v1.3.0 // indirect
 	github.com/fossas/fossa-cli v1.0.30
 	github.com/garethr/kubeval v0.0.0-20180821130434-c44f5193dc94
+	github.com/gnewton/jargo v0.0.0-20150417131352-41f5f186a805 // indirect
 	github.com/go-openapi/inflect v0.19.0 // indirect
-	github.com/go-openapi/runtime v0.19.5 // indirect
-	github.com/go-openapi/spec v0.19.5 // indirect
 	github.com/go-swagger/go-swagger v0.19.0
 	github.com/go-swagger/scan-repo-boundary v0.0.0-20180623220736-973b3573c013 // indirect
 	github.com/gogo/protobuf v1.3.2
-	github.com/golang/mock v1.4.4
-	github.com/golangci/golangci-lint v1.37.1
+	github.com/golang/mock v1.6.0
+	github.com/golangci/golangci-lint v1.43.0
 	github.com/hashicorp/go-retryablehttp v0.6.0
+	github.com/imdario/mergo v0.3.8 // indirect
 	github.com/m3db/build-tools v0.0.0-20181013000606-edd1bdd1df8a
-	github.com/m3db/m3 v1.1.1-0.20210302095536-802492679da1
+	github.com/m3db/m3 v1.4.2
+	github.com/m3db/m3x v0.0.0-20190408051622-ebf3c7b94afd // indirect
 	github.com/m3db/tools v0.0.0-20181008195521-c6ded3f34878
 	github.com/pkg/errors v0.9.1
 	github.com/rakyll/statik v0.1.6
+	github.com/remeh/sizedwaitgroup v1.0.0 // indirect
+	github.com/rhysd/go-github-selfupdate v1.2.2 // indirect
+	github.com/rveen/ogdl v0.0.0-20200522080342-eeeda1a978e7 // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/toqueteos/webbrowser v1.2.0 // indirect
-	github.com/uber-go/tally v3.3.17+incompatible
+	github.com/uber-go/tally v3.4.2+incompatible
 	github.com/urfave/cli v1.22.2 // indirect
-	go.uber.org/atomic v1.7.0
-	go.uber.org/zap v1.17.0
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+	go.uber.org/atomic v1.9.0
+	go.uber.org/zap v1.19.0
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
+	gopkg.in/go-ini/ini.v1 v1.57.0 // indirect
+	gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
 	k8s.io/api v0.22.2
 	k8s.io/apiextensions-apiserver v0.22.2
 	k8s.io/apimachinery v0.22.2

pkg/controller/m3admin_client.go

@@ -110,7 +110,8 @@ func newMultiAdminClient(adminOpts []m3admin.Option, logger *zap.Logger) *multiA
 
 func (m *multiAdminClient) adminClientForCluster(cluster *myspec.M3DBCluster) m3admin.Client {
 	env := k8sops.DefaultM3ClusterEnvironmentName(cluster)
-	opts := append(m.adminOpts, m3admin.WithEnvironment(env), m3admin.WithZone(cluster.Spec.Zone))
+	opts := append([]m3admin.Option{}, m.adminOpts...)
+	opts = append(opts, m3admin.WithEnvironment(env), m3admin.WithZone(cluster.Spec.Zone))
 	return m.adminClientFn(opts...)
 }