Skip to content

Commit bcb5237

Browse files
authored
Merge pull request #697 from kubero-dev/release/v3.1.1
Release/v3.1.1
2 parents 9c2d9dc + ca18cf7 commit bcb5237

File tree

8 files changed

+1123
-1225
lines changed

8 files changed

+1123
-1225
lines changed

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"sass": "^1.60.0",
4747
"typescript": "^5.0.0",
4848
"unplugin-fonts": "^1.0.3",
49-
"vite": "^6.3.4",
49+
"vite": "^6.3.6",
5050
"vite-plugin-vuetify": "^2.1.1",
5151
"vue-tsc": "^2.2.10"
5252
}
File renamed without changes.

client/src/components/loginprompt.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
class="mt-5"
2828
>
2929
User: <b>demo/reader</b><br>
30-
Pass: <b>123456</b>
30+
Pass: <b>kubero</b>
3131
</v-alert>
3232
<div v-if="authMethods.local" class="py-5">
3333
<v-alert
@@ -126,7 +126,7 @@ export default defineComponent({
126126
const demoDomain = demoDomains.includes(window.location.hostname)
127127
if (demoDomain) {
128128
this.username = 'demo';
129-
this.password = '123456';
129+
this.password = 'kubero';
130130
}
131131
return demoDomain;
132132
}

client/yarn.lock

Lines changed: 436 additions & 430 deletions
Large diffs are not rendered by default.

server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@prisma/client": "^6.9.0",
5353
"@types/bcrypt": "^5.0.2",
5454
"@willsoto/nestjs-prometheus": "^6.0.2",
55-
"axios": "^1.7.9",
55+
"axios": "^1.12.0",
5656
"bcrypt": "^5.1.1",
5757
"bitbucket": "^2.12.0",
5858
"cross-fetch": "^4.1.0",

server/src/addons/plugins/kuberoRabbitMQ.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { IPlugin, IPluginFormFields } from './plugin.interface';
55
export class KuberoRabbitMQ extends Plugin implements IPlugin {
66
public id: string = 'kubero-operator'; //same as operator name
77
public displayName = 'RabbitMQ (Bitnami)';
8-
public icon = '/img/addons/RabbitMQ.svg';
8+
public icon = '/img/addons/rabbitmq.svg';
99
public install: string = '';
1010
public url =
1111
'https://artifacthub.io/packages/olm/community-operators/kubero-operator';

server/src/database/database.service.ts

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,20 @@ export class DatabaseService {
126126
const userGroups = ['everyone', 'admin'];
127127

128128
try {
129-
// Generiere ein zufälliges Passwort
130-
const plainPassword = crypto
131-
.randomBytes(25)
132-
.toString('base64')
133-
.slice(0, 19);
134-
// Erstelle einen bcrypt-Hash
129+
let plainPassword: string;
130+
131+
if (!process.env.KUBERO_ADMIN_PASSWORD && process.env.KUBERO_ADMIN_PASSWORD !== '') {
132+
// Generate a random password
133+
plainPassword = crypto
134+
.randomBytes(25)
135+
.toString('base64')
136+
.slice(0, 19);
137+
138+
} else {
139+
plainPassword = process.env.KUBERO_ADMIN_PASSWORD;
140+
}
141+
142+
// create bcrypt hash
135143
const passwordHash = await bcrypt.hash(plainPassword, 10);
136144
console.log('\n\n\n', 'Admin account created since no user exists yet');
137145
console.log(' username: ', adminUser);
@@ -271,7 +279,7 @@ export class DatabaseService {
271279
}
272280

273281
const userID = crypto.randomUUID();
274-
const role = process.env.KUBERO_DEFAULT_USER_ROLE || 'guest';
282+
const role = 'admin'; //process.env.DEFAULT_USER_ROLE || 'admin'; //should be 'admin' for legacy users
275283
const userGroups = ['everyone'];
276284
try {
277285
await prisma.user.create({

server/yarn.lock

Lines changed: 667 additions & 783 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)