Skip to content

Commit f674837

Browse files
committed
[platform] Separate assets server into dedicated daemonset
Signed-off-by: Andrei Kvapil <[email protected]>
1 parent 1f47fbc commit f674837

11 files changed

Lines changed: 263 additions & 28 deletions

File tree

‎packages/core/installer/Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ image-cozystack:
3131
$(BUILDX_ARGS)
3232
IMAGE="$(REGISTRY)/installer:$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/installer.json -o json -r)" \
3333
yq -i '.cozystack.image = strenv(IMAGE)' values.yaml
34+
IMAGE="$(REGISTRY)/installer:$(call settag,$(TAG))@$$(yq e '."containerimage.digest"' images/installer.json -o json -r)" \
35+
yq -i '.cozystack.image = strenv(IMAGE)' ../platform/values.yaml
3436
rm -f images/installer.json
3537

3638
image-talos:

‎packages/core/installer/images/cozystack/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ FROM alpine:3.22
3434

3535
RUN wget -O- https://github.com/cozystack/cozypkg/raw/refs/heads/main/hack/install.sh | sh -s -- -v 1.2.0
3636

37-
RUN apk add --no-cache make kubectl helm coreutils git jq
37+
RUN apk add --no-cache make kubectl helm coreutils git jq openssl
3838

3939
COPY --from=builder /src/scripts /cozystack/scripts
4040
COPY --from=builder /src/packages/core /cozystack/packages/core

‎packages/core/installer/templates/cozystack.yaml‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -68,33 +68,10 @@ spec:
6868
valueFrom:
6969
fieldRef:
7070
fieldPath: metadata.name
71-
- name: assets
72-
image: "{{ .Values.cozystack.image }}"
73-
command:
74-
- /usr/bin/cozystack-assets-server
75-
- "-dir=/cozystack/assets"
76-
- "-address=:8123"
77-
ports:
78-
- name: http
79-
containerPort: 8123
8071
tolerations:
8172
- key: "node.kubernetes.io/not-ready"
8273
operator: "Exists"
8374
effect: "NoSchedule"
8475
- key: "node.cilium.io/agent-not-ready"
8576
operator: "Exists"
8677
effect: "NoSchedule"
87-
---
88-
apiVersion: v1
89-
kind: Service
90-
metadata:
91-
name: cozystack
92-
namespace: cozy-system
93-
spec:
94-
ports:
95-
- name: http
96-
port: 80
97-
targetPort: 8123
98-
selector:
99-
app: cozystack
100-
type: ClusterIP

‎packages/core/platform/templates/_helpers.tpl‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,36 @@ Get IP-addresses of master nodes
1717
{{ join "," $ips }}
1818
{{- end -}}
1919

