Skip to content

Commit ae9e4fb

Browse files
laveryaemosbaugh
laverya
and
emosbaugh
authored
kotsadm 1.116.0 testing (#1130)
* updated adminconsole version * debug failure to join nodes after HA restore * join controller commands are different on restore * reenable all tests --------- Co-authored-by: emosbaugh <[email protected]>
1 parent 9b4ccf4 commit ae9e4fb

File tree

4 files changed

+37
-13
lines changed

4 files changed

+37
-13
lines changed

‎e2e/playwright/tests/get-restore-join-controller-command/test.spec.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { test, expect } from '@playwright/test';
2+
import { login } from '../shared';
3+
4+
test('get restore join controller command', async ({ page }) => {
5+
await login(page);
6+
await expect(page.locator('#controller-testNodeType')).toBeChecked();
7+
await expect(page.locator('.CodeSnippet-copy')).toBeVisible();
8+
const joinCommand = await page.locator('.react-prism.language-bash').first().textContent();
9+
console.log(`{"command":"${joinCommand}"}`);
10+
});

‎e2e/restore_test.go‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,20 @@ func TestSingleNodeDisasterRecovery(t *testing.T) {
7777
t.Fatalf("fail to check installation state: %v", err)
7878
}
7979

80+
appUpgradeVersion := fmt.Sprintf("appver-%s-upgrade", os.Getenv("SHORT_SHA"))
81+
testArgs = []string{appUpgradeVersion}
82+
83+
t.Logf("%s: upgrading cluster", time.Now().Format(time.RFC3339))
84+
if _, _, err := runPlaywrightTest(t, tc, "deploy-upgrade", testArgs...); err != nil {
85+
t.Fatalf("fail to run playwright test deploy-upgrade: %v", err)
86+
}
87+
88+
t.Logf("%s: checking installation state after upgrade", time.Now().Format(time.RFC3339))
89+
line = []string{"check-postupgrade-state.sh", k8sVersion()}
90+
if _, _, err := RunCommandOnNode(t, tc, 0, line); err != nil {
91+
t.Fatalf("fail to check postupgrade state: %v", err)
92+
}
93+
8094
t.Logf("%s: test complete", time.Now().Format(time.RFC3339))
8195
}
8296

