Add latest changes from gitlab-org/gitlab@master

3 files changed, 17 insertions, 1 deletions

diff --git a/lib/gitlab/kubernetes/cilium_network_policy.rb b/lib/gitlab/kubernetes/cilium_network_policy.rb
index 55afd2b586e..71915040839 100644
--- a/lib/gitlab/kubernetes/cilium_network_policy.rb
+++ b/lib/gitlab/kubernetes/cilium_network_policy.rb
@@ -84,6 +84,11 @@ module Gitlab
           egress: egress
         }
       end
+
+      override :kind
+      def kind
+        KIND
+      end
     end
   end
 end
diff --git a/lib/gitlab/kubernetes/network_policy.rb b/lib/gitlab/kubernetes/network_policy.rb
index 28810dc4453..65817f2a4ba 100644
--- a/lib/gitlab/kubernetes/network_policy.rb
+++ b/lib/gitlab/kubernetes/network_policy.rb
@@ -6,6 +6,8 @@ module Gitlab
       include NetworkPolicyCommon
       extend ::Gitlab::Utils::Override
 
+      KIND = 'NetworkPolicy'
+
       def initialize(name:, namespace:, selector:, ingress:, labels: nil, creation_timestamp: nil, policy_types: ["Ingress"], egress: nil)
         @name = name
         @namespace = namespace
@@ -80,6 +82,11 @@ module Gitlab
           egress: egress
         }
       end
+
+      override :kind
+      def kind
+        KIND
+      end
     end
   end
 end
diff --git a/lib/gitlab/kubernetes/network_policy_common.rb b/lib/gitlab/kubernetes/network_policy_common.rb
index 3b6e46d21ef..9340e140240 100644
--- a/lib/gitlab/kubernetes/network_policy_common.rb
+++ b/lib/gitlab/kubernetes/network_policy_common.rb
@@ -57,8 +57,12 @@ module Gitlab
         raise NotImplementedError
       end
 
+      def kind
+        raise NotImplementedError
+      end
+
       def manifest
-        YAML.dump({ metadata: metadata, spec: spec }.deep_stringify_keys)
+        YAML.dump({ kind: kind, metadata: metadata, spec: spec }.deep_stringify_keys)
       end
     end
   end