Merge "Add support for global image prefix"

This commit is contained in:
Zuul 2020-05-05 17:00:55 +00:00 committed by Gerrit Code Review
commit ce4251d9da
3 changed files with 8 additions and 2 deletions

View File

@ -142,6 +142,7 @@ let Schemas =
let Input =
{ Type =
{ name : Text
, imagePrefix : Optional Text
, merger : Schemas.Merger.Type
, executor : Schemas.Executor.Type
, web : Schemas.Web.Type
@ -157,7 +158,8 @@ let Input =
, withCertManager : Bool
}
, default =
{ database = None UserSecret
{ imagePrefix = None Text
, database = None UserSecret
, zookeeper = None UserSecret
, externalConfig = Schemas.ExternalConfigs.default
, merger = Schemas.Merger.default

View File

@ -142,7 +142,10 @@ in \(input : Input)
}
]
let org = "docker.io/zuul"
let org =
merge
{ None = "docker.io/zuul", Some = \(prefix : Text) -> prefix }
input.imagePrefix
let version = "latest"

View File

@ -3,6 +3,7 @@ kind: Zuul
metadata:
name: zuul
spec:
imagePrefix: docker.io/zuul
executor:
count: 1
ssh_key: