Skip to content

Commit 58d379f

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
finalize initial version
1 parent 66a13b4 commit 58d379f

File tree

4 files changed

+139
-8
lines changed

4 files changed

+139
-8
lines changed

‎charts/cf-vcluster/.helmignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@
2121
.idea/
2222
*.tmproj
2323
.vscode/
24+
25+
# Adding schema.json file to exclude to reduce issues with Helm provider in Crossplane, strongly suggest to enable it while developing
26+
charts/vcluster/values.schema.json

‎charts/cf-vcluster/templates/ingresses.tpl‎

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,34 @@
11
{{- range $i, $val := (list "internal" "public") }}
2-
2+
{{- $ingress := index $.Values.global.ingress $val -}}
3+
{{- if and $ingress.enabled }}
4+
apiVersion: networking.k8s.io/v1
5+
kind: Ingress
6+
metadata:
7+
name: {{ printf "%s-%s" $.Release.Name $val }}
8+
{{- if $ingress.annotations }}
9+
annotations:
10+
{{- $ingress.annotations | toYaml | nindent 4 }}
11+
{{- end }}
12+
spec:
13+
ingressClassName: {{ $ingress.ingressClassName | quote }}
14+
rules:
15+
- host: {{ tpl (printf "%s.%s" $ingress.host.name $ingress.host.domain) $ }}
16+
http:
17+
paths:
18+
- path: /
19+
pathType: {{ $.Values.vcluster.controlPlane.ingress.pathType }}
20+
backend:
21+
{{- if $ingress.backendServiceOverride}}
22+
service:
23+
name: {{ $ingress.backendServiceOverride.name }}
24+
port:
25+
number: {{ $ingress.backendServiceOverride.port }}
26+
{{- else }}
27+
service:
28+
name: {{ $.Release.Name }}
29+
port:
30+
name: https
31+
{{- end }}
32+
---
33+
{{ end -}}
334
{{ end -}}

‎charts/cf-vcluster/values.test.rnd-sandbox.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# Test values file to deploy on rnd-sandbox vcluster host
2+
global:
3+
ingress:
4+
internal:
5+
enabled: true
6+
className: nginx-internal
7+
host:
8+
domain: rnd-sandbox.cf-infra.com

‎charts/cf-vcluster/values.yaml‎

Lines changed: 96 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ global:
22
ingress:
33
internal:
44
enabled: false
5-
annotations: {}
5+
annotations:
6+
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
7+
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
8+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
69
ingressClassName: "nginx-internal"
710
# -- Possibility to override backend service name for ingress. If not set default vcluster backend service will be used
8-
backendService: {}
9-
# backendService:
11+
backendServiceOverride: {}
12+
# backendServiceOverride:
1013
# name: "interceptor-service"
1114
# port: 80
1215
host:
@@ -16,11 +19,14 @@ global:
1619
enabled: false
1720
ingressClassName: "nginx-public"
1821
# -- Possibility to override backend service name for ingress. If not set default vcluster backend service will be used
19-
backendService: {}
20-
# backendService:
22+
backendServiceOverride: {}
23+
# backendServiceOverride:
2124
# name: "interceptor-service"
2225
# port: 80
23-
annotations: {}
26+
annotations:
27+
nginx.ingress.kubernetes.io/backend-protocol: HTTPS
28+
nginx.ingress.kubernetes.io/ssl-passthrough: "true"
29+
nginx.ingress.kubernetes.io/ssl-redirect: "true"
2430
host:
2531
name: "{{ .Release.Name }}"
2632
domain: example.com
@@ -32,7 +38,6 @@ vcluster:
3238
- "{{ tpl (printf \"%s.%s.%s\" .Release.Name .Release.Namespace \".cluster.svc.local\") . }}"
3339
- "{{ tpl (printf \"%s.%s\" .Values.global.ingress.internal.host.name .Values.global.ingress.internal.host.domain) . }}"
3440
- "{{ tpl (printf \"%s.%s\" .Values.global.ingress.public.host.name .Values.global.ingress.public.host.domain) . }}"
35-
3641
distro:
3742
k8s:
3843
enabled: true
@@ -42,3 +47,87 @@ vcluster:
4247
- --oidc-client-id=vcluster-login
4348
- --oidc-username-claim=email
4449
- --oidc-groups-claim=groups
50+
sync:
51+
toHost:
52+
ingresses:
53+
enabled: true
54+
serviceAccounts:
55+
enabled: true
56+
storageClasses:
57+
enabled: true
58+
persistentVolumeClaims:
59+
enabled: true
60+
persistentVolumes:
61+
enabled: true
62+
fromHost:
63+
ingressClasses:
64+
enabled: true
65+
nodes:
66+
enabled: true
67+
experimental:
68+
deploy:
69+
vcluster:
70+
manifests: |-
71+
---
72+
kind: ClusterRoleBinding
73+
apiVersion: rbac.authorization.k8s.io/v1
74+
metadata:
75+
name: oidc-cluster-admin
76+
roleRef:
77+
apiGroup: rbac.authorization.k8s.io
78+
kind: ClusterRole
79+
name: cluster-admin
80+
subjects:
81+
- kind: Group
82+
name: [email protected]
83+
---
84+
kind: ClusterRoleBinding
85+
apiVersion: rbac.authorization.k8s.io/v1
86+
metadata:
87+
name: oidc-cluster-admin-octopus
88+
roleRef:
89+
apiGroup: rbac.authorization.k8s.io
90+
kind: ClusterRole
91+
name: cluster-admin
92+
subjects:
93+
- kind: Group
94+
name: 787d1a9a-e488-4a77-bb6c-f4b2fdfd8cea # Codefresh R&D Team
95+
- kind: Group
96+
name: 607a9f67-422c-4ca2-b8c4-d0be213b9650 # Codefresh SA Team
97+
- kind: Group
98+
name: f8de82e2-cdb6-480a-8f37-9f958ea5fef5 # Codefresh Support Team
99+
- kind: Group
100+
name: 16b3fb37-58f2-4786-8ca8-6f58d0410687 # Codefresh OSS Team
101+
- kind: Group
102+
name: dc35779f-57d5-4dff-90c0-34c6e93fe7e7 # Codefresh OSS Team
103+
---
104+
apiVersion: v1
105+
kind: ServiceAccount
106+
metadata:
107+
name: codefresh-pipelines-integration-cluster-admin
108+
namespace: kube-system
109+
---
110+
apiVersion: v1
111+
kind: Secret
112+
metadata:
113+
name: codefresh-pipelines-integration-cluster-admin-token
114+
namespace: kube-system
115+
annotations:
116+
kubernetes.io/service-account.name: codefresh-pipelines-integration-cluster-admin
117+
type: kubernetes.io/service-account-token
118+
---
119+
kind: ClusterRoleBinding
120+
apiVersion: rbac.authorization.k8s.io/v1
121+
metadata:
122+
name: codefresh-pipelines-integration-cluster-admin
123+
roleRef:
124+
apiGroup: rbac.authorization.k8s.io
125+
kind: ClusterRole
126+
name: cluster-admin
127+
subjects:
128+
- kind: ServiceAccount
129+
name: codefresh-pipelines-integration-cluster-admin
130+
namespace: kube-system
131+
rbac:
132+
clusterRole:
133+
enabled: true

0 commit comments

Comments
 (0)