Skip to content

Commit c5dbc4f

Browse files
authored
Mount the k0s data directory into the kots deployment (#2126)
1 parent 06f715f commit c5dbc4f

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

pkg/addons/adminconsole/values.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ func (a *AdminConsole) GenerateHelmValues(ctx context.Context, kcli client.Clien
3232

3333
copiedValues["embeddedClusterID"] = metrics.ClusterID().String()
3434
copiedValues["embeddedClusterDataDir"] = runtimeconfig.EmbeddedClusterHomeDirectory()
35+
copiedValues["embeddedClusterK0sDir"] = runtimeconfig.EmbeddedClusterK0sSubDir()
3536
copiedValues["isHA"] = a.IsHA
3637
copiedValues["isMultiNodeEnabled"] = a.IsMultiNodeEnabled
3738

tests/dryrun/install_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ func testDefaultInstallationImpl(t *testing.T) {
7575
"isMultiNodeEnabled": true,
7676
"kurlProxy.nodePort": float64(30000),
7777
"embeddedClusterDataDir": "/var/lib/embedded-cluster",
78+
"embeddedClusterK0sDir": "/var/lib/embedded-cluster/k0s",
7879
})
7980
assertHelmValuePrefixes(t, adminConsoleOpts.Values, map[string]string{
8081
"images.kotsadm": "fake-replicated-proxy.test.net/anonymous",
@@ -235,6 +236,7 @@ func TestCustomDataDir(t *testing.T) {
235236
assert.Equal(t, "admin-console", adminConsoleOpts.ReleaseName)
236237
assertHelmValues(t, adminConsoleOpts.Values, map[string]interface{}{
237238
"embeddedClusterDataDir": "/custom/data/dir",
239+
"embeddedClusterK0sDir": "/custom/data/dir/k0s",
238240
})
239241

240242
// --- validate os env --- //

0 commit comments

Comments
 (0)