diff options
| author | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-23 17:34:26 +0800 |
|---|---|---|
| committer | Shelley-BaoYue <baoyue2@huawei.com> | 2023-11-23 18:42:23 +0800 |
| commit | 5816bec02e9d3e4a351bacd0bbaa08a0a37fe24e (patch) | |
| tree | b7d01ced20b69e5d0ffb44c6e8f251b5e5192e8e /keadm | |
| parent | Merge pull request #5156 from luomengY/quic (diff) | |
| download | kubeedge-5816bec02e9d3e4a351bacd0bbaa08a0a37fe24e.tar.gz | |
remove deprecated func of createv1alpha1edgecore config
Signed-off-by: Shelley-BaoYue <baoyue2@huawei.com>
Diffstat (limited to 'keadm')
| -rw-r--r-- | keadm/cmd/keadm/app/cmd/edge/join_others.go | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/keadm/cmd/keadm/app/cmd/edge/join_others.go b/keadm/cmd/keadm/app/cmd/edge/join_others.go index 7acf9a5ba..160263a71 100644 --- a/keadm/cmd/keadm/app/cmd/edge/join_others.go +++ b/keadm/cmd/keadm/app/cmd/edge/join_others.go @@ -36,8 +36,6 @@ import ( "github.com/kubeedge/kubeedge/common/constants" "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/common" "github.com/kubeedge/kubeedge/keadm/cmd/keadm/app/cmd/util" - "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1" - validationv1alpha1 "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha1/validation" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha2" "github.com/kubeedge/kubeedge/pkg/apis/componentconfig/edgecore/v1alpha2/validation" pkgutil "github.com/kubeedge/kubeedge/pkg/util" @@ -101,9 +99,6 @@ func createEdgeConfigFiles(opt *common.JoinOptions) error { if err != nil { return fmt.Errorf("parse kubeedge version failed, %v", err) } - if v.Major <= 1 && v.Minor < 12 { - return createV1alpha1EdgeConfigFiles(opt) - } if v.Major >= 1 && v.Minor >= 14 && opt.RuntimeType != constants.DefaultRuntimeType { return fmt.Errorf("since KubeEdge v1.14, runtime type only supports `remote`") } @@ -272,84 +267,3 @@ func runEdgeCore(withMqtt bool) error { klog.Infoln(tip) return nil } - -func createV1alpha1EdgeConfigFiles(opt *common.JoinOptions) error { - var edgeCoreConfig *v1alpha1.EdgeCoreConfig - - configFilePath := filepath.Join(util.KubeEdgePath, "config/edgecore.yaml") - _, err := os.Stat(configFilePath) - if err == nil || os.IsExist(err) { - klog.Infoln("Read existing configuration file") - b, err := os.ReadFile(configFilePath) - if err != nil { - return err - } - if err := yaml.Unmarshal(b, &edgeCoreConfig); err != nil { - return err - } - } - if edgeCoreConfig == nil { - klog.Infoln("The configuration does not exist or the parsing fails, and the default configuration is generated") - edgeCoreConfig = v1alpha1.NewDefaultEdgeCoreConfig() - } - - if opt.Token != "" { - edgeCoreConfig.Modules.EdgeHub.Token = opt.Token - } - if opt.EdgeNodeName != "" { - edgeCoreConfig.Modules.Edged.HostnameOverride = opt.EdgeNodeName - } - if opt.RuntimeType != "" { - edgeCoreConfig.Modules.Edged.RuntimeType = opt.RuntimeType - } - - switch opt.CGroupDriver { - case v1alpha1.CGroupDriverSystemd: - edgeCoreConfig.Modules.Edged.CGroupDriver = v1alpha1.CGroupDriverSystemd - case v1alpha1.CGroupDriverCGroupFS: - edgeCoreConfig.Modules.Edged.CGroupDriver = v1alpha1.CGroupDriverCGroupFS - default: - return fmt.Errorf("unsupported CGroupDriver: %s", opt.CGroupDriver) - } - edgeCoreConfig.Modules.Edged.CGroupDriver = opt.CGroupDriver - - if opt.RemoteRuntimeEndpoint != "" { - edgeCoreConfig.Modules.Edged.RemoteRuntimeEndpoint = opt.RemoteRuntimeEndpoint - edgeCoreConfig.Modules.Edged.RemoteImageEndpoint = opt.RemoteRuntimeEndpoint - } - - host, _, err := net.SplitHostPort(opt.CloudCoreIPPort) - if err != nil { - return fmt.Errorf("get current host and port failed: %v", err) - } - if opt.CertPort != "" { - edgeCoreConfig.Modules.EdgeHub.HTTPServer = "https://" + net.JoinHostPort(host, opt.CertPort) - } else { - edgeCoreConfig.Modules.EdgeHub.HTTPServer = "https://" + net.JoinHostPort(host, "10002") - } - - switch opt.HubProtocol { - case api.ProtocolTypeQuic: - edgeCoreConfig.Modules.EdgeHub.Quic.Enable = true - edgeCoreConfig.Modules.EdgeHub.WebSocket.Enable = false - edgeCoreConfig.Modules.EdgeHub.Quic.Server = opt.CloudCoreIPPort - edgeCoreConfig.Modules.EdgeHub.WebSocket.Server = net.JoinHostPort(host, strconv.Itoa(constants.DefaultWebSocketPort)) - case api.ProtocolTypeWS: - edgeCoreConfig.Modules.EdgeHub.Quic.Enable = false - edgeCoreConfig.Modules.EdgeHub.WebSocket.Enable = true - edgeCoreConfig.Modules.EdgeHub.Quic.Server = net.JoinHostPort(host, strconv.Itoa(constants.DefaultQuicPort)) - edgeCoreConfig.Modules.EdgeHub.WebSocket.Server = opt.CloudCoreIPPort - default: - return fmt.Errorf("unsupported hub of protocol: %s", opt.HubProtocol) - } - edgeCoreConfig.Modules.EdgeStream.TunnelServer = net.JoinHostPort(host, strconv.Itoa(constants.DefaultTunnelPort)) - - if len(opt.Labels) > 0 { - edgeCoreConfig.Modules.Edged.Labels = setEdgedNodeLabels(opt) - } - - if errs := validationv1alpha1.ValidateEdgeCoreConfiguration(edgeCoreConfig); len(errs) > 0 { - return errors.New(pkgutil.SpliceErrors(errs.ToAggregate().Errors())) - } - return common.Write2File(configFilePath, edgeCoreConfig) -} |
