Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v2.4.5 #570

Merged
merged 16 commits into from
Dec 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
},
"dependencies": {
"@mdi/font": "7.0.96",
"@wdns/vue-code-block": "^2.3.3",
"apexcharts": "^3.49.0",
"axios": "^1.7.4",
"chart.js": "^4.4.1",
Expand All @@ -28,7 +29,8 @@
"vue3-apexcharts": "^1.5.2",
"vue3-cookies": "^1.0.6",
"vuetify": "^3.4.0",
"xterm": "^5.3.0"
"xterm": "^5.3.0",
"yaml": "^2.6.1"
},
"devDependencies": {
"@babel/types": "^7.21.4",
Expand Down
24 changes: 14 additions & 10 deletions client/src/components/apps/form.vue
Original file line number Diff line number Diff line change
Expand Up @@ -636,6 +636,8 @@
v-model="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
label="Enable CORS"
color="primary"
false-value="false"
true-value="true"
inset
></v-switch>
</v-col>
Expand All @@ -649,7 +651,7 @@
<v-text-field
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-origin']"
label="CORS Allow Origin"
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
></v-text-field>
</v-col>
<v-col
Expand All @@ -659,7 +661,7 @@
<v-text-field
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-headers']"
label="CORS Allow Headers"
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
></v-text-field>
</v-col>
<v-col
Expand All @@ -669,7 +671,7 @@
<v-text-field
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-expose-headers']"
label="CORS Expose Headers"
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
></v-text-field>
</v-col>
</v-row>
Expand All @@ -683,7 +685,9 @@
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-credentials']"
label="CORS Allow Credentials"
color="primary"
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
false-value="false"
true-value="true"
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
></v-switch>
</v-col>
<v-col
Expand All @@ -693,7 +697,7 @@
<v-text-field
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-max-age']"
label="CORS Max Age"
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
></v-text-field>
</v-col>
<v-col
Expand All @@ -703,7 +707,7 @@
<v-text-field
v-model="ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-methods']"
label="CORS Allow Methods"
:disabled="!ingress.annotations['nginx.ingress.kubernetes.io/enable-cors']"
:disabled="ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false'"
></v-text-field>
</v-col>
</v-row>
Expand Down Expand Up @@ -1547,13 +1551,13 @@ export default defineComponent({
annotations: {
'nginx.ingress.kubernetes.io/whitelist-source-range': '',
'nginx.ingress.kubernetes.io/denylist-source-range': '',
'nginx.ingress.kubernetes.io/force-ssl-redirect': false,
'nginx.ingress.kubernetes.io/force-ssl-redirect': 'false',
'nginx.ingress.kubernetes.io/proxy-buffer-size': '4k',
'nginx.ingress.kubernetes.io/enable-cors': false,
'nginx.ingress.kubernetes.io/enable-cors': 'false',
'nginx.ingress.kubernetes.io/cors-allow-origin': '*',
'nginx.ingress.kubernetes.io/cors-allow-headers': 'DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization',
'nginx.ingress.kubernetes.io/cors-expose-headers': '*',
'nginx.ingress.kubernetes.io/cors-allow-credentials': true,
'nginx.ingress.kubernetes.io/cors-allow-credentials': 'true',
'nginx.ingress.kubernetes.io/cors-max-age': '1728000',
'nginx.ingress.kubernetes.io/cors-allow-methods': 'GET, PUT, POST, DELETE, PATCH, OPTIONS',
},
Expand Down Expand Up @@ -2004,7 +2008,7 @@ export default defineComponent({
delete this.ingress.annotations['nginx.ingress.kubernetes.io/proxy-buffer-size'];
}

if (this.ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == false) {
if (this.ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'] == 'false') {
delete this.ingress.annotations['nginx.ingress.kubernetes.io/enable-cors'];
delete this.ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-origin'];
delete this.ingress.annotations['nginx.ingress.kubernetes.io/cors-allow-headers'];
Expand Down
23 changes: 22 additions & 1 deletion client/src/components/pipelines/list.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@
<v-col class="text-right">
<v-btn
elevation="2"
:disabled="kubero.kubernetesVersion == 'unknown'"
color="primary"
:to="{ name: 'Pipeline Form', params: { pipeline: 'new' }}"
>New Pipeline</v-btn>
</v-col>
</v-row>

<v-row v-if="pipelines && pipelines.length < 1" class="delay-visible-enter-active">
<v-row v-if="(pipelines && pipelines.length < 1) && kubero.kubernetesVersion != 'unknown'" class="delay-visible-enter-active">
<v-alert
color="info"
icon="mdi-star-outline"
Expand All @@ -43,6 +44,22 @@
>Create your first pipeline</v-btn>
</v-col>
</v-row>
<v-row v-if="kubero.kubernetesVersion == 'unknown'">
<v-alert
type="error"
prominent
title="Kubernetes Connection Error"
variant="tonal"
>
<p>Kubero can't reach your kubernetes cluster. Please proceed with the setup to continue.</p>

<v-btn
color="success"
class="mt-4"
:to="{ name: 'Setup', params: { step: '1' }}"
>Start Setup</v-btn>
</v-alert>
</v-row>

<v-row v-for="item in pipelines" :key="item.name" :id="item.name">
<v-col cols="12">
Expand Down Expand Up @@ -113,6 +130,7 @@ import axios from "axios";
import { ref, defineComponent } from 'vue'
import Breadcrumbs from "../breadcrumbs.vue";
import { useKuberoStore } from '../../stores/kubero'
import { mapState } from 'pinia'
import Swal from 'sweetalert2';

type Pipeline = {
Expand Down Expand Up @@ -172,6 +190,9 @@ export default defineComponent({
}
],
}},
computed: {
...mapState(useKuberoStore, ['kubero']),
},
methods: {
async loadPipelinesList() {
const self = this;
Expand Down
Loading
Loading