particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

go.mod,vendor: update to images v0.177.0

Browse source
This commit is contained in:
Michael Vogt 2025-08-18 13:27:13 +02:00 • committed by Tomáš Hozza
parent c0cf23ded7
commit 36ccbf19b2
113 changed files with 61854 additions and 58639 deletions
Download patch file Download diff file Expand all files Collapse all files

50
go.mod
View file

@ -5,14 +5,14 @@ go 1.23.9
exclude github.com/mattn/go-sqlite3 v2.0.3+incompatible
require (
cloud.google.com/go/compute v1.42.0
cloud.google.com/go/compute v1.43.0
github.com/BurntSushi/toml v1.5.1-0.20250403130103-3d3abc24416a
github.com/aws/aws-sdk-go-v2 v1.37.2
github.com/aws/aws-sdk-go-v2/config v1.30.3
github.com/aws/aws-sdk-go-v2/credentials v1.18.3
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.2
github.com/aws/aws-sdk-go-v2 v1.38.0
github.com/aws/aws-sdk-go-v2/config v1.31.0
github.com/aws/aws-sdk-go-v2/credentials v1.18.4
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.56.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.241.0
github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0
github.com/aws/smithy-go v1.22.5
github.com/coreos/go-systemd/v22 v22.5.0
github.com/getkin/kin-openapi v0.132.0
@ -33,8 +33,8 @@ require (
github.com/oapi-codegen/oapi-codegen/v2 v2.5.0
github.com/oapi-codegen/runtime v1.1.2
github.com/openshift-online/ocm-sdk-go v0.1.473
github.com/osbuild/blueprint v1.12.0
github.com/osbuild/images v0.175.0
github.com/osbuild/blueprint v1.13.0
github.com/osbuild/images v0.177.0
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d
github.com/prometheus/client_golang v1.23.0
github.com/segmentio/ksuid v1.0.4
@ -42,15 +42,15 @@ require (
github.com/stretchr/testify v1.10.0
golang.org/x/exp v0.0.0-20250103183323-7d7fa50e5329
golang.org/x/sync v0.16.0
google.golang.org/api v0.246.0
google.golang.org/api v0.247.0
)
require (
cel.dev/expr v0.24.0 // indirect
cloud.google.com/go v0.121.4 // indirect
cloud.google.com/go/auth v0.16.3 // indirect
cloud.google.com/go/auth v0.16.4 // indirect
cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
cloud.google.com/go/compute/metadata v0.7.0 // indirect
cloud.google.com/go/compute/metadata v0.8.0 // indirect
cloud.google.com/go/iam v1.5.2 // indirect
cloud.google.com/go/monitoring v1.24.2 // indirect
cloud.google.com/go/storage v1.56.0 // indirect
@ -72,19 +72,19 @@ require (
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/apapsch/go-jsonmerge/v2 v2.0.0 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.2 // indirect
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.2 // indirect
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.2 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.86.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.27.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.32.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.36.0 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 // indirect
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.28.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.37.0 // indirect
github.com/aymerick/douceur v0.2.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@ -226,10 +226,10 @@ require (
golang.org/x/time v0.12.0 // indirect
golang.org/x/tools v0.36.0 // indirect
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
google.golang.org/grpc v1.74.2 // indirect
google.golang.org/protobuf v1.36.6 // indirect
google.golang.org/protobuf v1.36.7 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect

100
go.sum
View file

@ -3,14 +3,14 @@ cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.121.4 h1:cVvUiY0sX0xwyxPwdSU2KsF9knOVmtRyAMt8xou0iTs=
cloud.google.com/go v0.121.4/go.mod h1:XEBchUiHFJbz4lKBZwYBDHV/rSyfFktk737TLDU089s=
cloud.google.com/go/auth v0.16.3 h1:kabzoQ9/bobUmnseYnBO6qQG7q4a/CffFRlJSxv2wCc=
cloud.google.com/go/auth v0.16.3/go.mod h1:NucRGjaXfzP1ltpcQ7On/VTZ0H4kWB5Jy+Y9Dnm76fA=
cloud.google.com/go/auth v0.16.4 h1:fXOAIQmkApVvcIn7Pc2+5J8QTMVbUGLscnSVNl11su8=
cloud.google.com/go/auth v0.16.4/go.mod h1:j10ncYwjX/g3cdX7GpEzsdM+d+ZNsXAbb6qXA7p1Y5M=
cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc=
cloud.google.com/go/auth/oauth2adapt v0.2.8/go.mod h1:XQ9y31RkqZCcwJWNSx2Xvric3RrU88hAYYbjDWYDL+c=
cloud.google.com/go/compute v1.42.0 h1:QkiEHC6sYYqzyDBXfr8WjR0GkXd28u+a7ISwMee1qAA=
cloud.google.com/go/compute v1.42.0/go.mod h1:AE0hsarwPZohZIj3x1Yabea9Re+cTC3QPzvM4OeZpJU=
cloud.google.com/go/compute/metadata v0.7.0 h1:PBWF+iiAerVNe8UCHxdOt6eHLVc3ydFeOCw78U8ytSU=
cloud.google.com/go/compute/metadata v0.7.0/go.mod h1:j5MvL9PprKL39t166CoB1uVHfQMs4tFQZZcKwksXUjo=
cloud.google.com/go/compute v1.43.0 h1:6gRrxftrqe5llEyTvwPGGEqTnetXOrlLhPPyU4oTd34=
cloud.google.com/go/compute v1.43.0/go.mod h1:CVU1vblYdyi+kDBwugna5cHxDVAZ7FHMqKT9/aRHIJs=
cloud.google.com/go/compute/metadata v0.8.0 h1:HxMRIbao8w17ZX6wBnjhcDkW6lTFpgcaobyVfZWqRLA=
cloud.google.com/go/compute/metadata v0.8.0/go.mod h1:sYOGTp851OV9bOFJ9CH7elVvyzopvWQFNNghtDQ/Biw=
cloud.google.com/go/iam v1.5.2 h1:qgFRAGEmd8z6dJ/qyEchAuL9jpswyODjA2lS+w234g8=
cloud.google.com/go/iam v1.5.2/go.mod h1:SE1vg0N81zQqLzQEwxL2WI6yhetBdbNQuTvIKCSkUHE=
cloud.google.com/go/logging v1.13.0 h1:7j0HgAp0B94o1YRDqiqm26w4q1rDMH7XNRU34lJXHYc=
@ -76,46 +76,46 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpH
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
github.com/apapsch/go-jsonmerge/v2 v2.0.0 h1:axGnT1gRIfimI7gJifB699GoE/oq+F2MU7Dml6nw9rQ=
github.com/apapsch/go-jsonmerge/v2 v2.0.0/go.mod h1:lvDnEdqiQrp0O42VQGgmlKpxL1AP2+08jFMw88y4klk=
github.com/aws/aws-sdk-go-v2 v1.37.2 h1:xkW1iMYawzcmYFYEV0UCMxc8gSsjCGEhBXQkdQywVbo=
github.com/aws/aws-sdk-go-v2 v1.37.2/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
github.com/aws/aws-sdk-go-v2 v1.38.0 h1:UCRQ5mlqcFk9HJDIqENSLR3wiG1VTWlyUfLDEvY7RxU=
github.com/aws/aws-sdk-go-v2 v1.38.0/go.mod h1:9Q0OoGQoboYIAJyslFyF1f5K1Ryddop8gqMhWx/n4Wg=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0 h1:6GMWV6CNpA/6fbFHnoAjrv4+LGfyTqZz2LtCHnspgDg=
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.0/go.mod h1:/mXlTIVG9jbxkqDnr5UQNQxW1HRYxeGklkM9vAFeabg=
github.com/aws/aws-sdk-go-v2/config v1.30.3 h1:utupeVnE3bmB221W08P0Moz1lDI3OwYa2fBtUhl7TCc=
github.com/aws/aws-sdk-go-v2/config v1.30.3/go.mod h1:NDGwOEBdpyZwLPlQkpKIO7frf18BW8PaCmAM9iUxQmI=
github.com/aws/aws-sdk-go-v2/credentials v1.18.3 h1:ptfyXmv+ooxzFwyuBth0yqABcjVIkjDL0iTYZBSbum8=
github.com/aws/aws-sdk-go-v2/credentials v1.18.3/go.mod h1:Q43Nci++Wohb0qUh4m54sNln0dbxJw8PvQWkrwOkGOI=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.2 h1:nRniHAvjFJGUCl04F3WaAj7qp/rcz5Gi1OVoj5ErBkc=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.2/go.mod h1:eJDFKAMHHUvv4a0Zfa7bQb//wFNUXGrbFpYRCHe2kD0=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.3 h1:Nb2pUE30lySKPGdkiIJ1SZgHsjiebOiRNI7R9NA1WtM=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.3/go.mod h1:BO5EKulvhBF1NXwui8lfnuDPBQQU5807yvWASZ/5n6k=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.2 h1:sPiRHLVUIIQcoVZTNwqQcdtjkqkPopyYmIX0M5ElRf4=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.2/go.mod h1:ik86P3sgV+Bk7c1tBFCwI3VxMoSEwl4YkRB9xn1s340=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.2 h1:ZdzDAg075H6stMZtbD2o+PyB933M/f20e9WmCBC17wA=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.2/go.mod h1:eE1IIzXG9sdZCB0pNNpMpsYTLl4YdOQD3njiVN1e/E4=
github.com/aws/aws-sdk-go-v2/config v1.31.0 h1:9yH0xiY5fUnVNLRWO0AtayqwU1ndriZdN78LlhruJR4=
github.com/aws/aws-sdk-go-v2/config v1.31.0/go.mod h1:VeV3K72nXnhbe4EuxxhzsDc/ByrCSlZwUnWH52Nde/I=
github.com/aws/aws-sdk-go-v2/credentials v1.18.4 h1:IPd0Algf1b+Qy9BcDp0sCUcIWdCQPSzDoMK3a8pcbUM=
github.com/aws/aws-sdk-go-v2/credentials v1.18.4/go.mod h1:nwg78FjH2qvsRM1EVZlX9WuGUJOL5od+0qvm0adEzHk=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3 h1:GicIdnekoJsjq9wqnvyi2elW6CGMSYKhdozE7/Svh78=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.3/go.mod h1:R7BIi6WNC5mc1kfRM7XM/VHC3uRWkjc396sfabq4iOo=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4 h1:0SzCLoPRSK3qSydsaFQWugP+lOBCTPwfcBOm6222+UA=
github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.18.4/go.mod h1:JAet9FsBHjfdI+TnMBX4ModNNaQHAd3dc/Bk+cNsxeM=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3 h1:o9RnO+YZ4X+kt5Z7Nvcishlz0nksIt2PIzDglLMP0vA=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.3/go.mod h1:+6aLJzOG1fvMOyzIySYjOFjcguGvVRL68R+uoRencN4=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3 h1:joyyUFhiTQQmVK6ImzNU9TQSNRNeD9kOklqTzyk5v6s=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.3/go.mod h1:+vNIyZQP3b3B1tSLI0lxvrU9cfM7gpdRXMFfm67ZcPc=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.2 h1:sBpc8Ph6CpfZsEdkz/8bfg8WhKlWMCms5iWj6W/AW2U=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.2/go.mod h1:Z2lDojZB+92Wo6EKiZZmJid9pPrDJW2NNIXSlaEfVlU=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3 h1:ZV2XK2L3HBq9sCKQiQ/MdhZJppH/rH0vddEAamsHUIs=
github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.3/go.mod h1:b9F9tk2HdHpbf3xbN7rUZcfmJI26N6NcJu/8OsBFI/0=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.56.0 h1:YO7rat493hVtpBExbcDPKdGzk9eYTtaUrwaFJSWAqLo=
github.com/aws/aws-sdk-go-v2/service/autoscaling v1.56.0/go.mod h1:6vrMqNnS2fpOfZ9tZmIGDWYGTio7+SJ18fql3IwoSBg=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.241.0 h1:twGX//bv1QH/9pyJaqynNSo0eXGkDEdDTFy8GNPsz5M=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.241.0/go.mod h1:HDxGArx3/bUnkoFsuvTNIxEj/cR3f+IgsVh1B7Pvay8=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0 h1:KfETrpt7yv2nkSrjOltgmKyAl8scbzYc4TFtZeoV6uc=
github.com/aws/aws-sdk-go-v2/service/ec2 v1.244.0/go.mod h1:EeWmteKqZjaMj45MUmPET1SisFI+HkqWIRQoyjMivcc=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0 h1:6+lZi2JeGKtCraAj1rpoZfKqnQ9SptseRZioejfUOLM=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.0/go.mod h1:eb3gfbVIxIoGgJsi9pGne19dhCBpK6opTYpQqAmdy44=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.2 h1:blV3dY6WbxIVOFggfYIo2E1Q2lZoy5imS7nKgu5m6Tc=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.2/go.mod h1:cBWNeLBjHJRSmXAxdS7mwiMUEgx6zup4wQ9J+/PcsRQ=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.2 h1:oxmDEO14NBZJbK/M8y3brhMFEIGN4j8a6Aq8eY0sqlo=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.2/go.mod h1:4hH+8QCrk1uRWDPsVfsNDUup3taAjO8Dnx63au7smAU=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.2 h1:0hBNFAPwecERLzkhhBY+lQKUMpXSKVv4Sxovikrioms=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.2/go.mod h1:Vcnh4KyR4imrrjGN7A2kP2v9y6EPudqoPKXtnmBliPU=
github.com/aws/aws-sdk-go-v2/service/s3 v1.86.0 h1:utPhv4ECQzJIUbtx7vMN4A8uZxlQ5tSt1H1toPI41h8=
github.com/aws/aws-sdk-go-v2/service/s3 v1.86.0/go.mod h1:1/eZYtTWazDgVl96LmGdGktHFi7prAcGCrJ9JGvBITU=
github.com/aws/aws-sdk-go-v2/service/sso v1.27.0 h1:j7/jTOjWeJDolPwZ/J4yZ7dUsxsWZEsxNwH5O7F8eEA=
github.com/aws/aws-sdk-go-v2/service/sso v1.27.0/go.mod h1:M0xdEPQtgpNT7kdAX4/vOAPkFj60hSQRb7TvW9B0iug=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.32.0 h1:ywQF2N4VjqX+Psw+jLjMmUL2g1RDHlvri3NxHA08MGI=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.32.0/go.mod h1:Z+qv5Q6b7sWiclvbJyPSOT1BRVU9wfSUPaqQzZ1Xg3E=
github.com/aws/aws-sdk-go-v2/service/sts v1.36.0 h1:bRP/a9llXSSgDPk7Rqn5GD/DQCGo6uk95plBFKoXt2M=
github.com/aws/aws-sdk-go-v2/service/sts v1.36.0/go.mod h1:tgBsFzxwl65BWkuJ/x2EUs59bD4SfYKgikvFDJi1S58=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3 h1:3ZKmesYBaFX33czDl6mbrcHb6jeheg6LqjJhQdefhsY=
github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.8.3/go.mod h1:7ryVb78GLCnjq7cw45N6oUb9REl7/vNUwjvIqC5UgdY=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3 h1:ieRzyHXypu5ByllM7Sp4hC5f/1Fy5wqxqY0yB85hC7s=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.3/go.mod h1:O5ROz8jHiOAKAwx179v+7sHMhfobFVi6nZt8DEyiYoM=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3 h1:SE/e52dq9a05RuxzLcjT+S5ZpQobj3ie3UTaSf2NnZc=
github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.3/go.mod h1:zkpvBTsR020VVr8TOrwK2TrUW9pOir28sH5ECHpnAfo=
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0 h1:egoDf+Geuuntmw79Mz6mk9gGmELCPzg5PFEABOHB+6Y=
github.com/aws/aws-sdk-go-v2/service/s3 v1.87.0/go.mod h1:t9MDi29H+HDbkolTSQtbI0HP9DemAWQzUjmWC7LGMnE=
github.com/aws/aws-sdk-go-v2/service/sso v1.28.0 h1:Mc/MKBf2m4VynyJkABoVEN+QzkfLqGj0aiJuEe7cMeM=
github.com/aws/aws-sdk-go-v2/service/sso v1.28.0/go.mod h1:iS5OmxEcN4QIPXARGhavH7S8kETNL11kym6jhoS7IUQ=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0 h1:6csaS/aJmqZQbKhi1EyEMM7yBW653Wy/B9hnBofW+sw=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.33.0/go.mod h1:59qHWaY5B+Rs7HGTuVGaC32m0rdpQ68N8QCN3khYiqs=
github.com/aws/aws-sdk-go-v2/service/sts v1.37.0 h1:MG9VFW43M4A8BYeAfaJJZWrroinxeTi2r3+SnmLQfSA=
github.com/aws/aws-sdk-go-v2/service/sts v1.37.0/go.mod h1:JdeBDPgpJfuS6rU/hNglmOigKhyEZtBmbraLE4GK1J8=
github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
@ -515,10 +515,10 @@ github.com/openshift-online/ocm-sdk-go v0.1.473 h1:m/NWIBCzhC/8PototMQ7x8MQXCeSL
github.com/openshift-online/ocm-sdk-go v0.1.473/go.mod h1:5Gw/YZE+c5FAPaBtO1w/asd9qbs2ljQwg7fpVq51UW4=
github.com/oracle/oci-go-sdk/v54 v54.0.0 h1:CDLjeSejv2aDpElAJrhKpi6zvT/zhZCZuXchUUZ+LS4=
github.com/oracle/oci-go-sdk/v54 v54.0.0/go.mod h1:+t+yvcFGVp+3ZnztnyxqXfQDsMlq8U25faBLa+mqCMc=
github.com/osbuild/blueprint v1.12.0 h1:Q2VXPyOnRs9uqgH1lNsvob6PS+73oPF0K9FmsyC98RI=
github.com/osbuild/blueprint v1.12.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
github.com/osbuild/images v0.175.0 h1:DQ8ckR+mjPgRdZ392FOz3GiykoBLlc5I3FNEXJKyR5c=
github.com/osbuild/images v0.175.0/go.mod h1:EbAEDP9JEbY9Ih12Cxb5ZYke8H09ljiyjDkq3f0fv28=
github.com/osbuild/blueprint v1.13.0 h1:blo22+S2ZX5bBmjGcRveoTUrV4Ms7kLfKyb32WyuymA=
github.com/osbuild/blueprint v1.13.0/go.mod h1:HPlJzkEl7q5g8hzaGksUk7ifFAy9QFw9LmzhuFOAVm4=
github.com/osbuild/images v0.177.0 h1:oubjOaYmrI0STPnJmtxuDPNRQmV2nR9JI0g42u+yShw=
github.com/osbuild/images v0.177.0/go.mod h1:7CfDwGb8YA4erIzvMnqJysVpSu52i6l/f3h82usGPTg=
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d h1:r9BFPDv0uuA9k1947Jybcxs36c/pTywWS1gjeizvtcQ=
github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d/go.mod h1:zR1iu/hOuf+OQNJlk70tju9IqzzM4ycq0ectkFBm94U=
github.com/perimeterx/marshmallow v1.1.5 h1:a2LALqQ1BlHM8PZblsDdidgv1mWi1DgC2UmX50IvK2s=
@ -851,8 +851,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
google.golang.org/api v0.246.0 h1:H0ODDs5PnMZVZAEtdLMn2Ul2eQi7QNjqM2DIFp8TlTM=
google.golang.org/api v0.246.0/go.mod h1:dMVhVcylamkirHdzEBAIQWUCgqY885ivNeZYd7VAVr8=
google.golang.org/api v0.247.0 h1:tSd/e0QrUlLsrwMKmkbQhYVa109qIintOls2Wh6bngc=
google.golang.org/api v0.247.0/go.mod h1:r1qZOPmxXffXg6xS5uhx16Fa/UFY8QU/K4bfKrnvovM=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
@ -860,10 +860,10 @@ google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98
google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
google.golang.org/genproto v0.0.0-20250603155806-513f23925822 h1:rHWScKit0gvAPuOnu87KpaYtjK5zBMLcULh7gxkCXu4=
google.golang.org/genproto v0.0.0-20250603155806-513f23925822/go.mod h1:HubltRL7rMh0LfnQPkMH4NPDFEWp0jw3vixw7jEM53s=
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0 h1:0UOBWO4dC+e51ui0NFKSPbkHHiQ4TmrEfEZMLDyRmY8=
google.golang.org/genproto/googleapis/api v0.0.0-20250728155136-f173205681a0/go.mod h1:8ytArBbtOy2xfht+y2fqKd5DRDJRUQhqbyEnQ4bDChs=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0 h1:MAKi5q709QWfnkkpNQ0M12hYJ1+e8qYVDyowc4U1XZM=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250728155136-f173205681a0/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b h1:ULiyYQ0FdsJhwwZUwbaXpZF5yUE3h+RA+gxvBu37ucc=
google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:oDOGiMSXHL4sDTJvFvIB9nRQCGdLP1o/iVaqQK8zB+M=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b h1:zPKJod4w6F1+nRGDI9ubnXYhU9NSWoFAijkHkUXeTK8=
google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
@ -882,8 +882,8 @@ google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpAD
google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
google.golang.org/protobuf v1.36.7 h1:IgrO7UwFQGJdRNXH/sQux4R1Dj1WAKcLElzeeRaXV2A=
google.golang.org/protobuf v1.36.7/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

7
vendor/cloud.google.com/go/auth/CHANGES.md generated vendored
View file

@ -1,5 +1,12 @@
# Changelog
## [0.16.4](https://github.com/googleapis/google-cloud-go/compare/auth/v0.16.3...auth/v0.16.4) (2025-08-06)
### Bug Fixes
* **auth:** Add UseDefaultClient: true to metadata.Options ([#12666](https://github.com/googleapis/google-cloud-go/issues/12666)) ([1482191](https://github.com/googleapis/google-cloud-go/commit/1482191e88236693efef68769752638281566766)), refs [#11078](https://github.com/googleapis/google-cloud-go/issues/11078) [#12657](https://github.com/googleapis/google-cloud-go/issues/12657)
## [0.16.3](https://github.com/googleapis/google-cloud-go/compare/auth/v0.16.2...auth/v0.16.3) (2025-07-17)

3
vendor/cloud.google.com/go/auth/credentials/detect.go generated vendored
View file

@ -116,7 +116,8 @@ func DetectDefault(opts *DetectOptions) (*auth.Credentials, error) {
if OnGCE() {
metadataClient := metadata.NewWithOptions(&metadata.Options{
Logger: opts.logger(),
Logger: opts.logger(),
UseDefaultClient: true,
})
return auth.NewCredentials(&auth.CredentialsOptions{
TokenProvider: computeTokenProvider(opts, metadataClient),

115962
vendor/cloud.google.com/go/compute/apiv1/computepb/compute.pb.go generated vendored
View file

File diff suppressed because it is too large Load diff

5
vendor/cloud.google.com/go/compute/apiv1/gapic_metadata.json generated vendored
View file

@ -2273,6 +2273,11 @@
"RemovePeering"
]
},
"RequestRemovePeering": {
"methods": [
"RequestRemovePeering"
]
},
"SwitchToCustomMode": {
"methods": [
"SwitchToCustomMode"

76
vendor/cloud.google.com/go/compute/apiv1/networks_client.go generated vendored
View file

@ -50,6 +50,7 @@ type NetworksCallOptions struct {
ListPeeringRoutes []gax.CallOption
Patch []gax.CallOption
RemovePeering []gax.CallOption
RequestRemovePeering []gax.CallOption
SwitchToCustomMode []gax.CallOption
UpdatePeering []gax.CallOption
}
@ -119,6 +120,9 @@ func defaultNetworksRESTCallOptions() *NetworksCallOptions {
RemovePeering: []gax.CallOption{
gax.WithTimeout(600000 * time.Millisecond),
},
RequestRemovePeering: []gax.CallOption{
gax.WithTimeout(600000 * time.Millisecond),
},
SwitchToCustomMode: []gax.CallOption{
gax.WithTimeout(600000 * time.Millisecond),
},
@ -142,6 +146,7 @@ type internalNetworksClient interface {
ListPeeringRoutes(context.Context, *computepb.ListPeeringRoutesNetworksRequest, ...gax.CallOption) *ExchangedPeeringRouteIterator
Patch(context.Context, *computepb.PatchNetworkRequest, ...gax.CallOption) (*Operation, error)
RemovePeering(context.Context, *computepb.RemovePeeringNetworkRequest, ...gax.CallOption) (*Operation, error)
RequestRemovePeering(context.Context, *computepb.RequestRemovePeeringNetworkRequest, ...gax.CallOption) (*Operation, error)
SwitchToCustomMode(context.Context, *computepb.SwitchToCustomModeNetworkRequest, ...gax.CallOption) (*Operation, error)
UpdatePeering(context.Context, *computepb.UpdatePeeringNetworkRequest, ...gax.CallOption) (*Operation, error)
}
@ -226,6 +231,11 @@ func (c *NetworksClient) RemovePeering(ctx context.Context, req *computepb.Remov
return c.internalClient.RemovePeering(ctx, req, opts...)
}
// RequestRemovePeering requests to remove a peering from the specified network. Applicable only for PeeringConnection with update_strategy=CONSENSUS.
func (c *NetworksClient) RequestRemovePeering(ctx context.Context, req *computepb.RequestRemovePeeringNetworkRequest, opts ...gax.CallOption) (*Operation, error) {
return c.internalClient.RequestRemovePeering(ctx, req, opts...)
}
// SwitchToCustomMode switches the network mode from auto subnet mode to custom subnet mode.
func (c *NetworksClient) SwitchToCustomMode(ctx context.Context, req *computepb.SwitchToCustomModeNetworkRequest, opts ...gax.CallOption) (*Operation, error) {
return c.internalClient.SwitchToCustomMode(ctx, req, opts...)
@ -923,6 +933,72 @@ func (c *networksRESTClient) RemovePeering(ctx context.Context, req *computepb.R
return op, nil
}
// RequestRemovePeering requests to remove a peering from the specified network. Applicable only for PeeringConnection with update_strategy=CONSENSUS.
func (c *networksRESTClient) RequestRemovePeering(ctx context.Context, req *computepb.RequestRemovePeeringNetworkRequest, opts ...gax.CallOption) (*Operation, error) {
m := protojson.MarshalOptions{AllowPartial: true}
body := req.GetNetworksRequestRemovePeeringRequestResource()
jsonReq, err := m.Marshal(body)
if err != nil {
return nil, err
}
baseUrl, err := url.Parse(c.endpoint)
if err != nil {
return nil, err
}
baseUrl.Path += fmt.Sprintf("/compute/v1/projects/%v/global/networks/%v/requestRemovePeering", req.GetProject(), req.GetNetwork())
params := url.Values{}
if req != nil && req.RequestId != nil {
params.Add("requestId", fmt.Sprintf("%v", req.GetRequestId()))
}
baseUrl.RawQuery = params.Encode()
// Build HTTP headers from client and context metadata.
hds := []string{"x-goog-request-params", fmt.Sprintf("%s=%v&%s=%v", "project", url.QueryEscape(req.GetProject()), "network", url.QueryEscape(req.GetNetwork()))}
hds = append(c.xGoogHeaders, hds...)
hds = append(hds, "Content-Type", "application/json")
headers := gax.BuildHeaders(ctx, hds...)
opts = append((*c.CallOptions).RequestRemovePeering[0:len((*c.CallOptions).RequestRemovePeering):len((*c.CallOptions).RequestRemovePeering)], opts...)
unm := protojson.UnmarshalOptions{AllowPartial: true, DiscardUnknown: true}
resp := &computepb.Operation{}
e := gax.Invoke(ctx, func(ctx context.Context, settings gax.CallSettings) error {
if settings.Path != "" {
baseUrl.Path = settings.Path
}
httpReq, err := http.NewRequest("POST", baseUrl.String(), bytes.NewReader(jsonReq))
if err != nil {
return err
}
httpReq = httpReq.WithContext(ctx)
httpReq.Header = headers
buf, err := executeHTTPRequest(ctx, c.httpClient, httpReq, c.logger, jsonReq, "RequestRemovePeering")
if err != nil {
return err
}
if err := unm.Unmarshal(buf, resp); err != nil {
return err
}
return nil
}, opts...)
if e != nil {
return nil, e
}
op := &Operation{
&globalOperationsHandle{
c: c.operationClient,
proto: resp,
project: req.GetProject(),
},
}
return op, nil
}
// SwitchToCustomMode switches the network mode from auto subnet mode to custom subnet mode.
func (c *networksRESTClient) SwitchToCustomMode(ctx context.Context, req *computepb.SwitchToCustomModeNetworkRequest, opts ...gax.CallOption) (*Operation, error) {
baseUrl, err := url.Parse(c.endpoint)

3
vendor/cloud.google.com/go/compute/apiv1/subnetworks_client.go generated vendored
View file

@ -862,6 +862,9 @@ func (c *subnetworksRESTClient) ListUsable(ctx context.Context, req *computepb.L
if req != nil && req.ReturnPartialSuccess != nil {
params.Add("returnPartialSuccess", fmt.Sprintf("%v", req.GetReturnPartialSuccess()))
}
if req != nil && req.ServiceProject != nil {
params.Add("serviceProject", fmt.Sprintf("%v", req.GetServiceProject()))
}
baseUrl.RawQuery = params.Encode()

2
vendor/cloud.google.com/go/compute/internal/version.go generated vendored
View file

@ -15,4 +15,4 @@
package internal
// Version is the current tagged release of the library.
const Version = "1.42.0"
const Version = "1.43.0"

7
vendor/cloud.google.com/go/compute/metadata/CHANGES.md generated vendored
View file

@ -1,5 +1,12 @@
# Changes
## [0.8.0](https://github.com/googleapis/google-cloud-go/compare/compute/metadata/v0.7.0...compute/metadata/v0.8.0) (2025-08-06)
### Features
* **compute/metadata:** Add Options.UseDefaultClient ([#12657](https://github.com/googleapis/google-cloud-go/issues/12657)) ([1a88209](https://github.com/googleapis/google-cloud-go/commit/1a8820900f20e038291c4bb2c5284a449196e81f)), refs [#11078](https://github.com/googleapis/google-cloud-go/issues/11078)
## [0.7.0](https://github.com/googleapis/google-cloud-go/compare/compute/metadata/v0.6.0...compute/metadata/v0.7.0) (2025-05-13)

34
vendor/cloud.google.com/go/compute/metadata/metadata.go generated vendored
View file

@ -357,26 +357,52 @@ type Client struct {
// Options for configuring a [Client].
type Options struct {
// Client is the HTTP client used to make requests. Optional.
// If UseDefaultClient is true, this field is ignored.
// If this field is nil, a new default http.Client will be created.
Client *http.Client
// Logger is used to log information about HTTP request and responses.
// If not provided, nothing will be logged. Optional.
Logger *slog.Logger
// UseDefaultClient specifies that the client should use the same default
// internal http.Client that is used in functions such as GetWithContext.
// This is useful for sharing a single TCP connection pool across requests.
// The difference vs GetWithContext is the ability to use this struct
// to provide a custom logger. If this field is true, the Client
// field is ignored.
UseDefaultClient bool
}
// NewClient returns a Client that can be used to fetch metadata.
// Returns the client that uses the specified http.Client for HTTP requests.
// If nil is specified, returns the default client.
// If nil is specified, returns the default internal Client that is
// also used in functions such as GetWithContext. This is useful for sharing
// a single TCP connection pool across requests.
func NewClient(c *http.Client) *Client {
return NewWithOptions(&Options{
Client: c,
})
if c == nil {
// Preserve original behavior for nil argument.
return defaultClient
}
// Return a new client with a no-op logger for backward compatibility.
return &Client{hc: c, logger: slog.New(noOpHandler{})}
}
// NewWithOptions returns a Client that is configured with the provided Options.
func NewWithOptions(opts *Options) *Client {
// Preserve original behavior for nil opts.
if opts == nil {
return defaultClient
}
// Handle explicit request for the internal default http.Client.
if opts.UseDefaultClient {
logger := opts.Logger
if logger == nil {
logger = slog.New(noOpHandler{})
}
return &Client{hc: defaultClient.hc, logger: logger}
}
// Handle isolated client creation.
client := opts.Client
if client == nil {
client = newDefaultHTTPClient()

5
vendor/github.com/aws/aws-sdk-go-v2/aws/config.go generated vendored
View file

@ -199,6 +199,11 @@ type Config struct {
// Priority list of preferred auth scheme IDs.
AuthSchemePreference []string
// ServiceOptions provides service specific configuration options that will be applied
// when constructing clients for specific services. Each callback function receives the service ID
// and the service's Options struct, allowing for dynamic configuration based on the service.
ServiceOptions []func(string, any)
}
// NewConfig returns a new Config pointer that can be chained with builder

2
vendor/github.com/aws/aws-sdk-go-v2/aws/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package aws
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.37.2"
const goModuleVersion = "1.38.0"

5
vendor/github.com/aws/aws-sdk-go-v2/config/CHANGELOG.md generated vendored
View file

@ -1,3 +1,8 @@
# v1.31.0 (2025-08-11)
* **Feature**: Add support for configuring per-service Options via callback on global config.
* **Dependency Update**: Updated to the latest SDK module versions
# v1.30.3 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

3
vendor/github.com/aws/aws-sdk-go-v2/config/config.go generated vendored
View file

@ -93,6 +93,9 @@ var defaultAWSConfigResolvers = []awsConfigResolver{
resolveInterceptors,
resolveAuthSchemePreference,
// Sets the ServiceOptions if present in LoadOptions
resolveServiceOptions,
}
// A Config represents a generic configuration value or set of values. This type

2
vendor/github.com/aws/aws-sdk-go-v2/config/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package config
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.30.3"
const goModuleVersion = "1.31.0"

18
vendor/github.com/aws/aws-sdk-go-v2/config/load_options.go generated vendored
View file

@ -235,6 +235,11 @@ type LoadOptions struct {
// Priority list of preferred auth scheme names (e.g. sigv4a).
AuthSchemePreference []string
// ServiceOptions provides service specific configuration options that will be applied
// when constructing clients for specific services. Each callback function receives the service ID
// and the service's Options struct, allowing for dynamic configuration based on the service.
ServiceOptions []func(string, any)
}
func (o LoadOptions) getDefaultsMode(ctx context.Context) (aws.DefaultsMode, bool, error) {
@ -314,6 +319,10 @@ func (o LoadOptions) getBaseEndpoint(context.Context) (string, bool, error) {
return o.BaseEndpoint, o.BaseEndpoint != "", nil
}
func (o LoadOptions) getServiceOptions(context.Context) ([]func(string, any), bool, error) {
return o.ServiceOptions, len(o.ServiceOptions) > 0, nil
}
// GetServiceBaseEndpoint satisfies (internal/configsources).ServiceBaseEndpointProvider.
//
// The sdkID value is unused because LoadOptions only supports setting a GLOBAL
@ -1215,6 +1224,15 @@ func WithBaseEndpoint(v string) LoadOptionsFunc {
}
}
// WithServiceOptions is a helper function to construct functional options
// that sets ServiceOptions on config's LoadOptions.
func WithServiceOptions(callbacks ...func(string, any)) LoadOptionsFunc {
return func(o *LoadOptions) error {
o.ServiceOptions = append(o.ServiceOptions, callbacks...)
return nil
}
}
// WithBeforeExecution adds the BeforeExecutionInterceptor to config.
func WithBeforeExecution(i smithyhttp.BeforeExecutionInterceptor) LoadOptionsFunc {
return func(o *LoadOptions) error {

16
vendor/github.com/aws/aws-sdk-go-v2/config/provider.go generated vendored
View file

@ -768,3 +768,19 @@ func getAuthSchemePreference(ctx context.Context, configs configs) ([]string, bo
}
return nil, false
}
type serviceOptionsProvider interface {
getServiceOptions(ctx context.Context) ([]func(string, any), bool, error)
}
func getServiceOptions(ctx context.Context, configs configs) (v []func(string, any), found bool, err error) {
for _, c := range configs {
if p, ok := c.(serviceOptionsProvider); ok {
v, found, err = p.getServiceOptions(ctx)
if err != nil || found {
break
}
}
}
return v, found, err
}

13
vendor/github.com/aws/aws-sdk-go-v2/config/resolve.go generated vendored
View file

@ -429,3 +429,16 @@ func resolveAuthSchemePreference(ctx context.Context, cfg *aws.Config, configs c
}
return nil
}
func resolveServiceOptions(ctx context.Context, cfg *aws.Config, configs configs) error {
serviceOptions, found, err := getServiceOptions(ctx, configs)
if err != nil {
return err
}
if !found {
return nil
}
cfg.ServiceOptions = serviceOptions
return nil
}

4
vendor/github.com/aws/aws-sdk-go-v2/credentials/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.18.4 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.18.3 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/credentials/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package credentials
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.18.3"
const goModuleVersion = "1.18.4"

4
vendor/github.com/aws/aws-sdk-go-v2/feature/ec2/imds/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.18.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.18.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/feature/ec2/imds/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package imds
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.18.2"
const goModuleVersion = "1.18.3"

4
vendor/github.com/aws/aws-sdk-go-v2/feature/s3/manager/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.18.4 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.18.3 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/feature/s3/manager/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package manager
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.18.3"
const goModuleVersion = "1.18.4"

4
vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.4.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.4.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/internal/configsources/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package configsources
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.4.2"
const goModuleVersion = "1.4.3"

4
vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v2.7.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v2.7.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package endpoints
// goModuleVersion is the tagged release for this module
const goModuleVersion = "2.7.2"
const goModuleVersion = "2.7.3"

4
vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.4.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.4.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/internal/v4a/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package v4a
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.4.2"
const goModuleVersion = "1.4.3"

14
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/CHANGELOG.md generated vendored
View file

@ -1,3 +1,17 @@
# v1.244.0 (2025-08-14)
* **Feature**: This release adds ModifyInstanceConnectEndpoint API to update configurations on existing EC2 Instance Connect Endpoints and improves IPv6 support through dualstack DNS names for EC2 Instance Connect Endpoints.
# v1.243.0 (2025-08-12)
* **Feature**: Release to allow route table association with a PublicIpv4Pool.
# v1.242.0 (2025-08-11)
* **Feature**: Add support for configuring per-service Options via callback on global config.
* **Feature**: This release adds AvailabilityZoneId support for CreateVolume, DescribeVolume, LaunchTemplates, RunInstances, DescribeInstances, CreateDefaultSubnet, SpotInstances, and CreateDefaultSubnet APIs.
* **Dependency Update**: Updated to the latest SDK module versions
# v1.241.0 (2025-08-06)
* **Feature**: Mark Elastic Inference Accelerators and Elastic Graphics Processor parameters as deprecated on the RunInstances and LaunchTemplate APIs.

9
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_client.go generated vendored
View file

@ -446,7 +446,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
resolveUseDualStackEndpoint(cfg, &opts)
resolveUseFIPSEndpoint(cfg, &opts)
resolveBaseEndpoint(cfg, &opts)
return New(opts, optFns...)
return New(opts, func(o *Options) {
for _, opt := range cfg.ServiceOptions {
opt(ServiceID, o)
}
for _, opt := range optFns {
opt(o)
}
})
}
func resolveHTTPClient(o *Options) {

4
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_AssociateRouteTable.go generated vendored
View file

@ -52,6 +52,10 @@ type AssociateRouteTableInput struct {
// The ID of the internet gateway or virtual private gateway.
GatewayId *string
// The ID of a public IPv4 pool. A public IPv4 pool is a pool of IPv4 addresses
// that you've brought to Amazon Web Services with BYOIP.
PublicIpv4Pool *string
// The ID of the subnet.
SubnetId *string

10
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateDefaultSubnet.go generated vendored
View file

@ -35,9 +35,14 @@ type CreateDefaultSubnetInput struct {
// The Availability Zone in which to create the default subnet.
//
// This member is required.
// Either AvailabilityZone or AvailabilityZoneId must be specified, but not both.
AvailabilityZone *string
// The ID of the Availability Zone.
//
// Either AvailabilityZone or AvailabilityZoneId must be specified, but not both.
AvailabilityZoneId *string
// Checks whether you have the required permissions for the action, without
// actually making the request, and provides an error response. If you have the
// required permissions, the error response is DryRunOperation . Otherwise, it is
@ -130,9 +135,6 @@ func (c *Client) addOperationCreateDefaultSubnetMiddlewares(stack *middleware.St
if err = addCredentialSource(stack, options); err != nil {
return err
}
if err = addOpCreateDefaultSubnetValidationMiddleware(stack); err != nil {
return err
}
if err = stack.Initialize.Add(newServiceMetadataMiddleware_opCreateDefaultSubnet(options.Region), middleware.Before); err != nil {
return err
}

14
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_CreateVolume.go generated vendored
View file

@ -52,9 +52,15 @@ type CreateVolumeInput struct {
// The ID of the Availability Zone in which to create the volume. For example,
// us-east-1a .
//
// This member is required.
// Either AvailabilityZone or AvailabilityZoneId must be specified, but not both.
AvailabilityZone *string
// The ID of the Availability Zone in which to create the volume. For example,
// use1-az1 .
//
// Either AvailabilityZone or AvailabilityZoneId must be specified, but not both.
AvailabilityZoneId *string
// Unique, case-sensitive identifier that you provide to ensure the idempotency of
// the request. For more information, see [Ensure Idempotency].
//
@ -236,6 +242,9 @@ type CreateVolumeOutput struct {
// The Availability Zone for the volume.
AvailabilityZone *string
// The ID of the Availability Zone for the volume.
AvailabilityZoneId *string
// The time stamp when volume creation was initiated.
CreateTime *time.Time
@ -373,9 +382,6 @@ func (c *Client) addOperationCreateVolumeMiddlewares(stack *middleware.Stack, op
if err = addIdempotencyToken_opCreateVolumeMiddleware(stack, options); err != nil {
return err
}
if err = addOpCreateVolumeValidationMiddleware(stack); err != nil {
return err
}
if err = stack.Initialize.Add(newServiceMetadataMiddleware_opCreateVolume(options.Region), middleware.Before); err != nil {
return err
}

2
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeInstanceStatus.go generated vendored
View file

@ -75,6 +75,8 @@ type DescribeInstanceStatusInput struct {
//
// - availability-zone - The Availability Zone of the instance.
//
// - availability-zone-id - The ID of the Availability Zone of the instance.
//
// - event.code - The code for the scheduled event ( instance-reboot |
// system-reboot | system-maintenance | instance-retirement | instance-stop ).
//

2
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeInstances.go generated vendored
View file

@ -83,6 +83,8 @@ type DescribeInstancesInput struct {
//
// - availability-zone - The Availability Zone of the instance.
//
// - availability-zone-id - The ID of the Availability Zone of the instance.
//
// - block-device-mapping.attach-time - The attach time for an EBS volume mapped
// to the instance, for example, 2022-09-15T17:15:20.000Z .
//

3
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeSpotInstanceRequests.go generated vendored
View file

@ -108,6 +108,9 @@ type DescribeSpotInstanceRequestsInput struct {
// - launched-availability-zone - The Availability Zone in which the request is
// launched.
//
// - launched-availability-zone-id - The ID of the Availability Zone in which the
// request is launched.
//
// - network-interface.addresses.primary - Indicates whether the IP address is
// the primary private IP address.
//

10
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeSpotPriceHistory.go generated vendored
View file

@ -39,8 +39,15 @@ func (c *Client) DescribeSpotPriceHistory(ctx context.Context, params *DescribeS
type DescribeSpotPriceHistoryInput struct {
// Filters the results by the specified Availability Zone.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZone *string
// Filters the results by the specified ID of the Availability Zone.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZoneId *string
// Checks whether you have the required permissions for the action, without
// actually making the request, and provides an error response. If you have the
// required permissions, the error response is DryRunOperation . Otherwise, it is
@ -56,6 +63,9 @@ type DescribeSpotPriceHistoryInput struct {
// - availability-zone - The Availability Zone for which prices should be
// returned.
//
// - availability-zone-id - The ID of the Availability Zone for which prices
// should be returned.
//
// - instance-type - The type of instance (for example, m3.medium ).
//
// - product-description - The product description for the Spot price ( Linux/UNIX

3
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeVolumes.go generated vendored
View file

@ -72,6 +72,9 @@ type DescribeVolumesInput struct {
//
// - availability-zone - The Availability Zone in which the volume was created.
//
// - availability-zone-id - The ID of the Availability Zone in which the volume
// was created.
//
// - create-time - The time stamp when the volume was created.
//
// - encrypted - Indicates whether the volume is encrypted ( true | false )

2
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_DescribeVpcEndpointAssociations.go generated vendored
View file

@ -53,8 +53,6 @@ type DescribeVpcEndpointAssociationsInput struct {
//
// - resource-configuration-group-arn - The Amazon Resource Name (ARN) of the
// resource configuration of type GROUP.
//
// - service-network-resource-association-id - The ID of the association.
Filters []types.Filter
// The maximum page size.

15
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ImportVolume.go generated vendored
View file

@ -38,11 +38,6 @@ func (c *Client) ImportVolume(ctx context.Context, params *ImportVolumeInput, op
type ImportVolumeInput struct {
// The Availability Zone for the resulting EBS volume.
//
// This member is required.
AvailabilityZone *string
// The disk image.
//
// This member is required.
@ -53,6 +48,16 @@ type ImportVolumeInput struct {
// This member is required.
Volume *types.VolumeDetail
// The Availability Zone for the resulting EBS volume.
//
// Either AvailabilityZone or AvailabilityZoneId must be specified, but not both.
AvailabilityZone *string
// The ID of the Availability Zone for the resulting EBS volume.
//
// Either AvailabilityZone or AvailabilityZoneId must be specified, but not both.
AvailabilityZoneId *string
// A description of the volume.
Description *string

228
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/api_op_ModifyInstanceConnectEndpoint.go generated vendored Normal file
View file

@ -0,0 +1,228 @@
// Code generated by smithy-go-codegen DO NOT EDIT.
package ec2
import (
"context"
"fmt"
awsmiddleware "github.com/aws/aws-sdk-go-v2/aws/middleware"
"github.com/aws/aws-sdk-go-v2/service/ec2/types"
"github.com/aws/smithy-go/middleware"
smithyhttp "github.com/aws/smithy-go/transport/http"
)
// Modifies the specified EC2 Instance Connect Endpoint.
//
// For more information, see [Modify an EC2 Instance Connect Endpoint] in the Amazon EC2 User Guide.
//
// [Modify an EC2 Instance Connect Endpoint]: https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/modify-ec2-instance-connect-endpoint.html
func (c *Client) ModifyInstanceConnectEndpoint(ctx context.Context, params *ModifyInstanceConnectEndpointInput, optFns ...func(*Options)) (*ModifyInstanceConnectEndpointOutput, error) {
if params == nil {
params = &ModifyInstanceConnectEndpointInput{}
}
result, metadata, err := c.invokeOperation(ctx, "ModifyInstanceConnectEndpoint", params, optFns, c.addOperationModifyInstanceConnectEndpointMiddlewares)
if err != nil {
return nil, err
}
out := result.(*ModifyInstanceConnectEndpointOutput)
out.ResultMetadata = metadata
return out, nil
}
type ModifyInstanceConnectEndpointInput struct {
// The ID of the EC2 Instance Connect Endpoint to modify.
//
// This member is required.
InstanceConnectEndpointId *string
// Checks whether you have the required permissions for the operation, without
// actually making the request, and provides an error response. If you have the
// required permissions, the error response is DryRunOperation . Otherwise, it is
// UnauthorizedOperation .
DryRun *bool
// The new IP address type for the EC2 Instance Connect Endpoint.
//
// PreserveClientIp is only supported on IPv4 EC2 Instance Connect Endpoints. To
// use PreserveClientIp , the value for IpAddressType must be ipv4 .
IpAddressType types.IpAddressType
// Indicates whether the client IP address is preserved as the source. The
// following are the possible values.
//
// - true - Use the client IP address as the source.
//
// - false - Use the network interface IP address as the source.
//
// PreserveClientIp=true is only supported on IPv4 EC2 Instance Connect Endpoints.
// If modifying PreserveClientIp to true , either the endpoint's existing
// IpAddressType must be ipv4 , or if modifying IpAddressType in the same request,
// the new value must be ipv4 .
//
// Default: false
PreserveClientIp *bool
// Changes the security groups for the EC2 Instance Connect Endpoint. The new set
// of groups you specify replaces the current set. You must specify at least one
// group, even if it's just the default security group in the VPC. You must specify
// the ID of the security group, not the name.
SecurityGroupIds []string
noSmithyDocumentSerde
}
type ModifyInstanceConnectEndpointOutput struct {
// The return value of the request. Returns true if the specified product code is
// owned by the requester and associated with the specified instance.
Return *bool
// Metadata pertaining to the operation's result.
ResultMetadata middleware.Metadata
noSmithyDocumentSerde
}
func (c *Client) addOperationModifyInstanceConnectEndpointMiddlewares(stack *middleware.Stack, options Options) (err error) {
if err := stack.Serialize.Add(&setOperationInputMiddleware{}, middleware.After); err != nil {
return err
}
err = stack.Serialize.Add(&awsEc2query_serializeOpModifyInstanceConnectEndpoint{}, middleware.After)
if err != nil {
return err
}
err = stack.Deserialize.Add(&awsEc2query_deserializeOpModifyInstanceConnectEndpoint{}, middleware.After)
if err != nil {
return err
}
if err := addProtocolFinalizerMiddlewares(stack, options, "ModifyInstanceConnectEndpoint"); err != nil {
return fmt.Errorf("add protocol finalizers: %v", err)
}
if err = addlegacyEndpointContextSetter(stack, options); err != nil {
return err
}
if err = addSetLoggerMiddleware(stack, options); err != nil {
return err
}
if err = addClientRequestID(stack); err != nil {
return err
}
if err = addComputeContentLength(stack); err != nil {
return err
}
if err = addResolveEndpointMiddleware(stack, options); err != nil {
return err
}
if err = addComputePayloadSHA256(stack); err != nil {
return err
}
if err = addRetry(stack, options); err != nil {
return err
}
if err = addRawResponseToMetadata(stack); err != nil {
return err
}
if err = addRecordResponseTiming(stack); err != nil {
return err
}
if err = addSpanRetryLoop(stack, options); err != nil {
return err
}
if err = addClientUserAgent(stack, options); err != nil {
return err
}
if err = smithyhttp.AddErrorCloseResponseBodyMiddleware(stack); err != nil {
return err
}
if err = smithyhttp.AddCloseResponseBodyMiddleware(stack); err != nil {
return err
}
if err = addSetLegacyContextSigningOptionsMiddleware(stack); err != nil {
return err
}
if err = addTimeOffsetBuild(stack, c); err != nil {
return err
}
if err = addUserAgentRetryMode(stack, options); err != nil {
return err
}
if err = addCredentialSource(stack, options); err != nil {
return err
}
if err = addOpModifyInstanceConnectEndpointValidationMiddleware(stack); err != nil {
return err
}
if err = stack.Initialize.Add(newServiceMetadataMiddleware_opModifyInstanceConnectEndpoint(options.Region), middleware.Before); err != nil {
return err
}
if err = addRecursionDetection(stack); err != nil {
return err
}
if err = addRequestIDRetrieverMiddleware(stack); err != nil {
return err
}
if err = addResponseErrorMiddleware(stack); err != nil {
return err
}
if err = addRequestResponseLogging(stack, options); err != nil {
return err
}
if err = addDisableHTTPSMiddleware(stack, options); err != nil {
return err
}
if err = addInterceptBeforeRetryLoop(stack, options); err != nil {
return err
}
if err = addInterceptAttempt(stack, options); err != nil {
return err
}
if err = addInterceptExecution(stack, options); err != nil {
return err
}
if err = addInterceptBeforeSerialization(stack, options); err != nil {
return err
}
if err = addInterceptAfterSerialization(stack, options); err != nil {
return err
}
if err = addInterceptBeforeSigning(stack, options); err != nil {
return err
}
if err = addInterceptAfterSigning(stack, options); err != nil {
return err
}
if err = addInterceptTransmit(stack, options); err != nil {
return err
}
if err = addInterceptBeforeDeserialization(stack, options); err != nil {
return err
}
if err = addInterceptAfterDeserialization(stack, options); err != nil {
return err
}
if err = addSpanInitializeStart(stack); err != nil {
return err
}
if err = addSpanInitializeEnd(stack); err != nil {
return err
}
if err = addSpanBuildRequestStart(stack); err != nil {
return err
}
if err = addSpanBuildRequestEnd(stack); err != nil {
return err
}
return nil
}
func newServiceMetadataMiddleware_opModifyInstanceConnectEndpoint(region string) *awsmiddleware.RegisterServiceMetadata {
return &awsmiddleware.RegisterServiceMetadata{
Region: region,
ServiceID: ServiceID,
OperationName: "ModifyInstanceConnectEndpoint",
}
}

405
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/deserializers.go generated vendored
View file

@ -52098,6 +52098,101 @@ func awsEc2query_deserializeOpErrorModifyInstanceCapacityReservationAttributes(r
}
}
type awsEc2query_deserializeOpModifyInstanceConnectEndpoint struct {
}
func (*awsEc2query_deserializeOpModifyInstanceConnectEndpoint) ID() string {
return "OperationDeserializer"
}
func (m *awsEc2query_deserializeOpModifyInstanceConnectEndpoint) HandleDeserialize(ctx context.Context, in middleware.DeserializeInput, next middleware.DeserializeHandler) (
out middleware.DeserializeOutput, metadata middleware.Metadata, err error,
) {
out, metadata, err = next.HandleDeserialize(ctx, in)
if err != nil {
return out, metadata, err
}
_, span := tracing.StartSpan(ctx, "OperationDeserializer")
endTimer := startMetricTimer(ctx, "client.call.deserialization_duration")
defer endTimer()
defer span.End()
response, ok := out.RawResponse.(*smithyhttp.Response)
if !ok {
return out, metadata, &smithy.DeserializationError{Err: fmt.Errorf("unknown transport type %T", out.RawResponse)}
}
if response.StatusCode < 200 || response.StatusCode >= 300 {
return out, metadata, awsEc2query_deserializeOpErrorModifyInstanceConnectEndpoint(response, &metadata)
}
output := &ModifyInstanceConnectEndpointOutput{}
out.Result = output
var buff [1024]byte
ringBuffer := smithyio.NewRingBuffer(buff[:])
body := io.TeeReader(response.Body, ringBuffer)
rootDecoder := xml.NewDecoder(body)
t, err := smithyxml.FetchRootElement(rootDecoder)
if err == io.EOF {
return out, metadata, nil
}
if err != nil {
var snapshot bytes.Buffer
io.Copy(&snapshot, ringBuffer)
return out, metadata, &smithy.DeserializationError{
Err: fmt.Errorf("failed to decode response body, %w", err),
Snapshot: snapshot.Bytes(),
}
}
decoder := smithyxml.WrapNodeDecoder(rootDecoder, t)
err = awsEc2query_deserializeOpDocumentModifyInstanceConnectEndpointOutput(&output, decoder)
if err != nil {
var snapshot bytes.Buffer
io.Copy(&snapshot, ringBuffer)
err = &smithy.DeserializationError{
Err: fmt.Errorf("failed to decode response body, %w", err),
Snapshot: snapshot.Bytes(),
}
return out, metadata, err
}
return out, metadata, err
}
func awsEc2query_deserializeOpErrorModifyInstanceConnectEndpoint(response *smithyhttp.Response, metadata *middleware.Metadata) error {
var errorBuffer bytes.Buffer
if _, err := io.Copy(&errorBuffer, response.Body); err != nil {
return &smithy.DeserializationError{Err: fmt.Errorf("failed to copy error response body, %w", err)}
}
errorBody := bytes.NewReader(errorBuffer.Bytes())
errorCode := "UnknownError"
errorMessage := errorCode
errorComponents, err := ec2query.GetErrorResponseComponents(errorBody)
if err != nil {
return err
}
awsmiddleware.SetRequestIDMetadata(metadata, errorComponents.RequestID)
if len(errorComponents.Code) != 0 {
errorCode = errorComponents.Code
}
if len(errorComponents.Message) != 0 {
errorMessage = errorComponents.Message
}
errorBody.Seek(0, io.SeekStart)
switch {
default:
genericError := &smithy.GenericAPIError{
Code: errorCode,
Message: errorMessage,
}
return genericError
}
}
type awsEc2query_deserializeOpModifyInstanceCpuOptions struct {
}
@ -83946,6 +84041,12 @@ func awsEc2query_deserializeDocumentEc2InstanceConnectEndpoint(v **types.Ec2Inst
sv.PreserveClientIp = ptr.Bool(xtv)
}
case strings.EqualFold("publicDnsNames", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentInstanceConnectEndpointPublicDnsNames(&sv.PublicDnsNames, nodeDecoder); err != nil {
return err
}
case strings.EqualFold("securityGroupIdSet", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentSecurityGroupIdSet(&sv.SecurityGroupIds, nodeDecoder); err != nil {
@ -94048,6 +94149,19 @@ func awsEc2query_deserializeDocumentImportInstanceVolumeDetailItem(v **types.Imp
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("bytesConverted", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -94375,6 +94489,19 @@ func awsEc2query_deserializeDocumentImportVolumeTaskDetails(v **types.ImportVolu
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("bytesConverted", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -95858,6 +95985,116 @@ func awsEc2query_deserializeDocumentInstanceCapacity(v **types.InstanceCapacity,
return nil
}
func awsEc2query_deserializeDocumentInstanceConnectEndpointDnsNames(v **types.InstanceConnectEndpointDnsNames, decoder smithyxml.NodeDecoder) error {
if v == nil {
return fmt.Errorf("unexpected nil of type %T", v)
}
var sv *types.InstanceConnectEndpointDnsNames
if *v == nil {
sv = &types.InstanceConnectEndpointDnsNames{}
} else {
sv = *v
}
for {
t, done, err := decoder.Token()
if err != nil {
return err
}
if done {
break
}
originalDecoder := decoder
decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t)
switch {
case strings.EqualFold("dnsName", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.DnsName = ptr.String(xtv)
}
case strings.EqualFold("fipsDnsName", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.FipsDnsName = ptr.String(xtv)
}
default:
// Do nothing and ignore the unexpected tag element
err = decoder.Decoder.Skip()
if err != nil {
return err
}
}
decoder = originalDecoder
}
*v = sv
return nil
}
func awsEc2query_deserializeDocumentInstanceConnectEndpointPublicDnsNames(v **types.InstanceConnectEndpointPublicDnsNames, decoder smithyxml.NodeDecoder) error {
if v == nil {
return fmt.Errorf("unexpected nil of type %T", v)
}
var sv *types.InstanceConnectEndpointPublicDnsNames
if *v == nil {
sv = &types.InstanceConnectEndpointPublicDnsNames{}
} else {
sv = *v
}
for {
t, done, err := decoder.Token()
if err != nil {
return err
}
if done {
break
}
originalDecoder := decoder
decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t)
switch {
case strings.EqualFold("dualstack", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentInstanceConnectEndpointDnsNames(&sv.Dualstack, nodeDecoder); err != nil {
return err
}
case strings.EqualFold("ipv4", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentInstanceConnectEndpointDnsNames(&sv.Ipv4, nodeDecoder); err != nil {
return err
}
default:
// Do nothing and ignore the unexpected tag element
err = decoder.Decoder.Skip()
if err != nil {
return err
}
}
decoder = originalDecoder
}
*v = sv
return nil
}
func awsEc2query_deserializeDocumentInstanceConnectEndpointSet(v *[]types.Ec2InstanceConnectEndpoint, decoder smithyxml.NodeDecoder) error {
if v == nil {
return fmt.Errorf("unexpected nil of type %T", v)
@ -99860,6 +100097,19 @@ func awsEc2query_deserializeDocumentInstanceStatus(v **types.InstanceStatus, dec
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("eventsSet", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentInstanceStatusEventList(&sv.Events, nodeDecoder); err != nil {
@ -110927,6 +111177,19 @@ func awsEc2query_deserializeDocumentLaunchTemplatePlacement(v **types.LaunchTemp
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("groupId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -122410,6 +122673,19 @@ func awsEc2query_deserializeDocumentPlacement(v **types.Placement, decoder smith
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("groupId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -131536,6 +131812,19 @@ func awsEc2query_deserializeDocumentRouteTableAssociation(v **types.RouteTableAs
sv.Main = ptr.Bool(xtv)
}
case strings.EqualFold("publicIpv4Pool", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.PublicIpv4Pool = ptr.String(xtv)
}
case strings.EqualFold("routeTableAssociationId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -134372,6 +134661,12 @@ func awsEc2query_deserializeDocumentServiceConfiguration(v **types.ServiceConfig
sv.AcceptanceRequired = ptr.Bool(xtv)
}
case strings.EqualFold("availabilityZoneIdSet", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentValueStringList(&sv.AvailabilityZoneIds, nodeDecoder); err != nil {
return err
}
case strings.EqualFold("availabilityZoneSet", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentValueStringList(&sv.AvailabilityZones, nodeDecoder); err != nil {
@ -134643,6 +134938,12 @@ func awsEc2query_deserializeDocumentServiceDetail(v **types.ServiceDetail, decod
sv.AcceptanceRequired = ptr.Bool(xtv)
}
case strings.EqualFold("availabilityZoneIdSet", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentValueStringList(&sv.AvailabilityZoneIds, nodeDecoder); err != nil {
return err
}
case strings.EqualFold("availabilityZoneSet", t.Name.Local):
nodeDecoder := smithyxml.WrapNodeDecoder(decoder.Decoder, t)
if err := awsEc2query_deserializeDocumentValueStringList(&sv.AvailabilityZones, nodeDecoder); err != nil {
@ -138139,6 +138440,19 @@ func awsEc2query_deserializeDocumentSpotInstanceRequest(v **types.SpotInstanceRe
sv.LaunchedAvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("launchedAvailabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.LaunchedAvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("launchGroup", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -138938,6 +139252,19 @@ func awsEc2query_deserializeDocumentSpotPrice(v **types.SpotPrice, decoder smith
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("instanceType", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -154446,6 +154773,19 @@ func awsEc2query_deserializeDocumentVolume(v **types.Volume, decoder smithyxml.N
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("createTime", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -167088,6 +167428,19 @@ func awsEc2query_deserializeOpDocumentCreateVolumeOutput(v **CreateVolumeOutput,
sv.AvailabilityZone = ptr.String(xtv)
}
case strings.EqualFold("availabilityZoneId", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv := string(val)
sv.AvailabilityZoneId = ptr.String(xtv)
}
case strings.EqualFold("createTime", t.Name.Local):
val, err := decoder.Value()
if err != nil {
@ -188478,6 +188831,58 @@ func awsEc2query_deserializeOpDocumentModifyInstanceCapacityReservationAttribute
return nil
}
func awsEc2query_deserializeOpDocumentModifyInstanceConnectEndpointOutput(v **ModifyInstanceConnectEndpointOutput, decoder smithyxml.NodeDecoder) error {
if v == nil {
return fmt.Errorf("unexpected nil of type %T", v)
}
var sv *ModifyInstanceConnectEndpointOutput
if *v == nil {
sv = &ModifyInstanceConnectEndpointOutput{}
} else {
sv = *v
}
for {
t, done, err := decoder.Token()
if err != nil {
return err
}
if done {
break
}
originalDecoder := decoder
decoder = smithyxml.WrapNodeDecoder(originalDecoder.Decoder, t)
switch {
case strings.EqualFold("return", t.Name.Local):
val, err := decoder.Value()
if err != nil {
return err
}
if val == nil {
break
}
{
xtv, err := strconv.ParseBool(string(val))
if err != nil {
return fmt.Errorf("expected Boolean to be of type *bool, got %T instead", val)
}
sv.Return = ptr.Bool(xtv)
}
default:
// Do nothing and ignore the unexpected tag element
err = decoder.Decoder.Skip()
if err != nil {
return err
}
}
decoder = originalDecoder
}
*v = sv
return nil
}
func awsEc2query_deserializeOpDocumentModifyInstanceCpuOptionsOutput(v **ModifyInstanceCpuOptionsOutput, decoder smithyxml.NodeDecoder) error {
if v == nil {
return fmt.Errorf("unexpected nil of type %T", v)

1
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/generated.json generated vendored
View file

@ -568,6 +568,7 @@
"api_op_ModifyImageAttribute.go",
"api_op_ModifyInstanceAttribute.go",
"api_op_ModifyInstanceCapacityReservationAttributes.go",
"api_op_ModifyInstanceConnectEndpoint.go",
"api_op_ModifyInstanceCpuOptions.go",
"api_op_ModifyInstanceCreditSpecification.go",
"api_op_ModifyInstanceEventStartTime.go",

2
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package ec2
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.241.0"
const goModuleVersion = "1.244.0"

139
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/serializers.go generated vendored
View file

@ -39008,6 +39008,76 @@ func (m *awsEc2query_serializeOpModifyInstanceCapacityReservationAttributes) Han
return next.HandleSerialize(ctx, in)
}
type awsEc2query_serializeOpModifyInstanceConnectEndpoint struct {
}
func (*awsEc2query_serializeOpModifyInstanceConnectEndpoint) ID() string {
return "OperationSerializer"
}
func (m *awsEc2query_serializeOpModifyInstanceConnectEndpoint) HandleSerialize(ctx context.Context, in middleware.SerializeInput, next middleware.SerializeHandler) (
out middleware.SerializeOutput, metadata middleware.Metadata, err error,
) {
_, span := tracing.StartSpan(ctx, "OperationSerializer")
endTimer := startMetricTimer(ctx, "client.call.serialization_duration")
defer endTimer()
defer span.End()
request, ok := in.Request.(*smithyhttp.Request)
if !ok {
return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown transport type %T", in.Request)}
}
input, ok := in.Parameters.(*ModifyInstanceConnectEndpointInput)
_ = input
if !ok {
return out, metadata, &smithy.SerializationError{Err: fmt.Errorf("unknown input parameters type %T", in.Parameters)}
}
operationPath := "/"
if len(request.Request.URL.Path) == 0 {
request.Request.URL.Path = operationPath
} else {
request.Request.URL.Path = path.Join(request.Request.URL.Path, operationPath)
if request.Request.URL.Path != "/" && operationPath[len(operationPath)-1] == '/' {
request.Request.URL.Path += "/"
}
}
request.Request.Method = "POST"
httpBindingEncoder, err := httpbinding.NewEncoder(request.URL.Path, request.URL.RawQuery, request.Header)
if err != nil {
return out, metadata, &smithy.SerializationError{Err: err}
}
httpBindingEncoder.SetHeader("Content-Type").String("application/x-www-form-urlencoded")
bodyWriter := bytes.NewBuffer(nil)
bodyEncoder := query.NewEncoder(bodyWriter)
body := bodyEncoder.Object()
body.Key("Action").String("ModifyInstanceConnectEndpoint")
body.Key("Version").String("2016-11-15")
if err := awsEc2query_serializeOpDocumentModifyInstanceConnectEndpointInput(input, bodyEncoder.Value); err != nil {
return out, metadata, &smithy.SerializationError{Err: err}
}
err = bodyEncoder.Encode()
if err != nil {
return out, metadata, &smithy.SerializationError{Err: err}
}
if request, err = request.SetStream(bytes.NewReader(bodyWriter.Bytes())); err != nil {
return out, metadata, &smithy.SerializationError{Err: err}
}
if request.Request, err = httpBindingEncoder.Encode(request.Request); err != nil {
return out, metadata, &smithy.SerializationError{Err: err}
}
in.Request = request
endTimer()
span.End()
return next.HandleSerialize(ctx, in)
}
type awsEc2query_serializeOpModifyInstanceCpuOptions struct {
}
@ -53217,6 +53287,11 @@ func awsEc2query_serializeDocumentLaunchTemplatePlacementRequest(v *types.Launch
objectKey.String(*v.AvailabilityZone)
}
if v.AvailabilityZoneId != nil {
objectKey := object.Key("AvailabilityZoneId")
objectKey.String(*v.AvailabilityZoneId)
}
if v.GroupId != nil {
objectKey := object.Key("GroupId")
objectKey.String(*v.GroupId)
@ -54960,6 +55035,11 @@ func awsEc2query_serializeDocumentPlacement(v *types.Placement, value query.Valu
objectKey.String(*v.AvailabilityZone)
}
if v.AvailabilityZoneId != nil {
objectKey := object.Key("AvailabilityZoneId")
objectKey.String(*v.AvailabilityZoneId)
}
if v.GroupId != nil {
objectKey := object.Key("GroupId")
objectKey.String(*v.GroupId)
@ -59759,6 +59839,11 @@ func awsEc2query_serializeOpDocumentAssociateRouteTableInput(v *AssociateRouteTa
objectKey.String(*v.GatewayId)
}
if v.PublicIpv4Pool != nil {
objectKey := object.Key("PublicIpv4Pool")
objectKey.String(*v.PublicIpv4Pool)
}
if v.RouteTableId != nil {
objectKey := object.Key("RouteTableId")
objectKey.String(*v.RouteTableId)
@ -61234,6 +61319,11 @@ func awsEc2query_serializeOpDocumentCreateDefaultSubnetInput(v *CreateDefaultSub
objectKey.String(*v.AvailabilityZone)
}
if v.AvailabilityZoneId != nil {
objectKey := object.Key("AvailabilityZoneId")
objectKey.String(*v.AvailabilityZoneId)
}
if v.DryRun != nil {
objectKey := object.Key("DryRun")
objectKey.Boolean(*v.DryRun)
@ -64423,6 +64513,11 @@ func awsEc2query_serializeOpDocumentCreateVolumeInput(v *CreateVolumeInput, valu
objectKey.String(*v.AvailabilityZone)
}
if v.AvailabilityZoneId != nil {
objectKey := object.Key("AvailabilityZoneId")
objectKey.String(*v.AvailabilityZoneId)
}
if v.ClientToken != nil {
objectKey := object.Key("ClientToken")
objectKey.String(*v.ClientToken)
@ -70936,6 +71031,11 @@ func awsEc2query_serializeOpDocumentDescribeSpotPriceHistoryInput(v *DescribeSpo
objectKey.String(*v.AvailabilityZone)
}
if v.AvailabilityZoneId != nil {
objectKey := object.Key("AvailabilityZoneId")
objectKey.String(*v.AvailabilityZoneId)
}
if v.DryRun != nil {
objectKey := object.Key("DryRun")
objectKey.Boolean(*v.DryRun)
@ -75632,6 +75732,11 @@ func awsEc2query_serializeOpDocumentImportVolumeInput(v *ImportVolumeInput, valu
objectKey.String(*v.AvailabilityZone)
}
if v.AvailabilityZoneId != nil {
objectKey := object.Key("AvailabilityZoneId")
objectKey.String(*v.AvailabilityZoneId)
}
if v.Description != nil {
objectKey := object.Key("Description")
objectKey.String(*v.Description)
@ -76429,6 +76534,40 @@ func awsEc2query_serializeOpDocumentModifyInstanceCapacityReservationAttributesI
return nil
}
func awsEc2query_serializeOpDocumentModifyInstanceConnectEndpointInput(v *ModifyInstanceConnectEndpointInput, value query.Value) error {
object := value.Object()
_ = object
if v.DryRun != nil {
objectKey := object.Key("DryRun")
objectKey.Boolean(*v.DryRun)
}
if v.InstanceConnectEndpointId != nil {
objectKey := object.Key("InstanceConnectEndpointId")
objectKey.String(*v.InstanceConnectEndpointId)
}
if len(v.IpAddressType) > 0 {
objectKey := object.Key("IpAddressType")
objectKey.String(string(v.IpAddressType))
}
if v.PreserveClientIp != nil {
objectKey := object.Key("PreserveClientIp")
objectKey.Boolean(*v.PreserveClientIp)
}
if v.SecurityGroupIds != nil {
objectKey := object.FlatKey("SecurityGroupId")
if err := awsEc2query_serializeDocumentSecurityGroupIdStringListRequest(v.SecurityGroupIds, objectKey); err != nil {
return err
}
}
return nil
}
func awsEc2query_serializeOpDocumentModifyInstanceCpuOptionsInput(v *ModifyInstanceCpuOptionsInput, value query.Value) error {
object := value.Object()
_ = object

6
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/enums.go generated vendored
View file

@ -2044,6 +2044,9 @@ const (
Ec2InstanceConnectEndpointStateDeleteInProgress Ec2InstanceConnectEndpointState = "delete-in-progress"
Ec2InstanceConnectEndpointStateDeleteComplete Ec2InstanceConnectEndpointState = "delete-complete"
Ec2InstanceConnectEndpointStateDeleteFailed Ec2InstanceConnectEndpointState = "delete-failed"
Ec2InstanceConnectEndpointStateUpdateInProgress Ec2InstanceConnectEndpointState = "update-in-progress"
Ec2InstanceConnectEndpointStateUpdateComplete Ec2InstanceConnectEndpointState = "update-complete"
Ec2InstanceConnectEndpointStateUpdateFailed Ec2InstanceConnectEndpointState = "update-failed"
)
// Values returns all known values for Ec2InstanceConnectEndpointState. Note that
@ -2059,6 +2062,9 @@ func (Ec2InstanceConnectEndpointState) Values() []Ec2InstanceConnectEndpointStat
"delete-in-progress",
"delete-complete",
"delete-failed",
"update-in-progress",
"update-complete",
"update-failed",
}
}

96
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/types/types.go generated vendored
View file

@ -4459,6 +4459,9 @@ type Ec2InstanceConnectEndpoint struct {
// Default: true
PreserveClientIp *bool
// The public DNS names of the endpoint.
PublicDnsNames *InstanceConnectEndpointPublicDnsNames
// The security groups associated with the endpoint. If you didn't specify a
// security group, the default security group for your VPC is associated with the
// endpoint.
@ -7264,6 +7267,9 @@ type ImportInstanceVolumeDetailItem struct {
// The Availability Zone where the resulting instance will reside.
AvailabilityZone *string
// The ID of the Availability Zone where the resulting instance will reside.
AvailabilityZoneId *string
// The number of bytes converted so far.
BytesConverted *int64
@ -7309,6 +7315,9 @@ type ImportVolumeTaskDetails struct {
// The Availability Zone where the resulting volume will reside.
AvailabilityZone *string
// The ID of the Availability Zone where the resulting volume will reside.
AvailabilityZoneId *string
// The number of bytes converted so far.
BytesConverted *int64
@ -7729,6 +7738,33 @@ type InstanceCapacity struct {
noSmithyDocumentSerde
}
// The DNS names of the endpoint.
type InstanceConnectEndpointDnsNames struct {
// The DNS name of the EC2 Instance Connect Endpoint.
DnsName *string
// The Federal Information Processing Standards (FIPS) compliant DNS name of the
// EC2 Instance Connect Endpoint.
FipsDnsName *string
noSmithyDocumentSerde
}
// The public DNS names of the endpoint, including IPv4-only and dualstack DNS
// names.
type InstanceConnectEndpointPublicDnsNames struct {
// The dualstack DNS name of the EC2 Instance Connect Endpoint. A dualstack DNS
// name supports connections from both IPv4 and IPv6 clients.
Dualstack *InstanceConnectEndpointDnsNames
// The IPv4-only DNS name of the EC2 Instance Connect Endpoint.
Ipv4 *InstanceConnectEndpointDnsNames
noSmithyDocumentSerde
}
// Describes a Reserved Instance listing state.
type InstanceCount struct {
@ -9377,6 +9413,9 @@ type InstanceStatus struct {
// The Availability Zone of the instance.
AvailabilityZone *string
// The ID of the Availability Zone of the instance.
AvailabilityZoneId *string
// Any scheduled events associated with the instance.
Events []InstanceStatusEvent
@ -12039,6 +12078,9 @@ type LaunchTemplatePlacement struct {
// The Availability Zone of the instance.
AvailabilityZone *string
// The ID of the Availability Zone of the instance.
AvailabilityZoneId *string
// The Group ID of the placement group. You must specify the Placement Group Group
// ID to launch an instance in a shared placement group.
GroupId *string
@ -12073,8 +12115,15 @@ type LaunchTemplatePlacementRequest struct {
Affinity *string
// The Availability Zone for the instance.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZone *string
// The ID of the Availability Zone for the instance.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZoneId *string
// The Group Id of a placement group. You must specify the Placement Group Group
// Id to launch an instance in a shared placement group.
GroupId *string
@ -14994,7 +15043,8 @@ type Placement struct {
// The Availability Zone of the instance.
//
// If not specified, an Availability Zone will be automatically chosen for you
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both.
// If neither is specified, Amazon EC2 automatically selects an Availability Zone
// based on the load balancing criteria for the Region.
//
// This parameter is not supported for [CreateFleet].
@ -15002,6 +15052,17 @@ type Placement struct {
// [CreateFleet]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet
AvailabilityZone *string
// The ID of the Availability Zone of the instance.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both.
// If neither is specified, Amazon EC2 automatically selects an Availability Zone
// based on the load balancing criteria for the Region.
//
// This parameter is not supported for [CreateFleet].
//
// [CreateFleet]: https://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_CreateFleet
AvailabilityZoneId *string
// The ID of the placement group that the instance is in. If you specify GroupId ,
// you can't specify GroupName .
GroupId *string
@ -17159,6 +17220,10 @@ type RouteTableAssociation struct {
// Indicates whether this is the main route table.
Main *bool
// The ID of a public IPv4 pool. A public IPv4 pool is a pool of IPv4 addresses
// that you've brought to Amazon Web Services with BYOIP.
PublicIpv4Pool *string
// The ID of the association.
RouteTableAssociationId *string
@ -17933,7 +17998,14 @@ type ServiceConfiguration struct {
// endpoint to the service must first be accepted.
AcceptanceRequired *bool
// The IDs of the Availability Zones in which the service is available.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZoneIds []string
// The Availability Zones in which the service is available.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZones []string
// The DNS names for the service.
@ -17993,7 +18065,14 @@ type ServiceDetail struct {
// accepted by the service owner.
AcceptanceRequired *bool
// The IDs of the Availability Zones in which the service is available.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZoneIds []string
// The Availability Zones in which the service is available.
//
// Either AvailabilityZone or AvailabilityZoneId can be specified, but not both
AvailabilityZones []string
// The DNS names for the service.
@ -18968,8 +19047,17 @@ type SpotInstanceRequest struct {
LaunchSpecification *LaunchSpecification
// The Availability Zone in which the request is launched.
//
// Either launchedAvailabilityZone or launchedAvailabilityZoneId can be specified,
// but not both
LaunchedAvailabilityZone *string
// The ID of the Availability Zone in which the request is launched.
//
// Either launchedAvailabilityZone or launchedAvailabilityZoneId can be specified,
// but not both
LaunchedAvailabilityZoneId *string
// The product description associated with the Spot Instance.
ProductDescription RIProductDescription
@ -19399,6 +19487,9 @@ type SpotPrice struct {
// The Availability Zone.
AvailabilityZone *string
// The ID of the Availability Zone.
AvailabilityZoneId *string
// The instance type.
InstanceType InstanceType
@ -22202,6 +22293,9 @@ type Volume struct {
// The Availability Zone for the volume.
AvailabilityZone *string
// The ID of the Availability Zone for the volume.
AvailabilityZoneId *string
// The time stamp when volume creation was initiated.
CreateTime *time.Time

120
vendor/github.com/aws/aws-sdk-go-v2/service/ec2/validators.go generated vendored
View file

@ -1270,26 +1270,6 @@ func (m *validateOpCreateCustomerGateway) HandleInitialize(ctx context.Context,
return next.HandleInitialize(ctx, in)
}
type validateOpCreateDefaultSubnet struct {
}
func (*validateOpCreateDefaultSubnet) ID() string {
return "OperationInputValidation"
}
func (m *validateOpCreateDefaultSubnet) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
out middleware.InitializeOutput, metadata middleware.Metadata, err error,
) {
input, ok := in.Parameters.(*CreateDefaultSubnetInput)
if !ok {
return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters)
}
if err := validateOpCreateDefaultSubnetInput(input); err != nil {
return out, metadata, err
}
return next.HandleInitialize(ctx, in)
}
type validateOpCreateDelegateMacVolumeOwnershipTask struct {
}
@ -2510,26 +2490,6 @@ func (m *validateOpCreateVerifiedAccessTrustProvider) HandleInitialize(ctx conte
return next.HandleInitialize(ctx, in)
}
type validateOpCreateVolume struct {
}
func (*validateOpCreateVolume) ID() string {
return "OperationInputValidation"
}
func (m *validateOpCreateVolume) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
out middleware.InitializeOutput, metadata middleware.Metadata, err error,
) {
input, ok := in.Parameters.(*CreateVolumeInput)
if !ok {
return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters)
}
if err := validateOpCreateVolumeInput(input); err != nil {
return out, metadata, err
}
return next.HandleInitialize(ctx, in)
}
type validateOpCreateVpcBlockPublicAccessExclusion struct {
}
@ -7230,6 +7190,26 @@ func (m *validateOpModifyInstanceCapacityReservationAttributes) HandleInitialize
return next.HandleInitialize(ctx, in)
}
type validateOpModifyInstanceConnectEndpoint struct {
}
func (*validateOpModifyInstanceConnectEndpoint) ID() string {
return "OperationInputValidation"
}
func (m *validateOpModifyInstanceConnectEndpoint) HandleInitialize(ctx context.Context, in middleware.InitializeInput, next middleware.InitializeHandler) (
out middleware.InitializeOutput, metadata middleware.Metadata, err error,
) {
input, ok := in.Parameters.(*ModifyInstanceConnectEndpointInput)
if !ok {
return out, metadata, fmt.Errorf("unknown input parameters type %T", in.Parameters)
}
if err := validateOpModifyInstanceConnectEndpointInput(input); err != nil {
return out, metadata, err
}
return next.HandleInitialize(ctx, in)
}
type validateOpModifyInstanceCpuOptions struct {
}
@ -9922,10 +9902,6 @@ func addOpCreateCustomerGatewayValidationMiddleware(stack *middleware.Stack) err
return stack.Initialize.Add(&validateOpCreateCustomerGateway{}, middleware.After)
}
func addOpCreateDefaultSubnetValidationMiddleware(stack *middleware.Stack) error {
return stack.Initialize.Add(&validateOpCreateDefaultSubnet{}, middleware.After)
}
func addOpCreateDelegateMacVolumeOwnershipTaskValidationMiddleware(stack *middleware.Stack) error {
return stack.Initialize.Add(&validateOpCreateDelegateMacVolumeOwnershipTask{}, middleware.After)
}
@ -10170,10 +10146,6 @@ func addOpCreateVerifiedAccessTrustProviderValidationMiddleware(stack *middlewar
return stack.Initialize.Add(&validateOpCreateVerifiedAccessTrustProvider{}, middleware.After)
}
func addOpCreateVolumeValidationMiddleware(stack *middleware.Stack) error {
return stack.Initialize.Add(&validateOpCreateVolume{}, middleware.After)
}
func addOpCreateVpcBlockPublicAccessExclusionValidationMiddleware(stack *middleware.Stack) error {
return stack.Initialize.Add(&validateOpCreateVpcBlockPublicAccessExclusion{}, middleware.After)
}
@ -11114,6 +11086,10 @@ func addOpModifyInstanceCapacityReservationAttributesValidationMiddleware(stack
return stack.Initialize.Add(&validateOpModifyInstanceCapacityReservationAttributes{}, middleware.After)
}
func addOpModifyInstanceConnectEndpointValidationMiddleware(stack *middleware.Stack) error {
return stack.Initialize.Add(&validateOpModifyInstanceConnectEndpoint{}, middleware.After)
}
func addOpModifyInstanceCpuOptionsValidationMiddleware(stack *middleware.Stack) error {
return stack.Initialize.Add(&validateOpModifyInstanceCpuOptions{}, middleware.After)
}
@ -13594,21 +13570,6 @@ func validateOpCreateCustomerGatewayInput(v *CreateCustomerGatewayInput) error {
}
}
func validateOpCreateDefaultSubnetInput(v *CreateDefaultSubnetInput) error {
if v == nil {
return nil
}
invalidParams := smithy.InvalidParamsError{Context: "CreateDefaultSubnetInput"}
if v.AvailabilityZone == nil {
invalidParams.Add(smithy.NewErrParamRequired("AvailabilityZone"))
}
if invalidParams.Len() > 0 {
return invalidParams
} else {
return nil
}
}
func validateOpCreateDelegateMacVolumeOwnershipTaskInput(v *CreateDelegateMacVolumeOwnershipTaskInput) error {
if v == nil {
return nil
@ -14731,21 +14692,6 @@ func validateOpCreateVerifiedAccessTrustProviderInput(v *CreateVerifiedAccessTru
}
}
func validateOpCreateVolumeInput(v *CreateVolumeInput) error {
if v == nil {
return nil
}
invalidParams := smithy.InvalidParamsError{Context: "CreateVolumeInput"}
if v.AvailabilityZone == nil {
invalidParams.Add(smithy.NewErrParamRequired("AvailabilityZone"))
}
if invalidParams.Len() > 0 {
return invalidParams
} else {
return nil
}
}
func validateOpCreateVpcBlockPublicAccessExclusionInput(v *CreateVpcBlockPublicAccessExclusionInput) error {
if v == nil {
return nil
@ -18255,9 +18201,6 @@ func validateOpImportVolumeInput(v *ImportVolumeInput) error {
return nil
}
invalidParams := smithy.InvalidParamsError{Context: "ImportVolumeInput"}
if v.AvailabilityZone == nil {
invalidParams.Add(smithy.NewErrParamRequired("AvailabilityZone"))
}
if v.Image == nil {
invalidParams.Add(smithy.NewErrParamRequired("Image"))
} else if v.Image != nil {
@ -18550,6 +18493,21 @@ func validateOpModifyInstanceCapacityReservationAttributesInput(v *ModifyInstanc
}
}
func validateOpModifyInstanceConnectEndpointInput(v *ModifyInstanceConnectEndpointInput) error {
if v == nil {
return nil
}
invalidParams := smithy.InvalidParamsError{Context: "ModifyInstanceConnectEndpointInput"}
if v.InstanceConnectEndpointId == nil {
invalidParams.Add(smithy.NewErrParamRequired("InstanceConnectEndpointId"))
}
if invalidParams.Len() > 0 {
return invalidParams
} else {
return nil
}
}
func validateOpModifyInstanceCpuOptionsInput(v *ModifyInstanceCpuOptionsInput) error {
if v == nil {
return nil

4
vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.8.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.8.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/service/internal/checksum/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package checksum
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.8.2"
const goModuleVersion = "1.8.3"

4
vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.13.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.13.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package presignedurl
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.13.2"
const goModuleVersion = "1.13.3"

4
vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/CHANGELOG.md generated vendored
View file

@ -1,3 +1,7 @@
# v1.19.3 (2025-08-11)
* **Dependency Update**: Updated to the latest SDK module versions
# v1.19.2 (2025-08-04)
* **Dependency Update**: Updated to the latest SDK module versions

2
vendor/github.com/aws/aws-sdk-go-v2/service/internal/s3shared/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package s3shared
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.19.2"
const goModuleVersion = "1.19.3"

5
vendor/github.com/aws/aws-sdk-go-v2/service/s3/CHANGELOG.md generated vendored
View file

@ -1,3 +1,8 @@
# v1.87.0 (2025-08-11)
* **Feature**: Add support for configuring per-service Options via callback on global config.
* **Dependency Update**: Updated to the latest SDK module versions
# v1.86.0 (2025-08-04)
* **Feature**: Support configurable auth scheme preferences in service clients via AWS_AUTH_SCHEME_PREFERENCE in the environment, auth_scheme_preference in the config file, and through in-code settings on LoadDefaultConfig and client constructor methods.

9
vendor/github.com/aws/aws-sdk-go-v2/service/s3/api_client.go generated vendored
View file

@ -477,7 +477,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
resolveUseDualStackEndpoint(cfg, &opts)
resolveUseFIPSEndpoint(cfg, &opts)
resolveBaseEndpoint(cfg, &opts)
return New(opts, optFns...)
return New(opts, func(o *Options) {
for _, opt := range cfg.ServiceOptions {
opt(ServiceID, o)
}
for _, opt := range optFns {
opt(o)
}
})
}
func resolveHTTPClient(o *Options) {

2
vendor/github.com/aws/aws-sdk-go-v2/service/s3/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package s3
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.86.0"
const goModuleVersion = "1.87.0"

5
vendor/github.com/aws/aws-sdk-go-v2/service/sso/CHANGELOG.md generated vendored
View file

@ -1,3 +1,8 @@
# v1.28.0 (2025-08-11)
* **Feature**: Add support for configuring per-service Options via callback on global config.
* **Dependency Update**: Updated to the latest SDK module versions
# v1.27.0 (2025-08-04)
* **Feature**: Support configurable auth scheme preferences in service clients via AWS_AUTH_SCHEME_PREFERENCE in the environment, auth_scheme_preference in the config file, and through in-code settings on LoadDefaultConfig and client constructor methods.

9
vendor/github.com/aws/aws-sdk-go-v2/service/sso/api_client.go generated vendored
View file

@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
resolveUseDualStackEndpoint(cfg, &opts)
resolveUseFIPSEndpoint(cfg, &opts)
resolveBaseEndpoint(cfg, &opts)
return New(opts, optFns...)
return New(opts, func(o *Options) {
for _, opt := range cfg.ServiceOptions {
opt(ServiceID, o)
}
for _, opt := range optFns {
opt(o)
}
})
}
func resolveHTTPClient(o *Options) {

2
vendor/github.com/aws/aws-sdk-go-v2/service/sso/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package sso
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.27.0"
const goModuleVersion = "1.28.0"

5
vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/CHANGELOG.md generated vendored
View file

@ -1,3 +1,8 @@
# v1.33.0 (2025-08-11)
* **Feature**: Add support for configuring per-service Options via callback on global config.
* **Dependency Update**: Updated to the latest SDK module versions
# v1.32.0 (2025-08-04)
* **Feature**: Support configurable auth scheme preferences in service clients via AWS_AUTH_SCHEME_PREFERENCE in the environment, auth_scheme_preference in the config file, and through in-code settings on LoadDefaultConfig and client constructor methods.

9
vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/api_client.go generated vendored
View file

@ -438,7 +438,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
resolveUseDualStackEndpoint(cfg, &opts)
resolveUseFIPSEndpoint(cfg, &opts)
resolveBaseEndpoint(cfg, &opts)
return New(opts, optFns...)
return New(opts, func(o *Options) {
for _, opt := range cfg.ServiceOptions {
opt(ServiceID, o)
}
for _, opt := range optFns {
opt(o)
}
})
}
func resolveHTTPClient(o *Options) {

2
vendor/github.com/aws/aws-sdk-go-v2/service/ssooidc/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package ssooidc
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.32.0"
const goModuleVersion = "1.33.0"

5
vendor/github.com/aws/aws-sdk-go-v2/service/sts/CHANGELOG.md generated vendored
View file

@ -1,3 +1,8 @@
# v1.37.0 (2025-08-11)
* **Feature**: Add support for configuring per-service Options via callback on global config.
* **Dependency Update**: Updated to the latest SDK module versions
# v1.36.0 (2025-08-04)
* **Feature**: Support configurable auth scheme preferences in service clients via AWS_AUTH_SCHEME_PREFERENCE in the environment, auth_scheme_preference in the config file, and through in-code settings on LoadDefaultConfig and client constructor methods.

9
vendor/github.com/aws/aws-sdk-go-v2/service/sts/api_client.go generated vendored
View file

@ -442,7 +442,14 @@ func NewFromConfig(cfg aws.Config, optFns ...func(*Options)) *Client {
resolveUseDualStackEndpoint(cfg, &opts)
resolveUseFIPSEndpoint(cfg, &opts)
resolveBaseEndpoint(cfg, &opts)
return New(opts, optFns...)
return New(opts, func(o *Options) {
for _, opt := range cfg.ServiceOptions {
opt(ServiceID, o)
}
for _, opt := range optFns {
opt(o)
}
})
}
func resolveHTTPClient(o *Options) {

2
vendor/github.com/aws/aws-sdk-go-v2/service/sts/go_module_metadata.go generated vendored
View file

@ -3,4 +3,4 @@
package sts
// goModuleVersion is the tagged release for this module
const goModuleVersion = "1.36.0"
const goModuleVersion = "1.37.0"

21
vendor/github.com/osbuild/blueprint/pkg/blueprint/customizations.go generated vendored
View file

@ -8,7 +8,6 @@ import (
"github.com/osbuild/images/pkg/cert"
"github.com/osbuild/images/pkg/customizations/anaconda"
"github.com/osbuild/images/pkg/disk/partition"
)
type Customizations struct {
@ -345,26 +344,6 @@ func (c *Customizations) GetPartitioning() (*DiskCustomization, error) {
return c.Disk, nil
}
// GetPartitioningMode converts the string to a disk.PartitioningMode type
func (c *Customizations) GetPartitioningMode() (partition.PartitioningMode, error) {
if c == nil {
return partition.DefaultPartitioningMode, nil
}
switch c.PartitioningMode {
case "raw":
return partition.RawPartitioningMode, nil
case "lvm":
return partition.LVMPartitioningMode, nil
case "auto-lvm":
return partition.AutoLVMPartitioningMode, nil
case "":
return partition.DefaultPartitioningMode, nil
default:
return partition.DefaultPartitioningMode, fmt.Errorf("invalid partitioning mode '%s'", c.PartitioningMode)
}
}
func (c *Customizations) GetInstallationDevice() string {
if c == nil || c.InstallationDevice == "" {
return ""

46
vendor/github.com/osbuild/blueprint/pkg/blueprint/partitioning_mode.go generated vendored Normal file
View file

@ -0,0 +1,46 @@
package blueprint
import (
"fmt"
)
type PartitioningMode string
const (
// AutoLVMPartitioningMode creates a LVM layout if the filesystem
// contains a mountpoint that's not defined in the base partition table
// of the specified image type. In the other case, a raw layout is used.
AutoLVMPartitioningMode PartitioningMode = "auto-lvm"
// LVMPartitioningMode always creates an LVM layout.
LVMPartitioningMode PartitioningMode = "lvm"
// RawPartitioningMode always creates a raw layout.
RawPartitioningMode PartitioningMode = "raw"
// BtrfsPartitioningMode creates a btrfs layout.
BtrfsPartitioningMode PartitioningMode = "btrfs"
// DefaultPartitioningMode is AutoLVMPartitioningMode and is the empty state
DefaultPartitioningMode PartitioningMode = ""
)
// GetPartitioningMode converts the string to a disk.PartitioningMode type
func (c *Customizations) GetPartitioningMode() (PartitioningMode, error) {
if c == nil {
return DefaultPartitioningMode, nil
}
switch c.PartitioningMode {
case "raw":
return RawPartitioningMode, nil
case "lvm":
return LVMPartitioningMode, nil
case "auto-lvm":
return AutoLVMPartitioningMode, nil
case "":
return DefaultPartitioningMode, nil
default:
return DefaultPartitioningMode, fmt.Errorf("invalid partitioning mode '%s'", c.PartitioningMode)
}
}

8
vendor/github.com/osbuild/images/data/distrodefs/README.md generated vendored
View file

@ -40,8 +40,6 @@ image_types:
container:
filename: container.tar
image_func: container
build_pipelines: ["build"]
payload_pipelines: ["os", "container"]
exports: ["container"]
platforms:
- arch: "x86_64"
@ -53,12 +51,6 @@ image_types:
With that the "images" library can now create a "container"
image type that is available on x86_64 and only adds "bash".
For the build_pipelines, payload_pipelines, exports some
knowledge about the inner workings of osbuild is required,
it is recommended to use the existing image types as examples.
We are exploring infering the pipelines from `image_func`
information.
Now only a `data/repositories/simonos-1.json` file is needed
to make a complete new distro.

705
vendor/github.com/osbuild/images/data/distrodefs/fedora/imagetypes.yaml generated vendored
View file

@ -12,6 +12,149 @@
- "geolite2-country"
- "plymouth"
anaconda_pkgset: &anaconda_pkgset
include:
- "aajohan-comfortaa-fonts"
- "abattis-cantarell-fonts"
- "alsa-firmware"
- "alsa-tools-firmware"
- "anaconda"
- "anaconda-dracut"
- "anaconda-install-img-deps"
- "anaconda-widgets"
- "atheros-firmware"
- "audit"
- "bind-utils"
- "bitmap-fangsongti-fonts"
- "brcmfmac-firmware"
- "bzip2"
- "cryptsetup"
- "curl"
- "dbus-x11"
- "dejavu-sans-fonts"
- "dejavu-sans-mono-fonts"
- "device-mapper-persistent-data"
- "dmidecode"
- "dnf"
- "dracut-config-generic"
- "dracut-network"
- "efibootmgr"
- "ethtool"
- "fcoe-utils"
- "ftp"
- "gdb-gdbserver"
- "gdisk"
- "glibc-all-langpacks"
- "gnome-kiosk"
- "google-noto-sans-cjk-ttc-fonts"
- "grub2-tools"
- "grub2-tools-extra"
- "grub2-tools-minimal"
- "grubby"
- "gsettings-desktop-schemas"
- "hdparm"
- "hexedit"
- "hostname"
- "initscripts"
- "ipmitool"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "jomolhari-fonts"
- "kacst-farsi-fonts"
- "kacst-qurn-fonts"
- "kbd"
- "kbd-misc"
- "kdump-anaconda-addon"
- "kernel"
- "khmeros-base-fonts"
- "less"
- "libblockdev-lvm-dbus"
- "libibverbs"
- "libreport-plugin-bugzilla"
- "libreport-plugin-reportuploader"
- "librsvg2"
- "linux-firmware"
- "lldpad"
- "lohit-assamese-fonts"
- "lohit-bengali-fonts"
- "lohit-devanagari-fonts"
- "lohit-gujarati-fonts"
- "lohit-gurmukhi-fonts"
- "lohit-kannada-fonts"
- "lohit-odia-fonts"
- "lohit-tamil-fonts"
- "lohit-telugu-fonts"
- "lsof"
- "madan-fonts"
- "mtr"
- "mt-st"
- "net-tools"
- "nfs-utils"
- "nmap-ncat"
- "nm-connection-editor"
- "nss-tools"
- "openssh-clients"
- "openssh-server"
- "ostree"
- "pciutils"
- "perl-interpreter"
- "pigz"
- "plymouth"
- "prefixdevname"
- "python3-pyatspi"
- "rdma-core"
- "realtek-firmware"
- "rit-meera-new-fonts"
- "rng-tools"
- "rpcbind"
- "rpm-ostree"
- "rsync"
- "rsyslog"
- "selinux-policy-targeted"
- "sg3_utils"
- "sil-abyssinica-fonts"
- "sil-padauk-fonts"
- "sil-scheherazade-new-fonts"
- "smartmontools"
- "spice-vdagent"
- "strace"
- "systemd"
- "tar"
- "thai-scalable-waree-fonts"
- "tigervnc-server-minimal"
- "tigervnc-server-module"
- "udisks2"
- "udisks2-iscsi"
- "usbutils"
- "vim-minimal"
- "volume_key"
- "wget"
- "xfsdump"
- "xfsprogs"
- "xorg-x11-drivers"
- "xorg-x11-fonts-misc"
- "xorg-x11-server-Xorg"
- "xorg-x11-xauth"
- "metacity"
- "xrdb"
- "xz"
conditions:
"x86_64 specific anaconda pkgs":
when:
arch: "x86_64"
append:
include:
- "biosdevname"
- "dmidecode"
- "grub2-tools-efi"
- "memtest86+"
"aarch64 specific anaconda pkgs":
when:
arch: "aarch64"
append:
include:
- "dmidecode"
cloud_init_services: &cloud_init_services
- "cloud-init.service"
- "cloud-config.service"
@ -90,11 +233,35 @@
image_format: "raw"
packages:
<<: *x86_64_bios_platform_packages
firmware:
booting:
- "biosdevname"
- "grub2-pc-modules"
- "grub2-tools-efi"
- "grub2-tools"
- "grub2-tools-extra"
- "shim-ia32"
- "grub2-efi-ia32-cdboot"
firmware:
- "microcode_ctl"
- "amd-gpu-firmware"
- "amd-ucode-firmware"
- "atheros-firmware"
- "atmel-firmware"
- "b43-openfwwf"
- "brcmfmac-firmware"
- "intel-gpu-firmware"
- "iwlegacy-firmware"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "microcode_ctl"
- "libertas-firmware"
- "linux-firmware"
- "mt7xxx-firmware"
- "nvidia-gpu-firmware"
- "nxpwireless-firmware"
- "qed-firmware"
- "realtek-firmware"
- "tiwilink-firmware"
- "zd1211-firmware"
bootloader: "grub2"
aarch64_platform: &aarch64_platform
arch: "aarch64"
@ -114,20 +281,41 @@
uefi_vendor: "fedora"
packages:
<<: *aarch64_uefi_platform_packages
firmware:
booting:
- "arm-image-installer"
- "grub2-efi-aa64-cdboot"
- "uboot-images-armv8"
- "uboot-tools"
firmware:
- "amd-gpu-firmware"
- "atheros-firmware"
- "atmel-firmware"
- "b43-openfwwf"
- "bcm2711-firmware"
- "bcm2835-firmware"
- "bcm283x-firmware"
- "brcmfmac-firmware"
- "intel-gpu-firmware"
- "iwlegacy-firmware"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "libertas-firmware"
- "linux-firmware"
- "mt7xxx-firmware"
- "nvidia-gpu-firmware"
- "nxpwireless-firmware"
- "qcom-firmware"
- "qed-firmware"
- "realtek-firmware"
- "uboot-images-armv8"
- "tiwilink-firmware"
- "zd1211-firmware"
bootloader: "grub2"
ppc64le_bios_platform: &ppc64le_bios_platform
arch: "ppc64le"
bios_platform: "powerpc-ieee1275"
image_format: "qcow2"
qcow2_compat: "1.1"
packages:
packages: &ppc64le_bios_platform_packages
bios:
- "dracut-config-generic"
- "powerpc-utils"
@ -138,6 +326,36 @@
- "grub2-ppc64le"
- "grub2-ppc64le-modules"
bootloader: "grub2"
ppc64le_installer_platform: &ppc64le_installer_platform
<<: *ppc64le_bios_platform
image_format: "qcow2"
packages:
<<: *ppc64le_bios_platform_packages
booting:
- "lsvpd"
- "ppc64-diag"
- "grub2-tools"
- "grub2-tools-minimal"
- "grub2-tools-extra"
firmware:
- "amd-gpu-firmware"
- "atheros-firmware"
- "atmel-firmware"
- "b43-openfwwf"
- "brcmfmac-firmware"
- "intel-gpu-firmware"
- "iwlegacy-firmware"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "libertas-firmware"
- "linux-firmware"
- "mt7xxx-firmware"
- "nvidia-gpu-firmware"
- "nxpwireless-firmware"
- "qed-firmware"
- "realtek-firmware"
- "tiwilink-firmware"
- "zd1211-firmware"
s390x_zipl_platform: &s390x_zipl_platform
arch: "s390x"
zipl_support: true
@ -169,6 +387,7 @@
installer_config: &default_installer_config
iso_rootfs_type: "squashfs"
enabled_anaconda_modules: &install_config_enabled_anaconda_modules
- "org.fedoraproject.Anaconda.Modules.Localization"
- "org.fedoraproject.Anaconda.Modules.Network"
@ -180,8 +399,8 @@
additional_dracut_modules:
- "net-lib"
- "dbus-broker"
squashfs_rootfs: true
conditions:
default_menu: 1
conditions: &default_installer_config_conditions
"f41 dracut requires ifcfg, rootfs is squashfs":
when:
version_equal: "41"
@ -189,14 +408,11 @@
additional_dracut_modules:
- "ifcfg"
- "dbus-broker"
"f40 and lower uses ifcfg in dracut and squashfs+ext4 rootfs":
"x86_64 uses grub2":
when:
version_less_than: "41"
arch: "x86_64"
shallow_merge:
additional_dracut_modules:
- "ifcfg"
- "dbus-broker"
squashfs_rootfs: false
iso_boot_type: "grub2"
image_config:
iot_enabled_services: &image_config_iot_enabled_services
@ -553,8 +769,6 @@ image_types:
bootable: true
default_size: 5_368_709_120 # 5 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vagrant", "archive"]
exports: ["archive"]
required_partition_sizes: *default_required_dir_sizes
image_config: &image_config_vagrant
@ -615,8 +829,6 @@ image_types:
bootable: true
default_size: 5_368_709_120 # 5 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "qcow2"]
exports: ["qcow2"]
required_partition_sizes: *default_required_dir_sizes
image_config: &image_config_qcow2
@ -657,7 +869,6 @@ image_types:
name_aliases: ["ami", "aws"]
filename: "image.raw"
mime_type: "application/octet-stream"
payload_pipelines: ["os", "image"]
exports: ["image"]
environment: *ec2_env
platforms:
@ -691,7 +902,6 @@ image_types:
name_aliases: ["vhd", "azure"]
filename: "disk.vhd"
mime_type: "application/x-vhd"
payload_pipelines: ["os", "image", "vpc"]
exports: ["vpc"]
environment: *azure_env
platforms:
@ -718,8 +928,6 @@ image_types:
bootable: true
default_size: 2_147_483_648 # 2 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vmdk"]
exports: ["vmdk"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -768,7 +976,6 @@ image_types:
name_aliases: ["ova", "vsphere-ova"]
filename: "image.ova"
mime_type: "application/ovf"
payload_pipelines: ["os", "image", "vmdk", "ovf", "archive"]
exports: ["archive"]
platforms:
- <<: *x86_64_bios_platform
@ -782,8 +989,6 @@ image_types:
filename: "commit.tar"
mime_type: "application/x-tar"
image_func: "iot_commit"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "commit-archive"]
exports: ["commit-archive"]
required_partition_sizes: *default_required_dir_sizes
image_config: &image_config_iot_commit
@ -902,12 +1107,6 @@ image_types:
- "xz"
- "zram-generator"
conditions:
"f40 and below use dnsmasq":
when:
version_less_than: "41"
append:
include:
- "dnsmasq"
"f41 and below uses parsec/zezere":
when:
version_less_than: "42"
@ -943,8 +1142,6 @@ image_types:
filename: "container.tar"
mime_type: "application/x-tar"
image_func: "iot_container"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "container-tree", "container"]
exports: ["container"]
required_partition_sizes: *default_required_dir_sizes
image_config:
@ -960,14 +1157,12 @@ image_types:
filename: "image.raw.xz"
compression: "xz"
mime_type: "application/xz"
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
default_size: 5_368_709_120 # 5 * datasizes.GibiByte
bootable: true
image_func: "iot"
ostree:
name: "fedora-iot"
remote_name: "fedora-iot"
build_pipelines: ["build"]
payload_pipelines: ["ostree-deployment", "image", "xz"]
exports: ["xz"]
# Passing an empty map into the required partition sizes disables the
# default partition sizes normally set so our `basePartitionTables` can
@ -1045,8 +1240,6 @@ image_types:
ostree:
name: "fedora-iot"
remote_name: "fedora-iot"
build_pipelines: ["build"]
payload_pipelines: ["ostree-deployment", "image", "qcow2"]
exports: ["qcow2"]
required_partition_sizes: *default_required_dir_sizes
image_config:
@ -1068,8 +1261,6 @@ image_types:
filename: "iot-bootable-container.tar"
mime_type: "application/x-tar"
image_func: "bootable_container"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "ostree-encapsulate"]
exports: ["ostree-encapsulate"]
required_partition_sizes: *default_required_dir_sizes
image_config:
@ -1219,8 +1410,6 @@ image_types:
bootable: true
default_size: 2_147_483_648 # 2 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1310,196 +1499,8 @@ image_types:
name_aliases: []
filename: "disk.raw.zst"
compression: zstd
payload_pipelines: ["os", "image", "zstd"]
exports: ["zstd"]
installer:
package_sets:
os:
- *minimal_raw_pkgset
installer:
- &installer_pkgset
include:
- "anaconda-dracut"
- "atheros-firmware"
- "brcmfmac-firmware"
- "curl"
- "dracut-config-generic"
- "dracut-network"
- "hostname"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "kernel"
- "linux-firmware"
- "less"
- "nfs-utils"
- "openssh-clients"
- "ostree"
- "plymouth"
- "realtek-firmware"
- "rng-tools"
- "rpcbind"
- "selinux-policy-targeted"
- "systemd"
- "tar"
- "xfsprogs"
- "xz"
anaconda: &anaconda
installer_config: *default_installer_config
image_config:
locale: "en_US.UTF-8"
# ideally we would centralize the iso_rootfs_type here - but
# some installers (like coreos_installer) do things differently
# than the anaconda iso so we do not want to disturb whatever
# special things they expect in their images.
package_sets:
os:
- *minimal_raw_pkgset
installer:
- &anaconda_pkgset
include:
- "aajohan-comfortaa-fonts"
- "abattis-cantarell-fonts"
- "alsa-firmware"
- "alsa-tools-firmware"
- "anaconda"
- "anaconda-dracut"
- "anaconda-install-img-deps"
- "anaconda-widgets"
- "atheros-firmware"
- "audit"
- "bind-utils"
- "bitmap-fangsongti-fonts"
- "brcmfmac-firmware"
- "bzip2"
- "cryptsetup"
- "curl"
- "dbus-x11"
- "dejavu-sans-fonts"
- "dejavu-sans-mono-fonts"
- "device-mapper-persistent-data"
- "dmidecode"
- "dnf"
- "dracut-config-generic"
- "dracut-network"
- "efibootmgr"
- "ethtool"
- "fcoe-utils"
- "ftp"
- "gdb-gdbserver"
- "gdisk"
- "glibc-all-langpacks"
- "gnome-kiosk"
- "google-noto-sans-cjk-ttc-fonts"
- "grub2-tools"
- "grub2-tools-extra"
- "grub2-tools-minimal"
- "grubby"
- "gsettings-desktop-schemas"
- "hdparm"
- "hexedit"
- "hostname"
- "initscripts"
- "ipmitool"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "jomolhari-fonts"
- "kacst-farsi-fonts"
- "kacst-qurn-fonts"
- "kbd"
- "kbd-misc"
- "kdump-anaconda-addon"
- "kernel"
- "khmeros-base-fonts"
- "less"
- "libblockdev-lvm-dbus"
- "libibverbs"
- "libreport-plugin-bugzilla"
- "libreport-plugin-reportuploader"
- "librsvg2"
- "linux-firmware"
- "lldpad"
- "lohit-assamese-fonts"
- "lohit-bengali-fonts"
- "lohit-devanagari-fonts"
- "lohit-gujarati-fonts"
- "lohit-gurmukhi-fonts"
- "lohit-kannada-fonts"
- "lohit-odia-fonts"
- "lohit-tamil-fonts"
- "lohit-telugu-fonts"
- "lsof"
- "madan-fonts"
- "mtr"
- "mt-st"
- "net-tools"
- "nfs-utils"
- "nmap-ncat"
- "nm-connection-editor"
- "nss-tools"
- "openssh-clients"
- "openssh-server"
- "ostree"
- "pciutils"
- "perl-interpreter"
- "pigz"
- "plymouth"
- "prefixdevname"
- "python3-pyatspi"
- "rdma-core"
- "realtek-firmware"
- "rit-meera-new-fonts"
- "rng-tools"
- "rpcbind"
- "rpm-ostree"
- "rsync"
- "rsyslog"
- "selinux-policy-targeted"
- "sg3_utils"
- "sil-abyssinica-fonts"
- "sil-padauk-fonts"
- "sil-scheherazade-new-fonts"
- "smartmontools"
- "spice-vdagent"
- "strace"
- "systemd"
- "tar"
- "thai-scalable-waree-fonts"
- "tigervnc-server-minimal"
- "tigervnc-server-module"
- "udisks2"
- "udisks2-iscsi"
- "usbutils"
- "vim-minimal"
- "volume_key"
- "wget"
- "xfsdump"
- "xfsprogs"
- "xorg-x11-drivers"
- "xorg-x11-fonts-misc"
- "xorg-x11-server-Xorg"
- "xorg-x11-xauth"
- "metacity"
- "xrdb"
- "xz"
conditions:
"x86_64 specific anaconda pkgs":
when:
arch: "x86_64"
append:
include:
- "biosdevname"
- "dmidecode"
- "grub2-tools-efi"
- "memtest86+"
"aarch64 specific anaconda pkgs":
when:
arch: "aarch64"
append:
include:
- "dmidecode"
"iot-installer":
<<: *rpm_ostree_imgtype_common
name_aliases: ["fedora-iot-installer"]
@ -1512,30 +1513,14 @@ image_types:
ostree:
name: "fedora-iot"
remote_name: "fedora-iot"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config: *default_installer_config
installer_config:
<<: *default_installer_config
default_menu: 0
image_config:
<<: *image_config_iot_enabled_services
locale: "en_US.UTF-8"
iso_rootfs_type: "squashfs"
conditions:
"f40 and below uses ext4 based iso rootfs":
when:
version_less_than: "41"
shallow_merge:
iso_rootfs_type: "squashfs-ext4"
"x86_64 uses grub2":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "grub2"
package_sets:
installer:
- *anaconda_pkgset
@ -1553,29 +1538,25 @@ image_types:
boot_iso: true
image_func: "live_installer"
iso_label: "Workstation"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config: *default_installer_config
installer_config:
<<: *default_installer_config
# for some reason the live-installer never had or never took into account
# the additional dracut modules. This might be a bug but for now we reset
# them to empty to avoid changing the live-installer definition
additional_dracut_modules: []
# also reset the condition that adds dracut modules
conditions:
<<: *default_installer_config_conditions
"f41 dracut requires ifcfg, rootfs is squashfs":
when:
version_equal: "41"
shallow_merge:
additional_dracut_modules: []
image_config:
locale: "en_US.UTF-8"
iso_rootfs_type: "squashfs"
conditions:
"f40 and below uses ext4 based iso rootfs":
when:
version_less_than: "41"
shallow_merge:
iso_rootfs_type: "squashfs-ext4"
"x86_64 uses grub2":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "grub2"
package_sets:
installer:
- include:
@ -1616,7 +1597,6 @@ image_types:
- *aarch64_installer_platform
"minimal-installer":
<<: *anaconda
name_aliases: ["image-installer", "fedora-image-installer"]
filename: "installer.iso"
mime_type: "application/x-iso9660-image"
@ -1627,13 +1607,6 @@ image_types:
iso_label: "Unknown"
# We don't know the variant that goes into the OS pipeline that gets installed
variant: "Unknown"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "os"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config:
@ -1656,29 +1629,20 @@ image_types:
- "org.fedoraproject.Anaconda.Modules.Users"
image_config:
locale: "en_US.UTF-8"
iso_rootfs_type: "squashfs"
conditions:
"on f40 and below we used ext4 on squashfs":
when:
version_less_than: "41"
shallow_merge:
iso_rootfs_type: "squashfs-ext4"
"x86_64 uses grub2":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "grub2"
platforms:
- *x86_64_installer_platform
- *aarch64_installer_platform
package_sets:
os:
- *minimal_raw_pkgset
installer:
- *anaconda_pkgset
container: &container
filename: "container.tar"
mime_type: "application/x-tar"
image_func: "container"
bootable: false
build_pipelines: ["build"]
payload_pipelines: ["os", "container"]
exports: ["container"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1750,8 +1714,6 @@ image_types:
compression: "xz"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive", "xz"]
exports: ["xz"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1859,18 +1821,11 @@ image_types:
ostree:
name: "fedora"
remote_name: "fedora-iot"
build_pipelines: ["build"]
payload_pipelines:
- "ostree-deployment"
- "image"
- "xz"
- "coi-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config: *default_installer_config
installer_config:
<<: *default_installer_config
default_menu: 0
image_config:
<<: *image_config_iot
ignition_platform: "metal"
@ -1878,11 +1833,13 @@ image_types:
<<: *iot_simplified_installer_partition_tables
package_sets:
installer:
- *installer_pkgset
- include:
- "anaconda-dracut"
- "atheros-firmware"
- "attr"
- "basesystem"
- "binutils"
- "brcmfmac-firmware"
- "bsdtar"
- "clevis-dracut"
- "clevis-luks"
@ -1890,48 +1847,61 @@ image_types:
- "coreos-installer"
- "coreos-installer-dracut"
- "coreutils"
- "curl"
- "device-mapper-multipath"
- "dosfstools"
- "dracut-config-generic"
- "dracut-live"
- "dracut-network"
- "e2fsprogs"
- "fcoe-utils"
- "fdo-init"
- "fedora-logos"
- "gdisk"
- "gzip"
- "hostname"
- "ima-evm-utils"
- "iproute"
- "iptables"
- "iputils"
- "iscsi-initiator-utils"
- "iwlwifi-dvm-firmware"
- "iwlwifi-mvm-firmware"
- "kernel"
- "keyutils"
- "less"
- "linux-firmware"
- "lldpad"
- "lvm2"
- "mdadm"
- "nfs-utils"
- "nss-softokn"
- "openssh-clients"
- "ostree"
- "plymouth"
- "policycoreutils"
- "policycoreutils-python-utils"
- "procps-ng"
- "realtek-firmware"
- "rng-tools"
- "rootfiles"
- "rpcbind"
- "selinux-policy-targeted"
- "setools-console"
- "shadow-utils" # includes passwd
- "sudo"
- "systemd"
- "tar"
- "traceroute"
- "util-linux"
- "shadow-utils" # includes passwd
conditions:
"dnsmasq got deprecated in f41":
when:
version_less_than: "41"
append:
include:
- "dnsmasq" # deprecated for F41+
- "xfsprogs"
- "xz"
platforms:
- <<: *x86_64_uefi_platform
packages:
<<: *x86_64_uefi_platform_packages
firmware:
- "grub2-efi-x64"
- "grub2-efi-x64-cdboot"
- "grub2-tools"
- "grub2-tools-minimal"
- "efibootmgr"
@ -1948,7 +1918,6 @@ image_types:
- "arm-image-installer"
- "bcm283x-firmware"
- "grub2-efi-aa64"
- "grub2-efi-aa64-cdboot"
- "grub2-tools"
- "grub2-tools-minimal"
- "efibootmgr"
@ -1958,3 +1927,115 @@ image_types:
- "iwlwifi-mvm-firmware"
- "realtek-firmware"
- "uboot-images-armv8"
# Based on lorax runtime-install.tmpl
"everything-netinst":
name_aliases: ["netinst"]
filename: "netinst.iso"
mime_type: "application/x-iso9660-image"
bootable: true
boot_iso: true
image_func: "netinst"
iso_label: "Everything"
variant: "Everything"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config: *default_installer_config
image_config:
locale: "en_US.UTF-8"
package_sets:
installer:
- include:
- anaconda
- anaconda-widgets
- anaconda-install-img-deps
- ostree
- rpm-ostree
- pigz
- audit
- bind-utils
- kernel
- kernel-modules
- kernel-modules-extra
- grubby
- glibc-all-langpacks
- plymouth
- anaconda-dracut
- dracut-network
- dracut-config-generic
- initscripts
- cryptsetup
- rpcbind
- kbd
- kbd-misc
- tar
- xz
- curl
- bzip2
- rsyslog
- device-mapper-persistent-data
- xfsdump
- volume_key
- nss-tools
- selinux-policy-targeted
- audit
- ethtool
- openssh-server
- nfs-utils
- openssh-clients
- tigervnc-server-minimal
- tigervnc-server-module
- net-tools
- bridge-utils
- nmap-ncat
- prefixdevname
- pciutils
- usbutils
- ipmitool
- mt-st
- smartmontools
- hdparm
- rdma-core
- rng-tools
- nvme-cli
- default-fonts-core-sans
- default-fonts-other-sans
- google-noto-sans-cjk-fonts
- gdb-gdbserver
- libreport-plugin-bugzilla
- libreport-plugin-reportuploader
- fpaste
- python3-pyatspi
- nano
- nano-default-editor
- vim-minimal
- strace
- lsof
- dump
- less
- wget2-wget
- rsync
- bind-utils
- ftp
- mtr
- vconfig
- spice-vdagent
- gdisk
- hexedit
- sg3_utils
conditions:
"x86_64 specific anaconda pkgs":
when:
arch: "x86_64"
append:
include:
- dmidecode
"aarch64 specific anaconda pkgs":
when:
arch: "aarch64"
append:
include:
- dmidecode
platforms:
- *x86_64_installer_platform
- *aarch64_installer_platform

210
vendor/github.com/osbuild/images/data/distrodefs/rhel-10/imagetypes.yaml generated vendored
View file

@ -123,7 +123,7 @@
zipl:
- "s390utils-base"
installer_config: &default_installer_config
default_installer_config: &default_installer_config
enabled_anaconda_modules: &install_config_enabled_anaconda_modules
- "org.fedoraproject.Anaconda.Modules.Network"
- "org.fedoraproject.Anaconda.Modules.Payloads"
@ -137,6 +137,14 @@
- "ipmi_msghandler"
# see commit c6bfb22f54, controls the kickstart location
iso_root_kickstart: true
default_menu: 1
iso_rootfs_type: "squashfs"
conditions:
"x86_64 uses grub2":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "grub2"
sapapps_image_config: &sapapps_image_config
selinux_config:
@ -650,6 +658,82 @@
grub2_config:
<<: *azure_common_grub2_config
terminal: ["console"]
azure_base_pkgset: &azure_base_pkgset
include:
- "@Server"
- "bzip2"
- "cloud-init"
- "cloud-utils-growpart"
- "dracut-config-generic"
- "efibootmgr"
- "hyperv-daemons"
- "langpacks-en"
- "lvm2"
- "NetworkManager"
- "NetworkManager-cloud-setup"
- "nvme-cli"
- "patch"
- "rng-tools"
- "selinux-policy-targeted"
- "system-reinstall-bootc"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
exclude:
- "aic94xx-firmware"
- "alsa-firmware"
- "alsa-lib"
- "alsa-sof-firmware"
- "alsa-tools-firmware"
- "biosdevname"
- "bolt"
- "buildah"
- "cockpit-podman"
- "containernetworking-plugins"
- "dnf-plugin-spacewalk"
- "dracut-config-rescue"
- "glibc-all-langpacks"
- "iprutils"
- "ivtv-firmware"
- "iwl100-firmware"
- "iwl1000-firmware"
- "iwl105-firmware"
- "iwl135-firmware"
- "iwl2000-firmware"
- "iwl2030-firmware"
- "iwl3160-firmware"
- "iwl3945-firmware"
- "iwl4965-firmware"
- "iwl5000-firmware"
- "iwl5150-firmware"
- "iwl6000-firmware"
- "iwl6000g2a-firmware"
- "iwl6000g2b-firmware"
- "iwl6050-firmware"
- "iwl7260-firmware"
- "libertas-sd8686-firmware"
- "libertas-sd8787-firmware"
- "libertas-usb8388-firmware"
- "microcode_ctl"
- "NetworkManager-config-server"
- "plymouth"
- "podman"
- "python3-dnf-plugin-spacewalk"
- "python3-hwdata"
- "python3-rhnlib"
- "rhn-check"
- "rhn-client-tools"
- "rhn-setup"
- "rhnlib"
- "rhnsd"
- "usb_modeswitch"
conditions:
"add insights client on rhel":
when:
distro_name: "rhel"
append:
include:
- "insights-client"
image_config:
default:
@ -732,8 +816,6 @@ image_types:
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "qcow2"]
exports: ["qcow2"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -841,8 +923,6 @@ image_types:
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vagrant", "archive"]
exports: ["archive"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -891,7 +971,6 @@ image_types:
filename: "disk.vhd"
mime_type: "application/x-vhd"
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
payload_pipelines: ["os", "image", "vpc"]
exports: ["vpc"]
# note that unlike fedora no "environment.Azure" is used here for
# unknown reasons
@ -930,89 +1009,10 @@ image_types:
<<: *default_partition_tables
package_sets:
os:
- &vhd_pkgset
include:
- "@Server"
- "bzip2"
- "cloud-init"
- "cloud-utils-growpart"
- "dracut-config-generic"
- "efibootmgr"
- "hyperv-daemons"
- "kernel-core"
- "kernel-modules"
- "kernel"
- "langpacks-en"
- "lvm2"
- "NetworkManager"
- "NetworkManager-cloud-setup"
- "nvme-cli"
- "patch"
- "rng-tools"
- "selinux-policy-targeted"
- "system-reinstall-bootc"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
exclude:
- "aic94xx-firmware"
- "alsa-firmware"
- "alsa-lib"
- "alsa-sof-firmware"
- "alsa-tools-firmware"
- "biosdevname"
- "bolt"
- "buildah"
- "cockpit-podman"
- "containernetworking-plugins"
- "dnf-plugin-spacewalk"
- "dracut-config-rescue"
- "glibc-all-langpacks"
- "iprutils"
- "ivtv-firmware"
- "iwl100-firmware"
- "iwl1000-firmware"
- "iwl105-firmware"
- "iwl135-firmware"
- "iwl2000-firmware"
- "iwl2030-firmware"
- "iwl3160-firmware"
- "iwl3945-firmware"
- "iwl4965-firmware"
- "iwl5000-firmware"
- "iwl5150-firmware"
- "iwl6000-firmware"
- "iwl6000g2a-firmware"
- "iwl6000g2b-firmware"
- "iwl6050-firmware"
- "iwl7260-firmware"
- "libertas-sd8686-firmware"
- "libertas-sd8787-firmware"
- "libertas-usb8388-firmware"
- "microcode_ctl"
- "NetworkManager-config-server"
- "plymouth"
- "podman"
- "python3-dnf-plugin-spacewalk"
- "python3-hwdata"
- "python3-rhnlib"
- "rhn-check"
- "rhn-client-tools"
- "rhn-setup"
- "rhnlib"
- "rhnsd"
- "usb_modeswitch"
conditions:
"add insights client on rhel":
when:
distro_name: "rhel"
append:
include:
- "insights-client"
- *azure_base_pkgset
"azure": &azure
<<: *vhd
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
compression: "xz"
filename: "disk.vhd.xz"
@ -1120,7 +1120,7 @@ image_types:
<<: [*image_config_vhd, *sap_image_config]
package_sets:
os:
- *vhd_pkgset
- *azure_base_pkgset
- *sap_base_pkgset
- *sap_extras_pkgset
@ -1133,15 +1133,13 @@ image_types:
<<: [*image_config_vhd, *sapapps_image_config]
package_sets:
os:
- *vhd_pkgset
- *azure_base_pkgset
- *sap_base_pkgset
tar:
filename: "root.tar.xz"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive"]
exports: ["archive"]
package_sets:
os:
@ -1163,8 +1161,6 @@ image_types:
bootable: true
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vmdk"]
exports: ["vmdk"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1194,7 +1190,6 @@ image_types:
name_aliases: ["vsphere-ova"]
filename: "image.ova"
mime_type: "application/ovf"
payload_pipelines: ["os", "image", "vmdk", "ovf", "archive"]
exports: ["archive"]
platforms:
- <<: *x86_64_bios_platform
@ -1205,8 +1200,6 @@ image_types:
filename: "image.raw"
mime_type: "application/octet-stream"
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image"]
exports: ["image"]
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
@ -1386,7 +1379,6 @@ image_types:
# we have to reset the aliases otherwise this type
# will inherit the name aliases causing a conflict
name_aliases: []
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
filename: "image.raw.xz"
compression: "xz"
@ -1442,8 +1434,6 @@ image_types:
filename: "image.wsl"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive", "xz"]
exports: ["xz"]
compression: "xz"
platforms:
@ -1574,23 +1564,8 @@ image_types:
image_func: "image_installer"
# We don't know the variant of the OS pipeline being installed
iso_label: "Unknown"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "os"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
image_config:
iso_rootfs_type: "squashfs"
conditions:
"x86_64 uses grub2":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "grub2"
installer_config: *default_installer_config
platforms:
- *x86_64_installer_platform
@ -1743,8 +1718,6 @@ image_types:
filename: "image.tar.gz"
mime_type: "application/gzip"
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "archive"]
exports: ["archive"]
bootable: true
default_size: 21_474_836_480 # 20 * datasizes.GibiByte
@ -1917,7 +1890,6 @@ image_types:
<<: *vhd
filename: "disk.vhd.xz"
mime_type: "application/xz"
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
compression: "xz"
default_size: 34_359_738_368 # 32 * datasizes.GibiByte
@ -1992,14 +1964,18 @@ image_types:
- "cloud-init"
- "cloud-utils-growpart"
- "cryptsetup"
- "langpacks-en"
- "lvm2"
- "NetworkManager-cloud-setup"
- "nvme-cli"
- "openssh-server"
- "redhat-cloud-client-configuration"
- "redhat-release"
- "tpm2-tools"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
- exclude:
exclude:
- "dracut-config-rescue"
- "grubby"
- "iwl*"

6
vendor/github.com/osbuild/images/data/distrodefs/rhel-7/imagetypes.yaml generated vendored
View file

@ -262,8 +262,6 @@ image_types:
mime_type: "application/xz"
image_func: "disk"
default_size: 68_719_476_736 # 64 * datasizes.GibiByte
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
compression: "xz"
bootable: true
@ -419,8 +417,6 @@ image_types:
filename: "image.raw.xz"
mime_type: "application/xz"
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
compression: "xz"
bootable: true
@ -576,8 +572,6 @@ image_types:
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "qcow2"]
exports: ["qcow2"]
required_partition_sizes: *default_required_dir_sizes
disk_image_part_tool: sgdisk

76
vendor/github.com/osbuild/images/data/distrodefs/rhel-8/imagetypes.yaml generated vendored
View file

@ -871,6 +871,14 @@
iso_root_kickstart: true
additional_dracut_modules:
- "ifcfg"
default_menu: 1
iso_rootfs_type: "squashfs-ext4"
conditions:
"x86_64 uses syslinux":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "syslinux"
partitioning:
ids:
@ -1275,8 +1283,6 @@ image_types:
filename: "image.raw"
mime_type: "application/octet-stream"
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image"]
exports: ["image"]
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
@ -1317,7 +1323,6 @@ image_types:
filename: "image.raw.xz"
mime_type: "application/xz"
compression: "xz"
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
image_config:
<<: *ec2_image_config
@ -1428,8 +1433,6 @@ image_types:
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "qcow2"]
exports: ["qcow2"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1477,8 +1480,6 @@ image_types:
mime_type: "application/x-vhd"
image_func: "disk"
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vpc"]
exports: ["vpc"]
bootable: true
# note that unlike fedora no "environment.Azure" is used here for
@ -1638,8 +1639,6 @@ image_types:
mime_type: "application/xz"
image_func: "disk"
default_size: 68_719_476_736 # 64 * datasizes.GibiByte
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
compression: "xz"
bootable: true
@ -1797,23 +1796,8 @@ image_types:
image_func: "image_installer"
# We don't know the variant of the OS pipeline being installed
iso_label: "Unknown"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "os"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
image_config:
iso_rootfs_type: "squashfs-ext4"
conditions:
"x86_64 uses syslinux":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "syslinux"
installer_config: *default_installer_config
platforms:
- *x86_64_installer_platform
@ -1829,8 +1813,6 @@ image_types:
filename: "root.tar.xz"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive"]
exports: ["archive"]
platforms:
- arch: "x86_64"
@ -1851,8 +1833,6 @@ image_types:
mime_type: "application/x-tar"
rpm_ostree: true
image_func: "iot_commit"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "commit-archive"]
exports: ["commit-archive"]
platforms:
- *x86_64_bios_platform
@ -2039,23 +2019,11 @@ image_types:
variant: "edge"
ostree:
name: "rhel-edge"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
image_config:
iso_rootfs_type: "squashfs-ext4"
conditions:
"x86_64 uses syslinux":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "syslinux"
installer_config: *default_installer_config
installer_config:
<<: *default_installer_config
default_menu: 0
platforms:
- *x86_64_uefi_platform
- *aarch64_platform
@ -2086,8 +2054,6 @@ image_types:
name: "rhel-edge"
remote_name: "rhel-edge"
use_ostree_remotes: true
build_pipelines: ["build"]
payload_pipelines: ["ostree-deployment", "image", "xz"]
exports: ["xz"]
platforms:
- <<: *x86_64_installer_platform
@ -2125,15 +2091,6 @@ image_types:
remote_name: "rhel-edge"
# XXX: find better name
use_ostree_remotes: true
build_pipelines: ["build"]
payload_pipelines:
- "ostree-deployment"
- "image"
- "xz"
- "coi-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config:
@ -2222,8 +2179,6 @@ image_types:
mime_type: "application/x-tar"
rpm_ostree: true
image_func: "iot_container"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "container-tree", "container"]
exports: ["container"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -2242,8 +2197,6 @@ image_types:
bootable: true
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vmdk"]
exports: ["vmdk"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -2274,7 +2227,6 @@ image_types:
name_aliases: ["vsphere-ova"]
filename: "image.ova"
mime_type: "application/ovf"
payload_pipelines: ["os", "image", "vmdk", "ovf", "archive"]
exports: ["archive"]
platforms:
- <<: *x86_64_bios_platform
@ -2287,8 +2239,6 @@ image_types:
filename: "image.tar.gz"
mime_type: "application/gzip"
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "archive"]
exports: ["archive"]
bootable: true
default_size: 21_474_836_480 # 20 * datasizes.GibiByte
@ -2456,8 +2406,6 @@ image_types:
filename: "image.wsl"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive", "xz"]
exports: ["xz"]
compression: "xz"
platforms:
@ -2582,8 +2530,6 @@ image_types:
bootable: true
default_size: 2_147_483_648 # 2 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
required_partition_sizes: *default_required_dir_sizes
image_config:

245
vendor/github.com/osbuild/images/data/distrodefs/rhel-9/imagetypes.yaml generated vendored
View file

@ -202,6 +202,84 @@
append:
include:
- "system-reinstall-bootc"
azure_base_pkgset: &azure_base_pkgset
include:
- "@Server"
- "bzip2"
- "cloud-init"
- "cloud-utils-growpart"
- "dracut-config-generic"
- "efibootmgr"
- "gdisk"
- "hyperv-daemons"
- "langpacks-en"
- "lvm2"
- "NetworkManager"
- "NetworkManager-cloud-setup"
- "nvme-cli"
- "patch"
- "rng-tools"
- "selinux-policy-targeted"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
exclude:
- "aic94xx-firmware"
- "alsa-firmware"
- "alsa-lib"
- "alsa-sof-firmware"
- "alsa-tools-firmware"
- "biosdevname"
- "bolt"
- "buildah"
- "cockpit-podman"
- "containernetworking-plugins"
- "dnf-plugin-spacewalk"
- "dracut-config-rescue"
- "glibc-all-langpacks"
- "iprutils"
- "ivtv-firmware"
- "iwl100-firmware"
- "iwl1000-firmware"
- "iwl105-firmware"
- "iwl135-firmware"
- "iwl2000-firmware"
- "iwl2030-firmware"
- "iwl3160-firmware"
- "iwl3945-firmware"
- "iwl4965-firmware"
- "iwl5000-firmware"
- "iwl5150-firmware"
- "iwl6000-firmware"
- "iwl6000g2a-firmware"
- "iwl6000g2b-firmware"
- "iwl6050-firmware"
- "iwl7260-firmware"
- "libertas-sd8686-firmware"
- "libertas-sd8787-firmware"
- "libertas-usb8388-firmware"
- "NetworkManager-config-server"
- "plymouth"
- "podman"
- "python3-dnf-plugin-spacewalk"
- "python3-hwdata"
- "python3-rhnlib"
- "rhn-check"
- "rhn-client-tools"
- "rhn-setup"
- "rhnlib"
- "rhnsd"
- "usb_modeswitch"
conditions:
<<: *conditions_pkgsets_insights_client_on_rhel
"rhel-9.6+ gets system-reinstall-bootc and drops microcode_ctl":
when:
version_greater_or_equal: "9.6"
append:
include:
- "system-reinstall-bootc"
exclude:
- "microcode_ctl"
sapapps_image_config: &sapapps_image_config
selinux_config:
@ -1088,6 +1166,13 @@
- "cuse"
- "ipmi_devintf"
- "ipmi_msghandler"
default_menu: 1
conditions:
"x86_64 uses syslinux":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "syslinux"
image_config:
default:
@ -1172,8 +1257,6 @@ image_types:
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "qcow2"]
exports: ["qcow2"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1285,8 +1368,6 @@ image_types:
bootable: true
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vagrant", "archive"]
exports: ["archive"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1335,7 +1416,6 @@ image_types:
filename: "disk.vhd"
mime_type: "application/x-vhd"
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
payload_pipelines: ["os", "image", "vpc"]
exports: ["vpc"]
platforms:
- <<: *x86_64_bios_platform
@ -1378,92 +1458,11 @@ image_types:
<<: *default_partition_tables
package_sets:
os:
- &vhd_pkgset
include:
- "@Server"
- "bzip2"
- "cloud-init"
- "cloud-utils-growpart"
- "dracut-config-generic"
- "efibootmgr"
- "gdisk"
- "hyperv-daemons"
- "kernel-core"
- "kernel-modules"
- "kernel"
- "langpacks-en"
- "lvm2"
- "NetworkManager"
- "NetworkManager-cloud-setup"
- "nvme-cli"
- "patch"
- "rng-tools"
- "selinux-policy-targeted"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
exclude:
- "aic94xx-firmware"
- "alsa-firmware"
- "alsa-lib"
- "alsa-sof-firmware"
- "alsa-tools-firmware"
- "biosdevname"
- "bolt"
- "buildah"
- "cockpit-podman"
- "containernetworking-plugins"
- "dnf-plugin-spacewalk"
- "dracut-config-rescue"
- "glibc-all-langpacks"
- "iprutils"
- "ivtv-firmware"
- "iwl100-firmware"
- "iwl1000-firmware"
- "iwl105-firmware"
- "iwl135-firmware"
- "iwl2000-firmware"
- "iwl2030-firmware"
- "iwl3160-firmware"
- "iwl3945-firmware"
- "iwl4965-firmware"
- "iwl5000-firmware"
- "iwl5150-firmware"
- "iwl6000-firmware"
- "iwl6000g2a-firmware"
- "iwl6000g2b-firmware"
- "iwl6050-firmware"
- "iwl7260-firmware"
- "libertas-sd8686-firmware"
- "libertas-sd8787-firmware"
- "libertas-usb8388-firmware"
- "NetworkManager-config-server"
- "plymouth"
- "podman"
- "python3-dnf-plugin-spacewalk"
- "python3-hwdata"
- "python3-rhnlib"
- "rhn-check"
- "rhn-client-tools"
- "rhn-setup"
- "rhnlib"
- "rhnsd"
- "usb_modeswitch"
conditions:
<<: *conditions_pkgsets_insights_client_on_rhel
"rhel-9.6+ gets system-reinstall-bootc and drops microcode_ctl":
when:
version_greater_or_equal: "9.6"
append:
include:
- "system-reinstall-bootc"
exclude:
- "microcode_ctl"
- *azure_base_pkgset
"azure": &azure
<<: *vhd
mime_type: "application/xz"
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
compression: "xz"
filename: "disk.vhd.xz"
@ -1628,7 +1627,7 @@ image_types:
<<: [*image_config_vhd, *sap_image_config]
package_sets:
os:
- *vhd_pkgset
- *azure_base_pkgset
- *sap_base_pkgset
- *sap_extras_pkgset
@ -1641,15 +1640,13 @@ image_types:
<<: [*image_config_vhd, *sapapps_image_config]
package_sets:
os:
- *vhd_pkgset
- *azure_base_pkgset
- *sap_base_pkgset
tar:
filename: "root.tar.xz"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive"]
exports: ["archive"]
platforms:
- arch: "x86_64"
@ -1671,8 +1668,6 @@ image_types:
bootable: true
default_size: 4_294_967_296 # 4 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "vmdk"]
exports: ["vmdk"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -1702,7 +1697,6 @@ image_types:
name_aliases: ["vsphere-ova"]
filename: "image.ova"
mime_type: "application/ovf"
payload_pipelines: ["os", "image", "vmdk", "ovf", "archive"]
exports: ["archive"]
platforms:
- <<: *x86_64_bios_platform
@ -1711,8 +1705,6 @@ image_types:
ec2: &ec2
filename: "image.raw.xz"
mime_type: "application/xz"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
compression: "xz"
image_func: "disk"
@ -1860,7 +1852,6 @@ image_types:
name_aliases: ["aws"]
mime_type: "application/octet-stream"
filename: "image.raw"
payload_pipelines: ["os", "image"]
exports: ["image"]
compression: ""
@ -1939,8 +1930,6 @@ image_types:
filename: "image.wsl"
mime_type: "application/x-tar"
image_func: "tar"
build_pipelines: ["build"]
payload_pipelines: ["os", "archive"]
exports: ["xz"]
compression: "xz"
platforms:
@ -2067,13 +2056,6 @@ image_types:
image_func: "image_installer"
# We don't know the variant of the OS pipeline being installed
iso_label: "Unknown"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "os"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -2092,12 +2074,6 @@ image_types:
installer_config: *default_installer_config
image_config:
locale: "C.UTF-8"
conditions:
"x86_64 uses syslinux":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "syslinux"
package_sets:
<<: *bare_metal_pkgset
installer:
@ -2111,8 +2087,6 @@ image_types:
filename: "image.tar.gz"
mime_type: "application/gzip"
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "archive"]
exports: ["archive"]
bootable: true
default_size: 21_474_836_480 # 20 * datasizes.GibiByte
@ -2271,8 +2245,6 @@ image_types:
bootable: true
default_size: 2_147_483_648 # 2 * datasizes.GibiByte
image_func: "disk"
build_pipelines: ["build"]
payload_pipelines: ["os", "image", "xz"]
exports: ["xz"]
required_partition_sizes: *default_required_dir_sizes
platforms:
@ -2408,8 +2380,6 @@ image_types:
mime_type: "application/x-tar"
rpm_ostree: true
image_func: "iot_commit"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "commit-archive"]
exports: ["commit-archive"]
platforms:
- *x86_64_bios_platform
@ -2581,8 +2551,6 @@ image_types:
mime_type: "application/x-tar"
rpm_ostree: true
image_func: "iot_container"
build_pipelines: ["build"]
payload_pipelines: ["os", "ostree-commit", "container-tree", "container"]
exports: ["container"]
<<: *edge_commit
@ -2591,8 +2559,6 @@ image_types:
filename: "image.raw.xz"
compression: "xz"
mime_type: "application/xz"
build_pipelines: ["build"]
payload_pipelines: ["ostree-deployment", "image", "xz"]
exports: ["xz"]
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
rpm_ostree: true
@ -2651,27 +2617,17 @@ image_types:
variant: "edge"
ostree:
name: "rhel-edge"
build_pipelines: ["build"]
payload_pipelines:
- "anaconda-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
platforms:
- *x86_64_uefi_platform
- *aarch64_platform
installer_config: *default_installer_config
installer_config:
<<: *default_installer_config
default_menu: 0
image_config:
enabled_services: *enabled_services_edge
locale: "en_US.UTF-8"
conditions:
"x86_64 uses syslinux":
when:
arch: "x86_64"
shallow_merge:
iso_boot_type: "syslinux"
package_sets:
installer:
- *installer_pkgset
@ -2697,15 +2653,6 @@ image_types:
remote_name: "rhel-edge"
# XXX: find better name
use_ostree_remotes: true
build_pipelines: ["build"]
payload_pipelines:
- "ostree-deployment"
- "image"
- "xz"
- "coi-tree"
- "efiboot-tree"
- "bootiso-tree"
- "bootiso"
exports: ["bootiso"]
required_partition_sizes: *default_required_dir_sizes
installer_config:
@ -2797,8 +2744,6 @@ image_types:
filename: "image.raw"
mime_type: "application/octet-stream"
default_size: 10_737_418_240 # 10 * datasizes.GibiByte
build_pipelines: ["build"]
payload_pipelines: ["ostree-deployment", "image"]
exports: ["image"]
rpm_ostree: true
bootable: true
@ -2853,7 +2798,6 @@ image_types:
<<: *edge_ami
filename: "image.vmdk"
mime_type: "application/x-vmdk"
payload_pipelines: ["ostree-deployment", "image", "vmdk"]
exports: ["vmdk"]
platforms:
- <<: *x86_64_bios_platform
@ -2880,7 +2824,6 @@ image_types:
<<: *vhd
filename: "disk.vhd.xz"
mime_type: "application/xz"
payload_pipelines: ["os", "image", "vpc", "xz"]
exports: ["xz"]
compression: "xz"
default_size: 34_359_738_368 # 32 * datasizes.GibiByte
@ -2956,14 +2899,18 @@ image_types:
- "cloud-init"
- "cloud-utils-growpart"
- "cryptsetup"
- "langpacks-en"
- "lvm2"
- "NetworkManager-cloud-setup"
- "nvme-cli"
- "openssh-server"
- "redhat-cloud-client-configuration"
- "redhat-release"
- "tpm2-tools"
- "uuid"
- "WALinuxAgent"
- "yum-utils"
- exclude:
exclude:
- "dracut-config-rescue"
- "iwl*"
- "linux-firmware*"

8
vendor/github.com/osbuild/images/data/repositories/fedora-43.json generated vendored
View file

@ -2,7 +2,7 @@
"x86_64": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=x86_64",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-43&arch=x86_64",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGa23M8BEAC47NwKLi/g2S9I2p5JtUbJ0y3m2St9zqkSENmYw/+R+WKvaP3S\nKSFQF3Qi6pqGXJ88ADJUkFYpOGGyoc0dieLCmIPqtWbwGvBVMxBRBeU3+hClwbSQ\nsysVnr8VxUwidfsIjNJavCZwB0ZoZbxdCPMQMOgQyTLX4OI/uKlPUzeymDHwxjb/\ntllflSTOGtdYe3giRzidxN+xbCb6UoXkl0+lJEFbsmp41O5D/Ur5N05lBrsEXoDu\nFr99Kfv3Av7f3JfzDlkqC/EhmfxZEZvWj3hRdAfi2fFmtVcrdLfGIpQg6Y2Baphp\nPhaHqKl9zD5GWqu5GSXGoLaGXusBvwBKjS/g+VLo7pJfMsUF3sUduJNG3UThAsrp\nQLV3wQz0AMHVElRErOWdBDY0ddAKLPL7/mtxj39pGEpZ/dNtQkzgm7VCdP10QnQZ\nrwR2l8k7CPu0pylPCXmXvKFWV1uv9RnztlWY6BRmufKn+lJsN3Blh7ndi5rlCjR6\nmHVrQD/l6+8VmSD3/mDnbEXPyzBkSY5D1wpR7M5VXN5jVHROc4ZA5M88SyI48ESG\nNmeAwtGar45/X+wG47+EC4+JXpNO7BQrEvHgJxBdyoQ6KLDrEaqn/OQpxB4Gfmcv\nSwkWDpSk8wFm/pGlFK6J4b+ba7eOetW+aXrWSiFB1sTAg0OY+gds67OpWQARAQAB\ntDFGZWRvcmEgKDQzKSA8ZmVkb3JhLTQzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEExufwgc+A4TFGZ26IgptgZjFkVTEFAma23M8CGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEIKbYGYxZFUxagQP/RYWw5j0Gfvv\nlWkDQTjTVAnHtbKuQLYM13Lx5d3W1k0g6Xdrolf4yPjh4YPYVQDXksB4i6ULLbMo\n8u46UCPMQwCXTd3Ax9imYn+V74Isl/CkBbKQD9YfSJjhW3mSlPa27jo2uhqpdV0S\nxp05NWYnWrZN+GbtCUs1+rNTBevagOURtlZ8f0iPVRA/PxWzpjbRaGrCHlIYc3JO\nGKLUuQueLvOUg2pP8dtpll7S3xUe5Abyq2ifT34T0wHi6hJA3bfpXo1uNXRvGrNw\ngbJ7V6P7ioTcvyhS1h4zjelKFyvTnOKOy5D08HKmvTMWZQWEL7kDNymh1jMV7Abg\n4TPp808EiPF1GGAzXU56feaURSvIuix3MkjhGZsSQQH2kkkEIzq6j/EwmpyEMW38\ndtql4T2bVS/cTk/hRaqUKZlyrsL657g/4mFA1wDDM3895fYkHOpYF4JZ9SeDrhuc\nTgpC7/TW55l6vSiFtnQvcMfjpfCA6mCA4b75k+/xG9RxxBnYU0qVuUo/8pON31yQ\nD2AM2v7WbJBYVRYLlqPrkAZU5fe7+2wY7P7N0IAPwVA0TFJ1x6as3Kezdi/304mg\noC98DBLjHaUpX2bTxKMtCzlmeqPiwtyNkA9O9IQO7qQzArBKxmAgof4wblN5SL8i\nfsjiJUqsK/gTYwJ744I/tzxOy5FXjA7z\n=Bqds\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}
@ -10,7 +10,7 @@
"aarch64": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=aarch64",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-43&arch=aarch64",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGa23M8BEAC47NwKLi/g2S9I2p5JtUbJ0y3m2St9zqkSENmYw/+R+WKvaP3S\nKSFQF3Qi6pqGXJ88ADJUkFYpOGGyoc0dieLCmIPqtWbwGvBVMxBRBeU3+hClwbSQ\nsysVnr8VxUwidfsIjNJavCZwB0ZoZbxdCPMQMOgQyTLX4OI/uKlPUzeymDHwxjb/\ntllflSTOGtdYe3giRzidxN+xbCb6UoXkl0+lJEFbsmp41O5D/Ur5N05lBrsEXoDu\nFr99Kfv3Av7f3JfzDlkqC/EhmfxZEZvWj3hRdAfi2fFmtVcrdLfGIpQg6Y2Baphp\nPhaHqKl9zD5GWqu5GSXGoLaGXusBvwBKjS/g+VLo7pJfMsUF3sUduJNG3UThAsrp\nQLV3wQz0AMHVElRErOWdBDY0ddAKLPL7/mtxj39pGEpZ/dNtQkzgm7VCdP10QnQZ\nrwR2l8k7CPu0pylPCXmXvKFWV1uv9RnztlWY6BRmufKn+lJsN3Blh7ndi5rlCjR6\nmHVrQD/l6+8VmSD3/mDnbEXPyzBkSY5D1wpR7M5VXN5jVHROc4ZA5M88SyI48ESG\nNmeAwtGar45/X+wG47+EC4+JXpNO7BQrEvHgJxBdyoQ6KLDrEaqn/OQpxB4Gfmcv\nSwkWDpSk8wFm/pGlFK6J4b+ba7eOetW+aXrWSiFB1sTAg0OY+gds67OpWQARAQAB\ntDFGZWRvcmEgKDQzKSA8ZmVkb3JhLTQzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEExufwgc+A4TFGZ26IgptgZjFkVTEFAma23M8CGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEIKbYGYxZFUxagQP/RYWw5j0Gfvv\nlWkDQTjTVAnHtbKuQLYM13Lx5d3W1k0g6Xdrolf4yPjh4YPYVQDXksB4i6ULLbMo\n8u46UCPMQwCXTd3Ax9imYn+V74Isl/CkBbKQD9YfSJjhW3mSlPa27jo2uhqpdV0S\nxp05NWYnWrZN+GbtCUs1+rNTBevagOURtlZ8f0iPVRA/PxWzpjbRaGrCHlIYc3JO\nGKLUuQueLvOUg2pP8dtpll7S3xUe5Abyq2ifT34T0wHi6hJA3bfpXo1uNXRvGrNw\ngbJ7V6P7ioTcvyhS1h4zjelKFyvTnOKOy5D08HKmvTMWZQWEL7kDNymh1jMV7Abg\n4TPp808EiPF1GGAzXU56feaURSvIuix3MkjhGZsSQQH2kkkEIzq6j/EwmpyEMW38\ndtql4T2bVS/cTk/hRaqUKZlyrsL657g/4mFA1wDDM3895fYkHOpYF4JZ9SeDrhuc\nTgpC7/TW55l6vSiFtnQvcMfjpfCA6mCA4b75k+/xG9RxxBnYU0qVuUo/8pON31yQ\nD2AM2v7WbJBYVRYLlqPrkAZU5fe7+2wY7P7N0IAPwVA0TFJ1x6as3Kezdi/304mg\noC98DBLjHaUpX2bTxKMtCzlmeqPiwtyNkA9O9IQO7qQzArBKxmAgof4wblN5SL8i\nfsjiJUqsK/gTYwJ744I/tzxOy5FXjA7z\n=Bqds\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}
@ -18,7 +18,7 @@
"ppc64le": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=ppc64le",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-43&arch=ppc64le",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGa23M8BEAC47NwKLi/g2S9I2p5JtUbJ0y3m2St9zqkSENmYw/+R+WKvaP3S\nKSFQF3Qi6pqGXJ88ADJUkFYpOGGyoc0dieLCmIPqtWbwGvBVMxBRBeU3+hClwbSQ\nsysVnr8VxUwidfsIjNJavCZwB0ZoZbxdCPMQMOgQyTLX4OI/uKlPUzeymDHwxjb/\ntllflSTOGtdYe3giRzidxN+xbCb6UoXkl0+lJEFbsmp41O5D/Ur5N05lBrsEXoDu\nFr99Kfv3Av7f3JfzDlkqC/EhmfxZEZvWj3hRdAfi2fFmtVcrdLfGIpQg6Y2Baphp\nPhaHqKl9zD5GWqu5GSXGoLaGXusBvwBKjS/g+VLo7pJfMsUF3sUduJNG3UThAsrp\nQLV3wQz0AMHVElRErOWdBDY0ddAKLPL7/mtxj39pGEpZ/dNtQkzgm7VCdP10QnQZ\nrwR2l8k7CPu0pylPCXmXvKFWV1uv9RnztlWY6BRmufKn+lJsN3Blh7ndi5rlCjR6\nmHVrQD/l6+8VmSD3/mDnbEXPyzBkSY5D1wpR7M5VXN5jVHROc4ZA5M88SyI48ESG\nNmeAwtGar45/X+wG47+EC4+JXpNO7BQrEvHgJxBdyoQ6KLDrEaqn/OQpxB4Gfmcv\nSwkWDpSk8wFm/pGlFK6J4b+ba7eOetW+aXrWSiFB1sTAg0OY+gds67OpWQARAQAB\ntDFGZWRvcmEgKDQzKSA8ZmVkb3JhLTQzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEExufwgc+A4TFGZ26IgptgZjFkVTEFAma23M8CGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEIKbYGYxZFUxagQP/RYWw5j0Gfvv\nlWkDQTjTVAnHtbKuQLYM13Lx5d3W1k0g6Xdrolf4yPjh4YPYVQDXksB4i6ULLbMo\n8u46UCPMQwCXTd3Ax9imYn+V74Isl/CkBbKQD9YfSJjhW3mSlPa27jo2uhqpdV0S\nxp05NWYnWrZN+GbtCUs1+rNTBevagOURtlZ8f0iPVRA/PxWzpjbRaGrCHlIYc3JO\nGKLUuQueLvOUg2pP8dtpll7S3xUe5Abyq2ifT34T0wHi6hJA3bfpXo1uNXRvGrNw\ngbJ7V6P7ioTcvyhS1h4zjelKFyvTnOKOy5D08HKmvTMWZQWEL7kDNymh1jMV7Abg\n4TPp808EiPF1GGAzXU56feaURSvIuix3MkjhGZsSQQH2kkkEIzq6j/EwmpyEMW38\ndtql4T2bVS/cTk/hRaqUKZlyrsL657g/4mFA1wDDM3895fYkHOpYF4JZ9SeDrhuc\nTgpC7/TW55l6vSiFtnQvcMfjpfCA6mCA4b75k+/xG9RxxBnYU0qVuUo/8pON31yQ\nD2AM2v7WbJBYVRYLlqPrkAZU5fe7+2wY7P7N0IAPwVA0TFJ1x6as3Kezdi/304mg\noC98DBLjHaUpX2bTxKMtCzlmeqPiwtyNkA9O9IQO7qQzArBKxmAgof4wblN5SL8i\nfsjiJUqsK/gTYwJ744I/tzxOy5FXjA7z\n=Bqds\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}
@ -26,7 +26,7 @@
"s390x": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=s390x",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-43&arch=s390x",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGa23M8BEAC47NwKLi/g2S9I2p5JtUbJ0y3m2St9zqkSENmYw/+R+WKvaP3S\nKSFQF3Qi6pqGXJ88ADJUkFYpOGGyoc0dieLCmIPqtWbwGvBVMxBRBeU3+hClwbSQ\nsysVnr8VxUwidfsIjNJavCZwB0ZoZbxdCPMQMOgQyTLX4OI/uKlPUzeymDHwxjb/\ntllflSTOGtdYe3giRzidxN+xbCb6UoXkl0+lJEFbsmp41O5D/Ur5N05lBrsEXoDu\nFr99Kfv3Av7f3JfzDlkqC/EhmfxZEZvWj3hRdAfi2fFmtVcrdLfGIpQg6Y2Baphp\nPhaHqKl9zD5GWqu5GSXGoLaGXusBvwBKjS/g+VLo7pJfMsUF3sUduJNG3UThAsrp\nQLV3wQz0AMHVElRErOWdBDY0ddAKLPL7/mtxj39pGEpZ/dNtQkzgm7VCdP10QnQZ\nrwR2l8k7CPu0pylPCXmXvKFWV1uv9RnztlWY6BRmufKn+lJsN3Blh7ndi5rlCjR6\nmHVrQD/l6+8VmSD3/mDnbEXPyzBkSY5D1wpR7M5VXN5jVHROc4ZA5M88SyI48ESG\nNmeAwtGar45/X+wG47+EC4+JXpNO7BQrEvHgJxBdyoQ6KLDrEaqn/OQpxB4Gfmcv\nSwkWDpSk8wFm/pGlFK6J4b+ba7eOetW+aXrWSiFB1sTAg0OY+gds67OpWQARAQAB\ntDFGZWRvcmEgKDQzKSA8ZmVkb3JhLTQzLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEExufwgc+A4TFGZ26IgptgZjFkVTEFAma23M8CGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJEIKbYGYxZFUxagQP/RYWw5j0Gfvv\nlWkDQTjTVAnHtbKuQLYM13Lx5d3W1k0g6Xdrolf4yPjh4YPYVQDXksB4i6ULLbMo\n8u46UCPMQwCXTd3Ax9imYn+V74Isl/CkBbKQD9YfSJjhW3mSlPa27jo2uhqpdV0S\nxp05NWYnWrZN+GbtCUs1+rNTBevagOURtlZ8f0iPVRA/PxWzpjbRaGrCHlIYc3JO\nGKLUuQueLvOUg2pP8dtpll7S3xUe5Abyq2ifT34T0wHi6hJA3bfpXo1uNXRvGrNw\ngbJ7V6P7ioTcvyhS1h4zjelKFyvTnOKOy5D08HKmvTMWZQWEL7kDNymh1jMV7Abg\n4TPp808EiPF1GGAzXU56feaURSvIuix3MkjhGZsSQQH2kkkEIzq6j/EwmpyEMW38\ndtql4T2bVS/cTk/hRaqUKZlyrsL657g/4mFA1wDDM3895fYkHOpYF4JZ9SeDrhuc\nTgpC7/TW55l6vSiFtnQvcMfjpfCA6mCA4b75k+/xG9RxxBnYU0qVuUo/8pON31yQ\nD2AM2v7WbJBYVRYLlqPrkAZU5fe7+2wY7P7N0IAPwVA0TFJ1x6as3Kezdi/304mg\noC98DBLjHaUpX2bTxKMtCzlmeqPiwtyNkA9O9IQO7qQzArBKxmAgof4wblN5SL8i\nfsjiJUqsK/gTYwJ744I/tzxOy5FXjA7z\n=Bqds\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}

8
vendor/github.com/osbuild/images/data/repositories/fedora-44.json generated vendored
View file

@ -2,7 +2,7 @@
"x86_64": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=x86_64",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=x86_64",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGeGrzsBEAC4UV5Ij9oz6h6abEKIRoiezttFfnLhwOAfE9tWtfIFMRmhY91u\nL88PKf12n2xHBd3oc5ahBzGeTBhaMV+VJAppoQMSOIMI5q966D9GQ0LkJT+E5bwn\nxGRJKp7qccevh2KFOUt2vHtFskhDOuAIupoKfo5FgI9PkvAVBsrUpO/22yjNv0V/\naeDXxZhRX8m/8FKJ77VcZtBRPcp7M41bCmW9gV9IDpD81hAdTjYoQr1Y3KU0FTm5\nW4l1mf9mZcKMskOk08TyzQeC2YRB20EYRK439XCGJ4P7BFiOl96EbPpky2pHe2FV\nAvX474o3QEecTK3KxZrsRjmXOqpjRPy5YyMfKEYBM9j3zBDvpDFk79Mfuw5n2Nr5\nU4Wn/rqfhKLUKkfpfCow97nzq8NqynwS09yVobIfjHCKRtjwun6ife+s7R4L2nAu\nrTWPAHqzIjjW5nnjaFtoSulIadVKx+KibKajA6gRAc6K7xMyMTHfqZeTAIcawvX6\nh2d/nd8xCfogM5FTI5obNSUVNaMv5vQg6vcV1fb6oRgodF0Bi+1dssq5EMQpHFJM\nnIQ5NVwuzSjCLt3X2mWUp0mfIt2K9oBpBct12uXho7Nm1bSC5UFNYsvw+rj6vTqZ\nilK9pyfcYmELv7a/NPkyuACsBFGoc66nBfrEvk57kW9FaJK9mjSqGftykQARAQAB\ntDFGZWRvcmEgKDQ0KSA8ZmVkb3JhLTQ0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEENvYS3PJ/fRpIqDXk2/z3HG2fkKYFAmeGrzsCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJENv89xxtn5CmIU0P/iaFVxJjVi4P\nyu8A04PbdGy2vuBBCceIjYn5HaMDwJMRjdJT6uMS494pSKNEl/JJ8K5rRdigfUV1\n2Z22X3kI5aNb4k2wpaPg5Xq0JQS9FvG4Pjm//kNy5WplmEA8HVg4MVkvySWiXay4\n+tkCelhE8aQDstYEm3uh+lZ6udgoInfprwFMn6H+8RXkakTW1z5NkuAA8PpMDA9o\nSOFc4Hk6bhE6exEp4VNwBEkxwh4z9CGjarlXL4QEyM1UK60vtbXIHVjITjFfKVQP\nj6ifdn5X69oSuK+1mUFXEV+l9pc1mVjTVTwOrG3EMBsoekFyICp1pPtfMo1dxBed\nR8BFHqQFsFdmIG+59ycFznFOXzDRfaVn6OTEAk7T8nDqnpe/T4GlybLYic6KMKcM\nnbMLaJZjHZ97qJb5Scpsd1TWB5TDERi4VPB7NAVC/EwxMPC3IJUbRej/s05gNjg0\n+2yyuV/U/DDnNGWnLTJDFLUaE8HhQBMvNSfmdMA47mo5CCuYmpzX/3M9vlVsv8/R\nxJBxFLIj9VFCPFNgXPeu9gyyytXeWgsIpDzMNJil9tgbBuQ1dX5GFMkWtK/kPexM\nKfiSU0JgJFfFSm0OKI/KXcRlbA1zP3IF+2YwbL+P5ePinHsDiAPLCQt/dWgw2tfB\nZZLj9c3Ukew6Qobuy3V1knl564qQ6wjf\n=1m7R\n-----END PGP PUBLIC KEY BLOCK-----",
"check_gpg": true
}
@ -10,7 +10,7 @@
"aarch64": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=aarch64",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=aarch64",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGeGrzsBEAC4UV5Ij9oz6h6abEKIRoiezttFfnLhwOAfE9tWtfIFMRmhY91u\nL88PKf12n2xHBd3oc5ahBzGeTBhaMV+VJAppoQMSOIMI5q966D9GQ0LkJT+E5bwn\nxGRJKp7qccevh2KFOUt2vHtFskhDOuAIupoKfo5FgI9PkvAVBsrUpO/22yjNv0V/\naeDXxZhRX8m/8FKJ77VcZtBRPcp7M41bCmW9gV9IDpD81hAdTjYoQr1Y3KU0FTm5\nW4l1mf9mZcKMskOk08TyzQeC2YRB20EYRK439XCGJ4P7BFiOl96EbPpky2pHe2FV\nAvX474o3QEecTK3KxZrsRjmXOqpjRPy5YyMfKEYBM9j3zBDvpDFk79Mfuw5n2Nr5\nU4Wn/rqfhKLUKkfpfCow97nzq8NqynwS09yVobIfjHCKRtjwun6ife+s7R4L2nAu\nrTWPAHqzIjjW5nnjaFtoSulIadVKx+KibKajA6gRAc6K7xMyMTHfqZeTAIcawvX6\nh2d/nd8xCfogM5FTI5obNSUVNaMv5vQg6vcV1fb6oRgodF0Bi+1dssq5EMQpHFJM\nnIQ5NVwuzSjCLt3X2mWUp0mfIt2K9oBpBct12uXho7Nm1bSC5UFNYsvw+rj6vTqZ\nilK9pyfcYmELv7a/NPkyuACsBFGoc66nBfrEvk57kW9FaJK9mjSqGftykQARAQAB\ntDFGZWRvcmEgKDQ0KSA8ZmVkb3JhLTQ0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEENvYS3PJ/fRpIqDXk2/z3HG2fkKYFAmeGrzsCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJENv89xxtn5CmIU0P/iaFVxJjVi4P\nyu8A04PbdGy2vuBBCceIjYn5HaMDwJMRjdJT6uMS494pSKNEl/JJ8K5rRdigfUV1\n2Z22X3kI5aNb4k2wpaPg5Xq0JQS9FvG4Pjm//kNy5WplmEA8HVg4MVkvySWiXay4\n+tkCelhE8aQDstYEm3uh+lZ6udgoInfprwFMn6H+8RXkakTW1z5NkuAA8PpMDA9o\nSOFc4Hk6bhE6exEp4VNwBEkxwh4z9CGjarlXL4QEyM1UK60vtbXIHVjITjFfKVQP\nj6ifdn5X69oSuK+1mUFXEV+l9pc1mVjTVTwOrG3EMBsoekFyICp1pPtfMo1dxBed\nR8BFHqQFsFdmIG+59ycFznFOXzDRfaVn6OTEAk7T8nDqnpe/T4GlybLYic6KMKcM\nnbMLaJZjHZ97qJb5Scpsd1TWB5TDERi4VPB7NAVC/EwxMPC3IJUbRej/s05gNjg0\n+2yyuV/U/DDnNGWnLTJDFLUaE8HhQBMvNSfmdMA47mo5CCuYmpzX/3M9vlVsv8/R\nxJBxFLIj9VFCPFNgXPeu9gyyytXeWgsIpDzMNJil9tgbBuQ1dX5GFMkWtK/kPexM\nKfiSU0JgJFfFSm0OKI/KXcRlbA1zP3IF+2YwbL+P5ePinHsDiAPLCQt/dWgw2tfB\nZZLj9c3Ukew6Qobuy3V1knl564qQ6wjf\n=1m7R\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}
@ -18,7 +18,7 @@
"ppc64le": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=ppc64le",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=ppc64le",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGeGrzsBEAC4UV5Ij9oz6h6abEKIRoiezttFfnLhwOAfE9tWtfIFMRmhY91u\nL88PKf12n2xHBd3oc5ahBzGeTBhaMV+VJAppoQMSOIMI5q966D9GQ0LkJT+E5bwn\nxGRJKp7qccevh2KFOUt2vHtFskhDOuAIupoKfo5FgI9PkvAVBsrUpO/22yjNv0V/\naeDXxZhRX8m/8FKJ77VcZtBRPcp7M41bCmW9gV9IDpD81hAdTjYoQr1Y3KU0FTm5\nW4l1mf9mZcKMskOk08TyzQeC2YRB20EYRK439XCGJ4P7BFiOl96EbPpky2pHe2FV\nAvX474o3QEecTK3KxZrsRjmXOqpjRPy5YyMfKEYBM9j3zBDvpDFk79Mfuw5n2Nr5\nU4Wn/rqfhKLUKkfpfCow97nzq8NqynwS09yVobIfjHCKRtjwun6ife+s7R4L2nAu\nrTWPAHqzIjjW5nnjaFtoSulIadVKx+KibKajA6gRAc6K7xMyMTHfqZeTAIcawvX6\nh2d/nd8xCfogM5FTI5obNSUVNaMv5vQg6vcV1fb6oRgodF0Bi+1dssq5EMQpHFJM\nnIQ5NVwuzSjCLt3X2mWUp0mfIt2K9oBpBct12uXho7Nm1bSC5UFNYsvw+rj6vTqZ\nilK9pyfcYmELv7a/NPkyuACsBFGoc66nBfrEvk57kW9FaJK9mjSqGftykQARAQAB\ntDFGZWRvcmEgKDQ0KSA8ZmVkb3JhLTQ0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEENvYS3PJ/fRpIqDXk2/z3HG2fkKYFAmeGrzsCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJENv89xxtn5CmIU0P/iaFVxJjVi4P\nyu8A04PbdGy2vuBBCceIjYn5HaMDwJMRjdJT6uMS494pSKNEl/JJ8K5rRdigfUV1\n2Z22X3kI5aNb4k2wpaPg5Xq0JQS9FvG4Pjm//kNy5WplmEA8HVg4MVkvySWiXay4\n+tkCelhE8aQDstYEm3uh+lZ6udgoInfprwFMn6H+8RXkakTW1z5NkuAA8PpMDA9o\nSOFc4Hk6bhE6exEp4VNwBEkxwh4z9CGjarlXL4QEyM1UK60vtbXIHVjITjFfKVQP\nj6ifdn5X69oSuK+1mUFXEV+l9pc1mVjTVTwOrG3EMBsoekFyICp1pPtfMo1dxBed\nR8BFHqQFsFdmIG+59ycFznFOXzDRfaVn6OTEAk7T8nDqnpe/T4GlybLYic6KMKcM\nnbMLaJZjHZ97qJb5Scpsd1TWB5TDERi4VPB7NAVC/EwxMPC3IJUbRej/s05gNjg0\n+2yyuV/U/DDnNGWnLTJDFLUaE8HhQBMvNSfmdMA47mo5CCuYmpzX/3M9vlVsv8/R\nxJBxFLIj9VFCPFNgXPeu9gyyytXeWgsIpDzMNJil9tgbBuQ1dX5GFMkWtK/kPexM\nKfiSU0JgJFfFSm0OKI/KXcRlbA1zP3IF+2YwbL+P5ePinHsDiAPLCQt/dWgw2tfB\nZZLj9c3Ukew6Qobuy3V1knl564qQ6wjf\n=1m7R\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}
@ -26,7 +26,7 @@
"s390x": [
{
"name": "fedora",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-rawhide&arch=s390x",
"metalink": "https://mirrors.fedoraproject.org/metalink?repo=fedora-44&arch=s390x",
"gpgkey": "-----BEGIN PGP PUBLIC KEY BLOCK-----\n\nmQINBGeGrzsBEAC4UV5Ij9oz6h6abEKIRoiezttFfnLhwOAfE9tWtfIFMRmhY91u\nL88PKf12n2xHBd3oc5ahBzGeTBhaMV+VJAppoQMSOIMI5q966D9GQ0LkJT+E5bwn\nxGRJKp7qccevh2KFOUt2vHtFskhDOuAIupoKfo5FgI9PkvAVBsrUpO/22yjNv0V/\naeDXxZhRX8m/8FKJ77VcZtBRPcp7M41bCmW9gV9IDpD81hAdTjYoQr1Y3KU0FTm5\nW4l1mf9mZcKMskOk08TyzQeC2YRB20EYRK439XCGJ4P7BFiOl96EbPpky2pHe2FV\nAvX474o3QEecTK3KxZrsRjmXOqpjRPy5YyMfKEYBM9j3zBDvpDFk79Mfuw5n2Nr5\nU4Wn/rqfhKLUKkfpfCow97nzq8NqynwS09yVobIfjHCKRtjwun6ife+s7R4L2nAu\nrTWPAHqzIjjW5nnjaFtoSulIadVKx+KibKajA6gRAc6K7xMyMTHfqZeTAIcawvX6\nh2d/nd8xCfogM5FTI5obNSUVNaMv5vQg6vcV1fb6oRgodF0Bi+1dssq5EMQpHFJM\nnIQ5NVwuzSjCLt3X2mWUp0mfIt2K9oBpBct12uXho7Nm1bSC5UFNYsvw+rj6vTqZ\nilK9pyfcYmELv7a/NPkyuACsBFGoc66nBfrEvk57kW9FaJK9mjSqGftykQARAQAB\ntDFGZWRvcmEgKDQ0KSA8ZmVkb3JhLTQ0LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v\ncmc+iQJSBBMBCAA8FiEENvYS3PJ/fRpIqDXk2/z3HG2fkKYFAmeGrzsCGw8FCwkI\nBwIDIgIBBhUKCQgLAgQWAgMBAh4HAheAAAoJENv89xxtn5CmIU0P/iaFVxJjVi4P\nyu8A04PbdGy2vuBBCceIjYn5HaMDwJMRjdJT6uMS494pSKNEl/JJ8K5rRdigfUV1\n2Z22X3kI5aNb4k2wpaPg5Xq0JQS9FvG4Pjm//kNy5WplmEA8HVg4MVkvySWiXay4\n+tkCelhE8aQDstYEm3uh+lZ6udgoInfprwFMn6H+8RXkakTW1z5NkuAA8PpMDA9o\nSOFc4Hk6bhE6exEp4VNwBEkxwh4z9CGjarlXL4QEyM1UK60vtbXIHVjITjFfKVQP\nj6ifdn5X69oSuK+1mUFXEV+l9pc1mVjTVTwOrG3EMBsoekFyICp1pPtfMo1dxBed\nR8BFHqQFsFdmIG+59ycFznFOXzDRfaVn6OTEAk7T8nDqnpe/T4GlybLYic6KMKcM\nnbMLaJZjHZ97qJb5Scpsd1TWB5TDERi4VPB7NAVC/EwxMPC3IJUbRej/s05gNjg0\n+2yyuV/U/DDnNGWnLTJDFLUaE8HhQBMvNSfmdMA47mo5CCuYmpzX/3M9vlVsv8/R\nxJBxFLIj9VFCPFNgXPeu9gyyytXeWgsIpDzMNJil9tgbBuQ1dX5GFMkWtK/kPexM\nKfiSU0JgJFfFSm0OKI/KXcRlbA1zP3IF+2YwbL+P5ePinHsDiAPLCQt/dWgw2tfB\nZZLj9c3Ukew6Qobuy3V1knl564qQ6wjf\n=1m7R\n-----END PGP PUBLIC KEY BLOCK-----\n",
"check_gpg": true
}

2
vendor/github.com/osbuild/images/pkg/distro/defs/loader.go generated vendored
View file

@ -371,8 +371,6 @@ type ImageTypeYAML struct {
DefaultSize uint64 `yaml:"default_size"`
// the image func name: disk,container,live-installer,...
Image string `yaml:"image_func"`
BuildPipelines []string `yaml:"build_pipelines"`
PayloadPipelines []string `yaml:"payload_pipelines"`
Exports []string `yaml:"exports"`
RequiredPartitionSizes map[string]uint64 `yaml:"required_partition_sizes"`

13
vendor/github.com/osbuild/images/pkg/distro/distro.go generated vendored
View file

@ -113,12 +113,6 @@ type ImageType interface {
// Returns the corresponding boot mode ("legacy", "uefi", "hybrid") or "none"
BootMode() platform.BootMode
// Returns the names of the pipelines that set up the build environment (buildroot).
BuildPipelines() []string
// Returns the names of the pipelines that create the image.
PayloadPipelines() []string
// Returns the package set names safe to install custom packages via custom repositories.
PayloadPackageSets() []string
@ -154,13 +148,6 @@ type BasePartitionTableMap map[string]disk.PartitionTable
// function from below.
// Example: Exports() simply returns "assembler" for older image type
// implementations that didn't produce v1 manifests that have named pipelines.
func BuildPipelinesFallback() []string {
return []string{"build"}
}
func PayloadPipelinesFallback() []string {
return []string{"os", "assembler"}
}
func ExportsFallback() []string {
return []string{"assembler"}

2
vendor/github.com/osbuild/images/pkg/distro/generic/distro.go generated vendored
View file

@ -230,7 +230,7 @@ func DistroFactory(idStr string) distro.Distro {
return nil
}
if err != nil {
panic(err)
panic(fmt.Errorf("%w with distro %s", err, idStr))
}
return distro
}

192
vendor/github.com/osbuild/images/pkg/distro/generic/images.go generated vendored
View file

@ -318,6 +318,56 @@ func osCustomizations(t *imageType, osPackageSet rpmmd.PackageSet, options distr
return osc, nil
}
func installerCustomizations(t *imageType, c *blueprint.Customizations) (manifest.InstallerCustomizations, error) {
isc := manifest.InstallerCustomizations{}
isc.FIPS = c.GetFIPS()
isc.UseLegacyAnacondaConfig = t.ImageTypeYAML.UseLegacyAnacondaConfig
installerConfig, err := t.getDefaultInstallerConfig()
if err != nil {
return isc, err
}
if installerConfig != nil {
isc.EnabledAnacondaModules = append(isc.EnabledAnacondaModules, installerConfig.EnabledAnacondaModules...)
isc.AdditionalDracutModules = append(isc.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
isc.AdditionalDrivers = append(isc.AdditionalDrivers, installerConfig.AdditionalDrivers...)
if menu := installerConfig.DefaultMenu; menu != nil {
isc.DefaultMenu = *menu
}
if isoroot := installerConfig.ISORootfsType; isoroot != nil {
isc.ISORootfsType = *isoroot
}
if isoboot := installerConfig.ISOBootType; isoboot != nil {
isc.ISOBoot = *isoboot
}
// Put the kickstart file in the root of the iso, some image
// types (like rhel10/image-installer) put them there, some
// others (like fedora/image-installer) do not and because
// its not uniform we need to make it configurable.
// XXX: unify with rhel-11 ? or rhel-10.x?
if rootkickstart := installerConfig.ISORootKickstart; rootkickstart != nil {
isc.ISORootKickstart = *rootkickstart
}
}
installerCust, err := c.GetInstaller()
if err != nil {
return isc, err
}
if installerCust != nil && installerCust.Modules != nil {
isc.EnabledAnacondaModules = append(isc.EnabledAnacondaModules, installerCust.Modules.Enable...)
isc.DisabledAnacondaModules = append(isc.DisabledAnacondaModules, installerCust.Modules.Disable...)
}
return isc, nil
}
func ostreeDeploymentCustomizations(
t *imageType,
c *blueprint.Customizations) (manifest.OSTreeDeploymentCustomizations, error) {
@ -525,24 +575,12 @@ func liveInstallerImage(workload workload.Workload,
if locale := imgConfig.Locale; locale != nil {
img.Locale = *locale
}
if isoroot := imgConfig.ISORootfsType; isoroot != nil {
img.RootfsType = *isoroot
}
if isoboot := imgConfig.ISOBootType; isoboot != nil {
img.ISOBoot = *isoboot
}
installerConfig, err := t.getDefaultInstallerConfig()
img.InstallerCustomizations, err = installerCustomizations(t, bp.Customizations)
if err != nil {
return nil, err
}
if installerConfig != nil {
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
if installerConfig.SquashfsRootfs != nil && *installerConfig.SquashfsRootfs {
img.RootfsType = manifest.SquashfsRootfs
}
}
return img, nil
}
@ -565,8 +603,6 @@ func imageInstallerImage(workload workload.Workload,
return nil, err
}
img.UseLegacyAnacondaConfig = t.ImageTypeYAML.UseLegacyAnacondaConfig
img.Kickstart, err = kickstart.New(customizations)
if err != nil {
return nil, err
@ -575,45 +611,27 @@ func imageInstallerImage(workload workload.Workload,
img.Kickstart.Keyboard = img.OSCustomizations.Keyboard
img.Kickstart.Timezone = &img.OSCustomizations.Timezone
instCust, err := customizations.GetInstaller()
if err != nil {
return nil, err
}
if instCust != nil && instCust.Modules != nil {
img.EnabledAnacondaModules = append(img.EnabledAnacondaModules, instCust.Modules.Enable...)
img.DisabledAnacondaModules = append(img.DisabledAnacondaModules, instCust.Modules.Disable...)
}
img.EnabledAnacondaModules = append(img.EnabledAnacondaModules, anaconda.ModuleUsers)
img.Platform = t.platform
img.Workload = workload
img.ExtraBasePackages = packageSets[installerPkgsKey]
img.InstallerCustomizations, err = installerCustomizations(t, bp.Customizations)
if err != nil {
return nil, err
}
installerConfig, err := t.getDefaultInstallerConfig()
if err != nil {
return nil, err
}
if installerConfig != nil {
img.EnabledAnacondaModules = append(img.EnabledAnacondaModules, installerConfig.EnabledAnacondaModules...)
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
if installerConfig.SquashfsRootfs != nil && *installerConfig.SquashfsRootfs {
img.RootfsType = manifest.SquashfsRootfs
}
if img.Kickstart.Unattended {
img.AdditionalKernelOpts = append(img.AdditionalKernelOpts, installerConfig.KickstartUnattendedExtraKernelOpts...)
}
// XXX these bits should move into the `installerCustomization` function
// XXX directly
img.InstallerCustomizations.EnabledAnacondaModules = append(img.InstallerCustomizations.EnabledAnacondaModules, anaconda.ModuleUsers)
// Put the kickstart file in the root of the iso, some image
// types (like rhel10/image-installer) put them there, some
// others (like fedora/image-installer) do not and because
// its not uniform we need to make it configurable.
// XXX: unify with rhel-11 ? or rhel-10.x?
if installerConfig.ISORootKickstart != nil {
img.ISORootKickstart = *installerConfig.ISORootKickstart
}
if img.Kickstart.Unattended {
img.InstallerCustomizations.AdditionalKernelOpts = append(img.InstallerCustomizations.AdditionalKernelOpts, installerConfig.KickstartUnattendedExtraKernelOpts...)
}
d := t.arch.distro
@ -633,13 +651,6 @@ func imageInstallerImage(workload workload.Workload,
img.Filename = t.Filename()
img.RootfsCompression = "xz" // This also triggers using the bcj filter
imgConfig := t.getDefaultImageConfig()
if isoroot := imgConfig.ISORootfsType; isoroot != nil {
img.RootfsType = *isoroot
}
if isoboot := imgConfig.ISOBootType; isoboot != nil {
img.ISOBoot = *isoboot
}
return img, nil
}
@ -774,10 +785,8 @@ func iotInstallerImage(workload workload.Workload,
img := image.NewAnacondaOSTreeInstaller(commit)
customizations := bp.Customizations
img.FIPS = customizations.GetFIPS()
img.Platform = t.platform
img.ExtraBasePackages = packageSets[installerPkgsKey]
img.UseLegacyAnacondaConfig = t.ImageTypeYAML.UseLegacyAnacondaConfig
img.Kickstart, err = kickstart.New(customizations)
if err != nil {
@ -793,31 +802,17 @@ func iotInstallerImage(workload workload.Workload,
// kickstart though kickstart does support setting them
img.Kickstart.Timezone, _ = customizations.GetTimezoneSettings()
instCust, err := customizations.GetInstaller()
if err != nil {
return nil, err
}
if instCust != nil && instCust.Modules != nil {
img.EnabledAnacondaModules = append(img.EnabledAnacondaModules, instCust.Modules.Enable...)
img.DisabledAnacondaModules = append(img.DisabledAnacondaModules, instCust.Modules.Disable...)
}
img.InstallerCustomizations, err = installerCustomizations(t, bp.Customizations)
installerConfig, err := t.getDefaultInstallerConfig()
if err != nil {
return nil, err
}
if installerConfig != nil {
img.AdditionalDracutModules = append(img.AdditionalDracutModules, installerConfig.AdditionalDracutModules...)
img.AdditionalDrivers = append(img.AdditionalDrivers, installerConfig.AdditionalDrivers...)
img.EnabledAnacondaModules = append(img.EnabledAnacondaModules, installerConfig.EnabledAnacondaModules...)
if installerConfig.SquashfsRootfs != nil && *installerConfig.SquashfsRootfs {
img.RootfsType = manifest.SquashfsRootfs
}
}
// XXX these bits should move into the `installerCustomization` function
// XXX directly
if len(img.Kickstart.Users)+len(img.Kickstart.Groups) > 0 {
// only enable the users module if needed
img.EnabledAnacondaModules = append(img.EnabledAnacondaModules, anaconda.ModuleUsers)
img.InstallerCustomizations.EnabledAnacondaModules = append(img.InstallerCustomizations.EnabledAnacondaModules, anaconda.ModuleUsers)
}
img.Product = d.Product()
@ -838,12 +833,6 @@ func iotInstallerImage(workload workload.Workload,
if locale := imgConfig.Locale; locale != nil {
img.Locale = *locale
}
if isoroot := imgConfig.ISORootfsType; isoroot != nil {
img.RootfsType = *isoroot
}
if isoboot := imgConfig.ISOBootType; isoboot != nil {
img.ISOBoot = *isoboot
}
return img, nil
}
@ -980,6 +969,55 @@ func iotSimplifiedInstallerImage(workload workload.Workload,
return img, nil
}
// Make an Anaconda installer boot.iso
func netinstImage(workload workload.Workload,
t *imageType,
bp *blueprint.Blueprint,
options distro.ImageOptions,
packageSets map[string]rpmmd.PackageSet,
containers []container.SourceSpec,
rng *rand.Rand) (image.ImageKind, error) {
customizations := bp.Customizations
img := image.NewAnacondaNetInstaller()
language, _ := customizations.GetPrimaryLocale()
if language != nil {
img.Language = *language
}
img.Platform = t.platform
img.Workload = workload
img.ExtraBasePackages = packageSets[installerPkgsKey]
var err error
img.InstallerCustomizations, err = installerCustomizations(t, bp.Customizations)
if err != nil {
return nil, err
}
d := t.arch.distro
img.Product = d.Product()
img.Variant = t.Variant
img.OSVersion = d.OsVersion()
img.Release = fmt.Sprintf("%s %s", d.Product(), d.OsVersion())
img.Preview = d.DistroYAML.Preview
img.ISOLabel, err = t.ISOLabel()
if err != nil {
return nil, err
}
img.Filename = t.Filename()
img.RootfsCompression = "xz" // This also triggers using the bcj filter
return img, nil
}
// Create an ostree SourceSpec to define an ostree parent commit using the user
// options and the default ref for the image type. Additionally returns the
// ref to be used for the new commit to be created.

10
vendor/github.com/osbuild/images/pkg/distro/generic/imagetype.go generated vendored
View file

@ -67,6 +67,8 @@ func newImageTypeFrom(d *distribution, ar *architecture, imgYAML defs.ImageTypeY
it.image = iotSimplifiedInstallerImage
case "tar":
it.image = tarImage
case "netinst":
it.image = netinstImage
default:
err := fmt.Errorf("unknown image func: %v for %v", imgYAML.Image, imgYAML.Name())
panic(err)
@ -125,14 +127,6 @@ func (t *imageType) Size(size uint64) uint64 {
return size
}
func (t *imageType) BuildPipelines() []string {
return t.ImageTypeYAML.BuildPipelines
}
func (t *imageType) PayloadPipelines() []string {
return t.ImageTypeYAML.PayloadPipelines
}
func (t *imageType) PayloadPackageSets() []string {
return []string{blueprintPkgsKey}
}

12
vendor/github.com/osbuild/images/pkg/distro/image_config.go generated vendored
View file

@ -10,7 +10,6 @@ import (
"github.com/osbuild/images/pkg/customizations/subscription"
"github.com/osbuild/images/pkg/customizations/users"
"github.com/osbuild/images/pkg/customizations/wsl"
"github.com/osbuild/images/pkg/manifest"
"github.com/osbuild/images/pkg/osbuild"
)
@ -135,13 +134,6 @@ type ImageConfig struct {
// instead of writing to /etc/fstab
MountUnits *bool `yaml:"mount_units,omitempty"`
// ISORootfsType defines what rootfs (squashfs, erofs,ext4)
// is used
ISORootfsType *manifest.RootfsType `yaml:"iso_rootfs_type,omitempty"`
// ISOBootType defines what type of bootloader is used for the iso
ISOBootType *manifest.ISOBootType `yaml:"iso_boot_type,omitempty"`
// Indicates if rhc should be set to permissive when creating the registration script
PermissiveRHC *bool `yaml:"permissive_rhc,omitempty"`
@ -169,8 +161,8 @@ func shallowMerge[T any](child *T, parent *T) *T {
// Only container types or pointer are supported.
// The reason is that with basic types, we can't distinguish between unset value and zero value.
if kind := field.Kind(); kind != reflect.Ptr && kind != reflect.Slice && kind != reflect.Map {
panic(fmt.Sprintf("unsupported field type: %s (only container types or pointer are supported)",
field.Kind()))
panic(fmt.Sprintf("unsupported field type for %s: %s (only container types or pointer are supported)",
fieldName, field.Kind()))
}
if field.IsNil() {

15
vendor/github.com/osbuild/images/pkg/distro/installer_config.go generated vendored
View file

@ -1,5 +1,9 @@
package distro
import (
"github.com/osbuild/images/pkg/manifest"
)
// InstallerConfig represents a configuration for the installer
// part of an Installer image type.
type InstallerConfig struct {
@ -14,8 +18,15 @@ type InstallerConfig struct {
KickstartUnattendedExtraKernelOpts []string `yaml:"kickstart_unattended_extra_kernel_opts"`
ISORootKickstart *bool `yaml:"iso_root_kickstart"`
// SquashfsRootfs will set SquashfsRootfs as rootfs in the iso image
SquashfsRootfs *bool `yaml:"squashfs_rootfs"`
// DefaultMenu will set the grub2 iso menu's default setting
DefaultMenu *int `yaml:"default_menu"`
// RootfsType defines what rootfs (squashfs, erofs,ext4)
// is used
ISORootfsType *manifest.ISORootfsType `yaml:"iso_rootfs_type,omitempty"`
// BootType defines what type of bootloader is used for the iso
ISOBootType *manifest.ISOBootType `yaml:"iso_boot_type,omitempty"`
}
// InheritFrom inherits unset values from the provided parent configuration and

8
vendor/github.com/osbuild/images/pkg/distro/test_distro/distro.go generated vendored
View file

@ -225,14 +225,6 @@ func (t *TestImageType) BootMode() platform.BootMode {
return platform.BOOT_HYBRID
}
func (t *TestImageType) BuildPipelines() []string {
return distro.BuildPipelinesFallback()
}
func (t *TestImageType) PayloadPipelines() []string {
return distro.PayloadPipelinesFallback()
}
func (t *TestImageType) PayloadPackageSets() []string {
return []string{blueprintPkgsKey}
}

49
vendor/github.com/osbuild/images/pkg/image/anaconda_container_installer.go generated vendored
View file

@ -20,12 +20,11 @@ import (
type AnacondaContainerInstaller struct {
Base
Platform platform.Platform
ExtraBasePackages rpmmd.PackageSet
Platform platform.Platform
InstallerCustomizations manifest.InstallerCustomizations
ExtraBasePackages rpmmd.PackageSet
RootfsCompression string
RootfsType manifest.RootfsType
ISOBoot manifest.ISOBootType
ISOLabel string
Product string
@ -40,22 +39,8 @@ type AnacondaContainerInstaller struct {
Filename string
EnabledAnacondaModules []string
DisabledAnacondaModules []string
AdditionalDracutModules []string
AdditionalDrivers []string
FIPS bool
Kickstart *kickstart.Options
UseRHELLoraxTemplates bool
// Uses the old, deprecated, Anaconda config option "kickstart-modules".
// Only for RHEL 8.
UseLegacyAnacondaConfig bool
// Locale for the installer. This should be set to the same locale as the
// ISO OS payload, if known.
Locale string
@ -90,29 +75,25 @@ func (img *AnacondaContainerInstaller) InstantiateManifest(m *manifest.Manifest,
img.Preview,
)
anacondaPipeline.UseRHELLoraxTemplates = img.UseRHELLoraxTemplates
anacondaPipeline.UseLegacyAnacondaConfig = img.UseLegacyAnacondaConfig
anacondaPipeline.ExtraPackages = img.ExtraBasePackages.Include
anacondaPipeline.ExcludePackages = img.ExtraBasePackages.Exclude
anacondaPipeline.ExtraRepos = img.ExtraBasePackages.Repositories
anacondaPipeline.Variant = img.Variant
anacondaPipeline.Biosdevname = (img.Platform.GetArch() == arch.ARCH_X86_64)
anacondaPipeline.Checkpoint()
anacondaPipeline.EnabledAnacondaModules = img.EnabledAnacondaModules
anacondaPipeline.DisabledAnacondaModules = img.DisabledAnacondaModules
if img.FIPS {
anacondaPipeline.EnabledAnacondaModules = append(
anacondaPipeline.EnabledAnacondaModules,
anacondaPipeline.InstallerCustomizations = img.InstallerCustomizations
if anacondaPipeline.InstallerCustomizations.FIPS {
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules = append(
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules,
anaconda.ModuleSecurity,
)
}
anacondaPipeline.AdditionalDracutModules = img.AdditionalDracutModules
anacondaPipeline.AdditionalDrivers = img.AdditionalDrivers
anacondaPipeline.Locale = img.Locale
var rootfsImagePipeline *manifest.ISORootfsImg
switch img.RootfsType {
switch img.InstallerCustomizations.ISORootfsType {
case manifest.SquashfsExt4Rootfs:
rootfsImagePipeline = manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 4 * datasizes.GibiByte
@ -132,7 +113,7 @@ func (img *AnacondaContainerInstaller) InstantiateManifest(m *manifest.Manifest,
}
bootTreePipeline.KernelOpts = []string{fmt.Sprintf("inst.stage2=hd:LABEL=%s", img.ISOLabel), fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", img.ISOLabel, img.Kickstart.Path)}
if img.FIPS {
if anacondaPipeline.InstallerCustomizations.FIPS {
bootTreePipeline.KernelOpts = append(bootTreePipeline.KernelOpts, "fips=1")
}
@ -142,15 +123,15 @@ func (img *AnacondaContainerInstaller) InstantiateManifest(m *manifest.Manifest,
isoTreePipeline.Kickstart = img.Kickstart
isoTreePipeline.RootfsCompression = img.RootfsCompression
isoTreePipeline.RootfsType = img.RootfsType
isoTreePipeline.RootfsType = img.InstallerCustomizations.ISORootfsType
// For ostree installers, always put the kickstart file in the root of the ISO
isoTreePipeline.PayloadPath = "/container"
isoTreePipeline.PayloadRemoveSignatures = img.ContainerRemoveSignatures
isoTreePipeline.ContainerSource = &img.ContainerSource
isoTreePipeline.ISOBoot = img.ISOBoot
if img.FIPS {
isoTreePipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
if anacondaPipeline.InstallerCustomizations.FIPS {
isoTreePipeline.KernelOpts = append(isoTreePipeline.KernelOpts, "fips=1")
}
@ -158,7 +139,7 @@ func (img *AnacondaContainerInstaller) InstantiateManifest(m *manifest.Manifest,
isoPipeline := manifest.NewISO(buildPipeline, isoTreePipeline, img.ISOLabel)
isoPipeline.SetFilename(img.Filename)
isoPipeline.ISOBoot = img.ISOBoot
isoPipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
artifact := isoPipeline.Export()
return artifact, nil

23
vendor/github.com/osbuild/images/pkg/image/anaconda_live_installer.go generated vendored
View file

@ -17,15 +17,14 @@ import (
type AnacondaLiveInstaller struct {
Base
Platform platform.Platform
Environment environment.Environment
Workload workload.Workload
Platform platform.Platform
InstallerCustomizations manifest.InstallerCustomizations
Environment environment.Environment
Workload workload.Workload
ExtraBasePackages rpmmd.PackageSet
RootfsCompression string
RootfsType manifest.RootfsType
ISOBoot manifest.ISOBootType
ISOLabel string
Product string
@ -36,8 +35,6 @@ type AnacondaLiveInstaller struct {
Filename string
AdditionalKernelOpts []string
// Locale for the installer. This should be set to the same locale as the
// ISO OS payload, if known.
Locale string
@ -76,6 +73,7 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
livePipeline.Variant = img.Variant
livePipeline.Biosdevname = (img.Platform.GetArch() == arch.ARCH_X86_64)
livePipeline.Locale = img.Locale
livePipeline.InstallerCustomizations = img.InstallerCustomizations
// The live installer has SELinux enabled and targeted
livePipeline.SELinux = "targeted"
@ -83,7 +81,7 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
livePipeline.Checkpoint()
var rootfsImagePipeline *manifest.ISORootfsImg
switch img.RootfsType {
switch img.InstallerCustomizations.ISORootfsType {
case manifest.SquashfsExt4Rootfs:
rootfsImagePipeline = manifest.NewISORootfsImg(buildPipeline, livePipeline)
rootfsImagePipeline.Size = 8 * datasizes.GibiByte
@ -94,6 +92,7 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
bootTreePipeline.Platform = img.Platform
bootTreePipeline.UEFIVendor = img.Platform.GetUEFIVendor()
bootTreePipeline.ISOLabel = img.ISOLabel
bootTreePipeline.DefaultMenu = img.InstallerCustomizations.DefaultMenu
kernelOpts := []string{
fmt.Sprintf("root=live:CDLABEL=%s", img.ISOLabel),
@ -102,7 +101,7 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
"rhgb",
}
kernelOpts = append(kernelOpts, img.AdditionalKernelOpts...)
kernelOpts = append(kernelOpts, img.InstallerCustomizations.AdditionalKernelOpts...)
bootTreePipeline.KernelOpts = kernelOpts
@ -111,14 +110,14 @@ func (img *AnacondaLiveInstaller) InstantiateManifest(m *manifest.Manifest,
isoTreePipeline.Release = img.Release
isoTreePipeline.KernelOpts = kernelOpts
isoTreePipeline.ISOBoot = img.ISOBoot
isoTreePipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
isoTreePipeline.RootfsCompression = img.RootfsCompression
isoTreePipeline.RootfsType = img.RootfsType
isoTreePipeline.RootfsType = img.InstallerCustomizations.ISORootfsType
isoPipeline := manifest.NewISO(buildPipeline, isoTreePipeline, img.ISOLabel)
isoPipeline.SetFilename(img.Filename)
isoPipeline.ISOBoot = img.ISOBoot
isoPipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
artifact := isoPipeline.Export()

128
vendor/github.com/osbuild/images/pkg/image/anaconda_net_installer.go generated vendored Normal file
View file

@ -0,0 +1,128 @@
package image
import (
"fmt"
"math/rand"
"github.com/osbuild/images/internal/environment"
"github.com/osbuild/images/internal/workload"
"github.com/osbuild/images/pkg/arch"
"github.com/osbuild/images/pkg/artifact"
"github.com/osbuild/images/pkg/customizations/anaconda"
"github.com/osbuild/images/pkg/datasizes"
"github.com/osbuild/images/pkg/manifest"
"github.com/osbuild/images/pkg/platform"
"github.com/osbuild/images/pkg/rpmmd"
"github.com/osbuild/images/pkg/runner"
)
type AnacondaNetInstaller struct {
Base
Platform platform.Platform
InstallerCustomizations manifest.InstallerCustomizations
Environment environment.Environment
Workload workload.Workload
ExtraBasePackages rpmmd.PackageSet
RootfsCompression string
ISOLabel string
Product string
Variant string
OSVersion string
Release string
Preview bool
Filename string
Language string
}
func NewAnacondaNetInstaller() *AnacondaNetInstaller {
return &AnacondaNetInstaller{
Base: NewBase("netinst"),
}
}
func (img *AnacondaNetInstaller) InstantiateManifest(m *manifest.Manifest,
repos []rpmmd.RepoConfig,
runner runner.Runner,
rng *rand.Rand) (*artifact.Artifact, error) {
buildPipeline := addBuildBootstrapPipelines(m, runner, repos, nil)
buildPipeline.Checkpoint()
installerType := manifest.AnacondaInstallerTypeNetinst
anacondaPipeline := manifest.NewAnacondaInstaller(
installerType,
buildPipeline,
img.Platform,
repos,
"kernel",
img.Product,
img.OSVersion,
img.Preview,
)
anacondaPipeline.ExtraPackages = img.ExtraBasePackages.Include
anacondaPipeline.ExcludePackages = img.ExtraBasePackages.Exclude
anacondaPipeline.ExtraRepos = img.ExtraBasePackages.Repositories
anacondaPipeline.Variant = img.Variant
anacondaPipeline.Biosdevname = (img.Platform.GetArch() == arch.ARCH_X86_64)
anacondaPipeline.InstallerCustomizations = img.InstallerCustomizations
if anacondaPipeline.InstallerCustomizations.FIPS {
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules = append(
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules,
anaconda.ModuleSecurity,
)
}
anacondaPipeline.Locale = img.Language
anacondaPipeline.Checkpoint()
var rootfsImagePipeline *manifest.ISORootfsImg
switch img.InstallerCustomizations.ISORootfsType {
case manifest.SquashfsExt4Rootfs:
rootfsImagePipeline = manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 5 * datasizes.GibiByte
default:
}
bootTreePipeline := manifest.NewEFIBootTree(buildPipeline, img.Product, img.OSVersion)
bootTreePipeline.Platform = img.Platform
bootTreePipeline.UEFIVendor = img.Platform.GetUEFIVendor()
bootTreePipeline.ISOLabel = img.ISOLabel
bootTreePipeline.DefaultMenu = img.InstallerCustomizations.DefaultMenu
kernelOpts := []string{fmt.Sprintf("inst.stage2=hd:LABEL=%s", img.ISOLabel)}
if anacondaPipeline.InstallerCustomizations.FIPS {
kernelOpts = append(kernelOpts, "fips=1")
}
kernelOpts = append(kernelOpts, img.InstallerCustomizations.AdditionalKernelOpts...)
bootTreePipeline.KernelOpts = kernelOpts
isoTreePipeline := manifest.NewAnacondaInstallerISOTree(buildPipeline, anacondaPipeline, rootfsImagePipeline, bootTreePipeline)
// TODO: the partition table is required - make it a ctor arg or set a default one in the pipeline
isoTreePipeline.PartitionTable = efiBootPartitionTable(rng)
isoTreePipeline.Release = img.Release
isoTreePipeline.RootfsCompression = img.RootfsCompression
isoTreePipeline.RootfsType = img.InstallerCustomizations.ISORootfsType
isoTreePipeline.KernelOpts = img.InstallerCustomizations.AdditionalKernelOpts
if anacondaPipeline.InstallerCustomizations.FIPS {
isoTreePipeline.KernelOpts = append(isoTreePipeline.KernelOpts, "fips=1")
}
isoTreePipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
isoPipeline := manifest.NewISO(buildPipeline, isoTreePipeline, img.ISOLabel)
isoPipeline.SetFilename(img.Filename)
isoPipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
artifact := isoPipeline.Export()
return artifact, nil
}

46
vendor/github.com/osbuild/images/pkg/image/anaconda_ostree_installer.go generated vendored
View file

@ -20,8 +20,9 @@ import (
type AnacondaOSTreeInstaller struct {
Base
Platform platform.Platform
ExtraBasePackages rpmmd.PackageSet
Platform platform.Platform
InstallerCustomizations manifest.InstallerCustomizations
ExtraBasePackages rpmmd.PackageSet
Kickstart *kickstart.Options
@ -29,8 +30,6 @@ type AnacondaOSTreeInstaller struct {
Subscription *subscription.ImageOptions
RootfsCompression string
RootfsType manifest.RootfsType
ISOBoot manifest.ISOBootType
ISOLabel string
Product string
@ -43,18 +42,6 @@ type AnacondaOSTreeInstaller struct {
Filename string
EnabledAnacondaModules []string
DisabledAnacondaModules []string
AdditionalDracutModules []string
AdditionalDrivers []string
FIPS bool
// Uses the old, deprecated, Anaconda config option "kickstart-modules".
// Only for RHEL 8.
UseLegacyAnacondaConfig bool
// Locale for the installer. This should be set to the same locale as the
// ISO OS payload, if known.
Locale string
@ -97,21 +84,19 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
anacondaPipeline.Biosdevname = (img.Platform.GetArch() == arch.ARCH_X86_64)
anacondaPipeline.Checkpoint()
anacondaPipeline.UseLegacyAnacondaConfig = img.UseLegacyAnacondaConfig
anacondaPipeline.AdditionalDracutModules = img.AdditionalDracutModules
anacondaPipeline.EnabledAnacondaModules = img.EnabledAnacondaModules
if img.FIPS {
anacondaPipeline.EnabledAnacondaModules = append(
anacondaPipeline.EnabledAnacondaModules,
anacondaPipeline.InstallerCustomizations = img.InstallerCustomizations
if anacondaPipeline.InstallerCustomizations.FIPS {
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules = append(
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules,
anaconda.ModuleSecurity,
)
}
anacondaPipeline.DisabledAnacondaModules = img.DisabledAnacondaModules
anacondaPipeline.AdditionalDrivers = img.AdditionalDrivers
anacondaPipeline.Locale = img.Locale
var rootfsImagePipeline *manifest.ISORootfsImg
switch img.RootfsType {
switch img.InstallerCustomizations.ISORootfsType {
case manifest.SquashfsExt4Rootfs:
rootfsImagePipeline = manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 4 * datasizes.GibiByte
@ -122,6 +107,7 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
bootTreePipeline.Platform = img.Platform
bootTreePipeline.UEFIVendor = img.Platform.GetUEFIVendor()
bootTreePipeline.ISOLabel = img.ISOLabel
bootTreePipeline.DefaultMenu = img.InstallerCustomizations.DefaultMenu
if img.Kickstart == nil || img.Kickstart.OSTree == nil {
return nil, fmt.Errorf("kickstart options not set for ostree installer")
@ -130,7 +116,7 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
img.Kickstart.Path = osbuild.KickstartPathOSBuild
}
bootTreePipeline.KernelOpts = []string{fmt.Sprintf("inst.stage2=hd:LABEL=%s", img.ISOLabel), fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", img.ISOLabel, img.Kickstart.Path)}
if img.FIPS {
if anacondaPipeline.InstallerCustomizations.FIPS {
bootTreePipeline.KernelOpts = append(bootTreePipeline.KernelOpts, "fips=1")
}
@ -145,20 +131,20 @@ func (img *AnacondaOSTreeInstaller) InstantiateManifest(m *manifest.Manifest,
isoTreePipeline.Release = img.Release
isoTreePipeline.Kickstart = img.Kickstart
isoTreePipeline.RootfsCompression = img.RootfsCompression
isoTreePipeline.RootfsType = img.RootfsType
isoTreePipeline.RootfsType = img.InstallerCustomizations.ISORootfsType
isoTreePipeline.PayloadPath = "/ostree/repo"
isoTreePipeline.OSTreeCommitSource = &img.Commit
isoTreePipeline.ISOBoot = img.ISOBoot
if img.FIPS {
isoTreePipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
if anacondaPipeline.InstallerCustomizations.FIPS {
isoTreePipeline.KernelOpts = append(isoTreePipeline.KernelOpts, "fips=1")
}
isoTreePipeline.SubscriptionPipeline = subscriptionPipeline
isoPipeline := manifest.NewISO(buildPipeline, isoTreePipeline, img.ISOLabel)
isoPipeline.SetFilename(img.Filename)
isoPipeline.ISOBoot = img.ISOBoot
isoPipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
artifact := isoPipeline.Export()
return artifact, nil

68
vendor/github.com/osbuild/images/pkg/image/anaconda_tar_installer.go generated vendored
View file

@ -40,25 +40,17 @@ func efiBootPartitionTable(rng *rand.Rand) *disk.PartitionTable {
type AnacondaTarInstaller struct {
Base
Platform platform.Platform
OSCustomizations manifest.OSCustomizations
Environment environment.Environment
Workload workload.Workload
Platform platform.Platform
OSCustomizations manifest.OSCustomizations
InstallerCustomizations manifest.InstallerCustomizations
Environment environment.Environment
Workload workload.Workload
ExtraBasePackages rpmmd.PackageSet
// If set, the kickstart file will be added to the bootiso-tree at the
// default path for osbuild, otherwise any kickstart options will be
// configured in the default location for interactive defaults in the
// rootfs. Enabling UnattendedKickstart automatically enables this option
// because automatic installations cannot be configured using interactive
// defaults.
ISORootKickstart bool
Kickstart *kickstart.Options
Kickstart *kickstart.Options
RootfsCompression string
RootfsType manifest.RootfsType
ISOBoot manifest.ISOBootType
ISOLabel string
Product string
@ -68,17 +60,6 @@ type AnacondaTarInstaller struct {
Preview bool
Filename string
AdditionalKernelOpts []string
EnabledAnacondaModules []string
DisabledAnacondaModules []string
AdditionalDracutModules []string
AdditionalDrivers []string
// Uses the old, deprecated, Anaconda config option "kickstart-modules".
// Only for RHEL 8.
UseLegacyAnacondaConfig bool
}
func NewAnacondaTarInstaller() *AnacondaTarInstaller {
@ -101,10 +82,10 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
if img.Kickstart.Unattended {
// if we're building an unattended installer, override the
// ISORootKickstart option
img.ISORootKickstart = true
img.InstallerCustomizations.ISORootKickstart = true
}
if img.ISORootKickstart {
if img.InstallerCustomizations.ISORootKickstart {
// kickstart file will be in the iso root and not interactive-defaults,
// so let's make sure the kickstart path option is set
if img.Kickstart.Path == "" {
@ -135,22 +116,20 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
anacondaPipeline.Variant = img.Variant
anacondaPipeline.Biosdevname = (img.Platform.GetArch() == arch.ARCH_X86_64)
anacondaPipeline.UseLegacyAnacondaConfig = img.UseLegacyAnacondaConfig
anacondaPipeline.EnabledAnacondaModules = img.EnabledAnacondaModules
anacondaPipeline.InstallerCustomizations = img.InstallerCustomizations
if img.OSCustomizations.FIPS {
anacondaPipeline.EnabledAnacondaModules = append(
anacondaPipeline.EnabledAnacondaModules,
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules = append(
anacondaPipeline.InstallerCustomizations.EnabledAnacondaModules,
anaconda.ModuleSecurity,
)
}
anacondaPipeline.DisabledAnacondaModules = img.DisabledAnacondaModules
anacondaPipeline.AdditionalDracutModules = img.AdditionalDracutModules
anacondaPipeline.AdditionalDrivers = img.AdditionalDrivers
anacondaPipeline.Locale = img.OSCustomizations.Language
tarPath := "/liveimg.tar.gz"
if !img.ISORootKickstart {
if !img.InstallerCustomizations.ISORootKickstart {
payloadPath := filepath.Join("/run/install/repo/", tarPath)
anacondaPipeline.InteractiveDefaults = manifest.NewAnacondaInteractiveDefaults(fmt.Sprintf("file://%s", payloadPath))
}
@ -158,7 +137,7 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
anacondaPipeline.Checkpoint()
var rootfsImagePipeline *manifest.ISORootfsImg
switch img.RootfsType {
switch img.InstallerCustomizations.ISORootfsType {
case manifest.SquashfsExt4Rootfs:
rootfsImagePipeline = manifest.NewISORootfsImg(buildPipeline, anacondaPipeline)
rootfsImagePipeline.Size = 5 * datasizes.GibiByte
@ -169,15 +148,17 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
bootTreePipeline.Platform = img.Platform
bootTreePipeline.UEFIVendor = img.Platform.GetUEFIVendor()
bootTreePipeline.ISOLabel = img.ISOLabel
bootTreePipeline.DefaultMenu = img.InstallerCustomizations.DefaultMenu
kernelOpts := []string{fmt.Sprintf("inst.stage2=hd:LABEL=%s", img.ISOLabel)}
if img.ISORootKickstart {
if img.InstallerCustomizations.ISORootKickstart {
kernelOpts = append(kernelOpts, fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", img.ISOLabel, img.Kickstart.Path))
}
if img.OSCustomizations.FIPS {
kernelOpts = append(kernelOpts, "fips=1")
}
kernelOpts = append(kernelOpts, img.AdditionalKernelOpts...)
kernelOpts = append(kernelOpts, img.InstallerCustomizations.AdditionalKernelOpts...)
kernelOpts = append(kernelOpts, img.OSCustomizations.KernelOptionsAppend...)
bootTreePipeline.KernelOpts = kernelOpts
osPipeline := manifest.NewOS(buildPipeline, img.Platform, repos)
@ -191,24 +172,25 @@ func (img *AnacondaTarInstaller) InstantiateManifest(m *manifest.Manifest,
isoTreePipeline.Release = img.Release
isoTreePipeline.Kickstart = img.Kickstart
isoTreePipeline.PayloadPath = tarPath
if img.ISORootKickstart {
if img.InstallerCustomizations.ISORootKickstart {
isoTreePipeline.Kickstart.Path = img.Kickstart.Path
}
isoTreePipeline.RootfsCompression = img.RootfsCompression
isoTreePipeline.RootfsType = img.RootfsType
isoTreePipeline.RootfsType = img.InstallerCustomizations.ISORootfsType
isoTreePipeline.OSPipeline = osPipeline
isoTreePipeline.KernelOpts = img.AdditionalKernelOpts
isoTreePipeline.KernelOpts = img.InstallerCustomizations.AdditionalKernelOpts
isoTreePipeline.KernelOpts = append(isoTreePipeline.KernelOpts, img.OSCustomizations.KernelOptionsAppend...)
if img.OSCustomizations.FIPS {
isoTreePipeline.KernelOpts = append(isoTreePipeline.KernelOpts, "fips=1")
}
isoTreePipeline.ISOBoot = img.ISOBoot
isoTreePipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
isoPipeline := manifest.NewISO(buildPipeline, isoTreePipeline, img.ISOLabel)
isoPipeline.SetFilename(img.Filename)
isoPipeline.ISOBoot = img.ISOBoot
isoPipeline.ISOBoot = img.InstallerCustomizations.ISOBoot
artifact := isoPipeline.Export()

52
vendor/github.com/osbuild/images/pkg/manifest/anaconda_installer.go generated vendored
View file

@ -19,6 +19,7 @@ type AnacondaInstallerType int
const (
AnacondaInstallerTypeLive AnacondaInstallerType = iota + 1
AnacondaInstallerTypePayload
AnacondaInstallerTypeNetinst
)
// An Anaconda represents the installer tree as found on an ISO this can be either
@ -31,6 +32,9 @@ type AnacondaInstaller struct {
// manifest.
Type AnacondaInstallerType
// InstallerCustomizations to apply to the installer pipeline(s)
InstallerCustomizations InstallerCustomizations
// Packages to install and/or exclude in addition to the ones required by the
// pipeline.
ExtraPackages []string
@ -65,24 +69,8 @@ type AnacondaInstaller struct {
// properties are ignored.
InteractiveDefaultsKickstart *kickstart.Options
// Additional anaconda modules to enable
EnabledAnacondaModules []string
// Anaconda modules to explicitly disable
DisabledAnacondaModules []string
// Additional dracut modules and drivers to enable
AdditionalDracutModules []string
AdditionalDrivers []string
Files []*fsnode.File
// Temporary
UseRHELLoraxTemplates bool
// Uses the old, deprecated, Anaconda config option "kickstart-modules".
// Only for RHEL 8.
UseLegacyAnacondaConfig bool
// SELinux policy, when set it enables the labeling of the installer
// tree with the selected profile and selects the required package
// for depsolving
@ -157,7 +145,7 @@ func (p *AnacondaInstaller) getBuildPackages(Distro) []string {
"shadow-utils", // The pipeline always creates a root and installer user
)
if p.UseRHELLoraxTemplates {
if p.InstallerCustomizations.UseRHELLoraxTemplates {
packages = append(packages,
"lorax-templates-rhel",
)
@ -179,6 +167,9 @@ func (p *AnacondaInstaller) getBuildPackages(Distro) []string {
func (p *AnacondaInstaller) getPackageSetChain(Distro) []rpmmd.PackageSet {
packages := p.anacondaBootPackageSet()
// Install firmware packages and other platform specific packages
packages = append(packages, p.platform.GetPackages()...)
if p.Biosdevname {
packages = append(packages, "biosdevname")
}
@ -265,7 +256,7 @@ func (p *AnacondaInstaller) serialize() osbuild.Pipeline {
panic("anaconda installer type live does not support interactive defaults")
}
pipeline.AddStages(p.liveStages()...)
case AnacondaInstallerTypePayload:
case AnacondaInstallerTypePayload, AnacondaInstallerTypeNetinst:
pipeline.AddStages(p.payloadStages()...)
default:
panic("invalid anaconda installer type")
@ -305,16 +296,19 @@ func (p *AnacondaInstaller) payloadStages() []*osbuild.Stage {
}
stages = append(stages, osbuild.NewUsersStage(usersStageOptions))
var anacondaStageOptions *osbuild.AnacondaStageOptions
if p.UseLegacyAnacondaConfig {
anacondaStageOptions = osbuild.NewAnacondaStageOptionsLegacy(p.EnabledAnacondaModules, p.DisabledAnacondaModules)
} else {
anacondaStageOptions = osbuild.NewAnacondaStageOptions(p.EnabledAnacondaModules, p.DisabledAnacondaModules)
// Limit the Anaconda spokes on non-netinst iso types
if p.Type != AnacondaInstallerTypeNetinst {
var anacondaStageOptions *osbuild.AnacondaStageOptions
if p.InstallerCustomizations.UseLegacyAnacondaConfig {
anacondaStageOptions = osbuild.NewAnacondaStageOptionsLegacy(p.InstallerCustomizations.EnabledAnacondaModules, p.InstallerCustomizations.DisabledAnacondaModules)
} else {
anacondaStageOptions = osbuild.NewAnacondaStageOptions(p.InstallerCustomizations.EnabledAnacondaModules, p.InstallerCustomizations.DisabledAnacondaModules)
}
stages = append(stages, osbuild.NewAnacondaStage(anacondaStageOptions))
}
stages = append(stages, osbuild.NewAnacondaStage(anacondaStageOptions))
LoraxPath := "99-generic/runtime-postinstall.tmpl"
if p.UseRHELLoraxTemplates {
if p.InstallerCustomizations.UseRHELLoraxTemplates {
LoraxPath = "80-rhel/runtime-postinstall.tmpl"
}
stages = append(stages, osbuild.NewLoraxScriptStage(&osbuild.LoraxScriptStageOptions{
@ -424,16 +418,16 @@ func (p *AnacondaInstaller) dracutStageOptions() *osbuild.DracutStageOptions {
EarlyMicrocode: false,
AddModules: []string{"pollcdrom", "qemu", "qemu-net"},
Extra: []string{"--xz"},
AddDrivers: p.AdditionalDrivers,
AddDrivers: p.InstallerCustomizations.AdditionalDrivers,
}
options.AddModules = append(options.AddModules, p.AdditionalDracutModules...)
options.AddModules = append(options.AddModules, p.InstallerCustomizations.AdditionalDracutModules...)
if p.Biosdevname {
options.AddModules = append(options.AddModules, "biosdevname")
}
switch p.Type {
case AnacondaInstallerTypePayload:
case AnacondaInstallerTypePayload, AnacondaInstallerTypeNetinst:
// Lorax calls the boot.iso dracut with:
// --nomdadmconf --nolvmconf --xz --install '/.buildstamp' --no-early-microcode
// --add 'fips anaconda pollcdrom qemu qemu-net prefixdevname-tools'
@ -456,6 +450,8 @@ func (p *AnacondaInstaller) dracutStageOptions() *osbuild.DracutStageOptions {
"dmsquash-live",
"convertfs",
}...)
default:
panic(fmt.Errorf("unknown AnacondaInstallerType %v in dracutStageOptions", p.Type))
}
return &options

43
vendor/github.com/osbuild/images/pkg/manifest/anaconda_installer_iso_tree.go generated vendored
View file

@ -17,16 +17,16 @@ import (
"github.com/osbuild/images/pkg/ostree"
)
type RootfsType uint64
type ISORootfsType uint64
// These constants are used by the ISO images to control the style of the root filesystem
const ( // Rootfs type enum
SquashfsExt4Rootfs RootfsType = iota // Create an EXT4 rootfs compressed by Squashfs
SquashfsRootfs // Create a plain squashfs rootfs
ErofsRootfs // Create a plain erofs rootfs
SquashfsExt4Rootfs ISORootfsType = iota // Create an EXT4 rootfs compressed by Squashfs
SquashfsRootfs // Create a plain squashfs rootfs
ErofsRootfs // Create a plain erofs rootfs
)
func (r *RootfsType) UnmarshalJSON(data []byte) error {
func (r *ISORootfsType) UnmarshalJSON(data []byte) error {
var s string
if err := json.Unmarshal(data, &s); err != nil {
return err
@ -39,13 +39,13 @@ func (r *RootfsType) UnmarshalJSON(data []byte) error {
case "erofs":
*r = ErofsRootfs
default:
return fmt.Errorf("unknown RootfsType: %q", s)
return fmt.Errorf("unknown ISORootfsType: %q", s)
}
return nil
}
func (r *RootfsType) UnmarshalYAML(unmarshal func(any) error) error {
func (r *ISORootfsType) UnmarshalYAML(unmarshal func(any) error) error {
return common.UnmarshalYAMLviaJSON(r, unmarshal)
}
@ -106,7 +106,7 @@ type AnacondaInstallerISOTree struct {
isoLabel string
RootfsCompression string
RootfsType RootfsType
RootfsType ISORootfsType
OSPipeline *OS
OSTreeCommitSource *ostree.SourceSpec
@ -242,14 +242,18 @@ var installerBootExcludePaths = []string{
func (p *AnacondaInstallerISOTree) NewSquashfsStage() *osbuild.Stage {
var squashfsOptions osbuild.SquashfsStageOptions
if p.anacondaPipeline.Type == AnacondaInstallerTypePayload {
switch p.anacondaPipeline.Type {
case AnacondaInstallerTypePayload, AnacondaInstallerTypeNetinst:
squashfsOptions = osbuild.SquashfsStageOptions{
Filename: "images/install.img",
}
} else if p.anacondaPipeline.Type == AnacondaInstallerTypeLive {
case AnacondaInstallerTypeLive:
squashfsOptions = osbuild.SquashfsStageOptions{
Filename: "LiveOS/squashfs.img",
}
default:
// Shouldn't be possible, but catch it anyway
panic(fmt.Errorf("unknown AnacondaInstallerType %v in NewSquashfsStage", p.anacondaPipeline.Type))
}
if p.RootfsCompression != "" {
@ -281,14 +285,18 @@ func (p *AnacondaInstallerISOTree) NewSquashfsStage() *osbuild.Stage {
func (p *AnacondaInstallerISOTree) NewErofsStage() *osbuild.Stage {
var erofsOptions osbuild.ErofsStageOptions
if p.anacondaPipeline.Type == AnacondaInstallerTypePayload {
switch p.anacondaPipeline.Type {
case AnacondaInstallerTypePayload, AnacondaInstallerTypeNetinst:
erofsOptions = osbuild.ErofsStageOptions{
Filename: "images/install.img",
}
} else if p.anacondaPipeline.Type == AnacondaInstallerTypeLive {
case AnacondaInstallerTypeLive:
erofsOptions = osbuild.ErofsStageOptions{
Filename: "LiveOS/squashfs.img",
}
default:
// Shouldn't be possible, but catch it anyway
panic(fmt.Errorf("unknown AnacondaInstallerType %v in NewErofsStage", p.anacondaPipeline.Type))
}
var compression osbuild.ErofsCompression
@ -367,7 +375,8 @@ func (p *AnacondaInstallerISOTree) serialize() osbuild.Pipeline {
kernelOpts := []string{}
if p.anacondaPipeline.Type == AnacondaInstallerTypePayload {
if p.anacondaPipeline.Type == AnacondaInstallerTypePayload ||
p.anacondaPipeline.Type == AnacondaInstallerTypeNetinst {
kernelOpts = append(kernelOpts, fmt.Sprintf("inst.stage2=hd:LABEL=%s", p.isoLabel))
if p.Kickstart != nil && p.Kickstart.Path != "" {
kernelOpts = append(kernelOpts, fmt.Sprintf("inst.ks=hd:LABEL=%s:%s", p.isoLabel, p.Kickstart.Path))
@ -441,6 +450,13 @@ func (p *AnacondaInstallerISOTree) serialize() osbuild.Pipeline {
stage := osbuild.NewISOLinuxStage(options, p.anacondaPipeline.Name())
pipeline.AddStage(stage)
} else if p.ISOBoot == Grub2ISOBoot {
var grub2config *osbuild.Grub2Config
if p.anacondaPipeline.InstallerCustomizations.DefaultMenu > 0 {
grub2config = &osbuild.Grub2Config{
Default: p.anacondaPipeline.InstallerCustomizations.DefaultMenu,
}
}
options := &osbuild.Grub2ISOLegacyStageOptions{
Product: osbuild.Product{
Name: p.anacondaPipeline.product,
@ -452,6 +468,7 @@ func (p *AnacondaInstallerISOTree) serialize() osbuild.Pipeline {
},
ISOLabel: p.isoLabel,
FIPS: p.anacondaPipeline.platform.GetFIPSMenu(),
Config: grub2config,
}
stage := osbuild.NewGrub2ISOLegacyStage(options)

4
vendor/github.com/osbuild/images/pkg/manifest/build.go generated vendored
View file

@ -17,7 +17,9 @@ import (
// is not predictable nor reproducible. For the purposes of building the
// build pipeline, we do use the build host's filesystem, this means we should
// make minimal assumptions about what's available there.
//
// Any pipeline that implements the "Build" interface will be returned
// from "Manifest.BuildPipeline()"
type Build interface {
Name() string
Checkpoint()

11
vendor/github.com/osbuild/images/pkg/manifest/efi_boot_tree.go generated vendored
View file

@ -18,6 +18,9 @@ type EFIBootTree struct {
ISOLabel string
KernelOpts []string
// Default Grub2 menu on the ISO
DefaultMenu int
}
func NewEFIBootTree(buildPipeline Build, product, version string) *EFIBootTree {
@ -43,6 +46,13 @@ func (p *EFIBootTree) serialize() osbuild.Pipeline {
panic("unsupported architecture")
}
var grub2config *osbuild.Grub2Config
if p.DefaultMenu > 0 {
grub2config = &osbuild.Grub2Config{
Default: p.DefaultMenu,
}
}
grubOptions := &osbuild.GrubISOStageOptions{
Product: osbuild.Product{
Name: p.product,
@ -56,6 +66,7 @@ func (p *EFIBootTree) serialize() osbuild.Pipeline {
Architectures: architectures,
Vendor: p.UEFIVendor,
FIPS: p.Platform.GetFIPSMenu(),
Config: grub2config,
}
grub2Stage := osbuild.NewGrubISOStage(grubOptions)
pipeline.AddStage(grub2Stage)

35
vendor/github.com/osbuild/images/pkg/manifest/installer.go generated vendored Normal file
View file

@ -0,0 +1,35 @@
package manifest
// Contains all configuration applied to installer type images such as
// Anaconda or CoreOS installer ones.
type InstallerCustomizations struct {
FIPS bool
AdditionalKernelOpts []string
EnabledAnacondaModules []string
DisabledAnacondaModules []string
AdditionalDracutModules []string
AdditionalDrivers []string
// Uses the old, deprecated, Anaconda config option "kickstart-modules".
// Only for RHEL 8.
UseLegacyAnacondaConfig bool
// Temporary
UseRHELLoraxTemplates bool
ISORootfsType ISORootfsType
ISOBoot ISOBootType
DefaultMenu int
// If set, the kickstart file will be added to the bootiso-tree at the
// default path for osbuild, otherwise any kickstart options will be
// configured in the default location for interactive defaults in the
// rootfs. Enabling UnattendedKickstart automatically enables this option
// because automatic installations cannot be configured using interactive
// defaults.
ISORootKickstart bool
}

22
vendor/github.com/osbuild/images/pkg/manifest/manifest.go generated vendored
View file

@ -234,6 +234,28 @@ func (m Manifest) GetExports() []string {
return exports
}
func (m *Manifest) pipelineRoles() (build []string, payload []string) {
for _, pipeline := range m.pipelines {
switch pipeline.(type) {
case Build:
build = append(build, pipeline.Name())
default:
payload = append(payload, pipeline.Name())
}
}
return build, payload
}
func (m *Manifest) PayloadPipelines() []string {
_, payload := m.pipelineRoles()
return payload
}
func (m *Manifest) BuildPipelines() []string {
build, _ := m.pipelineRoles()
return build
}
// filterRepos returns a list of repositories that specify the given pipeline
// name in their PackageSets list in addition to any global repositories
// (global repositories are ones that do not specify any PackageSets).

2
vendor/github.com/osbuild/images/pkg/osbuild/grub2_iso_legacy_stage.go generated vendored
View file

@ -12,6 +12,8 @@ type Grub2ISOLegacyStageOptions struct {
ISOLabel string `json:"isolabel"`
FIPS bool `json:"fips,omitempty"`
Config *Grub2Config `json:"config,omitempty"`
}
func (Grub2ISOLegacyStageOptions) isStageOptions() {}

11
vendor/github.com/osbuild/images/pkg/osbuild/grub_iso_stage.go generated vendored
View file

@ -16,6 +16,8 @@ type GrubISOStageOptions struct {
Vendor string `json:"vendor,omitempty"`
FIPS bool `json:"fips,omitempty"`
Config *Grub2Config `json:"config,omitempty"`
}
func (GrubISOStageOptions) isStageOptions() {}
@ -51,6 +53,15 @@ type ISOKernel struct {
Opts []string `json:"opts,omitempty"`
}
type Grub2Config struct {
// Override the default grub menu timeout
// Note: 0 means to not override the stage default
Timeout int `json:"timeout,omitempty"`
// Override the default boot menu entry
Default int `json:"default,omitempty"`
}
// Assemble a file system tree for a bootable ISO
func NewGrubISOStage(options *GrubISOStageOptions) *Stage {
if err := options.validate(); err != nil {

Some files were not shown because too many files have changed in this diff Show more