DKube v1.0

service/ingress.go

@@ -18,7 +18,6 @@ type IngressesResp struct {
 	Total int            `json:"total"`
 }
 
-//定义ServiceCreate结构体，用于创建service需要的参数属性的定义
 type IngressCreate struct {
 	Name      string                 `json:"name"`
 	Namespace string                 `json:"namespace"`
@@ -26,7 +25,6 @@ type IngressCreate struct {
 	Hosts     map[string][]*HttpPath `json:"hosts"`
 }
 
-//定义ingress的path结构体
 type HttpPath struct {
 	Path        string        `json:"path"`
 	PathType    nwv1.PathType `json:"path_type"`
@@ -34,15 +32,12 @@ type HttpPath struct {
 	ServicePort int32         `json:"service_port"`
 }
 
-//获取ingress列表，支持过滤、排序、分页
 func (i *ingress) GetIngresses(filterName, namespace string, limit, page int) (ingressesResp *IngressesResp, err error) {
-	//获取ingressList类型的ingress列表
 	ingressList, err := K8s.ClientSet.NetworkingV1().Ingresses(namespace).List(context.TODO(), metav1.ListOptions{})
 	if err != nil {
 		logger.Error(errors.New("获取Ingress列表失败, " + err.Error()))
 		return nil, errors.New("获取Ingress列表失败, " + err.Error())
 	}
-	//将ingressList中的ingress列表(Items)，放进dataselector对象中，进行排序
 	selectableData := &dataSelector{
 		GenericDataList: i.toCells(ingressList.Items),
 		DataSelect: &DataSelectQuery{
@@ -58,7 +53,6 @@ func (i *ingress) GetIngresses(filterName, namespace string, limit, page int) (i
 	total := len(filtered.GenericDataList)
 	data := filtered.Sort().Paginate()
 
-	//将[]DataCell类型的ingress列表转为v1.ingress列表
 	ingresss := i.fromCells(data.GenericDataList)
 
 	return &IngressesResp{
@@ -67,7 +61,6 @@ func (i *ingress) GetIngresses(filterName, namespace string, limit, page int) (i
 	}, nil
 }
 
-//获取ingress详情
 func (i *ingress) GetIngresstDetail(ingressName, namespace string) (ingress *nwv1.Ingress, err error) {
 	ingress, err = K8s.ClientSet.NetworkingV1().Ingresses(namespace).Get(context.TODO(), ingressName, metav1.GetOptions{})
 	if err != nil {
@@ -78,12 +71,9 @@ func (i *ingress) GetIngresstDetail(ingressName, namespace string) (ingress *nwv
 	return ingress, nil
 }
 
-//创建ingress
 func (i *ingress) CreateIngress(data *IngressCreate) (err error) {
-	//声明nwv1.IngressRule和nwv1.HTTPIngressPath变量，后面组装数据于鏊用到
 	var ingressRules []nwv1.IngressRule
 	var httpIngressPATHs []nwv1.HTTPIngressPath
-	//将data中的数据组装成nwv1.Ingress对象
 	ingress := &nwv1.Ingress{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      data.Name,
@@ -92,41 +82,33 @@ func (i *ingress) CreateIngress(data *IngressCreate) (err error) {
 		},
 		Status: nwv1.IngressStatus{},
 	}
-	//第一层for循环是将host组装成nwv1.IngressRule类型的对象
-	// 一个host对应一个ingressrule，每个ingressrule中包含一个host和多个path
+
 	for key, value := range data.Hosts {
 		ir := nwv1.IngressRule{
 			Host: key,
-			//这里现将nwv1.HTTPIngressRuleValue类型中的Paths置为空，后面组装好数据再赋值
 			IngressRuleValue: nwv1.IngressRuleValue{
 				HTTP: &nwv1.HTTPIngressRuleValue{Paths: nil},
 			},
 		}
-		//第二层for循环是将path组装成nwv1.HTTPIngressPath类型的对象
 		for _, httpPath := range value {
 			hip := nwv1.HTTPIngressPath{
 				Path:     httpPath.Path,
 				PathType: &httpPath.PathType,
 				Backend: nwv1.IngressBackend{
 					Service: &nwv1.IngressServiceBackend{
-						Name: httpPath.ServiceName,
+						Name: getServiceName(httpPath.ServiceName),
 						Port: nwv1.ServiceBackendPort{
 							Number: httpPath.ServicePort,
 						},
 					},
 				},
 			}
-			//将每个hip对象组装成数组
 			httpIngressPATHs = append(httpIngressPATHs, hip)
 		}
-		//给Paths赋值，前面置为空了
 		ir.IngressRuleValue.HTTP.Paths = httpIngressPATHs
-		//将每个ir对象组装成数组，这个ir对象就是IngressRule，每个元素是一个host和多个path
 		ingressRules = append(ingressRules, ir)
 	}
-	//将ingressRules对象加入到ingress的规则中
 	ingress.Spec.Rules = ingressRules
-	//创建ingress
 	_, err = K8s.ClientSet.NetworkingV1().Ingresses(data.Namespace).Create(context.TODO(), ingress, metav1.CreateOptions{})
 	if err != nil {
 		logger.Error(errors.New("创建Ingress失败, " + err.Error()))
@@ -136,7 +118,6 @@ func (i *ingress) CreateIngress(data *IngressCreate) (err error) {
 	return nil
 }
 
-//删除ingress
 func (i *ingress) DeleteIngress(ingressName, namespace string) (err error) {
 	err = K8s.ClientSet.NetworkingV1().Ingresses(namespace).Delete(context.TODO(), ingressName, metav1.DeleteOptions{})
 	if err != nil {
@@ -147,7 +128,6 @@ func (i *ingress) DeleteIngress(ingressName, namespace string) (err error) {
 	return nil
 }
 
-//更新ingress
 func (i *ingress) UpdateIngress(namespace, content string) (err error) {
 	var ingress = &nwv1.Ingress{}