Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
水淹萌龙
kubesphere
提交
4b738830
K
kubesphere
项目概览
水淹萌龙
/
kubesphere
与 Fork 源项目一致
Fork自
KubeSphere / kubesphere
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
kubesphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
4b738830
编写于
3月 25, 2019
作者:
R
runzexia
提交者:
zryfish
3月 25, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
update s2i to v0.0.7
上级
aa4d07c8
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
122 addition
and
14 deletion
+122
-14
Gopkg.toml
Gopkg.toml
+1
-1
vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
.../s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
+28
-8
vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go
...perator/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go
+93
-5
未找到文件。
Gopkg.toml
浏览文件 @
4b738830
...
...
@@ -57,7 +57,7 @@ required = [
[[constraint]]
name
=
"github.com/kubesphere/s2ioperator"
version
=
"v0.0.
4
"
version
=
"v0.0.
7
"
[[override]]
name
=
"github.com/bifurcation/mint"
...
...
vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/s2ibuilder_types.go
浏览文件 @
4b738830
...
...
@@ -19,6 +19,7 @@ package v1alpha1
import
(
"fmt"
corev1
"k8s.io/api/core/v1"
metav1
"k8s.io/apimachinery/pkg/apis/meta/v1"
)
...
...
@@ -101,10 +102,11 @@ type DockerConfig struct {
// AuthConfig is our abstraction of the Registry authorization information for whatever
// docker client we happen to be based on
type
AuthConfig
struct
{
Username
string
`json:"username"`
Password
string
`json:"password"`
Email
string
`json:"email,omitempty"`
ServerAddress
string
`json:"server_address,omitempty"`
Username
string
`json:"username,omitempty"`
Password
string
`json:"password,omitempty"`
Email
string
`json:"email,omitempty"`
ServerAddress
string
`json:"server_address,omitempty"`
SecretRef
*
corev1
.
LocalObjectReference
`json:"secretRef,omitempty"`
}
// ContainerConfig is the abstraction of the docker client provider (formerly go-dockerclient, now either
...
...
@@ -229,7 +231,7 @@ type S2iConfig struct {
// RuntimeAuthentication holds the authentication information for pulling the
// runtime Docker images from private repositories.
RuntimeAuthentication
AuthConfig
`json:"runtimeAuthentication,omitempty"`
RuntimeAuthentication
*
AuthConfig
`json:"runtimeAuthentication,omitempty"`
// RuntimeArtifacts specifies a list of source/destination pairs that will
// be copied from builder to a runtime image. Source can be a file or
...
...
@@ -246,15 +248,15 @@ type S2iConfig struct {
// PullAuthentication holds the authentication information for pulling the
// Docker images from private repositories
PullAuthentication
AuthConfig
`json:"pullAuthentication,omitempty"`
PullAuthentication
*
AuthConfig
`json:"pullAuthentication,omitempty"`
// PullAuthentication holds the authentication information for pulling the
// Docker images from private repositories
PushAuthentication
AuthConfig
`json:"pushAuthentication,omitempty"`
PushAuthentication
*
AuthConfig
`json:"pushAuthentication,omitempty"`
// IncrementalAuthentication holds the authentication information for pulling the
// previous image from private repositories
IncrementalAuthentication
AuthConfig
`json:"incrementalAuthentication,omitempty"`
IncrementalAuthentication
*
AuthConfig
`json:"incrementalAuthentication,omitempty"`
// DockerNetworkMode is used to set the docker network setting to --net=container:<id>
// when the builder is invoked from a container.
...
...
@@ -390,6 +392,9 @@ type S2iConfig struct {
//SourceURL is url of the codes such as https://github.com/a/b.git
SourceURL
string
`json:"sourceUrl"`
//GitSecretRef is the BasicAuth Secret of Git Clone
GitSecretRef
*
corev1
.
LocalObjectReference
`json:"gitSecretRef,omitempty"`
}
type
UserDefineTemplate
struct
{
...
...
@@ -454,6 +459,21 @@ type S2iAutoScale struct {
Containers
[]
string
`json:"containers,omitempty"`
}
type
DockerConfigJson
struct
{
Auths
DockerConfigMap
`json:"auths"`
}
// DockerConfig represents the config file used by the docker CLI.
// This config that represents the credentials that should be used
// when pulling images from specific image repositories.
type
DockerConfigMap
map
[
string
]
DockerConfigEntry
type
DockerConfigEntry
struct
{
Username
string
`json:"username"`
Password
string
`json:"password"`
Email
string
`json:"email"`
}
func
init
()
{
SchemeBuilder
.
Register
(
&
S2iBuilder
{},
&
S2iBuilderList
{})
}
vendor/github.com/kubesphere/s2ioperator/pkg/apis/devops/v1alpha1/zz_generated.deepcopy.go
浏览文件 @
4b738830
...
...
@@ -15,17 +15,23 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
// Code generated by
deepcopy-ge
n. DO NOT EDIT.
// Code generated by
mai
n. DO NOT EDIT.
package
v1alpha1
import
(
v1
"k8s.io/api/core/v1"
runtime
"k8s.io/apimachinery/pkg/runtime"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
AuthConfig
)
DeepCopyInto
(
out
*
AuthConfig
)
{
*
out
=
*
in
if
in
.
SecretRef
!=
nil
{
in
,
out
:=
&
in
.
SecretRef
,
&
out
.
SecretRef
*
out
=
new
(
v1
.
LocalObjectReference
)
**
out
=
**
in
}
return
}
...
...
@@ -99,6 +105,67 @@ func (in *DockerConfig) DeepCopy() *DockerConfig {
return
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
DockerConfigEntry
)
DeepCopyInto
(
out
*
DockerConfigEntry
)
{
*
out
=
*
in
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerConfigEntry.
func
(
in
*
DockerConfigEntry
)
DeepCopy
()
*
DockerConfigEntry
{
if
in
==
nil
{
return
nil
}
out
:=
new
(
DockerConfigEntry
)
in
.
DeepCopyInto
(
out
)
return
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
DockerConfigJson
)
DeepCopyInto
(
out
*
DockerConfigJson
)
{
*
out
=
*
in
if
in
.
Auths
!=
nil
{
in
,
out
:=
&
in
.
Auths
,
&
out
.
Auths
*
out
=
make
(
DockerConfigMap
,
len
(
*
in
))
for
key
,
val
:=
range
*
in
{
(
*
out
)[
key
]
=
val
}
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerConfigJson.
func
(
in
*
DockerConfigJson
)
DeepCopy
()
*
DockerConfigJson
{
if
in
==
nil
{
return
nil
}
out
:=
new
(
DockerConfigJson
)
in
.
DeepCopyInto
(
out
)
return
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
DockerConfigMap
)
DeepCopyInto
(
out
*
DockerConfigMap
)
{
{
in
:=
&
in
*
out
=
make
(
DockerConfigMap
,
len
(
*
in
))
for
key
,
val
:=
range
*
in
{
(
*
out
)[
key
]
=
val
}
return
}
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerConfigMap.
func
(
in
DockerConfigMap
)
DeepCopy
()
DockerConfigMap
{
if
in
==
nil
{
return
nil
}
out
:=
new
(
DockerConfigMap
)
in
.
DeepCopyInto
(
out
)
return
*
out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
EnvironmentSpec
)
DeepCopyInto
(
out
*
EnvironmentSpec
)
{
*
out
=
*
in
...
...
@@ -394,7 +461,11 @@ func (in *S2iBuilderTemplateStatus) DeepCopy() *S2iBuilderTemplateStatus {
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func
(
in
*
S2iConfig
)
DeepCopyInto
(
out
*
S2iConfig
)
{
*
out
=
*
in
out
.
RuntimeAuthentication
=
in
.
RuntimeAuthentication
if
in
.
RuntimeAuthentication
!=
nil
{
in
,
out
:=
&
in
.
RuntimeAuthentication
,
&
out
.
RuntimeAuthentication
*
out
=
new
(
AuthConfig
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
if
in
.
RuntimeArtifacts
!=
nil
{
in
,
out
:=
&
in
.
RuntimeArtifacts
,
&
out
.
RuntimeArtifacts
*
out
=
make
([]
VolumeSpec
,
len
(
*
in
))
...
...
@@ -405,9 +476,21 @@ func (in *S2iConfig) DeepCopyInto(out *S2iConfig) {
*
out
=
new
(
DockerConfig
)
**
out
=
**
in
}
out
.
PullAuthentication
=
in
.
PullAuthentication
out
.
PushAuthentication
=
in
.
PushAuthentication
out
.
IncrementalAuthentication
=
in
.
IncrementalAuthentication
if
in
.
PullAuthentication
!=
nil
{
in
,
out
:=
&
in
.
PullAuthentication
,
&
out
.
PullAuthentication
*
out
=
new
(
AuthConfig
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
if
in
.
PushAuthentication
!=
nil
{
in
,
out
:=
&
in
.
PushAuthentication
,
&
out
.
PushAuthentication
*
out
=
new
(
AuthConfig
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
if
in
.
IncrementalAuthentication
!=
nil
{
in
,
out
:=
&
in
.
IncrementalAuthentication
,
&
out
.
IncrementalAuthentication
*
out
=
new
(
AuthConfig
)
(
*
in
)
.
DeepCopyInto
(
*
out
)
}
if
in
.
Environment
!=
nil
{
in
,
out
:=
&
in
.
Environment
,
&
out
.
Environment
*
out
=
make
([]
EnvironmentSpec
,
len
(
*
in
))
...
...
@@ -455,6 +538,11 @@ func (in *S2iConfig) DeepCopyInto(out *S2iConfig) {
*
out
=
make
([]
string
,
len
(
*
in
))
copy
(
*
out
,
*
in
)
}
if
in
.
GitSecretRef
!=
nil
{
in
,
out
:=
&
in
.
GitSecretRef
,
&
out
.
GitSecretRef
*
out
=
new
(
v1
.
LocalObjectReference
)
**
out
=
**
in
}
return
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录