diff --git a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml index 093d36cfb..cda25a565 100644 --- a/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspaces.v1beta1.yaml @@ -4624,7 +4624,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -4639,6 +4639,26 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that contains + a Dockerfile. The src in the OCI registry + required for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull the + Dockerfile from when using the Devfile Registry + as Dockerfile src. To ensure the Dockerfile + gets resolved consistently in different environments, + it is recommended to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + required: + - id + type: object git: description: Dockerfile's Git source properties: @@ -4659,52 +4679,34 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git as Dockerfile - src. + src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be - initialized in the git project. Must have - at least one remote configured + initialized in the git project. Projects must + have at least one remote configured while + StarterProjects & Image Component's Git source + can only have at most one remote configured. type: object required: - remotes type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull the - Dockerfile from when using the Devfile Registry - as Dockerfile src. To ensure the Dockerfile - gets resolved consistently in different environments, - it is recommended to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry that contains - a Dockerfile. The src in the OCI registry - required for the Dockerfile build will be - downloaded for building the image. - type: string - required: - - id - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from the current @@ -5367,7 +5369,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -5382,6 +5384,28 @@ spec: to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry + source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. The + src in the OCI registry required + for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL + to pull the Dockerfile from when + using the Devfile Registry as Dockerfile + src. To ensure the Dockerfile gets + resolved consistently in different + environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -5405,54 +5429,35 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using - git as Dockerfile src. + git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized in the git - project. Must have at least one - remote configured + project. Projects must have at least + one remote configured while StarterProjects + & Image Component's Git source can + only have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry - source - properties: - devfileRegistryUrl: - description: Devfile Registry URL - to pull the Dockerfile from when - using the Devfile Registry as Dockerfile - src. To ensure the Dockerfile gets - resolved consistently in different - environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. The - src in the OCI registry required - for the Dockerfile build will be - downloaded for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI @@ -6229,7 +6234,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -6244,6 +6249,26 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that + contains a Dockerfile. The src in the + OCI registry required for the Dockerfile + build will be downloaded for building + the image. + type: string + registryUrl: + description: Devfile Registry URL to pull + the Dockerfile from when using the Devfile + Registry as Dockerfile src. To ensure + the Dockerfile gets resolved consistently + in different environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -6265,50 +6290,33 @@ spec: not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git as - Dockerfile src. + Dockerfile src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should - be initialized in the git project. Must - have at least one remote configured + be initialized in the git project. Projects + must have at least one remote configured + while StarterProjects & Image Component's + Git source can only have at most one remote + configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull - the Dockerfile from when using the Devfile - Registry as Dockerfile src. To ensure - the Dockerfile gets resolved consistently - in different environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry that - contains a Dockerfile. The src in the - OCI registry required for the Dockerfile - build will be downloaded for building - the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from @@ -6992,7 +7000,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -7007,6 +7015,30 @@ spec: to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile + Registry source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. + The src in the OCI registry + required for the Dockerfile + build will be downloaded for + building the image. + type: string + registryUrl: + description: Devfile Registry + URL to pull the Dockerfile from + when using the Devfile Registry + as Dockerfile src. To ensure + the Dockerfile gets resolved + consistently in different environments, + it is recommended to always + specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -7031,56 +7063,36 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using - git as Dockerfile src. + git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized in the - git project. Must have at least - one remote configured + git project. Projects must have + at least one remote configured + while StarterProjects & Image + Component's Git source can only + have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile - Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry - URL to pull the Dockerfile from - when using the Devfile Registry - as Dockerfile src. To ensure - the Dockerfile gets resolved - consistently in different environments, - it is recommended to always - specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. - The src in the OCI registry - required for the Dockerfile - build will be downloaded for - building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative @@ -7482,8 +7494,9 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least - one remote configured while StarterProjects can - only have at most one remote configured. + one remote configured while StarterProjects & + Image Component's Git source can only have at + most one remote configured. type: object type: object name: @@ -7560,8 +7573,9 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least - one remote configured while StarterProjects can - only have at most one remote configured. + one remote configured while StarterProjects & + Image Component's Git source can only have at + most one remote configured. type: object type: object name: @@ -7666,8 +7680,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object required: - remotes @@ -7753,8 +7767,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object required: - remotes diff --git a/crds/workspace.devfile.io_devworkspaces.yaml b/crds/workspace.devfile.io_devworkspaces.yaml index c2338173e..95b16f85e 100644 --- a/crds/workspace.devfile.io_devworkspaces.yaml +++ b/crds/workspace.devfile.io_devworkspaces.yaml @@ -4625,7 +4625,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -4640,6 +4640,26 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that contains + a Dockerfile. The src in the OCI registry + required for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull the + Dockerfile from when using the Devfile Registry + as Dockerfile src. To ensure the Dockerfile + gets resolved consistently in different environments, + it is recommended to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + required: + - id + type: object git: description: Dockerfile's Git source properties: @@ -4660,52 +4680,34 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git as Dockerfile - src. + src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be - initialized in the git project. Must have - at least one remote configured + initialized in the git project. Projects must + have at least one remote configured while + StarterProjects & Image Component's Git source + can only have at most one remote configured. type: object required: - remotes type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull the - Dockerfile from when using the Devfile Registry - as Dockerfile src. To ensure the Dockerfile - gets resolved consistently in different environments, - it is recommended to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry that contains - a Dockerfile. The src in the OCI registry - required for the Dockerfile build will be - downloaded for building the image. - type: string - required: - - id - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from the current @@ -5372,7 +5374,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -5387,6 +5389,28 @@ spec: to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry + source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. The + src in the OCI registry required + for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL + to pull the Dockerfile from when + using the Devfile Registry as Dockerfile + src. To ensure the Dockerfile gets + resolved consistently in different + environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -5410,54 +5434,35 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using - git as Dockerfile src. + git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized in the git - project. Must have at least one - remote configured + project. Projects must have at least + one remote configured while StarterProjects + & Image Component's Git source can + only have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry - source - properties: - devfileRegistryUrl: - description: Devfile Registry URL - to pull the Dockerfile from when - using the Devfile Registry as Dockerfile - src. To ensure the Dockerfile gets - resolved consistently in different - environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. The - src in the OCI registry required - for the Dockerfile build will be - downloaded for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI @@ -6234,7 +6239,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -6249,6 +6254,26 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that + contains a Dockerfile. The src in the + OCI registry required for the Dockerfile + build will be downloaded for building + the image. + type: string + registryUrl: + description: Devfile Registry URL to pull + the Dockerfile from when using the Devfile + Registry as Dockerfile src. To ensure + the Dockerfile gets resolved consistently + in different environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -6270,50 +6295,33 @@ spec: not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git as - Dockerfile src. + Dockerfile src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should - be initialized in the git project. Must - have at least one remote configured + be initialized in the git project. Projects + must have at least one remote configured + while StarterProjects & Image Component's + Git source can only have at most one remote + configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull - the Dockerfile from when using the Devfile - Registry as Dockerfile src. To ensure - the Dockerfile gets resolved consistently - in different environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry that - contains a Dockerfile. The src in the - OCI registry required for the Dockerfile - build will be downloaded for building - the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from @@ -6997,7 +7005,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -7012,6 +7020,30 @@ spec: to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile + Registry source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. + The src in the OCI registry + required for the Dockerfile + build will be downloaded for + building the image. + type: string + registryUrl: + description: Devfile Registry + URL to pull the Dockerfile from + when using the Devfile Registry + as Dockerfile src. To ensure + the Dockerfile gets resolved + consistently in different environments, + it is recommended to always + specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -7036,56 +7068,36 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using - git as Dockerfile src. + git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized in the - git project. Must have at least - one remote configured + git project. Projects must have + at least one remote configured + while StarterProjects & Image + Component's Git source can only + have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile - Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry - URL to pull the Dockerfile from - when using the Devfile Registry - as Dockerfile src. To ensure - the Dockerfile gets resolved - consistently in different environments, - it is recommended to always - specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. - The src in the OCI registry - required for the Dockerfile - build will be downloaded for - building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative @@ -7487,8 +7499,9 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least - one remote configured while StarterProjects can - only have at most one remote configured. + one remote configured while StarterProjects & + Image Component's Git source can only have at + most one remote configured. type: object type: object name: @@ -7565,8 +7578,9 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least - one remote configured while StarterProjects can - only have at most one remote configured. + one remote configured while StarterProjects & + Image Component's Git source can only have at + most one remote configured. type: object type: object name: @@ -7671,8 +7685,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object required: - remotes @@ -7758,8 +7772,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object required: - remotes diff --git a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml index 4528008fb..db000a11e 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.v1beta1.yaml @@ -4381,7 +4381,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -4395,6 +4395,26 @@ spec: description: Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that contains + a Dockerfile. The src in the OCI registry required + for the Dockerfile build will be downloaded for + building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull the Dockerfile + from when using the Devfile Registry as Dockerfile + src. To ensure the Dockerfile gets resolved consistently + in different environments, it is recommended to + always specify the `devfileRegistryUrl` when `Id` + is used. + type: string + required: + - id + type: object git: description: Dockerfile's Git source properties: @@ -4415,51 +4435,34 @@ spec: is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git - repository when using git as Dockerfile src. + repository when using git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured + in the git project. Projects must have at least + one remote configured while StarterProjects & + Image Component's Git source can only have at + most one remote configured. type: object required: - remotes type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull the Dockerfile - from when using the Devfile Registry as Dockerfile - src. To ensure the Dockerfile gets resolved consistently - in different environments, it is recommended to - always specify the `devfileRegistryUrl` when `Id` - is used. - type: string - id: - description: Id in a devfile registry that contains - a Dockerfile. The src in the OCI registry required - for the Dockerfile build will be downloaded for - building the image. - type: string - required: - - id - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from the current devfile @@ -5104,7 +5107,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -5119,6 +5122,27 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry + source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. The src + in the OCI registry required for the + Dockerfile build will be downloaded + for building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull + the Dockerfile from when using the Devfile + Registry as Dockerfile src. To ensure + the Dockerfile gets resolved consistently + in different environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -5140,51 +5164,33 @@ spec: is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git - as Dockerfile src. + as Dockerfile src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should - be initialized in the git project. Must - have at least one remote configured + be initialized in the git project. Projects + must have at least one remote configured + while StarterProjects & Image Component's + Git source can only have at most one + remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry - source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull - the Dockerfile from when using the Devfile - Registry as Dockerfile src. To ensure - the Dockerfile gets resolved consistently - in different environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. The src - in the OCI registry required for the - Dockerfile build will be downloaded - for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from @@ -5930,7 +5936,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -5945,6 +5951,24 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that contains + a Dockerfile. The src in the OCI registry + required for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull the + Dockerfile from when using the Devfile Registry + as Dockerfile src. To ensure the Dockerfile + gets resolved consistently in different environments, + it is recommended to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -5965,48 +5989,32 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git as Dockerfile - src. + src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be - initialized in the git project. Must have - at least one remote configured + initialized in the git project. Projects must + have at least one remote configured while + StarterProjects & Image Component's Git source + can only have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull the - Dockerfile from when using the Devfile Registry - as Dockerfile src. To ensure the Dockerfile - gets resolved consistently in different environments, - it is recommended to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry that contains - a Dockerfile. The src in the OCI registry - required for the Dockerfile build will be - downloaded for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from the current @@ -6665,7 +6673,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -6680,6 +6688,28 @@ spec: to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry + source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. The + src in the OCI registry required + for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL + to pull the Dockerfile from when + using the Devfile Registry as Dockerfile + src. To ensure the Dockerfile gets + resolved consistently in different + environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -6703,54 +6733,35 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using - git as Dockerfile src. + git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized in the git - project. Must have at least one - remote configured + project. Projects must have at least + one remote configured while StarterProjects + & Image Component's Git source can + only have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry - source - properties: - devfileRegistryUrl: - description: Devfile Registry URL - to pull the Dockerfile from when - using the Devfile Registry as Dockerfile - src. To ensure the Dockerfile gets - resolved consistently in different - environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. The - src in the OCI registry required - for the Dockerfile build will be - downloaded for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI @@ -7135,8 +7146,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object type: object name: @@ -7212,8 +7223,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object type: object name: @@ -7315,8 +7326,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one remote - configured while StarterProjects can only have at most - one remote configured. + configured while StarterProjects & Image Component's Git + source can only have at most one remote configured. type: object required: - remotes @@ -7400,8 +7411,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one remote - configured while StarterProjects can only have at most - one remote configured. + configured while StarterProjects & Image Component's Git + source can only have at most one remote configured. type: object required: - remotes diff --git a/crds/workspace.devfile.io_devworkspacetemplates.yaml b/crds/workspace.devfile.io_devworkspacetemplates.yaml index 00d1d38d2..329899038 100644 --- a/crds/workspace.devfile.io_devworkspacetemplates.yaml +++ b/crds/workspace.devfile.io_devworkspacetemplates.yaml @@ -4382,7 +4382,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -4396,6 +4396,26 @@ spec: description: Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that contains + a Dockerfile. The src in the OCI registry required + for the Dockerfile build will be downloaded for + building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull the Dockerfile + from when using the Devfile Registry as Dockerfile + src. To ensure the Dockerfile gets resolved consistently + in different environments, it is recommended to + always specify the `devfileRegistryUrl` when `Id` + is used. + type: string + required: + - id + type: object git: description: Dockerfile's Git source properties: @@ -4416,51 +4436,34 @@ spec: is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git - repository when using git as Dockerfile src. + repository when using git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized - in the git project. Must have at least one remote - configured + in the git project. Projects must have at least + one remote configured while StarterProjects & + Image Component's Git source can only have at + most one remote configured. type: object required: - remotes type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull the Dockerfile - from when using the Devfile Registry as Dockerfile - src. To ensure the Dockerfile gets resolved consistently - in different environments, it is recommended to - always specify the `devfileRegistryUrl` when `Id` - is used. - type: string - id: - description: Id in a devfile registry that contains - a Dockerfile. The src in the OCI registry required - for the Dockerfile build will be downloaded for - building the image. - type: string - required: - - id - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from the current devfile @@ -5109,7 +5112,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -5124,6 +5127,27 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry + source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. The src + in the OCI registry required for the + Dockerfile build will be downloaded + for building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull + the Dockerfile from when using the Devfile + Registry as Dockerfile src. To ensure + the Dockerfile gets resolved consistently + in different environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -5145,51 +5169,33 @@ spec: is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git - as Dockerfile src. + as Dockerfile src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should - be initialized in the git project. Must - have at least one remote configured + be initialized in the git project. Projects + must have at least one remote configured + while StarterProjects & Image Component's + Git source can only have at most one + remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry - source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull - the Dockerfile from when using the Devfile - Registry as Dockerfile src. To ensure - the Dockerfile gets resolved consistently - in different environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. The src - in the OCI registry required for the - Dockerfile build will be downloaded - for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from @@ -5935,7 +5941,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -5950,6 +5956,24 @@ spec: build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry source + properties: + id: + description: Id in a devfile registry that contains + a Dockerfile. The src in the OCI registry + required for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL to pull the + Dockerfile from when using the Devfile Registry + as Dockerfile src. To ensure the Dockerfile + gets resolved consistently in different environments, + it is recommended to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -5970,48 +5994,32 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using git as Dockerfile - src. + src. Defaults to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be - initialized in the git project. Must have - at least one remote configured + initialized in the git project. Projects must + have at least one remote configured while + StarterProjects & Image Component's Git source + can only have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry source - properties: - devfileRegistryUrl: - description: Devfile Registry URL to pull the - Dockerfile from when using the Devfile Registry - as Dockerfile src. To ensure the Dockerfile - gets resolved consistently in different environments, - it is recommended to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry that contains - a Dockerfile. The src in the OCI registry - required for the Dockerfile build will be - downloaded for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI from the current @@ -6670,7 +6678,7 @@ spec: - required: - uri - required: - - registry + - devfileRegistry - required: - git properties: @@ -6685,6 +6693,28 @@ spec: to establish build context. Defaults to ${PROJECT_ROOT} in the container type: string + devfileRegistry: + description: Dockerfile's Devfile Registry + source + properties: + id: + description: Id in a devfile registry + that contains a Dockerfile. The + src in the OCI registry required + for the Dockerfile build will be + downloaded for building the image. + type: string + registryUrl: + description: Devfile Registry URL + to pull the Dockerfile from when + using the Devfile Registry as Dockerfile + src. To ensure the Dockerfile gets + resolved consistently in different + environments, it is recommended + to always specify the `devfileRegistryUrl` + when `Id` is used. + type: string + type: object git: description: Dockerfile's Git source properties: @@ -6708,54 +6738,35 @@ spec: revision is not found. type: string type: object - gitLocation: + fileLocation: description: Location of the Dockerfile in the Git repository when using - git as Dockerfile src. + git as Dockerfile src. Defaults + to Dockerfile. type: string remotes: additionalProperties: type: string description: The remotes map which should be initialized in the git - project. Must have at least one - remote configured + project. Projects must have at least + one remote configured while StarterProjects + & Image Component's Git source can + only have at most one remote configured. type: object type: object - locationType: - description: Type of Dockerfile location - enum: - - Uri - - Registry - - Git - type: string - registry: - description: Dockerfile's Devfile Registry - source - properties: - devfileRegistryUrl: - description: Devfile Registry URL - to pull the Dockerfile from when - using the Devfile Registry as Dockerfile - src. To ensure the Dockerfile gets - resolved consistently in different - environments, it is recommended - to always specify the `devfileRegistryUrl` - when `Id` is used. - type: string - id: - description: Id in a devfile registry - that contains a Dockerfile. The - src in the OCI registry required - for the Dockerfile build will be - downloaded for building the image. - type: string - type: object rootRequired: description: "Specify if a privileged builder pod is required. \n Default value is `false`" type: boolean + srcType: + description: Type of Dockerfile src + enum: + - Uri + - DevfileRegistry + - Git + type: string uri: description: URI Reference of a Dockerfile. It can be a full URL or a relative URI @@ -7140,8 +7151,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object type: object name: @@ -7217,8 +7228,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one - remote configured while StarterProjects can only have - at most one remote configured. + remote configured while StarterProjects & Image Component's + Git source can only have at most one remote configured. type: object type: object name: @@ -7320,8 +7331,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one remote - configured while StarterProjects can only have at most - one remote configured. + configured while StarterProjects & Image Component's Git + source can only have at most one remote configured. type: object required: - remotes @@ -7405,8 +7416,8 @@ spec: type: string description: The remotes map which should be initialized in the git project. Projects must have at least one remote - configured while StarterProjects can only have at most - one remote configured. + configured while StarterProjects & Image Component's Git + source can only have at most one remote configured. type: object required: - remotes diff --git a/pkg/apis/workspaces/v1alpha1/commands_conversion.go b/pkg/apis/workspaces/v1alpha1/commands_conversion.go index b48e3f2ce..878b448d6 100644 --- a/pkg/apis/workspaces/v1alpha1/commands_conversion.go +++ b/pkg/apis/workspaces/v1alpha1/commands_conversion.go @@ -58,47 +58,48 @@ func getGroup(dc v1alpha2.Command) *v1alpha2.CommandGroup { } func convertCommandFrom_v1alpha2(src *v1alpha2.Command, dest *Command) error { - if src != nil { - id := src.Key() + if src == nil { + return nil + } - srcCmdGroup := getGroup(*src) - if srcCmdGroup != nil && srcCmdGroup.Kind == v1alpha2.DeployCommandGroupKind { - // skip converting deploy kind commands as deploy kind commands are not supported in v1alpha1 - return nil - } + id := src.Key() - jsonCommand, err := json.Marshal(src) - if err != nil { - return err - } - err = json.Unmarshal(jsonCommand, dest) + srcCmdGroup := getGroup(*src) + if srcCmdGroup != nil && srcCmdGroup.Kind == v1alpha2.DeployCommandGroupKind { + // skip converting deploy kind commands as deploy kind commands are not supported in v1alpha1 + return nil + } + + jsonCommand, err := json.Marshal(src) + if err != nil { + return err + } + err = json.Unmarshal(jsonCommand, dest) + if err != nil { + return err + } + var destAttributes map[string]string + if src.Attributes != nil { + destAttributes = make(map[string]string) + err = convertAttributesFrom_v1alpha2(&src.Attributes, destAttributes) if err != nil { return err } - var destAttributes map[string]string - if src.Attributes != nil { - destAttributes = make(map[string]string) - err = convertAttributesFrom_v1alpha2(&src.Attributes, destAttributes) - if err != nil { - return err - } - } + } - switch { - case dest.Apply != nil: - dest.Apply.Attributes = destAttributes - dest.Apply.Id = id - case dest.Composite != nil: - dest.Composite.Attributes = destAttributes - dest.Composite.Id = id - case dest.Custom != nil: - dest.Custom.Attributes = destAttributes - dest.Custom.Id = id - case dest.Exec != nil: - dest.Exec.Attributes = destAttributes - dest.Exec.Id = id - } - return err + switch { + case dest.Apply != nil: + dest.Apply.Attributes = destAttributes + dest.Apply.Id = id + case dest.Composite != nil: + dest.Composite.Attributes = destAttributes + dest.Composite.Id = id + case dest.Custom != nil: + dest.Custom.Attributes = destAttributes + dest.Custom.Id = id + case dest.Exec != nil: + dest.Exec.Attributes = destAttributes + dest.Exec.Id = id } - return nil + return err } diff --git a/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go b/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go index 27cbcbe1d..4743825e2 100644 --- a/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go +++ b/pkg/apis/workspaces/v1alpha2/component_image_dockerfile.go @@ -1,31 +1,31 @@ package v1alpha2 -// DockerfileLocationType describes the type of -// the location for the Dockerfile outerloop build. +// DockerfileSrcType describes the type of +// the src for the Dockerfile outerloop build. // Only one of the following location type may be specified. -// +kubebuilder:validation:Enum=Uri;Registry;Git -type DockerfileLocationType string +// +kubebuilder:validation:Enum=Uri;DevfileRegistry;Git +type DockerfileSrcType string const ( - UriLikeDockerfileLocationType DockerfileLocationType = "Uri" - RegistryLikeDockerfileLocationType DockerfileLocationType = "Registry" - GitLikeDockerfileLocationType DockerfileLocationType = "Git" + UriLikeDockerfileSrcType DockerfileSrcType = "Uri" + DevfileRegistryLikeDockerfileSrcType DockerfileSrcType = "DevfileRegistry" + GitLikeDockerfileSrcType DockerfileSrcType = "Git" ) // Dockerfile Image type to specify the outerloop build using a Dockerfile type DockerfileImage struct { - BaseImage `json:",inline"` - DockerfileLocation `json:",inline"` - Dockerfile `json:",inline"` + BaseImage `json:",inline"` + DockerfileSrc `json:",inline"` + Dockerfile `json:",inline"` } // +union -type DockerfileLocation struct { - // Type of Dockerfile location +type DockerfileSrc struct { + // Type of Dockerfile src // + // +unionDiscriminator // +optional - LocationType DockerfileLocationType `json:"locationType,omitempty"` + SrcType DockerfileSrcType `json:"srcType,omitempty"` // URI Reference of a Dockerfile. // It can be a full URL or a relative URI from the current devfile as the base URI. @@ -34,7 +34,7 @@ type DockerfileLocation struct { // Dockerfile's Devfile Registry source // +optional - Registry *DockerfileDevfileRegistrySource `json:"registry,omitempty"` + DevfileRegistry *DockerfileDevfileRegistrySource `json:"devfileRegistry,omitempty"` // Dockerfile's Git source // +optional @@ -66,7 +66,7 @@ type DockerfileDevfileRegistrySource struct { // To ensure the Dockerfile gets resolved consistently in different environments, // it is recommended to always specify the `devfileRegistryUrl` when `Id` is used. // +optional - DevfileRegistryUrl string `json:"devfileRegistryUrl,omitempty"` + RegistryUrl string `json:"registryUrl,omitempty"` } type DockerfileGitProjectSource struct { @@ -75,6 +75,7 @@ type DockerfileGitProjectSource struct { GitProjectSource `json:",inline"` // Location of the Dockerfile in the Git repository when using git as Dockerfile src. + // Defaults to Dockerfile. // +optional - GitLocation string `json:"gitLocation,omitempty"` + FileLocation string `json:"fileLocation,omitempty"` } diff --git a/pkg/apis/workspaces/v1alpha2/projects.go b/pkg/apis/workspaces/v1alpha2/projects.go index eafa40ae0..9348d4d68 100644 --- a/pkg/apis/workspaces/v1alpha2/projects.go +++ b/pkg/apis/workspaces/v1alpha2/projects.go @@ -110,7 +110,7 @@ type GitLikeProjectSource struct { CheckoutFrom *CheckoutFrom `json:"checkoutFrom,omitempty"` // The remotes map which should be initialized in the git project. - // Projects must have at least one remote configured while StarterProjects can only have at most one remote configured. + // Projects must have at least one remote configured while StarterProjects & Image Component's Git source can only have at most one remote configured. Remotes map[string]string `json:"remotes"` } diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go index 1184bbe5d..c9e831338 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.deepcopy.go @@ -1768,7 +1768,7 @@ func (in *DockerfileGitProjectSourcePluginOverrideParentOverride) DeepCopy() *Do func (in *DockerfileImage) DeepCopyInto(out *DockerfileImage) { *out = *in out.BaseImage = in.BaseImage - in.DockerfileLocation.DeepCopyInto(&out.DockerfileLocation) + in.DockerfileSrc.DeepCopyInto(&out.DockerfileSrc) in.Dockerfile.DeepCopyInto(&out.Dockerfile) } @@ -1786,7 +1786,7 @@ func (in *DockerfileImage) DeepCopy() *DockerfileImage { func (in *DockerfileImageParentOverride) DeepCopyInto(out *DockerfileImageParentOverride) { *out = *in out.BaseImageParentOverride = in.BaseImageParentOverride - in.DockerfileLocationParentOverride.DeepCopyInto(&out.DockerfileLocationParentOverride) + in.DockerfileSrcParentOverride.DeepCopyInto(&out.DockerfileSrcParentOverride) in.DockerfileParentOverride.DeepCopyInto(&out.DockerfileParentOverride) } @@ -1804,7 +1804,7 @@ func (in *DockerfileImageParentOverride) DeepCopy() *DockerfileImageParentOverri func (in *DockerfileImagePluginOverride) DeepCopyInto(out *DockerfileImagePluginOverride) { *out = *in out.BaseImagePluginOverride = in.BaseImagePluginOverride - in.DockerfileLocationPluginOverride.DeepCopyInto(&out.DockerfileLocationPluginOverride) + in.DockerfileSrcPluginOverride.DeepCopyInto(&out.DockerfileSrcPluginOverride) in.DockerfilePluginOverride.DeepCopyInto(&out.DockerfilePluginOverride) } @@ -1822,7 +1822,7 @@ func (in *DockerfileImagePluginOverride) DeepCopy() *DockerfileImagePluginOverri func (in *DockerfileImagePluginOverrideParentOverride) DeepCopyInto(out *DockerfileImagePluginOverrideParentOverride) { *out = *in out.BaseImagePluginOverrideParentOverride = in.BaseImagePluginOverrideParentOverride - in.DockerfileLocationPluginOverrideParentOverride.DeepCopyInto(&out.DockerfileLocationPluginOverrideParentOverride) + in.DockerfileSrcPluginOverrideParentOverride.DeepCopyInto(&out.DockerfileSrcPluginOverrideParentOverride) in.DockerfilePluginOverrideParentOverride.DeepCopyInto(&out.DockerfilePluginOverrideParentOverride) } @@ -1837,176 +1837,176 @@ func (in *DockerfileImagePluginOverrideParentOverride) DeepCopy() *DockerfileIma } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfileLocation) DeepCopyInto(out *DockerfileLocation) { +func (in *DockerfileParentOverride) DeepCopyInto(out *DockerfileParentOverride) { *out = *in - if in.Registry != nil { - in, out := &in.Registry, &out.Registry - *out = new(DockerfileDevfileRegistrySource) - **out = **in + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) } - if in.Git != nil { - in, out := &in.Git, &out.Git - *out = new(DockerfileGitProjectSource) - (*in).DeepCopyInto(*out) + if in.RootRequired != nil { + in, out := &in.RootRequired, &out.RootRequired + *out = new(bool) + **out = **in } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileLocation. -func (in *DockerfileLocation) DeepCopy() *DockerfileLocation { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileParentOverride. +func (in *DockerfileParentOverride) DeepCopy() *DockerfileParentOverride { if in == nil { return nil } - out := new(DockerfileLocation) + out := new(DockerfileParentOverride) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfileLocationParentOverride) DeepCopyInto(out *DockerfileLocationParentOverride) { +func (in *DockerfilePluginOverride) DeepCopyInto(out *DockerfilePluginOverride) { *out = *in - if in.Registry != nil { - in, out := &in.Registry, &out.Registry - *out = new(DockerfileDevfileRegistrySourceParentOverride) - **out = **in + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) } - if in.Git != nil { - in, out := &in.Git, &out.Git - *out = new(DockerfileGitProjectSourceParentOverride) - (*in).DeepCopyInto(*out) + if in.RootRequired != nil { + in, out := &in.RootRequired, &out.RootRequired + *out = new(bool) + **out = **in } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileLocationParentOverride. -func (in *DockerfileLocationParentOverride) DeepCopy() *DockerfileLocationParentOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfilePluginOverride. +func (in *DockerfilePluginOverride) DeepCopy() *DockerfilePluginOverride { if in == nil { return nil } - out := new(DockerfileLocationParentOverride) + out := new(DockerfilePluginOverride) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfileLocationPluginOverride) DeepCopyInto(out *DockerfileLocationPluginOverride) { +func (in *DockerfilePluginOverrideParentOverride) DeepCopyInto(out *DockerfilePluginOverrideParentOverride) { *out = *in - if in.Registry != nil { - in, out := &in.Registry, &out.Registry - *out = new(DockerfileDevfileRegistrySourcePluginOverride) - **out = **in + if in.Args != nil { + in, out := &in.Args, &out.Args + *out = make([]string, len(*in)) + copy(*out, *in) } - if in.Git != nil { - in, out := &in.Git, &out.Git - *out = new(DockerfileGitProjectSourcePluginOverride) - (*in).DeepCopyInto(*out) + if in.RootRequired != nil { + in, out := &in.RootRequired, &out.RootRequired + *out = new(bool) + **out = **in } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileLocationPluginOverride. -func (in *DockerfileLocationPluginOverride) DeepCopy() *DockerfileLocationPluginOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfilePluginOverrideParentOverride. +func (in *DockerfilePluginOverrideParentOverride) DeepCopy() *DockerfilePluginOverrideParentOverride { if in == nil { return nil } - out := new(DockerfileLocationPluginOverride) + out := new(DockerfilePluginOverrideParentOverride) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfileLocationPluginOverrideParentOverride) DeepCopyInto(out *DockerfileLocationPluginOverrideParentOverride) { +func (in *DockerfileSrc) DeepCopyInto(out *DockerfileSrc) { *out = *in - if in.Registry != nil { - in, out := &in.Registry, &out.Registry - *out = new(DockerfileDevfileRegistrySourcePluginOverrideParentOverride) + if in.DevfileRegistry != nil { + in, out := &in.DevfileRegistry, &out.DevfileRegistry + *out = new(DockerfileDevfileRegistrySource) **out = **in } if in.Git != nil { in, out := &in.Git, &out.Git - *out = new(DockerfileGitProjectSourcePluginOverrideParentOverride) + *out = new(DockerfileGitProjectSource) (*in).DeepCopyInto(*out) } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileLocationPluginOverrideParentOverride. -func (in *DockerfileLocationPluginOverrideParentOverride) DeepCopy() *DockerfileLocationPluginOverrideParentOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileSrc. +func (in *DockerfileSrc) DeepCopy() *DockerfileSrc { if in == nil { return nil } - out := new(DockerfileLocationPluginOverrideParentOverride) + out := new(DockerfileSrc) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfileParentOverride) DeepCopyInto(out *DockerfileParentOverride) { +func (in *DockerfileSrcParentOverride) DeepCopyInto(out *DockerfileSrcParentOverride) { *out = *in - if in.Args != nil { - in, out := &in.Args, &out.Args - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.RootRequired != nil { - in, out := &in.RootRequired, &out.RootRequired - *out = new(bool) + if in.DevfileRegistry != nil { + in, out := &in.DevfileRegistry, &out.DevfileRegistry + *out = new(DockerfileDevfileRegistrySourceParentOverride) **out = **in } + if in.Git != nil { + in, out := &in.Git, &out.Git + *out = new(DockerfileGitProjectSourceParentOverride) + (*in).DeepCopyInto(*out) + } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileParentOverride. -func (in *DockerfileParentOverride) DeepCopy() *DockerfileParentOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileSrcParentOverride. +func (in *DockerfileSrcParentOverride) DeepCopy() *DockerfileSrcParentOverride { if in == nil { return nil } - out := new(DockerfileParentOverride) + out := new(DockerfileSrcParentOverride) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfilePluginOverride) DeepCopyInto(out *DockerfilePluginOverride) { +func (in *DockerfileSrcPluginOverride) DeepCopyInto(out *DockerfileSrcPluginOverride) { *out = *in - if in.Args != nil { - in, out := &in.Args, &out.Args - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.RootRequired != nil { - in, out := &in.RootRequired, &out.RootRequired - *out = new(bool) + if in.DevfileRegistry != nil { + in, out := &in.DevfileRegistry, &out.DevfileRegistry + *out = new(DockerfileDevfileRegistrySourcePluginOverride) **out = **in } + if in.Git != nil { + in, out := &in.Git, &out.Git + *out = new(DockerfileGitProjectSourcePluginOverride) + (*in).DeepCopyInto(*out) + } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfilePluginOverride. -func (in *DockerfilePluginOverride) DeepCopy() *DockerfilePluginOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileSrcPluginOverride. +func (in *DockerfileSrcPluginOverride) DeepCopy() *DockerfileSrcPluginOverride { if in == nil { return nil } - out := new(DockerfilePluginOverride) + out := new(DockerfileSrcPluginOverride) in.DeepCopyInto(out) return out } // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. -func (in *DockerfilePluginOverrideParentOverride) DeepCopyInto(out *DockerfilePluginOverrideParentOverride) { +func (in *DockerfileSrcPluginOverrideParentOverride) DeepCopyInto(out *DockerfileSrcPluginOverrideParentOverride) { *out = *in - if in.Args != nil { - in, out := &in.Args, &out.Args - *out = make([]string, len(*in)) - copy(*out, *in) - } - if in.RootRequired != nil { - in, out := &in.RootRequired, &out.RootRequired - *out = new(bool) + if in.DevfileRegistry != nil { + in, out := &in.DevfileRegistry, &out.DevfileRegistry + *out = new(DockerfileDevfileRegistrySourcePluginOverrideParentOverride) **out = **in } + if in.Git != nil { + in, out := &in.Git, &out.Git + *out = new(DockerfileGitProjectSourcePluginOverrideParentOverride) + (*in).DeepCopyInto(*out) + } } -// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfilePluginOverrideParentOverride. -func (in *DockerfilePluginOverrideParentOverride) DeepCopy() *DockerfilePluginOverrideParentOverride { +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new DockerfileSrcPluginOverrideParentOverride. +func (in *DockerfileSrcPluginOverrideParentOverride) DeepCopy() *DockerfileSrcPluginOverrideParentOverride { if in == nil { return nil } - out := new(DockerfilePluginOverrideParentOverride) + out := new(DockerfileSrcPluginOverrideParentOverride) in.DeepCopyInto(out) return out } diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go index 741c43c26..02750f5e6 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.parent_overrides.go @@ -567,7 +567,7 @@ type GitLikeProjectSourceParentOverride struct { // +optional // The remotes map which should be initialized in the git project. - // Projects must have at least one remote configured while StarterProjects can only have at most one remote configured. + // Projects must have at least one remote configured while StarterProjects & Image Component's Git source can only have at most one remote configured. Remotes map[string]string `json:"remotes,omitempty"` } @@ -745,9 +745,9 @@ type ImageTypeParentOverride string // Dockerfile Image type to specify the outerloop build using a Dockerfile type DockerfileImageParentOverride struct { - BaseImageParentOverride `json:",inline"` - DockerfileLocationParentOverride `json:",inline"` - DockerfileParentOverride `json:",inline"` + BaseImageParentOverride `json:",inline"` + DockerfileSrcParentOverride `json:",inline"` + DockerfileParentOverride `json:",inline"` } // ImportReferenceType describes the type of location @@ -849,14 +849,14 @@ type BaseImageParentOverride struct { } // +union -type DockerfileLocationParentOverride struct { +type DockerfileSrcParentOverride struct { - // +kubebuilder:validation:Enum=Uri;Registry;Git - // Type of Dockerfile location + // +kubebuilder:validation:Enum=Uri;DevfileRegistry;Git + // Type of Dockerfile src // + // +unionDiscriminator // +optional - LocationType DockerfileLocationTypeParentOverride `json:"locationType,omitempty"` + SrcType DockerfileSrcTypeParentOverride `json:"srcType,omitempty"` // URI Reference of a Dockerfile. // It can be a full URL or a relative URI from the current devfile as the base URI. @@ -865,7 +865,7 @@ type DockerfileLocationParentOverride struct { // Dockerfile's Devfile Registry source // +optional - Registry *DockerfileDevfileRegistrySourceParentOverride `json:"registry,omitempty"` + DevfileRegistry *DockerfileDevfileRegistrySourceParentOverride `json:"devfileRegistry,omitempty"` // Dockerfile's Git source // +optional @@ -993,10 +993,10 @@ type CompositeCommandPluginOverrideParentOverride struct { // +kubebuilder:validation:Enum=build;run;test;debug;deploy type CommandGroupKindParentOverride string -// DockerfileLocationType describes the type of -// the location for the Dockerfile outerloop build. +// DockerfileSrcType describes the type of +// the src for the Dockerfile outerloop build. // Only one of the following location type may be specified. -type DockerfileLocationTypeParentOverride string +type DockerfileSrcTypeParentOverride string type DockerfileDevfileRegistrySourceParentOverride struct { @@ -1009,7 +1009,7 @@ type DockerfileDevfileRegistrySourceParentOverride struct { // To ensure the Dockerfile gets resolved consistently in different environments, // it is recommended to always specify the `devfileRegistryUrl` when `Id` is used. // +optional - DevfileRegistryUrl string `json:"devfileRegistryUrl,omitempty"` + RegistryUrl string `json:"registryUrl,omitempty"` } type DockerfileGitProjectSourceParentOverride struct { @@ -1019,8 +1019,9 @@ type DockerfileGitProjectSourceParentOverride struct { GitProjectSourceParentOverride `json:",inline"` // Location of the Dockerfile in the Git repository when using git as Dockerfile src. + // Defaults to Dockerfile. // +optional - GitLocation string `json:"gitLocation,omitempty"` + FileLocation string `json:"fileLocation,omitempty"` } // DevWorkspace component: Anything that will bring additional features / tooling / behaviour / context @@ -1283,9 +1284,9 @@ type ImageTypePluginOverrideParentOverride string // Dockerfile Image type to specify the outerloop build using a Dockerfile type DockerfileImagePluginOverrideParentOverride struct { - BaseImagePluginOverrideParentOverride `json:",inline"` - DockerfileLocationPluginOverrideParentOverride `json:",inline"` - DockerfilePluginOverrideParentOverride `json:",inline"` + BaseImagePluginOverrideParentOverride `json:",inline"` + DockerfileSrcPluginOverrideParentOverride `json:",inline"` + DockerfilePluginOverrideParentOverride `json:",inline"` } type CommandGroupPluginOverrideParentOverride struct { @@ -1303,14 +1304,14 @@ type BaseImagePluginOverrideParentOverride struct { } // +union -type DockerfileLocationPluginOverrideParentOverride struct { +type DockerfileSrcPluginOverrideParentOverride struct { - // +kubebuilder:validation:Enum=Uri;Registry;Git - // Type of Dockerfile location + // +kubebuilder:validation:Enum=Uri;DevfileRegistry;Git + // Type of Dockerfile src // + // +unionDiscriminator // +optional - LocationType DockerfileLocationTypePluginOverrideParentOverride `json:"locationType,omitempty"` + SrcType DockerfileSrcTypePluginOverrideParentOverride `json:"srcType,omitempty"` // URI Reference of a Dockerfile. // It can be a full URL or a relative URI from the current devfile as the base URI. @@ -1319,7 +1320,7 @@ type DockerfileLocationPluginOverrideParentOverride struct { // Dockerfile's Devfile Registry source // +optional - Registry *DockerfileDevfileRegistrySourcePluginOverrideParentOverride `json:"registry,omitempty"` + DevfileRegistry *DockerfileDevfileRegistrySourcePluginOverrideParentOverride `json:"devfileRegistry,omitempty"` // Dockerfile's Git source // +optional @@ -1347,10 +1348,10 @@ type DockerfilePluginOverrideParentOverride struct { // +kubebuilder:validation:Enum=build;run;test;debug;deploy type CommandGroupKindPluginOverrideParentOverride string -// DockerfileLocationType describes the type of -// the location for the Dockerfile outerloop build. +// DockerfileSrcType describes the type of +// the src for the Dockerfile outerloop build. // Only one of the following location type may be specified. -type DockerfileLocationTypePluginOverrideParentOverride string +type DockerfileSrcTypePluginOverrideParentOverride string type DockerfileDevfileRegistrySourcePluginOverrideParentOverride struct { @@ -1363,7 +1364,7 @@ type DockerfileDevfileRegistrySourcePluginOverrideParentOverride struct { // To ensure the Dockerfile gets resolved consistently in different environments, // it is recommended to always specify the `devfileRegistryUrl` when `Id` is used. // +optional - DevfileRegistryUrl string `json:"devfileRegistryUrl,omitempty"` + RegistryUrl string `json:"registryUrl,omitempty"` } type DockerfileGitProjectSourcePluginOverrideParentOverride struct { @@ -1373,8 +1374,9 @@ type DockerfileGitProjectSourcePluginOverrideParentOverride struct { GitProjectSourcePluginOverrideParentOverride `json:",inline"` // Location of the Dockerfile in the Git repository when using git as Dockerfile src. + // Defaults to Dockerfile. // +optional - GitLocation string `json:"gitLocation,omitempty"` + FileLocation string `json:"fileLocation,omitempty"` } type GitProjectSourcePluginOverrideParentOverride struct { @@ -1389,7 +1391,8 @@ type GitLikeProjectSourcePluginOverrideParentOverride struct { CheckoutFrom *CheckoutFromPluginOverrideParentOverride `json:"checkoutFrom,omitempty"` // +optional - // The remotes map which should be initialized in the git project. Must have at least one remote configured + // The remotes map which should be initialized in the git project. + // Projects must have at least one remote configured while StarterProjects & Image Component's Git source can only have at most one remote configured. Remotes map[string]string `json:"remotes,omitempty"` } diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go b/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go index a18edcdae..76ffb6385 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.plugin_overrides.go @@ -491,9 +491,9 @@ type ImageTypePluginOverride string // Dockerfile Image type to specify the outerloop build using a Dockerfile type DockerfileImagePluginOverride struct { - BaseImagePluginOverride `json:",inline"` - DockerfileLocationPluginOverride `json:",inline"` - DockerfilePluginOverride `json:",inline"` + BaseImagePluginOverride `json:",inline"` + DockerfileSrcPluginOverride `json:",inline"` + DockerfilePluginOverride `json:",inline"` } type CommandGroupPluginOverride struct { @@ -511,14 +511,14 @@ type BaseImagePluginOverride struct { } // +union -type DockerfileLocationPluginOverride struct { +type DockerfileSrcPluginOverride struct { - // +kubebuilder:validation:Enum=Uri;Registry;Git - // Type of Dockerfile location + // +kubebuilder:validation:Enum=Uri;DevfileRegistry;Git + // Type of Dockerfile src // + // +unionDiscriminator // +optional - LocationType DockerfileLocationTypePluginOverride `json:"locationType,omitempty"` + SrcType DockerfileSrcTypePluginOverride `json:"srcType,omitempty"` // URI Reference of a Dockerfile. // It can be a full URL or a relative URI from the current devfile as the base URI. @@ -527,7 +527,7 @@ type DockerfileLocationPluginOverride struct { // Dockerfile's Devfile Registry source // +optional - Registry *DockerfileDevfileRegistrySourcePluginOverride `json:"registry,omitempty"` + DevfileRegistry *DockerfileDevfileRegistrySourcePluginOverride `json:"devfileRegistry,omitempty"` // Dockerfile's Git source // +optional @@ -555,10 +555,10 @@ type DockerfilePluginOverride struct { // +kubebuilder:validation:Enum=build;run;test;debug;deploy type CommandGroupKindPluginOverride string -// DockerfileLocationType describes the type of -// the location for the Dockerfile outerloop build. +// DockerfileSrcType describes the type of +// the src for the Dockerfile outerloop build. // Only one of the following location type may be specified. -type DockerfileLocationTypePluginOverride string +type DockerfileSrcTypePluginOverride string type DockerfileDevfileRegistrySourcePluginOverride struct { @@ -571,7 +571,7 @@ type DockerfileDevfileRegistrySourcePluginOverride struct { // To ensure the Dockerfile gets resolved consistently in different environments, // it is recommended to always specify the `devfileRegistryUrl` when `Id` is used. // +optional - DevfileRegistryUrl string `json:"devfileRegistryUrl,omitempty"` + RegistryUrl string `json:"registryUrl,omitempty"` } type DockerfileGitProjectSourcePluginOverride struct { @@ -581,8 +581,9 @@ type DockerfileGitProjectSourcePluginOverride struct { GitProjectSourcePluginOverride `json:",inline"` // Location of the Dockerfile in the Git repository when using git as Dockerfile src. + // Defaults to Dockerfile. // +optional - GitLocation string `json:"gitLocation,omitempty"` + FileLocation string `json:"fileLocation,omitempty"` } type GitProjectSourcePluginOverride struct { @@ -597,7 +598,8 @@ type GitLikeProjectSourcePluginOverride struct { CheckoutFrom *CheckoutFromPluginOverride `json:"checkoutFrom,omitempty"` // +optional - // The remotes map which should be initialized in the git project. Must have at least one remote configured + // The remotes map which should be initialized in the git project. + // Projects must have at least one remote configured while StarterProjects & Image Component's Git source can only have at most one remote configured. Remotes map[string]string `json:"remotes,omitempty"` } diff --git a/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go b/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go index 58e616440..3efd841ae 100644 --- a/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go +++ b/pkg/apis/workspaces/v1alpha2/zz_generated.union_definitions.go @@ -47,26 +47,26 @@ type ImageUnionVisitor struct { Dockerfile func(*DockerfileImage) error } -var dockerfileLocation reflect.Type = reflect.TypeOf(DockerfileLocationVisitor{}) +var dockerfileSrc reflect.Type = reflect.TypeOf(DockerfileSrcVisitor{}) -func (union DockerfileLocation) Visit(visitor DockerfileLocationVisitor) error { +func (union DockerfileSrc) Visit(visitor DockerfileSrcVisitor) error { return visitUnion(union, visitor) } -func (union *DockerfileLocation) discriminator() *string { - return (*string)(&union.LocationType) +func (union *DockerfileSrc) discriminator() *string { + return (*string)(&union.SrcType) } -func (union *DockerfileLocation) Normalize() error { - return normalizeUnion(union, dockerfileLocation) +func (union *DockerfileSrc) Normalize() error { + return normalizeUnion(union, dockerfileSrc) } -func (union *DockerfileLocation) Simplify() { - simplifyUnion(union, dockerfileLocation) +func (union *DockerfileSrc) Simplify() { + simplifyUnion(union, dockerfileSrc) } // +k8s:deepcopy-gen=false -type DockerfileLocationVisitor struct { - Uri func(string) error - Registry func(*DockerfileDevfileRegistrySource) error - Git func(*DockerfileGitProjectSource) error +type DockerfileSrcVisitor struct { + Uri func(string) error + DevfileRegistry func(*DockerfileDevfileRegistrySource) error + Git func(*DockerfileGitProjectSource) error } var k8sLikeComponentLocation reflect.Type = reflect.TypeOf(K8sLikeComponentLocationVisitor{}) @@ -337,26 +337,26 @@ type CommandUnionPluginOverrideParentOverrideVisitor struct { Composite func(*CompositeCommandPluginOverrideParentOverride) error } -var dockerfileLocationParentOverride reflect.Type = reflect.TypeOf(DockerfileLocationParentOverrideVisitor{}) +var dockerfileSrcParentOverride reflect.Type = reflect.TypeOf(DockerfileSrcParentOverrideVisitor{}) -func (union DockerfileLocationParentOverride) Visit(visitor DockerfileLocationParentOverrideVisitor) error { +func (union DockerfileSrcParentOverride) Visit(visitor DockerfileSrcParentOverrideVisitor) error { return visitUnion(union, visitor) } -func (union *DockerfileLocationParentOverride) discriminator() *string { - return (*string)(&union.LocationType) +func (union *DockerfileSrcParentOverride) discriminator() *string { + return (*string)(&union.SrcType) } -func (union *DockerfileLocationParentOverride) Normalize() error { - return normalizeUnion(union, dockerfileLocationParentOverride) +func (union *DockerfileSrcParentOverride) Normalize() error { + return normalizeUnion(union, dockerfileSrcParentOverride) } -func (union *DockerfileLocationParentOverride) Simplify() { - simplifyUnion(union, dockerfileLocationParentOverride) +func (union *DockerfileSrcParentOverride) Simplify() { + simplifyUnion(union, dockerfileSrcParentOverride) } // +k8s:deepcopy-gen=false -type DockerfileLocationParentOverrideVisitor struct { - Uri func(string) error - Registry func(*DockerfileDevfileRegistrySourceParentOverride) error - Git func(*DockerfileGitProjectSourceParentOverride) error +type DockerfileSrcParentOverrideVisitor struct { + Uri func(string) error + DevfileRegistry func(*DockerfileDevfileRegistrySourceParentOverride) error + Git func(*DockerfileGitProjectSourceParentOverride) error } var k8sLikeComponentLocationPluginOverrideParentOverride reflect.Type = reflect.TypeOf(K8sLikeComponentLocationPluginOverrideParentOverrideVisitor{}) @@ -400,26 +400,26 @@ type ImageUnionPluginOverrideParentOverrideVisitor struct { Dockerfile func(*DockerfileImagePluginOverrideParentOverride) error } -var dockerfileLocationPluginOverrideParentOverride reflect.Type = reflect.TypeOf(DockerfileLocationPluginOverrideParentOverrideVisitor{}) +var dockerfileSrcPluginOverrideParentOverride reflect.Type = reflect.TypeOf(DockerfileSrcPluginOverrideParentOverrideVisitor{}) -func (union DockerfileLocationPluginOverrideParentOverride) Visit(visitor DockerfileLocationPluginOverrideParentOverrideVisitor) error { +func (union DockerfileSrcPluginOverrideParentOverride) Visit(visitor DockerfileSrcPluginOverrideParentOverrideVisitor) error { return visitUnion(union, visitor) } -func (union *DockerfileLocationPluginOverrideParentOverride) discriminator() *string { - return (*string)(&union.LocationType) +func (union *DockerfileSrcPluginOverrideParentOverride) discriminator() *string { + return (*string)(&union.SrcType) } -func (union *DockerfileLocationPluginOverrideParentOverride) Normalize() error { - return normalizeUnion(union, dockerfileLocationPluginOverrideParentOverride) +func (union *DockerfileSrcPluginOverrideParentOverride) Normalize() error { + return normalizeUnion(union, dockerfileSrcPluginOverrideParentOverride) } -func (union *DockerfileLocationPluginOverrideParentOverride) Simplify() { - simplifyUnion(union, dockerfileLocationPluginOverrideParentOverride) +func (union *DockerfileSrcPluginOverrideParentOverride) Simplify() { + simplifyUnion(union, dockerfileSrcPluginOverrideParentOverride) } // +k8s:deepcopy-gen=false -type DockerfileLocationPluginOverrideParentOverrideVisitor struct { - Uri func(string) error - Registry func(*DockerfileDevfileRegistrySourcePluginOverrideParentOverride) error - Git func(*DockerfileGitProjectSourcePluginOverrideParentOverride) error +type DockerfileSrcPluginOverrideParentOverrideVisitor struct { + Uri func(string) error + DevfileRegistry func(*DockerfileDevfileRegistrySourcePluginOverrideParentOverride) error + Git func(*DockerfileGitProjectSourcePluginOverrideParentOverride) error } var componentUnionPluginOverride reflect.Type = reflect.TypeOf(ComponentUnionPluginOverrideVisitor{}) @@ -509,24 +509,24 @@ type ImageUnionPluginOverrideVisitor struct { Dockerfile func(*DockerfileImagePluginOverride) error } -var dockerfileLocationPluginOverride reflect.Type = reflect.TypeOf(DockerfileLocationPluginOverrideVisitor{}) +var dockerfileSrcPluginOverride reflect.Type = reflect.TypeOf(DockerfileSrcPluginOverrideVisitor{}) -func (union DockerfileLocationPluginOverride) Visit(visitor DockerfileLocationPluginOverrideVisitor) error { +func (union DockerfileSrcPluginOverride) Visit(visitor DockerfileSrcPluginOverrideVisitor) error { return visitUnion(union, visitor) } -func (union *DockerfileLocationPluginOverride) discriminator() *string { - return (*string)(&union.LocationType) +func (union *DockerfileSrcPluginOverride) discriminator() *string { + return (*string)(&union.SrcType) } -func (union *DockerfileLocationPluginOverride) Normalize() error { - return normalizeUnion(union, dockerfileLocationPluginOverride) +func (union *DockerfileSrcPluginOverride) Normalize() error { + return normalizeUnion(union, dockerfileSrcPluginOverride) } -func (union *DockerfileLocationPluginOverride) Simplify() { - simplifyUnion(union, dockerfileLocationPluginOverride) +func (union *DockerfileSrcPluginOverride) Simplify() { + simplifyUnion(union, dockerfileSrcPluginOverride) } // +k8s:deepcopy-gen=false -type DockerfileLocationPluginOverrideVisitor struct { - Uri func(string) error - Registry func(*DockerfileDevfileRegistrySourcePluginOverride) error - Git func(*DockerfileGitProjectSourcePluginOverride) error +type DockerfileSrcPluginOverrideVisitor struct { + Uri func(string) error + DevfileRegistry func(*DockerfileDevfileRegistrySourcePluginOverride) error + Git func(*DockerfileGitProjectSourcePluginOverride) error } diff --git a/pkg/utils/overriding/test-fixtures/patches/image-component-union/patch.yaml b/pkg/utils/overriding/test-fixtures/patches/image-component-union/patch.yaml index a3d032b66..08e21c15a 100644 --- a/pkg/utils/overriding/test-fixtures/patches/image-component-union/patch.yaml +++ b/pkg/utils/overriding/test-fixtures/patches/image-component-union/patch.yaml @@ -4,13 +4,12 @@ components: imageName: "newimage:xyz" dockerfile: git: - gitLocation: "uri/Dockerfile" + fileLocation: "uri/Dockerfile" checkoutFrom: revision: "FOO" - remote: "BAR" + remote: "foo" remotes: "foo": "BAR" - "FOOBAR": "BARFOO" buildContext: /BAR/FOO args: - "sleep" diff --git a/pkg/utils/overriding/test-fixtures/patches/image-component-union/result.yaml b/pkg/utils/overriding/test-fixtures/patches/image-component-union/result.yaml index 3be96e8e5..d911d7f30 100644 --- a/pkg/utils/overriding/test-fixtures/patches/image-component-union/result.yaml +++ b/pkg/utils/overriding/test-fixtures/patches/image-component-union/result.yaml @@ -10,13 +10,12 @@ components: imageName: "newimage:xyz" dockerfile: git: - gitLocation: "uri/Dockerfile" + fileLocation: "uri/Dockerfile" checkoutFrom: revision: "FOO" - remote: "BAR" + remote: "foo" remotes: "foo": "BAR" - "FOOBAR": "BARFOO" buildContext: /BAR/FOO args: - "sleep" diff --git a/pkg/validation/components.go b/pkg/validation/components.go index 8f0103b8e..10b3c89ad 100644 --- a/pkg/validation/components.go +++ b/pkg/validation/components.go @@ -22,6 +22,7 @@ const ( // 2. makes sure the volume components are unique // 3. checks the URI specified in openshift components and kubernetes components are with valid format // 4. makes sure the component name is unique +// 5. makes sure the image dockerfile component git src has at most one remote func ValidateComponents(components []v1alpha2.Component) (returnedErr error) { processedVolumes := make(map[string]bool) @@ -100,6 +101,14 @@ func ValidateComponents(components []v1alpha2.Component) (returnedErr error) { returnedErr = multierror.Append(returnedErr, resolveErrorMessageWithImportAttributes(endpointErr, component.Attributes)) } } + case component.Image != nil: + var gitSource v1alpha2.GitLikeProjectSource + if component.Image.Dockerfile != nil && component.Image.Dockerfile.Git != nil { + gitSource = component.Image.Dockerfile.Git.GitLikeProjectSource + if err := validateSingleRemoteGitSrc("component", component.Name, gitSource); err != nil { + returnedErr = multierror.Append(returnedErr, resolveErrorMessageWithImportAttributes(err, component.Attributes)) + } + } case component.Plugin != nil: if component.Plugin.RegistryUrl != "" { err := ValidateURI(component.Plugin.RegistryUrl) diff --git a/pkg/validation/components_test.go b/pkg/validation/components_test.go index 7d6bcb49c..d97349ae1 100644 --- a/pkg/validation/components_test.go +++ b/pkg/validation/components_test.go @@ -1,9 +1,10 @@ package validation import ( - "github.com/devfile/api/v2/pkg/attributes" "testing" + "github.com/devfile/api/v2/pkg/attributes" + "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" "github.com/hashicorp/go-multierror" "github.com/stretchr/testify/assert" @@ -80,6 +81,29 @@ func generateDummyKubernetesComponent(name string, endpoints []v1alpha2.Endpoint } } +// generateDummyImageComponent returns a dummy Image Dockerfile Component for testing +func generateDummyImageComponent(name string, src v1alpha2.DockerfileSrc) v1alpha2.Component { + + return v1alpha2.Component{ + Name: name, + ComponentUnion: v1alpha2.ComponentUnion{ + Image: &v1alpha2.ImageComponent{ + Image: v1alpha2.Image{ + ImageName: "image:latest", + ImageUnion: v1alpha2.ImageUnion{ + Dockerfile: &v1alpha2.DockerfileImage{ + DockerfileSrc: src, + Dockerfile: v1alpha2.Dockerfile{ + BuildContext: "/path", + }, + }, + }, + }, + }, + }, + } +} + // generateDummyPluginComponent returns a dummy Plugin component for testing func generateDummyPluginComponent(name, url string, compAttribute attributes.Attributes) v1alpha2.Component { @@ -128,6 +152,68 @@ func TestValidateComponents(t *testing.T) { }, } + twoRemotesGitSrc := v1alpha2.DockerfileSrc{ + Git: &v1alpha2.DockerfileGitProjectSource{ + GitProjectSource: v1alpha2.GitProjectSource{ + GitLikeProjectSource: v1alpha2.GitLikeProjectSource{ + Remotes: map[string]string{ + "a": "abc", + "x": "xyz", + }, + CheckoutFrom: &v1alpha2.CheckoutFrom{ + Remote: "a", + }, + }, + }, + }, + } + + zeroRemoteGitSrc := v1alpha2.DockerfileSrc{ + Git: &v1alpha2.DockerfileGitProjectSource{ + GitProjectSource: v1alpha2.GitProjectSource{ + GitLikeProjectSource: v1alpha2.GitLikeProjectSource{ + CheckoutFrom: &v1alpha2.CheckoutFrom{ + Remote: "a", + }, + }, + }, + }, + } + + invalidRemoteGitSrc := v1alpha2.DockerfileSrc{ + Git: &v1alpha2.DockerfileGitProjectSource{ + GitProjectSource: v1alpha2.GitProjectSource{ + GitLikeProjectSource: v1alpha2.GitLikeProjectSource{ + Remotes: map[string]string{ + "a": "abc", + }, + CheckoutFrom: &v1alpha2.CheckoutFrom{ + Remote: "b", + }, + }, + }, + }, + } + + validRemoteGitSrc := v1alpha2.DockerfileSrc{ + Git: &v1alpha2.DockerfileGitProjectSource{ + GitProjectSource: v1alpha2.GitProjectSource{ + GitLikeProjectSource: v1alpha2.GitLikeProjectSource{ + Remotes: map[string]string{ + "a": "abc", + }, + CheckoutFrom: &v1alpha2.CheckoutFrom{ + Remote: "a", + }, + }, + }, + }, + } + + validUriSrc := v1alpha2.DockerfileSrc{ + Uri: "uri", + } + endpointUrl18080 := generateDummyEndpoint("url1", 8080) endpointUrl18081 := generateDummyEndpoint("url1", 8081) endpointUrl28080 := generateDummyEndpoint("url2", 8080) @@ -139,6 +225,9 @@ func TestValidateComponents(t *testing.T) { sameEndpointNameErr := "devfile contains multiple endpoint entries with same name.*" sameTargetPortErr := "devfile contains multiple containers with same TargetPort.*" invalidURIErr := ".*invalid URI for request" + imageCompTwoRemoteErr := "component .* should have one remote only" + imageCompNoRemoteErr := "component .* should have at least one remote" + imageCompInvalidRemoteErr := "unable to find the checkout remote .* in the remotes for component .*" pluginOverridesFromMainDevfile := attributes.Attributes{}.PutString(ImportSourceAttribute, "uri: http://127.0.0.1:8080").PutString(PluginOverrideAttribute, "main devfile") @@ -246,6 +335,39 @@ func TestValidateComponents(t *testing.T) { }, wantErr: []string{duplicateComponentErr, invalidURIErr, invalidURIErrWithImportAttributes}, }, + { + name: "Invalid image dockerfile component with more than one remote", + components: []v1alpha2.Component{ + generateDummyImageComponent("name1", twoRemotesGitSrc), + }, + wantErr: []string{imageCompTwoRemoteErr}, + }, + { + name: "Invalid image dockerfile component with zero remote", + components: []v1alpha2.Component{ + generateDummyImageComponent("name1", zeroRemoteGitSrc), + }, + wantErr: []string{imageCompNoRemoteErr}, + }, + { + name: "Invalid image dockerfile component with wrong checkout", + components: []v1alpha2.Component{ + generateDummyImageComponent("name1", invalidRemoteGitSrc), + }, + wantErr: []string{imageCompInvalidRemoteErr}, + }, + { + name: "Valid image dockerfile component with correct remote", + components: []v1alpha2.Component{ + generateDummyImageComponent("name1", validRemoteGitSrc), + }, + }, + { + name: "Valid image dockerfile component with non git src", + components: []v1alpha2.Component{ + generateDummyImageComponent("name1", validUriSrc), + }, + }, } for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/pkg/validation/projects.go b/pkg/validation/projects.go index 05a64ba70..1c383aa68 100644 --- a/pkg/validation/projects.go +++ b/pkg/validation/projects.go @@ -2,6 +2,7 @@ package validation import ( "fmt" + "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2" "github.com/hashicorp/go-multierror" ) @@ -18,21 +19,7 @@ func ValidateStarterProjects(starterProjects []v1alpha2.StarterProject) (returne continue } - switch len(gitSource.Remotes) { - case 0: - starterProjectErr := fmt.Errorf("starterProject %s should have at least one remote", starterProject.Name) - newErr := resolveErrorMessageWithImportAttributes(starterProjectErr, starterProject.Attributes) - returnedErr = multierror.Append(returnedErr, newErr) - case 1: - if gitSource.CheckoutFrom != nil && gitSource.CheckoutFrom.Remote != "" { - err := validateRemoteMap(gitSource.Remotes, gitSource.CheckoutFrom.Remote, starterProject.Name) - if err != nil { - newErr := resolveErrorMessageWithImportAttributes(err, starterProject.Attributes) - returnedErr = multierror.Append(returnedErr, newErr) - } - } - default: // len(gitSource.Remotes) >= 2 - starterProjectErr := fmt.Errorf("starterProject %s should have one remote only", starterProject.Name) + if starterProjectErr := validateSingleRemoteGitSrc("starterProject", starterProject.Name, gitSource); starterProjectErr != nil { newErr := resolveErrorMessageWithImportAttributes(starterProjectErr, starterProject.Attributes) returnedErr = multierror.Append(returnedErr, newErr) } @@ -59,7 +46,7 @@ func ValidateProjects(projects []v1alpha2.Project) (returnedErr error) { returnedErr = multierror.Append(returnedErr, newErr) case 1: if gitSource.CheckoutFrom != nil && gitSource.CheckoutFrom.Remote != "" { - if err := validateRemoteMap(gitSource.Remotes, gitSource.CheckoutFrom.Remote, project.Name); err != nil { + if err := validateRemoteMap(gitSource.Remotes, gitSource.CheckoutFrom.Remote, "project", project.Name); err != nil { newErr := resolveErrorMessageWithImportAttributes(err, project.Attributes) returnedErr = multierror.Append(returnedErr, newErr) } @@ -71,7 +58,7 @@ func ValidateProjects(projects []v1alpha2.Project) (returnedErr error) { returnedErr = multierror.Append(returnedErr, newErr) continue } - if err := validateRemoteMap(gitSource.Remotes, gitSource.CheckoutFrom.Remote, project.Name); err != nil { + if err := validateRemoteMap(gitSource.Remotes, gitSource.CheckoutFrom.Remote, "project", project.Name); err != nil { newErr := resolveErrorMessageWithImportAttributes(err, project.Attributes) returnedErr = multierror.Append(returnedErr, newErr) } @@ -82,11 +69,27 @@ func ValidateProjects(projects []v1alpha2.Project) (returnedErr error) { } // validateRemoteMap checks if the checkout remote is present in the project remote map -func validateRemoteMap(remotes map[string]string, checkoutRemote, projectName string) error { +func validateRemoteMap(remotes map[string]string, checkoutRemote, object, name string) error { if _, ok := remotes[checkoutRemote]; !ok { - return fmt.Errorf("unable to find the checkout remote %s in the remotes for project %s", checkoutRemote, projectName) + return fmt.Errorf("unable to find the checkout remote %s in the remotes for %s %s", checkoutRemote, object, name) } return nil } + +// validateSingleRemoteGitSrc validates a git src for a single remote only +func validateSingleRemoteGitSrc(object, name string, gitSource v1alpha2.GitLikeProjectSource) (err error) { + switch len(gitSource.Remotes) { + case 0: + err = fmt.Errorf("%s %s should have at least one remote", object, name) + case 1: + if gitSource.CheckoutFrom != nil && gitSource.CheckoutFrom.Remote != "" { + err = validateRemoteMap(gitSource.Remotes, gitSource.CheckoutFrom.Remote, object, name) + } + default: // len(gitSource.Remotes) >= 2 + err = fmt.Errorf("%s %s should have one remote only", object, name) + } + + return err +} diff --git a/pkg/validation/projects_test.go b/pkg/validation/projects_test.go index a076d7218..54cc8c1e5 100644 --- a/pkg/validation/projects_test.go +++ b/pkg/validation/projects_test.go @@ -43,12 +43,12 @@ func generateDummyGitProject(name string, checkoutRemote *v1alpha2.CheckoutFrom, func TestValidateStarterProjects(t *testing.T) { oneRemoteErr := "starterProject .* should have one remote only" - wrongCheckoutErr := "unable to find the checkout remote .* in the remotes for project.*" + wrongCheckoutErr := "unable to find the checkout remote .* in the remotes for starterProject.*" atleastOneRemoteErr := "starterProject .* should have at least one remote" parentOverridesFromMainDevfile := attributes.Attributes{}.PutString(ImportSourceAttribute, "uri: http://127.0.0.1:8080").PutString(ParentOverrideAttribute, "main devfile") - wrongCheckoutErrWithImportAttributes := "unable to find the checkout remote .* in the remotes for project.*, imported from uri: http://127.0.0.1:8080, in parent overrides from main devfile" + wrongCheckoutErrWithImportAttributes := "unable to find the checkout remote .* in the remotes for starterProject.*, imported from uri: http://127.0.0.1:8080, in parent overrides from main devfile" tests := []struct { name string diff --git a/pkg/validation/validation-rule.md b/pkg/validation/validation-rule.md index fd88efa69..ac9c0f991 100644 --- a/pkg/validation/validation-rule.md +++ b/pkg/validation/validation-rule.md @@ -41,6 +41,9 @@ Common rules for all components types: #### Kubernetes & Openshift component - URI needs to be in valid URI format +#### Image component +- A Dockerfile Image component's git source cannot have more than one remote defined. If checkout remote is mentioned, validate it against the remote configured map + ### Events: 1. preStart and postStop events can only be Apply commands @@ -60,7 +63,3 @@ Common rules for all components types: ### projects - if more than one remote is configured, a checkout remote is mandatory - if checkout remote is mentioned, validate it against the starter project remote configured map - -### Architectures - -Architectures list support the following values - `amd64`, `arm64`, `ppc64le`, `s390x`. These values are determined by the .manifests[].platform["architecture"] field from an image's manifests and manually selected. diff --git a/pkg/validation/variables/test-fixtures/components/image-dockerfile-git-output.yaml b/pkg/validation/variables/test-fixtures/components/image-dockerfile-git-output.yaml index 63f1c10be..da723ec5b 100644 --- a/pkg/validation/variables/test-fixtures/components/image-dockerfile-git-output.yaml +++ b/pkg/validation/variables/test-fixtures/components/image-dockerfile-git-output.yaml @@ -1,12 +1,11 @@ imageName: "myimage:xyz" dockerfile: git: - gitLocation: "uri/Dockerfile" + fileLocation: "uri/Dockerfile" checkoutFrom: revision: "FOO" remote: "BAR" remotes: - "foo": "BAR" - "FOOBAR": "BARFOO" + "BAR": "foo" buildContext: /FOO/BAR rootRequired: true diff --git a/pkg/validation/variables/test-fixtures/components/image-dockerfile-git.yaml b/pkg/validation/variables/test-fixtures/components/image-dockerfile-git.yaml index cc367dd25..f27712dee 100644 --- a/pkg/validation/variables/test-fixtures/components/image-dockerfile-git.yaml +++ b/pkg/validation/variables/test-fixtures/components/image-dockerfile-git.yaml @@ -1,12 +1,11 @@ imageName: "myimage:{{ tag }}" dockerfile: git: - gitLocation: "{{ uri }}/Dockerfile" + fileLocation: "{{ uri }}/Dockerfile" checkoutFrom: revision: "{{foo}}" remote: "{{bar}}" remotes: - "foo": "{{bar}}" - "{{foo}}{{bar}}": "{{ bar }}{{ foo }}" + "{{bar}}": "foo" buildContext: /{{foo}}/{{bar}} rootRequired: true diff --git a/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry-output.yaml b/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry-output.yaml index 1b901d5f4..826557933 100644 --- a/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry-output.yaml +++ b/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry-output.yaml @@ -1,7 +1,7 @@ imageName: "myimage:xyz" dockerfile: - registry: + devfileRegistry: id: "FOO/BAR" - devfileRegistryUrl: "http://uri" + registryUrl: "http://uri" buildContext: /FOO/BAR rootRequired: true diff --git a/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry.yaml b/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry.yaml index f959b5fbf..4c695245f 100644 --- a/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry.yaml +++ b/pkg/validation/variables/test-fixtures/components/image-dockerfile-registry.yaml @@ -1,7 +1,7 @@ imageName: "myimage:{{ tag }}" dockerfile: - registry: + devfileRegistry: id: "{{foo}}/{{bar}}" - devfileRegistryUrl: "http://{{ uri }}" + registryUrl: "http://{{ uri }}" buildContext: /{{foo}}/{{bar}} rootRequired: true diff --git a/pkg/validation/variables/variables_component.go b/pkg/validation/variables/variables_component.go index de0e15e52..0bd237ad5 100644 --- a/pkg/validation/variables/variables_component.go +++ b/pkg/validation/variables/variables_component.go @@ -235,7 +235,7 @@ func validateAndReplaceForDockerfileImageComponent(variables map[string]string, } case dockerfileImage.Git != nil: // Validate dockerfile Git location - if dockerfileImage.Git.GitLocation, err = validateAndReplaceDataWithVariable(dockerfileImage.Git.GitLocation, variables); err != nil { + if dockerfileImage.Git.FileLocation, err = validateAndReplaceDataWithVariable(dockerfileImage.Git.FileLocation, variables); err != nil { checkForInvalidError(invalidKeys, err) } @@ -243,12 +243,12 @@ func validateAndReplaceForDockerfileImageComponent(variables map[string]string, if err = validateAndReplaceForGitProjectSource(variables, gitProject); err != nil { checkForInvalidError(invalidKeys, err) } - case dockerfileImage.Registry != nil: + case dockerfileImage.DevfileRegistry != nil: // Validate dockerfile devfile registry src - if dockerfileImage.Registry.Id, err = validateAndReplaceDataWithVariable(dockerfileImage.Registry.Id, variables); err != nil { + if dockerfileImage.DevfileRegistry.Id, err = validateAndReplaceDataWithVariable(dockerfileImage.DevfileRegistry.Id, variables); err != nil { checkForInvalidError(invalidKeys, err) } - if dockerfileImage.Registry.DevfileRegistryUrl, err = validateAndReplaceDataWithVariable(dockerfileImage.Registry.DevfileRegistryUrl, variables); err != nil { + if dockerfileImage.DevfileRegistry.RegistryUrl, err = validateAndReplaceDataWithVariable(dockerfileImage.DevfileRegistry.RegistryUrl, variables); err != nil { checkForInvalidError(invalidKeys, err) } } diff --git a/samples/devfiles/outerloop-dockerfile-build-inlined-deploy-devfile.yaml b/samples/devfiles/outerloop-dockerfile-build-inlined-deploy-devfile.yaml index 4bad4039d..0d3fda102 100644 --- a/samples/devfiles/outerloop-dockerfile-build-inlined-deploy-devfile.yaml +++ b/samples/devfiles/outerloop-dockerfile-build-inlined-deploy-devfile.yaml @@ -90,9 +90,16 @@ commands: group: kind: test isDefault: true + - id: build-image + apply: + component: outerloop-build - id: deployk8s apply: component: outerloop-deploy + - id: deploy + composite: + commands: + - build-image + - deployk8s group: kind: deploy - isDefault: true diff --git a/samples/devfiles/outerloop-dockerfile-build-uri-deploy-devfile.yaml b/samples/devfiles/outerloop-dockerfile-build-uri-deploy-devfile.yaml index 8926d58a3..31602f75c 100644 --- a/samples/devfiles/outerloop-dockerfile-build-uri-deploy-devfile.yaml +++ b/samples/devfiles/outerloop-dockerfile-build-uri-deploy-devfile.yaml @@ -61,9 +61,16 @@ commands: group: kind: test isDefault: true + - id: build-image + apply: + component: outerloop-build - id: deployk8s apply: component: outerloop-deploy + - id: deploy + composite: + commands: + - build-image + - deployk8s group: kind: deploy - isDefault: true diff --git a/schemas/latest/dev-workspace-template-spec.json b/schemas/latest/dev-workspace-template-spec.json index 903118f0d..0c5d7ef5f 100644 --- a/schemas/latest/dev-workspace-template-spec.json +++ b/schemas/latest/dev-workspace-template-spec.json @@ -518,7 +518,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -539,6 +539,24 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -561,12 +579,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -575,24 +593,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1204,7 +1204,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1225,6 +1225,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1244,12 +1259,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1258,21 +1273,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1992,7 +1992,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2013,6 +2013,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2032,12 +2047,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -2046,21 +2061,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -2666,7 +2666,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2687,6 +2687,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2706,12 +2721,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -2720,21 +2735,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -3057,7 +3057,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3141,7 +3141,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3265,7 +3265,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3371,7 +3371,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" diff --git a/schemas/latest/dev-workspace-template.json b/schemas/latest/dev-workspace-template.json index 7a7f90215..dab315317 100644 --- a/schemas/latest/dev-workspace-template.json +++ b/schemas/latest/dev-workspace-template.json @@ -684,7 +684,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -705,6 +705,24 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -727,12 +745,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -741,24 +759,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1370,7 +1370,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1391,6 +1391,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1410,12 +1425,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1424,21 +1439,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -2158,7 +2158,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2179,6 +2179,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2198,12 +2213,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -2212,21 +2227,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -2832,7 +2832,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2853,6 +2853,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2872,12 +2887,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -2886,21 +2901,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -3223,7 +3223,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3307,7 +3307,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3431,7 +3431,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3537,7 +3537,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" diff --git a/schemas/latest/dev-workspace.json b/schemas/latest/dev-workspace.json index 46535aff8..c9a8b1b60 100644 --- a/schemas/latest/dev-workspace.json +++ b/schemas/latest/dev-workspace.json @@ -697,7 +697,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -718,6 +718,24 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -740,12 +758,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -754,24 +772,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1383,7 +1383,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1404,6 +1404,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1423,12 +1438,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1437,21 +1452,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -2171,7 +2171,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2192,6 +2192,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2211,12 +2226,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -2225,21 +2240,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -2845,7 +2845,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2866,6 +2866,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2885,12 +2900,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -2899,21 +2914,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -3236,7 +3236,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3320,7 +3320,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3444,7 +3444,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -3550,7 +3550,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" diff --git a/schemas/latest/devfile.json b/schemas/latest/devfile.json index 0cc9632e9..585a16fab 100644 --- a/schemas/latest/devfile.json +++ b/schemas/latest/devfile.json @@ -437,7 +437,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -458,6 +458,24 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -480,12 +498,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -494,24 +512,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1261,7 +1261,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1282,6 +1282,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1301,12 +1316,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1315,21 +1330,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1605,7 +1605,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1689,7 +1689,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1790,7 +1790,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1878,7 +1878,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" diff --git a/schemas/latest/ide-targeted/dev-workspace-template-spec.json b/schemas/latest/ide-targeted/dev-workspace-template-spec.json index 6c7720577..7efab824e 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template-spec.json +++ b/schemas/latest/ide-targeted/dev-workspace-template-spec.json @@ -569,7 +569,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -592,6 +592,27 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -617,44 +638,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1327,7 +1327,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1350,6 +1350,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1372,41 +1390,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -2210,7 +2210,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2233,6 +2233,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2255,41 +2273,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -2960,7 +2960,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2983,6 +2983,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -3005,41 +3023,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -3404,12 +3404,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3500,12 +3500,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3640,12 +3640,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3758,12 +3758,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, diff --git a/schemas/latest/ide-targeted/dev-workspace-template.json b/schemas/latest/ide-targeted/dev-workspace-template.json index b6f5c21cb..bc320a5bf 100644 --- a/schemas/latest/ide-targeted/dev-workspace-template.json +++ b/schemas/latest/ide-targeted/dev-workspace-template.json @@ -768,7 +768,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -791,6 +791,27 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -816,44 +837,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1526,7 +1526,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1549,6 +1549,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1571,41 +1589,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -2409,7 +2409,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2432,6 +2432,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2454,41 +2472,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -3159,7 +3159,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -3182,6 +3182,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -3204,41 +3222,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -3603,12 +3603,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3699,12 +3699,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3839,12 +3839,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3957,12 +3957,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, diff --git a/schemas/latest/ide-targeted/dev-workspace.json b/schemas/latest/ide-targeted/dev-workspace.json index a3f3995e9..5d5fc8bf8 100644 --- a/schemas/latest/ide-targeted/dev-workspace.json +++ b/schemas/latest/ide-targeted/dev-workspace.json @@ -781,7 +781,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -804,6 +804,27 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -829,44 +850,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1539,7 +1539,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1562,6 +1562,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1584,41 +1602,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -2422,7 +2422,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -2445,6 +2445,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -2467,41 +2485,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -3172,7 +3172,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -3195,6 +3195,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -3217,41 +3235,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -3616,12 +3616,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3712,12 +3712,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3852,12 +3852,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -3970,12 +3970,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, diff --git a/schemas/latest/ide-targeted/devfile.json b/schemas/latest/ide-targeted/devfile.json index a5254183d..1d6011c44 100644 --- a/schemas/latest/ide-targeted/devfile.json +++ b/schemas/latest/ide-targeted/devfile.json @@ -478,7 +478,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -501,6 +501,27 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "required": [ + "id" + ], + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -526,44 +547,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "required": [ - "id" - ], - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1400,7 +1400,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1423,6 +1423,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1445,41 +1463,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1788,12 +1788,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -1884,12 +1884,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -2000,12 +2000,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -2100,12 +2100,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, diff --git a/schemas/latest/ide-targeted/parent-overrides.json b/schemas/latest/ide-targeted/parent-overrides.json index fc2792bd1..8a238b797 100644 --- a/schemas/latest/ide-targeted/parent-overrides.json +++ b/schemas/latest/ide-targeted/parent-overrides.json @@ -455,7 +455,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -478,6 +478,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -500,41 +518,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1205,7 +1205,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1228,6 +1228,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1250,41 +1268,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", @@ -1627,12 +1627,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, @@ -1718,12 +1718,12 @@ "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured." + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, diff --git a/schemas/latest/ide-targeted/plugin-overrides.json b/schemas/latest/ide-targeted/plugin-overrides.json index 61aa9d438..6cd389dce 100644 --- a/schemas/latest/ide-targeted/plugin-overrides.json +++ b/schemas/latest/ide-targeted/plugin-overrides.json @@ -444,7 +444,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -467,6 +467,24 @@ "type": "string", "markdownDescription": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string", + "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string", + "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." + } + }, + "additionalProperties": false, + "markdownDescription": "Dockerfile's Devfile Registry source" + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -489,41 +507,23 @@ "additionalProperties": false, "markdownDescription": "Defines from what the project should be checked out. Required if there are more than one remote configured" }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string", - "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src." + "markdownDescription": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile." }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" }, - "markdownDescription": "The remotes map which should be initialized in the git project. Must have at least one remote configured" + "markdownDescription": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured." } }, "additionalProperties": false, "markdownDescription": "Dockerfile's Git source" }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string", - "markdownDescription": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used." - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string", - "markdownDescription": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image." - } - }, - "additionalProperties": false, - "markdownDescription": "Dockerfile's Devfile Registry source" - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean", diff --git a/schemas/latest/parent-overrides.json b/schemas/latest/parent-overrides.json index 514e5f000..f005314f6 100644 --- a/schemas/latest/parent-overrides.json +++ b/schemas/latest/parent-overrides.json @@ -410,7 +410,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -431,6 +431,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -450,12 +465,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -464,21 +479,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1084,7 +1084,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -1105,6 +1105,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -1124,12 +1139,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1138,21 +1153,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean" @@ -1455,7 +1455,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -1535,7 +1535,7 @@ "additionalProperties": false }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects can only have at most one remote configured.", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" diff --git a/schemas/latest/plugin-overrides.json b/schemas/latest/plugin-overrides.json index 273012896..f3e07779f 100644 --- a/schemas/latest/plugin-overrides.json +++ b/schemas/latest/plugin-overrides.json @@ -400,7 +400,7 @@ }, { "required": [ - "registry" + "devfileRegistry" ] }, { @@ -421,6 +421,21 @@ "description": "Path of source directory to establish build context. Defaults to ${PROJECT_ROOT} in the container", "type": "string" }, + "devfileRegistry": { + "description": "Dockerfile's Devfile Registry source", + "type": "object", + "properties": { + "id": { + "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", + "type": "string" + }, + "registryUrl": { + "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", + "type": "string" + } + }, + "additionalProperties": false + }, "git": { "description": "Dockerfile's Git source", "type": "object", @@ -440,12 +455,12 @@ }, "additionalProperties": false }, - "gitLocation": { - "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src.", + "fileLocation": { + "description": "Location of the Dockerfile in the Git repository when using git as Dockerfile src. Defaults to Dockerfile.", "type": "string" }, "remotes": { - "description": "The remotes map which should be initialized in the git project. Must have at least one remote configured", + "description": "The remotes map which should be initialized in the git project. Projects must have at least one remote configured while StarterProjects \u0026 Image Component's Git source can only have at most one remote configured.", "type": "object", "additionalProperties": { "type": "string" @@ -454,21 +469,6 @@ }, "additionalProperties": false }, - "registry": { - "description": "Dockerfile's Devfile Registry source", - "type": "object", - "properties": { - "devfileRegistryUrl": { - "description": "Devfile Registry URL to pull the Dockerfile from when using the Devfile Registry as Dockerfile src. To ensure the Dockerfile gets resolved consistently in different environments, it is recommended to always specify the `devfileRegistryUrl` when `Id` is used.", - "type": "string" - }, - "id": { - "description": "Id in a devfile registry that contains a Dockerfile. The src in the OCI registry required for the Dockerfile build will be downloaded for building the image.", - "type": "string" - } - }, - "additionalProperties": false - }, "rootRequired": { "description": "Specify if a privileged builder pod is required.\n\nDefault value is `false`", "type": "boolean"