Skip to content

Commit 58377f8

Browse files
authored
Merge pull request #382 from kubero-dev/fix/templateloading-fails-to-load-addons
fix loading addons and volumes
2 parents 87f0cb6 + 629d0b4 commit 58377f8

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

client/src/components/apps/form.vue

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1599,7 +1599,9 @@ export default defineComponent({
15991599
this.docker.tag = response.data.image.tag;
16001600
16011601
this.envvars = response.data.envVars;
1602-
this.sAAnnotations = Object.entries(response.data.serviceAccount.annotations).map(([key, value]) => ({annotation: key, value: value as string}));
1602+
if (response.data.serviceAccount && response.data.serviceAccount.annotations) {
1603+
this.sAAnnotations = Object.entries(response.data.serviceAccount.annotations).map(([key, value]) => ({annotation: key, value: value as string}));
1604+
}
16031605
this.extraVolumes = response.data.extraVolumes;
16041606
this.cronjobs = response.data.cronjobs;
16051607
this.addons = response.data.addons;
@@ -1777,7 +1779,7 @@ export default defineComponent({
17771779
if (response.data.spec.envVars.length > 0) {
17781780
this.panel.push(5)
17791781
}
1780-
if (Object.entries(response.data.spec.serviceAccount.annotations).length > 0) {
1782+
if (response.data.spec.serviceAccount && Object.entries(response.data.spec.serviceAccount?.annotations).length > 0) {
17811783
this.panel.push(4)
17821784
}
17831785
if (response.data.spec.extraVolumes.length > 0) {
@@ -1807,7 +1809,9 @@ export default defineComponent({
18071809
this.domain = response.data.spec.domain;
18081810
this.envvars = response.data.spec.envVars;
18091811
this.serviceAccount = response.data.spec.serviceAccount;
1810-
this.sAAnnotations = Object.entries(response.data.spec.serviceAccount.annotations).map(([key, value]) => ({annotation: key, value: value as string}));
1812+
if (response.data.spec.serviceAccount && response.data.spec.serviceAccount.annotations) {
1813+
this.sAAnnotations = Object.entries(response.data.spec.serviceAccount.annotations).map(([key, value]) => ({annotation: key, value: value as string}));
1814+
}
18111815
this.extraVolumes = response.data.spec.extraVolumes;
18121816
this.containerPort = response.data.spec.image.containerPort;
18131817
this.podsize = response.data.spec.podsize;

0 commit comments

Comments
 (0)