@ydkn/pulumi-components 0.8.8 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (182) hide show
  1. package/index.d.ts +5 -1
  2. package/index.js +5 -1
  3. package/index.js.map +1 -1
  4. package/lib/alpine/config.d.ts +19 -0
  5. package/lib/alpine/config.js +195 -0
  6. package/lib/alpine/config.js.map +1 -0
  7. package/lib/alpine/deployment.js +2 -2
  8. package/lib/alpine/deployment.js.map +1 -1
  9. package/lib/alpine/host.d.ts +25 -0
  10. package/lib/alpine/host.js +98 -0
  11. package/lib/alpine/host.js.map +1 -0
  12. package/lib/alpine/index.d.ts +3 -1
  13. package/lib/alpine/index.js +3 -1
  14. package/lib/alpine/index.js.map +1 -1
  15. package/lib/avahi/deployment.d.ts +2 -0
  16. package/lib/avahi/deployment.js +44 -20
  17. package/lib/avahi/deployment.js.map +1 -1
  18. package/lib/avahi/service.d.ts +2 -2
  19. package/lib/avahi/service.js +9 -7
  20. package/lib/avahi/service.js.map +1 -1
  21. package/lib/certManager/certificate.js +1 -1
  22. package/lib/certManager/certificate.js.map +1 -1
  23. package/lib/certManager/issuer.d.ts +1 -1
  24. package/lib/certManager/operator.js +8 -8
  25. package/lib/certManager/operator.js.map +1 -1
  26. package/lib/cups/avahiService.d.ts +1 -1
  27. package/lib/cups/avahiService.js +1 -1
  28. package/lib/cups/avahiService.js.map +1 -1
  29. package/lib/cups/deployment.d.ts +1 -1
  30. package/lib/cups/deployment.js +3 -3
  31. package/lib/cups/deployment.js.map +1 -1
  32. package/lib/dashy/deployment.d.ts +35 -0
  33. package/lib/dashy/deployment.js +78 -0
  34. package/lib/dashy/deployment.js.map +1 -0
  35. package/lib/dashy/index.d.ts +2 -0
  36. package/lib/dashy/index.js +3 -0
  37. package/lib/dashy/index.js.map +1 -0
  38. package/lib/dhcpd/deployment.d.ts +6 -6
  39. package/lib/dhcpd/deployment.js +40 -30
  40. package/lib/dhcpd/deployment.js.map +1 -1
  41. package/lib/externalDns/operator.d.ts +2 -2
  42. package/lib/externalDns/operator.js +5 -16
  43. package/lib/externalDns/operator.js.map +1 -1
  44. package/lib/fcos/assets/install-ready.service +12 -0
  45. package/lib/fcos/assets/install-run.service +14 -0
  46. package/lib/fcos/config.d.ts +2 -5
  47. package/lib/fcos/config.js +44 -34
  48. package/lib/fcos/config.js.map +1 -1
  49. package/lib/fcos/host.d.ts +8 -12
  50. package/lib/fcos/host.js +45 -39
  51. package/lib/fcos/host.js.map +1 -1
  52. package/lib/fcos/index.d.ts +3 -3
  53. package/lib/fcos/index.js.map +1 -1
  54. package/lib/flatcar/assets/install-ready.service +12 -0
  55. package/lib/flatcar/assets/install-run.service +14 -0
  56. package/lib/flatcar/config.d.ts +3 -5
  57. package/lib/flatcar/config.js +44 -42
  58. package/lib/flatcar/config.js.map +1 -1
  59. package/lib/flatcar/host.d.ts +8 -12
  60. package/lib/flatcar/host.js +39 -29
  61. package/lib/flatcar/host.js.map +1 -1
  62. package/lib/flatcar/index.d.ts +3 -3
  63. package/lib/flatcar/index.js.map +1 -1
  64. package/lib/freeradius/deployment.js +1 -1
  65. package/lib/gitlab/project.js +4 -4
  66. package/lib/gitlab/project.js.map +1 -1
  67. package/lib/grafana/alloy.d.ts +1 -1
  68. package/lib/grafana/alloy.js +11 -12
  69. package/lib/grafana/alloy.js.map +1 -1
  70. package/lib/grafana/deployment.js +2 -2
  71. package/lib/grafana/deployment.js.map +1 -1
  72. package/lib/hcloud/assets/alpine-install.sh +45 -0
  73. package/lib/hcloud/assets/fcos-install.sh +13 -6
  74. package/lib/hcloud/assets/flatcar-install.sh +2 -2
  75. package/lib/hcloud/cluster.d.ts +9 -2
  76. package/lib/hcloud/cluster.js +273 -117
  77. package/lib/hcloud/cluster.js.map +1 -1
  78. package/lib/homeAssistant/deployment.d.ts +38 -0
  79. package/lib/homeAssistant/deployment.js +183 -0
  80. package/lib/homeAssistant/deployment.js.map +1 -0
  81. package/lib/homeAssistant/index.d.ts +2 -0
  82. package/lib/homeAssistant/index.js +3 -0
  83. package/lib/homeAssistant/index.js.map +1 -0
  84. package/lib/jellyfin/deployment.d.ts +1 -1
  85. package/lib/jellyfin/deployment.js +2 -5
  86. package/lib/jellyfin/deployment.js.map +1 -1
  87. package/lib/k0s/cluster.js +9 -4
  88. package/lib/k0s/cluster.js.map +1 -1
  89. package/lib/kubernetes/crashedCleanup.js +19 -2
  90. package/lib/kubernetes/crashedCleanup.js.map +1 -1
  91. package/lib/kubernetes/transformations/removeCrdDescriptions.js.map +1 -1
  92. package/lib/kubernetes/v1/secureIngress.js.map +1 -1
  93. package/lib/kured/deployment.d.ts +16 -0
  94. package/lib/kured/deployment.js +42 -0
  95. package/lib/kured/deployment.js.map +1 -0
  96. package/lib/kured/index.d.ts +2 -0
  97. package/lib/kured/index.js +3 -0
  98. package/lib/kured/index.js.map +1 -0
  99. package/lib/loki/deployment.js +8 -1
  100. package/lib/loki/deployment.js.map +1 -1
  101. package/lib/metallb/controller.d.ts +3 -0
  102. package/lib/metallb/controller.js +2 -0
  103. package/lib/metallb/controller.js.map +1 -1
  104. package/lib/mongodb/cluster.js +1 -1
  105. package/lib/mongodb/cluster.js.map +1 -1
  106. package/lib/musicAssistant/deployment.d.ts +26 -0
  107. package/lib/musicAssistant/deployment.js +77 -0
  108. package/lib/musicAssistant/deployment.js.map +1 -0
  109. package/lib/musicAssistant/index.d.ts +2 -0
  110. package/lib/musicAssistant/index.js +3 -0
  111. package/lib/musicAssistant/index.js.map +1 -0
  112. package/lib/nats/cluster.js +14 -10
  113. package/lib/nats/cluster.js.map +1 -1
  114. package/lib/netbird/agent.d.ts +0 -4
  115. package/lib/netbird/agent.js +5 -38
  116. package/lib/netbird/agent.js.map +1 -1
  117. package/lib/netbird/management.d.ts +1 -0
  118. package/lib/netbird/management.js +18 -3
  119. package/lib/netbird/management.js.map +1 -1
  120. package/lib/node/config.d.ts +37 -0
  121. package/lib/node/config.js +2 -0
  122. package/lib/node/config.js.map +1 -0
  123. package/lib/node/index.d.ts +2 -2
  124. package/lib/node/index.js.map +1 -1
  125. package/lib/node/node.d.ts +1 -1
  126. package/lib/plex/mediaServer.d.ts +1 -1
  127. package/lib/plex/mediaServer.js +4 -4
  128. package/lib/plex/mediaServer.js.map +1 -1
  129. package/lib/postgresql/cluster.js +1 -1
  130. package/lib/postgresql/cluster.js.map +1 -1
  131. package/lib/raspberrypi/cluster.d.ts +5 -2
  132. package/lib/raspberrypi/cluster.js +128 -76
  133. package/lib/raspberrypi/cluster.js.map +1 -1
  134. package/lib/redis/standalone.js +2 -2
  135. package/lib/rook/blockPool.js +1 -0
  136. package/lib/rook/blockPool.js.map +1 -1
  137. package/lib/rook/cluster.d.ts +0 -2
  138. package/lib/rook/cluster.js +10 -35
  139. package/lib/rook/cluster.js.map +1 -1
  140. package/lib/rook/filesystem.js +2 -1
  141. package/lib/rook/filesystem.js.map +1 -1
  142. package/lib/rook/operator.d.ts +8 -0
  143. package/lib/rook/operator.js +128 -122
  144. package/lib/rook/operator.js.map +1 -1
  145. package/lib/rook/sharedFilesystem.js +1 -0
  146. package/lib/rook/sharedFilesystem.js.map +1 -1
  147. package/lib/samba/avahiService.d.ts +1 -1
  148. package/lib/samba/avahiService.js +1 -1
  149. package/lib/samba/avahiService.js.map +1 -1
  150. package/lib/samba/dc.js +27 -1
  151. package/lib/samba/dc.js.map +1 -1
  152. package/lib/samba/deployment.d.ts +2 -1
  153. package/lib/samba/deployment.js +5 -6
  154. package/lib/samba/deployment.js.map +1 -1
  155. package/lib/torproxy/deployment.js +2 -3
  156. package/lib/torproxy/deployment.js.map +1 -1
  157. package/lib/traefik/controller.d.ts +12 -0
  158. package/lib/traefik/controller.js +37 -4
  159. package/lib/traefik/controller.js.map +1 -1
  160. package/lib/transmission/deployment.d.ts +5 -3
  161. package/lib/transmission/deployment.js +27 -11
  162. package/lib/transmission/deployment.js.map +1 -1
  163. package/lib/ubuntu/deployment.js +2 -2
  164. package/lib/ubuntu/deployment.js.map +1 -1
  165. package/lib/unifi/index.d.ts +2 -2
  166. package/lib/unifi/index.js +2 -2
  167. package/lib/unifi/index.js.map +1 -1
  168. package/lib/unifi/{networkServer.d.ts → osServer.d.ts} +7 -16
  169. package/lib/unifi/{networkServer.js → osServer.js} +86 -139
  170. package/lib/unifi/osServer.js.map +1 -0
  171. package/lib/utils/args.js +1 -1
  172. package/lib/utils/args.js.map +1 -1
  173. package/lib/velero/operator.d.ts +2 -2
  174. package/lib/velero/operator.js +6 -6
  175. package/lib/velero/operator.js.map +1 -1
  176. package/lib/wireguard/deployment.js +1 -1
  177. package/lib/zitadel/deployment.js +1 -1
  178. package/lib/zitadel/deployment.js.map +1 -1
  179. package/package.json +28 -24
  180. package/lib/netbird/assets/nftables.sh +0 -44
  181. package/lib/unifi/assets/init-mongo.sh +0 -19
  182. package/lib/unifi/networkServer.js.map +0 -1