@@ -476,7 +490,7 @@ func TestMultiNodeHADisasterRecovery(t *testing.T) {
476490

477491
// join a controller
478492
t.Logf("%s: generating a new controller token command", time.Now().Format(time.RFC3339))
479-
stdout, stderr, err = runPlaywrightTest(t, tc, "get-join-controller-command")
493+
stdout, stderr, err = runPlaywrightTest(t, tc, "get-restore-join-controller-command")
480494
if err != nil {
481495
t.Fatalf("fail to generate controller join token:\nstdout: %s\nstderr: %s", stdout, stderr)
482496
}
@@ -492,7 +506,7 @@ func TestMultiNodeHADisasterRecovery(t *testing.T) {
492506

493507
// join another controller in non-HA mode
494508
t.Logf("%s: generating a new controller token command", time.Now().Format(time.RFC3339))
495-
stdout, stderr, err = runPlaywrightTest(t, tc, "get-join-controller-command")
509+
stdout, stderr, err = runPlaywrightTest(t, tc, "get-restore-join-controller-command")
496510
if err != nil {
497511
t.Fatalf("fail to generate controller join token:\nstdout: %s\nstderr: %s", stdout, stderr)
498512
}
@@ -694,7 +708,7 @@ func TestMultiNodeAirgapHADisasterRecovery(t *testing.T) {
694708

695709
// join a controller
696710
t.Logf("%s: generating a new controller token command", time.Now().Format(time.RFC3339))
697-
stdout, stderr, err = runPlaywrightTest(t, tc, "get-join-controller-command")
711+
stdout, stderr, err = runPlaywrightTest(t, tc, "get-restore-join-controller-command")
698712
if err != nil {
699713
t.Fatalf("fail to generate controller join token:\nstdout: %s\nstderr: %s", stdout, stderr)
700714
}
@@ -710,7 +724,7 @@ func TestMultiNodeAirgapHADisasterRecovery(t *testing.T) {
710724

711725
// join another controller in non-HA mode
712726
t.Logf("%s: generating a new controller token command", time.Now().Format(time.RFC3339))
713-
stdout, stderr, err = runPlaywrightTest(t, tc, "get-join-controller-command")
727+
stdout, stderr, err = runPlaywrightTest(t, tc, "get-restore-join-controller-command")
714728
if err != nil {
715729
t.Fatalf("fail to generate controller join token:\nstdout: %s\nstderr: %s", stdout, stderr)
716730
}

‎pkg/addons/adminconsole/static/metadata.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@
55
# $ make buildtools
66
# $ output/bin/buildtools update addon <addon name>
77
#
8-
version: 1.115.1
8+
version: 1.116.0
99
location: oci://proxy.replicated.com/anonymous/registry.replicated.com/library/admin-console
1010
images:
1111
kotsadm:
1212
repo: proxy.replicated.com/anonymous/kotsadm/kotsadm
13-
tag: v1.115.1@sha256:9772a075a24586d2fd8550285f95a0bc466b280e960fd00ccb585ac9999592bb
13+
tag: v1.116.0@sha256:a30c3f825beb5e47d20a1b6717603eee65cf74ece86a7073209b3321c3b807a3
1414
kotsadm-migrations:
1515
repo: proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations
16-
tag: v1.115.1@sha256:22673b6d3729fe48607516314f59095b6da8ded4b61aa381c6ada5583f130c5e
16+
tag: v1.116.0@sha256:77fe399c43db11877663e68fd680d764fab7a6d06fc27c82eb0e9a2e4ed9888f
1717
kurl-proxy:
1818
repo: proxy.replicated.com/anonymous/kotsadm/kurl-proxy
19-
tag: v1.115.1@sha256:771901bff6459dde393d0df93c1a1ff50c4013dc8264903f89b71d3d10f0b459
19+
tag: v1.116.0@sha256:763c05284f8f824329202d2a71fab1e4bedd19e82ae17c4a694e07e1c166c32f
2020
rqlite:
2121
repo: proxy.replicated.com/anonymous/kotsadm/rqlite
22-
tag: 8.28.1-r0@sha256:f7f9dd7d67999d95d90b8bf26f3508f4f3fcfb89783c7d5abcf94b5aed406ba0
22+
tag: 8.30.0-r0@sha256:794fd99e8c72053c0cb0ad1fdbf1c4af24a8949bd418546952ed9affa6c4e5b6

‎pkg/addons/adminconsole/static/values.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
#
1414

1515
images:
16-
kotsadm: 'proxy.replicated.com/anonymous/kotsadm/kotsadm:v1.115.1@sha256:9772a075a24586d2fd8550285f95a0bc466b280e960fd00ccb585ac9999592bb'
17-
kurlProxy: 'proxy.replicated.com/anonymous/kotsadm/kurl-proxy:v1.115.1@sha256:771901bff6459dde393d0df93c1a1ff50c4013dc8264903f89b71d3d10f0b459'
18-
migrations: 'proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations:v1.115.1@sha256:22673b6d3729fe48607516314f59095b6da8ded4b61aa381c6ada5583f130c5e'
19-
rqlite: 'proxy.replicated.com/anonymous/kotsadm/rqlite:8.28.1-r0@sha256:f7f9dd7d67999d95d90b8bf26f3508f4f3fcfb89783c7d5abcf94b5aed406ba0'
16+
kotsadm: 'proxy.replicated.com/anonymous/kotsadm/kotsadm:v1.116.0@sha256:a30c3f825beb5e47d20a1b6717603eee65cf74ece86a7073209b3321c3b807a3'
17+
kurlProxy: 'proxy.replicated.com/anonymous/kotsadm/kurl-proxy:v1.116.0@sha256:763c05284f8f824329202d2a71fab1e4bedd19e82ae17c4a694e07e1c166c32f'
18+
migrations: 'proxy.replicated.com/anonymous/kotsadm/kotsadm-migrations:v1.116.0@sha256:77fe399c43db11877663e68fd680d764fab7a6d06fc27c82eb0e9a2e4ed9888f'
19+
rqlite: 'proxy.replicated.com/anonymous/kotsadm/rqlite:8.30.0-r0@sha256:794fd99e8c72053c0cb0ad1fdbf1c4af24a8949bd418546952ed9affa6c4e5b6'
2020
isHA: false
2121
isHelmManaged: false
2222
kurlProxy:

0 commit comments

Comments
 (0)