cluster-builder 0.5.2__tar.gz → 0.5.3__tar.gz

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 (34) hide show
  1. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/PKG-INFO +6 -5
  2. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/README.md +5 -4
  3. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/config/cluster.py +0 -3
  4. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/infrastructure/templates.py +0 -31
  5. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/swarmchestrate.py +109 -21
  6. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/aws/main.tf +13 -11
  7. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/deploy_manifest.tf +12 -2
  8. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/edge/main.tf +14 -11
  9. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/k3s_provider.tf +1 -1
  10. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/openstack/main.tf +121 -41
  11. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/registry_secret.tf +12 -2
  12. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder.egg-info/PKG-INFO +6 -5
  13. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder.egg-info/SOURCES.txt +0 -3
  14. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/pyproject.toml +1 -1
  15. cluster_builder-0.5.2/cluster_builder/templates/ha_user_data.sh.tpl +0 -33
  16. cluster_builder-0.5.2/cluster_builder/templates/master_user_data.sh.tpl +0 -37
  17. cluster_builder-0.5.2/cluster_builder/templates/worker_user_data.sh.tpl +0 -34
  18. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/LICENSE +0 -0
  19. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/__init__.py +0 -0
  20. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/config/__init__.py +0 -0
  21. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/config/postgres.py +0 -0
  22. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/infrastructure/__init__.py +0 -0
  23. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/infrastructure/executor.py +0 -0
  24. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/aws_provider.tf +0 -0
  25. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/edge_provider.tf +0 -0
  26. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/templates/openstack_provider.tf +0 -0
  27. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/utils/__init__.py +0 -0
  28. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/utils/hcl.py +0 -0
  29. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder/utils/logging.py +0 -0
  30. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder.egg-info/dependency_links.txt +0 -0
  31. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder.egg-info/requires.txt +0 -0
  32. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/cluster_builder.egg-info/top_level.txt +0 -0
  33. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/setup.cfg +0 -0
  34. {cluster_builder-0.5.2 → cluster_builder-0.5.3}/tests/test_hcl.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cluster-builder
3
- Version: 0.5.2
3
+ Version: 0.5.3
4
4
  Summary: Swarmchestrate cluster builder
5
5
  Author-email: Gunjan <G.Kotak@westminster.ac.uk>, Jay <J.Deslauriers@westminster.ac.uk>
6
6
  License: Apache2
@@ -179,8 +179,10 @@ The deploy_manifests method copies Kubernetes manifests to the target cluster no
179
179
  orchestrator.deploy_manifests(
180
180
  manifest_folder="path/to/manifests",
181
181
  master_ip="MASTER_NODE_IP",
182
- ssh_key_path="path/to/key.pem",
183
- ssh_user="USERNAME"
182
+ ssh_user="USERNAME",
183
+ ssh_key="path/to/key.pem", # for key auth
184
+ ssh_auth_method="key", # or "password"
185
+ ssh_password="" # required when ssh_auth_method="password"
184
186
  )
185
187
  ```
186
188
  ---
@@ -250,8 +252,7 @@ config = {
250
252
 
251
253
  Templates should be organised as follows:
252
254
  - `templates/` - Base directory for templates
253
- - `templates/{cloud}/` - Terraform modules for each cloud provider
254
- - `templates/{role}_user_data.sh.tpl` - Node initialisation scripts
255
+ - `templates/{cloud}/` - Opentofu modules for each cloud provider
255
256
  - `templates/{cloud}_provider.tf` - Provider configuration templates
256
257
 
257
258
  ---
@@ -162,8 +162,10 @@ The deploy_manifests method copies Kubernetes manifests to the target cluster no
162
162
  orchestrator.deploy_manifests(
163
163
  manifest_folder="path/to/manifests",
164
164
  master_ip="MASTER_NODE_IP",
165
- ssh_key_path="path/to/key.pem",
166
- ssh_user="USERNAME"
165
+ ssh_user="USERNAME",
166
+ ssh_key="path/to/key.pem", # for key auth
167
+ ssh_auth_method="key", # or "password"
168
+ ssh_password="" # required when ssh_auth_method="password"
167
169
  )
168
170
  ```
169
171
  ---
@@ -233,8 +235,7 @@ config = {
233
235
 
234
236
  Templates should be organised as follows:
235
237
  - `templates/` - Base directory for templates
236
- - `templates/{cloud}/` - Terraform modules for each cloud provider
237
- - `templates/{role}_user_data.sh.tpl` - Node initialisation scripts
238
+ - `templates/{cloud}/` - Opentofu modules for each cloud provider
238
239
  - `templates/{cloud}_provider.tf` - Provider configuration templates
239
240
 
240
241
  ---
@@ -150,7 +150,4 @@ class ClusterConfig:
150
150
  logger.error(error_msg)
151
151
  raise RuntimeError(error_msg)
152
152
 
153
- # Copy user data template
154
- self.template_manager.copy_user_data_template(role, cloud)
155
-
156
153
  return cluster_dir, prepared_config
@@ -99,37 +99,6 @@ class TemplateManager:
99
99
  f"✅ Provider configurations ensured in cluster directory {cluster_dir}"
100
100
  )
