test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 03:37:46 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: create resource emptying cluster ip (#1637)

Browse Source 
Co-authored-by: 曲源成 <quyc@goodrain.com>
This commit is contained in:
Quyc 2023-04-28 16:29:24 +08:00 committed by GitHub
parent 45787378b6
commit 31235ac41f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/handler/resource.go
View File

@ -10,6 +10,7 @@ import (
"github.com/goodrain/rainbond/db"
dbmodel "github.com/goodrain/rainbond/db/model"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
v1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -42,6 +43,7 @@ func (c *clusterAction) AddAppK8SResource(ctx context.Context, namespace string,
State: resource.State,
})
} else {
resourceObject.Resource = c.ResourceProcessing(resourceObject.Resource, namespace)
rsYaml, _ := ObjectToJSONORYaml("yaml", resourceObject.Resource)
resourceList = append(resourceList, &dbmodel.K8sResource{
AppID: appID,
@ -333,5 +335,15 @@ func (c *clusterAction) ResourceProcessing(unstructuredObj *unstructured.Unstruc
unstructuredMap, _ := runtime.DefaultUnstructuredConverter.ToUnstructured(&crb)
unstructuredObj.Object = unstructuredMap
}
if unstructuredObj.GetKind() == model.Service {
var service corev1.Service
serviceJSON, _ := json.Marshal(unstructuredObj)
_ = json.Unmarshal(serviceJSON, &service)
service.Spec.ClusterIP = ""
service.Spec.ClusterIPs = nil
unstructuredMap, _ := runtime.DefaultUnstructuredConverter.ToUnstructured(&service)
unstructuredObj.Object = unstructuredMap
return unstructuredObj
}
return unstructuredObj
}