diff --git a/conf/zuul/input.dhall b/conf/zuul/input.dhall index eed5d80..1974ab4 100644 --- a/conf/zuul/input.dhall +++ b/conf/zuul/input.dhall @@ -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 diff --git a/conf/zuul/resources.dhall b/conf/zuul/resources.dhall index 65e2851..bd8b25f 100644 --- a/conf/zuul/resources.dhall +++ b/conf/zuul/resources.dhall @@ -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" diff --git a/deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml b/deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml index 7b38640..e727fc8 100644 --- a/deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml +++ b/deploy/crds/zuul-ci_v1alpha1_zuul_cr.yaml @@ -3,6 +3,7 @@ kind: Zuul metadata: name: zuul spec: + imagePrefix: docker.io/zuul executor: count: 1 ssh_key: