Skip to content

Commit 1875fa5

Browse files
committed
fix: use latest transpire conventions
1 parent fb2de41 commit 1875fa5

18 files changed

+118
-262
lines changed

apps/arcanum.py

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
from transpire import emit
21
from apps.versions import versions
32

43
name = "arcanum"
54

6-
def objects() -> None:
5+
def objects():
76
# NOTE: arcanum-secret is manually created, as it has a secret key that we need for bootstrap.
8-
emit(
9-
[
7+
manifests = [
108
{
119
"apiVersion": "v1",
1210
"kind": "ServiceAccount",
@@ -159,10 +157,11 @@ def objects() -> None:
159157
},
160158
},
161159
]
162-
)
160+
161+
for manifest in manifests:
162+
yield manifest
163163

164-
emit(
165-
[
164+
manifests = [
166165
{
167166
"apiVersion": "apiextensions.k8s.io/v1",
168167
"kind": "CustomResourceDefinition",
@@ -228,4 +227,7 @@ def objects() -> None:
228227
},
229228
}
230229
]
231-
)
230+
231+
for manifest in manifests:
232+
yield manifest
233+

apps/argocd.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import requests
22
import yaml
3-
from transpire import emit, surgery
3+
from transpire import surgery
44
from transpire.resources.ingress import Ingress
55

66
from apps.versions import versions
@@ -22,12 +22,12 @@
2222
}
2323

2424

25-
def objects() -> None:
25+
def objects():
2626
contents = requests.get(
2727
f"https://raw.githubusercontent.com/argoproj/argo-cd/v{versions['argocd']['version']}/manifests/ha/install.yaml",
2828
)
2929
contents.raise_for_status()
30-
emit(
30+
yield from (
3131
surgery.edit_manifests(
3232
{
3333
("ConfigMap", "argocd-cm"): lambda m: surgery.shelve(
@@ -91,7 +91,6 @@ def objects() -> None:
9191
)
9292
)
9393

94-
ingress = Ingress.simple(
94+
yield Ingress.simple(
9595
"argo.ocf.berkeley.edu", "argocd-server", "https", "argocd-server"
9696
)
97-
emit(ingress)

apps/argoci.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
from __future__ import annotations
2+
from typing import Generator
23

34
import requests
45
import yaml
5-
from transpire import emit
66

77
from apps.versions import versions
88

99

1010
name = "argoci"
1111

12-
def objects() -> None:
12+
def objects() -> Generator[dict, None, None]:
1313
# TODO: Create argo-events namespace.
1414

1515
argo_workflows = requests.get(
1616
f"https://github.com/argoproj/argo-workflows/releases/download/v{versions['argo-workflows']['version']}/namespace-install.yaml",
1717
)
1818
argo_workflows.raise_for_status()
19-
emit(yaml.safe_load_all(argo_workflows.text))
19+
yield from yaml.safe_load_all(argo_workflows.text)
2020

2121
argo_events = requests.get(
2222
f"https://raw.githubusercontent.com/argoproj/argo-events/v{versions['argo-events']['version']}/manifests/install.yaml",
2323
)
2424
argo_events.raise_for_status()
25-
emit(yaml.safe_load_all(argo_events.text))
25+
yield from yaml.safe_load_all(argo_events.text)

apps/cert_manager.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from transpire import emit, helm
1+
from transpire import helm
22

33
from apps.versions import versions
44

@@ -22,11 +22,11 @@
2222

2323
name = "cert-manager"
2424

25-
def objects() -> None:
26-
helm_contents = helm.build_chart_from_versions(
25+
def objects():
26+
yield from helm.build_chart_from_versions(
2727
name="cert-manager",
2828
versions=versions,
2929
values=values,
3030
)
31-
emit(helm_contents)
32-
emit(cluster_issuer)
31+
yield cluster_issuer
32+

apps/cilium.py

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
from transpire import emit, helm
1+
from transpire import helm
22

33
from apps.versions import versions
44

55
values = {
66
"kubeProxyReplacement": "strict",
7-
"k8sServiceHost": "127.0.0.1",
7+
"k8sServiceHost": "k8s0.ocf.io",
88
"k8sServicePort": "6443",
99
"nativeRoutingCIDR": "10.0.0.0/8",
1010
"containerRuntime": {
@@ -16,14 +16,16 @@
1616
"relay": {"enabled": True},
1717
"ui": {"enabled": True},
1818
},
19+
"bpf": {
20+
"masquerade": True,
21+
},
1922
}
2023

2124
name = "cilium"
22-
def objects() -> None:
23-
emit(
24-
helm.build_chart_from_versions(
25-
name="cilium",
26-
versions=versions,
27-
values=values,
28-
)
25+
26+
def objects():
27+
yield from helm.build_chart_from_versions(
28+
name="cilium",
29+
versions=versions,
30+
values=values,
2931
)

apps/contour.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from transpire import emit, helm
1+
from transpire import helm
22

33
from apps.versions import versions
44

@@ -12,11 +12,9 @@
1212

1313
name = "contour"
1414

15-
def objects() -> None:
16-
emit(
17-
helm.build_chart_from_versions(
18-
name="contour",
19-
versions=versions,
20-
values=values,
21-
)
15+
def objects():
16+
yield from helm.build_chart_from_versions(
17+
name="contour",
18+
versions=versions,
19+
values=values,
2220
)

apps/coredns.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from transpire import emit, helm
1+
from transpire import helm
22

33
from apps.versions import versions
44

@@ -7,17 +7,16 @@
77
# TODO: This is a hardcoded variable from the kubelet configuration.
88
# Consider automatically grabbing this value.
99
"service": {
10-
"clusterIP": "10.32.0.10",
10+
"clusterIP": "10.96.0.10",
1111
},
1212
}
1313

1414
name = "coredns"
15+
namespace = "kube-system"
1516

16-
def objects() -> None:
17-
emit(
18-
helm.build_chart_from_versions(
19-
name="coredns",
20-
versions=versions,
21-
values=values,
22-
)
17+
def objects():
18+
yield from helm.build_chart_from_versions(
19+
name="coredns",
20+
versions=versions,
21+
values=values,
2322
)

apps/elastic.py

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

apps/harbor.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from transpire import emit, helm, surgery
1+
from transpire import helm, surgery
22

33
from apps.versions import versions
44

@@ -46,14 +46,12 @@ def strip_secret_checksum(m):
4646
return m
4747

4848

49-
def objects() -> None:
50-
emit(
51-
[
49+
def objects():
50+
yield from [
5251
strip_secret_checksum(m)
5352
for m in helm.build_chart_from_versions(
5453
name="harbor",
5554
versions=versions,
5655
values=values,
5756
)
5857
]
59-
)

apps/keycloak.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import requests
22
import yaml
3-
from transpire import emit
43

54
name = "keycloak"
65
base_url = (
@@ -31,7 +30,7 @@
3130
}
3231

3332

34-
def objects() -> None:
33+
def objects():
3534
for path in paths:
36-
emit(yaml.safe_load_all(requests.get(base_url.format(path)).text))
37-
emit(settings)
35+
yield from yaml.safe_load_all(requests.get(base_url.format(path)).text)
36+
yield settings

0 commit comments

Comments
 (0)