Skip to content

Commit cde1bca

Browse files
committed
Allow specifying uploadproxy url
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 17e9213 commit cde1bca

6 files changed

Lines changed: 43 additions & 2 deletions

File tree

‎packages/apps/tenant/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ description: Separated tenant namespace
44
icon: /logos/tenant.svg
55

66
type: application
7-
version: 1.4.0
7+
version: 1.5.0

‎packages/apps/tenant/templates/networkpolicy.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,18 @@ spec:
159159
---
160160
apiVersion: cilium.io/v2
161161
kind: CiliumNetworkPolicy
162+
metadata:
163+
name: allow-to-cdi-upload-proxy
164+
namespace: {{ include "tenant.name" . }}
165+
spec:
166+
endpointSelector: {}
167+
egress:
168+
- toEndpoints:
169+
- matchLabels:
170+
"k8s:io.kubernetes.pod.namespace": cozy-kubevirt-cdi
171+
---
172+
apiVersion: cilium.io/v2
173+
kind: CiliumNetworkPolicy
162174
metadata:
163175
name: allow-to-ingress
164176
namespace: {{ include "tenant.name" . }}

‎packages/apps/versions_map‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ tenant 1.1.0 4da8ac3b
7272
tenant 1.2.0 15478a88
7373
tenant 1.3.0 ceefae03
7474
tenant 1.3.1 c56e5769
75-
tenant 1.4.0 HEAD
75+
tenant 1.4.0 94c688f7
76+
tenant 1.5.0 HEAD
7677
virtual-machine 0.1.4 f2015d6
7778
virtual-machine 0.1.5 7cd7de7
7879
virtual-machine 0.2.0 5ca8823

‎packages/system/kubevirt-cdi/templates/cdi-cr.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ metadata:
44
name: cdi
55
spec:
66
config:
7+
{{- with .Values.uploadProxyHost }}
8+
uploadProxyURLOverride: "https://{{ . }}"
9+
{{- end }}
710
featureGates:
811
- HonorWaitForFirstConsumer
912
- ExpandDisks
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{{- if and .Values.uploadProxyHost .Values.ingressClass }}
2+
apiVersion: networking.k8s.io/v1
3+
kind: Ingress
4+
metadata:
5+
name: cdi-uploadproxy
6+
annotations:
7+
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
8+
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
9+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
10+
spec:
11+
ingressClassName: {{ .Values.ingressClass }}
12+
rules:
13+
- host: {{ .Values.uploadProxyHost }}
14+
http:
15+
paths:
16+
- backend:
17+
service:
18+
name: cdi-uploadproxy
19+
port:
20+
number: 443
21+
path: /
22+
pathType: Prefix
23+
{{- end }}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
uploadProxyHost: "cdi.infra.aenix.org"
2+
ingressClass: "tenant-root"

0 commit comments

Comments
 (0)