No description
Find a file
Tomas Hozza fd82174469 worker/osbuild: consolidate Koji target options values meaning
When the Koji target support was added to the osbuild job, based on the
osbuild-koji job, the meaning of target option values got messed up.

The side effect of the issue is that when Koji composes are
submitted via Cloud API the resulting image is currently always uploaded
back to the worker server.

`OsBuildKoji` job
-----------------
- `OSBuildKojiJob.ImageName` is set to the filename of the image as
  exported by osbuild.
- `OSBuildKojiJob.KojiFilename` is set to the desired filename which
  should be used when uploading the image to Koji.

`OsBuild` job + `KojiTargetOptions` before
------------------------------------------
- `OSBuildJob.ImageName` is set to the filename of the image as exported
  by osbuild. This is done only by the Cloud API code for Koji composes.
  Cloud API does not set this for regular composes and any other target.
  The variable is set in common case only by Weldr API code with the
  same meaning and it is used by the `OsBuild` job implementation as an
  indication that the image should be uploaded back to the worker server.
- `Target.ImageName` is not set at all. Other targets use it for the
  desired filename which should be used when uploading the image to the
  target environment.
- `KojiTargetOptions.Filename` is set to the desired filename which
  should be used when uploading the image to Koji. All other target
  types use `Filename` variable in their options for the filename of the
  image as exported by osbuild.

`OsBuild` job + `KojiTargetOptions` after
-----------------------------------------
- `OSBuildJob.ImageName` is still set to the filename of the image as
  exported by osbuild. This is kept for a backward compatibility of new
  composer with older workers.
- `Target.ImageName` is set to the desired filename which should be used
  when uploading the image to Koji.
- `KojiTargetOptions.Filename` is set to the filename of the image as
  exported by osbuild.

This change is backward incompatible, meaning that old worker won't be
able to handle Koji compose requests submitted via Cloud API using a new
composer and also a new worker won't be able to handle Koji compose
requests submitted by a new composer. This is intentional, because after
discussion with Ondrej Budai, the Cloud API Koji integration is
currently not used anywhere in production.
2022-06-17 17:37:15 +02:00
.devcontainer Devcontainer update to Fedora 36. 2022-05-04 10:44:21 +02:00
.github Adjust release schedule timer 2022-06-14 11:21:52 +02:00
cmd worker/osbuild: consolidate Koji target options values meaning 2022-06-17 17:37:15 +02:00
containers entrypoint - add parameters for socket bind address and port 2022-05-04 09:13:40 +02:00
distribution spec: remove dnf-json service and socket 2022-06-01 11:36:52 +01:00
docs Doc: remove unused doc/news directory 2021-11-24 14:55:47 +01:00
image-types image-types: Add research document for GCE image type 2022-04-14 19:07:31 +01:00
internal worker/osbuild: consolidate Koji target options values meaning 2022-06-17 17:37:15 +02:00
repositories distro: add an alias for rhel-91 2022-05-03 18:13:28 +02:00
schutzbot remove cloud-cleaner in favour of scheduled cloud cleaner 2022-06-14 10:41:18 +02:00
templates packer: pin the vector version 2022-06-07 09:08:22 +02:00
test test: add new regression test for insecure downlods 2022-06-15 20:13:47 +02:00
tools genall: move to cmd/ and rename to gen-manifests 2022-06-01 11:36:52 +01:00
vendor azure: add an option to tag page blobs 2022-06-13 21:06:01 +02:00
.env docker-compose: integrate dev container 2022-02-27 20:55:03 +00:00
.gitignore tools: AppSRE packer build 2022-01-05 22:13:55 +01:00
.gitlab-ci.yml CI: run the new regression test (insecure-repo) 2022-06-15 20:13:47 +02:00
.gitleaks.toml gitleaks: add allow list for test passwords and keys 2021-10-01 16:56:26 +02:00
.golangci.yml golangci: enable gosec in golangci 2021-12-13 12:17:30 +02:00
.packit.yaml packit: Enable Koji build integration 2022-05-10 13:29:32 +02:00
.pylintrc github/workflows: check dnf-json with pylint 2022-03-08 12:42:12 +01:00
codecov.yml codevoc: fix threshold 2020-05-17 10:12:06 +02:00
CONTRIBUTING.md Improve contributing.md 2021-11-23 08:25:07 +01:00
DEPLOYING.md Add DEPLOYING.md 2020-10-20 15:43:30 +02:00
dnf-json dnfjson: drop repo checksums 2022-06-01 11:36:52 +01:00
docker-compose.yml docker-compose: integrate dev container 2022-02-27 20:55:03 +00:00
go.mod azure: add an option to tag page blobs 2022-06-13 21:06:01 +02:00
go.sum azure: add an option to tag page blobs 2022-06-13 21:06:01 +02:00
HACKING.md docker-compose: integrate dev container 2022-02-27 20:55:03 +00:00
krb5.conf upload/koji: add support for GSSAPI/Kerberos auth 2020-08-27 17:29:57 +01:00
LICENSE Revert "Fill in the license template" 2019-11-15 15:26:51 +01:00
Makefile OSBuild - add support for generic S3 services 2022-04-07 15:01:01 +02:00
osbuild-composer.spec Post release version bump 2022-06-15 08:29:51 +00:00
README.md Add build requirement in README.md 2022-01-28 15:16:47 +01:00
Schutzfile Schutzfile: pin osbuild version for insecure curl option 2022-06-15 20:13:47 +02:00

