Update image references for nginx and caddy, and enhance environment injection for deployments

base/deploy.k

@@ -24,7 +24,7 @@ appRender = lambda a: App {
             template.spec.containers = [
                 {
                     name = a.name
-                    image = a.image
+                    image = "cr.suyiiyii.top/docker.io" + a.image
                     ports = [{containerPort = a.port}]
                 }
             ]

base/env.k

@@ -17,12 +17,13 @@ envSecretRender = lambda e: Envs {
     [secret]
 }
 
-envInjector = lambda envs: Envs, deploy {
+envInjector = lambda envs: Envs, input: appsv1.Deployment | any {
     """Inject envs to Deployment"""
-    _result = {}
+    _result: any = {}
-    if deploy.kind != "Deployment":
+    if input.kind != "Deployment":
-        _result = deploy
+        input
     else:
+        deploy: appsv1.Deployment = input as appsv1.Deployment
         secretEnv: [corev1.EnvVar] = [{
             name = k
             valueFrom = {

main.k

@@ -6,13 +6,13 @@ apps = [
     base.App {
         name = "nginxxx"
         replicas = 2
-        image = "nginx"
+        image = "library/nginx"
         port = 80
     }
     base.App {
         name = "caddyy"
         replicas = 2
-        image = "caddy"
+        image = "library/caddy"
         port = 80
     }
 ]