From 287ae4645cf60c5c4f52bdbc4c6cf6cb7b3564da Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Wed, 7 Jan 2026 13:23:10 +0200 Subject: [PATCH 1/7] clean caib API Signed-off-by: Benny Zlotnik --- .claude/skills/test-bootc-build/SKILL.md | 49 +- api/v1alpha1/imagebuild_types.go | 4 + bundle.Dockerfile | 4 - ...ve-dev-operator.clusterserviceversion.yaml | 40 +- ...ve.sdv.cloud.redhat.com_catalogimages.yaml | 25 +- ...tive.sdv.cloud.redhat.com_imagebuilds.yaml | 5 + bundle/metadata/annotations.yaml | 4 - cmd/caib/main.go | 644 ++++++++---------- ...tive.sdv.cloud.redhat.com_imagebuilds.yaml | 5 + config/manager/kustomization.yaml | 4 +- internal/buildapi/server.go | 15 +- internal/buildapi/types.go | 7 +- .../common/tasks/scripts/build_builder.sh | 6 +- internal/common/tasks/scripts/build_image.sh | 29 +- internal/common/tasks/tasks.go | 49 ++ internal/controller/imagebuild/controller.go | 13 +- 16 files changed, 467 insertions(+), 436 deletions(-) diff --git a/.claude/skills/test-bootc-build/SKILL.md b/.claude/skills/test-bootc-build/SKILL.md index 35121abf..086bb5a6 100644 --- a/.claude/skills/test-bootc-build/SKILL.md +++ b/.claude/skills/test-bootc-build/SKILL.md @@ -58,23 +58,27 @@ REGISTRY_PASSWORD="${REGISTRY_PASSWORD:-$(cat registry-pass 2>/dev/null)}" ### 5. Submit Build with Download +The `build` command creates a bootc container image and optionally a disk image. + ```bash BUILD_NAME="$ARGUMENTS" PUSH_IMAGE="${BOOTC_REGISTRY}:latest" DISK_IMAGE="${BOOTC_REGISTRY}:latest-disk" OUTPUT_FILE="./output/${BUILD_NAME}.qcow2" -bin/caib build-bootc simple.aib.yml \ +bin/caib build simple.aib.yml \ --server "$CAIB_SERVER" \ --token "$TOKEN" \ --name "$BUILD_NAME" \ --arch arm64 \ --target qemu \ --push "$PUSH_IMAGE" \ - --build-disk-image \ + --disk \ --format qcow2 \ - --export-oci "$DISK_IMAGE" \ - --download "$OUTPUT_FILE" \ + --push-disk "$DISK_IMAGE" \ + --output "$OUTPUT_FILE" \ + --registry-username "$REGISTRY_USERNAME" \ + --registry-password "$REGISTRY_PASSWORD" \ --follow ``` @@ -121,6 +125,42 @@ Provide a summary with: - If failed: the specific error and relevant log snippets - Suggestions for fixes based on the error type +## CLI Command Reference + +### build (bootc - default) +Creates a bootc container image from an AIB manifest. + +```bash +caib build \ + --push # Required: push container to registry + --disk # Also build disk image from container + --format # Disk image format (default: qcow2) + --push-disk # Push disk as OCI artifact + --output # Download disk image to file + --follow # Follow build logs + --wait # Wait for build to complete +``` + +### disk +Creates a disk image from an existing bootc container. + +```bash +caib disk \ + --push # Push disk as OCI artifact + --output # Download disk image to file + --format # Disk format (default: qcow2) +``` + +### build-legacy +Traditional ostree/package-based builds (for backwards compatibility). + +```bash +caib build-legacy \ + --mode # Required: build mode + --format # Required: export format + --name # Required: build name +``` + ## Common Error Patterns - "Builder image not found" - prepare-builder task failed or result not passed @@ -128,6 +168,7 @@ Provide a summary with: - "setfiles: Operation not supported" - SELinux context issues in osbuild - "unauthorized" - Token or registry auth issues - "BOOTC_REGISTRY not set" - Environment variable missing +- "container-ref is required for disk mode" - Missing container reference for disk command ## Alternative: Download Only (for completed builds) diff --git a/api/v1alpha1/imagebuild_types.go b/api/v1alpha1/imagebuild_types.go index a3956af2..0eb1ac67 100644 --- a/api/v1alpha1/imagebuild_types.go +++ b/api/v1alpha1/imagebuild_types.go @@ -89,6 +89,10 @@ type ImageBuildSpec struct { // BuilderImage is a custom builder image to use BuilderImage string `json:"builderImage,omitempty"` + + // ContainerRef is the reference to an existing bootc container image + // Used with mode=disk to create a disk image from an existing container + ContainerRef string `json:"containerRef,omitempty"` } // Publishers defines the configuration for artifact publishing diff --git a/bundle.Dockerfile b/bundle.Dockerfile index cc49f856..df67655c 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -6,7 +6,6 @@ LABEL operators.operatorframework.io.bundle.manifests.v1=manifests/ LABEL operators.operatorframework.io.bundle.metadata.v1=metadata/ LABEL operators.operatorframework.io.bundle.package.v1=automotive-dev-operator LABEL operators.operatorframework.io.bundle.channels.v1=alpha -LABEL operators.operatorframework.io.bundle.channel.default.v1=alpha LABEL operators.operatorframework.io.metrics.builder=operator-sdk-v1.42.0 LABEL operators.operatorframework.io.metrics.mediatype.v1=metrics+v1 LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 @@ -15,9 +14,6 @@ LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v4 LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ -# OpenShift labels -LABEL com.redhat.openshift.versions="v4.17" - # Copy files to locations specified by labels. COPY bundle/manifests /manifests/ COPY bundle/metadata /metadata/ diff --git a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml index 7f6e915f..e5819a8a 100644 --- a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml +++ b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml @@ -53,12 +53,10 @@ metadata: capabilities: Basic Install categories: Developer Tools containerImage: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - createdAt: "2026-01-04T16:02:41Z" + createdAt: "2026-01-07T10:28:46Z" operatorframework.io/suggested-namespace: automotive-dev-operator-system operators.operatorframework.io/builder: operator-sdk-v1.42.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 - operators.openshift.io/infrastructure-features: '["disconnected"]' - operators.openshift.io/valid-subscription: '["OpenShift Container Platform"]' repository: https://github.com/centos-automotive-suite/automotive-dev-operator support: Red Hat name: automotive-dev-operator.v0.0.1 @@ -67,6 +65,9 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: + - kind: CatalogImage + name: catalogimages.automotive.sdv.cloud.redhat.com + version: v1alpha1 - description: ImageBuild is the Schema for the imagebuilds API displayName: Image Build kind: ImageBuild @@ -82,29 +83,7 @@ spec: kind: OperatorConfig name: operatorconfigs.automotive.sdv.cloud.redhat.com version: v1alpha1 - description: | - The CentOS Automotive Suite Operator provides a Kubernetes-native way to build automotive OS images on OpenShift. - - ## Features - - * **ImageBuild Custom Resource**: Define and trigger automotive OS image builds declaratively - * **Multiple Build Modes**: Support for traditional AIB manifests and bootc container builds - * **Web UI**: Optional web interface for managing builds and viewing artifacts - * **Artifact Management**: Serve built images via Routes or push to OCI registries - - ## Prerequisites - - * OpenShift Pipelines Operator (Tekton) must be installed - - ## Getting Started - - 1. Install the operator from OperatorHub - 2. Create an OperatorConfig resource to configure the operator - 3. Create an ImageBuild resource to trigger a build - - ## Documentation - - For detailed documentation, visit the [project repository](https://github.com/centos-automotive-suite/automotive-dev-operator). + description: CentOS Automotive Suite displayName: CentOS Automotive Suite icon: - base64data: "" @@ -318,8 +297,8 @@ spec: fieldRef: fieldPath: metadata.namespace - name: OPERATOR_IMAGE - value: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - image: quay.io/rh-sdv-cloud/automotive-dev-operator:latest + value: image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest + image: default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -357,7 +336,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: quay.io/rh-sdv-cloud/automotive-dev-operator:latest + image: default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest imagePullPolicy: IfNotPresent name: init-oauth-secrets resources: @@ -429,7 +408,4 @@ spec: minKubeVersion: 1.26.0 provider: name: Red Hat - relatedImages: - - image: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - name: manager version: 0.0.1 diff --git a/bundle/manifests/automotive.sdv.cloud.redhat.com_catalogimages.yaml b/bundle/manifests/automotive.sdv.cloud.redhat.com_catalogimages.yaml index 30f7147e..e3d04710 100644 --- a/bundle/manifests/automotive.sdv.cloud.redhat.com_catalogimages.yaml +++ b/bundle/manifests/automotive.sdv.cloud.redhat.com_catalogimages.yaml @@ -79,12 +79,9 @@ spec: description: Metadata contains automotive-specific image metadata properties: architecture: - description: Architecture is the CPU architecture (amd64, arm64) - enum: - - amd64 - - arm64 - - x86_64 - - aarch64 + description: |- + Architecture is the CPU architecture + Supports both AIB canonical values (x86_64, aarch64) and OCI standard names (amd64, arm64) type: string bootc: description: Bootc indicates if this is a bootc-compatible image @@ -98,11 +95,19 @@ spec: - package type: string distro: - description: Distro is the distribution identifier (cs9, autosd10-sig) + description: |- + Distro is the distribution identifier + Common values include: cs9, autosd10-sig, autosd9, cs8, fedora-39, fedora-40, rhel9, rhel8 + Run 'aib list-dist' to see all available distributions type: string distroVersion: description: DistroVersion is the distribution version type: string + exportFormat: + description: |- + ExportFormat indicates the disk image format produced by AIB + Common values include: qcow2, raw, image, vmdk, iso, vhd, tar + type: string os: default: linux description: OS is the operating system (defaults to linux) @@ -114,8 +119,10 @@ spec: image supports properties: name: - description: Name is the target hardware identifier (qemu, - raspberry-pi, beaglebone) + description: |- + Name is the target hardware identifier + Common values include: qemu, raspberry-pi, beaglebone, generic + Run 'aib list-targets' to see all available hardware targets type: string notes: description: Notes contains target-specific information diff --git a/bundle/manifests/automotive.sdv.cloud.redhat.com_imagebuilds.yaml b/bundle/manifests/automotive.sdv.cloud.redhat.com_imagebuilds.yaml index 76656eff..e530fbd7 100644 --- a/bundle/manifests/automotive.sdv.cloud.redhat.com_imagebuilds.yaml +++ b/bundle/manifests/automotive.sdv.cloud.redhat.com_imagebuilds.yaml @@ -65,6 +65,11 @@ spec: description: ContainerPush is the registry URL to push the bootc container image type: string + containerRef: + description: |- + ContainerRef is the reference to an existing bootc container image + Used with mode=disk to create a disk image from an existing container + type: string distro: description: Distro specifies the distribution to build for (e.g., "cs9") diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 3174e01b..710e3f41 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -5,7 +5,6 @@ annotations: operators.operatorframework.io.bundle.metadata.v1: metadata/ operators.operatorframework.io.bundle.package.v1: automotive-dev-operator operators.operatorframework.io.bundle.channels.v1: alpha - operators.operatorframework.io.bundle.channel.default.v1: alpha operators.operatorframework.io.metrics.builder: operator-sdk-v1.42.0 operators.operatorframework.io.metrics.mediatype.v1: metrics+v1 operators.operatorframework.io.metrics.project_layout: go.kubebuilder.io/v4 @@ -13,6 +12,3 @@ annotations: # Annotations for testing. operators.operatorframework.io.test.mediatype.v1: scorecard+v1 operators.operatorframework.io.test.config.v1: tests/scorecard/ - - # OpenShift annotations - com.redhat.openshift.versions: "v4.17" diff --git a/cmd/caib/main.go b/cmd/caib/main.go index edbc87bb..99fff51f 100644 --- a/cmd/caib/main.go +++ b/cmd/caib/main.go @@ -12,6 +12,7 @@ import ( "os" "os/exec" "path/filepath" + "runtime" "strings" "time" @@ -30,6 +31,18 @@ import ( "k8s.io/client-go/tools/clientcmd" ) +// getDefaultArch returns the current system architecture in caib format +func getDefaultArch() string { + switch runtime.GOARCH { + case "amd64": + return "amd64" + case "arm64": + return "arm64" + default: + return "amd64" + } +} + var ( serverURL string imageBuildCfg string @@ -50,7 +63,6 @@ var ( followLogs bool version string aibExtraArgs string - aibOverrideArgs string compressArtifacts bool compressionAlgo string authToken string @@ -66,6 +78,7 @@ var ( builderImage string downloadFile string + containerRef string ) func main() { @@ -78,27 +91,79 @@ func main() { rootCmd.InitDefaultVersionFlag() rootCmd.SetVersionTemplate("caib version: {{.Version}}\n") - // New subcommands - buildBootcCmd := &cobra.Command{ - Use: "build-bootc ", + // Main build command (bootc - the default, future-focused approach) + buildCmd := &cobra.Command{ + Use: "build ", Short: "Build bootc container image with optional disk image", - Args: cobra.ExactArgs(1), - Run: runBuildBootc, + Long: `Build creates a bootc container image from an AIB manifest. + +Bootc images are immutable, atomically updatable OS images based on +container technology. This is the recommended approach for production. + +Examples: + # Build and push container to registry + caib build manifest.aib.yml --push quay.io/org/my-os:v1 + + # Build container + create disk image + caib build manifest.aib.yml --push quay.io/org/my-os:v1 --disk -o disk.qcow2`, + Args: cobra.ExactArgs(1), + Run: runBuild, + } + + // Disk command - create disk from existing container + diskCmd := &cobra.Command{ + Use: "disk ", + Short: "Create disk image from existing bootc container", + Long: `Create a disk image from an existing bootc container in a registry. + +This uses 'aib to-disk-image' to convert a bootc container to a disk +image that can be flashed onto hardware. + +Examples: + # Create disk image from container + caib disk quay.io/org/my-os:v1 -o disk.qcow2 --format qcow2 + + # Push disk as OCI artifact instead of downloading + caib disk quay.io/org/my-os:v1 --push quay.io/org/my-disk:v1`, + Args: cobra.ExactArgs(1), + Run: runDisk, } - buildTraditionalCmd := &cobra.Command{ - Use: "build-traditional ", + // Legacy build command (traditional ostree/package-based) + buildLegacyCmd := &cobra.Command{ + Use: "build-legacy ", Short: "Build traditional disk image (ostree or package-based)", - Args: cobra.ExactArgs(1), - Run: runBuildTraditional, + Long: `Build a traditional disk image using ostree or package-based mode. + +This is for legacy workflows. For new projects, use 'caib build' (bootc). + +Examples: + # Ostree-based image + caib build-legacy manifest.aib.yml --mode image --format qcow2 -o disk.qcow2 + + # Package-based image + caib build-legacy manifest.aib.yml --mode package --format raw -o disk.raw`, + Args: cobra.ExactArgs(1), + Run: runBuildLegacy, } - // Legacy build command (deprecated) - buildCmd := &cobra.Command{ - Use: "build", - Short: "Create an ImageBuild resource (deprecated, use build-bootc or build-traditional)", + // Deprecated aliases (hidden but functional for backwards compatibility) + buildBootcAliasCmd := &cobra.Command{ + Use: "build-bootc ", + Short: "Build bootc container image (deprecated: use 'build' instead)", + Args: cobra.ExactArgs(1), Run: runBuild, - Deprecated: "use 'build-bootc' or 'build-traditional' instead", + Deprecated: "use 'build' instead (bootc is now the default)", + Hidden: true, + } + + buildTraditionalAliasCmd := &cobra.Command{ + Use: "build-traditional ", + Short: "Build traditional disk image (deprecated: use 'build-legacy' instead)", + Args: cobra.ExactArgs(1), + Run: runBuildLegacy, + Deprecated: "use 'build-legacy' instead", + Hidden: true, } downloadCmd := &cobra.Command{ @@ -113,32 +178,29 @@ func main() { Run: runList, } - buildCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL (e.g. https://api.example)") - buildCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication (e.g., OpenShift access token)") - buildCmd.Flags().StringVar(&imageBuildCfg, "config", "", "path to ImageBuild YAML configuration file") - buildCmd.Flags().StringVar(&manifest, "manifest", "", "path to manifest YAML file for the build") - buildCmd.Flags().StringVar(&buildName, "name", "", "name for the ImageBuild") - buildCmd.Flags().StringVar(&distro, "distro", "autosd", "distribution to build") - buildCmd.Flags().StringVar(&target, "target", "qemu", "target platform (qemu, etc)") - buildCmd.Flags().StringVar(&architecture, "arch", "arm64", "architecture (amd64, arm64)") - buildCmd.Flags().StringVar(&exportFormat, "format", "qcow2", "disk image format (qcow2, raw, etc)") - buildCmd.Flags().StringVar(&mode, "mode", "bootc", "build mode (bootc, image, package)") - buildCmd.Flags().StringVar(&automotiveImageBuilder, "automotive-image-builder", "quay.io/centos-sig-automotive/automotive-image-builder:1.0.0", "container image for automotive-image-builder") - buildCmd.Flags().StringVar(&storageClass, "storage-class", "", "storage class to use for build workspace PVC") - buildCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes when waiting for build completion") - buildCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for the build to complete") - buildCmd.Flags().BoolVarP(&download, "download", "d", false, "automatically download artifacts when build completes") - buildCmd.Flags().BoolVar(&compressArtifacts, "compress", true, "compress directory artifacts (tar.gz). For directories, server always compresses.") - buildCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow logs of the build") - buildCmd.Flags().StringArrayVar(&customDefs, "define", []string{}, "Custom definition in KEY=VALUE format (can be specified multiple times)") - buildCmd.Flags().StringVar(&aibExtraArgs, "aib-args", "", "extra arguments passed to automotive-image-builder (space-separated)") - buildCmd.Flags().StringVar(&aibOverrideArgs, "override", "", "override arguments passed as-is to automotive-image-builder") - buildCmd.Flags().StringVar(&compressionAlgo, "compression", "gzip", "artifact compression algorithm (lz4|gzip)") - buildCmd.Flags().StringVar(&pushRepository, "push", "", "push artifact to OCI registry (e.g., quay.io/myorg/myimage:tag)") - buildCmd.Flags().StringVar(®istryURL, "registry-url", "", "registry URL for authentication (optional, extracted from --push if not set)") - buildCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username for push authentication") - buildCmd.Flags().StringVar(®istryPassword, "registry-password", "", "registry password for push authentication") - _ = buildCmd.MarkFlagRequired("arch") + // build command flags (bootc - the default) + buildCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL") + buildCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") + buildCmd.Flags().StringVarP(&buildName, "name", "n", "", "name for the ImageBuild (auto-generated if omitted)") + buildCmd.Flags().StringVarP(&distro, "distro", "d", "autosd", "distribution to build") + buildCmd.Flags().StringVarP(&target, "target", "t", "qemu", "target platform") + buildCmd.Flags().StringVarP(&architecture, "arch", "a", getDefaultArch(), "architecture (amd64, arm64)") + buildCmd.Flags().StringVar(&containerPush, "push", "", "push bootc container to registry (required)") + buildCmd.Flags().BoolVar(&buildDiskImage, "disk", false, "also build disk image from container") + buildCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file (requires --disk)") + buildCmd.Flags().StringVar(&diskFormat, "format", "qcow2", "disk image format (qcow2, raw, simg)") + buildCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") + buildCmd.Flags().StringVar(&exportOCI, "push-disk", "", "push disk image as OCI artifact to registry") + buildCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") + buildCmd.Flags().StringVar(®istryPassword, "registry-password", "", "registry password (or REGISTRY_PASSWORD env)") + buildCmd.Flags().StringVar(&automotiveImageBuilder, "aib-image", "quay.io/centos-sig-automotive/automotive-image-builder:latest", "AIB container image") + buildCmd.Flags().StringVar(&builderImage, "builder-image", "", "custom builder container") + buildCmd.Flags().StringVar(&storageClass, "storage-class", "", "Kubernetes storage class for build workspace") + buildCmd.Flags().StringArrayVarP(&customDefs, "define", "D", []string{}, "custom definition KEY=VALUE") + buildCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") + buildCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") + buildCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") + _ = buildCmd.MarkFlagRequired("push") downloadCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL (e.g. https://api.example)") downloadCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication (e.g., OpenShift access token)") @@ -150,55 +212,52 @@ func main() { listCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL (e.g. https://api.example)") listCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication (e.g., OpenShift access token)") - // build-bootc flags - buildBootcCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL") - buildBootcCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") - buildBootcCmd.Flags().StringVar(&buildName, "name", "", "name for the ImageBuild") - buildBootcCmd.Flags().StringVar(&distro, "distro", "autosd", "distribution to build") - buildBootcCmd.Flags().StringVar(&target, "target", "qemu", "target platform") - buildBootcCmd.Flags().StringVar(&architecture, "arch", "arm64", "architecture (amd64, arm64)") - buildBootcCmd.Flags().StringVar(&containerPush, "push", "", "push bootc container to registry (e.g., quay.io/org/image:tag)") - buildBootcCmd.Flags().BoolVar(&buildDiskImage, "build-disk-image", false, "also build disk image from container") - buildBootcCmd.Flags().StringVar(&diskFormat, "format", "qcow2", "disk image format (qcow2, raw, simg)") - buildBootcCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") - buildBootcCmd.Flags().StringVar(&exportOCI, "export-oci", "", "push disk image as OCI artifact to registry") - buildBootcCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username for push/export (or set REGISTRY_USERNAME env var)") - buildBootcCmd.Flags().StringVar(®istryPassword, "registry-password", "", "registry password for push/export (or set REGISTRY_PASSWORD env var, or use docker/podman auth)") - buildBootcCmd.Flags().StringVar(&automotiveImageBuilder, "automotive-image-builder", "quay.io/centos-sig-automotive/automotive-image-builder:latest", "container image for aib") - buildBootcCmd.Flags().StringVar(&builderImage, "builder-image", "", "custom aib-build container") - buildBootcCmd.Flags().StringVar(&storageClass, "storage-class", "", "storage class for build workspace PVC") - buildBootcCmd.Flags().StringArrayVar(&customDefs, "define", []string{}, "custom definition KEY=VALUE") - buildBootcCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") - buildBootcCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") - buildBootcCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") - buildBootcCmd.Flags().StringVar(&downloadFile, "download", "", "download disk image artifact to local file (requires --export-oci)") - _ = buildBootcCmd.MarkFlagRequired("name") - _ = buildBootcCmd.MarkFlagRequired("arch") - - // build-traditional flags - buildTraditionalCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL") - buildTraditionalCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") - buildTraditionalCmd.Flags().StringVar(&buildName, "name", "", "name for the ImageBuild") - buildTraditionalCmd.Flags().StringVar(&distro, "distro", "autosd", "distribution to build") - buildTraditionalCmd.Flags().StringVar(&target, "target", "qemu", "target platform") - buildTraditionalCmd.Flags().StringVar(&architecture, "arch", "arm64", "architecture (amd64, arm64)") - buildTraditionalCmd.Flags().StringVar(&mode, "mode", "image", "traditional mode (image, package)") - buildTraditionalCmd.Flags().StringVar(&exportFormat, "export", "qcow2", "export format (qcow2, raw, simg)") - buildTraditionalCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") - buildTraditionalCmd.Flags().StringVar(&downloadFile, "download", "", "download artifact to local file") - buildTraditionalCmd.Flags().StringVar(&exportOCI, "push", "", "push disk image as OCI artifact to registry") - buildTraditionalCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username for push (or set REGISTRY_USERNAME env var)") - buildTraditionalCmd.Flags().StringVar(®istryPassword, "registry-password", "", "registry password for push (or set REGISTRY_PASSWORD env var, or use docker/podman auth)") - buildTraditionalCmd.Flags().StringVar(&automotiveImageBuilder, "automotive-image-builder", "quay.io/centos-sig-automotive/automotive-image-builder:latest", "container image for aib") - buildTraditionalCmd.Flags().StringVar(&storageClass, "storage-class", "", "storage class for build workspace PVC") - buildTraditionalCmd.Flags().StringArrayVar(&customDefs, "define", []string{}, "custom definition KEY=VALUE") - buildTraditionalCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") - buildTraditionalCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") - buildTraditionalCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") - _ = buildTraditionalCmd.MarkFlagRequired("name") - _ = buildTraditionalCmd.MarkFlagRequired("arch") - - rootCmd.AddCommand(buildBootcCmd, buildTraditionalCmd, buildCmd, downloadCmd, listCmd, catalog.NewCatalogCmd()) + // disk command flags (create disk from existing container) + diskCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL") + diskCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") + diskCmd.Flags().StringVarP(&buildName, "name", "n", "", "name for the build job (auto-generated if omitted)") + diskCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file") + diskCmd.Flags().StringVar(&diskFormat, "format", "qcow2", "disk image format (qcow2, raw, simg)") + diskCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") + diskCmd.Flags().StringVar(&exportOCI, "push", "", "push disk image as OCI artifact to registry") + diskCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") + diskCmd.Flags().StringVar(®istryPassword, "registry-password", "", "registry password (or REGISTRY_PASSWORD env)") + diskCmd.Flags().StringVarP(&distro, "distro", "d", "autosd", "distribution") + diskCmd.Flags().StringVarP(&target, "target", "t", "qemu", "target platform") + diskCmd.Flags().StringVarP(&architecture, "arch", "a", getDefaultArch(), "architecture (amd64, arm64)") + diskCmd.Flags().StringVar(&automotiveImageBuilder, "aib-image", "quay.io/centos-sig-automotive/automotive-image-builder:latest", "AIB container image") + diskCmd.Flags().StringVar(&storageClass, "storage-class", "", "Kubernetes storage class") + diskCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") + diskCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") + diskCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") + + // build-legacy command flags (traditional ostree/package builds) + buildLegacyCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL") + buildLegacyCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") + buildLegacyCmd.Flags().StringVarP(&buildName, "name", "n", "", "name for the ImageBuild") + buildLegacyCmd.Flags().StringVarP(&distro, "distro", "d", "autosd", "distribution to build") + buildLegacyCmd.Flags().StringVarP(&target, "target", "t", "qemu", "target platform") + buildLegacyCmd.Flags().StringVarP(&architecture, "arch", "a", getDefaultArch(), "architecture (amd64, arm64)") + buildLegacyCmd.Flags().StringVar(&mode, "mode", "", "build mode: image (ostree) or package (required)") + buildLegacyCmd.Flags().StringVar(&exportFormat, "format", "", "export format: qcow2, raw, simg, etc. (required)") + buildLegacyCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download artifact to file") + buildLegacyCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") + buildLegacyCmd.Flags().StringVar(&exportOCI, "push", "", "push disk image as OCI artifact to registry") + buildLegacyCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") + buildLegacyCmd.Flags().StringVar(®istryPassword, "registry-password", "", "registry password (or REGISTRY_PASSWORD env)") + buildLegacyCmd.Flags().StringVar(&automotiveImageBuilder, "aib-image", "quay.io/centos-sig-automotive/automotive-image-builder:latest", "AIB container image") + buildLegacyCmd.Flags().StringVar(&storageClass, "storage-class", "", "Kubernetes storage class") + buildLegacyCmd.Flags().StringArrayVarP(&customDefs, "define", "D", []string{}, "custom definition KEY=VALUE") + buildLegacyCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") + buildLegacyCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") + buildLegacyCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") + _ = buildLegacyCmd.MarkFlagRequired("mode") + _ = buildLegacyCmd.MarkFlagRequired("format") + + // Add all commands + rootCmd.AddCommand(buildCmd, diskCmd, buildLegacyCmd, downloadCmd, listCmd, catalog.NewCatalogCmd()) + // Add deprecated aliases for backwards compatibility + rootCmd.AddCommand(buildBootcAliasCmd, buildTraditionalAliasCmd) if err := rootCmd.Execute(); err != nil { fmt.Println(err) @@ -206,18 +265,31 @@ func main() { } } -func runBuildBootc(cmd *cobra.Command, args []string) { +// runBuild handles the main 'build' command (bootc builds) +func runBuild(cmd *cobra.Command, args []string) { ctx := context.Background() manifest = args[0] if serverURL == "" { - handleError(fmt.Errorf("--server is required")) + handleError(fmt.Errorf("--server is required (or set CAIB_SERVER env)")) } + + // Auto-generate build name if not provided if buildName == "" { - handleError(fmt.Errorf("--name is required")) + base := strings.TrimSuffix(filepath.Base(manifest), ".aib.yml") + base = strings.TrimSuffix(base, ".yml") + buildName = fmt.Sprintf("%s-%s", base, time.Now().Format("20060102-150405")) + fmt.Printf("Auto-generated build name: %s\n", buildName) + } + + // Validate: if --output is specified, --disk must also be specified + if outputDir != "" && !buildDiskImage { + buildDiskImage = true // imply --disk when --output is specified } - if downloadFile != "" && exportOCI == "" { - handleError(fmt.Errorf("--download requires --export-oci (the disk image must be pushed to a registry first)")) + + // Validate: if downloading disk, need push-disk destination + if outputDir != "" && exportOCI == "" { + handleError(fmt.Errorf("--output requires --push-disk (disk image must be pushed to registry first for download)")) } if strings.TrimSpace(authToken) == "" { @@ -316,8 +388,111 @@ func runBuildBootc(cmd *cobra.Command, args []string) { waitForBuildCompletion(ctx, api, resp.Name, "") } - if downloadFile != "" { - if err := pullOCIArtifact(exportOCI, downloadFile, registryUsername, registryPassword); err != nil { + if outputDir != "" { + if err := pullOCIArtifact(exportOCI, outputDir, registryUsername, registryPassword); err != nil { + handleError(fmt.Errorf("failed to download OCI artifact: %w", err)) + } + } +} + +// runDisk handles the 'disk' command (create disk from existing container) +func runDisk(cmd *cobra.Command, args []string) { + ctx := context.Background() + containerRef = args[0] + + if serverURL == "" { + handleError(fmt.Errorf("--server is required (or set CAIB_SERVER env)")) + } + + // Validate: need either --output or --push + if outputDir == "" && exportOCI == "" { + handleError(fmt.Errorf("either --output or --push is required")) + } + + // Auto-generate build name if not provided + if buildName == "" { + // Extract image name from container ref for the build name + parts := strings.Split(containerRef, "/") + imagePart := parts[len(parts)-1] + imagePart = strings.Split(imagePart, ":")[0] // remove tag + buildName = fmt.Sprintf("disk-%s-%s", imagePart, time.Now().Format("20060102-150405")) + fmt.Printf("Auto-generated build name: %s\n", buildName) + } + + if strings.TrimSpace(authToken) == "" { + if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { + authToken = tok + } + } + + var opts []buildapiclient.Option + if strings.TrimSpace(authToken) != "" { + opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) + } + api, err := buildapiclient.New(serverURL, opts...) + if err != nil { + handleError(err) + } + + // Get registry credentials from env if not provided + if registryUsername == "" { + registryUsername = os.Getenv("REGISTRY_USERNAME") + } + if registryPassword == "" { + registryPassword = os.Getenv("REGISTRY_PASSWORD") + } + + // Extract registry URL for authentication + effectiveRegistryURL := "" + if containerRef != "" || exportOCI != "" { + ref := containerRef + if ref == "" { + ref = exportOCI + } + parts := strings.SplitN(ref, "/", 2) + if len(parts) > 0 && strings.Contains(parts[0], ".") { + effectiveRegistryURL = parts[0] + } else { + effectiveRegistryURL = "docker.io" + } + } + + req := buildapitypes.BuildRequest{ + Name: buildName, + ContainerRef: containerRef, + Distro: buildapitypes.Distro(distro), + Target: buildapitypes.Target(target), + Architecture: buildapitypes.Architecture(architecture), + ExportFormat: buildapitypes.ExportFormat(diskFormat), + Mode: buildapitypes.ModeDisk, + AutomotiveImageBuilder: automotiveImageBuilder, + StorageClass: storageClass, + Compression: compressionAlgo, + ExportOCI: exportOCI, + } + + if effectiveRegistryURL != "" && registryUsername != "" && registryPassword != "" { + req.RegistryCredentials = &buildapitypes.RegistryCredentials{ + Enabled: true, + AuthType: "username-password", + RegistryURL: effectiveRegistryURL, + Username: registryUsername, + Password: registryPassword, + } + } + + resp, err := api.CreateBuild(ctx, req) + if err != nil { + handleError(err) + } + fmt.Printf("Build %s accepted: %s - %s\n", resp.Name, resp.Phase, resp.Message) + + if waitForBuild || followLogs || outputDir != "" { + waitForBuildCompletion(ctx, api, resp.Name, "") + } + + if outputDir != "" && exportOCI != "" { + if err := pullOCIArtifact(exportOCI, outputDir, registryUsername, registryPassword); err != nil { handleError(fmt.Errorf("failed to download OCI artifact: %w", err)) } } @@ -466,7 +641,8 @@ func extractOCIArtifactBlob(ociLayoutPath, destPath string) error { return nil } -func runBuildTraditional(cmd *cobra.Command, args []string) { +// runBuildLegacy handles the 'build-legacy' command (traditional ostree/package builds) +func runBuildLegacy(cmd *cobra.Command, args []string) { ctx := context.Background() manifest = args[0] @@ -711,278 +887,6 @@ func waitForBuildCompletion(ctx context.Context, api *buildapiclient.Client, nam } } -func runBuild(cmd *cobra.Command, args []string) { - ctx := context.Background() - - if err := validateBuildRequirements(); err != nil { - handleError(err) - } - - if serverURL == "" { - handleError(fmt.Errorf("--server is required")) - } - - if serverURL != "" { - if strings.TrimSpace(authToken) == "" { - if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { - authToken = tok - } - } - var opts []buildapiclient.Option - if strings.TrimSpace(authToken) != "" { - opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) - } - api, err := buildapiclient.New(serverURL, opts...) - if err != nil { - handleError(err) - } - - manifestBytes, err := os.ReadFile(manifest) - if err != nil { - handleError(fmt.Errorf("error reading manifest: %w", err)) - } - - parsedDistro, err := buildapitypes.ParseDistro(distro) - if err != nil { - handleError(err) - } - parsedTarget, err := buildapitypes.ParseTarget(target) - if err != nil { - handleError(err) - } - parsedArch, err := buildapitypes.ParseArchitecture(architecture) - if err != nil { - handleError(err) - } - parsedExportFormat, err := buildapitypes.ParseExportFormat(exportFormat) - if err != nil { - handleError(err) - } - parsedMode, err := buildapitypes.ParseMode(mode) - if err != nil { - handleError(err) - } - - var aibArgsArray []string - var aibOverrideArray []string - if strings.TrimSpace(aibExtraArgs) != "" { - aibArgsArray = strings.Fields(aibExtraArgs) - } - if strings.TrimSpace(aibOverrideArgs) != "" { - aibOverrideArray = strings.Fields(aibOverrideArgs) - } - - req := buildapitypes.BuildRequest{ - Name: buildName, - Manifest: string(manifestBytes), - ManifestFileName: filepath.Base(manifest), - Distro: parsedDistro, - Target: parsedTarget, - Architecture: parsedArch, - ExportFormat: parsedExportFormat, - Mode: parsedMode, - AutomotiveImageBuilder: automotiveImageBuilder, - StorageClass: storageClass, - CustomDefs: customDefs, - AIBExtraArgs: aibArgsArray, - AIBOverrideArgs: aibOverrideArray, - ServeArtifact: download, - Compression: compressionAlgo, - PushRepository: pushRepository, - } - - // Add registry credentials if push is configured - if pushRepository != "" { - if registryUsername == "" || registryPassword == "" { - handleError(fmt.Errorf("--registry-username and --registry-password are required when --push is specified")) - } - // Extract registry URL from push repository if not explicitly provided - effectiveRegistryURL := registryURL - if effectiveRegistryURL == "" { - // Extract registry from push repository (e.g., "quay.io/org/image:tag" -> "quay.io") - parts := strings.SplitN(pushRepository, "/", 2) - if len(parts) > 0 && strings.Contains(parts[0], ".") { - effectiveRegistryURL = parts[0] - } else { - // Default to docker.io for short names - effectiveRegistryURL = "docker.io" - } - } - req.RegistryCredentials = &buildapitypes.RegistryCredentials{ - Enabled: true, - AuthType: "username-password", - RegistryURL: effectiveRegistryURL, - Username: registryUsername, - Password: registryPassword, - } - } - - resp, err := api.CreateBuild(ctx, req) - if err != nil { - handleError(err) - } - fmt.Printf("Build %s accepted: %s - %s\n", resp.Name, resp.Phase, resp.Message) - // If manifest references local files, upload them via the API - localRefs, err := findLocalFileReferences(string(manifestBytes)) - if err != nil { - handleError(fmt.Errorf("manifest file reference error: %w", err)) - } - if len(localRefs) > 0 { - for _, ref := range localRefs { - if _, err := os.Stat(ref["source_path"]); err != nil { - handleError(fmt.Errorf("referenced file %s does not exist: %w", ref["source_path"], err)) - } - } - - fmt.Println("Waiting for upload server to be ready...") - readyCtx, cancel := context.WithTimeout(ctx, 10*time.Minute) - defer cancel() - for { - if err := readyCtx.Err(); err != nil { - handleError(fmt.Errorf("timed out waiting for upload server to be ready")) - } - reqCtx, c := context.WithTimeout(ctx, 15*time.Second) - st, err := api.GetBuild(reqCtx, resp.Name) - c() - if err == nil { - if st.Phase == "Uploading" { - break - } - if st.Phase == "Failed" { - handleError(fmt.Errorf("build failed while waiting for upload server: %s", st.Message)) - } - } - time.Sleep(3 * time.Second) - } - - uploads := make([]buildapiclient.Upload, 0, len(localRefs)) - for _, ref := range localRefs { - uploads = append(uploads, buildapiclient.Upload{SourcePath: ref["source_path"], DestPath: ref["source_path"]}) - } - - uploadDeadline := time.Now().Add(10 * time.Minute) - for { - if err := api.UploadFiles(ctx, resp.Name, uploads); err != nil { - lower := strings.ToLower(err.Error()) - if time.Now().After(uploadDeadline) { - handleError(fmt.Errorf("upload files failed: %w", err)) - } - if strings.Contains(lower, "503") || strings.Contains(lower, "service unavailable") || strings.Contains(lower, "upload pod not ready") { - fmt.Println("Upload server not ready yet. Retrying...") - time.Sleep(5 * time.Second) - continue - } - handleError(fmt.Errorf("upload files failed: %w", err)) - } - break - } - fmt.Println("Local files uploaded. Build will proceed.") - } - - if waitForBuild || followLogs || download { - fmt.Println("Waiting for build to complete...") - timeoutCtx, cancel := context.WithTimeout(ctx, time.Duration(timeout)*time.Minute) - defer cancel() - ticker := time.NewTicker(5 * time.Second) - defer ticker.Stop() - userFollowRequested := followLogs - var lastPhase, lastMessage string - logFollowWarned := false - - logClient := &http.Client{ - Timeout: 10 * time.Minute, - Transport: &http.Transport{ - ResponseHeaderTimeout: 30 * time.Second, - IdleConnTimeout: 2 * time.Minute, - }, - } - - for { - select { - case <-timeoutCtx.Done(): - handleError(fmt.Errorf("timed out waiting for build")) - case <-ticker.C: - if followLogs { - req, _ := http.NewRequestWithContext(ctx, http.MethodGet, strings.TrimRight(serverURL, "/")+"/v1/builds/"+url.PathEscape(resp.Name)+"/logs?follow=1", nil) - if strings.TrimSpace(authToken) != "" { - req.Header.Set("Authorization", "Bearer "+strings.TrimSpace(authToken)) - } - resp2, err := logClient.Do(req) - if err == nil && resp2.StatusCode == http.StatusOK { - fmt.Println("Streaming logs...") - io.Copy(os.Stdout, resp2.Body) - resp2.Body.Close() - followLogs = userFollowRequested - } else if resp2 != nil { - body, _ := io.ReadAll(resp2.Body) - msg := strings.TrimSpace(string(body)) - if resp2.StatusCode == http.StatusServiceUnavailable || resp2.StatusCode == http.StatusGatewayTimeout { - if !logFollowWarned { - fmt.Println("log stream not ready (HTTP", resp2.StatusCode, "). Retrying…") - logFollowWarned = true - } - // treat as transient; keep trying silently afterwards - } else { - if msg != "" { - fmt.Printf("log stream error (%d): %s\n", resp2.StatusCode, msg) - } else { - fmt.Printf("log stream error: HTTP %d\n", resp2.StatusCode) - } - followLogs = false - } - resp2.Body.Close() - } - } - reqCtx, cancel := context.WithTimeout(ctx, 2*time.Minute) - st, err := api.GetBuild(reqCtx, resp.Name) - cancel() - if err != nil { - fmt.Printf("status check failed: %v\n", err) - continue - } - if !userFollowRequested { - if st.Phase != lastPhase || st.Message != lastMessage { - fmt.Printf("status: %s - %s\n", st.Phase, st.Message) - lastPhase = st.Phase - lastMessage = st.Message - } - } - if st.Phase == "Completed" { - if download { - if err := downloadArtifactViaAPI(ctx, serverURL, resp.Name, outputDir); err != nil { - fmt.Printf("Download via API failed: %v\n", err) - } - return - } - return - } - if st.Phase == "Failed" { - handleError(fmt.Errorf("build failed: %s", st.Message)) - } - } - } - } - return - } - -} - -func validateBuildRequirements() error { - if manifest == "" { - return fmt.Errorf("--manifest is required") - } - - if buildName == "" { - return fmt.Errorf("name is required") - } - - if strings.TrimSpace(architecture) == "" { - return fmt.Errorf("--arch is required") - } - - return nil -} - func handleError(err error) { fmt.Printf("Error: %v\n", err) os.Exit(1) diff --git a/config/crd/bases/automotive.sdv.cloud.redhat.com_imagebuilds.yaml b/config/crd/bases/automotive.sdv.cloud.redhat.com_imagebuilds.yaml index 7e721bb7..dd4ee6b4 100644 --- a/config/crd/bases/automotive.sdv.cloud.redhat.com_imagebuilds.yaml +++ b/config/crd/bases/automotive.sdv.cloud.redhat.com_imagebuilds.yaml @@ -65,6 +65,11 @@ spec: description: ContainerPush is the registry URL to push the bootc container image type: string + containerRef: + description: |- + ContainerRef is the reference to an existing bootc container image + Used with mode=disk to create a disk image from an existing container + type: string distro: description: Distro specifies the distribution to build for (e.g., "cs9") diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index fb392b10..9ee89e41 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -6,5 +6,5 @@ configurations: - kustomizeconfig.yaml images: - name: controller - newName: example.com/automotive-dev-operator - newTag: v0.0.1 + newName: default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator + newTag: latest diff --git a/internal/buildapi/server.go b/internal/buildapi/server.go index 25f27b9c..604c1dc2 100644 --- a/internal/buildapi/server.go +++ b/internal/buildapi/server.go @@ -824,8 +824,18 @@ func createBuild(c *gin.Context) { needsUpload := strings.Contains(req.Manifest, "source_path") - if req.Name == "" || req.Manifest == "" { - c.JSON(http.StatusBadRequest, gin.H{"error": "name and manifest are required"}) + // Disk mode uses ContainerRef instead of a manifest + if req.Name == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "name is required"}) + return + } + if req.Mode == ModeDisk { + if req.ContainerRef == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "container-ref is required for disk mode"}) + return + } + } else if req.Manifest == "" { + c.JSON(http.StatusBadRequest, gin.H{"error": "manifest is required"}) return } @@ -1011,6 +1021,7 @@ func createBuild(c *gin.Context) { BuildDiskImage: req.BuildDiskImage, ExportOCI: req.ExportOCI, BuilderImage: req.BuilderImage, + ContainerRef: req.ContainerRef, }, } if err := k8sClient.Create(ctx, imageBuild); err != nil { diff --git a/internal/buildapi/types.go b/internal/buildapi/types.go index 122b646b..604b7110 100644 --- a/internal/buildapi/types.go +++ b/internal/buildapi/types.go @@ -38,6 +38,8 @@ const ( ModeImage Mode = "image" // ModePackage creates traditional, mutable, package-based disk images ModePackage Mode = "package" + // ModeDisk creates a disk image from an existing bootc container + ModeDisk Mode = "disk" ) func (m Mode) IsValid() bool { @@ -98,8 +100,9 @@ func ParseMode(s string) (Mode, error) { // BuildRequest is the payload to create a build via the REST API type BuildRequest struct { Name string `json:"name"` - Manifest string `json:"manifest"` - ManifestFileName string `json:"manifestFileName"` + Manifest string `json:"manifest,omitempty"` + ManifestFileName string `json:"manifestFileName,omitempty"` + ContainerRef string `json:"containerRef,omitempty"` // For disk mode: existing container to convert Distro Distro `json:"distro"` Target Target `json:"target"` Architecture Architecture `json:"architecture"` diff --git a/internal/common/tasks/scripts/build_builder.sh b/internal/common/tasks/scripts/build_builder.sh index ff7cfa17..5c65c356 100644 --- a/internal/common/tasks/scripts/build_builder.sh +++ b/internal/common/tasks/scripts/build_builder.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -echo "Prepare builder for distro: $DISTRO" +echo "Prepare builder for distro: $DISTRO, arch: $TARGET_ARCH" # If BUILDER_IMAGE is provided, use it directly if [ -n "$BUILDER_IMAGE" ]; then @@ -21,7 +21,7 @@ else REGISTRY="image-registry.openshift-image-registry.svc:5000" fi -TARGET_IMAGE="${REGISTRY}/${NAMESPACE}/aib-build:$DISTRO" +TARGET_IMAGE="${REGISTRY}/${NAMESPACE}/aib-build:${DISTRO}-${TARGET_ARCH}" mkdir -p $HOME/.config cat > $HOME/.authjson < Date: Thu, 8 Jan 2026 12:19:59 +0200 Subject: [PATCH 2/7] fix disk image push Signed-off-by: Benny Zlotnik --- ...ve-dev-operator.clusterserviceversion.yaml | 2 +- catalog/automotive-dev-operator.yaml | 22 ++++-- cmd/caib/main.go | 40 +++++++---- internal/buildapi/server.go | 3 + internal/common/tasks/scripts/build_image.sh | 69 +++++++++++++++---- 5 files changed, 104 insertions(+), 32 deletions(-) diff --git a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml index e5819a8a..0f206c12 100644 --- a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml +++ b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml @@ -53,7 +53,7 @@ metadata: capabilities: Basic Install categories: Developer Tools containerImage: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - createdAt: "2026-01-07T10:28:46Z" + createdAt: "2026-01-08T09:47:15Z" operatorframework.io/suggested-namespace: automotive-dev-operator-system operators.operatorframework.io/builder: operator-sdk-v1.42.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 diff --git a/catalog/automotive-dev-operator.yaml b/catalog/automotive-dev-operator.yaml index b3bc7616..9740f357 100644 --- a/catalog/automotive-dev-operator.yaml +++ b/catalog/automotive-dev-operator.yaml @@ -10,10 +10,15 @@ entries: - name: automotive-dev-operator.v0.0.1 --- --- -image: quay.io/rh-sdv-cloud/automotive-dev-operator-bundle:v0.0.1 +image: image-registry.openshift-image-registry.svc:5000/openshift-marketplace/automotive-dev-operator-bundle:v0.0.1 name: automotive-dev-operator.v0.0.1 package: automotive-dev-operator properties: +- type: olm.gvk + value: + group: automotive.sdv.cloud.redhat.com + kind: CatalogImage + version: v1alpha1 - type: olm.gvk value: group: automotive.sdv.cloud.redhat.com @@ -37,9 +42,16 @@ properties: value: packageName: openshift-pipelines-operator-rh versionRange: ">=1.12.0" +- type: olm.package.required + value: + packageName: openshift-pipelines-operator-rh + versionRange: '>=1.12.0' +- type: olm.bundle.object + value: + data: {"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"annotations":{"controller-gen.kubebuilder.io/version":"v0.19.0"},"creationTimestamp":null,"name":"catalogimages.automotive.sdv.cloud.redhat.com"},"spec":{"group":"automotive.sdv.cloud.redhat.com","names":{"kind":"CatalogImage","listKind":"CatalogImageList","plural":"catalogimages","singular":"catalogimage"},"scope":"Namespaced","versions":[{"additionalPrinterColumns":[{"jsonPath":".spec.registryUrl","name":"Registry","type":"string"},{"jsonPath":".spec.metadata.architecture","name":"Architecture","type":"string"},{"jsonPath":".spec.metadata.distro","name":"Distro","type":"string"},{"jsonPath":".status.phase","name":"Phase","type":"string"},{"jsonPath":".metadata.creationTimestamp","name":"Age","type":"date"}],"name":"v1alpha1","schema":{"openAPIV3Schema":{"description":"CatalogImage is the Schema for the catalogimages API","properties":{"apiVersion":{"description":"APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"},"kind":{"description":"Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds","type":"string"},"metadata":{"type":"object"},"spec":{"description":"CatalogImageSpec defines the desired state of CatalogImage","properties":{"authSecretRef":{"description":"AuthSecretRef references the secret containing registry credentials","properties":{"name":{"description":"Name is the name of the secret containing registry credentials","type":"string"},"namespace":{"description":"Namespace is the namespace of the secret (defaults to CatalogImage namespace)","type":"string"}},"required":["name"],"type":"object"},"digest":{"description":"Digest is the immutable content-addressable identifier (sha256:...)","pattern":"^sha256:[a-f0-9]{64}$","type":"string"},"metadata":{"description":"Metadata contains automotive-specific image metadata","properties":{"architecture":{"description":"Architecture is the CPU architecture\nSupports both AIB canonical values (x86_64, aarch64) and OCI standard names (amd64, arm64)","type":"string"},"bootc":{"description":"Bootc indicates if this is a bootc-compatible image","type":"boolean"},"buildMode":{"description":"BuildMode indicates the AIB build mode used (bootc, image, package)","enum":["bootc","image","package"],"type":"string"},"distro":{"description":"Distro is the distribution identifier\nCommon values include: cs9, autosd10-sig, autosd9, cs8, fedora-39, fedora-40, rhel9, rhel8\nRun 'aib list-dist' to see all available distributions","type":"string"},"distroVersion":{"description":"DistroVersion is the distribution version","type":"string"},"exportFormat":{"description":"ExportFormat indicates the disk image format produced by AIB\nCommon values include: qcow2, raw, image, vmdk, iso, vhd, tar","type":"string"},"os":{"default":"linux","description":"OS is the operating system (defaults to linux)","type":"string"},"targets":{"description":"Targets lists compatible hardware targets","items":{"description":"HardwareTarget represents a hardware platform the image supports","properties":{"name":{"description":"Name is the target hardware identifier\nCommon values include: qemu, raspberry-pi, beaglebone, generic\nRun 'aib list-targets' to see all available hardware targets","type":"string"},"notes":{"description":"Notes contains target-specific information","type":"string"},"verified":{"default":false,"description":"Verified indicates if the image has been tested on this target","type":"boolean"}},"required":["name"],"type":"object"},"type":"array"},"variant":{"description":"Variant is the architecture variant (e.g., v7 for armv7)","type":"string"}},"type":"object"},"registryUrl":{"description":"RegistryURL is the full URL to the image in the container registry","pattern":"^[a-z0-9]+([._-][a-z0-9]+)*(/[a-z0-9]+([._-][a-z0-9]+)*)*:[a-zA-Z0-9_][a-zA-Z0-9._-]*$|^[a-z0-9]+([._-][a-z0-9]+)*\\.[a-z]{2,}(:[0-9]{1,5})?(/[a-z0-9]+([._-][a-z0-9]+)*)*:[a-zA-Z0-9_][a-zA-Z0-9._-]*$|^[a-z0-9]+([._-][a-z0-9]+)*\\.[a-z]{2,}(:[0-9]{1,5})?(/[a-z0-9]+([._-][a-z0-9]+)*)*@sha256:[a-f0-9]{64}$","type":"string"},"tags":{"description":"Tags are mutable labels for categorization","items":{"type":"string"},"type":"array"},"verificationInterval":{"default":"1h","description":"VerificationInterval specifies how often to verify registry accessibility","pattern":"^([0-9]+(\\.[0-9]+)?(ns|us|µs|ms|s|m|h))+$","type":"string"}},"required":["registryUrl"],"type":"object"},"status":{"description":"CatalogImageStatus defines the observed state of CatalogImage","properties":{"accessCount":{"description":"AccessCount tracks how many times this image has been accessed","format":"int64","type":"integer"},"artifactRefs":{"description":"ArtifactRefs contains references to downloadable artifacts","items":{"description":"ArtifactReference represents a downloadable artifact associated with the image","properties":{"digest":{"description":"Digest is the content digest for verification (sha256:...)","type":"string"},"format":{"description":"Format contains format-specific information","type":"string"},"sizeBytes":{"description":"SizeBytes is the size of the artifact in bytes","format":"int64","type":"integer"},"type":{"description":"Type is the artifact type (e.g., qcow2, raw, vmdk, container, iso)","type":"string"},"url":{"description":"URL is the download URL for the artifact","type":"string"}},"required":["type","url"],"type":"object"},"type":"array"},"conditions":{"description":"Conditions represent the latest available observations","items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition.\nThis may be an empty string.","maxLength":32768,"type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon.\nFor instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date\nwith respect to the current state of the instance.","format":"int64","minimum":0,"type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition.\nProducers of specific condition types may define expected values and meanings for this field,\nand whether the values are considered a guaranteed API.\nThe value should be a CamelCase string.\nThis field may not be empty.","maxLength":1024,"minLength":1,"pattern":"^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","enum":["True","False","Unknown"],"type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","maxLength":316,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"type":"array"},"lastVerificationTime":{"description":"LastVerificationTime is when the registry was last verified","format":"date-time","type":"string"},"observedGeneration":{"description":"ObservedGeneration is the most recent generation observed by the controller","format":"int64","type":"integer"},"phase":{"description":"Phase represents the current lifecycle phase","enum":["Pending","Verifying","Available","Unavailable","Failed"],"type":"string"},"publishedAt":{"description":"PublishedAt is when this image was published to the catalog","format":"date-time","type":"string"},"registryMetadata":{"description":"RegistryMetadata contains metadata extracted from the registry","properties":{"createdAt":{"description":"CreatedAt is when the image was created in the registry","format":"date-time","type":"string"},"isMultiArch":{"description":"IsMultiArch indicates if this is a multi-architecture manifest list","type":"boolean"},"layerCount":{"description":"LayerCount is the number of image layers","type":"integer"},"mediaType":{"description":"MediaType is the OCI manifest media type","type":"string"},"platform":{"description":"Platform contains platform information from the manifest","properties":{"architecture":{"description":"Architecture is the platform architecture","type":"string"},"os":{"description":"OS is the platform operating system","type":"string"},"variant":{"description":"Variant is the platform variant","type":"string"}},"type":"object"},"platformVariants":{"description":"PlatformVariants contains information about available platform variants\nOnly populated for multi-arch images","items":{"description":"PlatformVariant represents a platform-specific variant in a multi-arch image","properties":{"architecture":{"description":"Architecture is the CPU architecture (amd64, arm64, etc.)","type":"string"},"digest":{"description":"Digest is the digest for this specific platform variant","type":"string"},"os":{"description":"OS is the operating system","type":"string"},"sizeBytes":{"description":"SizeBytes is the size of this variant in bytes","format":"int64","type":"integer"},"variant":{"description":"Variant is the architecture variant (v7, v8, etc.)","type":"string"}},"type":"object"},"type":"array"},"resolvedDigest":{"description":"ResolvedDigest is the digest resolved from the registry","type":"string"},"sizeBytes":{"description":"SizeBytes is the total image size in bytes","format":"int64","type":"integer"}},"type":"object"},"sourceImageBuild":{"description":"SourceImageBuild references the ImageBuild that created this catalog entry","type":"string"}},"type":"object"}},"type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}}]},"status":{"acceptedNames":{"kind":"","plural":""},"conditions":null,"storedVersions":null}} - type: olm.bundle.object value: - data: {"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"annotations":{"controller-gen.kubebuilder.io/version":"v0.19.0"},"creationTimestamp":null,"name":"imagebuilds.automotive.sdv.cloud.redhat.com"},"spec":{"group":"automotive.sdv.cloud.redhat.com","names":{"kind":"ImageBuild","listKind":"ImageBuildList","plural":"imagebuilds","singular":"imagebuild"},"scope":"Namespaced","versions":[{"name":"v1alpha1","schema":{"openAPIV3Schema":{"description":"ImageBuild is the Schema for the imagebuilds API","properties":{"apiVersion":{"description":"APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"},"kind":{"description":"Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds","type":"string"},"metadata":{"type":"object"},"spec":{"description":"ImageBuildSpec defines the desired state of ImageBuild","properties":{"architecture":{"description":"Architecture specifies the target architecture","type":"string"},"automotiveImageBuilder":{"description":"AutomotiveImageBuilder specifies the image to use for building","type":"string"},"buildDiskImage":{"description":"BuildDiskImage indicates whether to build a disk image from the bootc container","type":"boolean"},"builderImage":{"description":"BuilderImage is a custom builder image to use","type":"string"},"compression":{"default":"gzip","description":"Compression specifies the compression algorithm for artifacts","enum":["lz4","gzip","xz"],"type":"string"},"containerPush":{"description":"ContainerPush is the registry URL to push the bootc container image","type":"string"},"distro":{"description":"Distro specifies the distribution to build for (e.g., \"cs9\")","type":"string"},"envSecretRef":{"description":"EnvSecretRef is the name of the secret containing environment variables for the build\nThese environment variables will be available during the build process and can be used\nfor private registry authentication (e.g., REGISTRY_USERNAME, REGISTRY_PASSWORD, REGISTRY_AUTH_FILE)","type":"string"},"exportFormat":{"description":"ExportFormat specifies the output format (image, qcow2)","type":"string"},"exportOci":{"description":"ExportOCI is the registry URL to push the disk image as an OCI artifact","type":"string"},"exposeRoute":{"description":"ExposeRoute indicates whether to expose the a route for the artifacts","type":"boolean"},"inputFilesServer":{"description":"InputFilesServer indicates if there's a server for files referenced locally in the manifest","type":"boolean"},"manifestConfigMap":{"description":"ManifestConfigMap specifies the name of the ConfigMap containing the manifest configuration","type":"string"},"mode":{"description":"Mode specifies the build mode (package, image)","type":"string"},"publishers":{"description":"Publishers defines where to publish the built artifacts","properties":{"registry":{"description":"Registry configuration for publishing to an OCI registry","properties":{"repositoryUrl":{"description":"RepositoryURL is the URL of the OCI registry repository","type":"string"},"secret":{"description":"Secret is the name of the secret containing registry credentials","type":"string"}},"required":["repositoryUrl","secret"],"type":"object"}},"type":"object"},"runtimeClassName":{"description":"RuntimeClassName specifies the runtime class to use for the build pod","type":"string"},"serveArtifact":{"description":"ServeArtifact determines whether to make the built artifact available for download","type":"boolean"},"serveExpiryHours":{"description":"ServeExpiryHours specifies how long to serve the artifact before cleanup (default: 24)","format":"int32","type":"integer"},"storageClass":{"description":"StorageClass is the name of the storage class to use for the build PVC","type":"string"},"target":{"description":"Target specifies the build target (e.g., \"qemu\")","type":"string"}},"type":"object"},"status":{"description":"ImageBuildStatus defines the observed state of ImageBuild","properties":{"artifactFileName":{"description":"ArtifactFileName is the name of the artifact file inside the PVC","type":"string"},"artifactPath":{"description":"ArtifactPath is the path inside the PVC where the artifact is stored","type":"string"},"artifactURL":{"description":"ArtifactURL is the route URL created to expose the artifacts","type":"string"},"completionTime":{"description":"CompletionTime is when the build finished","format":"date-time","type":"string"},"conditions":{"description":"Conditions represent the latest available observations of the ImageBuild's state","items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition.\nThis may be an empty string.","maxLength":32768,"type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon.\nFor instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date\nwith respect to the current state of the instance.","format":"int64","minimum":0,"type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition.\nProducers of specific condition types may define expected values and meanings for this field,\nand whether the values are considered a guaranteed API.\nThe value should be a CamelCase string.\nThis field may not be empty.","maxLength":1024,"minLength":1,"pattern":"^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","enum":["True","False","Unknown"],"type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","maxLength":316,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"type":"array"},"message":{"description":"Message provides more detail about the current phase","type":"string"},"observedGeneration":{"description":"ObservedGeneration is the most recent generation observed by the controller.","format":"int64","type":"integer"},"phase":{"description":"Phase represents the current phase of the build (Building, Completed, Failed)","enum":["Pending","Uploading","Building","Pushing","Completed","Failed"],"type":"string"},"pipelineRunName":{"description":"PipelineRunName is the name of the active PipelineRun for this build","type":"string"},"pushTaskRunName":{"description":"PushTaskRunName is the name of the TaskRun for pushing artifacts to registry","type":"string"},"pvcName":{"description":"PVCName is the name of the PVC where the artifact is stored","type":"string"},"startTime":{"description":"StartTime is when the build started","format":"date-time","type":"string"}},"type":"object"}},"type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}}]},"status":{"acceptedNames":{"kind":"","plural":""},"conditions":null,"storedVersions":null}} + data: {"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"annotations":{"controller-gen.kubebuilder.io/version":"v0.19.0"},"creationTimestamp":null,"name":"imagebuilds.automotive.sdv.cloud.redhat.com"},"spec":{"group":"automotive.sdv.cloud.redhat.com","names":{"kind":"ImageBuild","listKind":"ImageBuildList","plural":"imagebuilds","singular":"imagebuild"},"scope":"Namespaced","versions":[{"name":"v1alpha1","schema":{"openAPIV3Schema":{"description":"ImageBuild is the Schema for the imagebuilds API","properties":{"apiVersion":{"description":"APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"},"kind":{"description":"Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds","type":"string"},"metadata":{"type":"object"},"spec":{"description":"ImageBuildSpec defines the desired state of ImageBuild","properties":{"architecture":{"description":"Architecture specifies the target architecture","type":"string"},"automotiveImageBuilder":{"description":"AutomotiveImageBuilder specifies the image to use for building","type":"string"},"buildDiskImage":{"description":"BuildDiskImage indicates whether to build a disk image from the bootc container","type":"boolean"},"builderImage":{"description":"BuilderImage is a custom builder image to use","type":"string"},"compression":{"default":"gzip","description":"Compression specifies the compression algorithm for artifacts","enum":["lz4","gzip","xz"],"type":"string"},"containerPush":{"description":"ContainerPush is the registry URL to push the bootc container image","type":"string"},"containerRef":{"description":"ContainerRef is the reference to an existing bootc container image\nUsed with mode=disk to create a disk image from an existing container","type":"string"},"distro":{"description":"Distro specifies the distribution to build for (e.g., \"cs9\")","type":"string"},"envSecretRef":{"description":"EnvSecretRef is the name of the secret containing environment variables for the build\nThese environment variables will be available during the build process and can be used\nfor private registry authentication (e.g., REGISTRY_USERNAME, REGISTRY_PASSWORD, REGISTRY_AUTH_FILE)","type":"string"},"exportFormat":{"description":"ExportFormat specifies the output format (image, qcow2)","type":"string"},"exportOci":{"description":"ExportOCI is the registry URL to push the disk image as an OCI artifact","type":"string"},"exposeRoute":{"description":"ExposeRoute indicates whether to expose the a route for the artifacts","type":"boolean"},"inputFilesServer":{"description":"InputFilesServer indicates if there's a server for files referenced locally in the manifest","type":"boolean"},"manifestConfigMap":{"description":"ManifestConfigMap specifies the name of the ConfigMap containing the manifest configuration","type":"string"},"mode":{"description":"Mode specifies the build mode (package, image)","type":"string"},"publishers":{"description":"Publishers defines where to publish the built artifacts","properties":{"registry":{"description":"Registry configuration for publishing to an OCI registry","properties":{"repositoryUrl":{"description":"RepositoryURL is the URL of the OCI registry repository","type":"string"},"secret":{"description":"Secret is the name of the secret containing registry credentials","type":"string"}},"required":["repositoryUrl","secret"],"type":"object"}},"type":"object"},"runtimeClassName":{"description":"RuntimeClassName specifies the runtime class to use for the build pod","type":"string"},"serveArtifact":{"description":"ServeArtifact determines whether to make the built artifact available for download","type":"boolean"},"serveExpiryHours":{"description":"ServeExpiryHours specifies how long to serve the artifact before cleanup (default: 24)","format":"int32","type":"integer"},"storageClass":{"description":"StorageClass is the name of the storage class to use for the build PVC","type":"string"},"target":{"description":"Target specifies the build target (e.g., \"qemu\")","type":"string"}},"type":"object"},"status":{"description":"ImageBuildStatus defines the observed state of ImageBuild","properties":{"artifactFileName":{"description":"ArtifactFileName is the name of the artifact file inside the PVC","type":"string"},"artifactPath":{"description":"ArtifactPath is the path inside the PVC where the artifact is stored","type":"string"},"artifactURL":{"description":"ArtifactURL is the route URL created to expose the artifacts","type":"string"},"completionTime":{"description":"CompletionTime is when the build finished","format":"date-time","type":"string"},"conditions":{"description":"Conditions represent the latest available observations of the ImageBuild's state","items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition.\nThis may be an empty string.","maxLength":32768,"type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon.\nFor instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date\nwith respect to the current state of the instance.","format":"int64","minimum":0,"type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition.\nProducers of specific condition types may define expected values and meanings for this field,\nand whether the values are considered a guaranteed API.\nThe value should be a CamelCase string.\nThis field may not be empty.","maxLength":1024,"minLength":1,"pattern":"^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","enum":["True","False","Unknown"],"type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","maxLength":316,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"type":"array"},"message":{"description":"Message provides more detail about the current phase","type":"string"},"observedGeneration":{"description":"ObservedGeneration is the most recent generation observed by the controller.","format":"int64","type":"integer"},"phase":{"description":"Phase represents the current phase of the build (Building, Completed, Failed)","enum":["Pending","Uploading","Building","Pushing","Completed","Failed"],"type":"string"},"pipelineRunName":{"description":"PipelineRunName is the name of the active PipelineRun for this build","type":"string"},"pushTaskRunName":{"description":"PushTaskRunName is the name of the TaskRun for pushing artifacts to registry","type":"string"},"pvcName":{"description":"PVCName is the name of the PVC where the artifact is stored","type":"string"},"startTime":{"description":"StartTime is when the build started","format":"date-time","type":"string"}},"type":"object"}},"type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}}]},"status":{"acceptedNames":{"kind":"","plural":""},"conditions":null,"storedVersions":null}} - type: olm.bundle.object value: data: {"apiVersion":"apiextensions.k8s.io/v1","kind":"CustomResourceDefinition","metadata":{"annotations":{"controller-gen.kubebuilder.io/version":"v0.19.0"},"creationTimestamp":null,"name":"images.automotive.sdv.cloud.redhat.com"},"spec":{"group":"automotive.sdv.cloud.redhat.com","names":{"kind":"Image","listKind":"ImageList","plural":"images","singular":"image"},"scope":"Namespaced","versions":[{"additionalPrinterColumns":[{"jsonPath":".spec.distro","name":"Distro","type":"string"},{"jsonPath":".spec.architecture","name":"Architecture","type":"string"},{"jsonPath":".spec.exportFormat","name":"Format","type":"string"},{"jsonPath":".spec.location.type","name":"Location Type","type":"string"},{"jsonPath":".status.phase","name":"Phase","type":"string"},{"jsonPath":".spec.version","name":"Version","type":"string"},{"jsonPath":".metadata.creationTimestamp","name":"Age","type":"date"}],"name":"v1alpha1","schema":{"openAPIV3Schema":{"description":"Image is the Schema for the images API","properties":{"apiVersion":{"description":"APIVersion defines the versioned schema of this representation of an object.\nServers should convert recognized schemas to the latest internal value, and\nmay reject unrecognized values.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources","type":"string"},"kind":{"description":"Kind is a string value representing the REST resource this object represents.\nServers may infer this from the endpoint the client submits requests to.\nCannot be updated.\nIn CamelCase.\nMore info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds","type":"string"},"metadata":{"type":"object"},"spec":{"description":"ImageSpec defines the desired state of Image","properties":{"architecture":{"description":"Architecture specifies the target architecture","type":"string"},"description":{"description":"Description provides a human-readable description of the image","type":"string"},"distro":{"description":"Distro specifies the distribution","type":"string"},"exportFormat":{"description":"ExportFormat specifies the output format","type":"string"},"location":{"description":"Location defines where the image is stored","properties":{"registry":{"description":"Registry contains configuration for container registry storage","properties":{"digest":{"description":"Digest is the content-addressable digest of the image","type":"string"},"secretRef":{"description":"SecretRef is the name of the secret containing registry credentials","type":"string"},"url":{"description":"URL is the full URL to the image in the registry (e.g., \"quay.io/myorg/myimage:tag\")","type":"string"}},"required":["url"],"type":"object"},"type":{"default":"registry","description":"Type specifies the storage type","enum":["registry"],"type":"string"}},"required":["type"],"type":"object"},"metadata":{"description":"Metadata contains additional information about the image","properties":{"annotations":{"additionalProperties":{"type":"string"},"description":"Annotations are key-value pairs for additional annotations","type":"object"},"buildDate":{"description":"BuildDate is when the image was built","format":"date-time","type":"string"},"createdBy":{"description":"CreatedBy identifies who or what created this image","type":"string"},"labels":{"additionalProperties":{"type":"string"},"description":"Labels are key-value pairs for additional metadata","type":"object"},"sourceImageBuild":{"description":"SourceImageBuild references the ImageBuild that created this image","type":"string"}},"type":"object"},"mode":{"description":"Mode specifies the build mode","type":"string"},"size":{"description":"Size specifies the image size information","properties":{"compressedBytes":{"description":"CompressedBytes is the size of the compressed image in bytes","format":"int64","type":"integer"},"uncompressedBytes":{"description":"UncompressedBytes is the size of the uncompressed image in bytes","format":"int64","type":"integer"},"virtualBytes":{"description":"VirtualBytes is the virtual disk size for disk images","format":"int64","type":"integer"}},"type":"object"},"tags":{"description":"Tags are labels that can be used to categorize and search images","items":{"type":"string"},"type":"array"},"target":{"description":"Target specifies the build target","type":"string"},"version":{"description":"Version specifies the version of this image","type":"string"}},"required":["architecture","distro","exportFormat","location","target"],"type":"object"},"status":{"description":"ImageStatus defines the observed state of Image","properties":{"accessCount":{"description":"AccessCount tracks how many times this image has been accessed/downloaded","format":"int64","type":"integer"},"conditions":{"description":"Conditions represent the latest available observations of the image's state","items":{"description":"Condition contains details for one aspect of the current state of this API Resource.","properties":{"lastTransitionTime":{"description":"lastTransitionTime is the last time the condition transitioned from one status to another.\nThis should be when the underlying condition changed.  If that is not known, then using the time when the API field changed is acceptable.","format":"date-time","type":"string"},"message":{"description":"message is a human readable message indicating details about the transition.\nThis may be an empty string.","maxLength":32768,"type":"string"},"observedGeneration":{"description":"observedGeneration represents the .metadata.generation that the condition was set based upon.\nFor instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date\nwith respect to the current state of the instance.","format":"int64","minimum":0,"type":"integer"},"reason":{"description":"reason contains a programmatic identifier indicating the reason for the condition's last transition.\nProducers of specific condition types may define expected values and meanings for this field,\nand whether the values are considered a guaranteed API.\nThe value should be a CamelCase string.\nThis field may not be empty.","maxLength":1024,"minLength":1,"pattern":"^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$","type":"string"},"status":{"description":"status of the condition, one of True, False, Unknown.","enum":["True","False","Unknown"],"type":"string"},"type":{"description":"type of condition in CamelCase or in foo.example.com/CamelCase.","maxLength":316,"pattern":"^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$","type":"string"}},"required":["lastTransitionTime","message","reason","status","type"],"type":"object"},"type":"array"},"lastAccessed":{"description":"LastAccessed is when the image was last accessed","format":"date-time","type":"string"},"lastVerified":{"description":"LastVerified is when the image location was last verified to be accessible","format":"date-time","type":"string"},"message":{"description":"Message provides more detail about the current phase","type":"string"},"observedGeneration":{"description":"ObservedGeneration is the most recent generation observed by the controller.","format":"int64","type":"integer"},"phase":{"description":"Phase represents the current phase of the image (Available, Unavailable, Verifying)","type":"string"}},"type":"object"}},"type":"object"}},"served":true,"storage":true,"subresources":{"status":{}}}]},"status":{"acceptedNames":{"kind":"","plural":""},"conditions":null,"storedVersions":null}} @@ -48,7 +60,7 @@ properties: data: eyJhcGlWZXJzaW9uIjoiYXBpZXh0ZW5zaW9ucy5rOHMuaW8vdjEiLCJraW5kIjoiQ3VzdG9tUmVzb3VyY2VEZWZpbml0aW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiY29udHJvbGxlci1nZW4ua3ViZWJ1aWxkZXIuaW8vdmVyc2lvbiI6InYwLjE5LjAifSwiY3JlYXRpb25UaW1lc3RhbXAiOm51bGwsIm5hbWUiOiJvcGVyYXRvcmNvbmZpZ3MuYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSJ9LCJzcGVjIjp7Imdyb3VwIjoiYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSIsIm5hbWVzIjp7ImtpbmQiOiJPcGVyYXRvckNvbmZpZyIsImxpc3RLaW5kIjoiT3BlcmF0b3JDb25maWdMaXN0IiwicGx1cmFsIjoib3BlcmF0b3Jjb25maWdzIiwic2luZ3VsYXIiOiJvcGVyYXRvcmNvbmZpZyJ9LCJzY29wZSI6Ik5hbWVzcGFjZWQiLCJ2ZXJzaW9ucyI6W3siYWRkaXRpb25hbFByaW50ZXJDb2x1bW5zIjpbeyJqc29uUGF0aCI6Ii5zcGVjLndlYlVJIiwibmFtZSI6IldlYlVJIiwidHlwZSI6ImJvb2xlYW4ifSx7Impzb25QYXRoIjoiLnNwZWMub3NCdWlsZHMuZW5hYmxlZCIsIm5hbWUiOiJPUyBCdWlsZHMiLCJ0eXBlIjoiYm9vbGVhbiJ9LHsianNvblBhdGgiOiIuc3RhdHVzLnBoYXNlIiwibmFtZSI6IlBoYXNlIiwidHlwZSI6InN0cmluZyJ9LHsianNvblBhdGgiOiIubWV0YWRhdGEuY3JlYXRpb25UaW1lc3RhbXAiLCJuYW1lIjoiQWdlIiwidHlwZSI6ImRhdGUifV0sIm5hbWUiOiJ2MWFscGhhMSIsInNjaGVtYSI6eyJvcGVuQVBJVjNTY2hlbWEiOnsiZGVzY3JpcHRpb24iOiJPcGVyYXRvckNvbmZpZyBpcyB0aGUgU2NoZW1hIGZvciB0aGUgb3BlcmF0b3Jjb25maWdzIEFQSSIsInByb3BlcnRpZXMiOnsiYXBpVmVyc2lvbiI6eyJkZXNjcmlwdGlvbiI6IkFQSVZlcnNpb24gZGVmaW5lcyB0aGUgdmVyc2lvbmVkIHNjaGVtYSBvZiB0aGlzIHJlcHJlc2VudGF0aW9uIG9mIGFuIG9iamVjdC5cblNlcnZlcnMgc2hvdWxkIGNvbnZlcnQgcmVjb2duaXplZCBzY2hlbWFzIHRvIHRoZSBsYXRlc3QgaW50ZXJuYWwgdmFsdWUsIGFuZFxubWF5IHJlamVjdCB1bnJlY29nbml6ZWQgdmFsdWVzLlxuTW9yZSBpbmZvOiBodHRwczovL2dpdC5rOHMuaW8vY29tbXVuaXR5L2NvbnRyaWJ1dG9ycy9kZXZlbC9zaWctYXJjaGl0ZWN0dXJlL2FwaS1jb252ZW50aW9ucy5tZCNyZXNvdXJjZXMiLCJ0eXBlIjoic3RyaW5nIn0sImtpbmQiOnsiZGVzY3JpcHRpb24iOiJLaW5kIGlzIGEgc3RyaW5nIHZhbHVlIHJlcHJlc2VudGluZyB0aGUgUkVTVCByZXNvdXJjZSB0aGlzIG9iamVjdCByZXByZXNlbnRzLlxuU2VydmVycyBtYXkgaW5mZXIgdGhpcyBmcm9tIHRoZSBlbmRwb2ludCB0aGUgY2xpZW50IHN1Ym1pdHMgcmVxdWVzdHMgdG8uXG5DYW5ub3QgYmUgdXBkYXRlZC5cbkluIENhbWVsQ2FzZS5cbk1vcmUgaW5mbzogaHR0cHM6Ly9naXQuazhzLmlvL2NvbW11bml0eS9jb250cmlidXRvcnMvZGV2ZWwvc2lnLWFyY2hpdGVjdHVyZS9hcGktY29udmVudGlvbnMubWQjdHlwZXMta2luZHMiLCJ0eXBlIjoic3RyaW5nIn0sIm1ldGFkYXRhIjp7InR5cGUiOiJvYmplY3QifSwic3BlYyI6eyJkZXNjcmlwdGlvbiI6Ik9wZXJhdG9yQ29uZmlnU3BlYyBkZWZpbmVzIHRoZSBkZXNpcmVkIHN0YXRlIG9mIE9wZXJhdG9yQ29uZmlnIiwicHJvcGVydGllcyI6eyJvc0J1aWxkcyI6eyJkZXNjcmlwdGlvbiI6Ik9TQnVpbGRzIGRlZmluZXMgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIE9TIGJ1aWxkIG9wZXJhdGlvbnMiLCJwcm9wZXJ0aWVzIjp7ImNsdXN0ZXJSZWdpc3RyeVJvdXRlIjp7ImRlc2NyaXB0aW9uIjoiQ2x1c3RlclJlZ2lzdHJ5Um91dGUgaXMgdGhlIGV4dGVybmFsIHJvdXRlIGZvciB0aGUgY2x1c3RlcidzIGludGVybmFsIGltYWdlIHJlZ2lzdHJ5XG5SZXF1aXJlZCBmb3IgYm9vdGMgYnVpbGRzIHRvIGFsbG93IG5lc3RlZCBjb250YWluZXJzIHRvIHB1bGwgYnVpbGRlciBpbWFnZXNcbkV4YW1wbGU6IFwiZGVmYXVsdC1yb3V0ZS1vcGVuc2hpZnQtaW1hZ2UtcmVnaXN0cnkuYXBwcy5teWNsdXN0ZXIuZXhhbXBsZS5jb21cIiIsInR5cGUiOiJzdHJpbmcifSwiZW5hYmxlZCI6eyJkZWZhdWx0Ijp0cnVlLCJkZXNjcmlwdGlvbiI6IkVuYWJsZWQgZGV0ZXJtaW5lcyBpZiBUZWt0b24gdGFza3MgZm9yIE9TIGJ1aWxkcyBzaG91bGQgYmUgZGVwbG95ZWQiLCJ0eXBlIjoiYm9vbGVhbiJ9LCJtZW1vcnlWb2x1bWVTaXplIjp7ImRlc2NyaXB0aW9uIjoiTWVtb3J5Vm9sdW1lU2l6ZSBzcGVjaWZpZXMgdGhlIHNpemUgbGltaXQgZm9yIG1lbW9yeS1iYWNrZWQgdm9sdW1lcyAocmVxdWlyZWQgaWYgVXNlTWVtb3J5Vm9sdW1lcyBpcyB0cnVlKVxuRXhhbXBsZTogXCIyR2lcIiIsInR5cGUiOiJzdHJpbmcifSwicHZjU2l6ZSI6eyJkZXNjcmlwdGlvbiI6IlBWQ1NpemUgc3BlY2lmaWVzIHRoZSBzaXplIGZvciBwZXJzaXN0ZW50IHZvbHVtZSBjbGFpbXMgY3JlYXRlZCBmb3IgYnVpbGQgd29ya3NwYWNlc1xuRGVmYXVsdDogXCI4R2lcIiIsInR5cGUiOiJzdHJpbmcifSwicnVudGltZUNsYXNzTmFtZSI6eyJkZXNjcmlwdGlvbiI6IlJ1bnRpbWVDbGFzc05hbWUgc3BlY2lmaWVzIHRoZSBydW50aW1lIGNsYXNzIHRvIHVzZSBmb3IgdGhlIGJ1aWxkIHBvZFxuTW9yZSBpbmZvOiBodHRwczovL2t1YmVybmV0ZXMuaW8vZG9jcy9jb25jZXB0cy9jb250YWluZXJzL3J1bnRpbWUtY2xhc3MvIiwidHlwZSI6InN0cmluZyJ9LCJzZXJ2ZUV4cGlyeUhvdXJzIjp7ImRlc2NyaXB0aW9uIjoiU2VydmVFeHBpcnlIb3VycyBzcGVjaWZpZXMgaG93IGxvbmcgdG8gc2VydmUgYnVpbGQgYXJ0aWZhY3RzIGJlZm9yZSBhdXRvbWF0aWMgY2xlYW51cFxuRGVmYXVsdDogMjQiLCJmb3JtYXQiOiJpbnQzMiIsInR5cGUiOiJpbnRlZ2VyIn0sInVzZU1lbW9yeVZvbHVtZXMiOnsiZGVzY3JpcHRpb24iOiJVc2VNZW1vcnlWb2x1bWVzIGRldGVybWluZXMgd2hldGhlciB0byB1c2UgbWVtb3J5LWJhY2tlZCB2b2x1bWVzIGZvciBidWlsZCBvcGVyYXRpb25zIiwidHlwZSI6ImJvb2xlYW4ifX0sInJlcXVpcmVkIjpbImVuYWJsZWQiXSwidHlwZSI6Im9iamVjdCJ9LCJ3ZWJVSSI6eyJkZWZhdWx0Ijp0cnVlLCJkZXNjcmlwdGlvbiI6IldlYlVJIGRldGVybWluZXMgaWYgdGhlIHdlYiBVSSBzaG91bGQgYmUgZGVwbG95ZWQiLCJ0eXBlIjoiYm9vbGVhbiJ9fSwicmVxdWlyZWQiOlsid2ViVUkiXSwidHlwZSI6Im9iamVjdCJ9LCJzdGF0dXMiOnsiZGVzY3JpcHRpb24iOiJPcGVyYXRvckNvbmZpZ1N0YXR1cyBkZWZpbmVzIHRoZSBvYnNlcnZlZCBzdGF0ZSBvZiBPcGVyYXRvckNvbmZpZyIsInByb3BlcnRpZXMiOnsibWVzc2FnZSI6eyJkZXNjcmlwdGlvbiI6Ik1lc3NhZ2UgcHJvdmlkZXMgZGV0YWlsIGFib3V0IHRoZSBjdXJyZW50IHBoYXNlIiwidHlwZSI6InN0cmluZyJ9LCJvYnNlcnZlZEdlbmVyYXRpb24iOnsiZGVzY3JpcHRpb24iOiJPYnNlcnZlZEdlbmVyYXRpb24gaXMgdGhlIG1vc3QgcmVjZW50IGdlbmVyYXRpb24gb2JzZXJ2ZWQgYnkgdGhlIGNvbnRyb2xsZXIuIiwiZm9ybWF0IjoiaW50NjQiLCJ0eXBlIjoiaW50ZWdlciJ9LCJvc0J1aWxkc0RlcGxveWVkIjp7ImRlc2NyaXB0aW9uIjoiT1NCdWlsZHNEZXBsb3llZCBpbmRpY2F0ZXMgaWYgdGhlIE9TIEJ1aWxkcyBUZWt0b24gdGFza3MgYXJlIGN1cnJlbnRseSBkZXBsb3llZCIsInR5cGUiOiJib29sZWFuIn0sInBoYXNlIjp7ImRlc2NyaXB0aW9uIjoiUGhhc2UgcmVwcmVzZW50cyB0aGUgY3VycmVudCBwaGFzZSAoUmVhZHksIFJlY29uY2lsaW5nLCBGYWlsZWQpIiwidHlwZSI6InN0cmluZyJ9LCJ3ZWJVSURlcGxveWVkIjp7ImRlc2NyaXB0aW9uIjoiV2ViVUlEZXBsb3llZCBpbmRpY2F0ZXMgaWYgdGhlIFdlYlVJIGlzIGN1cnJlbnRseSBkZXBsb3llZCIsInR5cGUiOiJib29sZWFuIn19LCJ0eXBlIjoib2JqZWN0In19LCJ0eXBlIjoib2JqZWN0In19LCJzZXJ2ZWQiOnRydWUsInN0b3JhZ2UiOnRydWUsInN1YnJlc291cmNlcyI6eyJzdGF0dXMiOnt9fX1dfSwic3RhdHVzIjp7ImFjY2VwdGVkTmFtZXMiOnsia2luZCI6IiIsInBsdXJhbCI6IiJ9LCJjb25kaXRpb25zIjpudWxsLCJzdG9yZWRWZXJzaW9ucyI6bnVsbH19 - type: olm.bundle.object value: - data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"ImageBuild\",\n    \"metadata\": {\n      \"annotations\": {\n        \"description\": \"Example ImageBuild CR. The architecture can be set to any supported value like \\\"aarch64\\\", \\\"x86_64\\\", etc. See your build platform's documentation for supported values.\\n\"\n      },\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"imagebuild-sample\"\n    },\n    \"spec\": {\n      \"architecture\": \"amd64\",\n      \"automotiveImageBuilder\": \"quay.io/centos-sig-automotive/automotive-image-builder:1.0.0\",\n      \"distro\": \"cs9\",\n      \"exportFormat\": \"qcow2\",\n      \"manifestConfigMap\": \"mpp\",\n      \"mode\": \"image\",\n      \"serveArtifact\": false,\n      \"serveExpiryHours\": 24,\n      \"target\": \"qemu\"\n    }\n  },\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"OperatorConfig\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"automotive-dev\",\n      \"namespace\": \"automotive-dev-operator-system\"\n    },\n    \"spec\": {\n      \"osBuilds\": {\n        \"enabled\": true,\n        \"pvcSize\": \"8Gi\",\n        \"serveExpiryHours\": 24\n      },\n      \"webUI\": true\n    }\n  }\n]","capabilities":"Basic Install","categories":"Developer Tools","containerImage":"quay.io/rh-sdv-cloud/automotive-dev-operator:latest","createdAt":"2026-01-04T16:02:41Z","operatorframework.io/suggested-namespace":"automotive-dev-operator-system","operators.operatorframework.io/builder":"operator-sdk-v1.42.0","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4","repository":"https://github.com/centos-automotive-suite/automotive-dev-operator","support":"Red Hat"},"name":"automotive-dev-operator.v0.0.1","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"description":"ImageBuild is the Schema for the imagebuilds API","displayName":"Image Build","kind":"ImageBuild","name":"imagebuilds.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"Image is the Schema for the images API","displayName":"Image","kind":"Image","name":"images.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"OperatorConfig is the Schema for the operatorconfigs API","displayName":"Operator Config","kind":"OperatorConfig","name":"operatorconfigs.automotive.sdv.cloud.redhat.com","version":"v1alpha1"}]},"description":"CentOS Automotive Suite","displayName":"CentOS Automotive Suite","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","persistentvolumeclaims","pods","secrets","serviceaccounts","services"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]},{"apiGroups":[""],"resources":["namespaces"],"verbs":["create","get","list","watch"]},{"apiGroups":[""],"resources":["pods/exec"],"verbs":["create"]},{"apiGroups":[""],"resources":["pods/log"],"verbs":["get"]},{"apiGroups":["apps"],"resources":["deployments"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages","imagebuilds","images","operatorconfigs"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/finalizers","imagebuilds/finalizers","images/finalizers","operatorconfigs/finalizers"],"verbs":["update"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/status","imagebuilds/status","images/status","operatorconfigs/status"],"verbs":["get","patch","update"]},{"apiGroups":["networking.k8s.io"],"resources":["ingresses"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["rbac.authorization.k8s.io"],"resources":["clusterrolebindings","clusterroles","rolebindings"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["route.openshift.io"],"resources":["routes"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["create","delete","get","list","patch","update","use","watch"]},{"apiGroups":["tekton.dev"],"resources":["pipelineruns","pipelines","taskruns","tasks"],"verbs":["create","delete","get","list","patch","update","watch"]}],"serviceAccountName":"ado-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"automotive-dev-operator","control-plane":"controller-manager"},"name":"ado-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"control-plane":"controller-manager"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]},{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}},"containers":[{"args":["--leader-elect","--health-probe-bind-address=:8081","--metrics-bind-address=0"],"command":["/manager"],"env":[{"name":"BUILD_API_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"OPERATOR_IMAGE","value":"image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest"}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":8080,"name":"build-api"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"100m","memory":"256Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"initContainers":[{"command":["/init-secrets"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","name":"init-oauth-secrets","resources":{"limits":{"cpu":"100m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"32Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"securityContext":{"runAsNonRoot":true},"serviceAccountName":"ado-controller-manager","terminationGracePeriodSeconds":10}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"ado-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":false,"type":"AllNamespaces"}],"keywords":["automotive"],"links":[{"name":"CentOS Automotive Suite","url":"https://github.com/centos-automotive-suite/automotive-dev-operator"}],"maturity":"alpha","minKubeVersion":"1.26.0","provider":{"name":"Red Hat"},"version":"0.0.1"}} + data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"ImageBuild\",\n    \"metadata\": {\n      \"annotations\": {\n        \"description\": \"Example ImageBuild CR. The architecture can be set to any supported value like \\\"aarch64\\\", \\\"x86_64\\\", etc. See your build platform's documentation for supported values.\\n\"\n      },\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"imagebuild-sample\"\n    },\n    \"spec\": {\n      \"architecture\": \"amd64\",\n      \"automotiveImageBuilder\": \"quay.io/centos-sig-automotive/automotive-image-builder:1.0.0\",\n      \"distro\": \"cs9\",\n      \"exportFormat\": \"qcow2\",\n      \"manifestConfigMap\": \"mpp\",\n      \"mode\": \"image\",\n      \"serveArtifact\": false,\n      \"serveExpiryHours\": 24,\n      \"target\": \"qemu\"\n    }\n  },\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"OperatorConfig\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"automotive-dev\",\n      \"namespace\": \"automotive-dev-operator-system\"\n    },\n    \"spec\": {\n      \"osBuilds\": {\n        \"enabled\": true,\n        \"pvcSize\": \"8Gi\",\n        \"serveExpiryHours\": 24\n      },\n      \"webUI\": true\n    }\n  }\n]","capabilities":"Basic Install","categories":"Developer Tools","containerImage":"quay.io/rh-sdv-cloud/automotive-dev-operator:latest","createdAt":"2026-01-08T09:47:15Z","operatorframework.io/suggested-namespace":"automotive-dev-operator-system","operators.operatorframework.io/builder":"operator-sdk-v1.42.0","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4","repository":"https://github.com/centos-automotive-suite/automotive-dev-operator","support":"Red Hat"},"name":"automotive-dev-operator.v0.0.1","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"kind":"CatalogImage","name":"catalogimages.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"ImageBuild is the Schema for the imagebuilds API","displayName":"Image Build","kind":"ImageBuild","name":"imagebuilds.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"Image is the Schema for the images API","displayName":"Image","kind":"Image","name":"images.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"OperatorConfig is the Schema for the operatorconfigs API","displayName":"Operator Config","kind":"OperatorConfig","name":"operatorconfigs.automotive.sdv.cloud.redhat.com","version":"v1alpha1"}]},"description":"CentOS Automotive Suite","displayName":"CentOS Automotive Suite","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","persistentvolumeclaims","pods","secrets","serviceaccounts","services"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]},{"apiGroups":[""],"resources":["namespaces"],"verbs":["create","get","list","watch"]},{"apiGroups":[""],"resources":["pods/exec"],"verbs":["create"]},{"apiGroups":[""],"resources":["pods/log"],"verbs":["get"]},{"apiGroups":["apps"],"resources":["deployments"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages","imagebuilds","images","operatorconfigs"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/finalizers","imagebuilds/finalizers","images/finalizers","operatorconfigs/finalizers"],"verbs":["update"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/status","imagebuilds/status","images/status","operatorconfigs/status"],"verbs":["get","patch","update"]},{"apiGroups":["networking.k8s.io"],"resources":["ingresses"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["rbac.authorization.k8s.io"],"resources":["clusterrolebindings","clusterroles","rolebindings"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["route.openshift.io"],"resources":["routes"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["create","delete","get","list","patch","update","use","watch"]},{"apiGroups":["tekton.dev"],"resources":["pipelineruns","pipelines","taskruns","tasks"],"verbs":["create","delete","get","list","patch","update","watch"]}],"serviceAccountName":"ado-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"automotive-dev-operator","control-plane":"controller-manager"},"name":"ado-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"control-plane":"controller-manager"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]},{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}},"containers":[{"args":["--leader-elect","--health-probe-bind-address=:8081","--metrics-bind-address=0"],"command":["/manager"],"env":[{"name":"BUILD_API_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"OPERATOR_IMAGE","value":"image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest"}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":8080,"name":"build-api"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"100m","memory":"256Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"initContainers":[{"command":["/init-secrets"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","name":"init-oauth-secrets","resources":{"limits":{"cpu":"100m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"32Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"securityContext":{"runAsNonRoot":true},"serviceAccountName":"ado-controller-manager","terminationGracePeriodSeconds":10}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"ado-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":false,"type":"AllNamespaces"}],"keywords":["automotive"],"links":[{"name":"CentOS Automotive Suite","url":"https://github.com/centos-automotive-suite/automotive-dev-operator"}],"maturity":"alpha","minKubeVersion":"1.26.0","provider":{"name":"Red Hat"},"version":"0.0.1"}} - type: olm.bundle.object value: data: eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJhZG8ifSwibmFtZSI6ImFkby1pbWFnZS12aWV3ZXItcm9sZSJ9LCJydWxlcyI6W3siYXBpR3JvdXBzIjpbImF1dG9tb3RpdmUuc2R2LmNsb3VkLnJlZGhhdC5jb20iXSwicmVzb3VyY2VzIjpbImltYWdlcyJdLCJ2ZXJicyI6WyJnZXQiLCJsaXN0Iiwid2F0Y2giXX0seyJhcGlHcm91cHMiOlsiYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSJdLCJyZXNvdXJjZXMiOlsiaW1hZ2VzL3N0YXR1cyJdLCJ2ZXJicyI6WyJnZXQiXX1dfQ== @@ -83,6 +95,6 @@ properties: value: data: eyJhcGlWZXJzaW9uIjoidjEiLCJraW5kIjoiU2VydmljZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJhdXRvbW90aXZlLWRldi1vcGVyYXRvciIsImNvbnRyb2wtcGxhbmUiOiJjb250cm9sbGVyLW1hbmFnZXIifSwibmFtZSI6ImFkby1jb250cm9sbGVyLW1hbmFnZXItbWV0cmljcy1zZXJ2aWNlIn0sInNwZWMiOnsicG9ydHMiOlt7Im5hbWUiOiJodHRwcyIsInBvcnQiOjg0NDMsInByb3RvY29sIjoiVENQIiwidGFyZ2V0UG9ydCI6ODQ0M31dLCJzZWxlY3RvciI6eyJjb250cm9sLXBsYW5lIjoiY29udHJvbGxlci1tYW5hZ2VyIn19LCJzdGF0dXMiOnsibG9hZEJhbGFuY2VyIjp7fX19 relatedImages: -- image: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - name: manager +- image: default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest + name: "" schema: olm.bundle diff --git a/cmd/caib/main.go b/cmd/caib/main.go index 99fff51f..be9e6faa 100644 --- a/cmd/caib/main.go +++ b/cmd/caib/main.go @@ -188,7 +188,7 @@ Examples: buildCmd.Flags().StringVar(&containerPush, "push", "", "push bootc container to registry (required)") buildCmd.Flags().BoolVar(&buildDiskImage, "disk", false, "also build disk image from container") buildCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file (requires --disk)") - buildCmd.Flags().StringVar(&diskFormat, "format", "qcow2", "disk image format (qcow2, raw, simg)") + buildCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, image); inferred from output filename if not set") buildCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") buildCmd.Flags().StringVar(&exportOCI, "push-disk", "", "push disk image as OCI artifact to registry") buildCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") @@ -217,7 +217,7 @@ Examples: diskCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") diskCmd.Flags().StringVarP(&buildName, "name", "n", "", "name for the build job (auto-generated if omitted)") diskCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file") - diskCmd.Flags().StringVar(&diskFormat, "format", "qcow2", "disk image format (qcow2, raw, simg)") + diskCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, image); inferred from output filename if not set") diskCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") diskCmd.Flags().StringVar(&exportOCI, "push", "", "push disk image as OCI artifact to registry") diskCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") @@ -287,10 +287,7 @@ func runBuild(cmd *cobra.Command, args []string) { buildDiskImage = true // imply --disk when --output is specified } - // Validate: if downloading disk, need push-disk destination - if outputDir != "" && exportOCI == "" { - handleError(fmt.Errorf("--output requires --push-disk (disk image must be pushed to registry first for download)")) - } + // Note: diskFormat can be empty - AIB will default to raw (or infer from output filename extension) if strings.TrimSpace(authToken) == "" { if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { @@ -384,13 +381,21 @@ func runBuild(cmd *cobra.Command, args []string) { handleFileUploads(ctx, api, resp.Name, localRefs) } - if waitForBuild || followLogs || downloadFile != "" { + if waitForBuild || followLogs || outputDir != "" { waitForBuildCompletion(ctx, api, resp.Name, "") } if outputDir != "" { - if err := pullOCIArtifact(exportOCI, outputDir, registryUsername, registryPassword); err != nil { - handleError(fmt.Errorf("failed to download OCI artifact: %w", err)) + if exportOCI != "" { + // Download via OCI registry (pushed as artifact) + if err := pullOCIArtifact(exportOCI, outputDir, registryUsername, registryPassword); err != nil { + handleError(fmt.Errorf("failed to download OCI artifact: %w", err)) + } + } else { + // Download directly from cluster via artifact API + if err := downloadArtifactViaAPI(ctx, serverURL, buildName, filepath.Dir(outputDir)); err != nil { + handleError(fmt.Errorf("failed to download artifact: %w", err)) + } } } } @@ -419,6 +424,8 @@ func runDisk(cmd *cobra.Command, args []string) { fmt.Printf("Auto-generated build name: %s\n", buildName) } + // Note: diskFormat can be empty - AIB will default to raw (or infer from output filename extension) + if strings.TrimSpace(authToken) == "" { if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { authToken = tok @@ -469,6 +476,7 @@ func runDisk(cmd *cobra.Command, args []string) { StorageClass: storageClass, Compression: compressionAlgo, ExportOCI: exportOCI, + ServeArtifact: outputDir != "" && exportOCI == "", } if effectiveRegistryURL != "" && registryUsername != "" && registryPassword != "" { @@ -491,9 +499,17 @@ func runDisk(cmd *cobra.Command, args []string) { waitForBuildCompletion(ctx, api, resp.Name, "") } - if outputDir != "" && exportOCI != "" { - if err := pullOCIArtifact(exportOCI, outputDir, registryUsername, registryPassword); err != nil { - handleError(fmt.Errorf("failed to download OCI artifact: %w", err)) + if outputDir != "" { + if exportOCI != "" { + // Download via OCI registry + if err := pullOCIArtifact(exportOCI, outputDir, registryUsername, registryPassword); err != nil { + handleError(fmt.Errorf("failed to download OCI artifact: %w", err)) + } + } else { + // Download directly from cluster via artifact API + if err := downloadArtifactViaAPI(ctx, serverURL, buildName, filepath.Dir(outputDir)); err != nil { + handleError(fmt.Errorf("failed to download artifact: %w", err)) + } } } } diff --git a/internal/buildapi/server.go b/internal/buildapi/server.go index 604c1dc2..7a3ca047 100644 --- a/internal/buildapi/server.go +++ b/internal/buildapi/server.go @@ -822,6 +822,9 @@ func createBuild(c *gin.Context) { return } + // Debug logging for containerRef + fmt.Printf("DEBUG: Received request - Mode: %s, ContainerRef: %q\n", req.Mode, req.ContainerRef) + needsUpload := strings.Contains(req.Manifest, "source_path") // Disk mode uses ContainerRef instead of a manifest diff --git a/internal/common/tasks/scripts/build_image.sh b/internal/common/tasks/scripts/build_image.sh index 0350de87..9e531a6a 100644 --- a/internal/common/tasks/scripts/build_image.sh +++ b/internal/common/tasks/scripts/build_image.sh @@ -152,12 +152,26 @@ mount --bind "$destPath" "$osbuildPath" cd $(workspaces.shared-workspace.path) -if [ "$(params.export-format)" = "image" ]; then +EXPORT_FORMAT="$(params.export-format)" +# If format is empty, AIB defaults to raw +if [ -z "$EXPORT_FORMAT" ] || [ "$EXPORT_FORMAT" = "image" ]; then file_extension=".raw" -elif [ "$(params.export-format)" = "qcow2" ]; then +elif [ "$EXPORT_FORMAT" = "qcow2" ]; then file_extension=".qcow2" else - file_extension=".$(params.export-format)" + file_extension=".$EXPORT_FORMAT" +fi + +# Only pass --format to AIB if explicitly specified +# Note: to-disk-image accepts raw/qcow2/simg, not "image" +FORMAT_ARG="" +if [ -n "$EXPORT_FORMAT" ]; then + AIB_FORMAT="$EXPORT_FORMAT" + # Translate "image" to "raw" for AIB compatibility + if [ "$AIB_FORMAT" = "image" ]; then + AIB_FORMAT="raw" + fi + FORMAT_ARG="--format $AIB_FORMAT" fi cleanName=$(params.distro)-$(params.target) @@ -246,20 +260,27 @@ BUILDER_IMAGE="$(params.builder-image)" CLUSTER_REGISTRY_ROUTE="$(params.cluster-registry-route)" CONTAINER_REF="$(params.container-ref)" +echo "=== Build Configuration ===" +echo "BUILD_MODE: $BUILD_MODE" +echo "CONTAINER_PUSH: ${CONTAINER_PUSH:-}" +echo "BUILD_DISK_IMAGE: $BUILD_DISK_IMAGE" +echo "EXPORT_OCI: ${EXPORT_OCI:-}" +echo "===========================" + BOOTC_CONTAINER_NAME="localhost/aib-build:$(params.distro)-$(params.target)" BUILD_CONTAINER_ARG="" LOCAL_BUILDER_IMAGE="localhost/aib-build:$(params.distro)-$TARGET_ARCH" -# For bootc builds, if no builder-image is provided but cluster-registry-route is set, +# For bootc/disk builds, if no builder-image is provided but cluster-registry-route is set, # use the image that prepare-builder cached in the cluster registry -if [ -z "$BUILDER_IMAGE" ] && [ "$BUILD_MODE" = "bootc" ] && [ -n "$CLUSTER_REGISTRY_ROUTE" ]; then +if [ -z "$BUILDER_IMAGE" ] && { [ "$BUILD_MODE" = "bootc" ] || [ "$BUILD_MODE" = "disk" ]; } && [ -n "$CLUSTER_REGISTRY_ROUTE" ]; then NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace) BUILDER_IMAGE="${CLUSTER_REGISTRY_ROUTE}/${NAMESPACE}/aib-build:$(params.distro)-$TARGET_ARCH" echo "Using builder image from cluster registry: $BUILDER_IMAGE" fi -if [ -n "$BUILDER_IMAGE" ] && [ "$BUILD_MODE" = "bootc" ]; then +if [ -n "$BUILDER_IMAGE" ] && { [ "$BUILD_MODE" = "bootc" ] || [ "$BUILD_MODE" = "disk" ]; }; then echo "Pulling builder image to local storage: $BUILDER_IMAGE" TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token 2>/dev/null || echo "") @@ -301,18 +322,26 @@ if [ "$USE_OVERRIDE" = true ]; then else case "$BUILD_MODE" in bootc) + # Build bootc container and optionally disk image in a single command + # aib build takes: manifest out [disk] where disk is optional + DISK_OUTPUT="" + if [ "$BUILD_DISK_IMAGE" = "true" ]; then + DISK_OUTPUT="/output/${exportFile}" + fi + build_command="aib --verbose build \ --distro $(params.distro) \ --target $(params.target) \ --arch=${arch} \ --build-dir=/output/_build \ --osbuild-manifest=/output/image.json \ + $FORMAT_ARG \ $BUILD_CONTAINER_ARG \ $CUSTOM_DEFS \ $AIB_ARGS \ $MANIFEST_FILE \ $BOOTC_CONTAINER_NAME \ - /output/${exportFile}" + $DISK_OUTPUT" echo "Running bootc build: $build_command" eval "$build_command" @@ -324,6 +353,11 @@ else "docker://$CONTAINER_PUSH" echo "Container pushed successfully to $CONTAINER_PUSH" fi + + if [ "$BUILD_DISK_IMAGE" = "true" ]; then + echo "Disk image created: /output/${exportFile}" + # Note: Disk image push to OCI registry is handled by the separate push-disk-artifact task + fi ;; image) build_command="aib-dev --verbose \ @@ -332,7 +366,7 @@ else --distro $(params.distro) \ --target $(params.target) \ --arch=${arch} \ - --format $(params.export-format) \ + $FORMAT_ARG \ --build-dir=/output/_build \ --osbuild-manifest=/output/image.json \ $AIB_ARGS \ @@ -348,7 +382,7 @@ else --distro $(params.distro) \ --target $(params.target) \ --arch=${arch} \ - --format $(params.export-format) \ + $FORMAT_ARG \ --build-dir=/output/_build \ --osbuild-manifest=/output/image.json \ $AIB_ARGS \ @@ -367,17 +401,24 @@ else # Pull the container image first echo "Pulling container image..." - skopeo copy --authfile="$REGISTRY_AUTH_FILE" \ - "docker://$CONTAINER_REF" \ - "containers-storage:$CONTAINER_REF" + # Try without auth first (for public images), fall back to auth file if needed + if ! skopeo copy "docker://$CONTAINER_REF" "containers-storage:$CONTAINER_REF" 2>/dev/null; then + echo "Public pull failed, trying with auth..." + skopeo copy --authfile="$REGISTRY_AUTH_FILE" \ + "docker://$CONTAINER_REF" \ + "containers-storage:$CONTAINER_REF" + fi + # to-disk-image only accepts: --format, --build-container, src_container, out build_command="aib --verbose to-disk-image \ - --target $(params.target) \ - --build-dir=/output/_build \ + $FORMAT_ARG \ + $BUILD_CONTAINER_ARG \ $CONTAINER_REF \ /output/${exportFile}" echo "Running to-disk-image: $build_command" eval "$build_command" + + # Note: Disk image push to OCI registry is handled by the separate push-disk-artifact task ;; *) echo "Error: Unknown build mode '$BUILD_MODE'. Supported modes: bootc, image, package, disk" From 711611fcfe3bb439b377d42305590e814ccb3a58 Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Thu, 8 Jan 2026 15:36:55 +0200 Subject: [PATCH 3/7] fix arg text Signed-off-by: Benny Zlotnik --- ...ve-dev-operator.clusterserviceversion.yaml | 2 +- catalog/automotive-dev-operator.yaml | 2 +- cmd/caib/README.md | 153 +++++--- cmd/caib/main.go | 341 +++++++++++------- internal/buildapi/server.go | 241 ++++--------- internal/buildapi/types.go | 27 +- internal/common/tasks/scripts/build_image.sh | 25 +- internal/controller/imagebuild/controller.go | 57 ++- 8 files changed, 451 insertions(+), 397 deletions(-) diff --git a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml index 0f206c12..58037f2c 100644 --- a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml +++ b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml @@ -53,7 +53,7 @@ metadata: capabilities: Basic Install categories: Developer Tools containerImage: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - createdAt: "2026-01-08T09:47:15Z" + createdAt: "2026-01-09T11:11:25Z" operatorframework.io/suggested-namespace: automotive-dev-operator-system operators.operatorframework.io/builder: operator-sdk-v1.42.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 diff --git a/catalog/automotive-dev-operator.yaml b/catalog/automotive-dev-operator.yaml index 9740f357..e45a1647 100644 --- a/catalog/automotive-dev-operator.yaml +++ b/catalog/automotive-dev-operator.yaml @@ -60,7 +60,7 @@ properties: data: eyJhcGlWZXJzaW9uIjoiYXBpZXh0ZW5zaW9ucy5rOHMuaW8vdjEiLCJraW5kIjoiQ3VzdG9tUmVzb3VyY2VEZWZpbml0aW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiY29udHJvbGxlci1nZW4ua3ViZWJ1aWxkZXIuaW8vdmVyc2lvbiI6InYwLjE5LjAifSwiY3JlYXRpb25UaW1lc3RhbXAiOm51bGwsIm5hbWUiOiJvcGVyYXRvcmNvbmZpZ3MuYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSJ9LCJzcGVjIjp7Imdyb3VwIjoiYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSIsIm5hbWVzIjp7ImtpbmQiOiJPcGVyYXRvckNvbmZpZyIsImxpc3RLaW5kIjoiT3BlcmF0b3JDb25maWdMaXN0IiwicGx1cmFsIjoib3BlcmF0b3Jjb25maWdzIiwic2luZ3VsYXIiOiJvcGVyYXRvcmNvbmZpZyJ9LCJzY29wZSI6Ik5hbWVzcGFjZWQiLCJ2ZXJzaW9ucyI6W3siYWRkaXRpb25hbFByaW50ZXJDb2x1bW5zIjpbeyJqc29uUGF0aCI6Ii5zcGVjLndlYlVJIiwibmFtZSI6IldlYlVJIiwidHlwZSI6ImJvb2xlYW4ifSx7Impzb25QYXRoIjoiLnNwZWMub3NCdWlsZHMuZW5hYmxlZCIsIm5hbWUiOiJPUyBCdWlsZHMiLCJ0eXBlIjoiYm9vbGVhbiJ9LHsianNvblBhdGgiOiIuc3RhdHVzLnBoYXNlIiwibmFtZSI6IlBoYXNlIiwidHlwZSI6InN0cmluZyJ9LHsianNvblBhdGgiOiIubWV0YWRhdGEuY3JlYXRpb25UaW1lc3RhbXAiLCJuYW1lIjoiQWdlIiwidHlwZSI6ImRhdGUifV0sIm5hbWUiOiJ2MWFscGhhMSIsInNjaGVtYSI6eyJvcGVuQVBJVjNTY2hlbWEiOnsiZGVzY3JpcHRpb24iOiJPcGVyYXRvckNvbmZpZyBpcyB0aGUgU2NoZW1hIGZvciB0aGUgb3BlcmF0b3Jjb25maWdzIEFQSSIsInByb3BlcnRpZXMiOnsiYXBpVmVyc2lvbiI6eyJkZXNjcmlwdGlvbiI6IkFQSVZlcnNpb24gZGVmaW5lcyB0aGUgdmVyc2lvbmVkIHNjaGVtYSBvZiB0aGlzIHJlcHJlc2VudGF0aW9uIG9mIGFuIG9iamVjdC5cblNlcnZlcnMgc2hvdWxkIGNvbnZlcnQgcmVjb2duaXplZCBzY2hlbWFzIHRvIHRoZSBsYXRlc3QgaW50ZXJuYWwgdmFsdWUsIGFuZFxubWF5IHJlamVjdCB1bnJlY29nbml6ZWQgdmFsdWVzLlxuTW9yZSBpbmZvOiBodHRwczovL2dpdC5rOHMuaW8vY29tbXVuaXR5L2NvbnRyaWJ1dG9ycy9kZXZlbC9zaWctYXJjaGl0ZWN0dXJlL2FwaS1jb252ZW50aW9ucy5tZCNyZXNvdXJjZXMiLCJ0eXBlIjoic3RyaW5nIn0sImtpbmQiOnsiZGVzY3JpcHRpb24iOiJLaW5kIGlzIGEgc3RyaW5nIHZhbHVlIHJlcHJlc2VudGluZyB0aGUgUkVTVCByZXNvdXJjZSB0aGlzIG9iamVjdCByZXByZXNlbnRzLlxuU2VydmVycyBtYXkgaW5mZXIgdGhpcyBmcm9tIHRoZSBlbmRwb2ludCB0aGUgY2xpZW50IHN1Ym1pdHMgcmVxdWVzdHMgdG8uXG5DYW5ub3QgYmUgdXBkYXRlZC5cbkluIENhbWVsQ2FzZS5cbk1vcmUgaW5mbzogaHR0cHM6Ly9naXQuazhzLmlvL2NvbW11bml0eS9jb250cmlidXRvcnMvZGV2ZWwvc2lnLWFyY2hpdGVjdHVyZS9hcGktY29udmVudGlvbnMubWQjdHlwZXMta2luZHMiLCJ0eXBlIjoic3RyaW5nIn0sIm1ldGFkYXRhIjp7InR5cGUiOiJvYmplY3QifSwic3BlYyI6eyJkZXNjcmlwdGlvbiI6Ik9wZXJhdG9yQ29uZmlnU3BlYyBkZWZpbmVzIHRoZSBkZXNpcmVkIHN0YXRlIG9mIE9wZXJhdG9yQ29uZmlnIiwicHJvcGVydGllcyI6eyJvc0J1aWxkcyI6eyJkZXNjcmlwdGlvbiI6Ik9TQnVpbGRzIGRlZmluZXMgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIE9TIGJ1aWxkIG9wZXJhdGlvbnMiLCJwcm9wZXJ0aWVzIjp7ImNsdXN0ZXJSZWdpc3RyeVJvdXRlIjp7ImRlc2NyaXB0aW9uIjoiQ2x1c3RlclJlZ2lzdHJ5Um91dGUgaXMgdGhlIGV4dGVybmFsIHJvdXRlIGZvciB0aGUgY2x1c3RlcidzIGludGVybmFsIGltYWdlIHJlZ2lzdHJ5XG5SZXF1aXJlZCBmb3IgYm9vdGMgYnVpbGRzIHRvIGFsbG93IG5lc3RlZCBjb250YWluZXJzIHRvIHB1bGwgYnVpbGRlciBpbWFnZXNcbkV4YW1wbGU6IFwiZGVmYXVsdC1yb3V0ZS1vcGVuc2hpZnQtaW1hZ2UtcmVnaXN0cnkuYXBwcy5teWNsdXN0ZXIuZXhhbXBsZS5jb21cIiIsInR5cGUiOiJzdHJpbmcifSwiZW5hYmxlZCI6eyJkZWZhdWx0Ijp0cnVlLCJkZXNjcmlwdGlvbiI6IkVuYWJsZWQgZGV0ZXJtaW5lcyBpZiBUZWt0b24gdGFza3MgZm9yIE9TIGJ1aWxkcyBzaG91bGQgYmUgZGVwbG95ZWQiLCJ0eXBlIjoiYm9vbGVhbiJ9LCJtZW1vcnlWb2x1bWVTaXplIjp7ImRlc2NyaXB0aW9uIjoiTWVtb3J5Vm9sdW1lU2l6ZSBzcGVjaWZpZXMgdGhlIHNpemUgbGltaXQgZm9yIG1lbW9yeS1iYWNrZWQgdm9sdW1lcyAocmVxdWlyZWQgaWYgVXNlTWVtb3J5Vm9sdW1lcyBpcyB0cnVlKVxuRXhhbXBsZTogXCIyR2lcIiIsInR5cGUiOiJzdHJpbmcifSwicHZjU2l6ZSI6eyJkZXNjcmlwdGlvbiI6IlBWQ1NpemUgc3BlY2lmaWVzIHRoZSBzaXplIGZvciBwZXJzaXN0ZW50IHZvbHVtZSBjbGFpbXMgY3JlYXRlZCBmb3IgYnVpbGQgd29ya3NwYWNlc1xuRGVmYXVsdDogXCI4R2lcIiIsInR5cGUiOiJzdHJpbmcifSwicnVudGltZUNsYXNzTmFtZSI6eyJkZXNjcmlwdGlvbiI6IlJ1bnRpbWVDbGFzc05hbWUgc3BlY2lmaWVzIHRoZSBydW50aW1lIGNsYXNzIHRvIHVzZSBmb3IgdGhlIGJ1aWxkIHBvZFxuTW9yZSBpbmZvOiBodHRwczovL2t1YmVybmV0ZXMuaW8vZG9jcy9jb25jZXB0cy9jb250YWluZXJzL3J1bnRpbWUtY2xhc3MvIiwidHlwZSI6InN0cmluZyJ9LCJzZXJ2ZUV4cGlyeUhvdXJzIjp7ImRlc2NyaXB0aW9uIjoiU2VydmVFeHBpcnlIb3VycyBzcGVjaWZpZXMgaG93IGxvbmcgdG8gc2VydmUgYnVpbGQgYXJ0aWZhY3RzIGJlZm9yZSBhdXRvbWF0aWMgY2xlYW51cFxuRGVmYXVsdDogMjQiLCJmb3JtYXQiOiJpbnQzMiIsInR5cGUiOiJpbnRlZ2VyIn0sInVzZU1lbW9yeVZvbHVtZXMiOnsiZGVzY3JpcHRpb24iOiJVc2VNZW1vcnlWb2x1bWVzIGRldGVybWluZXMgd2hldGhlciB0byB1c2UgbWVtb3J5LWJhY2tlZCB2b2x1bWVzIGZvciBidWlsZCBvcGVyYXRpb25zIiwidHlwZSI6ImJvb2xlYW4ifX0sInJlcXVpcmVkIjpbImVuYWJsZWQiXSwidHlwZSI6Im9iamVjdCJ9LCJ3ZWJVSSI6eyJkZWZhdWx0Ijp0cnVlLCJkZXNjcmlwdGlvbiI6IldlYlVJIGRldGVybWluZXMgaWYgdGhlIHdlYiBVSSBzaG91bGQgYmUgZGVwbG95ZWQiLCJ0eXBlIjoiYm9vbGVhbiJ9fSwicmVxdWlyZWQiOlsid2ViVUkiXSwidHlwZSI6Im9iamVjdCJ9LCJzdGF0dXMiOnsiZGVzY3JpcHRpb24iOiJPcGVyYXRvckNvbmZpZ1N0YXR1cyBkZWZpbmVzIHRoZSBvYnNlcnZlZCBzdGF0ZSBvZiBPcGVyYXRvckNvbmZpZyIsInByb3BlcnRpZXMiOnsibWVzc2FnZSI6eyJkZXNjcmlwdGlvbiI6Ik1lc3NhZ2UgcHJvdmlkZXMgZGV0YWlsIGFib3V0IHRoZSBjdXJyZW50IHBoYXNlIiwidHlwZSI6InN0cmluZyJ9LCJvYnNlcnZlZEdlbmVyYXRpb24iOnsiZGVzY3JpcHRpb24iOiJPYnNlcnZlZEdlbmVyYXRpb24gaXMgdGhlIG1vc3QgcmVjZW50IGdlbmVyYXRpb24gb2JzZXJ2ZWQgYnkgdGhlIGNvbnRyb2xsZXIuIiwiZm9ybWF0IjoiaW50NjQiLCJ0eXBlIjoiaW50ZWdlciJ9LCJvc0J1aWxkc0RlcGxveWVkIjp7ImRlc2NyaXB0aW9uIjoiT1NCdWlsZHNEZXBsb3llZCBpbmRpY2F0ZXMgaWYgdGhlIE9TIEJ1aWxkcyBUZWt0b24gdGFza3MgYXJlIGN1cnJlbnRseSBkZXBsb3llZCIsInR5cGUiOiJib29sZWFuIn0sInBoYXNlIjp7ImRlc2NyaXB0aW9uIjoiUGhhc2UgcmVwcmVzZW50cyB0aGUgY3VycmVudCBwaGFzZSAoUmVhZHksIFJlY29uY2lsaW5nLCBGYWlsZWQpIiwidHlwZSI6InN0cmluZyJ9LCJ3ZWJVSURlcGxveWVkIjp7ImRlc2NyaXB0aW9uIjoiV2ViVUlEZXBsb3llZCBpbmRpY2F0ZXMgaWYgdGhlIFdlYlVJIGlzIGN1cnJlbnRseSBkZXBsb3llZCIsInR5cGUiOiJib29sZWFuIn19LCJ0eXBlIjoib2JqZWN0In19LCJ0eXBlIjoib2JqZWN0In19LCJzZXJ2ZWQiOnRydWUsInN0b3JhZ2UiOnRydWUsInN1YnJlc291cmNlcyI6eyJzdGF0dXMiOnt9fX1dfSwic3RhdHVzIjp7ImFjY2VwdGVkTmFtZXMiOnsia2luZCI6IiIsInBsdXJhbCI6IiJ9LCJjb25kaXRpb25zIjpudWxsLCJzdG9yZWRWZXJzaW9ucyI6bnVsbH19 - type: olm.bundle.object value: - data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"ImageBuild\",\n    \"metadata\": {\n      \"annotations\": {\n        \"description\": \"Example ImageBuild CR. The architecture can be set to any supported value like \\\"aarch64\\\", \\\"x86_64\\\", etc. See your build platform's documentation for supported values.\\n\"\n      },\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"imagebuild-sample\"\n    },\n    \"spec\": {\n      \"architecture\": \"amd64\",\n      \"automotiveImageBuilder\": \"quay.io/centos-sig-automotive/automotive-image-builder:1.0.0\",\n      \"distro\": \"cs9\",\n      \"exportFormat\": \"qcow2\",\n      \"manifestConfigMap\": \"mpp\",\n      \"mode\": \"image\",\n      \"serveArtifact\": false,\n      \"serveExpiryHours\": 24,\n      \"target\": \"qemu\"\n    }\n  },\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"OperatorConfig\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"automotive-dev\",\n      \"namespace\": \"automotive-dev-operator-system\"\n    },\n    \"spec\": {\n      \"osBuilds\": {\n        \"enabled\": true,\n        \"pvcSize\": \"8Gi\",\n        \"serveExpiryHours\": 24\n      },\n      \"webUI\": true\n    }\n  }\n]","capabilities":"Basic Install","categories":"Developer Tools","containerImage":"quay.io/rh-sdv-cloud/automotive-dev-operator:latest","createdAt":"2026-01-08T09:47:15Z","operatorframework.io/suggested-namespace":"automotive-dev-operator-system","operators.operatorframework.io/builder":"operator-sdk-v1.42.0","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4","repository":"https://github.com/centos-automotive-suite/automotive-dev-operator","support":"Red Hat"},"name":"automotive-dev-operator.v0.0.1","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"kind":"CatalogImage","name":"catalogimages.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"ImageBuild is the Schema for the imagebuilds API","displayName":"Image Build","kind":"ImageBuild","name":"imagebuilds.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"Image is the Schema for the images API","displayName":"Image","kind":"Image","name":"images.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"OperatorConfig is the Schema for the operatorconfigs API","displayName":"Operator Config","kind":"OperatorConfig","name":"operatorconfigs.automotive.sdv.cloud.redhat.com","version":"v1alpha1"}]},"description":"CentOS Automotive Suite","displayName":"CentOS Automotive Suite","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","persistentvolumeclaims","pods","secrets","serviceaccounts","services"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]},{"apiGroups":[""],"resources":["namespaces"],"verbs":["create","get","list","watch"]},{"apiGroups":[""],"resources":["pods/exec"],"verbs":["create"]},{"apiGroups":[""],"resources":["pods/log"],"verbs":["get"]},{"apiGroups":["apps"],"resources":["deployments"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages","imagebuilds","images","operatorconfigs"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/finalizers","imagebuilds/finalizers","images/finalizers","operatorconfigs/finalizers"],"verbs":["update"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/status","imagebuilds/status","images/status","operatorconfigs/status"],"verbs":["get","patch","update"]},{"apiGroups":["networking.k8s.io"],"resources":["ingresses"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["rbac.authorization.k8s.io"],"resources":["clusterrolebindings","clusterroles","rolebindings"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["route.openshift.io"],"resources":["routes"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["create","delete","get","list","patch","update","use","watch"]},{"apiGroups":["tekton.dev"],"resources":["pipelineruns","pipelines","taskruns","tasks"],"verbs":["create","delete","get","list","patch","update","watch"]}],"serviceAccountName":"ado-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"automotive-dev-operator","control-plane":"controller-manager"},"name":"ado-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"control-plane":"controller-manager"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]},{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}},"containers":[{"args":["--leader-elect","--health-probe-bind-address=:8081","--metrics-bind-address=0"],"command":["/manager"],"env":[{"name":"BUILD_API_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"OPERATOR_IMAGE","value":"image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest"}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":8080,"name":"build-api"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"100m","memory":"256Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"initContainers":[{"command":["/init-secrets"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","name":"init-oauth-secrets","resources":{"limits":{"cpu":"100m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"32Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"securityContext":{"runAsNonRoot":true},"serviceAccountName":"ado-controller-manager","terminationGracePeriodSeconds":10}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"ado-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":false,"type":"AllNamespaces"}],"keywords":["automotive"],"links":[{"name":"CentOS Automotive Suite","url":"https://github.com/centos-automotive-suite/automotive-dev-operator"}],"maturity":"alpha","minKubeVersion":"1.26.0","provider":{"name":"Red Hat"},"version":"0.0.1"}} + data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"ImageBuild\",\n    \"metadata\": {\n      \"annotations\": {\n        \"description\": \"Example ImageBuild CR. The architecture can be set to any supported value like \\\"aarch64\\\", \\\"x86_64\\\", etc. See your build platform's documentation for supported values.\\n\"\n      },\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"imagebuild-sample\"\n    },\n    \"spec\": {\n      \"architecture\": \"amd64\",\n      \"automotiveImageBuilder\": \"quay.io/centos-sig-automotive/automotive-image-builder:1.0.0\",\n      \"distro\": \"cs9\",\n      \"exportFormat\": \"qcow2\",\n      \"manifestConfigMap\": \"mpp\",\n      \"mode\": \"image\",\n      \"serveArtifact\": false,\n      \"serveExpiryHours\": 24,\n      \"target\": \"qemu\"\n    }\n  },\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"OperatorConfig\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"automotive-dev\",\n      \"namespace\": \"automotive-dev-operator-system\"\n    },\n    \"spec\": {\n      \"osBuilds\": {\n        \"enabled\": true,\n        \"pvcSize\": \"8Gi\",\n        \"serveExpiryHours\": 24\n      },\n      \"webUI\": true\n    }\n  }\n]","capabilities":"Basic Install","categories":"Developer Tools","containerImage":"quay.io/rh-sdv-cloud/automotive-dev-operator:latest","createdAt":"2026-01-09T11:11:25Z","operatorframework.io/suggested-namespace":"automotive-dev-operator-system","operators.operatorframework.io/builder":"operator-sdk-v1.42.0","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4","repository":"https://github.com/centos-automotive-suite/automotive-dev-operator","support":"Red Hat"},"name":"automotive-dev-operator.v0.0.1","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"kind":"CatalogImage","name":"catalogimages.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"ImageBuild is the Schema for the imagebuilds API","displayName":"Image Build","kind":"ImageBuild","name":"imagebuilds.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"Image is the Schema for the images API","displayName":"Image","kind":"Image","name":"images.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"OperatorConfig is the Schema for the operatorconfigs API","displayName":"Operator Config","kind":"OperatorConfig","name":"operatorconfigs.automotive.sdv.cloud.redhat.com","version":"v1alpha1"}]},"description":"CentOS Automotive Suite","displayName":"CentOS Automotive Suite","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","persistentvolumeclaims","pods","secrets","serviceaccounts","services"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]},{"apiGroups":[""],"resources":["namespaces"],"verbs":["create","get","list","watch"]},{"apiGroups":[""],"resources":["pods/exec"],"verbs":["create"]},{"apiGroups":[""],"resources":["pods/log"],"verbs":["get"]},{"apiGroups":["apps"],"resources":["deployments"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages","imagebuilds","images","operatorconfigs"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/finalizers","imagebuilds/finalizers","images/finalizers","operatorconfigs/finalizers"],"verbs":["update"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/status","imagebuilds/status","images/status","operatorconfigs/status"],"verbs":["get","patch","update"]},{"apiGroups":["networking.k8s.io"],"resources":["ingresses"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["rbac.authorization.k8s.io"],"resources":["clusterrolebindings","clusterroles","rolebindings"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["route.openshift.io"],"resources":["routes"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["create","delete","get","list","patch","update","use","watch"]},{"apiGroups":["tekton.dev"],"resources":["pipelineruns","pipelines","taskruns","tasks"],"verbs":["create","delete","get","list","patch","update","watch"]}],"serviceAccountName":"ado-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"automotive-dev-operator","control-plane":"controller-manager"},"name":"ado-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"control-plane":"controller-manager"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]},{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}},"containers":[{"args":["--leader-elect","--health-probe-bind-address=:8081","--metrics-bind-address=0"],"command":["/manager"],"env":[{"name":"BUILD_API_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"OPERATOR_IMAGE","value":"image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest"}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":8080,"name":"build-api"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"100m","memory":"256Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"initContainers":[{"command":["/init-secrets"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","name":"init-oauth-secrets","resources":{"limits":{"cpu":"100m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"32Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"securityContext":{"runAsNonRoot":true},"serviceAccountName":"ado-controller-manager","terminationGracePeriodSeconds":10}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"ado-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":false,"type":"AllNamespaces"}],"keywords":["automotive"],"links":[{"name":"CentOS Automotive Suite","url":"https://github.com/centos-automotive-suite/automotive-dev-operator"}],"maturity":"alpha","minKubeVersion":"1.26.0","provider":{"name":"Red Hat"},"version":"0.0.1"}} - type: olm.bundle.object value: data: eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJhZG8ifSwibmFtZSI6ImFkby1pbWFnZS12aWV3ZXItcm9sZSJ9LCJydWxlcyI6W3siYXBpR3JvdXBzIjpbImF1dG9tb3RpdmUuc2R2LmNsb3VkLnJlZGhhdC5jb20iXSwicmVzb3VyY2VzIjpbImltYWdlcyJdLCJ2ZXJicyI6WyJnZXQiLCJsaXN0Iiwid2F0Y2giXX0seyJhcGlHcm91cHMiOlsiYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSJdLCJyZXNvdXJjZXMiOlsiaW1hZ2VzL3N0YXR1cyJdLCJ2ZXJicyI6WyJnZXQiXX1dfQ== diff --git a/cmd/caib/README.md b/cmd/caib/README.md index 2e1210eb..650094af 100644 --- a/cmd/caib/README.md +++ b/cmd/caib/README.md @@ -25,8 +25,7 @@ export CAIB_SERVER=https://your-build-api.example Build a bootc container and push it to a registry: ```bash -bin/caib build-bootc manifest.aib.yml \ - --name my-bootc-build \ +bin/caib build manifest.aib.yml \ --arch arm64 \ --push quay.io/myorg/automotive-os:latest \ --follow @@ -43,14 +42,12 @@ bootc switch quay.io/myorg/automotive-os:latest Build a bootc container and also create a disk image from it: ```bash -bin/caib build-bootc manifest.aib.yml \ - --name my-disk-build \ +bin/caib build manifest.aib.yml \ --arch arm64 \ --push quay.io/myorg/automotive-os:latest \ - --build-disk-image \ - --format qcow2 \ - --export-oci quay.io/myorg/automotive-disk:latest \ - --download ./output/disk.qcow2 \ + --disk \ + --push-disk quay.io/myorg/automotive-disk:latest \ + -o ./output/disk.qcow2 \ --follow ``` @@ -59,49 +56,48 @@ bin/caib build-bootc manifest.aib.yml \ Build an ostree-based or package-based disk image: ```bash -bin/caib build-traditional manifest.aib.yml \ - --name my-traditional-build \ +bin/caib build-legacy manifest.aib.yml \ --arch arm64 \ --mode image \ - --export qcow2 \ - --download ./output/disk.qcow2 \ + --format qcow2 \ + -o ./output/disk.qcow2 \ --follow ``` ## Commands -### build-bootc +### build -Builds a bootc container image with optional disk image creation. +Builds a bootc container image with optional disk image creation. This is the recommended approach for production. ```bash -bin/caib build-bootc [flags] +bin/caib build [flags] ``` **Required flags:** | Flag | Description | |------|-------------| -| `--name` | Unique build name | -| `--arch` | Architecture (`amd64`, `arm64`) | +| `--push` | Push bootc container to registry (e.g., `quay.io/org/image:tag`) | **Optional flags:** | Flag | Default | Description | |------|---------|-------------| | `--server` | `$CAIB_SERVER` | Build API server URL | | `--token` | `$CAIB_TOKEN` | Bearer token (auto-detected from kubeconfig) | -| `--distro` | `autosd` | Distribution to build | -| `--target` | `qemu` | Target platform | -| `--push` | | Push bootc container to registry (e.g., `quay.io/org/image:tag`) | -| `--build-disk-image` | `false` | Also build a disk image from the container | -| `--format` | `qcow2` | Disk image format (`qcow2`, `raw`, `simg`) | +| `-n`, `--name` | (auto-generated) | Unique build name | +| `-d`, `--distro` | `autosd` | Distribution to build | +| `-t`, `--target` | `qemu` | Target platform | +| `-a`, `--arch` | (current system) | Architecture (`amd64`, `arm64`) | +| `--disk` | `false` | Also build a disk image from the container | +| `--format` | (inferred from `-o`) | Disk image format (`qcow2`, `raw`, `simg`) | | `--compress` | `gzip` | Compression algorithm (`gzip`, `lz4`, `xz`) | -| `--export-oci` | | Push disk image as OCI artifact to registry | -| `--download` | | Download disk image to local file (requires `--export-oci`) | +| `--push-disk` | | Push disk image as OCI artifact to registry | +| `-o`, `--output` | | Download disk image to local file (implies `--disk`) | | `--builder-image` | | Custom aib-build container | -| `--automotive-image-builder` | `quay.io/.../automotive-image-builder:latest` | AIB container image | +| `--aib-image` | `quay.io/.../automotive-image-builder:latest` | AIB container image | | `--storage-class` | | Storage class for build workspace PVC | -| `--define` | | Custom definition `KEY=VALUE` (repeatable) | -| `--registry-username` | `$REGISTRY_USERNAME` | Registry username for push/export | +| `-D`, `--define` | | Custom definition `KEY=VALUE` (repeatable) | +| `--registry-username` | `$REGISTRY_USERNAME` | Registry username for push operations | | `--registry-password` | `$REGISTRY_PASSWORD` | Registry password (or use docker/podman auth) | | `--timeout` | `60` | Timeout in minutes | | `-w`, `--wait` | `false` | Wait for build to complete | @@ -111,61 +107,102 @@ bin/caib build-bootc [flags] ```bash # Build and push bootc container only -bin/caib build-bootc my-manifest.aib.yml \ - --name bootc-only \ +bin/caib build my-manifest.aib.yml \ --arch arm64 \ --push quay.io/myorg/automotive:v1.0 \ --follow # Build bootc container + qcow2 disk image, download locally -bin/caib build-bootc my-manifest.aib.yml \ - --name full-build \ +bin/caib build my-manifest.aib.yml \ --arch arm64 \ --push quay.io/myorg/automotive:v1.0 \ - --build-disk-image \ + --disk \ --format qcow2 \ - --export-oci quay.io/myorg/automotive-disk:v1.0 \ - --download ./my-image.qcow2 \ + --push-disk quay.io/myorg/automotive-disk:v1.0 \ + -o ./my-image.qcow2 \ --follow # Use custom builder image -bin/caib build-bootc my-manifest.aib.yml \ - --name custom-builder \ +bin/caib build my-manifest.aib.yml \ --arch amd64 \ --builder-image quay.io/myorg/my-aib-build:latest \ --push quay.io/myorg/result:latest \ --follow ``` -### build-traditional +### disk -Builds a traditional (ostree or package-based) disk image. +Creates a disk image from an existing bootc container in a registry. ```bash -bin/caib build-traditional [flags] +bin/caib disk [flags] +``` + +**Optional flags:** +| Flag | Default | Description | +|------|---------|-------------| +| `--server` | `$CAIB_SERVER` | Build API server URL | +| `--token` | `$CAIB_TOKEN` | Bearer token | +| `-n`, `--name` | (auto-generated) | Build job name | +| `-o`, `--output` | | Download disk image to local file | +| `--format` | (inferred from `-o`) | Disk image format (`qcow2`, `raw`, `simg`) | +| `--compress` | `gzip` | Compression algorithm (`gzip`, `lz4`, `xz`) | +| `--push` | | Push disk image as OCI artifact to registry | +| `-d`, `--distro` | `autosd` | Distribution | +| `-t`, `--target` | `qemu` | Target platform | +| `-a`, `--arch` | (current system) | Architecture (`amd64`, `arm64`) | +| `--aib-image` | `quay.io/.../automotive-image-builder:latest` | AIB container image | +| `--storage-class` | | Kubernetes storage class | +| `--registry-username` | `$REGISTRY_USERNAME` | Registry username | +| `--registry-password` | `$REGISTRY_PASSWORD` | Registry password | +| `--timeout` | `60` | Timeout in minutes | +| `-w`, `--wait` | `false` | Wait for build to complete | +| `-f`, `--follow` | `false` | Follow build logs | + +**Examples:** + +```bash +# Create disk image from container, download locally +bin/caib disk quay.io/myorg/my-os:v1 \ + -o ./disk.qcow2 \ + --format qcow2 \ + --wait + +# Push disk as OCI artifact instead of downloading +bin/caib disk quay.io/myorg/my-os:v1 \ + --push quay.io/myorg/my-disk:v1 \ + --follow +``` + +### build-legacy + +Builds a traditional (ostree or package-based) disk image. For legacy workflows; new projects should use `build`. + +```bash +bin/caib build-legacy [flags] ``` **Required flags:** | Flag | Description | |------|-------------| -| `--name` | Unique build name | -| `--arch` | Architecture (`amd64`, `arm64`) | +| `--mode` | Build mode: `image` (ostree) or `package` | +| `--format` | Export format: `qcow2`, `raw`, `simg`, etc. | **Optional flags:** | Flag | Default | Description | |------|---------|-------------| | `--server` | `$CAIB_SERVER` | Build API server URL | | `--token` | `$CAIB_TOKEN` | Bearer token (auto-detected from kubeconfig) | -| `--distro` | `autosd` | Distribution to build | -| `--target` | `qemu` | Target platform | -| `--mode` | `image` | Build mode (`image`, `package`) | -| `--export` | `qcow2` | Export format (`qcow2`, `raw`, `simg`) | +| `-n`, `--name` | | Unique build name | +| `-d`, `--distro` | `autosd` | Distribution to build | +| `-t`, `--target` | `qemu` | Target platform | +| `-a`, `--arch` | (current system) | Architecture (`amd64`, `arm64`) | | `--compress` | `gzip` | Compression algorithm (`gzip`, `lz4`, `xz`) | | `--push` | | Push disk image as OCI artifact to registry | -| `--download` | | Download artifact to local file | -| `--automotive-image-builder` | `quay.io/.../automotive-image-builder:latest` | AIB container image | +| `-o`, `--output` | | Download artifact to local file | +| `--aib-image` | `quay.io/.../automotive-image-builder:latest` | AIB container image | | `--storage-class` | | Storage class for build workspace PVC | -| `--define` | | Custom definition `KEY=VALUE` (repeatable) | +| `-D`, `--define` | | Custom definition `KEY=VALUE` (repeatable) | | `--registry-username` | `$REGISTRY_USERNAME` | Registry username | | `--registry-password` | `$REGISTRY_PASSWORD` | Registry password | | `--timeout` | `60` | Timeout in minutes | @@ -176,18 +213,18 @@ bin/caib build-traditional [flags] ```bash # Build ostree-based image and download -bin/caib build-traditional my-manifest.aib.yml \ - --name traditional-build \ +bin/caib build-legacy my-manifest.aib.yml \ --arch arm64 \ --mode image \ - --export qcow2 \ - --download ./disk.qcow2 \ + --format qcow2 \ + -o ./disk.qcow2 \ --follow # Build and push to OCI registry -bin/caib build-traditional my-manifest.aib.yml \ - --name pushed-build \ +bin/caib build-legacy my-manifest.aib.yml \ --arch arm64 \ + --mode image \ + --format qcow2 \ --push quay.io/myorg/disk-image:v1.0 \ --registry-username myuser \ --registry-password mypass \ @@ -223,10 +260,10 @@ bin/caib list [flags] | `--server` | `$CAIB_SERVER` | Build API server URL | | `--token` | `$CAIB_TOKEN` | Bearer token | -## Bootc vs Traditional Builds +## Bootc vs Legacy Builds -| Aspect | `build-bootc` | `build-traditional` | -|--------|---------------|---------------------| +| Aspect | `build` (bootc) | `build-legacy` | +|--------|-----------------|----------------| | Output | Container image (+ optional disk) | Disk image only | | Update mechanism | `bootc switch/upgrade` | Requires re-imaging | | Use case | OTA-updatable systems | Standalone disk images | @@ -241,7 +278,7 @@ The CLI automatically detects authentication in this order: 3. Bearer token from kubeconfig (OpenShift `oc login`, exec plugins) 4. `oc whoami -t` command (if `oc` is available) -For registry authentication (`--push`, `--export-oci`): +For registry authentication (`--push`, `--push-disk`): 1. `--registry-username` / `--registry-password` flags 2. `REGISTRY_USERNAME` / `REGISTRY_PASSWORD` environment variables diff --git a/cmd/caib/main.go b/cmd/caib/main.go index be9e6faa..bf707feb 100644 --- a/cmd/caib/main.go +++ b/cmd/caib/main.go @@ -81,6 +81,56 @@ var ( containerRef string ) +// createBuildAPIClient creates a build API client with authentication token from flags or kubeconfig +func createBuildAPIClient(serverURL string, authToken *string) (*buildapiclient.Client, error) { + if strings.TrimSpace(*authToken) == "" { + if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { + *authToken = tok + } + } + + var opts []buildapiclient.Option + if strings.TrimSpace(*authToken) != "" { + opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(*authToken))) + } + return buildapiclient.New(serverURL, opts...) +} + +// extractRegistryCredentials extracts registry URL and ensures credentials are loaded from env vars +func extractRegistryCredentials(primaryRef, secondaryRef string, username, password *string) string { + // Try environment variables if command line flags are empty + if *username == "" { + *username = os.Getenv("REGISTRY_USERNAME") + } + if *password == "" { + *password = os.Getenv("REGISTRY_PASSWORD") + } + + // Determine the reference to use for URL extraction + ref := primaryRef + if ref == "" { + ref = secondaryRef + } + + // If no reference, return empty + if ref == "" { + return "" + } + + // Warn if credentials missing (will fall back to Docker/Podman auth files) + if *username == "" || *password == "" { + fmt.Println("Warning: No registry credentials provided via flags or environment variables.") + fmt.Println("Will attempt to use Docker/Podman auth files as fallback.") + } + + // Extract registry URL from reference + parts := strings.SplitN(ref, "/", 2) + if len(parts) > 0 && strings.Contains(parts[0], ".") { + return parts[0] + } + return "docker.io" +} + func main() { rootCmd := &cobra.Command{ Use: "caib", @@ -188,7 +238,7 @@ Examples: buildCmd.Flags().StringVar(&containerPush, "push", "", "push bootc container to registry (required)") buildCmd.Flags().BoolVar(&buildDiskImage, "disk", false, "also build disk image from container") buildCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file (requires --disk)") - buildCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, image); inferred from output filename if not set") + buildCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, simg); inferred from output filename if not set") buildCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") buildCmd.Flags().StringVar(&exportOCI, "push-disk", "", "push disk image as OCI artifact to registry") buildCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") @@ -217,7 +267,7 @@ Examples: diskCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication") diskCmd.Flags().StringVarP(&buildName, "name", "n", "", "name for the build job (auto-generated if omitted)") diskCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file") - diskCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, image); inferred from output filename if not set") + diskCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, simg); inferred from output filename if not set") diskCmd.Flags().StringVar(&compressionAlgo, "compress", "gzip", "compression algorithm (gzip, lz4, xz)") diskCmd.Flags().StringVar(&exportOCI, "push", "", "push disk image as OCI artifact to registry") diskCmd.Flags().StringVar(®istryUsername, "registry-username", "", "registry username (or REGISTRY_USERNAME env)") @@ -289,17 +339,7 @@ func runBuild(cmd *cobra.Command, args []string) { // Note: diskFormat can be empty - AIB will default to raw (or infer from output filename extension) - if strings.TrimSpace(authToken) == "" { - if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { - authToken = tok - } - } - - var opts []buildapiclient.Option - if strings.TrimSpace(authToken) != "" { - opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) - } - api, err := buildapiclient.New(serverURL, opts...) + api, err := createBuildAPIClient(serverURL, &authToken) if err != nil { handleError(err) } @@ -309,33 +349,8 @@ func runBuild(cmd *cobra.Command, args []string) { handleError(fmt.Errorf("error reading manifest: %w", err)) } - // Extract registry URL from push if not empty - effectiveRegistryURL := "" - if containerPush != "" || exportOCI != "" { - // Try environment variables if command line flags are empty - if registryUsername == "" { - registryUsername = os.Getenv("REGISTRY_USERNAME") - } - if registryPassword == "" { - registryPassword = os.Getenv("REGISTRY_PASSWORD") - } - - // Note: Docker/Podman auth files will be tried as fallback in pullOCIArtifact - if registryUsername == "" || registryPassword == "" { - fmt.Println("Warning: No registry credentials provided via flags or environment variables.") - fmt.Println("Will attempt to use Docker/Podman auth files as fallback.") - } - pushTarget := containerPush - if pushTarget == "" { - pushTarget = exportOCI - } - parts := strings.SplitN(pushTarget, "/", 2) - if len(parts) > 0 && strings.Contains(parts[0], ".") { - effectiveRegistryURL = parts[0] - } else { - effectiveRegistryURL = "docker.io" - } - } + // Extract registry URL and credentials + effectiveRegistryURL := extractRegistryCredentials(containerPush, exportOCI, ®istryUsername, ®istryPassword) req := buildapitypes.BuildRequest{ Name: buildName, @@ -393,7 +408,7 @@ func runBuild(cmd *cobra.Command, args []string) { } } else { // Download directly from cluster via artifact API - if err := downloadArtifactViaAPI(ctx, serverURL, buildName, filepath.Dir(outputDir)); err != nil { + if err := downloadArtifactViaAPI(ctx, serverURL, buildName, outputDir); err != nil { handleError(fmt.Errorf("failed to download artifact: %w", err)) } } @@ -426,43 +441,13 @@ func runDisk(cmd *cobra.Command, args []string) { // Note: diskFormat can be empty - AIB will default to raw (or infer from output filename extension) - if strings.TrimSpace(authToken) == "" { - if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { - authToken = tok - } - } - - var opts []buildapiclient.Option - if strings.TrimSpace(authToken) != "" { - opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) - } - api, err := buildapiclient.New(serverURL, opts...) + api, err := createBuildAPIClient(serverURL, &authToken) if err != nil { handleError(err) } - // Get registry credentials from env if not provided - if registryUsername == "" { - registryUsername = os.Getenv("REGISTRY_USERNAME") - } - if registryPassword == "" { - registryPassword = os.Getenv("REGISTRY_PASSWORD") - } - - // Extract registry URL for authentication - effectiveRegistryURL := "" - if containerRef != "" || exportOCI != "" { - ref := containerRef - if ref == "" { - ref = exportOCI - } - parts := strings.SplitN(ref, "/", 2) - if len(parts) > 0 && strings.Contains(parts[0], ".") { - effectiveRegistryURL = parts[0] - } else { - effectiveRegistryURL = "docker.io" - } - } + // Extract registry URL and credentials + effectiveRegistryURL := extractRegistryCredentials(containerRef, exportOCI, ®istryUsername, ®istryPassword) req := buildapitypes.BuildRequest{ Name: buildName, @@ -507,7 +492,7 @@ func runDisk(cmd *cobra.Command, args []string) { } } else { // Download directly from cluster via artifact API - if err := downloadArtifactViaAPI(ctx, serverURL, buildName, filepath.Dir(outputDir)); err != nil { + if err := downloadArtifactViaAPI(ctx, serverURL, buildName, outputDir); err != nil { handleError(fmt.Errorf("failed to download artifact: %w", err)) } } @@ -587,7 +572,22 @@ func pullOCIArtifact(ociRef, destPath, username, password string) error { return fmt.Errorf("extract artifact: %w", err) } - fmt.Printf("Downloaded to %s\n", destPath) + // Check if file is compressed and add appropriate extension if needed + finalPath := destPath + compression := detectFileCompression(destPath) + if compression != "" && !hasCompressionExtension(destPath) { + ext := compressionExtension(compression) + if ext != "" { + newPath := destPath + ext + fmt.Printf("Adding compression extension: %s -> %s\n", filepath.Base(destPath), filepath.Base(newPath)) + if err := os.Rename(destPath, newPath); err != nil { + return fmt.Errorf("rename file with compression extension: %w", err) + } + finalPath = newPath + } + } + + fmt.Printf("Downloaded to %s\n", finalPath) return nil } @@ -669,17 +669,7 @@ func runBuildLegacy(cmd *cobra.Command, args []string) { handleError(fmt.Errorf("--name is required")) } - if strings.TrimSpace(authToken) == "" { - if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { - authToken = tok - } - } - - var opts []buildapiclient.Option - if strings.TrimSpace(authToken) != "" { - opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) - } - api, err := buildapiclient.New(serverURL, opts...) + api, err := createBuildAPIClient(serverURL, &authToken) if err != nil { handleError(err) } @@ -695,28 +685,8 @@ func runBuildLegacy(cmd *cobra.Command, args []string) { parsedMode = buildapitypes.ModePackage } - effectiveRegistryURL := "" - if exportOCI != "" { - // Try environment variables if command line flags are empty - if registryUsername == "" { - registryUsername = os.Getenv("REGISTRY_USERNAME") - } - if registryPassword == "" { - registryPassword = os.Getenv("REGISTRY_PASSWORD") - } - - // Note: Docker/Podman auth files will be tried as fallback - if registryUsername == "" || registryPassword == "" { - fmt.Println("Warning: No registry credentials provided via flags or environment variables.") - fmt.Println("Will attempt to use Docker/Podman auth files as fallback.") - } - parts := strings.SplitN(exportOCI, "/", 2) - if len(parts) > 0 && strings.Contains(parts[0], ".") { - effectiveRegistryURL = parts[0] - } else { - effectiveRegistryURL = "docker.io" - } - } + // Extract registry URL and credentials + effectiveRegistryURL := extractRegistryCredentials("", exportOCI, ®istryUsername, ®istryPassword) req := buildapitypes.BuildRequest{ Name: buildName, @@ -983,10 +953,122 @@ func findLocalFileReferences(manifestContent string) ([]map[string]string, error return localFiles, nil } -func downloadArtifactViaAPI(ctx context.Context, baseURL, name, outDir string) error { - if strings.TrimSpace(outDir) == "" { - outDir = "./output" +// isDirectory checks if a path exists and is a directory +func isDirectory(path string) bool { + stat, err := os.Stat(path) + return err == nil && stat.IsDir() +} + +// compressionExtension returns the file extension for a compression algorithm +func compressionExtension(algo string) string { + switch algo { + case "gzip": + return ".gz" + case "lz4": + return ".lz4" + case "xz": + return ".xz" + default: + return "" + } +} + +// hasCompressionExtension checks if a filename already has a compression extension +func hasCompressionExtension(filename string) bool { + lower := strings.ToLower(filename) + return strings.HasSuffix(lower, ".gz") || + strings.HasSuffix(lower, ".lz4") || + strings.HasSuffix(lower, ".xz") +} + +// parseOutputPath determines the output directory and optional user-specified filename +func parseOutputPath(outPath string) (outDir, userFilename string) { + outPath = strings.TrimSpace(outPath) + + // Empty path defaults to ./output + if outPath == "" { + return "./output", "" + } + + // Explicit directory paths (trailing slash or existing directory) + if strings.HasSuffix(outPath, "/") || isDirectory(outPath) { + return strings.TrimRight(outPath, "/"), "" + } + + // File path - extract directory and filename + dir := filepath.Dir(outPath) + filename := filepath.Base(outPath) + + // Current directory defaults to ./output for clarity + if dir == "." { + dir = "./output" + } + + return dir, filename +} + +// resolveFilename determines the final filename, adding compression extension if needed +func resolveFilename(userFilename, serverFilename, compression, fallbackName string) string { + // Priority: user-specified > server-provided > fallback + filename := fallbackName + if serverFilename != "" { + filename = serverFilename + } + if userFilename != "" { + filename = userFilename + } + + // Add compression extension if server indicates compression and filename lacks it + if compression != "" && !hasCompressionExtension(filename) { + if ext := compressionExtension(compression); ext != "" { + original := filename + filename += ext + if userFilename != "" { + fmt.Printf("Adding compression extension: %s -> %s\n", original, filename) + } + } + } + + return filename +} + +// detectFileCompression examines file magic bytes to determine compression type +func detectFileCompression(filePath string) string { + file, err := os.Open(filePath) + if err != nil { + return "" + } + defer file.Close() + + // Read first few bytes to check magic numbers + header := make([]byte, 10) + n, err := file.Read(header) + if err != nil || n < 3 { + return "" + } + + // Check for gzip magic number + if n >= 2 && header[0] == 0x1f && header[1] == 0x8b { + return "gzip" } + + // Check for lz4 magic number + if n >= 4 && header[0] == 0x04 && header[1] == 0x22 && header[2] == 0x4d && header[3] == 0x18 { + return "lz4" + } + + // Check for xz magic number + if n >= 6 && header[0] == 0xfd && header[1] == 0x37 && header[2] == 0x7a && + header[3] == 0x58 && header[4] == 0x5a && header[5] == 0x00 { + return "xz" + } + + return "" +} + +func downloadArtifactViaAPI(ctx context.Context, baseURL, name, outPath string) error { + outDir, userFilename := parseOutputPath(outPath) + if err := os.MkdirAll(outDir, 0755); err != nil { return fmt.Errorf("create output dir: %w", err) } @@ -1020,16 +1102,19 @@ func downloadArtifactViaAPI(ctx context.Context, baseURL, name, outDir string) e } if resp.StatusCode == http.StatusOK { - filename := name + ".artifact" contentType := resp.Header.Get("Content-Type") + + // Extract server-provided filename from Content-Disposition header + serverFilename := "" if cd := resp.Header.Get("Content-Disposition"); cd != "" { if i := strings.Index(cd, "filename="); i >= 0 { - f := strings.Trim(cd[i+9:], "\" ") - if f != "" { - filename = f - } + serverFilename = strings.Trim(cd[i+9:], "\" ") } } + + // Resolve final filename with compression handling + compression := strings.TrimSpace(resp.Header.Get("X-AIB-Compression")) + filename := resolveFilename(userFilename, serverFilename, compression, name+".artifact") if at := strings.TrimSpace(resp.Header.Get("X-AIB-Artifact-Type")); at != "" { fmt.Printf("Artifact type: %s\n", at) } @@ -1187,16 +1272,7 @@ func runDownload(cmd *cobra.Command, args []string) { os.Exit(1) } - if strings.TrimSpace(authToken) == "" { - if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { - authToken = tok - } - } - var opts []buildapiclient.Option - if strings.TrimSpace(authToken) != "" { - opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) - } - api, err := buildapiclient.New(serverURL, opts...) + api, err := createBuildAPIClient(serverURL, &authToken) if err != nil { fmt.Printf("Error: %v\n", err) os.Exit(1) @@ -1224,16 +1300,7 @@ func runList(cmd *cobra.Command, args []string) { fmt.Println("Error: --server is required (or set CAIB_SERVER)") os.Exit(1) } - if strings.TrimSpace(authToken) == "" { - if tok, err := loadTokenFromKubeconfig(); err == nil && strings.TrimSpace(tok) != "" { - authToken = tok - } - } - var opts []buildapiclient.Option - if strings.TrimSpace(authToken) != "" { - opts = append(opts, buildapiclient.WithAuthToken(strings.TrimSpace(authToken))) - } - api, err := buildapiclient.New(serverURL, opts...) + api, err := createBuildAPIClient(serverURL, &authToken) if err != nil { fmt.Printf("Error: %v\n", err) os.Exit(1) diff --git a/internal/buildapi/server.go b/internal/buildapi/server.go index 7a3ca047..3c31274d 100644 --- a/internal/buildapi/server.go +++ b/internal/buildapi/server.go @@ -1374,41 +1374,10 @@ func (a *APIServer) listArtifacts(c *gin.Context, name string) { artifactFileName = fmt.Sprintf("%s-%s%s", build.Spec.Distro, build.Spec.Target, ext) } - var artifactPod *corev1.Pod - deadline := time.Now().Add(2 * time.Minute) - for { - podList := &corev1.PodList{} - if err := k8sClient.List(ctx, podList, - client.InNamespace(namespace), - client.MatchingLabels{ - "app.kubernetes.io/name": "artifact-pod", - "automotive.sdv.cloud.redhat.com/imagebuild-name": name, - }); err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("error listing artifact pods: %v", err)}) - return - } - for i := range podList.Items { - p := &podList.Items[i] - if p.Status.Phase == corev1.PodRunning { - for _, cs := range p.Status.ContainerStatuses { - if cs.Name == "fileserver" && cs.Ready { - artifactPod = p - break - } - } - } - if artifactPod != nil { - break - } - } - if artifactPod != nil { - break - } - if time.Now().After(deadline) { - c.JSON(http.StatusServiceUnavailable, gin.H{"error": "artifact pod not ready"}) - return - } - time.Sleep(2 * time.Second) + artifactPod, err := findReadyArtifactPod(ctx, k8sClient, namespace, name, time.Now().Add(2*time.Minute)) + if err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return } restCfg, err := getRESTConfigFromRequest(c) @@ -1510,41 +1479,10 @@ func (a *APIServer) streamArtifactPart(c *gin.Context, name, file string) { artifactFileName = fmt.Sprintf("%s-%s%s", build.Spec.Distro, build.Spec.Target, ext) } - var artifactPod *corev1.Pod - deadline := time.Now().Add(2 * time.Minute) - for { - podList := &corev1.PodList{} - if err := k8sClient.List(ctx, podList, - client.InNamespace(namespace), - client.MatchingLabels{ - "app.kubernetes.io/name": "artifact-pod", - "automotive.sdv.cloud.redhat.com/imagebuild-name": name, - }); err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("error listing artifact pods: %v", err)}) - return - } - for i := range podList.Items { - p := &podList.Items[i] - if p.Status.Phase == corev1.PodRunning { - for _, cs := range p.Status.ContainerStatuses { - if cs.Name == "fileserver" && cs.Ready { - artifactPod = p - break - } - } - } - if artifactPod != nil { - break - } - } - if artifactPod != nil { - break - } - if time.Now().After(deadline) { - c.JSON(http.StatusServiceUnavailable, gin.H{"error": "artifact pod not ready"}) - return - } - time.Sleep(2 * time.Second) + artifactPod, err := findReadyArtifactPod(ctx, k8sClient, namespace, name, time.Now().Add(2*time.Minute)) + if err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return } restCfg, err := getRESTConfigFromRequest(c) @@ -1680,43 +1618,10 @@ func (a *APIServer) streamDefaultArtifact(c *gin.Context, name string) { return } - var artifactPod *corev1.Pod - deadline := time.Now().Add(2 * time.Minute) - for { - podList := &corev1.PodList{} - if err := k8sClient.List(ctx, podList, - client.InNamespace(namespace), - client.MatchingLabels{ - "app.kubernetes.io/name": "artifact-pod", - "automotive.sdv.cloud.redhat.com/imagebuild-name": name, - }); err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("error listing artifact pods: %v", err)}) - return - } - - for i := range podList.Items { - p := &podList.Items[i] - if p.Status.Phase == corev1.PodRunning { - for _, cs := range p.Status.ContainerStatuses { - if cs.Name == "fileserver" && cs.Ready { - artifactPod = p - break - } - } - } - if artifactPod != nil { - break - } - } - - if artifactPod != nil { - break - } - if time.Now().After(deadline) { - c.JSON(http.StatusServiceUnavailable, gin.H{"error": "artifact pod not ready"}) - return - } - time.Sleep(2 * time.Second) + artifactPod, err := findReadyArtifactPod(ctx, k8sClient, namespace, name, time.Now().Add(2*time.Minute)) + if err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return } podPath := "/workspace/shared/" + artifactFileName @@ -1877,43 +1782,10 @@ func (a *APIServer) streamArtifactByFilename(c *gin.Context, name, filename stri return } - var artifactPod *corev1.Pod - deadline := time.Now().Add(2 * time.Minute) - for { - podList := &corev1.PodList{} - if err := k8sClient.List(ctx, podList, - client.InNamespace(namespace), - client.MatchingLabels{ - "app.kubernetes.io/name": "artifact-pod", - "automotive.sdv.cloud.redhat.com/imagebuild-name": name, - }); err != nil { - c.JSON(http.StatusInternalServerError, gin.H{"error": fmt.Sprintf("error listing artifact pods: %v", err)}) - return - } - - for i := range podList.Items { - p := &podList.Items[i] - if p.Status.Phase == corev1.PodRunning { - for _, cs := range p.Status.ContainerStatuses { - if cs.Name == "fileserver" && cs.Ready { - artifactPod = p - break - } - } - } - if artifactPod != nil { - break - } - } - - if artifactPod != nil { - break - } - if time.Now().After(deadline) { - c.JSON(http.StatusServiceUnavailable, gin.H{"error": "artifact pod not ready"}) - return - } - time.Sleep(2 * time.Second) + artifactPod, err := findReadyArtifactPod(ctx, k8sClient, namespace, name, time.Now().Add(2*time.Minute)) + if err != nil { + c.JSON(http.StatusServiceUnavailable, gin.H{"error": err.Error()}) + return } podPath := "/workspace/shared/" + base @@ -2108,53 +1980,88 @@ func getClientFromRequest(c *gin.Context) (client.Client, error) { } func (a *APIServer) isAuthenticated(c *gin.Context) bool { - authHeader := c.Request.Header.Get("Authorization") - token := "" - token, _ = strings.CutPrefix(authHeader, "Bearer ") + token := extractBearerToken(c) if token == "" { - token = c.Request.Header.Get("X-Forwarded-Access-Token") - } - if strings.TrimSpace(token) == "" { return false } + cfg, err := getRESTConfigFromRequest(c) if err != nil { return false } + clientset, err := kubernetes.NewForConfig(cfg) if err != nil { return false } + tr := &authnv1.TokenReview{Spec: authnv1.TokenReviewSpec{Token: token}} res, err := clientset.AuthenticationV1().TokenReviews().Create(c.Request.Context(), tr, metav1.CreateOptions{}) - if err != nil { - return false - } - return res.Status.Authenticated + return err == nil && res.Status.Authenticated } -func resolveRequester(c *gin.Context) string { +// extractBearerToken extracts the bearer token from the request +func extractBearerToken(c *gin.Context) string { authHeader := c.Request.Header.Get("Authorization") - token := "" - token, _ = strings.CutPrefix(authHeader, "Bearer ") + token, _ := strings.CutPrefix(authHeader, "Bearer ") if token == "" { token = c.Request.Header.Get("X-Forwarded-Access-Token") } + return strings.TrimSpace(token) +} + +// findReadyArtifactPod finds a running and ready artifact pod for the given ImageBuild +func findReadyArtifactPod(ctx context.Context, k8sClient client.Client, namespace, buildName string, deadline time.Time) (*corev1.Pod, error) { + for { + podList := &corev1.PodList{} + if err := k8sClient.List(ctx, podList, + client.InNamespace(namespace), + client.MatchingLabels{ + "app.kubernetes.io/name": "artifact-pod", + "automotive.sdv.cloud.redhat.com/imagebuild-name": buildName, + }); err != nil { + return nil, fmt.Errorf("error listing artifact pods: %w", err) + } - if strings.TrimSpace(token) != "" { - cfg, err := getRESTConfigFromRequest(c) - if err == nil { - clientset, err := kubernetes.NewForConfig(cfg) - if err == nil { - tr := &authnv1.TokenReview{Spec: authnv1.TokenReviewSpec{Token: token}} - if res, err := clientset.AuthenticationV1().TokenReviews().Create(c.Request.Context(), tr, metav1.CreateOptions{}); err == nil { - if res.Status.Authenticated && res.Status.User.Username != "" { - return res.Status.User.Username + for i := range podList.Items { + p := &podList.Items[i] + if p.Status.Phase == corev1.PodRunning { + for _, cs := range p.Status.ContainerStatuses { + if cs.Name == "fileserver" && cs.Ready { + return p, nil } } } } + + if time.Now().After(deadline) { + return nil, fmt.Errorf("artifact pod not ready") + } + time.Sleep(2 * time.Second) + } +} + +func resolveRequester(c *gin.Context) string { + token := extractBearerToken(c) + if token == "" { + return "unknown" + } + + cfg, err := getRESTConfigFromRequest(c) + if err != nil { + return "unknown" + } + + clientset, err := kubernetes.NewForConfig(cfg) + if err != nil { + return "unknown" + } + + tr := &authnv1.TokenReview{Spec: authnv1.TokenReviewSpec{Token: token}} + res, err := clientset.AuthenticationV1().TokenReviews().Create(c.Request.Context(), tr, metav1.CreateOptions{}) + if err != nil || !res.Status.Authenticated || res.Status.User.Username == "" { + return "unknown" } - return "unknown" + return res.Status.User.Username } diff --git a/internal/buildapi/types.go b/internal/buildapi/types.go index 604b7110..974a44aa 100644 --- a/internal/buildapi/types.go +++ b/internal/buildapi/types.go @@ -7,28 +7,12 @@ import ( type Distro string -func (d Distro) IsValid() bool { - return strings.TrimSpace(string(d)) != "" -} - type Target string -func (t Target) IsValid() bool { - return strings.TrimSpace(string(t)) != "" -} - type Architecture string -func (a Architecture) IsValid() bool { - return strings.TrimSpace(string(a)) != "" -} - type ExportFormat string -func (e ExportFormat) IsValid() bool { - return strings.TrimSpace(string(e)) != "" -} - type Mode string const ( @@ -42,10 +26,17 @@ const ( ModeDisk Mode = "disk" ) -func (m Mode) IsValid() bool { - return strings.TrimSpace(string(m)) != "" +// IsValid checks if a string value is non-empty after trimming whitespace +func IsValid(s string) bool { + return strings.TrimSpace(s) != "" } +func (d Distro) IsValid() bool { return IsValid(string(d)) } +func (t Target) IsValid() bool { return IsValid(string(t)) } +func (a Architecture) IsValid() bool { return IsValid(string(a)) } +func (e ExportFormat) IsValid() bool { return IsValid(string(e)) } +func (m Mode) IsValid() bool { return IsValid(string(m)) } + // IsBootc returns true if this is bootc mode func (m Mode) IsBootc() bool { return m == ModeBootc diff --git a/internal/common/tasks/scripts/build_image.sh b/internal/common/tasks/scripts/build_image.sh index 9e531a6a..ac843219 100644 --- a/internal/common/tasks/scripts/build_image.sh +++ b/internal/common/tasks/scripts/build_image.sh @@ -585,10 +585,29 @@ elif [ -f "$(workspaces.shared-workspace.path)/${exportFile}" ]; then fi if [ -z "$final_name" ]; then - guess=$(ls -1 $(workspaces.shared-workspace.path)/${cleanName}* 2>/dev/null | head -n1) - if [ -n "$guess" ]; then - final_name=$(basename "$guess") + workspace_path=$(workspaces.shared-workspace.path) + + # Try to find artifact with priority: compressed file > compressed dir > any file + # This ensures we prefer compressed artifacts when compression is enabled + patterns_to_try=( + "${cleanName}*${EXT_FILE}" + "${cleanName}*${EXT_DIR}" + "${cleanName}*" + ) + + # If compression is disabled, only try the general pattern + if [ "$COMPRESSION" = "none" ]; then + patterns_to_try=("${cleanName}*") fi + + for pattern in "${patterns_to_try[@]}"; do + guess=$(ls -1 "${workspace_path}/${pattern}" 2>/dev/null | head -n1) + if [ -n "$guess" ]; then + final_name=$(basename "$guess") + echo "Fallback: using found artifact: $final_name" + break + fi + done fi if [ -n "$final_name" ]; then echo "Writing artifact filename to Tekton result: $final_name" diff --git a/internal/controller/imagebuild/controller.go b/internal/controller/imagebuild/controller.go index d775ca8d..96bfd9a8 100644 --- a/internal/controller/imagebuild/controller.go +++ b/internal/controller/imagebuild/controller.go @@ -27,6 +27,47 @@ const ( OperatorNamespace = "automotive-dev-operator-system" ) +// getFormatExtension returns the file extension for an export format +func getFormatExtension(format string) string { + switch format { + case "image": + return ".raw" + case "qcow2": + return ".qcow2" + default: + if format != "" { + return "." + format + } + return ".raw" + } +} + +// getCompressionExtension returns the file extension for a compression algorithm +func getCompressionExtension(compression string) string { + if compression == "" || compression == "none" { + return "" + } + + switch compression { + case "gzip": + return ".gz" + case "lz4": + return ".lz4" + case "xz": + return ".xz" + default: + return "" + } +} + +// buildArtifactFilename constructs the artifact filename with proper extensions +func buildArtifactFilename(distro, target, exportFormat, compression string) string { + baseFormat := getFormatExtension(exportFormat) + compressionExt := getCompressionExtension(compression) + + return fmt.Sprintf("%s-%s%s%s", distro, target, baseFormat, compressionExt) +} + // ImageBuildReconciler reconciles a ImageBuild object type ImageBuildReconciler struct { client.Client @@ -828,20 +869,12 @@ func (r *ImageBuildReconciler) updateArtifactInfo(ctx context.Context, imageBuil // Only set ArtifactFileName if it's not already set (from Tekton results) if latestImageBuild.Status.ArtifactFileName == "" { - var fileExtension string - switch latestImageBuild.Spec.ExportFormat { - case "image": - fileExtension = ".raw" - case "qcow2": - fileExtension = ".qcow2" - default: - fileExtension = fmt.Sprintf(".%s", latestImageBuild.Spec.ExportFormat) - } - - fileName := fmt.Sprintf("%s-%s%s", + fileName := buildArtifactFilename( latestImageBuild.Spec.Distro, latestImageBuild.Spec.Target, - fileExtension) + latestImageBuild.Spec.ExportFormat, + latestImageBuild.Spec.Compression, + ) latestImageBuild.Status.ArtifactFileName = fileName } From 5f28107bf1ecb89cea91005b36ac41841c145132 Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Fri, 9 Jan 2026 15:49:00 +0200 Subject: [PATCH 4/7] fix --follow Signed-off-by: Benny Zlotnik --- ...ve-dev-operator.clusterserviceversion.yaml | 2 +- catalog/automotive-dev-operator.yaml | 2 +- cmd/caib/main.go | 124 +++++++++++++----- internal/buildapi/server.go | 4 +- 4 files changed, 97 insertions(+), 35 deletions(-) diff --git a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml index 58037f2c..511e99ea 100644 --- a/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml +++ b/bundle/manifests/automotive-dev-operator.clusterserviceversion.yaml @@ -53,7 +53,7 @@ metadata: capabilities: Basic Install categories: Developer Tools containerImage: quay.io/rh-sdv-cloud/automotive-dev-operator:latest - createdAt: "2026-01-09T11:11:25Z" + createdAt: "2026-01-09T13:33:39Z" operatorframework.io/suggested-namespace: automotive-dev-operator-system operators.operatorframework.io/builder: operator-sdk-v1.42.0 operators.operatorframework.io/project_layout: go.kubebuilder.io/v4 diff --git a/catalog/automotive-dev-operator.yaml b/catalog/automotive-dev-operator.yaml index e45a1647..962db742 100644 --- a/catalog/automotive-dev-operator.yaml +++ b/catalog/automotive-dev-operator.yaml @@ -60,7 +60,7 @@ properties: data: eyJhcGlWZXJzaW9uIjoiYXBpZXh0ZW5zaW9ucy5rOHMuaW8vdjEiLCJraW5kIjoiQ3VzdG9tUmVzb3VyY2VEZWZpbml0aW9uIiwibWV0YWRhdGEiOnsiYW5ub3RhdGlvbnMiOnsiY29udHJvbGxlci1nZW4ua3ViZWJ1aWxkZXIuaW8vdmVyc2lvbiI6InYwLjE5LjAifSwiY3JlYXRpb25UaW1lc3RhbXAiOm51bGwsIm5hbWUiOiJvcGVyYXRvcmNvbmZpZ3MuYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSJ9LCJzcGVjIjp7Imdyb3VwIjoiYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSIsIm5hbWVzIjp7ImtpbmQiOiJPcGVyYXRvckNvbmZpZyIsImxpc3RLaW5kIjoiT3BlcmF0b3JDb25maWdMaXN0IiwicGx1cmFsIjoib3BlcmF0b3Jjb25maWdzIiwic2luZ3VsYXIiOiJvcGVyYXRvcmNvbmZpZyJ9LCJzY29wZSI6Ik5hbWVzcGFjZWQiLCJ2ZXJzaW9ucyI6W3siYWRkaXRpb25hbFByaW50ZXJDb2x1bW5zIjpbeyJqc29uUGF0aCI6Ii5zcGVjLndlYlVJIiwibmFtZSI6IldlYlVJIiwidHlwZSI6ImJvb2xlYW4ifSx7Impzb25QYXRoIjoiLnNwZWMub3NCdWlsZHMuZW5hYmxlZCIsIm5hbWUiOiJPUyBCdWlsZHMiLCJ0eXBlIjoiYm9vbGVhbiJ9LHsianNvblBhdGgiOiIuc3RhdHVzLnBoYXNlIiwibmFtZSI6IlBoYXNlIiwidHlwZSI6InN0cmluZyJ9LHsianNvblBhdGgiOiIubWV0YWRhdGEuY3JlYXRpb25UaW1lc3RhbXAiLCJuYW1lIjoiQWdlIiwidHlwZSI6ImRhdGUifV0sIm5hbWUiOiJ2MWFscGhhMSIsInNjaGVtYSI6eyJvcGVuQVBJVjNTY2hlbWEiOnsiZGVzY3JpcHRpb24iOiJPcGVyYXRvckNvbmZpZyBpcyB0aGUgU2NoZW1hIGZvciB0aGUgb3BlcmF0b3Jjb25maWdzIEFQSSIsInByb3BlcnRpZXMiOnsiYXBpVmVyc2lvbiI6eyJkZXNjcmlwdGlvbiI6IkFQSVZlcnNpb24gZGVmaW5lcyB0aGUgdmVyc2lvbmVkIHNjaGVtYSBvZiB0aGlzIHJlcHJlc2VudGF0aW9uIG9mIGFuIG9iamVjdC5cblNlcnZlcnMgc2hvdWxkIGNvbnZlcnQgcmVjb2duaXplZCBzY2hlbWFzIHRvIHRoZSBsYXRlc3QgaW50ZXJuYWwgdmFsdWUsIGFuZFxubWF5IHJlamVjdCB1bnJlY29nbml6ZWQgdmFsdWVzLlxuTW9yZSBpbmZvOiBodHRwczovL2dpdC5rOHMuaW8vY29tbXVuaXR5L2NvbnRyaWJ1dG9ycy9kZXZlbC9zaWctYXJjaGl0ZWN0dXJlL2FwaS1jb252ZW50aW9ucy5tZCNyZXNvdXJjZXMiLCJ0eXBlIjoic3RyaW5nIn0sImtpbmQiOnsiZGVzY3JpcHRpb24iOiJLaW5kIGlzIGEgc3RyaW5nIHZhbHVlIHJlcHJlc2VudGluZyB0aGUgUkVTVCByZXNvdXJjZSB0aGlzIG9iamVjdCByZXByZXNlbnRzLlxuU2VydmVycyBtYXkgaW5mZXIgdGhpcyBmcm9tIHRoZSBlbmRwb2ludCB0aGUgY2xpZW50IHN1Ym1pdHMgcmVxdWVzdHMgdG8uXG5DYW5ub3QgYmUgdXBkYXRlZC5cbkluIENhbWVsQ2FzZS5cbk1vcmUgaW5mbzogaHR0cHM6Ly9naXQuazhzLmlvL2NvbW11bml0eS9jb250cmlidXRvcnMvZGV2ZWwvc2lnLWFyY2hpdGVjdHVyZS9hcGktY29udmVudGlvbnMubWQjdHlwZXMta2luZHMiLCJ0eXBlIjoic3RyaW5nIn0sIm1ldGFkYXRhIjp7InR5cGUiOiJvYmplY3QifSwic3BlYyI6eyJkZXNjcmlwdGlvbiI6Ik9wZXJhdG9yQ29uZmlnU3BlYyBkZWZpbmVzIHRoZSBkZXNpcmVkIHN0YXRlIG9mIE9wZXJhdG9yQ29uZmlnIiwicHJvcGVydGllcyI6eyJvc0J1aWxkcyI6eyJkZXNjcmlwdGlvbiI6Ik9TQnVpbGRzIGRlZmluZXMgdGhlIGNvbmZpZ3VyYXRpb24gZm9yIE9TIGJ1aWxkIG9wZXJhdGlvbnMiLCJwcm9wZXJ0aWVzIjp7ImNsdXN0ZXJSZWdpc3RyeVJvdXRlIjp7ImRlc2NyaXB0aW9uIjoiQ2x1c3RlclJlZ2lzdHJ5Um91dGUgaXMgdGhlIGV4dGVybmFsIHJvdXRlIGZvciB0aGUgY2x1c3RlcidzIGludGVybmFsIGltYWdlIHJlZ2lzdHJ5XG5SZXF1aXJlZCBmb3IgYm9vdGMgYnVpbGRzIHRvIGFsbG93IG5lc3RlZCBjb250YWluZXJzIHRvIHB1bGwgYnVpbGRlciBpbWFnZXNcbkV4YW1wbGU6IFwiZGVmYXVsdC1yb3V0ZS1vcGVuc2hpZnQtaW1hZ2UtcmVnaXN0cnkuYXBwcy5teWNsdXN0ZXIuZXhhbXBsZS5jb21cIiIsInR5cGUiOiJzdHJpbmcifSwiZW5hYmxlZCI6eyJkZWZhdWx0Ijp0cnVlLCJkZXNjcmlwdGlvbiI6IkVuYWJsZWQgZGV0ZXJtaW5lcyBpZiBUZWt0b24gdGFza3MgZm9yIE9TIGJ1aWxkcyBzaG91bGQgYmUgZGVwbG95ZWQiLCJ0eXBlIjoiYm9vbGVhbiJ9LCJtZW1vcnlWb2x1bWVTaXplIjp7ImRlc2NyaXB0aW9uIjoiTWVtb3J5Vm9sdW1lU2l6ZSBzcGVjaWZpZXMgdGhlIHNpemUgbGltaXQgZm9yIG1lbW9yeS1iYWNrZWQgdm9sdW1lcyAocmVxdWlyZWQgaWYgVXNlTWVtb3J5Vm9sdW1lcyBpcyB0cnVlKVxuRXhhbXBsZTogXCIyR2lcIiIsInR5cGUiOiJzdHJpbmcifSwicHZjU2l6ZSI6eyJkZXNjcmlwdGlvbiI6IlBWQ1NpemUgc3BlY2lmaWVzIHRoZSBzaXplIGZvciBwZXJzaXN0ZW50IHZvbHVtZSBjbGFpbXMgY3JlYXRlZCBmb3IgYnVpbGQgd29ya3NwYWNlc1xuRGVmYXVsdDogXCI4R2lcIiIsInR5cGUiOiJzdHJpbmcifSwicnVudGltZUNsYXNzTmFtZSI6eyJkZXNjcmlwdGlvbiI6IlJ1bnRpbWVDbGFzc05hbWUgc3BlY2lmaWVzIHRoZSBydW50aW1lIGNsYXNzIHRvIHVzZSBmb3IgdGhlIGJ1aWxkIHBvZFxuTW9yZSBpbmZvOiBodHRwczovL2t1YmVybmV0ZXMuaW8vZG9jcy9jb25jZXB0cy9jb250YWluZXJzL3J1bnRpbWUtY2xhc3MvIiwidHlwZSI6InN0cmluZyJ9LCJzZXJ2ZUV4cGlyeUhvdXJzIjp7ImRlc2NyaXB0aW9uIjoiU2VydmVFeHBpcnlIb3VycyBzcGVjaWZpZXMgaG93IGxvbmcgdG8gc2VydmUgYnVpbGQgYXJ0aWZhY3RzIGJlZm9yZSBhdXRvbWF0aWMgY2xlYW51cFxuRGVmYXVsdDogMjQiLCJmb3JtYXQiOiJpbnQzMiIsInR5cGUiOiJpbnRlZ2VyIn0sInVzZU1lbW9yeVZvbHVtZXMiOnsiZGVzY3JpcHRpb24iOiJVc2VNZW1vcnlWb2x1bWVzIGRldGVybWluZXMgd2hldGhlciB0byB1c2UgbWVtb3J5LWJhY2tlZCB2b2x1bWVzIGZvciBidWlsZCBvcGVyYXRpb25zIiwidHlwZSI6ImJvb2xlYW4ifX0sInJlcXVpcmVkIjpbImVuYWJsZWQiXSwidHlwZSI6Im9iamVjdCJ9LCJ3ZWJVSSI6eyJkZWZhdWx0Ijp0cnVlLCJkZXNjcmlwdGlvbiI6IldlYlVJIGRldGVybWluZXMgaWYgdGhlIHdlYiBVSSBzaG91bGQgYmUgZGVwbG95ZWQiLCJ0eXBlIjoiYm9vbGVhbiJ9fSwicmVxdWlyZWQiOlsid2ViVUkiXSwidHlwZSI6Im9iamVjdCJ9LCJzdGF0dXMiOnsiZGVzY3JpcHRpb24iOiJPcGVyYXRvckNvbmZpZ1N0YXR1cyBkZWZpbmVzIHRoZSBvYnNlcnZlZCBzdGF0ZSBvZiBPcGVyYXRvckNvbmZpZyIsInByb3BlcnRpZXMiOnsibWVzc2FnZSI6eyJkZXNjcmlwdGlvbiI6Ik1lc3NhZ2UgcHJvdmlkZXMgZGV0YWlsIGFib3V0IHRoZSBjdXJyZW50IHBoYXNlIiwidHlwZSI6InN0cmluZyJ9LCJvYnNlcnZlZEdlbmVyYXRpb24iOnsiZGVzY3JpcHRpb24iOiJPYnNlcnZlZEdlbmVyYXRpb24gaXMgdGhlIG1vc3QgcmVjZW50IGdlbmVyYXRpb24gb2JzZXJ2ZWQgYnkgdGhlIGNvbnRyb2xsZXIuIiwiZm9ybWF0IjoiaW50NjQiLCJ0eXBlIjoiaW50ZWdlciJ9LCJvc0J1aWxkc0RlcGxveWVkIjp7ImRlc2NyaXB0aW9uIjoiT1NCdWlsZHNEZXBsb3llZCBpbmRpY2F0ZXMgaWYgdGhlIE9TIEJ1aWxkcyBUZWt0b24gdGFza3MgYXJlIGN1cnJlbnRseSBkZXBsb3llZCIsInR5cGUiOiJib29sZWFuIn0sInBoYXNlIjp7ImRlc2NyaXB0aW9uIjoiUGhhc2UgcmVwcmVzZW50cyB0aGUgY3VycmVudCBwaGFzZSAoUmVhZHksIFJlY29uY2lsaW5nLCBGYWlsZWQpIiwidHlwZSI6InN0cmluZyJ9LCJ3ZWJVSURlcGxveWVkIjp7ImRlc2NyaXB0aW9uIjoiV2ViVUlEZXBsb3llZCBpbmRpY2F0ZXMgaWYgdGhlIFdlYlVJIGlzIGN1cnJlbnRseSBkZXBsb3llZCIsInR5cGUiOiJib29sZWFuIn19LCJ0eXBlIjoib2JqZWN0In19LCJ0eXBlIjoib2JqZWN0In19LCJzZXJ2ZWQiOnRydWUsInN0b3JhZ2UiOnRydWUsInN1YnJlc291cmNlcyI6eyJzdGF0dXMiOnt9fX1dfSwic3RhdHVzIjp7ImFjY2VwdGVkTmFtZXMiOnsia2luZCI6IiIsInBsdXJhbCI6IiJ9LCJjb25kaXRpb25zIjpudWxsLCJzdG9yZWRWZXJzaW9ucyI6bnVsbH19 - type: olm.bundle.object value: - data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"ImageBuild\",\n    \"metadata\": {\n      \"annotations\": {\n        \"description\": \"Example ImageBuild CR. The architecture can be set to any supported value like \\\"aarch64\\\", \\\"x86_64\\\", etc. See your build platform's documentation for supported values.\\n\"\n      },\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"imagebuild-sample\"\n    },\n    \"spec\": {\n      \"architecture\": \"amd64\",\n      \"automotiveImageBuilder\": \"quay.io/centos-sig-automotive/automotive-image-builder:1.0.0\",\n      \"distro\": \"cs9\",\n      \"exportFormat\": \"qcow2\",\n      \"manifestConfigMap\": \"mpp\",\n      \"mode\": \"image\",\n      \"serveArtifact\": false,\n      \"serveExpiryHours\": 24,\n      \"target\": \"qemu\"\n    }\n  },\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"OperatorConfig\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"automotive-dev\",\n      \"namespace\": \"automotive-dev-operator-system\"\n    },\n    \"spec\": {\n      \"osBuilds\": {\n        \"enabled\": true,\n        \"pvcSize\": \"8Gi\",\n        \"serveExpiryHours\": 24\n      },\n      \"webUI\": true\n    }\n  }\n]","capabilities":"Basic Install","categories":"Developer Tools","containerImage":"quay.io/rh-sdv-cloud/automotive-dev-operator:latest","createdAt":"2026-01-09T11:11:25Z","operatorframework.io/suggested-namespace":"automotive-dev-operator-system","operators.operatorframework.io/builder":"operator-sdk-v1.42.0","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4","repository":"https://github.com/centos-automotive-suite/automotive-dev-operator","support":"Red Hat"},"name":"automotive-dev-operator.v0.0.1","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"kind":"CatalogImage","name":"catalogimages.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"ImageBuild is the Schema for the imagebuilds API","displayName":"Image Build","kind":"ImageBuild","name":"imagebuilds.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"Image is the Schema for the images API","displayName":"Image","kind":"Image","name":"images.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"OperatorConfig is the Schema for the operatorconfigs API","displayName":"Operator Config","kind":"OperatorConfig","name":"operatorconfigs.automotive.sdv.cloud.redhat.com","version":"v1alpha1"}]},"description":"CentOS Automotive Suite","displayName":"CentOS Automotive Suite","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","persistentvolumeclaims","pods","secrets","serviceaccounts","services"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]},{"apiGroups":[""],"resources":["namespaces"],"verbs":["create","get","list","watch"]},{"apiGroups":[""],"resources":["pods/exec"],"verbs":["create"]},{"apiGroups":[""],"resources":["pods/log"],"verbs":["get"]},{"apiGroups":["apps"],"resources":["deployments"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages","imagebuilds","images","operatorconfigs"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/finalizers","imagebuilds/finalizers","images/finalizers","operatorconfigs/finalizers"],"verbs":["update"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/status","imagebuilds/status","images/status","operatorconfigs/status"],"verbs":["get","patch","update"]},{"apiGroups":["networking.k8s.io"],"resources":["ingresses"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["rbac.authorization.k8s.io"],"resources":["clusterrolebindings","clusterroles","rolebindings"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["route.openshift.io"],"resources":["routes"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["create","delete","get","list","patch","update","use","watch"]},{"apiGroups":["tekton.dev"],"resources":["pipelineruns","pipelines","taskruns","tasks"],"verbs":["create","delete","get","list","patch","update","watch"]}],"serviceAccountName":"ado-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"automotive-dev-operator","control-plane":"controller-manager"},"name":"ado-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"control-plane":"controller-manager"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]},{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}},"containers":[{"args":["--leader-elect","--health-probe-bind-address=:8081","--metrics-bind-address=0"],"command":["/manager"],"env":[{"name":"BUILD_API_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"OPERATOR_IMAGE","value":"image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest"}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":8080,"name":"build-api"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"100m","memory":"256Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"initContainers":[{"command":["/init-secrets"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","name":"init-oauth-secrets","resources":{"limits":{"cpu":"100m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"32Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"securityContext":{"runAsNonRoot":true},"serviceAccountName":"ado-controller-manager","terminationGracePeriodSeconds":10}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"ado-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":false,"type":"AllNamespaces"}],"keywords":["automotive"],"links":[{"name":"CentOS Automotive Suite","url":"https://github.com/centos-automotive-suite/automotive-dev-operator"}],"maturity":"alpha","minKubeVersion":"1.26.0","provider":{"name":"Red Hat"},"version":"0.0.1"}} + data: {"apiVersion":"operators.coreos.com/v1alpha1","kind":"ClusterServiceVersion","metadata":{"annotations":{"alm-examples":"[\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"ImageBuild\",\n    \"metadata\": {\n      \"annotations\": {\n        \"description\": \"Example ImageBuild CR. The architecture can be set to any supported value like \\\"aarch64\\\", \\\"x86_64\\\", etc. See your build platform's documentation for supported values.\\n\"\n      },\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"imagebuild-sample\"\n    },\n    \"spec\": {\n      \"architecture\": \"amd64\",\n      \"automotiveImageBuilder\": \"quay.io/centos-sig-automotive/automotive-image-builder:1.0.0\",\n      \"distro\": \"cs9\",\n      \"exportFormat\": \"qcow2\",\n      \"manifestConfigMap\": \"mpp\",\n      \"mode\": \"image\",\n      \"serveArtifact\": false,\n      \"serveExpiryHours\": 24,\n      \"target\": \"qemu\"\n    }\n  },\n  {\n    \"apiVersion\": \"automotive.sdv.cloud.redhat.com/v1alpha1\",\n    \"kind\": \"OperatorConfig\",\n    \"metadata\": {\n      \"labels\": {\n        \"app.kubernetes.io/managed-by\": \"kustomize\",\n        \"app.kubernetes.io/name\": \"automotive-dev-operator\"\n      },\n      \"name\": \"automotive-dev\",\n      \"namespace\": \"automotive-dev-operator-system\"\n    },\n    \"spec\": {\n      \"osBuilds\": {\n        \"enabled\": true,\n        \"pvcSize\": \"8Gi\",\n        \"serveExpiryHours\": 24\n      },\n      \"webUI\": true\n    }\n  }\n]","capabilities":"Basic Install","categories":"Developer Tools","containerImage":"quay.io/rh-sdv-cloud/automotive-dev-operator:latest","createdAt":"2026-01-09T13:33:39Z","operatorframework.io/suggested-namespace":"automotive-dev-operator-system","operators.operatorframework.io/builder":"operator-sdk-v1.42.0","operators.operatorframework.io/project_layout":"go.kubebuilder.io/v4","repository":"https://github.com/centos-automotive-suite/automotive-dev-operator","support":"Red Hat"},"name":"automotive-dev-operator.v0.0.1","namespace":"placeholder"},"spec":{"apiservicedefinitions":{},"customresourcedefinitions":{"owned":[{"kind":"CatalogImage","name":"catalogimages.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"ImageBuild is the Schema for the imagebuilds API","displayName":"Image Build","kind":"ImageBuild","name":"imagebuilds.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"Image is the Schema for the images API","displayName":"Image","kind":"Image","name":"images.automotive.sdv.cloud.redhat.com","version":"v1alpha1"},{"description":"OperatorConfig is the Schema for the operatorconfigs API","displayName":"Operator Config","kind":"OperatorConfig","name":"operatorconfigs.automotive.sdv.cloud.redhat.com","version":"v1alpha1"}]},"description":"CentOS Automotive Suite","displayName":"CentOS Automotive Suite","icon":[{"base64data":"","mediatype":""}],"install":{"spec":{"clusterPermissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps","persistentvolumeclaims","pods","secrets","serviceaccounts","services"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]},{"apiGroups":[""],"resources":["namespaces"],"verbs":["create","get","list","watch"]},{"apiGroups":[""],"resources":["pods/exec"],"verbs":["create"]},{"apiGroups":[""],"resources":["pods/log"],"verbs":["get"]},{"apiGroups":["apps"],"resources":["deployments"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages","imagebuilds","images","operatorconfigs"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/finalizers","imagebuilds/finalizers","images/finalizers","operatorconfigs/finalizers"],"verbs":["update"]},{"apiGroups":["automotive.sdv.cloud.redhat.com"],"resources":["catalogimages/status","imagebuilds/status","images/status","operatorconfigs/status"],"verbs":["get","patch","update"]},{"apiGroups":["networking.k8s.io"],"resources":["ingresses"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["rbac.authorization.k8s.io"],"resources":["clusterrolebindings","clusterroles","rolebindings"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["route.openshift.io"],"resources":["routes"],"verbs":["create","delete","get","list","patch","update","watch"]},{"apiGroups":["security.openshift.io"],"resources":["securitycontextconstraints"],"verbs":["create","delete","get","list","patch","update","use","watch"]},{"apiGroups":["tekton.dev"],"resources":["pipelineruns","pipelines","taskruns","tasks"],"verbs":["create","delete","get","list","patch","update","watch"]}],"serviceAccountName":"ado-controller-manager"}],"deployments":[{"label":{"app.kubernetes.io/managed-by":"kustomize","app.kubernetes.io/name":"automotive-dev-operator","control-plane":"controller-manager"},"name":"ado-controller-manager","spec":{"replicas":1,"selector":{"matchLabels":{"control-plane":"controller-manager"}},"strategy":{},"template":{"metadata":{"annotations":{"kubectl.kubernetes.io/default-container":"manager"},"labels":{"control-plane":"controller-manager"}},"spec":{"affinity":{"nodeAffinity":{"requiredDuringSchedulingIgnoredDuringExecution":{"nodeSelectorTerms":[{"matchExpressions":[{"key":"kubernetes.io/arch","operator":"In","values":["arm64","amd64"]},{"key":"kubernetes.io/os","operator":"In","values":["linux"]}]}]}}},"containers":[{"args":["--leader-elect","--health-probe-bind-address=:8081","--metrics-bind-address=0"],"command":["/manager"],"env":[{"name":"BUILD_API_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}},{"name":"OPERATOR_IMAGE","value":"image-registry.openshift-image-registry.svc:5000/automotive-dev-operator-system/automotive-dev-operator:latest"}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","livenessProbe":{"httpGet":{"path":"/healthz","port":8081},"initialDelaySeconds":15,"periodSeconds":20},"name":"manager","ports":[{"containerPort":8080,"name":"build-api"}],"readinessProbe":{"httpGet":{"path":"/readyz","port":8081},"initialDelaySeconds":5,"periodSeconds":10},"resources":{"limits":{"cpu":"1","memory":"512Mi"},"requests":{"cpu":"100m","memory":"256Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"initContainers":[{"command":["/init-secrets"],"env":[{"name":"POD_NAMESPACE","valueFrom":{"fieldRef":{"fieldPath":"metadata.namespace"}}}],"image":"default-route-openshift-image-registry.apps.automotive1.ocp.automotive.sig.centos.org/automotive-dev-operator-system/automotive-dev-operator:latest","imagePullPolicy":"IfNotPresent","name":"init-oauth-secrets","resources":{"limits":{"cpu":"100m","memory":"64Mi"},"requests":{"cpu":"10m","memory":"32Mi"}},"securityContext":{"allowPrivilegeEscalation":false,"capabilities":{"drop":["ALL"]}}}],"securityContext":{"runAsNonRoot":true},"serviceAccountName":"ado-controller-manager","terminationGracePeriodSeconds":10}}}}],"permissions":[{"rules":[{"apiGroups":[""],"resources":["configmaps"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":["coordination.k8s.io"],"resources":["leases"],"verbs":["get","list","watch","create","update","patch","delete"]},{"apiGroups":[""],"resources":["events"],"verbs":["create","patch"]}],"serviceAccountName":"ado-controller-manager"}]},"strategy":"deployment"},"installModes":[{"supported":true,"type":"OwnNamespace"},{"supported":true,"type":"SingleNamespace"},{"supported":false,"type":"MultiNamespace"},{"supported":false,"type":"AllNamespaces"}],"keywords":["automotive"],"links":[{"name":"CentOS Automotive Suite","url":"https://github.com/centos-automotive-suite/automotive-dev-operator"}],"maturity":"alpha","minKubeVersion":"1.26.0","provider":{"name":"Red Hat"},"version":"0.0.1"}} - type: olm.bundle.object value: data: eyJhcGlWZXJzaW9uIjoicmJhYy5hdXRob3JpemF0aW9uLms4cy5pby92MSIsImtpbmQiOiJDbHVzdGVyUm9sZSIsIm1ldGFkYXRhIjp7ImNyZWF0aW9uVGltZXN0YW1wIjpudWxsLCJsYWJlbHMiOnsiYXBwLmt1YmVybmV0ZXMuaW8vbWFuYWdlZC1ieSI6Imt1c3RvbWl6ZSIsImFwcC5rdWJlcm5ldGVzLmlvL25hbWUiOiJhZG8ifSwibmFtZSI6ImFkby1pbWFnZS12aWV3ZXItcm9sZSJ9LCJydWxlcyI6W3siYXBpR3JvdXBzIjpbImF1dG9tb3RpdmUuc2R2LmNsb3VkLnJlZGhhdC5jb20iXSwicmVzb3VyY2VzIjpbImltYWdlcyJdLCJ2ZXJicyI6WyJnZXQiLCJsaXN0Iiwid2F0Y2giXX0seyJhcGlHcm91cHMiOlsiYXV0b21vdGl2ZS5zZHYuY2xvdWQucmVkaGF0LmNvbSJdLCJyZXNvdXJjZXMiOlsiaW1hZ2VzL3N0YXR1cyJdLCJ2ZXJicyI6WyJnZXQiXX1dfQ== diff --git a/cmd/caib/main.go b/cmd/caib/main.go index bf707feb..25cd1bc8 100644 --- a/cmd/caib/main.go +++ b/cmd/caib/main.go @@ -796,6 +796,10 @@ func waitForBuildCompletion(ctx context.Context, api *buildapiclient.Client, nam userFollowRequested := followLogs var lastPhase, lastMessage string logFollowWarned := false + logRetryFailureWarned := false + logStreamActive := false + logRetryCount := 0 + const maxLogRetries = 24 // Try for ~2 minutes (24 * 5s = 120s) before giving up logClient := &http.Client{ Timeout: 10 * time.Minute, @@ -810,36 +814,7 @@ func waitForBuildCompletion(ctx context.Context, api *buildapiclient.Client, nam case <-timeoutCtx.Done(): handleError(fmt.Errorf("timed out waiting for build")) case <-ticker.C: - if followLogs { - req, _ := http.NewRequestWithContext(ctx, http.MethodGet, strings.TrimRight(serverURL, "/")+"/v1/builds/"+url.PathEscape(name)+"/logs?follow=1", nil) - if strings.TrimSpace(authToken) != "" { - req.Header.Set("Authorization", "Bearer "+strings.TrimSpace(authToken)) - } - resp, err := logClient.Do(req) - if err == nil && resp.StatusCode == http.StatusOK { - fmt.Println("Streaming logs...") - io.Copy(os.Stdout, resp.Body) - resp.Body.Close() - followLogs = userFollowRequested - } else if resp != nil { - body, _ := io.ReadAll(resp.Body) - msg := strings.TrimSpace(string(body)) - if resp.StatusCode == http.StatusServiceUnavailable || resp.StatusCode == http.StatusGatewayTimeout { - if !logFollowWarned { - fmt.Println("log stream not ready (HTTP", resp.StatusCode, "). Retrying...") - logFollowWarned = true - } - } else { - if msg != "" { - fmt.Printf("log stream error (%d): %s\n", resp.StatusCode, msg) - } else { - fmt.Printf("log stream error: HTTP %d\n", resp.StatusCode) - } - followLogs = false - } - resp.Body.Close() - } - } + // First, check build status reqCtx, cancelReq := context.WithTimeout(ctx, 2*time.Minute) st, err := api.GetBuild(reqCtx, name) cancelReq() @@ -847,13 +822,17 @@ func waitForBuildCompletion(ctx context.Context, api *buildapiclient.Client, nam fmt.Printf("status check failed: %v\n", err) continue } - if !userFollowRequested { + + // Update status display (only if not actively streaming logs) + if !logStreamActive && (!userFollowRequested || logRetryCount > maxLogRetries) { if st.Phase != lastPhase || st.Message != lastMessage { fmt.Printf("status: %s - %s\n", st.Phase, st.Message) lastPhase = st.Phase lastMessage = st.Message } } + + // Handle completed/failed builds if st.Phase == "Completed" { if downloadTo != "" { outDir := filepath.Dir(downloadTo) @@ -869,8 +848,91 @@ func waitForBuildCompletion(ctx context.Context, api *buildapiclient.Client, nam if st.Phase == "Failed" { handleError(fmt.Errorf("build failed: %s", st.Message)) } + + // Only attempt log streaming if: + // 1. User requested it + // 2. Build is in active phase (Building, Running, etc.) + // 3. We haven't exceeded retry limit + // 4. We're not already streaming + if followLogs && !logStreamActive && logRetryCount <= maxLogRetries { + buildIsActive := st.Phase == "Building" || st.Phase == "Running" || st.Phase == "Uploading" + if buildIsActive || (st.Phase != "Pending" && st.Phase != "Completed" && st.Phase != "Failed") { + // First attempt - show helpful message + if logRetryCount == 0 && buildIsActive { + fmt.Println("Build is active. Attempting to stream logs...") + logFollowWarned = false // Reset so we can show retry messages + } + + if err := tryLogStreaming(ctx, logClient, name, &logStreamActive, &logRetryCount, &logFollowWarned); err != nil { + // Log streaming failed, will retry next iteration if under limit + logRetryCount++ + if logRetryCount > maxLogRetries && !logRetryFailureWarned { + fmt.Printf("Log streaming failed after %d attempts (~2 minutes). Falling back to status updates only.\n", maxLogRetries) + logRetryFailureWarned = true + } + } else { + // Streaming succeeded, reset retry count + logRetryCount = 0 + followLogs = userFollowRequested // Reset for potential future streams + } + } else if st.Phase == "Pending" { + // Build not yet started, reset retry count and wait + logRetryCount = 0 + if userFollowRequested && !logFollowWarned { + fmt.Println("Waiting for build to start before streaming logs...") + logFollowWarned = true // Prevent spam + } + } + } + } + } +} + +// tryLogStreaming attempts to stream logs and returns error if it fails +func tryLogStreaming(ctx context.Context, logClient *http.Client, name string, logStreamActive *bool, logRetryCount *int, logFollowWarned *bool) error { + req, _ := http.NewRequestWithContext(ctx, http.MethodGet, strings.TrimRight(serverURL, "/")+"/v1/builds/"+url.PathEscape(name)+"/logs?follow=1", nil) + if strings.TrimSpace(authToken) != "" { + req.Header.Set("Authorization", "Bearer "+strings.TrimSpace(authToken)) + } + + resp, err := logClient.Do(req) + if err != nil { + return fmt.Errorf("log request failed: %w", err) + } + defer resp.Body.Close() + + if resp.StatusCode == http.StatusOK { + fmt.Println("Streaming logs...") + *logStreamActive = true + *logFollowWarned = false + *logRetryCount = 0 + _, copyErr := io.Copy(os.Stdout, resp.Body) + *logStreamActive = false + if copyErr != nil { + return fmt.Errorf("log stream interrupted: %w", copyErr) + } + return nil // Streaming completed successfully + } + + // Handle error responses + body, _ := io.ReadAll(resp.Body) + msg := strings.TrimSpace(string(body)) + + if resp.StatusCode == http.StatusServiceUnavailable || resp.StatusCode == http.StatusGatewayTimeout { + if !*logFollowWarned { + fmt.Printf("log stream not ready (HTTP %d). Retrying... (attempt %d/24)\n", resp.StatusCode, *logRetryCount+1) + *logFollowWarned = true } + return fmt.Errorf("log endpoint not ready (HTTP %d)", resp.StatusCode) + } + + // Other errors - show message and stop trying + if msg != "" { + fmt.Printf("log stream error (%d): %s\n", resp.StatusCode, msg) + } else { + fmt.Printf("log stream error: HTTP %d\n", resp.StatusCode) } + return fmt.Errorf("log stream failed with HTTP %d", resp.StatusCode) } func handleError(err error) { diff --git a/internal/buildapi/server.go b/internal/buildapi/server.go index 3c31274d..ac431ec5 100644 --- a/internal/buildapi/server.go +++ b/internal/buildapi/server.go @@ -288,7 +288,7 @@ func streamLogs(c *gin.Context, name string) { c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) return } - pods, err := quickCS.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{LabelSelector: "tekton.dev/pipelineRun=" + tr + ",tekton.dev/taskRun"}) + pods, err := quickCS.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{LabelSelector: "tekton.dev/pipelineRun=" + tr + ",tekton.dev/memberOf=tasks"}) if err != nil || len(pods.Items) == 0 { c.JSON(http.StatusServiceUnavailable, gin.H{"error": "logs not available yet"}) return @@ -484,7 +484,7 @@ func streamLogsSSE(c *gin.Context, name string) { c.Writer.Flush() return } - pods, err := quickCS.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{LabelSelector: "tekton.dev/pipelineRun=" + tr + ",tekton.dev/taskRun"}) + pods, err := quickCS.CoreV1().Pods(namespace).List(ctx, metav1.ListOptions{LabelSelector: "tekton.dev/pipelineRun=" + tr + ",tekton.dev/memberOf=tasks"}) if err != nil || len(pods.Items) == 0 { sendSSEEvent(c, "waiting", "", "Build pods not ready yet, waiting for logs...") c.Writer.Flush() From 28099648343dc5980059ae1ea4d34bd51dac90c4 Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Sun, 11 Jan 2026 09:07:38 +0200 Subject: [PATCH 5/7] --follow by default Signed-off-by: Benny Zlotnik --- cmd/caib/main.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/caib/main.go b/cmd/caib/main.go index 25cd1bc8..d3138cb6 100644 --- a/cmd/caib/main.go +++ b/cmd/caib/main.go @@ -249,7 +249,7 @@ Examples: buildCmd.Flags().StringArrayVarP(&customDefs, "define", "D", []string{}, "custom definition KEY=VALUE") buildCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") buildCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") - buildCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") + buildCmd.Flags().BoolVarP(&followLogs, "follow", "f", true, "follow build logs") _ = buildCmd.MarkFlagRequired("push") downloadCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL (e.g. https://api.example)") @@ -279,7 +279,7 @@ Examples: diskCmd.Flags().StringVar(&storageClass, "storage-class", "", "Kubernetes storage class") diskCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") diskCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") - diskCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") + diskCmd.Flags().BoolVarP(&followLogs, "follow", "f", true, "follow build logs") // build-legacy command flags (traditional ostree/package builds) buildLegacyCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL") @@ -300,7 +300,7 @@ Examples: buildLegacyCmd.Flags().StringArrayVarP(&customDefs, "define", "D", []string{}, "custom definition KEY=VALUE") buildLegacyCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") buildLegacyCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") - buildLegacyCmd.Flags().BoolVarP(&followLogs, "follow", "f", false, "follow build logs") + buildLegacyCmd.Flags().BoolVarP(&followLogs, "follow", "f", true, "follow build logs") _ = buildLegacyCmd.MarkFlagRequired("mode") _ = buildLegacyCmd.MarkFlagRequired("format") From 95a57b1d7d8c8a37a8853042546b200a95f69e3f Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Sun, 11 Jan 2026 10:07:02 +0200 Subject: [PATCH 6/7] simplify CLI Signed-off-by: Benny Zlotnik --- cmd/caib/main.go | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/caib/main.go b/cmd/caib/main.go index d3138cb6..d0415827 100644 --- a/cmd/caib/main.go +++ b/cmd/caib/main.go @@ -235,7 +235,7 @@ Examples: buildCmd.Flags().StringVarP(&distro, "distro", "d", "autosd", "distribution to build") buildCmd.Flags().StringVarP(&target, "target", "t", "qemu", "target platform") buildCmd.Flags().StringVarP(&architecture, "arch", "a", getDefaultArch(), "architecture (amd64, arm64)") - buildCmd.Flags().StringVar(&containerPush, "push", "", "push bootc container to registry (required)") + buildCmd.Flags().StringVar(&containerPush, "push", "", "push bootc container to registry (optional if --disk is used)") buildCmd.Flags().BoolVar(&buildDiskImage, "disk", false, "also build disk image from container") buildCmd.Flags().StringVarP(&outputDir, "output", "o", "", "download disk image to file (requires --disk)") buildCmd.Flags().StringVar(&diskFormat, "format", "", "disk image format (qcow2, raw, simg); inferred from output filename if not set") @@ -250,7 +250,7 @@ Examples: buildCmd.Flags().IntVar(&timeout, "timeout", 60, "timeout in minutes") buildCmd.Flags().BoolVarP(&waitForBuild, "wait", "w", false, "wait for build to complete") buildCmd.Flags().BoolVarP(&followLogs, "follow", "f", true, "follow build logs") - _ = buildCmd.MarkFlagRequired("push") + // Note: --push is optional when --disk is used (disk image becomes the output) downloadCmd.Flags().StringVar(&serverURL, "server", os.Getenv("CAIB_SERVER"), "REST API server base URL (e.g. https://api.example)") downloadCmd.Flags().StringVar(&authToken, "token", os.Getenv("CAIB_TOKEN"), "Bearer token for authentication (e.g., OpenShift access token)") @@ -337,6 +337,12 @@ func runBuild(cmd *cobra.Command, args []string) { buildDiskImage = true // imply --disk when --output is specified } + // Validate: --push is required unless we're building a disk image + // (disk image becomes the output, so container push is optional) + if containerPush == "" && !buildDiskImage { + handleError(fmt.Errorf("--push is required when not building a disk image (use --disk or --output to create a disk image without pushing the container)")) + } + // Note: diskFormat can be empty - AIB will default to raw (or infer from output filename extension) api, err := createBuildAPIClient(serverURL, &authToken) @@ -369,6 +375,7 @@ func runBuild(cmd *cobra.Command, args []string) { BuildDiskImage: buildDiskImage, ExportOCI: exportOCI, BuilderImage: builderImage, + ServeArtifact: outputDir != "" && exportOCI == "", } if effectiveRegistryURL != "" { From 7345dc893e415acc4034e37c0103c4bbcaff5ff7 Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Sun, 11 Jan 2026 10:17:23 +0200 Subject: [PATCH 7/7] improve secret handling Signed-off-by: Benny Zlotnik --- internal/buildapi/server.go | 27 ++++++--- internal/controller/imagebuild/controller.go | 61 ++++++++++++-------- 2 files changed, 58 insertions(+), 30 deletions(-) diff --git a/internal/buildapi/server.go b/internal/buildapi/server.go index ac431ec5..141ff21f 100644 --- a/internal/buildapi/server.go +++ b/internal/buildapi/server.go @@ -8,6 +8,7 @@ import ( "encoding/json" "fmt" "io" + "log" "net/http" "os" "path" @@ -1032,19 +1033,20 @@ func createBuild(c *gin.Context) { return } - if err := setOwnerRef(ctx, k8sClient, namespace, cfgName, imageBuild); err != nil { - // best-effort + // Set owner references for cascading deletion + if err := setConfigMapOwnerRef(ctx, k8sClient, namespace, cfgName, imageBuild); err != nil { + log.Printf("WARNING: failed to set owner reference on ConfigMap %s: %v (cleanup may require manual intervention)", cfgName, err) } if envSecretRef != "" { - if err := setOwnerRef(ctx, k8sClient, namespace, envSecretRef, imageBuild); err != nil { - // best-effort + if err := setSecretOwnerRef(ctx, k8sClient, namespace, envSecretRef, imageBuild); err != nil { + log.Printf("WARNING: failed to set owner reference on registry secret %s: %v (cleanup may require manual intervention)", envSecretRef, err) } } if pushSecretName != "" { - if err := setOwnerRef(ctx, k8sClient, namespace, pushSecretName, imageBuild); err != nil { - // best-effort + if err := setSecretOwnerRef(ctx, k8sClient, namespace, pushSecretName, imageBuild); err != nil { + log.Printf("WARNING: failed to set owner reference on push secret %s: %v (cleanup may require manual intervention)", pushSecretName, err) } } @@ -1913,7 +1915,7 @@ func copyFileToPod(config *rest.Config, namespace, podName, containerName, local return executor.StreamWithContext(context.Background(), remotecommand.StreamOptions{Stdin: pr, Stdout: io.Discard, Stderr: io.Discard}) } -func setOwnerRef(ctx context.Context, c client.Client, namespace, configMapName string, owner *automotivev1alpha1.ImageBuild) error { +func setConfigMapOwnerRef(ctx context.Context, c client.Client, namespace, configMapName string, owner *automotivev1alpha1.ImageBuild) error { cm := &corev1.ConfigMap{} if err := c.Get(ctx, types.NamespacedName{Name: configMapName, Namespace: namespace}, cm); err != nil { return err @@ -1924,6 +1926,17 @@ func setOwnerRef(ctx context.Context, c client.Client, namespace, configMapName return c.Update(ctx, cm) } +func setSecretOwnerRef(ctx context.Context, c client.Client, namespace, secretName string, owner *automotivev1alpha1.ImageBuild) error { + secret := &corev1.Secret{} + if err := c.Get(ctx, types.NamespacedName{Name: secretName, Namespace: namespace}, secret); err != nil { + return err + } + secret.OwnerReferences = []metav1.OwnerReference{ + *metav1.NewControllerRef(owner, automotivev1alpha1.GroupVersion.WithKind("ImageBuild")), + } + return c.Update(ctx, secret) +} + func writeJSON(c *gin.Context, status int, v any) { c.Header("Cache-Control", "no-store") c.IndentedJSON(status, v) diff --git a/internal/controller/imagebuild/controller.go b/internal/controller/imagebuild/controller.go index 96bfd9a8..2dbe1f6f 100644 --- a/internal/controller/imagebuild/controller.go +++ b/internal/controller/imagebuild/controller.go @@ -1126,37 +1126,51 @@ server { } // cleanupTransientSecrets deletes any transient secrets created for this build +// Uses retry logic to handle transient API errors func (r *ImageBuildReconciler) cleanupTransientSecrets(ctx context.Context, imageBuild *automotivev1alpha1.ImageBuild, log logr.Logger) { // Cleanup registry auth secret (EnvSecretRef) if imageBuild.Spec.EnvSecretRef != "" { - secret := &corev1.Secret{ - ObjectMeta: metav1.ObjectMeta{ - Name: imageBuild.Spec.EnvSecretRef, - Namespace: imageBuild.Namespace, - }, - } - if err := r.Delete(ctx, secret); err != nil && !errors.IsNotFound(err) { - log.Error(err, "Failed to delete registry auth secret", "secret", imageBuild.Spec.EnvSecretRef) - } else if err == nil { - log.Info("Deleted registry auth secret", "secret", imageBuild.Spec.EnvSecretRef) - } + r.deleteSecretWithRetry(ctx, imageBuild.Namespace, imageBuild.Spec.EnvSecretRef, "registry auth", log) } // Cleanup push secret (Publishers.Registry.Secret) if imageBuild.Spec.Publishers != nil && imageBuild.Spec.Publishers.Registry != nil { secretName := imageBuild.Spec.Publishers.Registry.Secret if secretName != "" { - secret := &corev1.Secret{ - ObjectMeta: metav1.ObjectMeta{ - Name: secretName, - Namespace: imageBuild.Namespace, - }, - } - if err := r.Delete(ctx, secret); err != nil && !errors.IsNotFound(err) { - log.Error(err, "Failed to delete push secret", "secret", secretName) - } else if err == nil { - log.Info("Deleted push secret", "secret", secretName) - } + r.deleteSecretWithRetry(ctx, imageBuild.Namespace, secretName, "push", log) + } + } +} + +// deleteSecretWithRetry attempts to delete a secret with exponential backoff retry +func (r *ImageBuildReconciler) deleteSecretWithRetry(ctx context.Context, namespace, secretName, secretType string, log logr.Logger) { + maxRetries := 3 + backoff := 100 * time.Millisecond + + for attempt := 1; attempt <= maxRetries; attempt++ { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: secretName, + Namespace: namespace, + }, + } + err := r.Delete(ctx, secret) + if err == nil { + log.Info("Deleted "+secretType+" secret", "secret", secretName) + return + } + if errors.IsNotFound(err) { + // Already deleted, nothing to do + return + } + + // Transient error - retry with backoff + if attempt < maxRetries { + log.V(1).Info("Retrying secret deletion", "secret", secretName, "attempt", attempt, "error", err.Error()) + time.Sleep(backoff) + backoff *= 2 // Exponential backoff + } else { + log.Error(err, "Failed to delete "+secretType+" secret after retries (manual cleanup may be required)", "secret", secretName, "attempts", maxRetries) } } } @@ -1169,7 +1183,8 @@ func (r *ImageBuildReconciler) SetupWithManager(mgr ctrl.Manager) error { Owns(&corev1.Pod{}). Owns(&corev1.PersistentVolumeClaim{}). Owns(&corev1.Service{}). - Owns(&corev1.ConfigMap{}) + Owns(&corev1.ConfigMap{}). + Owns(&corev1.Secret{}) // Only add Route ownership if the Route CRD is available (OpenShift only) _, err := mgr.GetRESTMapper().RESTMapping(routev1.GroupVersion.WithKind("Route").GroupKind())