zuul
/
zuul-operator
Code Issues Proposed changes

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
parent 0b1d0c1445 ea6652e4e6
commit ce4251d9da
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf/zuul/input.dhall
View File

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

5
conf/zuul/resources.dhall
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" let version = "latest"

1
deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml
View File

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