Add latest changes from gitlab-org/gitlab@master

2 files changed, 56 insertions, 0 deletions

diff --git a/spec/lib/gitlab/kubernetes/generic_secret_spec.rb b/spec/lib/gitlab/kubernetes/generic_secret_spec.rb
new file mode 100644
index 00000000000..fe1d4cc11e6
--- /dev/null
+++ b/spec/lib/gitlab/kubernetes/generic_secret_spec.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Kubernetes::GenericSecret do
+  let(:secret) { described_class.new(name, data, namespace) }
+  let(:name) { 'example-name' }
+  let(:data) { 'example-data' }
+  let(:namespace) { 'example-namespace' }
+
+  describe '#generate' do
+    subject { secret.generate }
+
+    let(:resource) do
+      ::Kubeclient::Resource.new(
+        type: 'Opaque',
+        metadata: { name: name, namespace: namespace },
+        data: data
+      )
+    end
+
+    it { is_expected.to eq(resource) }
+  end
+end
diff --git a/spec/lib/gitlab/kubernetes/tls_secret_spec.rb b/spec/lib/gitlab/kubernetes/tls_secret_spec.rb
new file mode 100644
index 00000000000..438a0dc79fc
--- /dev/null
+++ b/spec/lib/gitlab/kubernetes/tls_secret_spec.rb
@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Kubernetes::TlsSecret do
+  let(:secret) { described_class.new(name, cert, key, namespace) }
+  let(:name) { 'example-name' }
+  let(:cert) { 'example-cert' }
+  let(:key) { 'example-key' }
+  let(:namespace) { 'example-namespace' }
+
+  let(:data) do
+    {
+      'tls.crt': Base64.strict_encode64(cert),
+      'tls.key': Base64.strict_encode64(key)
+    }
+  end
+
+  describe '#generate' do
+    subject { secret.generate }
+
+    let(:resource) do
+      ::Kubeclient::Resource.new(
+        type: 'kubernetes.io/tls',
+        metadata: { name: name, namespace: namespace },
+        data: data
+      )
+    end
+
+    it { is_expected.to eq(resource) }
+  end
+end