mirror of https://github.com/portainer/portainer
feat(gitops): reword automatic update to gitops update for ui and docs (#9067)
parent
57fa044f2e
commit
2ac70b1eb6
|
@ -171,7 +171,7 @@ type composeStackFromGitRepositoryPayload struct {
|
||||||
ComposeFile string `example:"docker-compose.yml" default:"docker-compose.yml"`
|
ComposeFile string `example:"docker-compose.yml" default:"docker-compose.yml"`
|
||||||
// Applicable when deploying with multiple stack files
|
// Applicable when deploying with multiple stack files
|
||||||
AdditionalFiles []string `example:"[nz.compose.yml, uat.compose.yml]"`
|
AdditionalFiles []string `example:"[nz.compose.yml, uat.compose.yml]"`
|
||||||
// Optional auto update configuration
|
// Optional GitOps update configuration
|
||||||
AutoUpdate *portainer.AutoUpdateSettings
|
AutoUpdate *portainer.AutoUpdateSettings
|
||||||
// A list of environment variables used during stack deployment
|
// A list of environment variables used during stack deployment
|
||||||
Env []portainer.Pair
|
Env []portainer.Pair
|
||||||
|
|
|
@ -130,7 +130,7 @@ type swarmStackFromGitRepositoryPayload struct {
|
||||||
ComposeFile string `example:"docker-compose.yml" default:"docker-compose.yml"`
|
ComposeFile string `example:"docker-compose.yml" default:"docker-compose.yml"`
|
||||||
// Applicable when deploying with multiple stack files
|
// Applicable when deploying with multiple stack files
|
||||||
AdditionalFiles []string `example:"[nz.compose.yml, uat.compose.yml]"`
|
AdditionalFiles []string `example:"[nz.compose.yml, uat.compose.yml]"`
|
||||||
// Optional auto update configuration
|
// Optional GitOps update configuration
|
||||||
AutoUpdate *portainer.AutoUpdateSettings
|
AutoUpdate *portainer.AutoUpdateSettings
|
||||||
// TLSSkipVerify skips SSL verification when cloning the Git repository
|
// TLSSkipVerify skips SSL verification when cloning the Git repository
|
||||||
TLSSkipVerify bool `example:"false"`
|
TLSSkipVerify bool `example:"false"`
|
||||||
|
|
|
@ -1017,7 +1017,7 @@ type (
|
||||||
UpdatedBy string `example:"bob"`
|
UpdatedBy string `example:"bob"`
|
||||||
// Only applies when deploying stack with multiple files
|
// Only applies when deploying stack with multiple files
|
||||||
AdditionalFiles []string `json:"AdditionalFiles"`
|
AdditionalFiles []string `json:"AdditionalFiles"`
|
||||||
// The auto update settings of a git stack
|
// The GitOps update settings of a git stack
|
||||||
AutoUpdate *AutoUpdateSettings `json:"AutoUpdate"`
|
AutoUpdate *AutoUpdateSettings `json:"AutoUpdate"`
|
||||||
// The stack deployment option
|
// The stack deployment option
|
||||||
Option *StackOption `json:"Option"`
|
Option *StackOption `json:"Option"`
|
||||||
|
|
|
@ -17,7 +17,7 @@ type StackPayload struct {
|
||||||
Webhook string
|
Webhook string
|
||||||
// A list of environment(endpoint) variables used during stack deployment
|
// A list of environment(endpoint) variables used during stack deployment
|
||||||
Env []portainer.Pair
|
Env []portainer.Pair
|
||||||
// Optional auto update configuration
|
// Optional GitOps update configuration
|
||||||
AutoUpdate *portainer.AutoUpdateSettings
|
AutoUpdate *portainer.AutoUpdateSettings
|
||||||
// Whether the stack is from a app template
|
// Whether the stack is from a app template
|
||||||
FromAppTemplate bool `example:"false"`
|
FromAppTemplate bool `example:"false"`
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
label="'Enable Change Window'"
|
label="'Enable Change Window'"
|
||||||
label-class="'col-sm-7 col-lg-4'"
|
label-class="'col-sm-7 col-lg-4'"
|
||||||
feature-id="$ctrl.limitedFeatureAutoUpdate"
|
feature-id="$ctrl.limitedFeatureAutoUpdate"
|
||||||
tooltip="'Specify a time-frame during which automatic updates can occur in this environment.'"
|
tooltip="'Specify a time-frame during which GitOps updates can occur in this environment.'"
|
||||||
on-change="($ctrl.onToggleAutoUpdate)"
|
on-change="($ctrl.onToggleAutoUpdate)"
|
||||||
>
|
>
|
||||||
</por-switch-field>
|
</por-switch-field>
|
||||||
|
|
|
@ -104,7 +104,7 @@
|
||||||
name="'disableSysctlSettingForRegularUsers'"
|
name="'disableSysctlSettingForRegularUsers'"
|
||||||
label="'Enable Change Window'"
|
label="'Enable Change Window'"
|
||||||
feature-id="ctrl.limitedFeatureAutoWindow"
|
feature-id="ctrl.limitedFeatureAutoWindow"
|
||||||
tooltip="'Automatic updates to stacks or applications outside the defined change window will not occur.'"
|
tooltip="'GitOps updates to stacks or applications outside the defined change window will not occur.'"
|
||||||
on-change="(ctrl.onToggleAutoUpdate)"
|
on-change="(ctrl.onToggleAutoUpdate)"
|
||||||
label-class="'col-sm-5 col-lg-4 px-0 !m-0'"
|
label-class="'col-sm-5 col-lg-4 px-0 !m-0'"
|
||||||
switch-class="'col-sm-8 text-muted'"
|
switch-class="'col-sm-8 text-muted'"
|
||||||
|
|
|
@ -124,7 +124,7 @@ export type DeploymentOptions = {
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* EndpointChangeWindow determine when automatic stack/app updates may occur
|
* EndpointChangeWindow determine when GitOps stack/app updates may occur
|
||||||
*/
|
*/
|
||||||
interface EndpointChangeWindow {
|
interface EndpointChangeWindow {
|
||||||
Enabled: boolean;
|
Enabled: boolean;
|
||||||
|
@ -161,7 +161,7 @@ export type Environment = {
|
||||||
EnableImageNotification: boolean;
|
EnableImageNotification: boolean;
|
||||||
LocalTimeZone?: string;
|
LocalTimeZone?: string;
|
||||||
|
|
||||||
/** Automatic update change window restriction for stacks and apps */
|
/** GitOps update change window restriction for stacks and apps */
|
||||||
ChangeWindow: EndpointChangeWindow;
|
ChangeWindow: EndpointChangeWindow;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ export function AutoUpdateFieldset({
|
||||||
<SwitchField
|
<SwitchField
|
||||||
name="autoUpdate"
|
name="autoUpdate"
|
||||||
checked={!!value.RepositoryAutomaticUpdates}
|
checked={!!value.RepositoryAutomaticUpdates}
|
||||||
label="Automatic updates"
|
label="GitOps updates"
|
||||||
labelClass="col-sm-3 col-lg-2"
|
labelClass="col-sm-3 col-lg-2"
|
||||||
onChange={(value) =>
|
onChange={(value) =>
|
||||||
handleChange({ RepositoryAutomaticUpdates: value })
|
handleChange({ RepositoryAutomaticUpdates: value })
|
||||||
|
|
|
@ -37,7 +37,7 @@ function TimeWindowDisplay() {
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TextTip color="orange" className="mb-2">
|
<TextTip color="orange" className="mb-2">
|
||||||
A change window is enabled, automatic updates will not occur outside of{' '}
|
A change window is enabled, GitOps updates will not occur outside of{' '}
|
||||||
<span className="font-bold">
|
<span className="font-bold">
|
||||||
{shortTime(startTimeUtc)} - {shortTime(endTimeUtc)} UTC (
|
{shortTime(startTimeUtc)} - {shortTime(endTimeUtc)} UTC (
|
||||||
{shortTime(startTimeLocal)} -{shortTime(endTimeLocal)}{' '}
|
{shortTime(startTimeLocal)} -{shortTime(endTimeLocal)}{' '}
|
||||||
|
|
Loading…
Reference in New Issue