Skip to content

Commit 9110a66

Browse files
authored
[server] Mount admin-credentials (#16760)
* fix * Fix * Fix
1 parent 581408d commit 9110a66

File tree

26 files changed

+239
-43
lines changed

26 files changed

+239
-43
lines changed

components/server/src/config.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export type Config = Omit<
4141
admin: {
4242
loginKey?: string;
4343
// Absolute file path pointing to a file which contains admin credentials, encoded as JSON.
44-
credentialsFilePath: string;
44+
credentialsPath: string;
4545
};
4646
};
4747

@@ -154,6 +154,7 @@ export interface ConfigSerialized {
154154
adminLoginKeyFile?: string;
155155
admin: {
156156
grantFirstUserAdminRole: boolean;
157+
credentialsPath: string;
157158
};
158159

159160
/** defaultBaseImageRegistryWhitelist is the list of registryies users get acces to by default */
@@ -359,7 +360,7 @@ export namespace ConfigFile {
359360
admin: {
360361
...config.admin,
361362
loginKey: adminLoginKey,
362-
credentialsFilePath: "",
363+
credentialsPath: config.admin.credentialsPath,
363364
},
364365
};
365366
}

components/server/src/user/user-controller.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -905,7 +905,7 @@ export class UserController {
905905
}
906906

907907
private async readAdminCredentials(): Promise<AdminCredentials> {
908-
const credentialsFilePath = this.config.admin.credentialsFilePath;
908+
const credentialsFilePath = this.config.admin.credentialsPath;
909909

910910
// Credentials do not have to be present in the system, if admin level sing-in is entirely disabled.
911911
if (!credentialsFilePath) {

install/installer/cmd/testdata/render/agent-smith/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/aws-setup/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/custom-pull-repository/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/customization/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/external-registry/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/gcp-setup/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/http-proxy/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/ide-config/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

install/installer/cmd/testdata/render/kind-meta/output.golden

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)