Merge branch 'revert-a7aec7e8' into 'master'

Revert "Merge branch '8285-support-external-consul' into 'master'"

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/7277

Merged-by: Balasankar 'Balu' C <[email protected]>
Approved-by: Balasankar 'Balu' C <[email protected]>
Co-authored-by: Clemens Beck <[email protected]>

Author: balasankarc

config/software/consul.rb

@@ -16,8 +16,6 @@
 
 name 'consul'
 
-# This version should be keep in sync with consul versions in
-# software/consul.rb and consul_helper.rb.
 version = Gitlab::Version.new('consul', 'v1.16.3')
 default_version version.print(false)
 

deps.yml

@@ -79,13 +79,6 @@ dependencies:
         - filename: config/software/consul.rb
           pattern: "version = Gitlab::Version.new\\('consul', 'v(\\S+)'\\)"
           range: '< 1.17.0'
-        - filename: files/gitlab-ctl-commands-ee/lib/consul_download.rb
-          pattern: "DEFAULT_VERSION = '(\\S+)'"
-          range: '< 1.17.0'
-        - filename: files/gitlab-cookbooks/consul/libraries/consul_helper.rb
-          pattern: "SUPPORTED_MINOR = '(\\S+)'"
-          tag_filter:
-            output_as: '$1.$2'
       # go-crond
       https://github.com/webdevops/go-crond.git:
         replace_in_files:

files/gitlab-config-template/gitlab.rb.template

@@ -3234,7 +3234,6 @@ external_url 'GENERATED_EXTERNAL_URL'
 # Consul (EE only)
 ################################################################################
 # consul['enable'] = false
-# consul['binary_path'] = '/opt/gitlab/embedded/bin/consul'
 # consul['dir'] = '/var/opt/gitlab/consul'
 # consul['username'] = 'gitlab-consul'
 # consul['group'] = 'gitlab-consul'

files/gitlab-cookbooks/consul/attributes/default.rb

@@ -1,5 +1,4 @@
 default['consul']['enable'] = false
-default['consul']['binary_path'] = '/opt/gitlab/embedded/bin/consul'
 default['consul']['dir'] = '/var/opt/gitlab/consul'
 default['consul']['username'] = 'gitlab-consul'
 default['consul']['group'] = 'gitlab-consul'

files/gitlab-cookbooks/consul/libraries/consul_helper.rb

@@ -9,10 +9,6 @@ class ConsulHelper
   # provide an `enable_service_#{service_name}` and `disable_service_#{service_name}` recipe
   SERVICES = %w(postgresql).freeze
 
-  # This version should be keep in sync with consul versions in
-  # software/consul.rb and consul_helper.rb.
-  SUPPORTED_MINOR = '1.16'.freeze
-
   def initialize(node)
     @node = node
     @default_configuration = {
@@ -180,7 +176,7 @@ def disabled_services
   def installed_version
     return unless OmnibusHelper.new(@node).service_up?('consul')
 
-    command = "#{@node['consul']['binary_path']} version"
+    command = '/opt/gitlab/embedded/bin/consul version'
     command_output = VersionHelper.version(command)
     raise "Execution of the command `#{command}` failed" unless command_output
 
@@ -199,13 +195,6 @@ def running_version
     info[:Config][:Version] unless info.empty?
   end
 
-  def installed_is_supported?
-    major_installed, minor_installed = installed_version.split('.')[0..1]
-    major_supported, minor_supported = SUPPORTED_MINOR.split('.')
-
-    major_installed == major_supported && minor_installed == minor_supported
-  end
-
   private
 
   def verify_incoming?

files/gitlab-cookbooks/consul/recipes/enable_daemon.rb

@@ -20,7 +20,6 @@
 
 runit_service 'consul' do
   options({
-            binary_path: node['consul']['binary_path'],
             config_dir: node['consul']['config_dir'],
             custom_config_dir: node['consul']['custom_config_dir'],
             config_file: node['consul']['config_file'],
@@ -58,17 +57,3 @@
   end
   only_if { consul_helper.running_version != consul_helper.installed_version }
 end
-
-ruby_block 'warn consul version mismatch' do
-  block do
-    message = <<~MESSAGE
-      The version of the installed consul service is different than what is expected.
-      Please run `gitlab-ctl consul-download --force` and restart consul to start
-      the new version:
-
-      https://docs.gitlab.com/ee/administration/consul.html#restart-consul
-    MESSAGE
-    LoggingHelper.warning(message)
-  end
-  only_if { consul_helper.installed_is_supported? }
-end

files/gitlab-cookbooks/consul/templates/default/sv-consul-run.erb

@@ -9,9 +9,7 @@ cd <%= @options[:dir] %>
 exec chpst -P -e <%= @options[:env_dir] %> \
 -U <%= @options[:user] %>:<%= @options[:groupname] %> \
 -u <%= @options[:user] %>:<%= @options[:groupname] %> \
-<%= @options[:binary_path] %> \
-  agent \
-  -config-file <%= @options[:config_file] %> \
+/opt/gitlab/embedded/bin/consul agent -config-file <%= @options[:config_file] %> \
   -config-dir <%= @options[:config_dir] %> \
   <% unless @options[:custom_config_dir].nil? -%>
   -config-dir <%= @options[:custom_config_dir] %> \

files/gitlab-ctl-commands-ee/consul.rb

@@ -15,13 +15,8 @@
 #
 
 require "#{base_path}/embedded/service/omnibus-ctl-ee/lib/consul"
-require "#{base_path}/embedded/service/omnibus-ctl-ee/lib/consul_download"
 
 add_command_under_category('consul', 'consul', 'Interact with the gitlab-consul cluster', 2) do
   consul = ConsulHandler.new(ARGV, $stdin.gets)
   consul.execute
 end
-
-add_command_under_category('consul-download', 'consul', 'Download consul for the gitlab-consul cluster', 2) do
-  ConsulDownloadCommand.new(ARGV).run
-end

files/gitlab-ctl-commands-ee/lib/consul.rb

@@ -1,10 +1,4 @@
 require 'mixlib/shellout'
-# For testing purposes, if the first path cannot be found load the second
-begin
-  require_relative '../../omnibus-ctl/lib/gitlab_ctl'
-rescue LoadError
-  require_relative '../../gitlab-ctl-commands/lib/gitlab_ctl'
-end
 
 class ConsulHandler
   WatcherError = Class.new(StandardError)
@@ -23,7 +17,7 @@ def execute
 
   class << self
     def run_consul(cmd)
-      command = Mixlib::ShellOut.new("#{consul_binary} #{cmd}")
+      command = Mixlib::ShellOut.new("/opt/gitlab/embedded/bin/consul #{cmd}")
       command.run_command
       begin
         command.error!
@@ -34,12 +28,6 @@ def run_consul(cmd)
       end
       command.stdout
     end
-
-    private
-
-    def consul_binary
-      GitlabCtl::Util.get_node_attributes.dig('consul', 'binary_path')
-    end
   end
 
   class Kv