@@ -29,13 +29,40 @@ export class Dhcpd extends ComponentResource {
29
29
  this.config = new k8s.core.v1.ConfigMap(name, {
30
30
  metadata,
31
31
  data: {
32
- "dhcpd.conf": pulumi.all([args.subnets]).apply(([subnets]) => {
33
- const confOptions = ["authoritative;", "ddns-update-style none;"];
34
- for (const s of subnets) {
35
- confOptions.push(`subnet ${s.subnet} netmask ${s.netmask} {`, `range ${s.start} ${s.end};`, `option domain-name-servers ${s.nameservers.join(", ")};`, `option routers ${s.router};`, "default-lease-time 3600;", "max-lease-time 86400;", "}");
36
- }
37
- return confOptions.join("\n");
38
- }),
32
+ "dhcp4.conf": pulumi.all([args.subnets]).apply(([subnets]) => pulumi.all(subnets).apply((subnets) => {
33
+ return JSON.stringify({
34
+ Dhcp4: {
35
+ "valid-lifetime": 86400,
36
+ "renew-timer": 3600,
37
+ "rebind-timer": 7200,
38
+ "interfaces-config": {
39
+ interfaces: subnets.map((subnet) => subnet.interface),
40
+ },
41
+ "lease-database": {
42
+ type: "memfile",
43
+ persist: true,
44
+ name: "/usr/local/var/lib/kea/dhcp4.leases",
45
+ },
46
+ subnet4: subnets.map((subnet, idx) => {
47
+ return {
48
+ id: idx + 1,
49
+ subnet: subnet.cidr,
50
+ pools: [{ pool: `${subnet.start} - ${subnet.end}` }],
51
+ "option-data": [
52
+ {
53
+ name: "domain-name-servers",
54
+ data: subnet.nameservers.join(", "),
55
+ },
56
+ {
57
+ name: "routers",
58
+ data: subnet.router,
59
+ },
60
+ ],
61
+ };
62
+ }),
63
+ },
64
+ });
65
+ })),
39
66
  },
40
67
  }, opts);
41
68
  this.deployment = new k8s.apps.v1.Deployment(name, {
@@ -53,41 +80,24 @@ export class Dhcpd extends ComponentResource {
53
80
  { effect: "NoExecute", operator: "Exists" },
54
81
  ],
55
82
  hostNetwork: true,
56
- initContainers: [
57
- {
58
- name: "settings",
59
- image: "busybox:latest",
60
- command: ["/bin/sh"],
61
- args: ["-c", "cat /config/dhcpd.conf > /data/dhcpd.conf"],
62
- volumeMounts: [
63
- { name: "config", mountPath: "/config" },
64
- { name: "data", mountPath: "/data" },
65
- ],
66
- resources: {
67
- requests: { memory: "8Mi", cpu: "100m" },
68
- limits: { memory: "16Mi", cpu: "200m" },
69
- },
70
- },
71
- ],
72
83
  containers: [
73
84
  {
74
- name: "dhcpd",
75
- image: "networkboot/dhcpd:latest",
85
+ name: "kea",
86
+ image: "kometchtech/kea:latest",
76
87
  securityContext: {
77
88
  privileged: true,
78
89
  capabilities: { add: ["NET_ADMIN"] },
79
90
  },
80
- volumeMounts: [{ name: "data", mountPath: "/data" }],
91
+ volumeMounts: [
92
+ { name: "config", mountPath: "/usr/local/etc/kea/kea-dhcp4.conf", subPath: "dhcp4.conf" },
93
+ ],
81
94
  resources: {
82
95
  requests: { memory: "16Mi", cpu: "100m" },
83
96
  limits: { memory: "32Mi", cpu: "400m" },
84
97
  },
85
98
  },
86
99
  ],
87
- volumes: [
88
- { name: "config", configMap: { name: this.config.metadata.name } },
89
- { name: "data", emptyDir: {} },
90
- ],
100
+ volumes: [{ name: "config", configMap: { name: this.config.metadata.name } }],
91
101
  affinity: {
92
102
  podAntiAffinity: {
93
103
  preferredDuringSchedulingIgnoredDuringExecution: [
@@ -1 +1 @@
1
- {"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/dhcpd/deployment.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"deployment.js","sourceRoot":"","sources":["../../../lib/dhcpd/deployment.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,11 @@
1
1
  import * as pulumi from "@pulumi/pulumi";
2
2
  import { ComponentResource } from "../common/index.js";
3
3
  export interface CloudflareArgs {
4
- apiToken: pulumi.Input<string>;
4
+ token: pulumi.Input<string>;
5
5
  proxied?: pulumi.Input<boolean>;
6
6
  }
7
7
  export interface HetznerArgs {
8
- apiToken: pulumi.Input<string>;
8
+ token: pulumi.Input<string>;
9
9
  }
10
10
  export interface ExternalDnsArgs {
11
11
  namespace?: pulumi.Input<string>;
@@ -65,7 +65,7 @@ export class ExternalDns extends ComponentResource {
65
65
  this.providerSecret = new kubernetes.v1.Secret(`${name}-cloudflare`, {
66
66
  metadata: { namespace: this.namespace, name: pulumi.interpolate `${name}-cloudflare` },
67
67
  stringData: {
68
- cloudflare_api_token: pulumi.all([args.cloudflare]).apply(([cloudflare]) => cloudflare.apiToken),
68
+ cloudflare_api_token: pulumi.all([args.cloudflare]).apply(([cloudflare]) => cloudflare.token),
69
69
  },
70
70
  }, opts);
71
71
  helmValues.provider.name = "cloudflare";
@@ -93,33 +93,22 @@ export class ExternalDns extends ComponentResource {
93
93
  this.providerSecret = new kubernetes.v1.Secret(`${name}-hetzner`, {
94
94
  metadata: { namespace: this.namespace, name: pulumi.interpolate `${name}-hetzner` },
95
95
  stringData: {
96
- api_token: pulumi.all([args.hetzner]).apply(([hetzner]) => hetzner.apiToken),
96
+ token: pulumi.all([args.hetzner]).apply(([hetzner]) => hetzner.token),
97
97
  },
98
98
  }, opts);
99
99
  helmValues.provider.name = "webhook";
100
100
  helmValues.provider.webhook = {
101
- image: { repository: "ghcr.io/mconfalonieri/external-dns-hetzner-webhook", tag: "latest" },
101
+ image: { repository: "docker.io/hetzner/external-dns-hetzner-webhook", tag: "v0.3.2" },
102
102
  env: [
103
103
  {
104
- name: "HETZNER_API_KEY",
105
- valueFrom: { secretKeyRef: { name: this.providerSecret.metadata.name, key: "api_token" } },
104
+ name: "HETZNER_TOKEN",
105
+ valueFrom: { secretKeyRef: { name: this.providerSecret.metadata.name, key: "token" } },
106
106
  },
107
- { name: "DEFAULT_TTL", value: "3600" },
108
107
  ],
109
108
  resources: {
110
109
  requests: { memory: "24Mi" },
111
110
  limits: { memory: "32Mi" },
112
111
  },
113
- livenessProbe: {
114
- httpGet: { path: "/health", port: "http-webhook" },
115
- initialDelaySeconds: 10,
116
- timeoutSeconds: 5,
117
- },
118
- readinessProbe: {
119
- httpGet: { path: "/ready", port: "http-webhook" },
120
- initialDelaySeconds: 10,
121
- timeoutSeconds: 5,
122
- },
123
112
  };
124
113
  }
125
114
  this.helmRelease = new kubernetes.helm.v3.Release(name, {
@@ -1 +1 @@
1
- {"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/externalDns/operator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"operator.js","sourceRoot":"","sources":["../../../lib/externalDns/operator.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ [Unit]
2
+ Description=Create file to indicate the system is ready
3
+ Wants=network-online.target
4
+ After=network-online.target
5
+
6
+ [Service]
7
+ Type=oneshot
8
+ RemainAfterExit=yes
9
+ ExecStart=touch /tmp/install-ready
10
+
11
+ [Install]
12
+ WantedBy=multi-user.target
@@ -0,0 +1,14 @@
1
+ [Unit]
2
+ Description=Run abitrary commands after provisioning
3
+ Wants=network-online.target
4
+ After=network-online.target
5
+
6
+ [Service]
7
+ Type=oneshot
8
+ RemainAfterExit=yes
9
+ ExecStart=/usr/local/sbin/install-run
10
+ ExecStartPost=/usr/bin/touch /etc/install-run.done
11
+ ConditionPathExists=!/etc/install-run.done
12
+
13
+ [Install]
14
+ WantedBy=multi-user.target
@@ -1,9 +1,6 @@
1
1
  import * as pulumi from "@pulumi/pulumi";
2
2
  import { ComponentResource } from "../common/index.js";
3
- import { IgnitionArgs } from "../node/index.js";
4
- export interface ConfigArgs extends IgnitionArgs {
5
- hostname: pulumi.Input<string>;
6
- }
3
+ import { OperatingSystemConfigArgs } from "../node/index.js";
7
4
  export declare class Config extends ComponentResource {
8
5
  readonly ignitionConfig: pulumi.Output<string>;
9
6
  /**
@@ -12,7 +9,7 @@ export declare class Config extends ComponentResource {
12
9
  * @param args A bag of arguments to control the FCOS config creation.
13
10
  * @param opts A bag of options that control this resource's behavior.
14
11
  */
15
- constructor(name: string, args: ConfigArgs, opts?: pulumi.ComponentResourceOptions);
12
+ constructor(name: string, args: OperatingSystemConfigArgs, opts?: pulumi.ComponentResourceOptions);
16
13
  private defaultConfig;
17
14
  private assetContent;
18
15
  private encodeContents;
@@ -15,16 +15,8 @@ export class Config extends ComponentResource {
15
15
  constructor(name, args, opts) {
16
16
  super("fcos:config", name, args, opts);
17
17
  this.ignitionConfig = pulumi
18
- .all([
19
- this.defaultConfig(),
20
- args.hostname,
21
- args.users,
22
- args.disks,
23
- args.filesystems,
24
- args.files,
25
- args.systemdUnits,
26
- ])
27
- .apply(([config, hostname, users, disks, filesystems, files, systemdUnits]) => {
18
+ .all([this.defaultConfig(), args.hostname, args.packages, args.users, args.filesystems, args.files, args.run])
19
+ .apply(([config, hostname, packages, users, filesystems, files, run]) => {
28
20
  /* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call */
29
21
  if (hostname !== undefined) {
30
22
  config.storage.files.push({
@@ -34,30 +26,23 @@ export class Config extends ComponentResource {
34
26
  overwrite: true,
35
27
  });
36
28
  }
29
+ for (const pkg of packages ?? []) {
30
+ config.storage.files.push({
31
+ path: `/etc/rpm-ostree-install/${pkg}`,
32
+ contents: this.encodeContents(pkg),
33
+ mode: 0o644,
34
+ overwrite: true,
35
+ });
36
+ }
37
37
  for (const user of users ?? []) {
38
+ user.sshAuthorizedKeys = (user.sshAuthorizedKeys ?? []).map((key) => key.trim());
38
39
  config.passwd.users.push(user);
39
40
  }
40
- for (const disk of disks ?? []) {
41
- config.storage.disks.push({
42
- device: disk.device,
43
- partitions: disk.partitions.map((partition) => {
44
- return {
45
- label: partition.label,
46
- size_mib: partition.size,
47
- start_mib: partition.start,
48
- number: partition.number,
49
- resize: partition.resize,
50
- };
51
- }),
52
- wipe_table: disk.wipeTable,
53
- });
54
- }
55
41
  for (const filesystem of filesystems ?? []) {
56
42
  config.storage.filesystems.push({
57
43
  device: filesystem.device,
58
44
  path: filesystem.path,
59
45
  format: filesystem.format,
60
- label: filesystem.label,
61
46
  });
62
47
  if (filesystem.path !== undefined) {
63
48
  const checkSystemdName = filesystem.device.replace(/-/g, "\\x2d").replace(/^\//, "").replace(/\//g, "-");
@@ -85,12 +70,17 @@ export class Config extends ComponentResource {
85
70
  path: file.path,
86
71
  contents: this.encodeContents(file.contents),
87
72
  mode: file.mode ?? 0o644,
88
- overwrite: file.overwrite ?? true,
73
+ user: file.user,
74
+ group: file.group,
75
+ overwrite: true,
89
76
  });
90
77
  }
91
- for (const unit of systemdUnits ?? []) {
92
- config.systemd.units.push(unit);
93
- }
78
+ config.storage.files.push({
79
+ path: "/usr/local/sbin/install-run",
80
+ contents: this.encodeContents(["#!/bin/bash", "", ...(run ?? []), "", "exit 0"].join("\n")),
81
+ mode: 0o755,
82
+ overwrite: true,
83
+ });
94
84
  return JSON.stringify(config);
95
85
  });
96
86
  this.registerOutputs();
@@ -107,6 +97,12 @@ export class Config extends ComponentResource {
107
97
  filesystems: [],
108
98
  directories: [{ path: "/etc/rpm-ostree-install" }],
109
99
  files: [
100
+ {
101
+ path: "/etc/modules-load.d/wireguard.conf",
102
+ contents: this.encodeContents("wireguard"),
103
+ mode: 0o644,
104
+ overwrite: true,
105
+ },
110
106
  {
111
107
  path: "/etc/sysctl.d/20-silence-audit.conf",
112
108
  contents: this.encodeContents("kernel.printk=4"),
@@ -114,8 +110,12 @@ export class Config extends ComponentResource {
114
110
  overwrite: true,
115
111
  },
116
112
  {
117
- path: "/etc/sysctl.d/10-fs-inotify.conf",
118
- contents: this.encodeContents("fs.inotify.max_user_instances = 8192\nfs.inotify.max_user_watches = 524288"),
113
+ path: "/etc/sysctl.d/10-fs.conf",
114
+ contents: this.encodeContents([
115
+ "fs.file-max = 65536",
116
+ "fs.inotify.max_user_instances = 8192",
117
+ "fs.inotify.max_user_watches = 524288",
118
+ ].join("\n")),
119
119
  overwrite: true,
120
120
  },
121
121
  {
@@ -128,7 +128,6 @@ export class Config extends ComponentResource {
128
128
  contents: this.encodeContents("net.ipv6.conf.all.forwarding = 1"),
129
129
  overwrite: true,
130
130
  },
131
- { path: "/etc/systemd/resolved.conf", append: [this.encodeContents("LLMNR=no")], overwrite: false },
132
131
  {
133
132
  path: "/usr/local/sbin/rpm-ostree-install",
134
133
  contents: this.encodeContents(this.assetContent("rpm-ostree-install.sh")),
@@ -136,15 +135,26 @@ export class Config extends ComponentResource {
136
135
  overwrite: true,
137
136
  },
138
137
  ],
139
- links: [],
140
138
  },
141
139
  systemd: {
142
140
  units: [
141
+ { mask: true, name: "docker.service" },
142
+ { mask: true, name: "docker.socket" },
143
143
  {
144
144
  name: "rpm-ostree-install.service",
145
145
  enabled: true,
146
146
  contents: this.assetContent("rpm-ostree-install.service"),
147
147
  },
148
+ {
149
+ name: "install-ready.service",
150
+ enabled: true,
151
+ contents: this.assetContent("install-ready.service"),
152
+ },
153
+ {
154
+ name: "install-run.service",
155
+ enabled: true,
156
+ contents: this.assetContent("install-run.service"),
157
+ },
148
158
  ],
149
159
  },
150
160
  };
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/fcos/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../../../lib/fcos/config.ts"],"names":[],"mappings":"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"}
@@ -1,21 +1,17 @@
1
1
  import * as pulumi from "@pulumi/pulumi";
2
2
  import * as tls from "@pulumi/tls";
3
3
  import { ComponentResource } from "../common/index.js";
4
- import { ConfigArgs } from "./config.js";
5
- export interface HostUserArgs {
6
- name: pulumi.Input<string>;
7
- groups?: pulumi.Input<pulumi.Input<string>[]>;
8
- }
9
- export interface HostArgs extends ConfigArgs {
10
- sshUsers?: pulumi.Input<pulumi.Input<HostUserArgs>[]>;
4
+ import { OperatingSystemConfigArgs } from "../node/index.js";
5
+ export interface HostArgs extends OperatingSystemConfigArgs {
6
+ sshAuthorizedKeys?: pulumi.Input<pulumi.Input<string>[]>;
11
7
  }
12
8
  export declare class Host extends ComponentResource {
13
- private static readonly defaultModules;
9
+ static readonly defaultUsername = "core";
10
+ private static readonly defaultDeployUsername;
14
11
  private static readonly defaultPackages;
15
- readonly sshPrivateKeys: pulumi.Output<{
16
- [key: string]: tls.PrivateKey;
17
- }>;
18
- readonly ignitionConfig: pulumi.Output<string>;
12
+ readonly deployUsername: string;
13
+ readonly deployPrivateKey: tls.PrivateKey;
14
+ readonly initConfig: pulumi.Output<string>;
19
15
  /**
20
16
  * Create a new FCOS host resource.
21
17
  * @param name The name of the FCOS host resource.
package/lib/fcos/host.js CHANGED
@@ -3,17 +3,20 @@ import * as tls from "@pulumi/tls";
3
3
  import { ComponentResource } from "../common/index.js";
4
4
  import { Config } from "./config.js";
5
5
  export class Host extends ComponentResource {
6
- static defaultModules = ["wireguard"];
6
+ static defaultUsername = "core";
7
+ static defaultDeployUsername = "pulumi";
7
8
  static defaultPackages = [
8
9
  "netcat",
9
10
  "tcpdump",
10
11
  "iperf3",
11
12
  "htop",
12
- "golang-gvisor",
13
- "container-selinux",
13
+ "glances",
14
+ "tmux",
15
+ "smartmontools",
14
16
  ];
15
- sshPrivateKeys;
16
- ignitionConfig;
17
+ deployUsername;
18
+ deployPrivateKey;
19
+ initConfig;
17
20
  /**
18
21
  * Create a new FCOS host resource.
19
22
  * @param name The name of the FCOS host resource.
@@ -23,45 +26,48 @@ export class Host extends ComponentResource {
23
26
  constructor(name, args, opts) {
24
27
  super("fcos:host", name, args, opts);
25
28
  const emptyOpts = this.opts();
26
- this.sshPrivateKeys = pulumi.all([args.sshUsers]).apply(([sshUsers]) => {
27
- const sshPrivateKeys = {};
28
- for (const sshUser of sshUsers ?? []) {
29
- sshPrivateKeys[sshUser.name] = new tls.PrivateKey(`${name}-${sshUser.name}`, { algorithm: "ED25519" }, emptyOpts);
30
- }
31
- return sshPrivateKeys;
32
- });
33
- this.ignitionConfig = new Config(name, {
29
+ this.deployUsername = Host.defaultDeployUsername;
30
+ this.deployPrivateKey = new tls.PrivateKey(`${name}-${Host.defaultDeployUsername}`, { algorithm: "ED25519" }, emptyOpts);
31
+ this.initConfig = new Config(name, {
34
32
  ...args,
35
- files: pulumi.all([args.files ?? []]).apply(([files]) => files.concat(Host.defaultModules
36
- .map((module) => ({
37
- path: `/etc/modules-load.d/${module}.conf`,
38
- contents: module,
39
- mode: 0o644,
40
- }))
41
- .concat(Host.defaultPackages.map((pkg) => ({
42
- path: `/etc/rpm-ostree-install/${pkg}`,
43
- contents: "",
44
- mode: 0o644,
45
- }))))),
33
+ packages: pulumi
34
+ .all([args.packages])
35
+ .apply(([packages]) => pulumi.all(packages ?? []).apply((packages) => packages.concat(Host.defaultPackages))),
46
36
  users: pulumi
47
- .all([args.users, args.sshUsers, this.sshPrivateKeys])
48
- .apply(([users, sshUsers, sshPrivateKeys]) => {
49
- const allUsers = [];
50
- for (const user of users ?? []) {
51
- allUsers.push(user);
37
+ .all([this.deployUsername, this.deployPrivateKey.publicKeyOpenssh, args.users, args.sshAuthorizedKeys])
38
+ .apply(([deployUsername, deployPublicKeyOpenssh, users, sshAuthorizedKeys]) => pulumi.all(users ?? []).apply((users) => {
39
+ let foundDefaultUser = false;
40
+ let foundDeployUser = false;
41
+ for (const user of users) {
42
+ if (user.name === Host.defaultUsername) {
43
+ user.sshAuthorizedKeys = (sshAuthorizedKeys ?? []).concat(user.sshAuthorizedKeys ?? []);
44
+ user.groups = (user.groups ?? []).concat(["sudo"]);
45
+ user.lockPasswd = true;
46
+ foundDefaultUser = true;
47
+ }
48
+ if (user.name === deployUsername) {
49
+ user.sshAuthorizedKeys = [deployPublicKeyOpenssh].concat(user.sshAuthorizedKeys ?? []);
50
+ user.groups = (user.groups ?? []).concat(["sudo"]);
51
+ user.lockPasswd = true;
52
+ foundDeployUser = true;
53
+ }
52
54
  }
53
- for (const sshUser of sshUsers ?? []) {
54
- allUsers.push({
55
- name: sshUser.name,
56
- groups: sshUser.groups,
57
- sshAuthorizedKeys: sshPrivateKeys[sshUser.name].publicKeyOpenssh.apply((key) => [key.trim()]),
55
+ if (!foundDefaultUser) {
56
+ users.push({
57
+ name: Host.defaultUsername,
58
+ groups: ["sudo"],
59
+ sshAuthorizedKeys,
58
60
  });
59
61
  }
60
- return allUsers;
61
- }),
62
- systemdUnits: pulumi
63
- .all([args.systemdUnits])
64
- .apply(([systemdUnits]) => (systemdUnits ?? []).concat({ mask: true, name: "docker.service" }, { mask: true, name: "docker.socket" })),
62
+ if (!foundDeployUser) {
63
+ users.push({
64
+ name: deployUsername,
65
+ groups: ["sudo"],
66
+ sshAuthorizedKeys: [deployPublicKeyOpenssh],
67
+ });
68
+ }
69
+ return users;
70
+ })),
65
71
  }, emptyOpts).ignitionConfig;
66
72
  this.registerOutputs();
67
73
  }
@@ -1 +1 @@
1
- {"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/fcos/host.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"host.js","sourceRoot":"","sources":["../../../lib/fcos/host.ts"],"names":[],"mappings":"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"}
@@ -1,3 +1,3 @@
1
- import { ConfigArgs, Config } from "./config.js";
2
- import { HostUserArgs, HostArgs, Host } from "./host.js";
3
- export { ConfigArgs, Config, HostUserArgs, HostArgs, Host };
1
+ import { Config } from "./config.js";
2
+ import { HostArgs, Host } from "./host.js";
3
+ export { Config, HostArgs, Host };
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/fcos/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAA0B,IAAI,EAAE,MAAM,WAAW,CAAC;AAEzD,OAAO,EAAc,MAAM,EAA0B,IAAI,EAAE,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/fcos/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAY,IAAI,EAAE,MAAM,WAAW,CAAC;AAE3C,OAAO,EAAE,MAAM,EAAY,IAAI,EAAE,CAAC"}
@@ -0,0 +1,12 @@
1
+ [Unit]
2
+ Description=Create file to indicate the system is ready
3
+ Wants=network-online.target
4
+ After=network-online.target
5
+
6
+ [Service]
7
+ Type=oneshot
8
+ RemainAfterExit=yes
9
+ ExecStart=touch /tmp/install-ready
10
+
11
+ [Install]
12
+ WantedBy=multi-user.target
@@ -0,0 +1,14 @@
1
+ [Unit]
2
+ Description=Run abitrary commands after provisioning
3
+ Wants=network-online.target
4
+ After=network-online.target
5
+
6
+ [Service]
7
+ Type=oneshot
8
+ RemainAfterExit=yes
9
+ ExecStart=/usr/local/sbin/install-run
10
+ ExecStartPost=/usr/bin/touch /etc/install-run.done
11
+ ConditionPathExists=!/etc/install-run.done
12
+
13
+ [Install]
14
+ WantedBy=multi-user.target