kuber_kit 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31078802fb9b9050b29675dd4b364c667ea7dc0f554b395144166fa2b7e0ffce
-  data.tar.gz: 585c56af43570387ee0ceb0985d0ceb2cbac7a4d5627103be1471f6757d2eabd
+  metadata.gz: e7a15c35161f8c5761166a3c41dbc90266cc3ae51d1cfa9072d3fa388d7989e2
+  data.tar.gz: d8099224340a4853898d990c3da88885db319c5b1025c660ae86427bf41dcaa2
 SHA512:
-  metadata.gz: 50a194368b224a8b35a6b24a9a22897a9ed0c891eb6888fee5f9c3e788d4114618647b18a6cffe31772cff641b2ee37361bb02cc14838eb18ea1ecd5b1fab3dd
-  data.tar.gz: dc9c31daed2206895a685aec0737656f387d9d08726f5897a8fb5b89bcce254683231b809ccf75b5b4e4a88ca39cb65ec41b2a688513ac559dd842510f09e823
+  metadata.gz: b7237d18746045b3a9017efd958191fc80339c321945bb6a4fceffa0320c15832e4b04710636b56977ab8df22bd0f5770bb970a83797e6c9a4aa22a4efea0093
+  data.tar.gz: 30e94daaafd019195a7ab46ffe07d619af7bcbbe06d87e288f4e3e50ca8e926a9270dfa7716b72cbfcec0d480a9fa2979422c676ea4df7a3fdd0dbc03ff2b4c0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+**1.3.3**
+- Support "partials" in the templates with "render" method.
+- Cleanup artifacts after deployment if cache_result: false
+- Improve fetching git artifact when branch name has changed
+
+**1.3.2**
+- Added an ability to generate helm templates using `kit generate` command
+
 **1.3.1**
 - Fix upgrade command for helm strategy
 

data/README.md

@@ -19,7 +19,7 @@ Please install specific kuber_kit version, depending on Ruby version.
 | Ruby Version | KuberKit Version |
 | ------------ | ------------ |
 | 2.6 | 1.0.1 |
-| 2.7 | 1.1.3 |
+| 2.7 | 1.1.5 |
 | > 3.0 | 1.2.6 |
 
 ## Usage

data/kuber_kit.gemspec

@@ -36,6 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "cli-ui", '2.1.0'
   spec.add_dependency "net-ssh"
   spec.add_dependency "tty-prompt"
+  spec.add_dependency 'ed25519'
 
   spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/kuber_kit/actions/service_deployer.rb

@@ -29,11 +29,11 @@ class KuberKit::Actions::ServiceDeployer
       services, tags = deployment_options_selector.call()
     end
 
