feat: Merge pull request #22 from abolfazl8131/feature/ingress

add ingress

Author: abolfazl8131

app/__pycache__/prompt_generators.cpython-311.pyc

@@ -1,86 +1,86 @@
 import os
+import yaml
 
-# Define the project structure
-project_name = "MyHelm"
-base_path = "app/media/"
-project_path = os.path.join(base_path, project_name)
+# Define directory and file structure
+project_name = 'MyHelm'
+base_path = os.path.join('app', 'media', project_name)
 
 directories = [
-    "charts",
-    "templates/web"
+    os.path.join(base_path, 'charts'),
+    os.path.join(base_path, 'templates', 'web')
 ]
 
-files_and_contents = {
-    "Chart.yaml": """apiVersion: v2
-name: MyHelm
-description: A Helm chart for Kubernetes
-version: 0.1.0
-""",
-    "values.yaml": """web:
-  image: nginx
-  targetPort: 80
-  replicas: 1
-  persistence:
-    size: 1Gi
-    accessModes:
-      - ReadWriteOnce
-  env:
-    - name: ENV1
-      value: Hi
-  ingress:
-    enabled: true
-  stateless: true
-""",
-    "templates/web/service.yaml": """apiVersion: v1
+files = {
+    'Chart.yaml': {
+        'apiVersion': 'v2',
+        'name': project_name,
+        'description': 'A Helm chart for Kubernetes',
+        'version': '0.1.0',
+        'appVersion': '1.0.0'
+    },
+    'values.yaml': {
+        'web': {
+            'image': {
+                'repository': 'nginx',
+                'tag': 'latest'
+            },
+            'service': {
+                'enabled': True,
+                'port': 80
+            },
+            'replicaCount': 1,
+            'persistence': {
+                'enabled': True,
+                'size': '1Gi',
+                'accessModes': ['ReadWriteOnce']
+            },
+            'env': [{
+                'name': 'ENV1',
+                'value': 'Hi'
+            }],
+            'ingress': {
+                'enabled': False,
+                'host': 'www.example.com'
+            }
+        }
+    }
+}
+
+# Create directories
+for directory in directories:
+    os.makedirs(directory, exist_ok=True)
+
+# Create files with initial content
+for filename, content in files.items():
+    with open(os.path.join(base_path, filename), 'w') as file:
+        yaml.dump(content, file)
+
+# Create service.yaml template
+service_yaml_content = """apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-web
+  name: {{ include "{project_name}.fullname" . }}
 spec:
   type: ClusterIP
   ports:
-    - port: 80
-      targetPort: {{ .Values.web.targetPort }}
-  selector:
-    app: {{ .Release.Name }}-web
-""",
-    "templates/web/deployment.yaml": """apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ .Release.Name }}-web
-spec:
-  replicas: {{ .Values.web.replicas }}
+    - port: {{ .Values.web.service.port }}
   selector:
-    matchLabels:
-      app: {{ .Release.Name }}-web
-  template:
-    metadata:
-      labels:
-        app: {{ .Release.Name }}-web
-    spec:
-      containers:
-        - name: web
-          image: {{ .Values.web.image }}
-          ports:
-            - containerPort: {{ .Values.web.targetPort }}
-          env:
-            - name: {{ .Values.web.env[0].name }}
-              value: {{ .Values.web.env[0].value }}
-""",
-    "templates/web/secret.yaml": """apiVersion: v1
+    app: {{ include "{project_name}.name" . }}
+"""
+
+with open(os.path.join(base_path, 'templates', 'web', 'service.yaml'), 'w') as service_file:
+    service_file.write(service_yaml_content.format(project_name=project_name))
+
+# Create secret.yaml template if environment variables exist
+if files['values.yaml']['web'].get('env'):
+    secret_yaml_content = """apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-web-secret
+  name: {{ include "{project_name}.fullname" . }}-env
 type: Opaque
 data:
   ENV1: {{ .Values.web.env[0].value | b64enc | quote }}
 """
-}
-
-# Create directories and files
-os.makedirs(project_path, exist_ok=True)
-for directory in directories:
-    os.makedirs(os.path.join(project_path, directory), exist_ok=True)
 
-for file_path, content in files_and_contents.items():
-    with open(os.path.join(project_path, file_path), 'w') as f:
-        f.write(content)
+    with open(os.path.join(base_path, 'templates', 'web', 'secret.yaml'), 'w') as secret_file:
+        secret_file.write(secret_yaml_content.format(project_name=project_name))

app/directory_generators/helm_generator.py

@@ -1,4 +1,5 @@
 apiVersion: v2
-name: MyHelm
+appVersion: 1.0.0
 description: A Helm chart for Kubernetes
+name: MyHelm
 version: 0.1.0

app/media/MyHelm/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-web-secret
+  name: { include "MyHelm.fullname" . }-env
 type: Opaque
 data:
-  ENV1: {{ .Values.web.env[0].value | b64enc | quote }}
+  ENV1: { .Values.web.env[0].value | b64enc | quote }

app/media/MyHelm/templates/web/deployment.yaml

@@ -1,11 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}-web
+  name: { include "MyHelm.fullname" . }
 spec:
   type: ClusterIP
   ports:
-    - port: 80
-      targetPort: {{ .Values.web.targetPort }}
+    - port: { .Values.web.service.port }
   selector:
-    app: {{ .Release.Name }}-web
+    app: { include "MyHelm.name" . }

app/media/MyHelm/templates/web/secret.yaml

@@ -1,14 +1,19 @@
 web:
-  image: nginx
-  targetPort: 80
-  replicas: 1
-  persistence:
-    size: 1Gi
-    accessModes:
-      - ReadWriteOnce
   env:
-    - name: ENV1
-      value: Hi
+  - name: ENV1
+    value: Hi
+  image:
+    repository: nginx
+    tag: latest
   ingress:
+    enabled: false
+    host: www.example.com
+  persistence:
+    accessModes:
+    - ReadWriteOnce
+    enabled: true
+    size: 1Gi
+  replicaCount: 1
+  service:
     enabled: true
-  stateless: true
+    port: 80

app/media/MyHelm/templates/web/service.yaml

@@ -9,6 +9,10 @@ class Environment(BaseModel):
     name:str = "ENV1"
     value:str = "Hi"
 
+class Ingress(BaseModel):
+    enabled:bool = False
+    host:str = "www.example.com"
+
 class Pod(BaseModel):
     name:str = "web"
     image:str = "nginx"
@@ -17,7 +21,7 @@ class Pod(BaseModel):
     persistance: Persistance
     environment: List[Environment]
     stateless:bool = True
-    ingress:bool = False
+    ingress: Ingress
 
 class HelmTemplateGeneration(BaseModel):
     api_version:int = 2

app/media/MyHelm/values.yaml

@@ -83,12 +83,11 @@ def helm_template_generator(input : HelmTemplateGeneration) -> str:
             set replicas of pods following this dict format : {replicas_}.
             set persistance (pvc) of pods following this dict fomrat : {persistance}
             set environment variables of pods like this dict format : {envs}
-            set ingress for pod if the pod ingress is true. here is a dict format for ingress : {ingress_}.
-            create deployment.yaml in the related template if the pod stateless == true, 
-            you can see each pod status here in the dict format : {status}
+            initialize ingress with a default host for pod if the pod ingress is true in here {ingress_}.
+            
             if environment variable is considered for pod, then create secret.yaml in the related template.
 
-            please set a something default in chart.yaml and values.yaml
+            please set a something default in chart.yaml and values.yaml based on the requirement.
 
             just Generate a python code without any additional notes or ```python3 entry
             """