diff --git a/.tool-versions b/.tool-versions index 29940d1..b92116d 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,3 @@ elixir 1.12.2-otp-24 erlang 24.0 +nodejs 14.17.3 diff --git a/config/dev.exs b/config/dev.exs index f04936e..ae1f070 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -82,7 +82,8 @@ config :discovery, :base_url, "http://localhost:4000" config :discovery, connection_method: :kube_config, namespace: "discovery", - service_account: "discovery-service-account", + ## "discovery-service-account", + service_account: "default", resources: %{ limits: %{cpu: "500m", memory: "500Mi"}, requests: %{cpu: "100m", memory: "300Mi"} @@ -90,3 +91,10 @@ config :discovery, image_pull_secrets: "ghostdsb-auth-discovery", use_external_ingress_class: false, use_service_account: true + +# config :discovery, :api_version, +# config_map: "v1", +# deployment: "apps/v1", +# ingress: "networking.k8s.io/v1beta1", +# namespace: "v1", +# service: "v1" diff --git a/lib/discovery/resources/ingress.ex b/lib/discovery/resources/ingress.ex index e689601..46f3c54 100644 --- a/lib/discovery/resources/ingress.ex +++ b/lib/discovery/resources/ingress.ex @@ -23,6 +23,7 @@ defmodule Discovery.Resources.Ingress do def add_ingress_path(current_ingress_map, app) do new_path = %{ "path" => "/#{app.uid}(/|$)(.*)", + # "pathType" => "ImplementationSpecific", "backend" => %{ "serviceName" => "#{app.app_name}-#{app.uid}", "servicePort" => 80