From 8fdb9fe2b9594727d7bd4ea4099708264e68092e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 4 Aug 2021 10:48:00 +0200 Subject: [PATCH] ceph: remove old network types MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Those types are legacy, not really used anywhere and not needed anymore. Signed-off-by: Sébastien Han --- cmd/rook/ceph/ceph.go | 13 ---- cmd/rook/ceph/operator.go | 2 - cmd/rook/rook/rook.go | 7 +- pkg/clusterd/context.go | 3 - pkg/clusterd/network.go | 97 --------------------------- pkg/clusterd/network_test.go | 87 ------------------------ pkg/daemon/ceph/client/config.go | 20 ++---- pkg/daemon/ceph/client/config_test.go | 12 ---- 8 files changed, 9 insertions(+), 232 deletions(-) delete mode 100644 pkg/clusterd/network.go delete mode 100644 pkg/clusterd/network_test.go diff --git a/cmd/rook/ceph/ceph.go b/cmd/rook/ceph/ceph.go index 8b099ad1d..56a18828f 100644 --- a/cmd/rook/ceph/ceph.go +++ b/cmd/rook/ceph/ceph.go @@ -49,7 +49,6 @@ type config struct { location string cephConfigOverride string storeConfig osdconfig.StoreConfig - networkInfo clusterd.NetworkInfo monEndpoints string nodeName string pvcBacked bool @@ -69,13 +68,10 @@ func createContext() *clusterd.Context { context := rook.NewContext() context.ConfigDir = cfg.dataDir context.ConfigFileOverride = cfg.cephConfigOverride - context.NetworkInfo = cfg.NetworkInfo() return context } func addCephFlags(command *cobra.Command) { - command.Flags().StringVar(&cfg.networkInfo.PublicAddr, "public-ip", "", "public IP address for this machine") - command.Flags().StringVar(&cfg.networkInfo.ClusterAddr, "private-ip", "", "private IP address for this machine") command.Flags().StringVar(&clusterInfo.FSID, "fsid", "", "the cluster uuid") command.Flags().StringVar(&clusterInfo.MonitorSecret, "mon-secret", "", "the cephx keyring for monitors") command.Flags().StringVar(&clusterInfo.CephCred.Username, "ceph-username", "", "ceph username") @@ -85,13 +81,4 @@ func addCephFlags(command *cobra.Command) { command.Flags().StringVar(&cfg.cephConfigOverride, "ceph-config-override", "", "optional path to a ceph config file that will be appended to the config files that rook generates") clusterInfo.Namespace = os.Getenv(k8sutil.PodNamespaceEnvVar) - - // deprecated ipv4 format address - // TODO: remove these legacy flags in the future - command.Flags().StringVar(&cfg.networkInfo.PublicAddrIPv4, "public-ipv4", "", "public IPv4 address for this machine") - command.Flags().StringVar(&cfg.networkInfo.ClusterAddrIPv4, "private-ipv4", "", "private IPv4 address for this machine") -} - -func (c *config) NetworkInfo() clusterd.NetworkInfo { - return c.networkInfo.Simplify() } diff --git a/cmd/rook/ceph/operator.go b/cmd/rook/ceph/operator.go index d8979b52b..94cb6aa07 100644 --- a/cmd/rook/ceph/operator.go +++ b/cmd/rook/ceph/operator.go @@ -19,7 +19,6 @@ package ceph import ( "github.com/pkg/errors" "github.com/rook/rook/cmd/rook/rook" - "github.com/rook/rook/pkg/clusterd" "github.com/rook/rook/pkg/daemon/ceph/agent/flexvolume/attachment" operator "github.com/rook/rook/pkg/operator/ceph" cluster "github.com/rook/rook/pkg/operator/ceph/cluster" @@ -70,7 +69,6 @@ func startOperator(cmd *cobra.Command, args []string) error { logger.Info("starting Rook-Ceph operator") context := createContext() - context.NetworkInfo = clusterd.NetworkInfo{} context.ConfigDir = k8sutil.DataDir volumeAttachment, err := attachment.New(context) if err != nil { diff --git a/cmd/rook/rook/rook.go b/cmd/rook/rook/rook.go index 055407e0b..8b700f3ae 100644 --- a/cmd/rook/rook/rook.go +++ b/cmd/rook/rook/rook.go @@ -102,10 +102,9 @@ func NewContext() *clusterd.Context { var err error context := &clusterd.Context{ - Executor: &exec.CommandExecutor{}, - NetworkInfo: clusterd.NetworkInfo{}, - ConfigDir: k8sutil.DataDir, - LogLevel: Cfg.LogLevel, + Executor: &exec.CommandExecutor{}, + ConfigDir: k8sutil.DataDir, + LogLevel: Cfg.LogLevel, } // Try to read config from in-cluster env diff --git a/pkg/clusterd/context.go b/pkg/clusterd/context.go index 3a9599abb..eccd4704f 100644 --- a/pkg/clusterd/context.go +++ b/pkg/clusterd/context.go @@ -66,9 +66,6 @@ type Context struct { // The full path to a config file that can be used to override generated settings ConfigFileOverride string - // Information about the network for this machine and its cluster - NetworkInfo NetworkInfo - // NetworkClient is a connection to the CNI plugin API NetworkClient netclient.K8sCniCncfIoV1Interface diff --git a/pkg/clusterd/network.go b/pkg/clusterd/network.go deleted file mode 100644 index 3efdf80de..000000000 --- a/pkg/clusterd/network.go +++ /dev/null @@ -1,97 +0,0 @@ -/* -Copyright 2016 The Rook Authors. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -package clusterd - -import ( - "fmt" - "net" -) - -type NetworkInfo struct { - PublicAddr string - ClusterAddr string - PublicNetwork string // public network and subnet mask in CIDR notation - ClusterNetwork string // cluster network and subnet mask in CIDR notation - - // deprecated ipv4 format address - // TODO: remove these legacy fields in the future - PublicAddrIPv4 string - ClusterAddrIPv4 string -} - -// Simplify adapts deprecated fields -// TODO: remove this function in the future -func (in NetworkInfo) Simplify() NetworkInfo { - out := NetworkInfo{ - PublicNetwork: in.PublicNetwork, - ClusterNetwork: in.ClusterNetwork, - } - if in.PublicAddr != "" { - out.PublicAddr = in.PublicAddr - } else { - out.PublicAddr = in.PublicAddrIPv4 - } - - if in.ClusterAddr != "" { - out.ClusterAddr = in.ClusterAddr - } else { - out.ClusterAddr = in.ClusterAddrIPv4 - } - return out -} - -func VerifyNetworkInfo(networkInfo NetworkInfo) error { - if err := verifyIPAddr(networkInfo.PublicAddr); err != nil { - return err - } - - if err := verifyIPAddr(networkInfo.ClusterAddr); err != nil { - return err - } - - if err := verifyIPNetwork(networkInfo.PublicNetwork); err != nil { - return err - } - - if err := verifyIPNetwork(networkInfo.ClusterNetwork); err != nil { - return err - } - - return nil -} - -func verifyIPAddr(addr string) error { - if addr == "" { - // empty strings are OK - return nil - } - - if net.ParseIP(addr) == nil { - return fmt.Errorf("failed to parse IP address %s", addr) - } - - return nil -} - -func verifyIPNetwork(network string) error { - if network == "" { - // empty strings are OK - return nil - } - - _, _, err := net.ParseCIDR(network) - return err -} diff --git a/pkg/clusterd/network_test.go b/pkg/clusterd/network_test.go deleted file mode 100644 index 9a2433faa..000000000 --- a/pkg/clusterd/network_test.go +++ /dev/null @@ -1,87 +0,0 @@ -/* -Copyright 2016 The Rook Authors. All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ -package clusterd - -import "testing" -import "github.com/stretchr/testify/assert" - -func TestVerifyNetworkInfo(t *testing.T) { - // empty network info is OK - var networkInfo NetworkInfo - err := VerifyNetworkInfo(networkInfo) - assert.Nil(t, err) - - // well formed network info is OK - networkInfo = NetworkInfo{ - PublicAddr: "10.1.1.1", - PublicNetwork: "10.1.1.0/24", - ClusterAddr: "10.1.2.2", - ClusterNetwork: "10.1.2.0/24", - } - err = VerifyNetworkInfo(networkInfo) - assert.Nil(t, err) - - // malformed IP address is not OK - networkInfo = NetworkInfo{ - PublicAddr: "10.1.1.256", - PublicNetwork: "10.1.1.0/24", - ClusterAddr: "10.1.2.256", - ClusterNetwork: "10.1.2.0/24", - } - err = VerifyNetworkInfo(networkInfo) - assert.NotNil(t, err) - - // malformed network address is not OK - networkInfo = NetworkInfo{ - PublicAddr: "10.1.1.1", - PublicNetwork: "10.1.1.0/33", - ClusterAddr: "10.1.2.2", - ClusterNetwork: "10.1.2.0/33", - } - err = VerifyNetworkInfo(networkInfo) - assert.NotNil(t, err) -} - -func TestNetworkInfoSimplify(t *testing.T) { - - out := NetworkInfo{ - PublicAddr: "10.1.1.1", - PublicNetwork: "10.1.1.0/24", - ClusterAddr: "10.1.2.2", - ClusterNetwork: "10.1.2.0/24", - } - - // only has old fields - in := NetworkInfo{ - PublicAddrIPv4: "10.1.1.1", - PublicNetwork: "10.1.1.0/24", - ClusterAddrIPv4: "10.1.2.2", - ClusterNetwork: "10.1.2.0/24", - } - assert.Equal(t, out, in.Simplify()) - - // has both new and old fields - in = NetworkInfo{ - PublicAddr: "10.1.1.1", - PublicAddrIPv4: "10.9.1.1", - PublicNetwork: "10.1.1.0/24", - ClusterAddr: "10.1.2.2", - ClusterAddrIPv4: "10.9.2.2", - ClusterNetwork: "10.1.2.0/24", - } - assert.Equal(t, out, in.Simplify()) - -} diff --git a/pkg/daemon/ceph/client/config.go b/pkg/daemon/ceph/client/config.go index 31876d1e9..dbd707257 100644 --- a/pkg/daemon/ceph/client/config.go +++ b/pkg/daemon/ceph/client/config.go @@ -61,13 +61,9 @@ var ( // GlobalConfig represents the [global] sections of Ceph's config file. type GlobalConfig struct { - FSID string `ini:"fsid,omitempty"` - MonMembers string `ini:"mon initial members,omitempty"` - MonHost string `ini:"mon host"` - PublicAddr string `ini:"public addr,omitempty"` - PublicNetwork string `ini:"public network,omitempty"` - ClusterAddr string `ini:"cluster addr,omitempty"` - ClusterNetwork string `ini:"cluster network,omitempty"` + FSID string `ini:"fsid,omitempty"` + MonMembers string `ini:"mon initial members,omitempty"` + MonHost string `ini:"mon host"` } // CephConfig represents an entire Ceph config including all sections. @@ -198,13 +194,9 @@ func CreateDefaultCephConfig(context *clusterd.Context, clusterInfo *ClusterInfo conf := &CephConfig{ GlobalConfig: &GlobalConfig{ - FSID: clusterInfo.FSID, - MonMembers: strings.Join(monMembers, " "), - MonHost: strings.Join(monHosts, ","), - PublicAddr: context.NetworkInfo.PublicAddr, - PublicNetwork: context.NetworkInfo.PublicNetwork, - ClusterAddr: context.NetworkInfo.ClusterAddr, - ClusterNetwork: context.NetworkInfo.ClusterNetwork, + FSID: clusterInfo.FSID, + MonMembers: strings.Join(monMembers, " "), + MonHost: strings.Join(monHosts, ","), }, } diff --git a/pkg/daemon/ceph/client/config_test.go b/pkg/daemon/ceph/client/config_test.go index 2f28463bb..ed6ed4dd5 100644 --- a/pkg/daemon/ceph/client/config_test.go +++ b/pkg/daemon/ceph/client/config_test.go @@ -51,12 +51,6 @@ func TestCreateDefaultCephConfig(t *testing.T) { // start with INFO level logging context := &clusterd.Context{ LogLevel: capnslog.INFO, - NetworkInfo: clusterd.NetworkInfo{ - PublicAddr: "10.1.1.1", - PublicNetwork: "10.1.1.0/24", - ClusterAddr: "10.1.2.2", - ClusterNetwork: "10.1.2.0/24", - }, } cephConfig, err := CreateDefaultCephConfig(context, clusterInfo) @@ -73,12 +67,6 @@ func TestCreateDefaultCephConfig(t *testing.T) { t.Fatalf("failed to create default ceph config. %+v", err) } verifyConfig(t, cephConfig, clusterInfo, 10) - - // verify the network info config - assert.Equal(t, "10.1.1.1", cephConfig.PublicAddr) - assert.Equal(t, "10.1.1.0/24", cephConfig.PublicNetwork) - assert.Equal(t, "10.1.2.2", cephConfig.ClusterAddr) - assert.Equal(t, "10.1.2.0/24", cephConfig.ClusterNetwork) } func TestGenerateConfigFile(t *testing.T) {