@@ -141,6 +141,12 @@ def helm_with_build_cache(chart, namespace="", values=[], set=[], specifier = ""
141141 entryPoints = spec ["entryPoints" ]
142142 if "websecure" in entryPoints :
143143 entryPoints .append ("web" )
144+ if containers or job_template_containers :
145+ metadata = object ["metadata" ]
146+ if "annotations" not in metadata or not metadata ["annotations" ]:
147+ metadata ["annotations" ] = {}
148+
149+ metadata ["annotations" ]["reloader.stakater.com/auto" ] = "true"
144150
145151 return encode_yaml_stream (objects )
146152
@@ -311,7 +317,7 @@ k8s_resource(workload="faf-db-migrations", objects=["faf-db-migrations:secret"],
311317k8s_yaml ("tilt/yaml/populate-db.yaml" )
312318k8s_resource (workload = "populate-db" , resource_deps = ["faf-db-migrations" ], labels = ["database" ], auto_init = False , trigger_mode = TRIGGER_MODE_MANUAL )
313319
314- k8s_yaml (helm_with_build_cache ("apps/ergochat" , namespace = "faf-apps" , values = ["config/local.yaml" ]))
320+ k8s_yaml (helm_with_build_cache ("apps/ergochat" , namespace = "faf-apps" , values = ["config/local.yaml" ], set = [ "serverName=chat.faforever.local" ] ))
315321k8s_resource (new_name = "ergochat-config" , objects = ["ergochat:configmap" , "ergochat:secret" ], labels = ["chat" ])
316322k8s_resource (workload = "ergochat" , objects = ["ergochat-webirc:ingressroute" ], resource_deps = ["traefik" ] + mariadb_setup_resources , port_forwards = ["8097:8097" ], labels = ["chat" ])
317323
@@ -355,38 +361,43 @@ k8s_resource(new_name="faf-policy-server-config", objects=["faf-policy-server:co
355361user_service_deps = ["faf-db-migrations" , "ory-hydra" ]
356362user_service_labels = ["user" ]
357363user_service_links = [link ("http://user.localhost/register" , "User Service Registration" )]
358- proxy_local_service_if_set (service_name = "faf-user-service" , service_chart = "apps/faf-user-service" , service_namespace = "faf-apps" , service_deps = user_service_deps , service_labels = user_service_labels , service_links = user_service_links , config_patch = {"HYDRA_TOKEN_ISSUER" : "http://ory-hydra:4444" , "HYDRA_JWKS_URL" : "http://ory-hydra:4444/.well-known/jwks.json" , "LOBBY_URL" :"ws://ws.localhost" , "REPLAY_URL" :"ws://replay-ws.localhost" })
364+ user_service_patch = {"HYDRA_TOKEN_ISSUER" : "http://ory-hydra:4444" , "HYDRA_JWKS_URL" : "http://ory-hydra:4444/.well-known/jwks.json" , "LOBBY_URL" :"ws://ws.localhost" , "REPLAY_URL" :"ws://replay-ws.localhost" }
365+ proxy_local_service_if_set (service_name = "faf-user-service" , service_chart = "apps/faf-user-service" , service_namespace = "faf-apps" , service_deps = user_service_deps , service_labels = user_service_labels , service_links = user_service_links , config_patch = user_service_patch )
359366
360367website_deps = ["wordpress" ]
361368website_labels = ["website" ]
362369website_links = [link ("http://www.localhost" , "FAForever Website" )]
363- proxy_local_service_if_set (service_name = "faf-website" , service_chart = "apps/faf-website" , service_namespace = "faf-apps" , service_deps = website_deps , service_labels = website_labels , service_links = website_links , additional_values = ["apps/faf-website/values-prod.yaml" ], config_patch = {"OAUTH_URL" : "http://ory-hydra:4444" , "OAUTH_PUBLIC_URL" : "http://hydra.localhost" , "API_URL" : "http://faf-api:8010" , "WP_URL" : "http://wordpress:80" })
370+ website_patch = {"OAUTH_URL" : "http://ory-hydra:4444" , "OAUTH_PUBLIC_URL" : "http://hydra.localhost" , "API_URL" : "http://faf-api:8010" , "WP_URL" : "http://wordpress:80" }
371+ proxy_local_service_if_set (service_name = "faf-website" , service_chart = "apps/faf-website" , service_namespace = "faf-apps" , service_deps = website_deps , service_labels = website_labels , service_links = website_links , additional_values = ["apps/faf-website/values-prod.yaml" ], config_patch = website_patch )
364372
365- api_deps = ["faf-db-migrations" , "ory-hydra" ] + rabbitmq_setup_resources
366- api_labels = ["api" ]
367- api_links = [link ("http://api.localhost" , "FAF API" )]
368- proxy_local_service_if_set (service_name = "faf-api" , service_chart = "apps/faf-api" , service_namespace = "faf-apps" , service_deps = api_deps , service_labels = api_labels , service_links = api_links , config_patch = {"JWT_FAF_HYDRA_ISSUER" : "http://ory-hydra:4444" })
373+ api_deps = ["faf-db-migrations" , "ory-hydra" ] + rabbitmq_setup_resources
374+ api_labels = ["api" ]
375+ api_links = [link ("http://api.localhost" , "FAF API" )]
376+ api_patch = {"JWT_FAF_HYDRA_ISSUER" : "http://ory-hydra:4444" , "REPLAY_DOWNLOAD_URL_FORMAT" : "http://replays.localhost/%s" , "MOD_DOWNLOAD_URL_FORMAT" : "http://content.localhost/mods/%s" , "MAP_DOWNLOAD_URL_FORMAT" : "http://content.localhost/maps/%s" , "FEATURED_MOD_URL_FORMAT" :"http://content.localhost/legacy-featured-mod-files/%s/%s" , "AVATAR_DOWNLOAD_URL_FORMAT" :"http://content.localhost/faf/avatars/%s" }
377+ proxy_local_service_if_set (service_name = "faf-api" , service_chart = "apps/faf-api" , service_namespace = "faf-apps" , service_deps = api_deps , service_labels = api_labels , service_links = api_links , config_patch = api_patch )
369378
370- league_service_deps = mariadb_setup_resources + rabbitmq_setup_resources
371- league_service_labels = ["leagues" ]
379+ league_service_deps = mariadb_setup_resources + rabbitmq_setup_resources
380+ league_service_labels = ["leagues" ]
372381proxy_local_service_if_set (service_name = "faf-league-service" , service_chart = "apps/faf-league-service" , service_namespace = "faf-apps" , service_deps = league_service_deps , service_labels = league_service_labels )
373382
374- lobby_server_deps = ["faf-db-migrations" , "ory-hydra" ] + rabbitmq_setup_resources
375- lobby_server_labels = ["lobby" ]
376- proxy_local_service_if_set (service_name = "faf-lobby-server" , service_chart = "apps/faf-lobby-server" , service_namespace = "faf-apps" , service_deps = lobby_server_deps , service_labels = lobby_server_labels , config_patch = {"HYDRA_JWKS_URI" : "http://ory-hydra:4444/.well-known/jwks.json" })
383+ lobby_server_deps = ["faf-db-migrations" , "ory-hydra" ] + rabbitmq_setup_resources
384+ lobby_server_labels = ["lobby" ]
385+ lobby_server_patch = {"HYDRA_JWKS_URI" : "http://ory-hydra:4444/.well-known/jwks.json" }
386+ proxy_local_service_if_set (service_name = "faf-lobby-server" , service_chart = "apps/faf-lobby-server" , service_namespace = "faf-apps" , service_deps = lobby_server_deps , service_labels = lobby_server_labels , config_patch = lobby_server_patch )
377387
378- replay_server_deps = ["faf-db-migrations" ]
379- replay_server_labels = ["replay" ]
388+ replay_server_deps = ["faf-db-migrations" ]
389+ replay_server_labels = ["replay" ]
380390proxy_local_service_if_set (service_name = "faf-replay-server" , service_chart = "apps/faf-replay-server" , service_namespace = "faf-apps" , service_deps = replay_server_deps , service_labels = replay_server_labels )
381391
382- unitdb_labels = ["unitdb" ]
383- unitdb_links = [link ("http://unitdb.localhost" , "Rackover UnitDB" )]
392+ unitdb_labels = ["unitdb" ]
393+ unitdb_links = [link ("http://unitdb.localhost" , "Rackover UnitDB" )]
384394proxy_local_service_if_set (service_name = "faf-unitdb" , service_chart = "apps/faf-unitdb" , service_namespace = "faf-apps" , service_labels = unitdb_labels , service_links = unitdb_links )
385395
386- ws_bridge_deps = ["faf-lobby-server" ]
387- ws_bridge_labels = ["lobby" ]
396+ ws_bridge_deps = ["faf-lobby-server" ]
397+ ws_bridge_labels = ["lobby" ]
388398proxy_local_service_if_set (service_name = "faf-ws-bridge" , service_chart = "apps/faf-ws-bridge" , service_namespace = "faf-apps" , service_deps = ws_bridge_deps , service_labels = ws_bridge_labels )
389399
390- icebreaker_deps = ["faf-db-migrations" , "ory-hydra" ] + rabbitmq_setup_resources
391- icebreaker_labels = ["api" ]
392- proxy_local_service_if_set (service_name = "faf-icebreaker" , service_chart = "apps/faf-icebreaker" , service_namespace = "faf-apps" , service_deps = icebreaker_deps , service_labels = icebreaker_labels , config_patch = {"HYDRA_URL" : "http://ory-hydra:4444" , "XIRSYS_ENABLED" : "false" , "XIRSYS_TURN_ENABLED" : "false" , "CLOUDFLARE_ENABLED" : "false" })
400+ icebreaker_deps = ["faf-db-migrations" , "ory-hydra" ] + rabbitmq_setup_resources
401+ icebreaker_labels = ["api" ]
402+ icebreaker_patch = {"HYDRA_URL" : "http://ory-hydra:4444" , "XIRSYS_ENABLED" : "false" , "XIRSYS_TURN_ENABLED" : "false" , "CLOUDFLARE_ENABLED" : "false" }
403+ proxy_local_service_if_set (service_name = "faf-icebreaker" , service_chart = "apps/faf-icebreaker" , service_namespace = "faf-apps" , service_deps = icebreaker_deps , service_labels = icebreaker_labels , config_patch = icebreaker_patch )
0 commit comments