Merge pull request #18 from kcl-lang/extra-label-examples

feat: add extra pod metadata label examples
kcl-lang · Jul 24, 2024 · bf4f771 · bf4f771
2 parents c43bd76 + fdc51f0
commit bf4f771
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 41 deletions.
diff --git a/.github/workflows/cla.yml b/.github/workflows/cla.yml
diff --git a/examples/server/app_secret/prod/main.k b/examples/server/app_secret/prod/main.k
@@ -18,4 +18,7 @@ appConfiguration: frontend.Server {
             type = "Opaque"
         }
     ]
+    podMetadata.labels: {
+        "app.kubernetes.io/env" = "myenv"
+    }
 }
diff --git a/models/kube/render/render.k b/models/kube/render/render.k
@@ -34,7 +34,7 @@ remove_duplicated_iter = lambda data: [], func {
 
 __renderServerFrontendInstances__ = [inst for inst in frontend.Server.instances() if typeof(inst) == "Server"]
 __renderServerBackendInstances__ = [backend.ServerBackend(inst) for inst in __renderServerFrontendInstances__]
-__serverExtraResources: [{str:}] = [v for s in __renderServerFrontendInstances__ for k, v in s.extraResources]
+__serverExtraResources: [{str:}] = [v for s in __renderServerFrontendInstances__ for k, v in s.extraResources or []]
 
 __renderJobFrontendInstances__ = [inst for inst in frontend.Job.instances() if typeof(inst) == "Job"]
 __renderJobBackendInstances__ = [backend.JobBackend(inst) for inst in __renderJobFrontendInstances__]

diff --git a/models/kube/utils/metadata_builder.k b/models/kube/utils/metadata_builder.k
@@ -2,8 +2,8 @@ import models.kube.metadata
 
 MetadataBuilder = lambda config -> {str:} {
     {
-        name: metadata.__META_APP_NAME
-        namespace: metadata.__META_APP_NAME
+        name: config?.name or metadata.__META_APP_NAME
+        namespace: config?.name or metadata.__META_APP_NAME
         labels: config?.labels
         annotations: config?.annotations
     }