Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add huawei cloud registry support #67

Merged
merged 20 commits into from
Jul 13, 2021
Merged
Prev Previous commit
Next Next commit
remove registry pointer
Signed-off-by: liu deyi <andrew@koderover.com>
  • Loading branch information
dyliu committed Jul 13, 2021
commit c8cb5988973b4093a362a39f89d4f26cb7ebafa5
18 changes: 9 additions & 9 deletions pkg/microservice/aslan/core/common/repository/models/queue.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ type ServiceTaskArgs struct {
}

type ConfigPayload struct {
Aslan AslanConfig `json:"aslan"`
Proxy Proxy `json:"proxy"`
S3Storage S3Config `json:"s3_storage"`
Github GithubConfig `json:"github"`
Gitlab GitlabConfig `json:"gitlab"`
Build BuildConfig `json:"build"`
Test TestConfig `json:"test"`
Registry *RegistryConfig `json:"registry"`
Release ReleaseConfig `json:"release"`
Aslan AslanConfig `json:"aslan"`
Proxy Proxy `json:"proxy"`
S3Storage S3Config `json:"s3_storage"`
Github GithubConfig `json:"github"`
Gitlab GitlabConfig `json:"gitlab"`
Build BuildConfig `json:"build"`
Test TestConfig `json:"test"`
Registry RegistryConfig `json:"registry"`
Release ReleaseConfig `json:"release"`
// 推送线上镜像需要的用户名密码, 根据pipeline镜像发布模块动态配置
ImageRelease ImageReleaseConfig `json:"image_release"`
Docker DockerConfig `json:"docker"`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ func GetConfigPayload(codeHostID int) *models.ConfigPayload {
Test: models.TestConfig{
KubeNamespace: config.Namespace(),
},
Registry: &models.RegistryConfig{
Registry: models.RegistryConfig{
AccessKey: config.RegistryAccessKey(),
SecretKey: config.RegistrySecretKey(),
Namespace: config.RegistryNamespace(),
Expand Down