Add latest changes from gitlab-org/gitlab@master

3 files changed, 82 insertions, 2 deletions

diff --git a/lib/gitlab/kubernetes/generic_secret.rb b/lib/gitlab/kubernetes/generic_secret.rb
new file mode 100644
index 00000000000..45adf869da0
--- /dev/null
+++ b/lib/gitlab/kubernetes/generic_secret.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Kubernetes
+    class GenericSecret
+      attr_reader :name, :data, :namespace_name
+
+      def initialize(name, data, namespace_name)
+        @name = name
+        @data = data
+        @namespace_name = namespace_name
+      end
+
+      def generate
+        ::Kubeclient::Resource.new(
+          type: generic_secret_type,
+          metadata: metadata,
+          data: data
+        )
+      end
+
+      private
+
+      def generic_secret_type
+        'Opaque'
+      end
+
+      def metadata
+        {
+          name: name,
+          namespace: namespace_name
+        }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/kubernetes/tls_secret.rb b/lib/gitlab/kubernetes/tls_secret.rb
new file mode 100644
index 00000000000..2895f4df27c
--- /dev/null
+++ b/lib/gitlab/kubernetes/tls_secret.rb
@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Kubernetes
+    class TlsSecret
+      attr_reader :name, :cert, :key, :namespace_name
+
+      def initialize(name, cert, key, namespace_name)
+        @name = name
+        @cert = cert
+        @key = key
+        @namespace_name = namespace_name
+      end
+
+      def generate
+        ::Kubeclient::Resource.new(
+          type: tls_secret_type,
+          metadata: metadata,
+          data: data
+        )
+      end
+
+      private
+
+      def tls_secret_type
+        'kubernetes.io/tls'
+      end
+
+      def metadata
+        {
+          name: name,
+          namespace: namespace_name
+        }
+      end
+
+      def data
+        {
+          'tls.crt': Base64.strict_encode64(cert),
+          'tls.key': Base64.strict_encode64(key)
+        }
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/utils/deep_size.rb b/lib/gitlab/utils/deep_size.rb
index ed2ceb8af7c..e185786e638 100644
--- a/lib/gitlab/utils/deep_size.rb
+++ b/lib/gitlab/utils/deep_size.rb
@@ -13,8 +13,8 @@ module Gitlab
 
       def initialize(root, max_size: DEFAULT_MAX_SIZE, max_depth: DEFAULT_MAX_DEPTH)
         @root = root
-        @max_size = max_size
-        @max_depth = max_depth
+        @max_size = max_size || DEFAULT_MAX_SIZE
+        @max_depth = max_depth || DEFAULT_MAX_DEPTH
         @size = 0
         @depth = 0