Skip to content

Commit a2cc83d

Browse files
authored
move fluxcd and operator back to system (#188)
Separate and move fluxcd and fluxcd-operator from `core` to `system`. It should not be problem with self-update now, since we correctly set dependsOn option, it ensures ordered update of flux instance right after flux-operator. As part of #184 and #185 fixes #169 Signed-off-by: Andrei Kvapil <[email protected]>
1 parent cf1d9fa commit a2cc83d

33 files changed

Lines changed: 184 additions & 126 deletions

‎hack/e2e.sh‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -294,22 +294,22 @@ kubectl patch -n tenant-root hr/tenant-root --type=merge -p '{"spec":{ "values":
294294
timeout 60 sh -c 'until kubectl get hr -n tenant-root etcd ingress monitoring tenant-root; do sleep 1; done'
295295

296296
# Wait for HelmReleases be installed
297-
kubectl wait --timeout=2m --for=condition=ready hr -n tenant-root etcd ingress monitoring tenant-root
297+
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr etcd ingress monitoring tenant-root
298298

299299
# Wait for nginx-ingress-controller
300300
timeout 60 sh -c 'until kubectl get deploy -n tenant-root root-ingress-controller; do sleep 1; done'
301-
kubectl wait deploy -n tenant-root --timeout=5m --for=condition=available root-ingress-controller
301+
kubectl wait --timeout=5m --for=condition=available -n tenant-root deploy root-ingress-controller
302302

303303
# Wait for etcd
304-
kubectl wait --for=jsonpath=.status.readyReplicas=3 -n tenant-root --timeout=5m sts etcd
304+
kubectl wait --timeout=5m --for=jsonpath=.status.readyReplicas=3 -n tenant-root sts etcd
305305

306306
# Wait for Victoria metrics
307-
kubectl wait deploy -n tenant-root --timeout=5m --for=condition=available vmalert-vmalert vminsert-longterm vminsert-shortterm
308-
kubectl wait --for=jsonpath=.status.readyReplicas=2 -n tenant-root --timeout=5m sts vmalertmanager-alertmanager vmselect-longterm vmselect-shortterm vmstorage-longterm vmstorage-shortterm
307+
kubectl wait --timeout=5m --for=condition=available deploy -n tenant-root vmalert-vmalert vminsert-longterm vminsert-shortterm
308+
kubectl wait --timeout=5m --for=jsonpath=.status.readyReplicas=2 -n tenant-root sts vmalertmanager-alertmanager vmselect-longterm vmselect-shortterm vmstorage-longterm vmstorage-shortterm
309309

310310
# Wait for grafana
311-
kubectl wait --for=condition=ready clusters.postgresql.cnpg.io -n tenant-root grafana-db
312-
kubectl wait deploy -n tenant-root --timeout=5m --for=condition=available grafana-deployment
311+
kubectl wait --timeout=5m --for=condition=ready -n tenant-root clusters.postgresql.cnpg.io grafana-db
312+
kubectl wait --timeout=5m --for=condition=available -n tenant-root deploy grafana-deployment
313313

314314
# Get IP of nginx-ingress
315315
ip=$(kubectl get svc -n tenant-root root-ingress-controller -o jsonpath='{.status.loadBalancer.ingress..ip}')

‎packages/core/fluxcd/Makefile‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎packages/core/fluxcd/templates/flux-instance.yaml‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎packages/core/fluxcd/values.yaml‎

Lines changed: 0 additions & 55 deletions
This file was deleted.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
2-
"buildx.build.ref": "priceless_leavitt/priceless_leavitt0/d75hbe5lm96nutwocaw0h8ohc",
2+
"buildx.build.ref": "priceless_leavitt/priceless_leavitt0/h4dfyd134l9durh9d02r2u2uu",
33
"containerimage.descriptor": {
44
"mediaType": "application/vnd.docker.distribution.manifest.list.v2+json",
5-
"digest": "sha256:a5544e0cf76b09b421345906d2e85282ba8c2187e9db814cfe5c08ddd9ee491a",
5+
"digest": "sha256:b5cbbb921a240d05c6775aab15c99432180c5547801ef6cb6ca51303eeb489e1",
66
"size": 685
77
},
8-
"containerimage.digest": "sha256:a5544e0cf76b09b421345906d2e85282ba8c2187e9db814cfe5c08ddd9ee491a",
8+
"containerimage.digest": "sha256:b5cbbb921a240d05c6775aab15c99432180c5547801ef6cb6ca51303eeb489e1",
99
"image.name": "ghcr.io/aenix-io/cozystack/cozystack:latest"
1010
}

‎packages/core/platform/bundles/distro-full.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
22

33
releases:
4+
- name: fluxcd-operator
5+
releaseName: fluxcd-operator
6+
chart: cozy-fluxcd-operator
7+
namespace: cozy-fluxcd
8+
privileged: true
9+
dependsOn: []
10+
11+
- name: fluxcd
12+
releaseName: fluxcd
13+
chart: cozy-fluxcd
14+
namespace: cozy-fluxcd
15+
dependsOn: [fluxcd-operator,cilium]
16+
417
- name: cilium
518
releaseName: cilium
619
chart: cozy-cilium

‎packages/core/platform/bundles/distro-hosted.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
22

33
releases:
4+
- name: fluxcd-operator
5+
releaseName: fluxcd-operator
6+
chart: cozy-fluxcd-operator
7+
namespace: cozy-fluxcd
8+
privileged: true
9+
dependsOn: []
10+
11+
- name: fluxcd
12+
releaseName: fluxcd
13+
chart: cozy-fluxcd
14+
namespace: cozy-fluxcd
15+
dependsOn: [fluxcd-operator]
16+
417
- name: cert-manager
518
releaseName: cert-manager
619
chart: cozy-cert-manager

‎packages/core/platform/bundles/paas-full.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
22

33
releases:
4+
- name: fluxcd-operator
5+
releaseName: fluxcd-operator
6+
chart: cozy-fluxcd-operator
7+
namespace: cozy-fluxcd
8+
privileged: true
9+
dependsOn: []
10+
11+
- name: fluxcd
12+
releaseName: fluxcd
13+
chart: cozy-fluxcd
14+
namespace: cozy-fluxcd
15+
dependsOn: [fluxcd-operator,cilium,kubeovn]
16+
417
- name: cilium
518
releaseName: cilium
619
chart: cozy-cilium

‎packages/core/platform/bundles/paas-hosted.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,19 @@
11
{{- $cozyConfig := lookup "v1" "ConfigMap" "cozy-system" "cozystack" }}
22

33
releases:
4+
- name: fluxcd-operator
5+
releaseName: fluxcd-operator
6+
chart: cozy-fluxcd-operator
7+
namespace: cozy-fluxcd
8+
privileged: true
9+
dependsOn: []
10+
11+
- name: fluxcd
12+
releaseName: fluxcd
13+
chart: cozy-fluxcd
14+
namespace: cozy-fluxcd
15+
dependsOn: [fluxcd-operator]
16+
417
- name: cert-manager
518
releaseName: cert-manager
619
chart: cozy-cert-manager

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
{{/* Add extra namespaces */}}
1818
{{- $_ := set $namespaces "cozy-public" false }}
19-
{{- $_ := set $namespaces "cozy-fluxcd" true }}
2019

2120
{{- range $namespace, $privileged := $namespaces }}
2221
---

0 commit comments

Comments
 (0)