From d7ff5c49777313b7ba63d7198d72a7567debb5a6 Mon Sep 17 00:00:00 2001
From: Timo Furrer <tfurrer@gitlab.com>
Date: Tue, 30 Jul 2024 12:56:24 +0200
Subject: [PATCH] Migrate from kas-grpc to gitlab-kas-grpc gem
This change migrates from the old `kas-grpc` to the new
`gitlab-kas-grpc` gem.
Context is in
https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/merge_requests/1643
---
Gemfile | 2 +-
Gemfile.checksum | 2 +-
Gemfile.lock | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Gemfile b/Gemfile
index 3c9088a5ccab..044faf2b5039 100644
--- a/Gemfile
+++ b/Gemfile
@@ -626,7 +626,7 @@ gem 'spamcheck', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory
gem 'gitaly', '~> 17.2.0', feature_category: :gitaly
# KAS GRPC protocol definitions
-gem 'kas-grpc', '~> 0.6.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 17.4.0.pre.rc1', feature_category: :deployment_management
# Lock the version before issues below are resolved:
# https://gitlab.com/gitlab-org/gitlab/-/issues/473169#note_2028352939
diff --git a/Gemfile.checksum b/Gemfile.checksum
index 51f520753b9e..ad850d60f80d 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -218,6 +218,7 @@
{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"ruby","checksum":"f379545fc53a71c31525025fdb422f46081133af5cced3130ce680b155c2aa69"},
{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"x86_64-darwin","checksum":"50e0f4865ef7c455426c7c058fc10ff9c8366482d48a63d6f6693b38c4a49c1c"},
{"name":"gitlab-glfm-markdown","version":"0.0.17","platform":"x86_64-linux","checksum":"cc877ff8ceb3aa8a331fdb8991592e35897823e0f77ba9e4b2b65082c665089b"},
+{"name":"gitlab-kas-grpc","version":"17.4.0.pre.rc1","platform":"ruby","checksum":"37679435a3e71b830b215741e78714984c3392fbc09d660b3102e4a5e6ab92ca"},
{"name":"gitlab-labkit","version":"0.36.1","platform":"ruby","checksum":"04fb6941b7e5fc1fdcee8f9971fa2086a4dc442e39e67a74b992403dd580c300"},
{"name":"gitlab-license","version":"2.5.0","platform":"ruby","checksum":"4c166c469c2ad17876ca43188a4ccebe3feb0726c4c1770047f8dcef96573f4d"},
{"name":"gitlab-mail_room","version":"0.0.25","platform":"ruby","checksum":"223ce7c3c0797b6015eaa37147884e6ddc7be9a7ee90a424358c96bc18613b1a"},
@@ -344,7 +345,6 @@
{"name":"kaminari-actionview","version":"1.2.2","platform":"ruby","checksum":"1330f6fc8b59a4a4ef6a549ff8a224797289ebf7a3a503e8c1652535287cc909"},
{"name":"kaminari-activerecord","version":"1.2.2","platform":"ruby","checksum":"0dd3a67bab356a356f36b3b7236bcb81cef313095365befe8e98057dd2472430"},
{"name":"kaminari-core","version":"1.2.2","platform":"ruby","checksum":"3bd26fec7370645af40ca73b9426a448d09b8a8ba7afa9ba3c3e0d39cdbb83ff"},
-{"name":"kas-grpc","version":"0.6.0","platform":"ruby","checksum":"43f7364cf45d50d5696ca4e1689bb648f22e5cec70fcf8ffe58330c04455af79"},
{"name":"knapsack","version":"4.0.0","platform":"ruby","checksum":"a9422688751989d09a40b4bf7f959a71a3bfe7bc49d3cd610c2fcfb6e45482b8"},
{"name":"kramdown","version":"2.3.2","platform":"ruby","checksum":"cb4530c2e9d16481591df2c9336723683c354e5416a5dd3e447fa48215a6a71c"},
{"name":"kramdown-parser-gfm","version":"1.1.0","platform":"ruby","checksum":"fb39745516427d2988543bf01fc4cf0ab1149476382393e0e9c48592f6581729"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 89f1711f3c2e..c36bb23e0f44 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -726,6 +726,8 @@ GEM
nokogiri (~> 1, >= 1.10.8)
gitlab-glfm-markdown (0.0.17)
rb_sys (= 0.9.94)
+ gitlab-kas-grpc (17.4.0.pre.rc1)
+ grpc (~> 1.0)
gitlab-labkit (0.36.1)
actionpack (>= 5.0.0, < 8.0.0)
activesupport (>= 5.0.0, < 8.0.0)
@@ -1037,8 +1039,6 @@ GEM
activerecord
kaminari-core (= 1.2.2)
kaminari-core (1.2.2)
- kas-grpc (0.6.0)
- grpc (~> 1.0)
knapsack (4.0.0)
rake
kramdown (2.3.2)
@@ -2057,6 +2057,7 @@ DEPENDENCIES
gitlab-glfm-markdown (~> 0.0.17)
gitlab-housekeeper!
gitlab-http!
+ gitlab-kas-grpc (~> 17.4.0.pre.rc1)
gitlab-labkit (~> 0.36.0)
gitlab-license (~> 2.5)
gitlab-mail_room (~> 0.0.24)
@@ -2127,7 +2128,6 @@ DEPENDENCIES
jsonb_accessor (~> 1.3.10)
jwt (~> 2.5)
kaminari (~> 1.2.2)
- kas-grpc (~> 0.6.0)
knapsack (~> 4.0.0)
kramdown (~> 2.3.1)
kubeclient (~> 4.11.0)
--
GitLab