-    disabled_services = current_configuration.disabled_services.map(&:to_s)
-    disabled_services += skip_services if skip_services
-    default_services  = current_configuration.default_services.map(&:to_s) - disabled_services
-    initial_services  = current_configuration.initial_services.map(&:to_s) - disabled_services
-    initial_service_names = initial_services.map(&:to_sym)
+    disabled_services     = current_configuration.disabled_services.map(&:to_s)
+    disabled_services     += skip_services if skip_services
+    default_services      = current_configuration.default_services.map(&:to_s) - disabled_services
+    pre_deploy_services   = current_configuration.pre_deploy_services.map(&:to_s) - disabled_services
+    post_deploy_services  = current_configuration.post_deploy_services.map(&:to_s) - disabled_services
 
     service_names = service_list_resolver.resolve(
       services:         services || [],
@@ -50,17 +50,19 @@ class KuberKit::Actions::ServiceDeployer
       all_service_names = service_dependency_resolver.get_all(service_names)
     end
 
+    all_service_names_with_hooks  = (pre_deploy_services.map(&:to_sym) + all_service_names + post_deploy_services.map(&:to_sym)).uniq
+
     unless all_service_names.any?
       ui.print_warning "ServiceDeployer", "No service found with given options, nothing will be deployed."
       return false
     end
 
-    unless allow_deployment?(require_confirmation: require_confirmation, service_names: (initial_service_names + all_service_names).uniq)
+    unless allow_deployment?(require_confirmation: require_confirmation, service_names: all_service_names_with_hooks)
       return false
     end
 
     # Compile images for all services and dependencies
-    images_names = get_image_names(service_names: (initial_service_names + all_service_names).uniq)
+    images_names = get_image_names(service_names: all_service_names_with_hooks.uniq)
     unless skip_compile
       compilation_result = compile_images(images_names)
 
@@ -72,33 +74,31 @@ class KuberKit::Actions::ServiceDeployer
       return deployment_result
     end
 
-    # First deploy initial services. 
+    # First, deploy pre-deploy services.
     # This feature is used to deploy some services, required for deployment of other services, e.g. env files
     # Note: Initial services are deployed without dependencies
-    initial_services.map(&:to_sym).each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
-      ui.print_debug("ServiceDeployer", "Scheduling to compile: #{batch_service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
+    pre_deploy_services.map(&:to_sym).each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
+      deploy_simultaneously(batch_service_names, deployment_result)
+    end
 
-      if deployment_result.succeeded?
+    # Next, deploy all initializers simultaneously.
+    # Note: In earlier versions, KuberKit would deploy all dependencies in the order defined by dependency tree.
+    #       Now it would deploy all dependencies (initializers) at the same time, even if one initializer depends on another initializer.
+    unless skip_dependencies
+      initializers = service_dependency_resolver.get_all_deps(service_names)
+      initializers.map(&:to_sym).each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
         deploy_simultaneously(batch_service_names, deployment_result)
       end
     end
 
-    if skip_dependencies
-      service_names.each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
-        ui.print_debug("ServiceDeployer", "Scheduling to deploy: #{batch_service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
-
-        if deployment_result.succeeded?
-          deploy_simultaneously(batch_service_names, deployment_result)
-        end
-      end
-    else
-      service_dependency_resolver.each_with_deps(service_names) do |dep_service_names|
-        ui.print_debug("ServiceDeployer", "Scheduling to deploy: #{dep_service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
+    # Next, deploy all requested services.
+    service_names.each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
+      deploy_simultaneously(batch_service_names, deployment_result)
+    end
 
-        if deployment_result.succeeded?
-          deploy_simultaneously(dep_service_names, deployment_result)
-        end
-      end
+    # Last, deploy post-deploy services.
+    post_deploy_services.map(&:to_sym).each_slice(configs.deploy_simultaneous_limit) do |batch_service_names|
+      deploy_simultaneously(batch_service_names, deployment_result)
     end
 
     deployment_result
@@ -116,6 +116,13 @@ class KuberKit::Actions::ServiceDeployer
 
   private
     def deploy_simultaneously(service_names, deployment_result)
+      unless deployment_result.succeeded?
+        ui.print_debug("ServiceDeployer", "Deploymet already failed. Canceling: #{service_names.inspect}")
+        return
+      end
+
+      ui.print_debug("ServiceDeployer", "Scheduling to deploy: #{service_names.inspect}. Limit: #{configs.deploy_simultaneous_limit}")
+
       task_group = ui.create_task_group
 
       service_names.each do |service_name|

data/lib/kuber_kit/actions/service_generator.rb

@@ -0,0 +1,20 @@
+class KuberKit::Actions::ServiceGenerator
+  include KuberKit::Import[
+    "shell.local_shell",
+    "service_generator.action_handler",
+    "ui",
+  ]
+
+  Contract Symbol, String => Any
+  def call(service_name, path)
+    expanded_path = File.expand_path(path)
+    puts expanded_path
+    action_handler.call(local_shell, service_name, expanded_path)
+
+    true
+  rescue KuberKit::Error => e
+    ui.print_error("Error", e.message)
+    
+    false
+  end
+end

data/lib/kuber_kit/artifacts_sync/artifact_updater.rb

@@ -1,27 +1,37 @@
 class KuberKit::ArtifactsSync::ArtifactUpdater
-  ResolverNotFoundError = Class.new(KuberKit::NotFoundError)
+  StrategyNotFoundError = Class.new(KuberKit::NotFoundError)
 
   include KuberKit::Import[
     "ui"
   ]
 
-  def use_resolver(artifact_resolver, artifact_class:)
-    @@resolvers ||= {}
+  def use_strategy(strategy, artifact_class:)
+    @@strategies ||= {}
 
-    if !artifact_resolver.is_a?(KuberKit::ArtifactsSync::AbstractArtifactResolver)
-      raise ArgumentError.new("should be an instance of KuberKit::ArtifactsSync::AbstractArtifactResolver, got: #{artifact_resolver.inspect}")
+    if !strategy.is_a?(KuberKit::ArtifactsSync::Strategies::Abstract)
+      raise ArgumentError.new("should be an instance of KuberKit::ArtifactsSync::Strategies::Abstract, got: #{strategy.inspect}")
     end
 
-    @@resolvers[artifact_class] = artifact_resolver
+    @@strategies[artifact_class] = strategy
   end
 
   def update(shell, artifact)
-    resolver = @@resolvers[artifact.class]
+    strategy = @@strategies[artifact.class]
 
     ui.print_debug "ArtifactUpdater", "Updating artifact #{artifact.name.to_s.green}"
     
-    raise ResolverNotFoundError, "Can't find resolver for artifact #{artifact}" if resolver.nil?
+    raise StrategyNotFoundError, "Can't find strategy for artifact #{artifact}" if strategy.nil?
 
-    resolver.resolve(shell, artifact)
+    strategy.update(shell, artifact)
+  end
+
+  def cleanup(shell, artifact)
+    strategy = @@strategies[artifact.class]
+
+    ui.print_debug "ArtifactUpdater", "Cleaning artifact #{artifact.name.to_s.green}"
+    
+    raise StrategyNotFoundError, "Can't find strategy for artifact #{artifact}" if strategy.nil?
+
+    strategy.cleanup(shell, artifact)
   end
 end

data/lib/kuber_kit/artifacts_sync/strategies/abstract.rb

@@ -0,0 +1,9 @@
+class KuberKit::ArtifactsSync::Strategies::Abstract
+  def update(shell, artifact)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+
+  def cleanup(shell, artifact)
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
+end

data/lib/kuber_kit/artifacts_sync/strategies/git_updater.rb

@@ -0,0 +1,46 @@
+class KuberKit::ArtifactsSync::Strategies::GitUpdater < KuberKit::ArtifactsSync::Strategies::Abstract
+
+  include KuberKit::Import[
+    "shell.git_commands",
+    "shell.bash_commands",
+  ]
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Artifacts::Git => Any
+  def update(shell, artifact)
+    already_cloned = artifact_already_cloned?(
+      shell:      shell,
+      repo_path:  artifact.cloned_path,
+      artifact:   artifact
+    )
+
+    if already_cloned
+      git_commands.force_pull_repo(shell, 
+        path: artifact.cloned_path, branch: artifact.branch
+      )
+    else
+      git_commands.download_repo(shell, 
+        remote_url: artifact.remote_url, path: artifact.cloned_path, branch: artifact.branch
+      )
+    end
+  end
+
+  Contract KuberKit::Shell::AbstractShell, KuberKit::Core::Artifacts::Git => Any
+  def cleanup(shell, artifact)
+    bash_commands.rm_rf(shell, artifact.cloned_path)
+  end
+
+  private
+    def artifact_already_cloned?(shell:, repo_path:, artifact:)
+      target_remote_url = git_commands.get_remote_url(shell, repo_path)
+      if target_remote_url != artifact.remote_url
+        return false
+      end
+
+      target_branch = git_commands.get_branch_name(shell, repo_path)
+      if target_branch != artifact.branch
+        return false
+      end
+
+      return true
+    end
+end

data/lib/kuber_kit/artifacts_sync/strategies/null_updater.rb

@@ -0,0 +1,12 @@
+class KuberKit::ArtifactsSync::Strategies::NullUpdater < KuberKit::ArtifactsSync::Strategies::Abstract
+
+  Contract KuberKit::Shell::AbstractShell, Any => Any
+  def update(shell, artifact)
+    return true
+  end
+
+  Contract KuberKit::Shell::AbstractShell, Any => Any
+  def cleanup(shell, artifact)
+    return true
+  end
+end

data/lib/kuber_kit/cli.rb

@@ -24,6 +24,8 @@ class KuberKit::CLI < Thor
       action_result = KuberKit::Container['actions.image_compiler'].call(image_names, options)
     end
 
+    clean_artifacts(options)
+
     if action_result && action_result.succeeded?
       time = (Time.now.to_i - started_at)
       print_result("Image compilation finished! (#{time}s)", result: {
@@ -64,6 +66,8 @@ class KuberKit::CLI < Thor
       )
     end
 
+    clean_artifacts(options)
+
     if action_result && action_result.succeeded?
       time = (Time.now.to_i - started_at)
       print_result("Service deployment finished! (#{time}s)", result: {
@@ -111,6 +115,16 @@ class KuberKit::CLI < Thor
     end
   end
 
+
+  desc "generate SERVICE_NAME PATH_NAME", "Generates a template for a given service in a given path"
+  def generate(service_name, path)
+    setup(options)
+
+    if KuberKit::Container['actions.configuration_loader'].call(options)
+      KuberKit::Container['actions.service_generator'].call(service_name.to_sym, path)
+    end
+  end
+
   desc "apply FILE_PATH", "Apply FILE_PATH with kubectl"
   def apply(file_path)
     setup(options)
@@ -220,4 +234,17 @@ class KuberKit::CLI < Thor
     def print_result(message, data = {})
       KuberKit::Container['ui'].print_result(message, data)
     end
+
+    def clean_artifacts(options)
+      artifacts = KuberKit.current_configuration.artifacts.values
+      artifacts_to_clean = artifacts.select(&:cleanup_needed?)
+  
+      return unless artifacts_to_clean.any?
+
+      artifacts_to_clean.each do |artifact|
+        KuberKit::Container['artifacts_sync.artifact_updater'].cleanup(
+          KuberKit::Container['shell.local_shell'], artifact
+        )
+      end
+    end
 end

data/lib/kuber_kit/configs.rb

@@ -5,7 +5,8 @@ class KuberKit::Configs
     :image_dockerfile_name, :image_build_context_dir, :image_tag, :docker_ignore_list, :image_compile_dir, :remote_image_compile_dir,
     :kuber_kit_dirname, :kuber_kit_min_version, :images_dirname, :services_dirname, :infra_dirname, :configurations_dirname,
     :artifact_clone_dir, :service_config_dir, :deployer_strategy, :compile_simultaneous_limit, :deploy_simultaneous_limit,
-    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir, :shell_launcher_strategy, :shell_launcher_sets_configration
+    :additional_images_paths, :deprecation_warnings_disabled, :log_file_path, :env_file_compile_dir, :shell_launcher_strategy, 
+    :shell_launcher_sets_configration, :generator_strategy
   ]
   DOCKER_IGNORE_LIST = [
     'Dockerfile',
@@ -60,6 +61,7 @@ class KuberKit::Configs
     set :log_file_path,           File.join(absolute_kuber_kit_path, "deploy.log")
     set :env_file_compile_dir,    File.join(absolute_kuber_kit_path, "env_files")
     set :shell_launcher_sets_configration, true
+    set :generator_strategy,         :helm
   end
 
   def items

data/lib/kuber_kit/container.rb

@@ -25,6 +25,10 @@ class KuberKit::Container
     KuberKit::Actions::ServiceChecker.new
   end
 
+  register "actions.service_generator" do
+    KuberKit::Actions::ServiceGenerator.new
+  end
+
   register "actions.configuration_loader" do
     KuberKit::Actions::ConfigurationLoader.new
   end
@@ -233,12 +237,12 @@ class KuberKit::Container
     KuberKit::ArtifactsSync::ArtifactUpdater.new
   end
 
-  register "artifacts_sync.git_artifact_resolver" do
-    KuberKit::ArtifactsSync::GitArtifactResolver.new
+  register "artifacts_sync.strategies.git_updater" do
+    KuberKit::ArtifactsSync::Strategies::GitUpdater.new
   end
 
-  register "artifacts_sync.null_artifact_resolver" do
-    KuberKit::ArtifactsSync::NullArtifactResolver.new
+  register "artifacts_sync.strategies.null_updater" do
+    KuberKit::ArtifactsSync::Strategies::NullUpdater.new
   end
 
   register "env_file_reader.action_handler" do
@@ -273,6 +277,10 @@ class KuberKit::Container
     KuberKit::TemplateReader::Reader.new
   end
 
+  register "template_reader.renderer" do
+    KuberKit::TemplateReader::Renderer.new
+  end
+
   register "template_reader.strategies.artifact_file" do
     KuberKit::TemplateReader::Strategies::ArtifactFile.new
   end
@@ -301,6 +309,18 @@ class KuberKit::Container
     KuberKit::ServiceDeployer::ServiceDependencyResolver.new
   end
 
+  register "service_generator.action_handler" do
+    KuberKit::ServiceGenerator::ActionHandler.new
+  end
+
+  register "service_generator.strategy_detector" do
+    KuberKit::ServiceGenerator::StrategyDetector.new
+  end
+
+  register "service_generator.generator" do
+    KuberKit::ServiceGenerator::Generator.new
+  end
+
   register "service_reader.action_handler" do
     KuberKit::ServiceReader::ActionHandler.new
   end

data/lib/kuber_kit/core/artifacts/abstract_artifact.rb

@@ -14,4 +14,8 @@ class KuberKit::Core::Artifacts::AbstractArtifact
   def sync_description
     raise KuberKit::NotImplementedError, "must be implemented"
   end
+
+  def cleanup_needed?
+    raise KuberKit::NotImplementedError, "must be implemented"
+  end
 end

data/lib/kuber_kit/core/artifacts/git.rb

@@ -5,12 +5,13 @@ class KuberKit::Core::Artifacts::Git < KuberKit::Core::Artifacts::AbstractArtifa
   DEFAULT_REMOTE_NAME = "origin"
   DEFAULT_BRANCH = "master"
 
-  def setup(remote_url:, remote_name: DEFAULT_REMOTE_NAME, branch: DEFAULT_BRANCH, clone_path: nil, ssh_key: DEFAULT_SSH_KEY)
+  def setup(remote_url:, remote_name: DEFAULT_REMOTE_NAME, branch: DEFAULT_BRANCH, clone_path: nil, ssh_key: DEFAULT_SSH_KEY, cache_result: true)
     @remote_name = remote_name
     @remote_url = remote_url
     @branch = branch
     @clone_path = clone_path
     @ssh_key = ssh_key
+    @cache_result = cache_result
     self
   end
 
@@ -23,4 +24,8 @@ class KuberKit::Core::Artifacts::Git < KuberKit::Core::Artifacts::AbstractArtifa
   def sync_description
     "#{remote_url}:#{branch}"
   end
+
+  def cleanup_needed?
+    !@cache_result
+  end
 end

data/lib/kuber_kit/core/artifacts/local.rb

@@ -15,4 +15,8 @@ class KuberKit::Core::Artifacts::Local < KuberKit::Core::Artifacts::AbstractArti
   def sync_description
     "local"
   end
+
+  def cleanup_needed?
+    false
+  end
 end

data/lib/kuber_kit/core/configuration.rb

@@ -1,9 +1,9 @@
 class KuberKit::Core::Configuration
   attr_reader :name, :artifacts, :registries, :env_files, :templates, :kubeconfig_path, :kubectl_entrypoint,
               :services_attributes, :enabled_services, :disabled_services, :default_services,
-              :initial_services, :build_servers, :global_build_vars,
+              :pre_deploy_services, :post_deploy_services, :build_servers, :global_build_vars,
               :deployer_strategy, :deployer_namespace, :deployer_require_confirmation,
-              :shell_launcher_strategy
+              :shell_launcher_strategy, :generator_strategy
 
   Contract KeywordArgs[
     name:                 Symbol,
@@ -17,18 +17,20 @@ class KuberKit::Core::Configuration
     enabled_services:     ArrayOf[Symbol],
     disabled_services:    ArrayOf[Symbol],
     default_services:     ArrayOf[Symbol],
-    initial_services:     ArrayOf[Symbol],
+    pre_deploy_services:  ArrayOf[Symbol],
+    post_deploy_services: ArrayOf[Symbol],
     build_servers:        ArrayOf[KuberKit::Core::BuildServers::AbstractBuildServer],
     global_build_vars:    HashOf[Symbol => Any],
     deployer_strategy:              Symbol,
     deployer_namespace:             Maybe[Or[Symbol, String]],
     deployer_require_confirmation:  Bool,
     shell_launcher_strategy:        Symbol,
+    generator_strategy:             Symbol,
   ] => Any
   def initialize(name:, artifacts:, registries:, env_files:, templates:, kubeconfig_path:, kubectl_entrypoint:,
                  services_attributes:, enabled_services:, disabled_services:, default_services:, 
-                 initial_services:, build_servers:, global_build_vars:,
-                 deployer_strategy:, deployer_namespace:, deployer_require_confirmation:, shell_launcher_strategy:)
+                 pre_deploy_services:, post_deploy_services:, build_servers:, global_build_vars:,
+                 deployer_strategy:, deployer_namespace:, deployer_require_confirmation:, shell_launcher_strategy:, generator_strategy:)
     @name                 = name
     @artifacts            = artifacts
     @registries           = registries
@@ -41,12 +43,14 @@ class KuberKit::Core::Configuration
     @enabled_services     = enabled_services
     @disabled_services    = disabled_services
     @default_services     = default_services
-    @initial_services     = initial_services
+    @pre_deploy_services  = pre_deploy_services
+    @post_deploy_services = post_deploy_services
     @global_build_vars    = global_build_vars
     @deployer_strategy              = deployer_strategy
     @deployer_namespace             = deployer_namespace
     @deployer_require_confirmation  = deployer_require_confirmation
     @shell_launcher_strategy        = shell_launcher_strategy
+    @generator_strategy             = generator_strategy
   end
 
   def service_attributes(service_name)

data/lib/kuber_kit/core/configuration_definition.rb

@@ -9,13 +9,14 @@ class KuberKit::Core::ConfigurationDefinition
     @artifacts  = {}
     @registries = {}
     @env_files  = {}
-    @templates  = {}
-    @build_servers      = []
-    @enabled_services   = []
-    @disabled_services  = []
-    @default_services   = []
-    @initial_services   = []
-    @services_attributes = {}
+    @templates  = {} 
+    @build_servers        = []
+    @enabled_services     = []
+    @disabled_services    = []
+    @default_services     = []
+    @pre_deploy_services  = []
+    @post_deploy_services = []
+    @services_attributes  = {}
   end
 
   def to_attrs
@@ -30,7 +31,8 @@ class KuberKit::Core::ConfigurationDefinition
       enabled_services:     @enabled_services,
       disabled_services:    @disabled_services,
       default_services:     @default_services,
-      initial_services:     @initial_services,
+      pre_deploy_services:  @pre_deploy_services,
+      post_deploy_services: @post_deploy_services,
       build_servers:        @build_servers,
       services_attributes:  @services_attributes,
       global_build_vars:    @global_build_vars,
@@ -38,6 +40,7 @@ class KuberKit::Core::ConfigurationDefinition
       deployer_namespace:             @deployer_namespace,
       deployer_require_confirmation:  @deployer_require_confirmation || false,
       shell_launcher_strategy:        @shell_launcher_strategy,
+      generator_strategy:             @generator_strategy,
     )
   end
 
@@ -109,6 +112,12 @@ class KuberKit::Core::ConfigurationDefinition
     self
   end
 
+  def generator_strategy(strategy)
+    @generator_strategy = strategy
+
+    self
+  end
+
   def deployer_require_confirmation
     @deployer_require_confirmation = true
 
@@ -143,7 +152,19 @@ class KuberKit::Core::ConfigurationDefinition
   end
 
   def initial_services(services)
-    @initial_services += services.map(&:to_sym)
+    unless KuberKit.deprecation_warnings_disabled?
+      puts "WARNING: initial_services is deprecated, please use pre_deploy_services instead"
+    end
+    pre_deploy_services(services)
+  end
+
+  def pre_deploy_services(services)
+    @pre_deploy_services += services.map(&:to_sym)
+    return self
+  end
+
+  def post_deploy_services(services)
+    @post_deploy_services += services.map(&:to_sym)
     return self
   end
 

data/lib/kuber_kit/core/configuration_factory.rb

@@ -32,12 +32,14 @@ class KuberKit::Core::ConfigurationFactory
       enabled_services:     configuration_attrs.enabled_services,
       disabled_services:    configuration_attrs.disabled_services,
       default_services:     configuration_attrs.default_services,
-      initial_services:     configuration_attrs.initial_services,
+      pre_deploy_services:  configuration_attrs.pre_deploy_services,
+      post_deploy_services: configuration_attrs.post_deploy_services,
       global_build_vars:    configuration_attrs.global_build_vars || {},
       deployer_strategy:              configuration_attrs.deployer_strategy || configs.deployer_strategy,
       deployer_namespace:             configuration_attrs.deployer_namespace,
       deployer_require_confirmation:  configuration_attrs.deployer_require_confirmation,
       shell_launcher_strategy:        configuration_attrs.shell_launcher_strategy || configs.shell_launcher_strategy,
+      generator_strategy:             configuration_attrs.generator_strategy || configs.generator_strategy,
     )
   end
 

data/lib/kuber_kit/core/context_helper/abstract_helper.rb

@@ -0,0 +1,5 @@
+class KuberKit::Core::ContextHelper::AbstractHelper
+  def get_binding
+    binding
+  end
+end

data/lib/kuber_kit/core/context_helper/base_helper.rb

@@ -1,6 +1,4 @@
-class KuberKit::Core::ContextHelper::BaseHelper
-  CONTRACT = RespondTo[:get_binding]
-
+class KuberKit::Core::ContextHelper::BaseHelper < KuberKit::Core::ContextHelper::AbstractHelper
   attr_reader :shell, :artifact_store, :image_store, :env_file_reader
 
   def initialize(image_store:, artifact_store:, shell:, env_file_reader:)
@@ -39,8 +37,4 @@ class KuberKit::Core::ContextHelper::BaseHelper
     end
     global_build_vars
   end
-
-  def get_binding
-    binding
-  end
 end

data/lib/kuber_kit/core/context_helper/context_helper_factory.rb

@@ -2,7 +2,8 @@ class KuberKit::Core::ContextHelper::ContextHelperFactory
   include KuberKit::Import[
     "core.image_store",
     "core.artifact_store",
-    env_file_reader: "env_file_reader.action_handler"
+    template_renderer: "template_reader.renderer",
+    env_file_reader:   "env_file_reader.action_handler"
   ]
 
   def build_image_context(shell, image)
@@ -22,6 +23,7 @@ class KuberKit::Core::ContextHelper::ContextHelperFactory
       shell:            shell,
       env_file_reader:  env_file_reader,
       service:          service,
+      template_renderer: template_renderer
     )
   end
 end

data/lib/kuber_kit/core/context_helper/local_context_helper.rb

@@ -0,0 +1,14 @@
+class KuberKit::Core::ContextHelper::LocalContextHelper < KuberKit::Core::ContextHelper::AbstractHelper
+  def initialize(parent_context_helper:, variables:)
+    @parent_context_helper = parent_context_helper
+    @variables = variables
+  end
+
+  def method_missing(method_name, *args, &block)
+    if @variables.has_key?(method_name)
+      @variables[method_name]
+    else
+      @parent_context_helper.send(method_name, *args, &block)
+    end
+  end
+end