Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
5e59c40b
Commit
5e59c40b
authored
Nov 20, 2018
by
Amit Rathi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing more tests
parent
33c7adcc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
spec/factories/clusters/applications/helm.rb
spec/factories/clusters/applications/helm.rb
+1
-0
spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
+5
-2
No files found.
spec/factories/clusters/applications/helm.rb
View file @
5e59c40b
...
@@ -54,6 +54,7 @@ FactoryBot.define do
...
@@ -54,6 +54,7 @@ FactoryBot.define do
end
end
factory
:clusters_applications_prometheus
,
class:
Clusters
::
Applications
::
Prometheus
do
factory
:clusters_applications_prometheus
,
class:
Clusters
::
Applications
::
Prometheus
do
email
'admin@example.com'
cluster
factory:
%i(cluster with_installed_helm provided_by_gcp)
cluster
factory:
%i(cluster with_installed_helm provided_by_gcp)
end
end
...
...
spec/lib/gitlab/kubernetes/helm/install_command_spec.rb
View file @
5e59c40b
...
@@ -43,6 +43,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
...
@@ -43,6 +43,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
--tls-cert /data/helm/app-name/config/cert.pem
--tls-cert /data/helm/app-name/config/cert.pem
--tls-key /data/helm/app-name/config/key.pem
--tls-key /data/helm/app-name/config/key.pem
--version 1.2.3
--version 1.2.3
--set rbac.create
\\
=false,rbac.enabled
\\
=false
--namespace gitlab-managed-apps
--namespace gitlab-managed-apps
-f /data/helm/app-name/config/values.yaml
-f /data/helm/app-name/config/values.yaml
EOS
EOS
...
@@ -101,6 +102,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
...
@@ -101,6 +102,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
--tls-cert /data/helm/app-name/config/cert.pem
--tls-cert /data/helm/app-name/config/cert.pem
--tls-key /data/helm/app-name/config/key.pem
--tls-key /data/helm/app-name/config/key.pem
--version 1.2.3
--version 1.2.3
--set rbac.create
\\
=false,rbac.enabled
\\
=false
--namespace gitlab-managed-apps
--namespace gitlab-managed-apps
-f /data/helm/app-name/config/values.yaml
-f /data/helm/app-name/config/values.yaml
EOS
EOS
...
@@ -126,7 +128,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
...
@@ -126,7 +128,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
<<~
EOS
.
strip
<<~
EOS
.
strip
/bin/date
/bin/date
/bin/true
/bin/true
helm install chart-name --name app-name --tls --tls-ca-cert /data/helm/app-name/config/ca.pem --tls-cert /data/helm/app-name/config/cert.pem --tls-key /data/helm/app-name/config/key.pem --version 1.2.3 --namespace gitlab-managed-apps -f /data/helm/app-name/config/values.yaml
helm install chart-name --name app-name --tls --tls-ca-cert /data/helm/app-name/config/ca.pem --tls-cert /data/helm/app-name/config/cert.pem --tls-key /data/helm/app-name/config/key.pem --version 1.2.3 --
set rbac.create
\\
=false,rbac.enabled
\\
=false --
namespace gitlab-managed-apps -f /data/helm/app-name/config/values.yaml
EOS
EOS
end
end
end
end
...
@@ -148,7 +150,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
...
@@ -148,7 +150,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
let
(
:helm_install_command
)
do
let
(
:helm_install_command
)
do
<<~
EOS
.
strip
<<~
EOS
.
strip
helm install chart-name --name app-name --tls --tls-ca-cert /data/helm/app-name/config/ca.pem --tls-cert /data/helm/app-name/config/cert.pem --tls-key /data/helm/app-name/config/key.pem --version 1.2.3 --namespace gitlab-managed-apps -f /data/helm/app-name/config/values.yaml
helm install chart-name --name app-name --tls --tls-ca-cert /data/helm/app-name/config/ca.pem --tls-cert /data/helm/app-name/config/cert.pem --tls-key /data/helm/app-name/config/key.pem --version 1.2.3 --
set rbac.create
\\
=false,rbac.enabled
\\
=false --
namespace gitlab-managed-apps -f /data/helm/app-name/config/values.yaml
/bin/date
/bin/date
/bin/false
/bin/false
EOS
EOS
...
@@ -175,6 +177,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
...
@@ -175,6 +177,7 @@ describe Gitlab::Kubernetes::Helm::InstallCommand do
helm install chart-name
helm install chart-name
--name app-name
--name app-name
--version 1.2.3
--version 1.2.3
--set rbac.create
\\
=false,rbac.enabled
\\
=false
--namespace gitlab-managed-apps
--namespace gitlab-managed-apps
-f /data/helm/app-name/config/values.yaml
-f /data/helm/app-name/config/values.yaml
EOS
EOS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment