Skip to content

Commit 1086778

Browse files
committed
improve addon handling
1 parent 9bea5a9 commit 1086778

File tree

6 files changed

+15
-16
lines changed

6 files changed

+15
-16
lines changed

client/src/components/apps/addons.vue

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,6 @@
9090
></v-select>
9191
</v-col>
9292

93-
<v-col cols="12">
94-
<v-text-field
95-
label="Instance Name"
96-
:rules="baseRule"
97-
v-model="selectedAddon.id"
98-
outlined
99-
></v-text-field>
100-
</v-col>
101-
10293
<v-col cols="12" v-for="field in selectedAddon.formfields" v-bind:key="field.name">
10394
<v-select
10495
v-if="field.type === 'select-storageclass'"
@@ -165,7 +156,7 @@
165156
<v-btn
166157
color="blue darken-1"
167158
variant="text"
168-
@click="dialog = false"
159+
@click="dialog = false; selectedAddon = {} as Addon"
169160
>
170161
Close
171162
</v-btn>
@@ -321,7 +312,15 @@ export default defineComponent({
321312
Object.entries(this.selectedAddon.formfields as FormField[]).forEach(([field, value]) => {
322313
const fieldvalue = get(addon.resourceDefinitions, field, value.default)
323314
//console.log(field, value, fieldvalue);
324-
value.default = fieldvalue;
315+
316+
if (value.name === 'metadata.name' && typeof value.default === 'string') {
317+
if (fieldvalue.startsWith(this.appname)) {
318+
// remove appname prefix
319+
value.default = fieldvalue.replace(`${this.appname}-`, '');
320+
}
321+
} else {
322+
value.default = fieldvalue;
323+
}
325324
});
326325
//console.log(this.selectedAddon.formfields);
327326

server/src/addons/plugins/kuberoaddonsMemcached.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export class KuberoAddonMemcached extends Plugin implements IPlugin {
2929
label: 'Memcached Instance Name',
3030
name: 'metadata.name',
3131
required: true,
32-
default: 'kuberoaddonmemcached-sample',
32+
default: 'memcached',
3333
description: 'The name of the Memcached instance',
3434
},
3535
'KuberoAddonMemcached.spec.memcached.image.tag': {

server/src/addons/plugins/kuberoaddonsMongodb.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export class KuberoAddonMongodb extends Plugin implements IPlugin {
123123
apiVersion: "application.kubero.dev/v1alpha1",
124124
kind: "KuberoAddonMongodb",
125125
metadata: {
126-
name: "kuberoaddonmongodb-sample"
126+
name: "mongodb"
127127
},
128128
spec: {
129129
mongodb: {

server/src/addons/plugins/kuberoaddonsMysql.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ export class KuberoAddonMysql extends Plugin implements IPlugin {
9797
apiVersion: "application.kubero.dev/v1alpha1",
9898
kind: "KuberoAddonMysql",
9999
metadata: {
100-
name: "KuberoAddonMysql-sample"
100+
name: "mysql"
101101
},
102102
spec: {
103103
mysql: {

server/src/addons/plugins/kuberoaddonsPostgres.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ export class KuberoAddonPostgres extends Plugin implements IPlugin {
121121
apiVersion: "application.kubero.dev/v1alpha1",
122122
kind: "KuberoAddonPostgres",
123123
metadata: {
124-
name: "kuberoaddonpostgres-sample"
124+
name: "postgres"
125125
},
126126
spec: {
127127
postgres: {

server/src/addons/plugins/kuberoaddonsRabbitmq.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export class KuberoAddonRabbitmq extends Plugin implements IPlugin {
8989
apiVersion: "application.kubero.dev/v1alpha1",
9090
kind: "KuberoAddonRabbitmq",
9191
metadata: {
92-
name: "kuberoaddonrabbitmq-sample"
92+
name: "rabbitmq"
9393
},
9494
spec: {
9595
rabbitmq: {

0 commit comments

Comments
 (0)