101
101
 
102
- def copy_user_data_template(self, role: str, cloud: str) -> None:
103
- """
104
- Copy the user data template for a specific role to the cloud provider directory.
105
-
106
- Args:
107
- role: K3s role (master, worker, etc.)
108
- cloud: Cloud provider name
109
-
110
- Raises:
111
- RuntimeError: If the template file doesn't exist or can't be copied
112
- """
113
- user_data_src = os.path.join(self.templates_dir, f"{role}_user_data.sh.tpl")
114
- user_data_dst = os.path.join(
115
- self.templates_dir, cloud, f"{role}_user_data.sh.tpl"
116
- )
117
-
118
- if not os.path.exists(user_data_src):
119
- error_msg = f"User data template not found: {user_data_src}"
120
- logger.error(error_msg)
121
- raise RuntimeError(error_msg)
122
-
123
- try:
124
- shutil.copy2(user_data_src, user_data_dst)
125
- logger.debug(
126
- f"Copied user data template from {user_data_src} to {user_data_dst}"
127
- )
128
- except (OSError, shutil.Error) as e:
129
- error_msg = f"Failed to copy user data template: {e}"
130
- logger.error(error_msg)
131
- raise RuntimeError(error_msg)
132
-
133
102
  def get_required_variables(self, cloud: str) -> dict:
134
103
  """
135
104
  Get the variables required for a specific cloud provider's templates.
@@ -5,6 +5,7 @@ Swarmchestrate - Main orchestration class for K3s cluster management.
5
5
  import json
6
6
  import os
7
7
  import logging
8
+ import re
8
9
  from pathlib import Path
9
10
  import shutil
10
11
  import subprocess
@@ -710,6 +711,42 @@ class Swarmchestrate:
710
711
 
711
712
  logger.debug(f"Found workspaces: {workspaces}")
712
713
 
714
+ # Parse module metadata once to infer role when workspace outputs are missing.
715
+ main_tf_path = os.path.join(cluster_dir, "main.tf")
716
+ module_role = {}
717
+ try:
718
+ with open(main_tf_path, "r") as f:
719
+ lines = f.readlines()
720
+
721
+ current_module = None
722
+ current_role = None
723
+ brace_depth = 0
724
+
725
+ for line in lines:
726
+ if current_module is None:
727
+ module_match = re.match(r'\s*module\s+"([^"]+)"\s*\{', line)
728
+ if module_match:
729
+ current_module = module_match.group(1)
730
+ current_role = None
731
+ brace_depth = line.count("{") - line.count("}")
732
+ continue
733
+
734
+ brace_depth += line.count("{") - line.count("}")
735
+
736
+ role_match = re.match(r'\s*k3s_role\s*=\s*"([^"]+)"', line)
737
+ if role_match:
738
+ current_role = role_match.group(1).lower()
739
+
740
+ if brace_depth <= 0:
741
+ if current_module:
742
+ if current_role:
743
+ module_role[current_module] = current_role
744
+ current_module = None
745
+ current_role = None
746
+ brace_depth = 0
747
+ except Exception as e:
748
+ logger.debug(f"Could not parse module role metadata from main.tf: {e}")
749
+
713
750
  # ---------- STEP 1: collect role metadata ----------
714
751
  ws_roles = []
715
752
 
@@ -738,6 +775,10 @@ class Swarmchestrate:
738
775
  role = outputs.get("k3s_role", {}).get("value")
739
776
 
740
777
  # fallback if missing, infer from outputs when possible
778
+ if not role:
779
+ role = module_role.get(ws)
780
+
781
+ # fallback if still missing, infer from per-role output fields
741
782
  if not role:
742
783
  worker_ip = outputs.get("worker_ip", {}).get("value")
743
784
  ha_ip = outputs.get("ha_ip", {}).get("value")
@@ -745,10 +786,6 @@ class Swarmchestrate:
745
786
  role = "worker"
746
787
  elif ha_ip:
747
788
  role = "ha"
748
- elif "worker" in ws:
749
- role = "worker"
750
- elif "ha" in ws:
751
- role = "ha"
752
789
  else:
753
790
  role = "master"
754
791
 
@@ -861,9 +898,12 @@ class Swarmchestrate:
861
898
  self,
862
899
  manifest_folder: str,
863
900
  master_ip: str,
864
- ssh_key_path: str,
865
901
  ssh_user: str,
902
+ ssh_key: str = "",
903
+ ssh_key_path: str = "",
866
904
  ssh_port: int = 22,
905
+ ssh_auth_method: str = "key",
906
+ ssh_password: str = "",
867
907
  ):
868
908
  """
869
909
  Copy and apply manifests to a cluster using copy_manifest.tf in a temporaryfolder.
