Skip to content

Commit 2521c71

Browse files
Merge pull request #6 from iosifnicolae2/main
main
2 parents db63d4d + 4ce68cb commit 2521c71

File tree

8 files changed

+11
-55
lines changed

8 files changed

+11
-55
lines changed

.idea/.gitignore

-10
This file was deleted.

.idea/django-superapp-deploy.iml

-9
This file was deleted.

.idea/misc.xml

-9
This file was deleted.

.idea/modules.xml

-8
This file was deleted.

.idea/vcs.xml

-6
This file was deleted.

deploy.iml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<component name="NewModuleRootManager" inherit-compiler-output="true">
44
<exclude-output />
55
<content url="file://$MODULE_DIR$" />
6-
<orderEntry type="jdk" jdkName="Python 3.13 (whatsapp-deploy)" jdkType="Python SDK" />
6+
<orderEntry type="jdk" jdkName="Python 3.13 (rke2-cluster-deploy)" jdkType="Python SDK" />
77
<orderEntry type="sourceFolder" forTests="false" />
88
</component>
99
</module>

environments/sample_environment/main.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ def generate_all_skaffolds():
4545
# Clean up and create temporary directory
4646
shutil.rmtree(f"{GENERATED_SKAFFOLD_TMP_DIR}", ignore_errors=True)
4747
os.makedirs(f'{GENERATED_SKAFFOLD_TMP_DIR}', exist_ok=True)
48-
48+
4949
# Create an empty .gitkeep file
5050
with open(f'{GENERATED_SKAFFOLD_TMP_DIR}/.gitkeep', 'w') as f:
5151
f.write("")
52-
52+
5353
# Load secrets
5454
# Load configuration from YAML
5555
with open(config_path, 'r') as f:
5656
config = yaml.safe_load(f)
5757
env_vars = config.get('env', {})
58-
58+
5959
# Core infrastructure
6060
increase_fs_watchers_limit = create_increase_fs_watchers_limit(
6161
slug="increase-fs-watchers-limit",
@@ -148,14 +148,14 @@ def generate_all_skaffolds():
148148
)
149149
# Get disk configurations from config
150150
longhorn_disks = longhorn_config.get('LONGHORN_DISKS', [])
151-
151+
152152
# Ensure each disk has the correct node selector format
153153
for disk in longhorn_disks:
154154
if 'node_selector' not in disk and 'kubernetes.io/hostname' not in disk.get('node_selector', {}):
155155
# If node name is specified but not in the correct format, fix it
156156
if 'node' in disk:
157157
disk['node_selector'] = {'kubernetes.io/hostname': disk['node']}
158-
158+
159159
# Define storage classes for different performance tiers
160160
longhorn_storage_classes = [
161161
{
@@ -183,7 +183,7 @@ def generate_all_skaffolds():
183183
"fs_type": "ext4"
184184
}
185185
]
186-
186+
187187
longhorn = create_longhorn(
188188
slug="longhorn",
189189
namespace="longhorn-system",
@@ -395,20 +395,20 @@ def generate_all_skaffolds():
395395
whatsapp_waha_postgres_instance,
396396
whatsapp_waha,
397397
]
398-
398+
399399
# Generate skaffold configurations
400400
generate_skaffolds(
401401
components=components,
402402
)
403-
403+
404404
# Generate IntelliJ run configurations if enabled
405405
if INTELLIJ_RUN_CONFIGURATIONS_ENABLED or env_vars['INTELLIJ_RUN_CONFIGURATIONS_ENABLED'].lower() == 'true':
406406
generate_intelij_skaffolds_run_configurations()
407-
407+
408408
# Sync generated files to the final directory
409409
subprocess.call(["rsync", "-rcvu", "--delete", f"{GENERATED_SKAFFOLD_TMP_DIR}/", f"{GENERATED_SKAFFOLD_DIR}/"])
410410
subprocess.call(["rm", "-rf", f"{GENERATED_SKAFFOLD_TMP_DIR}/"])
411411

412412

413413
if __name__ == '__main__':
414-
generate_all_skaffolds()
414+
generate_all_skaffolds()

scripts/common-env.sh

-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ env_variables="$(python3 -c "
1212
import sys, os
1313
# Add the repository root to sys.path
1414
sys.path.insert(0, os.path.abspath('$SKAFFOLD_ROOT_DIR'))
15-
# Set the config path environment variable
16-
os.environ['CONFIG_YAML_PATH'] = './secrets/config_env.yaml'
1715
# Import constants directly from the module
1816
from components.base.constants import *
1917
# Export all uppercase variables

0 commit comments

Comments
 (0)