20+
{{/*
21+
Get Kubernetes API Endpoint from cozystack deployment
22+
Returns host:port format
23+
*/}}
24+
{{- define "cozystack.kubernetesAPIEndpoint" -}}
25+
{{- $cozyDeployment := lookup "apps/v1" "Deployment" "cozy-system" "cozystack" }}
26+
{{- $cozyContainers := dig "spec" "template" "spec" "containers" list $cozyDeployment }}
27+
{{- $kubernetesServiceHost := "" }}
28+
{{- $kubernetesServicePort := "" }}
29+
{{- range $cozyContainers }}
30+
{{- if eq .name "cozystack" }}
31+
{{- range .env }}
32+
{{- if eq .name "KUBERNETES_SERVICE_HOST" }}
33+
{{- $kubernetesServiceHost = .value }}
34+
{{- end }}
35+
{{- if eq .name "KUBERNETES_SERVICE_PORT" }}
36+
{{- $kubernetesServicePort = .value }}
37+
{{- end }}
38+
{{- end }}
39+
{{- end }}
40+
{{- end }}
41+
{{- if eq $kubernetesServiceHost "" }}
42+
{{- $kubernetesServiceHost = "kubernetes.default.svc" }}
43+
{{- end }}
44+
{{- if eq $kubernetesServicePort "" }}
45+
{{- $kubernetesServicePort = "443" }}
46+
{{- end }}
47+
{{- printf "%s:%s" $kubernetesServiceHost $kubernetesServicePort }}
48+
{{- end -}}
49+
2050
{{- define "cozystack.defaultDashboardValues" -}}
2151
kubeapps:
2252
{{- if .Capabilities.APIVersions.Has "source.toolkit.fluxcd.io/v1" }}
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
apiVersion: apps/v1
2+
kind: StatefulSet
3+
metadata:
4+
name: cozystack-assets
5+
namespace: cozy-system
6+
labels:
7+
app: cozystack-assets
8+
spec:
9+
serviceName: cozystack-assets
10+
replicas: 1
11+
selector:
12+
matchLabels:
13+
app: cozystack-assets
14+
template:
15+
metadata:
16+
labels:
17+
app: cozystack-assets
18+
spec:
19+
hostNetwork: true
20+
containers:
21+
- name: assets-server
22+
image: "{{ .Values.cozystack.image }}"
23+
command:
24+
- /usr/bin/cozystack-assets-server
25+
- "-dir=/cozystack/assets"
26+
- "-address=:8123"
27+
ports:
28+
- name: http
29+
containerPort: 8123
30+
hostPort: 8123
31+
tolerations:
32+
- operator: Exists
33+
---
34+
apiVersion: rbac.authorization.k8s.io/v1
35+
kind: Role
36+
metadata:
37+
name: cozystack-assets-reader
38+
namespace: cozy-system
39+
rules:
40+
- apiGroups: [""]
41+
resources:
42+
- pods/proxy
43+
resourceNames:
44+
- cozystack-assets-0
45+
verbs:
46+
- get
47+
- create
48+
- update
49+
---
50+
apiVersion: rbac.authorization.k8s.io/v1
51+
kind: RoleBinding
52+
metadata:
53+
name: cozystack-assets-reader
54+
namespace: cozy-system
55+
subjects:
56+
- kind: User
57+
name: cozystack-assets-reader
58+
apiGroup: rbac.authorization.k8s.io
59+
roleRef:
60+
kind: Role
61+
name: cozystack-assets-reader
62+
apiGroup: rbac.authorization.k8s.io
63+
---
64+
apiVersion: v1
65+
kind: Service
66+
metadata:
67+
name: cozystack-assets
68+
namespace: cozy-system
69+
spec:
70+
ports:
71+
- name: http
72+
port: 80
73+
targetPort: 8123
74+
selector:
75+
app: cozystack-assets
76+
type: ClusterIP
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
apiVersion: apps/v1
2+
kind: StatefulSet
3+
metadata:
4+
name: cozystack-assets
5+
namespace: cozy-system
6+
labels:
7+
app: cozystack-assets
8+
spec:
9+
serviceName: cozystack-assets
10+
replicas: 1
11+
selector:
12+
matchLabels:
13+
app: cozystack-assets
14+
template:
15+
metadata:
16+
labels:
17+
app: cozystack-assets
18+
spec:
19+
hostNetwork: true
20+
containers:
21+
- name: assets-server
22+
image: "{{ .Values.cozystack.image }}"
23+
command:
24+
- /usr/bin/cozystack-assets-server
25+
- "-dir=/cozystack/assets"
26+
- "-address=:8123"
27+
ports:
28+
- name: http
29+
containerPort: 8123
30+
hostPort: 8123
31+
tolerations:
32+
- operator: Exists
33+
---
34+
apiVersion: rbac.authorization.k8s.io/v1
35+
kind: Role
36+
metadata:
37+
name: cozystack-assets-reader
38+
namespace: cozy-system
39+
rules:
40+
- apiGroups: [""]
41+
resources:
42+
- pods/proxy
43+
resourceNames:
44+
- cozystack-assets-0
45+
verbs:
46+
- get
47+
- create
48+
- update
49+
---
50+
apiVersion: rbac.authorization.k8s.io/v1
51+
kind: RoleBinding
52+
metadata:
53+
name: cozystack-assets-reader
54+
namespace: cozy-system
55+
subjects:
56+
- kind: User
57+
name: cozystack-assets-reader
58+
apiGroup: rbac.authorization.k8s.io
59+
roleRef:
60+
kind: Role
61+
name: cozystack-assets-reader
62+
apiGroup: rbac.authorization.k8s.io
63+
---
64+
apiVersion: v1
65+
kind: Service
66+
metadata:
67+
name: cozystack-assets
68+
namespace: cozy-system
69+
spec:
70+
ports:
71+
- name: http
72+
port: 80
73+
targetPort: 8123
74+
selector:
75+
app: cozystack-assets
76+
type: ClusterIP

‎packages/core/platform/templates/helmrepos.yaml‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ metadata:
88
cozystack.io/repository: system
99
spec:
1010
interval: 5m0s
11-
url: http://cozystack.cozy-system.svc/repos/system
11+
url: https://{{ include "cozystack.kubernetesAPIEndpoint" . }}/api/v1/namespaces/cozy-system/pods/cozystack-assets-0/proxy/repos/system
12+
certSecretRef:
13+
name: cozystack-assets-tls
1214
---
1315
apiVersion: source.toolkit.fluxcd.io/v1
1416
kind: HelmRepository
@@ -20,7 +22,9 @@ metadata:
2022
cozystack.io/repository: apps
2123
spec:
2224
interval: 5m0s
23-
url: http://cozystack.cozy-system.svc/repos/apps
25+
url: https://{{ include "cozystack.kubernetesAPIEndpoint" . }}/api/v1/namespaces/cozy-system/pods/cozystack-assets-0/proxy/repos/apps
26+
certSecretRef:
27+
name: cozystack-assets-tls
2428
---
2529
apiVersion: source.toolkit.fluxcd.io/v1
2630
kind: HelmRepository
@@ -31,4 +35,6 @@ metadata:
3135
cozystack.io/repository: extra
3236
spec:
3337
interval: 5m0s
34-
url: http://cozystack.cozy-system.svc/repos/extra
38+
url: https://{{ include "cozystack.kubernetesAPIEndpoint" . }}/api/v1/namespaces/cozy-system/pods/cozystack-assets-0/proxy/repos/extra
39+
certSecretRef:
40+
name: cozystack-assets-tls

‎packages/core/platform/values.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
cozystack:
2+
image: ghcr.io/cozystack/cozystack/installer:v0.38.2@sha256:9ff92b655de6f9bea3cba4cd42dcffabd9aace6966dcfb1cc02dda2420ea4a15

‎packages/extra/monitoring/templates/dashboards.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ spec:
1111
instanceSelector:
1212
matchLabels:
1313
dashboards: grafana
14-
url: http://cozystack.cozy-system.svc/dashboards/{{ . }}.json
14+
url: http://cozystack-assets.cozy-system.svc/dashboards/{{ . }}.json
1515
{{- end }}
1616
{{- end }}

‎scripts/installer.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ make -C packages/core/platform namespaces-apply
6969
# Install fluxcd
7070
ensure_fluxcd
7171

72+
# Install fluxcd certificates
73+
./scripts/issue-flux-certificates.sh
74+
7275
# Install platform chart
7376
make -C packages/core/platform reconcile
7477

0 commit comments

Comments
 (0)