github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(gitops): reword automatic update to gitops update for ui and docs (#9067)

pull/9070/head
Oscar Zhou 2023-06-13 15:32:10 +12:00 committed by GitHub
parent 57fa044f2e
commit 2ac70b1eb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/http/handler/stacks/create_compose_stack.go
View File

@ -171,7 +171,7 @@ type composeStackFromGitRepositoryPayload struct {
ComposeFile string `example:"docker-compose.yml" default:"docker-compose.yml"`
// Applicable when deploying with multiple stack files
AdditionalFiles []string `example:"[nz.compose.yml, uat.compose.yml]"`
// Optional auto update configuration
// Optional GitOps update configuration
AutoUpdate *portainer.AutoUpdateSettings
// A list of environment variables used during stack deployment
Env []portainer.Pair

2
api/http/handler/stacks/create_swarm_stack.go
View File

@ -130,7 +130,7 @@ type swarmStackFromGitRepositoryPayload struct {
ComposeFile string `example:"docker-compose.yml" default:"docker-compose.yml"`
// Applicable when deploying with multiple stack files
AdditionalFiles []string `example:"[nz.compose.yml, uat.compose.yml]"`
// Optional auto update configuration
// Optional GitOps update configuration
AutoUpdate *portainer.AutoUpdateSettings
// TLSSkipVerify skips SSL verification when cloning the Git repository
TLSSkipVerify bool `example:"false"`

2
api/portainer.go
View File

@ -1017,7 +1017,7 @@ type (
UpdatedBy string `example:"bob"`
// Only applies when deploying stack with multiple files
AdditionalFiles []string `json:"AdditionalFiles"`
// The auto update settings of a git stack
// The GitOps update settings of a git stack
AutoUpdate *AutoUpdateSettings `json:"AutoUpdate"`
// The stack deployment option
Option *StackOption `json:"Option"`

2
api/stacks/stackbuilders/stack_payload.go
View File

@ -17,7 +17,7 @@ type StackPayload struct {
Webhook string
// A list of environment(endpoint) variables used during stack deployment
Env []portainer.Pair
// Optional auto update configuration
// Optional GitOps update configuration
AutoUpdate *portainer.AutoUpdateSettings
// Whether the stack is from a app template
FromAppTemplate bool `example:"false"`

2
app/docker/views/docker-features-configuration/docker-features-configuration.html
View File

@ -49,7 +49,7 @@
label="'Enable Change Window'"
label-class="'col-sm-7 col-lg-4'"
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)"
>
</por-switch-field>

2
app/kubernetes/views/configure/configure.html
View File

@ -104,7 +104,7 @@
name="'disableSysctlSettingForRegularUsers'"
label="'Enable Change Window'"
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)"
label-class="'col-sm-5 col-lg-4 px-0 !m-0'"
switch-class="'col-sm-8 text-muted'"

4
app/react/portainer/environments/types.ts
View File

@ -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 {
Enabled: boolean;
@ -161,7 +161,7 @@ export type Environment = {
EnableImageNotification: boolean;
LocalTimeZone?: string;
/** Automatic update change window restriction for stacks and apps */
/** GitOps update change window restriction for stacks and apps */
ChangeWindow: EndpointChangeWindow;
};

2
app/react/portainer/gitops/AutoUpdateFieldset/AutoUpdateFieldset.tsx
View File

@ -38,7 +38,7 @@ export function AutoUpdateFieldset({
<SwitchField
name="autoUpdate"
checked={!!value.RepositoryAutomaticUpdates}
label="Automatic updates"
label="GitOps updates"
labelClass="col-sm-3 col-lg-2"
onChange={(value) =>
handleChange({ RepositoryAutomaticUpdates: value })

2
app/react/portainer/gitops/TimeWindowDisplay.tsx
View File

@ -37,7 +37,7 @@ function TimeWindowDisplay() {
return (
<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">
{shortTime(startTimeUtc)} - {shortTime(endTimeUtc)} UTC (
{shortTime(startTimeLocal)} -{shortTime(endTimeLocal)}{' '}