mirror of
https://github.com/portainer/portainer.git
synced 2025-07-22 23:09:41 +02:00
* feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * feat(helm): list and configure helm chart (#5431) * backport and tidyup code * --amend * using rocket icon for charts * helm chart bugfix - clear category button * added matomo analytics for helm chart install * fix web editor exit warning without changes * editor modified exit bugfix * fixed notifications typo * updated helm template text * helper text to convey slow helm templates load Co-authored-by: zees-dev <dev.786zshan@gmail.com> * removing redundant time-consuming api call by using prop attribute * feat(helm) helm chart backport from ee EE-1311 (#5436) * Add missing defaultHelmRepoUrl and mock testing * Backport EE-1477 * Backport updates to helm tests from EE * add https by default changes and ssl to tls renaming from EE * Port install integration test. Disabled by default to pass CI checks * merged changes from EE for the integration test * kube proxy whitelist updated to support internal helm install command Co-authored-by: zees-dev <dev.786zshan@gmail.com> * Pull in all changes from tech review in EE-943 * added helm to sidebar after rebase, sync CE with EE * bugfix: kubectl shell not opening - bearer token bug * tidy go modules & remove yarn-error.log * removed redundant handler (not used) - to match EE * resolved merge conflicts, updated code * feat(helm/views): helm release and application views EE-1236 (#5529) * feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * Pull in all changes from tech review in EE-943 * added helm to sidebar after rebase, sync CE with EE * removed redundant handler (not used) - to match EE * feat(helm) display helm charts - backend EE-1236 * copy over components for new applications view EE-1236 * Add new applications datatable component * Add more migrated files * removed test not applicable to CE * baclkported EE app data table code to CE * removed redundant helm repo url * resolved conflicts, updated code * using endpoint middleware * PR review fixes * using constants, openapi updated Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Co-authored-by: zees-dev <dev.786zshan@gmail.com> * fixed test conflicts, go linted * feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514) * feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * feat(helm) helm chart backport from ee EE-1311 (#5436) * Add missing defaultHelmRepoUrl and mock testing * Backport EE-1477 * Backport updates to helm tests from EE * add https by default changes and ssl to tls renaming from EE * Port install integration test. Disabled by default to pass CI checks * merged changes from EE for the integration test * kube proxy whitelist updated to support internal helm install command Co-authored-by: zees-dev <dev.786zshan@gmail.com> * Pull in all changes from tech review in EE-943 * feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * Pull in all changes from tech review in EE-943 * added helm to sidebar after rebase, sync CE with EE * backport EE-1278, squashed, diffed, updated * helm install openapi spec update * resolved conflicts, updated code * - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019 - helm install using endpoint middleware - remove trailing slash from added/persisted helm repo urls * feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561) * feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567) * feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 * post review changes and further backported changes from EE * resolved conflicts, updated code * fixed helm_install handler unit test * user cannot add existing repo if suffix is '/' (#5571) * feat(helm/docs) fix broken swagger docs EE-1278 (#5572) * Fix swagger docs * minor correction * fix(helm): migrating code from user handler to helm handler (#5573) * - migrated user_helm_repos to helm endpoint handler - migrated api operations from user factory/service to helm factory/service - passing endpointId into helm service/factory as endpoint provider is deprecated * upgrade libhelm to hide secrets Co-authored-by: Matt Hook <hookenz@gmail.com> * removed duplicate file - due to merge conflict * dependency injection in helm factory Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Co-authored-by: Matt Hook <hookenz@gmail.com> * kubernetes.templates -> kubernetes.templates.helm name conflict fix * Validate the URL added as a public helm repo (#5579) * fix(helm): helm app deletion fix EE-1581 (#5582) * updated helm lib to show correct error on uninstall failure * passing down helm app namespace on deletion * fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590) Co-authored-by: Simon Meng <simon.meng@portainer.io> * fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585) * - trim trailing slash and lowercase before persisting helm repo - browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm - fix publish url - fix helm repo add refresh - semi-fix k8s app expansion * Tidy up swagger documentation related to helm. Make json consistent * fixed helm release page for non-default namespaces * k8s app view table expansion bugfix * EE-1593: publish url load balancer fallback Co-authored-by: Matt Hook <hookenz@gmail.com> * k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599) * fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600) * k8s app secrets key value text overflow ellipses * wrapping key value pairs instead of ellipses * fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602) * helm apps bundling issue across different namespaces * - code comments and indentation to ease reading - moved namespace calc out of loop * feat(helm/test) disable slow helm search test by default EE-1599 (#5598) * skip helm_repo_search as it's an integration test * switch to portainer built in integration test checker * make module order match EE * don't print test struct out when skipping integration test Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Co-authored-by: Matt Hook <hookenz@gmail.com> Co-authored-by: cong meng <mcpacino@gmail.com> Co-authored-by: Simon Meng <simon.meng@portainer.io>
212 lines
7.6 KiB
Go
212 lines
7.6 KiB
Go
package settings
|
|
|
|
import (
|
|
"net/http"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/asaskevich/govalidator"
|
|
"github.com/pkg/errors"
|
|
"github.com/portainer/libhelm"
|
|
httperror "github.com/portainer/libhttp/error"
|
|
"github.com/portainer/libhttp/request"
|
|
"github.com/portainer/libhttp/response"
|
|
portainer "github.com/portainer/portainer/api"
|
|
"github.com/portainer/portainer/api/filesystem"
|
|
)
|
|
|
|
type settingsUpdatePayload struct {
|
|
// URL to a logo that will be displayed on the login page as well as on top of the sidebar. Will use default Portainer logo when value is empty string
|
|
LogoURL *string `example:"https://mycompany.mydomain.tld/logo.png"`
|
|
// A list of label name & value that will be used to hide containers when querying containers
|
|
BlackListedLabels []portainer.Pair
|
|
// Active authentication method for the Portainer instance. Valid values are: 1 for internal, 2 for LDAP, or 3 for oauth
|
|
AuthenticationMethod *int `example:"1"`
|
|
LDAPSettings *portainer.LDAPSettings `example:""`
|
|
OAuthSettings *portainer.OAuthSettings `example:""`
|
|
// The interval in which endpoint snapshots are created
|
|
SnapshotInterval *string `example:"5m"`
|
|
// URL to the templates that will be displayed in the UI when navigating to App Templates
|
|
TemplatesURL *string `example:"https://raw.githubusercontent.com/portainer/templates/master/templates.json"`
|
|
// The default check in interval for edge agent (in seconds)
|
|
EdgeAgentCheckinInterval *int `example:"5"`
|
|
// Whether edge compute features are enabled
|
|
EnableEdgeComputeFeatures *bool `example:"true"`
|
|
// The duration of a user session
|
|
UserSessionTimeout *string `example:"5m"`
|
|
// The expiry of a Kubeconfig
|
|
KubeconfigExpiry *string `example:"24h" default:"0"`
|
|
// Whether telemetry is enabled
|
|
EnableTelemetry *bool `example:"false"`
|
|
// Helm repository URL
|
|
HelmRepositoryURL *string `example:"https://charts.bitnami.com/bitnami"`
|
|
}
|
|
|
|
func (payload *settingsUpdatePayload) Validate(r *http.Request) error {
|
|
if payload.AuthenticationMethod != nil && *payload.AuthenticationMethod != 1 && *payload.AuthenticationMethod != 2 && *payload.AuthenticationMethod != 3 {
|
|
return errors.New("Invalid authentication method value. Value must be one of: 1 (internal), 2 (LDAP/AD) or 3 (OAuth)")
|
|
}
|
|
if payload.LogoURL != nil && *payload.LogoURL != "" && !govalidator.IsURL(*payload.LogoURL) {
|
|
return errors.New("Invalid logo URL. Must correspond to a valid URL format")
|
|
}
|
|
if payload.TemplatesURL != nil && *payload.TemplatesURL != "" && !govalidator.IsURL(*payload.TemplatesURL) {
|
|
return errors.New("Invalid external templates URL. Must correspond to a valid URL format")
|
|
}
|
|
if payload.HelmRepositoryURL != nil && *payload.HelmRepositoryURL != "" {
|
|
err := libhelm.ValidateHelmRepositoryURL(*payload.HelmRepositoryURL)
|
|
if err != nil {
|
|
return errors.Wrap(err, "Invalid Helm repository URL. Must correspond to a valid URL format")
|
|
}
|
|
}
|
|
if payload.UserSessionTimeout != nil {
|
|
_, err := time.ParseDuration(*payload.UserSessionTimeout)
|
|
if err != nil {
|
|
return errors.New("Invalid user session timeout")
|
|
}
|
|
}
|
|
if payload.KubeconfigExpiry != nil {
|
|
_, err := time.ParseDuration(*payload.KubeconfigExpiry)
|
|
if err != nil {
|
|
return errors.New("Invalid Kubeconfig Expiry")
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// @id SettingsUpdate
|
|
// @summary Update Portainer settings
|
|
// @description Update Portainer settings.
|
|
// @description **Access policy**: administrator
|
|
// @tags settings
|
|
// @security jwt
|
|
// @accept json
|
|
// @produce json
|
|
// @param body body settingsUpdatePayload true "New settings"
|
|
// @success 200 {object} portainer.Settings "Success"
|
|
// @failure 400 "Invalid request"
|
|
// @failure 500 "Server error"
|
|
// @router /settings [put]
|
|
func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError {
|
|
var payload settingsUpdatePayload
|
|
err := request.DecodeAndValidateJSONPayload(r, &payload)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err}
|
|
}
|
|
|
|
settings, err := handler.DataStore.Settings().Settings()
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve the settings from the database", err}
|
|
}
|
|
|
|
if payload.AuthenticationMethod != nil {
|
|
settings.AuthenticationMethod = portainer.AuthenticationMethod(*payload.AuthenticationMethod)
|
|
}
|
|
|
|
if payload.LogoURL != nil {
|
|
settings.LogoURL = *payload.LogoURL
|
|
}
|
|
|
|
if payload.TemplatesURL != nil {
|
|
settings.TemplatesURL = *payload.TemplatesURL
|
|
}
|
|
|
|
if payload.HelmRepositoryURL != nil {
|
|
settings.HelmRepositoryURL = strings.TrimSuffix(strings.ToLower(*payload.HelmRepositoryURL), "/")
|
|
}
|
|
|
|
if payload.BlackListedLabels != nil {
|
|
settings.BlackListedLabels = payload.BlackListedLabels
|
|
}
|
|
|
|
if payload.LDAPSettings != nil {
|
|
ldapReaderDN := settings.LDAPSettings.ReaderDN
|
|
ldapPassword := settings.LDAPSettings.Password
|
|
if payload.LDAPSettings.ReaderDN != "" {
|
|
ldapReaderDN = payload.LDAPSettings.ReaderDN
|
|
}
|
|
if payload.LDAPSettings.Password != "" {
|
|
ldapPassword = payload.LDAPSettings.Password
|
|
}
|
|
settings.LDAPSettings = *payload.LDAPSettings
|
|
settings.LDAPSettings.ReaderDN = ldapReaderDN
|
|
settings.LDAPSettings.Password = ldapPassword
|
|
}
|
|
|
|
if payload.OAuthSettings != nil {
|
|
clientSecret := payload.OAuthSettings.ClientSecret
|
|
if clientSecret == "" {
|
|
clientSecret = settings.OAuthSettings.ClientSecret
|
|
}
|
|
settings.OAuthSettings = *payload.OAuthSettings
|
|
settings.OAuthSettings.ClientSecret = clientSecret
|
|
}
|
|
|
|
if payload.EnableEdgeComputeFeatures != nil {
|
|
settings.EnableEdgeComputeFeatures = *payload.EnableEdgeComputeFeatures
|
|
}
|
|
|
|
if payload.SnapshotInterval != nil && *payload.SnapshotInterval != settings.SnapshotInterval {
|
|
err := handler.updateSnapshotInterval(settings, *payload.SnapshotInterval)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to update snapshot interval", err}
|
|
}
|
|
}
|
|
|
|
if payload.EdgeAgentCheckinInterval != nil {
|
|
settings.EdgeAgentCheckinInterval = *payload.EdgeAgentCheckinInterval
|
|
}
|
|
|
|
if payload.KubeconfigExpiry != nil {
|
|
settings.KubeconfigExpiry = *payload.KubeconfigExpiry
|
|
}
|
|
|
|
if payload.UserSessionTimeout != nil {
|
|
settings.UserSessionTimeout = *payload.UserSessionTimeout
|
|
|
|
userSessionDuration, _ := time.ParseDuration(*payload.UserSessionTimeout)
|
|
|
|
handler.JWTService.SetUserSessionDuration(userSessionDuration)
|
|
}
|
|
|
|
if payload.EnableTelemetry != nil {
|
|
settings.EnableTelemetry = *payload.EnableTelemetry
|
|
}
|
|
|
|
tlsError := handler.updateTLS(settings)
|
|
if tlsError != nil {
|
|
return tlsError
|
|
}
|
|
|
|
err = handler.DataStore.Settings().UpdateSettings(settings)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist settings changes inside the database", err}
|
|
}
|
|
|
|
return response.JSON(w, settings)
|
|
}
|
|
|
|
func (handler *Handler) updateSnapshotInterval(settings *portainer.Settings, snapshotInterval string) error {
|
|
settings.SnapshotInterval = snapshotInterval
|
|
|
|
err := handler.SnapshotService.SetSnapshotInterval(snapshotInterval)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (handler *Handler) updateTLS(settings *portainer.Settings) *httperror.HandlerError {
|
|
if (settings.LDAPSettings.TLSConfig.TLS || settings.LDAPSettings.StartTLS) && !settings.LDAPSettings.TLSConfig.TLSSkipVerify {
|
|
caCertPath, _ := handler.FileService.GetPathForTLSFile(filesystem.LDAPStorePath, portainer.TLSFileCA)
|
|
settings.LDAPSettings.TLSConfig.TLSCACertPath = caCertPath
|
|
} else {
|
|
settings.LDAPSettings.TLSConfig.TLSCACertPath = ""
|
|
err := handler.FileService.DeleteTLSFiles(filesystem.LDAPStorePath)
|
|
if err != nil {
|
|
return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove TLS files from disk", err}
|
|
}
|
|
}
|
|
return nil
|
|
}
|