diff --git a/go.mod b/go.mod index 530610d8f..549b2214b 100644 --- a/go.mod +++ b/go.mod @@ -42,7 +42,6 @@ require ( ) replace ( - github.com/k8ssandra/cass-operator => github.com/k8ssandra/cass-operator v1.8.0-rc.2.0.20220108141909-eb7bbb91f9bb k8s.io/api => k8s.io/api v0.22.2 k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.22.2 k8s.io/apimachinery => k8s.io/apimachinery v0.22.2 diff --git a/go.sum b/go.sum index 522d62bc5..631140c9d 100644 --- a/go.sum +++ b/go.sum @@ -472,8 +472,6 @@ github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22 github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/jsanda/cass-operator-1 v1.6.1-0.20220114212340-bb9f5b39297d h1:fiWmJ6b0FUR39NIHOk/598XQhiho0kJ3bebsqNo7Yfs= -github.com/jsanda/cass-operator-1 v1.6.1-0.20220114212340-bb9f5b39297d/go.mod h1:zsEoRc3auDcbY3GZAGv14mBZ5KTbj3EwMQzmM8/Kl4A= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= @@ -484,8 +482,8 @@ github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfV 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/jung-kurt/gofpdf v1.0.3-0.20190309125859-24315acbbda5/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= -github.com/k8ssandra/cass-operator v1.8.0-rc.2.0.20220108141909-eb7bbb91f9bb h1:ZMScu7aAIwCdCw3UJnWqUMyA7iqXGGdDRKG0xPb6ayA= -github.com/k8ssandra/cass-operator v1.8.0-rc.2.0.20220108141909-eb7bbb91f9bb/go.mod h1:zsEoRc3auDcbY3GZAGv14mBZ5KTbj3EwMQzmM8/Kl4A= +github.com/k8ssandra/cass-operator v1.8.0-rc.2.0.20220114225934-6a78a8237173 h1:oWNFVOwiEYQd8RaWHb+JIG+fNTs3UboGnAeaNzsUHts= +github.com/k8ssandra/cass-operator v1.8.0-rc.2.0.20220114225934-6a78a8237173/go.mod h1:zsEoRc3auDcbY3GZAGv14mBZ5KTbj3EwMQzmM8/Kl4A= github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5 h1:Dq0VdM960G3AbhYwFuaebmsE08IzOYHYhngUfDmWaAc= github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5/go.mod h1:WsQymIaVT39xbcstZhdqynUS13AGzP2p6U9Hsk1oy5M= github.com/karrick/godirwalk v1.16.1/go.mod h1:j4mkqPuvaLI8mp1DroR3P6ad7cyYd4c1qeJ3RV7ULlk= diff --git a/pkg/cassandra/datacenter.go b/pkg/cassandra/datacenter.go index b932a4118..ad53d20e4 100644 --- a/pkg/cassandra/datacenter.go +++ b/pkg/cassandra/datacenter.go @@ -368,7 +368,7 @@ func ValidateConfig(desiredDc, actualDc *cassdcapi.CassandraDatacenter) error { desiredCassYaml, foundDesiredYaml := desiredConfig["cassandra-yaml"].(map[string]interface{}) if (foundActualYaml && foundDesiredYaml) && actualCassYaml["num_tokens"] != desiredCassYaml["num_tokens"] { - return fmt.Errorf("tried to change num_tokens in an existing datacenter") + return fmt.Errorf("tried to change num_tokens in an existing datacenter") } return nil