mirror of
https://github.com/portainer/portainer.git
synced 2025-08-09 07:45:22 +02:00
Revert multiple commits to set it back to tag 2.19 (#10946)
* Revert "docs(dashboard): update link for swarm node [EE-6318] (#10770)" This reverts commit30356d2c15
. * Revert "docs(api): default to pascal case for property name [EE-6471] (#10861)" This reverts commit392819576c
. * Revert "fix(edge/jobs): clear logs [EE-5923] (#10819)" This reverts commite01386f63d
. * Revert "disable html5 validation (#10843)" This reverts commit4b0f08e92a
. * Revert "fix(edgestack): allow to set retry deployment toggle EE-6167 (#10676) (#10805)" This reverts commiteee632b22d
. * Revert "fix(stack): edit git stack validation (#10812)" This reverts commitd3b150b29c
. * Revert "Revert "Revert "fix(rollback): reversed rollback code from 2.19.4 [EE-6435] (#10811)" (#10832)" This reverts commit32e05bb705
. * Revert "fix(setting/ssl): cert files are optional to upload [EE-6139] (#10779)" This reverts commit7408668dbb
. * Revert "fix(endpoint): delete the endpoint proxy when updating an endpoint address [EE-5577] (#10824)" This reverts commit4b5ea01456
. * Revert "fix(swagger): custom template create docs EE-6428 (#10806)" This reverts commit0d55cb3e08
. * Revert "fix(images): sort by tags [EE-6410] (#10755)" This reverts commit7f51c727a0
. * Revert "fix(stacks): sort by date [EE-5766] (#10758)" This reverts commit57b80cd9ac
. * Revert "fix(UI): remember backup settings tab [EE-6347] (#10764)" This reverts commitc20452492d
. * Revert "fix(backup ui): minor typo on backup page EE-6348 (#10717)" This reverts commitd58046eb68
. * Revert "fix(app): shift external to the top [EE-6392] (#10753) (#10802)" This reverts commit4795e85d18
. * Revert "fix(app): update sliders when limits are known [EE-5933] (#10769) (#10801)" This reverts commitd090b0043a
. * Revert "fix(gitops): correct commit hash link [EE-6346] (#10800)" This reverts commit0e59cf76ec
. * Revert "fix toast error (#10804)" This reverts commit9978b88ed4
. * Revert "fix(kube): configmaps and secrets from envFrom in the app detail screen [EE-6282] (#10741) (#10798)" This reverts commitc1a01558d0
. * Revert "fix(stacks): allow editing custom templates before stack deployment EE-6380 (#10713)" This reverts commitf0aa0554f8
. * Reapply "fix(rollback): reversed rollback code from 2.19.4 [EE-6435] (#10811) This reverts commitc58fa274e7
.
This commit is contained in:
parent
d2eb53eb18
commit
6f5d9c357f
29 changed files with 213 additions and 331 deletions
|
@ -149,7 +149,7 @@ func isValidNote(note string) bool {
|
|||
// @success 200 {object} portainer.CustomTemplate
|
||||
// @failure 400 "Invalid request"
|
||||
// @failure 500 "Server error"
|
||||
// @router /custom_templates/create/string [post]
|
||||
// @router /custom_templates/string [post]
|
||||
func (handler *Handler) createCustomTemplateFromFileContent(r *http.Request) (*portainer.CustomTemplate, error) {
|
||||
var payload customTemplateFromFileContentPayload
|
||||
err := request.DecodeAndValidateJSONPayload(r, &payload)
|
||||
|
@ -263,7 +263,7 @@ func (payload *customTemplateFromGitRepositoryPayload) Validate(r *http.Request)
|
|||
// @success 200 {object} portainer.CustomTemplate
|
||||
// @failure 400 "Invalid request"
|
||||
// @failure 500 "Server error"
|
||||
// @router /custom_templates/create/repository [post]
|
||||
// @router /custom_templates/repository [post]
|
||||
func (handler *Handler) createCustomTemplateFromGitRepository(r *http.Request) (*portainer.CustomTemplate, error) {
|
||||
var payload customTemplateFromGitRepositoryPayload
|
||||
err := request.DecodeAndValidateJSONPayload(r, &payload)
|
||||
|
@ -443,7 +443,7 @@ func (payload *customTemplateFromFileUploadPayload) Validate(r *http.Request) er
|
|||
// @success 200 {object} portainer.CustomTemplate
|
||||
// @failure 400 "Invalid request"
|
||||
// @failure 500 "Server error"
|
||||
// @router /custom_templates/create/file [post]
|
||||
// @router /custom_templates/file [post]
|
||||
func (handler *Handler) createCustomTemplateFromFileUpload(r *http.Request) (*portainer.CustomTemplate, error) {
|
||||
payload := &customTemplateFromFileUploadPayload{}
|
||||
err := payload.Validate(r)
|
||||
|
|
|
@ -110,6 +110,11 @@ func (handler *Handler) clearEdgeJobTaskLogs(tx dataservices.DataStoreTx, edgeJo
|
|||
return httperror.InternalServerError("Unable to persist Edge job changes in the database", err)
|
||||
}
|
||||
|
||||
err = handler.FileService.ClearEdgeJobTaskLogs(strconv.Itoa(int(edgeJobID)), strconv.Itoa(int(endpointID)))
|
||||
if err != nil {
|
||||
return httperror.InternalServerError("Unable to clear log file from disk", err)
|
||||
}
|
||||
|
||||
endpoint, err := tx.Endpoint().Endpoint(endpointID)
|
||||
if err != nil {
|
||||
return httperror.NotFound("Unable to retrieve environment from the database", err)
|
||||
|
|
|
@ -89,8 +89,6 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) *
|
|||
return httperror.InternalServerError("Unable to find an environment with the specified identifier inside the database", err)
|
||||
}
|
||||
|
||||
updateEndpointProxy := shouldReloadTLSConfiguration(endpoint, &payload)
|
||||
|
||||
if payload.Name != nil {
|
||||
name := *payload.Name
|
||||
isUnique, err := handler.isNameUnique(name, endpoint.ID)
|
||||
|
@ -106,9 +104,8 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) *
|
|||
|
||||
}
|
||||
|
||||
if payload.URL != nil && *payload.URL != endpoint.URL {
|
||||
if payload.URL != nil {
|
||||
endpoint.URL = *payload.URL
|
||||
updateEndpointProxy = true
|
||||
}
|
||||
|
||||
if payload.PublicURL != nil {
|
||||
|
@ -182,8 +179,6 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) *
|
|||
}
|
||||
|
||||
if endpoint.Type == portainer.AzureEnvironment {
|
||||
updateEndpointProxy = true
|
||||
|
||||
credentials := endpoint.AzureCredentials
|
||||
if payload.AzureApplicationID != nil {
|
||||
credentials.ApplicationID = *payload.AzureApplicationID
|
||||
|
@ -252,7 +247,10 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) *
|
|||
}
|
||||
}
|
||||
|
||||
if updateEndpointProxy {
|
||||
if (payload.URL != nil && *payload.URL != endpoint.URL) ||
|
||||
(payload.TLS != nil && endpoint.TLSConfig.TLS != *payload.TLS) ||
|
||||
endpoint.Type == portainer.AzureEnvironment ||
|
||||
shouldReloadTLSConfiguration(endpoint, &payload) {
|
||||
handler.ProxyManager.DeleteEndpointProxy(endpoint.ID)
|
||||
_, err = handler.ProxyManager.CreateAndRegisterEndpointProxy(endpoint)
|
||||
if err != nil {
|
||||
|
@ -293,12 +291,6 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) *
|
|||
}
|
||||
|
||||
func shouldReloadTLSConfiguration(endpoint *portainer.Endpoint, payload *endpointUpdatePayload) bool {
|
||||
|
||||
// If we change anything in the tls config then we need to reload the proxy
|
||||
if payload.TLS != nil && endpoint.TLSConfig.TLS != *payload.TLS {
|
||||
return true
|
||||
}
|
||||
|
||||
// When updating Docker API environment, as long as TLS is true and TLSSkipVerify is false,
|
||||
// we assume that new TLS files have been uploaded and we need to reload the TLS configuration.
|
||||
if endpoint.Type != portainer.DockerEnvironment ||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue