From 847ec9dbac470c0f822a7ad73f1d95471ca023b3 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Sun, 6 Sep 2026 09:57:29 +0100
Subject: [PATCH] Drop unused support for elasticsearch 6

---
 cookbooks/apt/recipes/elasticsearch6.rb       | 27 -------------------
 cookbooks/elasticsearch/attributes/default.rb |  2 +-
 cookbooks/elasticsearch/recipes/default.rb    |  1 -
 3 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 cookbooks/apt/recipes/elasticsearch6.rb

diff --git a/cookbooks/apt/recipes/elasticsearch6.rb b/cookbooks/apt/recipes/elasticsearch6.rb
deleted file mode 100644
index 66844f61c..000000000
--- a/cookbooks/apt/recipes/elasticsearch6.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Cookbook:: apt
-# Recipe:: elasticsearch6
-#
-# Copyright:: 2022, Tom Hughes
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-include_recipe "apt"
-
-apt_repository "elasticsearch6.x" do
-  uri "https://artifacts.elastic.co/packages/6.x/apt"
-  distribution "stable"
-  components ["main"]
-  key "https://artifacts.elastic.co/GPG-KEY-elasticsearch"
-end
diff --git a/cookbooks/elasticsearch/attributes/default.rb b/cookbooks/elasticsearch/attributes/default.rb
index 52f6b9599..9b8ea06ee 100644
--- a/cookbooks/elasticsearch/attributes/default.rb
+++ b/cookbooks/elasticsearch/attributes/default.rb
@@ -1,4 +1,4 @@
-default[:elasticsearch][:version] = "6.x"
+default[:elasticsearch][:version] = "7.x"
 default[:elasticsearch][:cluster][:name] = "default"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:low] = "85%"
 default[:elasticsearch][:cluster][:routing][:allocation][:disk][:watermark][:high] = "90%"
diff --git a/cookbooks/elasticsearch/recipes/default.rb b/cookbooks/elasticsearch/recipes/default.rb
index 63ed3fd45..ced7a3b9f 100644
--- a/cookbooks/elasticsearch/recipes/default.rb
+++ b/cookbooks/elasticsearch/recipes/default.rb
@@ -20,7 +20,6 @@
 include_recipe "prometheus"
 
 case node[:elasticsearch][:version]
-when "6.x" then include_recipe "apt::elasticsearch6"
 when "7.x" then include_recipe "apt::elasticsearch7"
 when "8.x" then include_recipe "apt::elasticsearch8"
 end
-- 
2.47.3