Skip to content

Commit 74e82c4

Browse files
mms-giannimms-gianni
authored
Merge pull request #570 from kubero-dev/release/v2.4.5
Release/v2.4.5
2 parents 9efd757 + b4fe56f commit 74e82c4

File tree

18 files changed

+1143
-57
lines changed

18 files changed

+1143
-57
lines changed

‎client/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
},
1212
"dependencies": {
1313
"@mdi/font": "7.0.96",
14+
"@wdns/vue-code-block": "^2.3.3",
1415
"apexcharts": "^3.49.0",
1516
"axios": "^1.7.4",
1617
"chart.js": "^4.4.1",
@@ -28,7 +29,8 @@
2829
"vue3-apexcharts": "^1.5.2",
2930
"vue3-cookies": "^1.0.6",
3031
"vuetify": "^3.4.0",
31-
"xterm": "^5.3.0"
32+
"xterm": "^5.3.0",
33+
"yaml": "^2.6.1"
3234
},
3335
"devDependencies": {
3436
"@babel/types": "^7.21.4",

‎client/src/components/apps/form.vue

+14-10
Original file line numberDiff line numberDiff line change
@@ -636,6 +636,8 @@
636636
v-model="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
637637
label="Enable CORS"
638638
color="primary"
639+
false-value="false"
640+
true-value="true"
639641
inset
640642
></v-switch>
641643
</v-col>
@@ -649,7 +651,7 @@
649651
<v-text-field
650652
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-origin']"
651653
label="CORS Allow Origin"
652-
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
654+
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
653655
></v-text-field>
654656
</v-col>
655657
<v-col
@@ -659,7 +661,7 @@
659661
<v-text-field
660662
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-headers']"
661663
label="CORS Allow Headers"
662-
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
664+
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
663665
></v-text-field>
664666
</v-col>
665667
<v-col
@@ -669,7 +671,7 @@
669671
<v-text-field
670672
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-expose-headers']"
671673
label="CORS Expose Headers"
672-
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
674+
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
673675
></v-text-field>
674676
</v-col>
675677
</v-row>
@@ -683,7 +685,9 @@
683685
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-credentials']"
684686
label="CORS Allow Credentials"
685687
color="primary"
686-
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
688+
false-value="false"
689+
true-value="true"
690+
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
687691
></v-switch>
688692
</v-col>
689693
<v-col
@@ -693,7 +697,7 @@
693697
<v-text-field
694698
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-max-age']"
695699
label="CORS Max Age"
696-
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
700+
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
697701
></v-text-field>
698702
</v-col>
699703
<v-col
@@ -703,7 +707,7 @@
703707
<v-text-field
704708
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-methods']"
705709
label="CORS Allow Methods"
706-
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
710+
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
707711
></v-text-field>
708712
</v-col>
709713
</v-row>
@@ -1547,13 +1551,13 @@ export default defineComponent({
15471551
annotations: {
15481552
'nginx.ingress.kubernetes.io/whitelist-source-range': '',
15491553
'nginx.ingress.kubernetes.io/denylist-source-range': '',
1550-
'nginx.ingress.kubernetes.io/force-ssl-redirect': false,
1554+
'nginx.ingress.kubernetes.io/force-ssl-redirect': 'false',
15511555
'nginx.ingress.kubernetes.io/proxy-buffer-size': '4k',
1552-
'nginx.ingress.kubernetes.io/enable-cors': false,
1556+
'nginx.ingress.kubernetes.io/enable-cors': 'false',
15531557
'nginx.ingress.kubernetes.io/cors-allow-origin': '*',
15541558
'nginx.ingress.kubernetes.io/cors-allow-headers': 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization',
15551559
'nginx.ingress.kubernetes.io/cors-expose-headers': '*',
1556-
'nginx.ingress.kubernetes.io/cors-allow-credentials': true,
1560+
'nginx.ingress.kubernetes.io/cors-allow-credentials': 'true',
15571561
'nginx.ingress.kubernetes.io/cors-max-age': '1728000',
15581562
'nginx.ingress.kubernetes.io/cors-allow-methods': 'GET, PUT, POST, DELETE, PATCH, OPTIONS',
15591563
},
@@ -2004,7 +2008,7 @@ export default defineComponent({
20042008
delete this.ingress.annotations['nginx.ingress.kubernetes.io/proxy-buffer-size'];
20052009
}
20062010
2007-
if (this.ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == false) {
2011+
if (this.ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false') {
20082012
delete this.ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'];
20092013
delete this.ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-origin'];
20102014
delete this.ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-headers'];

‎client/src/components/pipelines/list.vue

+22-1
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
<v-col class="text-right">
1111
<v-btn
1212
elevation="2"
13+
:disabled="kubero.kubernetesVersion == 'unknown'"
1314
color="primary"
1415
:to="{ name: 'Pipeline Form', params: { pipeline: 'new' }}"
1516
>New Pipeline</v-btn>
1617
</v-col>
1718
</v-row>
1819

19-
<v-row v-if="pipelines && pipelines.length < 1" class="delay-visible-enter-active">
20+
<v-row v-if="(pipelines && pipelines.length < 1) && kubero.kubernetesVersion != 'unknown'" class="delay-visible-enter-active">
2021
<v-alert
2122
color="info"
2223
icon="mdi-star-outline"
@@ -43,6 +44,22 @@
4344
>Create your first pipeline</v-btn>
4445
</v-col>
4546
</v-row>
47+
<v-row v-if="kubero.kubernetesVersion == 'unknown'">
48+
<v-alert
49+
type="error"
50+
prominent
51+
title="Kubernetes Connection Error"
52+
variant="tonal"
53+
>
54+
<p>Kubero can't reach your kubernetes cluster. Please proceed with the setup to continue.</p>
55+
56+
<v-btn
57+
color="success"
58+
class="mt-4"
59+
:to="{ name: 'Setup', params: { step: '1' }}"
60+
>Start Setup</v-btn>
61+
</v-alert>
62+
</v-row>
4663

4764
<v-row v-for="item in pipelines" :key="item.name" :id="item.name">
4865
<v-col cols="12">
@@ -113,6 +130,7 @@ import axios from "axios";
113130
import { ref, defineComponent } from 'vue'
114131
import Breadcrumbs from "../breadcrumbs.vue";
115132
import { useKuberoStore } from '../../stores/kubero'
133+
import { mapState } from 'pinia'
116134
import Swal from 'sweetalert2';
117135
118136
type Pipeline = {
@@ -172,6 +190,9 @@ export default defineComponent({
172190
}
173191
],
174192
}},
193+
computed: {
194+
...mapState(useKuberoStore, ['kubero']),
195+
},
175196
methods: {
176197
async loadPipelinesList() {
177198
const self = this;

0 commit comments

Comments
 (0)