Merge branch 'main' into salah/sc-88945/additionalnamespaces-is-not-w…

…orking-in-new
replicatedhq · Sep 28, 2023 · 85f4846 · 85f4846
2 parents 87fb9d6 + bfde97a
commit 85f4846
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.github/workflows/build-test.yaml b/.github/workflows/build-test.yaml
@@ -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
@@ -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

diff --git a/web/src/components/modals/AutomaticUpdatesModal.tsx b/web/src/components/modals/AutomaticUpdatesModal.tsx
@@ -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