diff --git a/config/config.exs b/config/config.exs index 7e66294..ff3eb86 100644 --- a/config/config.exs +++ b/config/config.exs @@ -59,7 +59,7 @@ config :discovery, config :discovery, :api_version, config_map: "v1", deployment: "apps/v1", - ingress: "networking.k8s.io/v1beta1", + ingress: "networking.k8s.io/v1", namespace: "v1", service: "v1" diff --git a/dev.Dockerfile b/dev.Dockerfile index 94aeeac..cc3828b 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -20,8 +20,8 @@ ENV MIX_ENV="${MIX_ENV}" # install mix dependencies COPY mix.exs mix.lock ./ -RUN mix deps.get --only $MIX_ENV -RUN mkdir config +COPY config config +RUN mix do deps.get, deps.compile # copy compile-time config files before we compile dependencies # to ensure any relevant config change will trigger the dependencies diff --git a/lib/discovery/deploy/deploy_utils.ex b/lib/discovery/deploy/deploy_utils.ex index 254b8c9..b2a95a5 100644 --- a/lib/discovery/deploy/deploy_utils.ex +++ b/lib/discovery/deploy/deploy_utils.ex @@ -153,7 +153,7 @@ defmodule Discovery.Deploy.DeployUtils do end end - @spec create_app_folder(app()) :: :ok | {:error, term()} + @spec create_app_version_folder(app()) :: :ok | {:error, term()} defp create_app_version_folder(app) do File.mkdir("minikube/discovery/#{app.app_name}/#{app.app_name}-#{app.uid}") end @@ -283,7 +283,7 @@ defmodule Discovery.Deploy.DeployUtils do @spec patch_resource(String.t()) :: :ok | {:error, String.t()} defp patch_resource(resource) do - Utils.puts_warn("RUNNING RESOURCE: #{resource}") + Utils.puts_warn("PATCHING RESOURCE: #{resource}") with conn when not is_nil(conn) <- Builder.get_conn(), {:ok, resource_map} <- K8s.Resource.from_file(resource), diff --git a/makefile b/makefile index 80c4ea0..daa0046 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,4 @@ -VERSION_DEV = 0.2.2 +VERSION_DEV = 0.2.3 VERSION_PROD = 0.1.0 commit: diff --git a/mix.exs b/mix.exs index 1e046c7..157d366 100644 --- a/mix.exs +++ b/mix.exs @@ -1,7 +1,7 @@ defmodule Discovery.MixProject do use Mix.Project - @version "0.2.1" + @version "0.2.3" def project do [