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

20240523 release to develop back merge #511

Merged
merged 28 commits into from
May 23, 2024
Merged

20240523 release to develop back merge #511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
b5cb7f0
Merge pull request #493 from openinfradev/develop
ktkfree May 17, 2024
4242cf0
Merge pull request #496 from openinfradev/develop
ktkfree May 21, 2024
16e9faf
trivial. update validation rule for user & organization
ktkfree May 21, 2024
7b8a304
trivial. add validation rule when organization creating
ktkfree May 21, 2024
73bb151
Merge pull request #497 from openinfradev/minor_fix
ktkfree May 21, 2024
505e7e9
trivial. fix user filter for organizations
ktkfree May 21, 2024
419a724
Merge pull request #499 from openinfradev/minor_fix
ktkfree May 21, 2024
3e417da
Merge pull request #500 from openinfradev/develop
ktkfree May 21, 2024
a3be5c5
bugfix. TKS관리자 생성시 발생하는 502 에러 수정
cho4036 May 22, 2024
a4ba3b9
bugfix. TKS관리자 생성시 비밀번호 임시화
cho4036 May 22, 2024
3d0a42d
Merge pull request #501 from cho4036/release
seungkyua May 22, 2024
961f9fc
trivial. change alarm name to warning from audit
ktkfree May 22, 2024
1e6ee1c
Merge pull request #502 from openinfradev/snr_policy
cho4036 May 22, 2024
2d809ca
trivial. change snr policy type
ktkfree May 22, 2024
fb7286e
Merge pull request #503 from openinfradev/snr_policy
ktkfree May 22, 2024
bee0b5a
bugfix. make kubeconfig lowercase
cho4036 May 23, 2024
bc7860d
change kubeConfig / kube-config -> kubeconfig
cho4036 May 23, 2024
b3a5a73
trivial.
cho4036 May 23, 2024
91546b9
Merge pull request #505 from cho4036/release
ktkfree May 23, 2024
892f96e
Merge pull request #506 from openinfradev/develop
ktkfree May 23, 2024
a42ed8e
trivial. add debug log
ktkfree May 23, 2024
886c7a5
Merge pull request #507 from openinfradev/add_debug
ktkfree May 23, 2024
d2c825c
feature. fix bug - policy violation
ktkfree May 23, 2024
a723173
Merge pull request #508 from openinfradev/add_debug
cho4036 May 23, 2024
f4e3a1f
trivial. fix error for policyViolationTop5
ktkfree May 23, 2024
bff70db
Merge pull request #509 from openinfradev/add_debug
ktkfree May 23, 2024
ede08c0
trivial. fix error code for thanosclient
ktkfree May 23, 2024
cd0d093
Merge pull request #510 from openinfradev/add_debug
cho4036 May 23, 2024
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
119 changes: 107 additions & 12 deletions api/swagger/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6622,7 +6622,7 @@ const docTemplate = `{
}
}
},
"/organizations/{organizationId}/projects/{projectId}/kube-config": {
"/organizations/{organizationId}/projects/{projectId}/kubeconfig": {
"get": {
"security": [
{
Expand Down Expand Up @@ -7463,7 +7463,7 @@ const docTemplate = `{
}
}
},
"/organizations/{organizationId}/projects/{projectId}/namespaces/{projectNamespace}/stacks/{stackId}/kube-config": {
"/organizations/{organizationId}/projects/{projectId}/namespaces/{projectNamespace}/stacks/{stackId}/kubeconfig": {
"get": {
"security": [
{
Expand Down Expand Up @@ -7515,7 +7515,7 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/github_com_openinfradev_tks-api_pkg_domain.GetProjectNamespaceKubeConfigResponse"
"$ref": "#/definitions/github_com_openinfradev_tks-api_pkg_domain.GetProjectNamespaceKubeconfigResponse"
}
}
}
Expand Down Expand Up @@ -8614,7 +8614,7 @@ const docTemplate = `{
"JWT": []
}
],
"description": "Get KubeConfig by stack",
"description": "Get Kubeconfig by stack",
"consumes": [
"application/json"
],
Expand All @@ -8624,7 +8624,7 @@ const docTemplate = `{
"tags": [
"Stacks"
],
"summary": "Get KubeConfig by stack",
"summary": "Get Kubeconfig by stack",
"parameters": [
{
"type": "string",
Expand All @@ -8645,7 +8645,7 @@ const docTemplate = `{
"200": {
"description": "OK",
"schema": {
"$ref": "#/definitions/github_com_openinfradev_tks-api_pkg_domain.GetStackKubeConfigResponse"
"$ref": "#/definitions/github_com_openinfradev_tks-api_pkg_domain.GetStackKubeconfigResponse"
}
}
}
Expand Down Expand Up @@ -11668,7 +11668,9 @@ const docTemplate = `{
],
"properties": {
"adminAccountId": {
"type": "string"
"type": "string",
"maxLength": 20,
"minLength": 0
},
"adminEmail": {
"type": "string"
Expand Down Expand Up @@ -11769,6 +11771,10 @@ const docTemplate = `{
"templateName"
],
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"deprecated": {
"type": "boolean",
"example": false
Expand Down Expand Up @@ -11815,6 +11821,15 @@ const docTemplate = `{
],
"example": "medium"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"templateName": {
"type": "string",
"example": "필수 Label 검사"
Expand All @@ -11830,6 +11845,10 @@ const docTemplate = `{
"versionUpType"
],
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"currentVersion": {
"type": "string",
"example": "v1.0.0"
Expand Down Expand Up @@ -11857,6 +11876,15 @@ const docTemplate = `{
"type": "string",
"example": "rego 코드"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"versionUpType": {
"type": "string",
"enum": [
Expand Down Expand Up @@ -12193,7 +12221,9 @@ const docTemplate = `{
],
"properties": {
"accountId": {
"type": "string"
"type": "string",
"maxLength": 20,
"minLength": 0
},
"department": {
"type": "string",
Expand Down Expand Up @@ -13140,10 +13170,10 @@ const docTemplate = `{
}
}
},
"github_com_openinfradev_tks-api_pkg_domain.GetProjectNamespaceKubeConfigResponse": {
"github_com_openinfradev_tks-api_pkg_domain.GetProjectNamespaceKubeconfigResponse": {
"type": "object",
"properties": {
"kubeConfig": {
"kubeconfig": {
"type": "string"
}
}
Expand Down Expand Up @@ -13216,10 +13246,10 @@ const docTemplate = `{
}
}
},
"github_com_openinfradev_tks-api_pkg_domain.GetStackKubeConfigResponse": {
"github_com_openinfradev_tks-api_pkg_domain.GetStackKubeconfigResponse": {
"type": "object",
"properties": {
"kubeConfig": {
"kubeconfig": {
"type": "string"
}
}
Expand Down Expand Up @@ -14200,6 +14230,10 @@ const docTemplate = `{
"github_com_openinfradev_tks-api_pkg_domain.PolicyTemplateResponse": {
"type": "object",
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"createdAt": {
"type": "string"
},
Expand Down Expand Up @@ -14250,6 +14284,15 @@ const docTemplate = `{
],
"example": "medium"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"templateName": {
"type": "string",
"example": "필수 Label 검사"
Expand Down Expand Up @@ -14291,6 +14334,10 @@ const docTemplate = `{
"github_com_openinfradev_tks-api_pkg_domain.PolicyTemplateTwoVersionResponse": {
"type": "object",
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"createdAt": {
"type": "string"
},
Expand Down Expand Up @@ -14349,6 +14396,15 @@ const docTemplate = `{
],
"example": "medium"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"templateName": {
"type": "string",
"example": "필수 Label 검사"
Expand Down Expand Up @@ -16463,6 +16519,10 @@ const docTemplate = `{
"templateName"
],
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"deprecated": {
"type": "boolean",
"example": false
Expand Down Expand Up @@ -16509,6 +16569,15 @@ const docTemplate = `{
],
"example": "medium"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"templateName": {
"type": "string",
"example": "필수 Label 검사"
Expand All @@ -16524,6 +16593,10 @@ const docTemplate = `{
"versionUpType"
],
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"currentVersion": {
"type": "string",
"example": "v1.0.0"
Expand Down Expand Up @@ -16551,6 +16624,15 @@ const docTemplate = `{
"type": "string",
"example": "rego 코드"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"versionUpType": {
"type": "string",
"enum": [
Expand Down Expand Up @@ -16704,6 +16786,10 @@ const docTemplate = `{
"github_com_openinfradev_tks-api_pkg_domain_admin.PolicyTemplateResponse": {
"type": "object",
"properties": {
"SyncJson": {
"type": "string",
"example": "[[]]"
},
"createdAt": {
"type": "string"
},
Expand Down Expand Up @@ -16760,6 +16846,15 @@ const docTemplate = `{
],
"example": "medium"
},
"syncKinds": {
"type": "array",
"items": {
"type": "string"
},
"example": [
"Ingress"
]
},
"templateName": {
"type": "string",
"example": "필수 Label 검사"
Expand Down
Loading
Loading