Skip to content

Commit dc9377e

Browse files
authored
Merge pull request #518 from kubero-dev/fix/cors-header-not-active
Fix / Cors headers not applied
2 parents 4e7331f + fcc9828 commit dc9377e

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

client/src/components/apps/form.vue

Lines changed: 14 additions & 10 deletions
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'];

0 commit comments

Comments
 (0)