Skip to content

Commit 227f192

Browse files
authored
Merge pull request #246 from mareklibra/MGMT-10296.KubeadminReserved
MGMT-10296 Kubeadmin username is reserved
2 parents f52c764 + 26bbbfd commit 227f192

4 files changed

Lines changed: 11 additions & 7 deletions

File tree

ui/frontend/src/components/DomainPage/__snapshots__/DomainSelector.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ exports[`DomainSelector can can handle invalid domain 1`] = `
5050
class="validation-failed-text"
5151
data-testid="domain-validation-failed"
5252
>
53-
Valid domain wasn't provided
53+
Valid domain wasn't provided.
5454
</div>
5555
</div>
5656
</div>

ui/frontend/src/components/UsernamePage/__snapshots__/UsernameSelector.test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ exports[`UsernameSelector can can handle invalid domain 1`] = `
5151
class="validation-failed-text"
5252
data-testid="validation-failed-text"
5353
>
54-
Valid username wasn't provided
54+
Valid username wasn't provided.
5555
</div>
5656
</div>
5757
</div>
@@ -111,7 +111,7 @@ exports[`UsernameSelector can can handle invalid domain 2`] = `
111111
class="validation-failed-text"
112112
data-testid="validation-failed-text"
113113
>
114-
Valid username wasn't provided
114+
Valid username wasn't provided.
115115
</div>
116116
</div>
117117
</div>

ui/frontend/src/components/utils.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {
88

99
const TWELVE_SPACES = ' ';
1010
const STRING_SUCCESS = '';
11-
const STRING_FAILED_DOMAIN = "Valid domain wasn't provided";
12-
const STRING_FAILED_USERNAME = "Valid username wasn't provided";
11+
const STRING_FAILED_DOMAIN = "Valid domain wasn't provided.";
12+
const STRING_FAILED_USERNAME = "Valid username wasn't provided.";
1313

1414
const IP_TRIPLET_SUCCESS = {
1515
valid: true,

ui/frontend/src/components/utils.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,19 +37,23 @@ export const domainValidator = (domain: string): K8SStateContextData['domainVali
3737
if (!domain || domain?.match(DNS_NAME_REGEX)) {
3838
return ''; // passed ; optional - pass for empty as well
3939
}
40-
return "Valid domain wasn't provided";
40+
return "Valid domain wasn't provided.";
4141
};
4242

4343
export const usernameValidator = (username = ''): K8SStateContextData['username'] => {
4444
if (username.length >= 54) {
4545
return 'Valid username can not be longer than 54 characters.';
4646
}
4747

48+
if (username === 'kubeadmin') {
49+
return 'The kubeadmin username is reserved.';
50+
}
51+
4852
if (!username || username.match(USERNAME_REGEX)) {
4953
return ''; // passed
5054
}
5155

52-
return "Valid username wasn't provided";
56+
return "Valid username wasn't provided.";
5357
};
5458

5559
export const passwordValidator = (pwd: string): K8SStateContextData['passwordValidation'] => {

0 commit comments

Comments
 (0)