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

20231103 release to develop #195

Merged
merged 10 commits into from
Nov 3, 2023
Merged

20231103 release to develop #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
58fdd75
feature. add cluster type to GetClusterSiteValues
ktkfree Nov 1, 2023
883696a
Merge pull request #189 from openinfradev/add_cluster_type
cho4036 Nov 1, 2023
eb2d8fc
bugfix. remove test code
ktkfree Nov 1, 2023
8b196e9
Merge pull request #190 from openinfradev/add_cluster_type
cho4036 Nov 1, 2023
808e373
bugfix. change admin clutserId to tksadmin
ktkfree Nov 1, 2023
596b2fb
Merge pull request #191 from openinfradev/fix_import
intelliguy Nov 1, 2023
23d8cf5
feature. change clusterId ctksadmin from tksadmin
ktkfree Nov 2, 2023
1e5d1db
Merge pull request #192 from openinfradev/fix_import
intelliguy Nov 2, 2023
20763aa
feature. rollback to tks-admin
ktkfree Nov 3, 2023
78f1af0
Merge pull request #194 from openinfradev/fix_import_id
cho4036 Nov 3, 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
3 changes: 3 additions & 0 deletions api/swagger/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4650,6 +4650,9 @@ const docTemplate = `{
"clusterRegion": {
"type": "string"
},
"clusterType": {
"type": "string"
},
"sshKeyName": {
"type": "string"
},
Expand Down
3 changes: 3 additions & 0 deletions api/swagger/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4643,6 +4643,9 @@
"clusterRegion": {
"type": "string"
},
"clusterType": {
"type": "string"
},
"sshKeyName": {
"type": "string"
},
Expand Down
2 changes: 2 additions & 0 deletions api/swagger/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,8 @@ definitions:
type: integer
clusterRegion:
type: string
clusterType:
type: string
sshKeyName:
type: string
tksCpNode:
Expand Down
1 change: 0 additions & 1 deletion internal/delivery/http/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ func (h *ClusterHandler) ImportCluster(w http.ResponseWriter, r *http.Request) {
dto.Conf.SetDefault()
log.InfoWithContext(r.Context(), dto.Conf)

dto.CloudService = "AWS"
dto.CloudAccountId = uuid.Nil
clusterId, err := h.usecase.Import(r.Context(), dto)
if err != nil {
Expand Down
1 change: 1 addition & 0 deletions pkg/domain/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,7 @@ type SimpleClusterResponse struct {
}

type ClusterSiteValuesResponse struct {
ClusterType string `json:"clusterType"`
SshKeyName string `json:"sshKeyName"`
ClusterRegion string `json:"clusterRegion"`
TksCpNode int `json:"tksCpNode"`
Expand Down
Loading