Skip to content

Commit

Permalink
Merge branch 'main' into salah/sc-89974/dropdown-for-automatic-partia…
Browse files Browse the repository at this point in the history
…l-snapshots
  • Loading branch information
sgalsaleh authored Sep 28, 2023
2 parents 43a0b80 + bfde97a commit 743f638
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2824,7 +2824,7 @@ jobs:
fail-fast: false
matrix:
cluster: [
{distribution: kind, version: v1.27}
{distribution: kind, version: v1.27, instance-type: r1.medium}
]
env:
APP_SLUG: remove-app
Expand All @@ -2842,6 +2842,7 @@ jobs:
cluster-name: automated-kots-${{ github.run_id }}-${{ matrix.cluster.distribution }}-${{ matrix.cluster.version }}
timeout-minutes: '120'
ttl: 2h
instance-type: ${{ matrix.cluster.instance-type }}
export-kubeconfig: true

- name: download kots binary
Expand Down
3 changes: 2 additions & 1 deletion web/src/components/modals/AutomaticUpdatesModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,8 @@ export default class AutomaticUpdatesModal extends React.Component<
</p>
<span className="u-fontSize--normal u-marginTop--5 u-textColor--info u-lineHeight--more u-marginBottom--15">
Choose how frequently your application checks for updates. A
custom schedule can be defined with a cron expression.
custom schedule can be defined with a cron expression. Configured
automatic update checks use the local server time.
</span>
<div className="flex flex1">
<Select
Expand Down

0 comments on commit 743f638

Please sign in to comment.