Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
8f41c857
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
8f41c857
编写于
7月 28, 2018
作者:
D
Dylan Griffith
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Minor style improvements for Helm code
上级
0582df8e
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
16 addition
and
4 deletion
+16
-4
lib/gitlab/kubernetes/helm/base_command.rb
lib/gitlab/kubernetes/helm/base_command.rb
+4
-0
lib/gitlab/kubernetes/helm/install_command.rb
lib/gitlab/kubernetes/helm/install_command.rb
+7
-3
lib/gitlab/kubernetes/helm/pod.rb
lib/gitlab/kubernetes/helm/pod.rb
+1
-1
spec/factories/clusters/applications/helm.rb
spec/factories/clusters/applications/helm.rb
+3
-0
spec/features/projects/clusters/applications_spec.rb
spec/features/projects/clusters/applications_spec.rb
+1
-0
未找到文件。
lib/gitlab/kubernetes/helm/base_command.rb
浏览文件 @
8f41c857
...
...
@@ -26,6 +26,10 @@ module Gitlab
Gitlab
::
Kubernetes
::
ConfigMap
.
new
(
name
,
files
).
generate
end
def
file_names
files
.
keys
end
def
name
raise
"Not implemented"
end
...
...
lib/gitlab/kubernetes/helm/install_command.rb
浏览文件 @
8f41c857
...
...
@@ -33,9 +33,13 @@ module Gitlab
end
def
script_command
<<~
HEREDOC
helm install
#{
optional_tls_flags
}
#{
chart
}
--name
#{
name
}#{
optional_version_flag
}
--namespace
#{
Gitlab
::
Kubernetes
::
Helm
::
NAMESPACE
}
-f /data/helm/
#{
name
}
/config/values.yaml >/dev/null
HEREDOC
"helm install"
\
"
#{
optional_tls_flags
}
"
\
"
#{
chart
}
"
\
"--name
#{
name
}
"
\
"
#{
optional_version_flag
}
"
\
"--namespace
#{
Gitlab
::
Kubernetes
::
Helm
::
NAMESPACE
}
"
\
"-f /data/helm/
#{
name
}
/config/values.yaml >/dev/null
\n
"
end
def
optional_version_flag
...
...
lib/gitlab/kubernetes/helm/pod.rb
浏览文件 @
8f41c857
...
...
@@ -59,7 +59,7 @@ module Gitlab
name:
'configuration-volume'
,
configMap:
{
name:
"values-content-configuration-
#{
command
.
name
}
"
,
items:
command
.
file
s
.
map
{
|
name
,
_
|
{
key:
name
,
path:
name
}
}
items:
command
.
file
_names
.
map
{
|
name
|
{
key:
name
,
path:
name
}
}
}
}
]
...
...
spec/factories/clusters/applications/helm.rb
浏览文件 @
8f41c857
...
...
@@ -35,12 +35,15 @@ FactoryBot.define do
factory
:clusters_applications_ingress
,
class:
Clusters
::
Applications
::
Ingress
do
cluster
factory:
%i(cluster with_installed_helm provided_by_gcp)
end
factory
:clusters_applications_prometheus
,
class:
Clusters
::
Applications
::
Prometheus
do
cluster
factory:
%i(cluster with_installed_helm provided_by_gcp)
end
factory
:clusters_applications_runner
,
class:
Clusters
::
Applications
::
Runner
do
cluster
factory:
%i(cluster with_installed_helm provided_by_gcp)
end
factory
:clusters_applications_jupyter
,
class:
Clusters
::
Applications
::
Jupyter
do
oauth_application
factory: :oauth_application
cluster
factory:
%i(cluster with_installed_helm provided_by_gcp)
...
...
spec/features/projects/clusters/applications_spec.rb
浏览文件 @
8f41c857
...
...
@@ -121,6 +121,7 @@ describe 'Clusters Applications', :js do
def
wait_until_helm_created!
retries
=
0
while
Clusters
::
Cluster
.
last
.
application_helm
.
nil?
raise
"Timed out waiting for helm application to be created in DB"
if
(
retries
+=
1
)
>
3
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录