@@ -871,10 +911,26 @@ class Swarmchestrate:
871
911
  Args:
872
912
  manifest_folder: Path to local manifest folder
873
913
  master_ip: IP address of K3s master
874
- ssh_key_path: Path to SSH private key
914
+ ssh_key: Path to SSH private key (preferred)
915
+ ssh_key_path: Deprecated alias for ssh_key
875
916
  ssh_user: SSH username to connect to the master node
876
917
  ssh_port: SSH port for the master node (defaults to 22)
918
+ ssh_auth_method: SSH auth method, either "key" or "password"
919
+ ssh_password: SSH password when ssh_auth_method is "password"
877
920
  """
921
+ resolved_ssh_key = ssh_key or ssh_key_path
922
+
923
+ if ssh_auth_method not in {"key", "password"}:
924
+ raise ValueError("ssh_auth_method must be either 'key' or 'password'")
925
+
926
+ if ssh_auth_method == "key" and not resolved_ssh_key:
927
+ raise ValueError("ssh_key is required when ssh_auth_method is 'key'")
928
+
929
+ if ssh_auth_method == "password" and not ssh_password:
930
+ raise ValueError(
931
+ "ssh_password is required when ssh_auth_method is 'password'"
932
+ )
933
+
878
934
  # Dedicated folder for copy-manifest operations
879
935
  copy_dir = Path(self.output_dir) / "copy-manifest"
880
936
  copy_dir.mkdir(parents=True, exist_ok=True)
@@ -910,17 +966,21 @@ class Swarmchestrate:
910
966
  )
911
967
 
912
968
  # Run tofu apply with spinner
969
+ apply_vars = [
970
+ f"-var=manifest_folder={manifest_folder}",
971
+ f"-var=master_ip={master_ip}",
972
+ f"-var=ssh_user={ssh_user}",
973
+ f"-var=ssh_port={ssh_port}",
974
+ f"-var=ssh_auth_method={ssh_auth_method}",
975
+ ]
976
+
977
+ if ssh_auth_method == "key":
978
+ apply_vars.append(f"-var=ssh_key={resolved_ssh_key}")
979
+ else:
980
+ apply_vars.append(f"-var=ssh_password={json.dumps(ssh_password)}")
981
+
913
982
  CommandExecutor.run_command(
914
- [
915
- "tofu",
916
- "apply",
917
- "-auto-approve",
918
- f"-var=manifest_folder={manifest_folder}",
919
- f"-var=master_ip={master_ip}",
920
- f"-var=ssh_private_key_path={ssh_key_path}",
921
- f"-var=ssh_user={ssh_user}",
922
- f"-var=ssh_port={ssh_port}",
923
- ],
983
+ ["tofu", "apply", "-auto-approve"] + apply_vars,
924
984
  cwd=str(copy_dir),
925
985
  description="OpenTofu apply",
926
986
  env=env_vars,
@@ -946,7 +1006,11 @@ class Swarmchestrate:
946
1006
  {
947
1007
  "master_ip": "1.2.3.4",
948
1008
  "ssh_user": "ubuntu",
949
- "ssh_private_key_path": "/path/to/key.pem",
1009
+ "ssh_key": "/path/to/key.pem", # for key auth (preferred)
1010
+ "ssh_private_key_path": "/path/to/key.pem", # legacy alias
1011
+ "ssh_key_path": "/path/to/key.pem", # legacy alias
1012
+ "ssh_auth_method": "key" or "password",
1013
+ "ssh_password": "optional-password", # for password auth
950
1014
  "ssh_port": 22,
951
1015
  "namespace": "optional-namespace",
952
1016
  "secret_names": ["optional-name1", "optional-name2"]
@@ -965,13 +1029,31 @@ class Swarmchestrate:
965
1029
  # Get cluster connection from method input
966
1030
  master_ip = cluster_config.get("master_ip")
967
1031
  ssh_user = cluster_config.get("ssh_user")
968
- ssh_key_path = cluster_config.get("ssh_private_key_path")
1032
+ ssh_key = (
1033
+ cluster_config.get("ssh_key")
1034
+ or cluster_config.get("ssh_private_key_path")
1035
+ or cluster_config.get("ssh_key_path")
1036
+ or ""
1037
+ )
1038
+ ssh_auth_method = cluster_config.get("ssh_auth_method", "key")
1039
+ ssh_password = cluster_config.get("ssh_password", "")
969
1040
  ssh_port = cluster_config.get("ssh_port", 22)
970
1041
  namespace = cluster_config.get("namespace", "default")
971
1042
  secret_names = cluster_config.get("secret_names", [])
972
1043
 
973
- if not all([master_ip, ssh_user, ssh_key_path]):
974
- raise ValueError("Cluster config missing required keys")
1044
+ if not all([master_ip, ssh_user]):
1045
+ raise ValueError(
1046
+ "Cluster config missing required keys: master_ip, ssh_user"
1047
+ )
1048
+
1049
+ if ssh_auth_method not in {"key", "password"}:
1050
+ raise ValueError("ssh_auth_method must be either 'key' or 'password'")
1051
+
1052
+ if ssh_auth_method == "key" and not ssh_key:
1053
+ raise ValueError("ssh_key is required for key-based auth")
1054
+
1055
+ if ssh_auth_method == "password" and not ssh_password:
1056
+ raise ValueError("ssh_password is required for password-based auth")
975
1057
 
976
1058
  # Validate secret_names length if provided
977
1059
  if secret_names and len(secret_names) != len(registries):
@@ -1013,10 +1095,16 @@ class Swarmchestrate:
1013
1095
  f"-var=passwords={json.dumps(passwords)}",
1014
1096
  f"-var=master_ip={master_ip}",
1015
1097
  f"-var=ssh_user={ssh_user}",
1016
- f"-var=ssh_private_key_path={ssh_key_path}",
1017
1098
  f"-var=ssh_port={ssh_port}",
1099
+ f"-var=ssh_auth_method={ssh_auth_method}",
1018
1100
  f"-var=namespace={namespace}",
1019
1101
  ]
1102
+
1103
+ if ssh_auth_method == "key":
1104
+ apply_vars.append(f"-var=ssh_key={ssh_key}")
1105
+ else:
1106
+ apply_vars.append(f"-var=ssh_password={json.dumps(ssh_password)}")
1107
+
1020
1108
  if secret_names:
1021
1109
  apply_vars.append(f"-var=secret_names={json.dumps(secret_names)}")
1022
1110
 
@@ -2,7 +2,7 @@ terraform {
2
2
  required_providers {
3
3
  k3s = {
4
4
  source = "striveworks/k3s"
5
- version = "0.3.0"
5
+ version = "1.0.0"
6
6
  }
7
7
  }
8
8
  }
@@ -143,12 +143,14 @@ resource "k3s_server" "k3s" {
143
143
  auth = {
144
144
  host = aws_instance.k3s_node.public_ip,
145
145
  user = var.ssh_user,
146
- private_key = file(var.ssh_key)
146
+ private_key_file = var.ssh_key
147
147
  }
148
148
 
149
+ bootstrap_token = var.k3s_token
150
+
149
151
  config = <<-EOT
150
152
  node-name: ${var.resource_name}
151
- token: ${var.k3s_token}
153
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
152
154
  cluster-name: ${var.cluster_name}
153
155
  EOT
154
156
 
@@ -162,12 +164,14 @@ resource "k3s_server" "k3s_ha_init" {
162
164
  auth = {
163
165
  host = aws_instance.k3s_node.public_ip,
164
166
  user = var.ssh_user,
165
- private_key = file(var.ssh_key)
167
+ private_key_file = var.ssh_key
166
168
  }
167
169
 
170
+ bootstrap_token = var.k3s_token
171
+
168
172
  config = <<-EOT
169
173
  node-name: ${var.resource_name}
170
- token: ${var.k3s_token}
174
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
171
175
  cluster-name: ${var.cluster_name}
172
176
  EOT
173
177
 
@@ -185,12 +189,12 @@ resource "k3s_server" "k3s_ha_join" {
185
189
  auth = {
186
190
  host = aws_instance.k3s_node.public_ip,
187
191
  user = var.ssh_user,
188
- private_key = file(var.ssh_key)
192
+ private_key_file = var.ssh_key
189
193
  }
190
194
 
191
195
  config = <<-EOT
192
196
  node-name: ${var.resource_name}
193
- token: ${var.k3s_token}
197
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
194
198
  EOT
195
199
 
196
200
  highly_available = {
@@ -209,19 +213,17 @@ resource "k3s_agent" "k3s" {
209
213
  auth = {
210
214
  host = aws_instance.k3s_node.public_ip,
211
215
  user = var.ssh_user,
212
- private_key = file(var.ssh_key)
216
+ private_key_file = var.ssh_key
213
217
  }
214
218
 
215
219
  server = "https://${var.master_ip}:6443"
216
220
  token = var.k3s_token
217
221
 
218
- kubeconfig = "/etc/rancher/k3s/k3s.yaml"
219
-
220
222
  config = <<-EOT
221
223
  node-name: ${var.resource_name}
224
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
222
225
  EOT
223
226
 
224
- allow_delete_err = true
225
227
  depends_on = [aws_instance.k3s_node]
226
228
  }
227
229
 
@@ -1,7 +1,16 @@
1
1
  # main.tf
2
2
 
3
3
  variable "manifest_folder" {}
4
- variable "ssh_private_key_path" {}
4
+ variable "ssh_key" {
5
+ default = ""
6
+ }
7
+ variable "ssh_password" {
8
+ default = ""
9
+ sensitive = true
10
+ }
11
+ variable "ssh_auth_method" {
12
+ default = "key"
13
+ }
5
14
  variable "master_ip" {}
6
15
  variable "ssh_user" {}
7
16
  variable "ssh_port" {
@@ -14,7 +23,8 @@ resource "null_resource" "copy_manifests" {
14
23
  connection {
15
24
  type = "ssh"
16
25
  user = var.ssh_user
17
- private_key = file(var.ssh_private_key_path)
26
+ private_key = var.ssh_auth_method == "key" ? file(var.ssh_key) : null
27
+ password = var.ssh_auth_method == "password" ? var.ssh_password : null
18
28
  host = var.master_ip
19
29
  port = var.ssh_port
20
30
  }
@@ -2,7 +2,7 @@ terraform {
2
2
  required_providers {
3
3
  k3s = {
4
4
  source = "striveworks/k3s"
5
- version = "0.3.0"
5
+ version = "1.0.0"
6
6
  }
7
7
  }
8
8
  }
@@ -53,13 +53,15 @@ resource "k3s_server" "k3s" {
53
53
  auth = {
54
54
  host = var.edge_device_ip
55
55
  user = var.ssh_user
56
- private_key = file(var.ssh_key)
56
+ private_key_file = var.ssh_key
57
57
  port = var.ssh_port
58
58
  }
59
59
 
60
+ bootstrap_token = var.k3s_token
61
+
60
62
  config = <<-EOT
61
63
  node-name: ${var.resource_name}
62
- token: ${var.k3s_token}
64
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
63
65
  cluster-name: ${var.cluster_name}
64
66
  EOT
65
67
  }
@@ -72,13 +74,15 @@ resource "k3s_server" "k3s_ha_init" {
72
74
  auth = {
73
75
  host = var.edge_device_ip
74
76
  user = var.ssh_user
75
- private_key = file(var.ssh_key)
77
+ private_key_file = var.ssh_key
76
78
  port = var.ssh_port
77
79
  }
78
80
 
81
+ bootstrap_token = var.k3s_token
82
+
79
83
  config = <<-EOT
80
84
  node-name: ${var.resource_name}
81
- token: ${var.k3s_token}
85
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
82
86
  cluster-name: ${var.cluster_name}
83
87
  EOT
84
88
 
@@ -94,13 +98,13 @@ resource "k3s_server" "k3s_ha_join" {
94
98
  auth = {
95
99
  host = var.edge_device_ip
96
100
  user = var.ssh_user
97
- private_key = file(var.ssh_key)
101
+ private_key_file = var.ssh_key
98
102
  port = var.ssh_port
99
103
  }
100
104
 
101
105
  config = <<-EOT
102
106
  node-name: ${var.resource_name}
103
- token: ${var.k3s_token}
107
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
104
108
  EOT
105
109
 
106
110
  highly_available = {
@@ -117,19 +121,18 @@ resource "k3s_agent" "k3s" {
117
121
  auth = {
118
122
  host = var.edge_device_ip
119
123
  user = var.ssh_user
120
- private_key = file(var.ssh_key)
124
+ private_key_file = var.ssh_key
121
125
  port = var.ssh_port
122
126
  }
123
127
 
124
128
  server = "https://${var.master_ip}:6443"
125
129
  token = var.k3s_token
126
130
 
127
- kubeconfig = "/etc/rancher/k3s/k3s.yaml"
128
-
129
131
  config = <<-EOT
130
132
  node-name: ${var.resource_name}
133
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
131
134
  EOT
132
- allow_delete_err = true
135
+
133
136
  }
134
137
 
135
138
  output "cluster_name" {
@@ -2,7 +2,7 @@ terraform {
2
2
  required_providers {
3
3
  k3s = {
4
4
  source = "striveworks/k3s"
5
- version = "0.3.0"
5
+ version = "1.0.0"
6
6
  }
7
7
  }
8
8
  }
@@ -1,3 +1,11 @@
1
+ terraform {
2
+ required_providers {
3
+ k3s = {
4
+ source = "striveworks/k3s"
5
+ version = "1.0.0"
6
+ }
7
+ }
8
+ }
1
9
  # variables.tf
2
10
  variable "cluster_name" {}
3
11
  variable "resource_name" {}
@@ -53,11 +61,6 @@ resource "openstack_blockstorage_volume_v3" "root_volume" {
53
61
  image_id = var.openstack_image_id
54
62
  }
55
63
 
56
- # Defining the port to use while instance creation
57
- resource "openstack_networking_port_v2" "port_1" {
58
- network_id = var.network_id
59
- }
60
-
61
64
  # Security group rules
62
65
  locals {
63
66
  ingress_rules = var.security_group_id == "" ? concat(
@@ -144,17 +147,8 @@ resource "openstack_networking_secgroup_rule_v2" "k3s_sg_egress" {
144
147
  description = each.value.desc
145
148
  }
146
149
 
147
- resource "openstack_networking_port_secgroup_associate_v2" "port_2" {
148
- port_id = openstack_networking_port_v2.port_1.id
149
- enforce = true
150
- # Use the provided security group ID if available, otherwise use the generated security group
151
- security_group_ids = var.security_group_id != "" ? [var.security_group_id] : [openstack_networking_secgroup_v2.k3s_sg[0].id]
152
- }
153
-
154
150
  # Compute instance for each role
155
151
  resource "openstack_compute_instance_v2" "k3s_node" {
156
- depends_on = [openstack_networking_port_v2.port_1]
157
-
158
152
  name = "${var.resource_name}"
159
153
  flavor_name = var.openstack_flavor_id
160
154
  key_pair = replace(basename(var.ssh_key), ".pem", "")
@@ -174,7 +168,7 @@ resource "openstack_compute_instance_v2" "k3s_node" {
174
168
  }
175
169
 
176
170
  network {
177
- port = openstack_networking_port_v2.port_1.id
171
+ uuid = var.network_id
178
172
  }
179
173
 
180
174
  tags = [
@@ -185,46 +179,132 @@ resource "openstack_compute_instance_v2" "k3s_node" {
185
179
  ]
186
180
  }
187
181
 
182
+ data "openstack_networking_port_v2" "instance_port" {
183
+ device_id = openstack_compute_instance_v2.k3s_node.id
184
+ network_id = var.network_id
185
+ }
186
+
187
+ resource "openstack_networking_port_secgroup_associate_v2" "instance_port_sg" {
188
+ port_id = data.openstack_networking_port_v2.instance_port.id
189
+ enforce = true
190
+
191
+ # Use provided SG ID when available, otherwise use the SG created in this module.
192
+ security_group_ids = var.security_group_id != "" ? [var.security_group_id] : [openstack_networking_secgroup_v2.k3s_sg[0].id]
193
+ }
194
+
188
195
  resource "openstack_networking_floatingip_associate_v2" "fip_association" {
189
196
  floating_ip = var.floating_ip
190
- port_id = openstack_networking_port_v2.port_1.id
197
+ port_id = data.openstack_networking_port_v2.instance_port.id
198
+ }
199
+
200
+ # Standalone master (no HA)
201
+ resource "k3s_server" "k3s" {
202
+ count = (var.k3s_role == "master" && !var.ha) ? 1 : 0
203
+
204
+ auth = {
205
+ host = var.floating_ip
206
+ user = var.ssh_user
207
+ private_key_file = var.ssh_key
208
+ }
209
+
210
+ bootstrap_token = var.k3s_token
211
+ orphan = true
212
+
213
+ config = <<-EOT
214
+ node-name: ${var.resource_name}
215
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
216
+ cluster-name: ${var.cluster_name}
217
+ EOT
191
218
 
192
219
  depends_on = [
193
- openstack_compute_instance_v2.k3s_node # Ensure the instance is created first
220
+ openstack_networking_port_secgroup_associate_v2.instance_port_sg,
221
+ openstack_networking_floatingip_associate_v2.fip_association,
194
222
  ]
195
223
  }
196
224
 
197
- # Provisioning via SSH
198
- resource "null_resource" "k3s_provision" {
199
- depends_on = [openstack_networking_floatingip_associate_v2.fip_association]
200
-
201
- provisioner "file" {
202
- content = templatefile("${path.module}/${var.k3s_role}_user_data.sh.tpl", {
203
- ha = var.ha,
204
- k3s_token = var.k3s_token,
205
- master_ip = var.master_ip,
206
- cluster_name = var.cluster_name,
207
- public_ip = var.floating_ip
208
- resource_name = "${var.resource_name}"
209
- })
210
- destination = "/tmp/k3s_user_data.sh"
225
+ # HA init node — first server that bootstraps the cluster
226
+ resource "k3s_server" "k3s_ha_init" {
227
+ count = (var.k3s_role == "master" && var.ha) ? 1 : 0
228
+
229
+ auth = {
230
+ host = var.floating_ip
231
+ user = var.ssh_user
232
+ private_key_file = var.ssh_key
211
233
  }
212
234
 
213
- provisioner "remote-exec" {
214
- inline = [
215
- "rm -f ~/.ssh/known_hosts",
216
- "echo 'Executing remote provisioning script on ${var.k3s_role} node'",
217
- "chmod +x /tmp/k3s_user_data.sh",
218
- "sudo /tmp/k3s_user_data.sh"
219
- ]
235
+ bootstrap_token = var.k3s_token
236
+ orphan = true
237
+
238
+ config = <<-EOT
239
+ node-name: ${var.resource_name}
240
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
241
+ cluster-name: ${var.cluster_name}
242
+ EOT
243
+
244
+ highly_available = {
245
+ cluster_init = true
220
246
  }
221
247
 
222
- connection {
223
- type = "ssh"
248
+ depends_on = [
249
+ openstack_networking_port_secgroup_associate_v2.instance_port_sg,
250
+ openstack_networking_floatingip_associate_v2.fip_association,
251
+ ]
252
+ }
253
+
254
+ # HA join node — subsequent server nodes joining an existing master
255
+ resource "k3s_server" "k3s_ha_join" {
256
+ count = var.k3s_role == "ha" ? 1 : 0
257
+
258
+ orphan = true
259
+
260
+ auth = {
261
+ host = var.floating_ip
224
262
  user = var.ssh_user
225
- private_key = file(var.ssh_key)
263
+ private_key_file = var.ssh_key
264
+ }
265
+
266
+ config = <<-EOT
267
+ node-name: ${var.resource_name}
268
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
269
+ EOT
270
+
271
+ highly_available = {
272
+ cluster_init = false
273
+ server = "https://${var.master_ip}:6443"
274
+ token = var.k3s_token
275
+ }
276
+
277
+ depends_on = [
278
+ openstack_networking_port_secgroup_associate_v2.instance_port_sg,
279
+ openstack_networking_floatingip_associate_v2.fip_association,
280
+ ]
281
+ }
282
+
283
+ # Worker node
284
+ resource "k3s_agent" "k3s" {
285
+ count = var.k3s_role == "worker" ? 1 : 0
286
+
287
+ orphan = true
288
+
289
+ auth = {
226
290
  host = var.floating_ip
291
+ user = var.ssh_user
292
+ private_key_file = var.ssh_key
227
293
  }
294
+
295
+ server = "https://${var.master_ip}:6443"
296
+ token = var.k3s_token
297
+
298
+ config = <<-EOT
299
+ node-name: ${var.resource_name}
300
+ node-label: labels.swarmchestrate.eu/ms_id=${var.resource_name}
301
+ EOT
302
+
303
+
304
+ depends_on = [
305
+ openstack_networking_port_secgroup_associate_v2.instance_port_sg,
306
+ openstack_networking_floatingip_associate_v2.fip_association,
307
+ ]
228
308
  }
229
309
 
230
310
  # outputs.tf
@@ -17,7 +17,16 @@ variable "secret_names" {
17
17
 
18
18
  variable "master_ip" {}
19
19
  variable "ssh_user" {}
20
- variable "ssh_private_key_path" {}
20
+ variable "ssh_key" {
21
+ default = ""
22
+ }
23
+ variable "ssh_password" {
24
+ default = ""
25
+ sensitive = true
26
+ }
27
+ variable "ssh_auth_method" {
28
+ default = "key"
29
+ }
21
30
  variable "ssh_port" {
22
31
  default = 22
23
32
  }
@@ -32,7 +41,8 @@ resource "null_resource" "docker_registry_secrets" {
32
41
  type = "ssh"
33
42
  host = var.master_ip
34
43
  user = var.ssh_user
35
- private_key = file(var.ssh_private_key_path)
44
+ private_key = var.ssh_auth_method == "key" ? file(var.ssh_key) : null
45
+ password = var.ssh_auth_method == "password" ? var.ssh_password : null
36
46
  port = var.ssh_port
37
47
  }
38
48
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: cluster-builder
3
- Version: 0.5.2
3
+ Version: 0.5.3
4
4
  Summary: Swarmchestrate cluster builder
5
5
  Author-email: Gunjan <G.Kotak@westminster.ac.uk>, Jay <J.Deslauriers@westminster.ac.uk>
6
6
  License: Apache2
@@ -179,8 +179,10 @@ The deploy_manifests method copies Kubernetes manifests to the target cluster no
179
179
  orchestrator.deploy_manifests(
180
180
  manifest_folder="path/to/manifests",
181
181
  master_ip="MASTER_NODE_IP",
182
- ssh_key_path="path/to/key.pem",
183
- ssh_user="USERNAME"
182
+ ssh_user="USERNAME",
183
+ ssh_key="path/to/key.pem", # for key auth
184
+ ssh_auth_method="key", # or "password"
185
+ ssh_password="" # required when ssh_auth_method="password"
184
186
  )
185
187
  ```
186
188
  ---
@@ -250,8 +252,7 @@ config = {
250
252
 
251
253
  Templates should be organised as follows:
252
254
  - `templates/` - Base directory for templates
253
- - `templates/{cloud}/` - Terraform modules for each cloud provider
254
- - `templates/{role}_user_data.sh.tpl` - Node initialisation scripts
255
+ - `templates/{cloud}/` - Opentofu modules for each cloud provider
255
256
  - `templates/{cloud}_provider.tf` - Provider configuration templates
256
257
 
257
258
  ---
@@ -17,12 +17,9 @@ cluster_builder/infrastructure/templates.py
17
17
  cluster_builder/templates/aws_provider.tf
18
18
  cluster_builder/templates/deploy_manifest.tf
19
19
  cluster_builder/templates/edge_provider.tf
20
- cluster_builder/templates/ha_user_data.sh.tpl
21
20
  cluster_builder/templates/k3s_provider.tf
22
- cluster_builder/templates/master_user_data.sh.tpl
23
21
  cluster_builder/templates/openstack_provider.tf
24
22
  cluster_builder/templates/registry_secret.tf
25
- cluster_builder/templates/worker_user_data.sh.tpl
26
23
  cluster_builder/templates/aws/main.tf
27
24
  cluster_builder/templates/edge/main.tf
28
25
  cluster_builder/templates/openstack/main.tf
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
4
4
 
5
5
  [project]
6
6
  name = "cluster-builder"
7
- version = "0.5.2"
7
+ version = "0.5.3"
8
8
  description = "Swarmchestrate cluster builder"
9
9
  readme = "README.md"
10
10
  authors = [
@@ -1,33 +0,0 @@
1
- #!/bin/bash
2
- set -euo pipefail
3
-
4
- LOG_FILE="/var/log/k3s_server_install.log"
5
- exec > >(tee -a "$LOG_FILE") 2>&1
6
- echo "=== K3s HA Server Install Script Started at $(date) ==="
7
-
8
- # Function to log messages with timestamp
9
- log_message() {
10
- echo "$(date) - $1"
11
- }
12
-
13
- # Check if K3s server is already running
14
- if systemctl is-active --quiet k3s; then
15
- log_message "K3s is already running. Skipping installation."
16
- exit 0
17
- fi
18
-
19
- # Install K3s HA server and join the cluster
20
- log_message "Installing K3s HA Server and joining the cluster..."
21
- if ! curl -sfL https://get.k3s.io | K3S_TOKEN="${k3s_token}" sh -s - server \
22
- --server "https://${master_ip}:6443" \
23
- --node-external-ip="${public_ip}" \
24
- --node-name="${resource_name}" \
25
- --flannel-backend=wireguard-native \
26
- --flannel-external-ip; then
27
- log_message "ERROR: K3s server installation failed!"
28
- exit 1
29
- else
30
- log_message "K3s server installation succeeded."
31
- fi
32
-
33
- log_message "=== Script completed at $(date) ==="
@@ -1,37 +0,0 @@
1
- #!/bin/bash
2
- set -euo pipefail
3
-
4
- LOG_FILE="/var/log/k3s_server_install.log"
5
- exec > >(tee -a "$LOG_FILE") 2>&1
6
- echo "=== K3s Server Install Script Started at $(date) ==="
7
-
8
- # Function to log messages with timestamp
9
- log_message() {
10
- echo "$(date) - $1"
11
- }
12
-
13
- # Trap errors and print a message
14
- trap 'log_message "ERROR: Script failed at line $LINENO with exit code $?."' ERR
15
-
16
- # Check if K3s server is already running
17
- if systemctl is-active --quiet k3s; then
18
- log_message "K3s is already running. Skipping installation."
19
- else
20
- log_message "K3s is not running. Proceeding with installation..."
21
-
22
- # Use the provided public IP
23
- log_message "Using provided public IP: ${public_ip}"
24
-
25
- # Templated installation based on HA configuration
26
- if [[ "${ha}" == "true" ]]; then
27
- log_message "Installing in HA mode using cluster-init..."
28
- curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--cluster-init --node-external-ip=${public_ip} --node-name="${resource_name}" --flannel-backend=wireguard-native --flannel-external-ip" K3S_TOKEN="${k3s_token}" sh -s - server
29
- else
30
- log_message "Installing in single-server mode..."
31
- curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--node-external-ip=${public_ip} --node-name="${resource_name}" --flannel-backend=wireguard-native --flannel-external-ip" K3S_TOKEN="${k3s_token}" sh -s - server
32
- fi
33
-
34
- log_message "K3s installation completed successfully."
35
- fi
36
-
37
- log_message "=== Script completed at $(date) ==="
@@ -1,34 +0,0 @@
1
- #!/bin/bash
2
- set -euo pipefail
3
-
4
- LOG_FILE="/var/log/k3s_agent_install.log"
5
- exec > >(tee -a "$LOG_FILE") 2>&1
6
- echo "=== K3s Agent Install Script Started at $(date) ==="
7
-
8
- # Function to log messages with timestamp
9
- log_message() {
10
- echo "$(date) - $1"
11
- }
12
-
13
- # Use the provided public IP
14
- log_message "Using provided public IP: ${public_ip}"
15
-
16
- # Check if K3s agent is already running
17
- if systemctl is-active --quiet k3s-agent; then
18
- log_message "K3s agent is already running. Skipping installation."
19
- else
20
- log_message "K3s agent is not running. Proceeding with installation..."
21
-
22
- export K3S_URL="https://${master_ip}:6443"
23
- export K3S_TOKEN="${k3s_token}"
24
-
25
- # Install the K3s agent and join the cluster
26
- if ! curl -sfL https://get.k3s.io | sh -s - agent --node-external-ip="${public_ip}" --node-name="${resource_name}"; then
27
- log_message "ERROR: K3s agent installation failed!"
28
- exit 1
29
- else
30
- log_message "K3s agent installation succeeded."
31
- fi
32
- fi
33
-
34
- log_message "=== Script completed at $(date) ==="
File without changes