1 files changed, 11 insertions, 7 deletions
diff --git a/lib/gitlab/kas/client.rb b/lib/gitlab/kas/client.rb
index 43546d04087..fe244bd88a0 100644
--- a/lib/gitlab/kas/client.rb
+++ b/lib/gitlab/kas/client.rb
@@ -31,7 +31,7 @@ module Gitlab
       def list_agent_config_files(project:)
         request = Gitlab::Agent::ConfigurationProject::Rpc::ListAgentConfigFilesRequest.new(
           repository: repository(project),
-          gitaly_address: gitaly_address(project)
+          gitaly_info: gitaly_info(project)
         )
 
         stub_for(:configuration_project)
@@ -42,9 +42,11 @@ module Gitlab
 
       def send_git_push_event(project:)
         request = Gitlab::Agent::Notifications::Rpc::GitPushEventRequest.new(
-          project: Gitlab::Agent::Notifications::Rpc::Project.new(
-            id: project.id,
-            full_path: project.full_path
+          event: Gitlab::Agent::Event::GitPushEvent.new(
+            project: Gitlab::Agent::Event::Project.new(
+              id: project.id,
+              full_path: project.full_path
+            )
           )
         )
 
@@ -62,13 +64,15 @@ module Gitlab
       def repository(project)
         gitaly_repository = project.repository.gitaly_repository
 
-        Gitlab::Agent::Modserver::Repository.new(gitaly_repository.to_h)
+        Gitlab::Agent::Entity::GitalyRepository.new(gitaly_repository.to_h)
       end
 
-      def gitaly_address(project)
+      def gitaly_info(project)
+        gitaly_features = Feature::Gitaly.server_feature_flags
         connection_data = Gitlab::GitalyClient.connection_data(project.repository_storage)
+          .merge(features: gitaly_features)
 
-        Gitlab::Agent::Modserver::GitalyAddress.new(connection_data)
+        Gitlab::Agent::Entity::GitalyInfo.new(connection_data)
       end
 
       def kas_endpoint_url