Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix delete k8s env bug #3237

Merged
merged 2 commits into from
Dec 8, 2023
Merged

fix delete k8s env bug #3237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ce10ae
fix delete k8s env bug
PetrusZ Dec 8, 2023
5651657
rename default_gateway_ip filed
PetrusZ Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
*.o
*.a
*.so
*.exe

# Folders
.idea
Expand Down
15 changes: 6 additions & 9 deletions pkg/microservice/aslan/core/environment/service/environment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,15 +1960,16 @@ func DeleteProduct(username, envName, productName, requestID string, isDelete bo
notify.SendMessage(username, title, content, requestID, log)
}
}()

err = commonrepo.NewProductColl().Delete(envName, productName)
if err != nil {
log.Errorf("Product.Delete error: %v", err)
}
if productInfo.Production {
err = commonrepo.NewProductColl().Delete(envName, productName)
if err != nil {
log.Errorf("Product.Delete error: %v", err)
}
return
}
if isDelete {

if isDelete {
svcNames := make([]string, 0)
for svcName := range productInfo.GetServiceMap() {
svcNames = append(svcNames, svcName)
Expand Down Expand Up @@ -2000,10 +2001,6 @@ func DeleteProduct(username, envName, productName, requestID string, isDelete bo
return
}
}
err = commonrepo.NewProductColl().Delete(envName, productName)
if err != nil {
log.Errorf("Product.Delete error: %v", err)
}
}()
}

Expand Down
6 changes: 3 additions & 3 deletions pkg/microservice/aslan/core/environment/service/share_env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1354,8 +1354,8 @@ func CheckServicesDeployedInSubEnvs(ctx context.Context, productName, envName st
}

type GetPortalServiceResponse struct {
DefaultGatewayIP string `json:"default_gateway_ip"`
Servers []SetupPortalServiceRequest `json:"servers"`
DefaultGatewayAddress string `json:"default_gateway_address"`
Servers []SetupPortalServiceRequest `json:"servers"`
}

func GetPortalService(ctx context.Context, productName, envName, serviceName string) (GetPortalServiceResponse, error) {
Expand Down Expand Up @@ -1397,7 +1397,7 @@ func GetPortalService(ctx context.Context, productName, envName, serviceName str
return resp, e.ErrGetPortalService.AddDesc("istio default gateway's lb doesn't have ip address")
}
for _, ing := range gatewaySvc.Status.LoadBalancer.Ingress {
resp.DefaultGatewayIP = ing.IP
resp.DefaultGatewayAddress = ing.IP
}

gwObj, err := istioClient.NetworkingV1alpha3().Gateways(ns).Get(ctx, gatewayName, metav1.GetOptions{})
Expand Down
52 changes: 51 additions & 1 deletion pkg/microservice/aslan/server/rest/doc/docs.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

52 changes: 51 additions & 1 deletion pkg/microservice/aslan/server/rest/doc/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4833,6 +4833,13 @@
"registry_id": {
"type": "string"
},
"related_envs": {
"description": "New Since v2.1.0",
"type": "array",
"items": {
"$ref": "#/definitions/service.SharedNSEnvs"
}
},
"render": {
"$ref": "#/definitions/models.RenderInfo"
},
Expand Down Expand Up @@ -5691,6 +5698,12 @@
}
]
},
"resources": {
"type": "array",
"items": {
"$ref": "#/definitions/models.ServiceResource"
}
},
"revision": {
"type": "integer"
},
Expand Down Expand Up @@ -6150,6 +6163,23 @@
"value": {}
}
},
"models.ServiceResource": {
"type": "object",
"properties": {
"group": {
"type": "string"
},
"kind": {
"type": "string"
},
"name": {
"type": "string"
},
"version": {
"type": "string"
}
}
},
"models.WebHookType": {
"type": "string",
"enum": [
Expand Down Expand Up @@ -6894,7 +6924,7 @@
"service.GetPortalServiceResponse": {
"type": "object",
"properties": {
"default_gateway_ip": {
"default_gateway_address": {
"type": "string"
},
"servers": {
Expand Down Expand Up @@ -7502,6 +7532,12 @@
}
]
},
"resources": {
"type": "array",
"items": {
"$ref": "#/definitions/models.ServiceResource"
}
},
"revision": {
"type": "integer"
},
Expand Down Expand Up @@ -7781,6 +7817,20 @@
}
}
},
"service.SharedNSEnvs": {
"type": "object",
"properties": {
"env_name": {
"type": "string"
},
"production": {
"type": "boolean"
},
"project_name": {
"type": "string"
}
}
},
"service.SvcDiffResult": {
"type": "object",
"properties": {
Expand Down
35 changes: 34 additions & 1 deletion pkg/microservice/aslan/server/rest/doc/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ definitions:
type: integer
registry_id:
type: string
related_envs:
description: New Since v2.1.0
items:
$ref: '#/definitions/service.SharedNSEnvs'
type: array
render:
$ref: '#/definitions/models.RenderInfo'
services:
Expand Down Expand Up @@ -673,6 +678,10 @@ definitions:
allOf:
- $ref: '#/definitions/template.ServiceRender'
description: New since 1.9.0 used to replace service renders in render_set
resources:
items:
$ref: '#/definitions/models.ServiceResource'
type: array
revision:
type: integer
service_name:
Expand Down Expand Up @@ -992,6 +1001,17 @@ definitions:
$ref: '#/definitions/models.ParameterSettingType'
value: {}
type: object
models.ServiceResource:
properties:
group:
type: string
kind:
type: string
name:
type: string
version:
type: string
type: object
models.WebHookType:
enum:
- feishu
Expand Down Expand Up @@ -1502,7 +1522,7 @@ definitions:
type: object
service.GetPortalServiceResponse:
properties:
default_gateway_ip:
default_gateway_address:
type: string
servers:
items:
Expand Down Expand Up @@ -1897,6 +1917,10 @@ definitions:
allOf:
- $ref: '#/definitions/template.ServiceRender'
description: New since 1.9.0 used to replace service renders in render_set
resources:
items:
$ref: '#/definitions/models.ServiceResource'
type: array
revision:
type: integer
service_name:
Expand Down Expand Up @@ -2082,6 +2106,15 @@ definitions:
port_protocol:
type: string
type: object
service.SharedNSEnvs:
properties:
env_name:
type: string
production:
type: boolean
project_name:
type: string
type: object
service.SvcDiffResult:
properties:
chart_name:
Expand Down
Loading