OSBuild Composer

Operating System Image Composition Services

The composer project is a set of HTTP services for composing operating system images. It builds on the pipeline execution engine of osbuild and defines its own class of images that it supports building.

Multiple APIs are available to access a composer service. This includes support for the lorax-composer API, and as such can serve as drop-in replacement for lorax-composer.

You can control a composer instance either directly via the provided APIs, or through higher-level user-interfaces from external projects. This, for instance, includes a Cockpit Module or using the composer-cli command-line tool.

Project

Contributing

Please refer to the developer guide to learn about our workflow, code style and more.

About

Composer is a middleman between the workhorses from osbuild and the user-interfaces like cockpit-composer, composer-cli, or others. It defines a set of high-level image compositions that it supports building. Builds of these compositions can be requested via the different APIs of Composer, which will then translate the requests into pipeline-descriptions for osbuild. The pipeline output is then either provided back to the user, or uploaded to a user specified target.

The following image visualizes the overall architecture of the OSBuild infrastructure and the place that Composer takes:

overview

Consult the osbuild-composer(7) man-page for an introduction into composer, information on running your own composer instance, as well as details on the provided infrastructure and services.

Requirements

The requirements for this project are:

  • osbuild >= 26
  • systemd >= 244

At build-time, the following software is required:

  • go >= 1.16
  • python-docutils >= 0.13
  • krb5-devel for fedora/rhel or libkrb5-dev for debian/ubuntu`

Build

The standard go package system is used. Consult upstream documentation for detailed help. In most situations the following commands are sufficient to build and install from source:

mkdir build
go build -o build ./...

The man-pages require python-docutils and can be built via:

make man

Repository:

Pull request gating

Each pull request against osbuild-composer starts a series of automated tests. Tests run via GitHub Actions and Jenkins. Each push to the pull request will launch theses tests automatically.

Jenkins only tests pull requests from members of the osbuild organization in GitHub. A member of the osbuild organization must say ok to test in a pull request comment to approve testing. Anyone can ask for testing to run by saying the bot's favorite word, schutzbot, in a pull request comment. Testing will begin shortly after the comment is posted.

Test results in Jenkins are available by clicking the Details link on the right side of the Schutzbot check in the pull request page.

License:

  • Apache-2.0
  • See LICENSE file for details.