From d6fd6a9be507d32ec08177486b80a93e6535fda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Hozza?= Date: Tue, 3 Sep 2024 10:48:35 +0200 Subject: [PATCH] Update osbuild/images to v0.82.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Tomáš Hozza --- go.mod | 2 +- go.sum | 4 ++-- .../images/pkg/blueprint/customizations.go | 2 +- .../blueprint/filesystem_customizations.go | 19 +++++++++---------- .../images/pkg/distro/rhel/rhel10/gce.go | 3 ++- vendor/modules.txt | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/go.mod b/go.mod index a67f14b767..dc09979cfb 100644 --- a/go.mod +++ b/go.mod @@ -46,7 +46,7 @@ require ( github.com/labstack/gommon v0.4.2 github.com/openshift-online/ocm-sdk-go v0.1.438 github.com/oracle/oci-go-sdk/v54 v54.0.0 - github.com/osbuild/images v0.81.0 + github.com/osbuild/images v0.82.0 github.com/osbuild/osbuild-composer/pkg/splunk_logger v0.0.0-20240814102216-0239db53236d github.com/osbuild/pulp-client v0.1.0 github.com/prometheus/client_golang v1.20.2 diff --git a/go.sum b/go.sum index 9d35163eae..0ce331e9f3 100644 --- a/go.sum +++ b/go.sum @@ -510,8 +510,8 @@ github.com/openshift-online/ocm-sdk-go v0.1.438 h1:tsLCCUzbLCTL4RZG02y9RuopmGCXp github.com/openshift-online/ocm-sdk-go v0.1.438/go.mod h1:CiAu2jwl3ITKOxkeV0Qnhzv4gs35AmpIzVABQLtcI2Y= 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/images v0.81.0 h1:p5v94tFL5StKvsyshkZ1flPiq7mt11RKt/vbzTuWDbA= -github.com/osbuild/images v0.81.0/go.mod h1:1kJyvTtEbJfRv00phwd9Dlkai4/V05JhNACglxFTxS8= +github.com/osbuild/images v0.82.0 h1:bWfcGHHQR6pYZnv4jAxmLWxEkw669Zb6C2ADcyuf49g= +github.com/osbuild/images v0.82.0/go.mod h1:1kJyvTtEbJfRv00phwd9Dlkai4/V05JhNACglxFTxS8= 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/osbuild/pulp-client v0.1.0 h1:L0C4ezBJGTamN3BKdv+rKLuq/WxXJbsFwz/Hj7aEmJ8= diff --git a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go index 23addb9c93..d361626f53 100644 --- a/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go +++ b/vendor/github.com/osbuild/images/pkg/blueprint/customizations.go @@ -228,7 +228,7 @@ func (c *Customizations) GetTimezoneSettings() (*string, []string) { } func (c *Customizations) GetUsers() []UserCustomization { - if c == nil { + if c == nil || (c.SSHKey == nil && c.User == nil) { return nil } diff --git a/vendor/github.com/osbuild/images/pkg/blueprint/filesystem_customizations.go b/vendor/github.com/osbuild/images/pkg/blueprint/filesystem_customizations.go index 829f72e952..ad0ac1c492 100644 --- a/vendor/github.com/osbuild/images/pkg/blueprint/filesystem_customizations.go +++ b/vendor/github.com/osbuild/images/pkg/blueprint/filesystem_customizations.go @@ -24,17 +24,17 @@ func (fsc *FilesystemCustomization) UnmarshalTOML(data interface{}) error { return fmt.Errorf("TOML unmarshal: mountpoint must be string, got %v of type %T", d["mountpoint"], d["mountpoint"]) } - switch d["size"].(type) { + switch d["minsize"].(type) { case int64: - fsc.MinSize = uint64(d["size"].(int64)) + fsc.MinSize = uint64(d["minsize"].(int64)) case string: - size, err := common.DataSizeToUint64(d["size"].(string)) + minSize, err := common.DataSizeToUint64(d["minsize"].(string)) if err != nil { - return fmt.Errorf("TOML unmarshal: size is not valid filesystem size (%w)", err) + return fmt.Errorf("TOML unmarshal: minsize is not valid filesystem size (%w)", err) } - fsc.MinSize = size + fsc.MinSize = minSize default: - return fmt.Errorf("TOML unmarshal: size must be integer or string, got %v of type %T", d["size"], d["size"]) + return fmt.Errorf("TOML unmarshal: minsize must be integer or string, got %v of type %T", d["minsize"], d["minsize"]) } return nil @@ -57,14 +57,13 @@ func (fsc *FilesystemCustomization) UnmarshalJSON(data []byte) error { // The JSON specification only mentions float64 and Go defaults to it: https://go.dev/blog/json switch d["minsize"].(type) { case float64: - // Note that it uses different key than the TOML version fsc.MinSize = uint64(d["minsize"].(float64)) case string: - size, err := common.DataSizeToUint64(d["minsize"].(string)) + minSize, err := common.DataSizeToUint64(d["minsize"].(string)) if err != nil { - return fmt.Errorf("JSON unmarshal: size is not valid filesystem size (%w)", err) + return fmt.Errorf("JSON unmarshal: minsize is not valid filesystem size (%w)", err) } - fsc.MinSize = size + fsc.MinSize = minSize default: return fmt.Errorf("JSON unmarshal: minsize must be float64 number or string, got %v of type %T", d["minsize"], d["minsize"]) } diff --git a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/gce.go b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/gce.go index e1a0cf811e..7ad9e1fd57 100644 --- a/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/gce.go +++ b/vendor/github.com/osbuild/images/pkg/distro/rhel/rhel10/gce.go @@ -155,7 +155,8 @@ func gceCommonPackageSet(t *rhel.ImageType) rpmmd.PackageSet { // the el9 version depends on libboost_regex.so.1.75.0()(64bit), which is not available on el10 //"google-compute-engine", "google-osconfig-agent", - "gce-disk-expand", + // Requires gdisk which was removed late in the RHEL 10 development cycle + // "gce-disk-expand", // cloud-init is a replacement for "google-compute-engine", remove once the package is available "cloud-init", diff --git a/vendor/modules.txt b/vendor/modules.txt index f02ae33093..63e30955db 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -947,7 +947,7 @@ github.com/oracle/oci-go-sdk/v54/identity github.com/oracle/oci-go-sdk/v54/objectstorage github.com/oracle/oci-go-sdk/v54/objectstorage/transfer github.com/oracle/oci-go-sdk/v54/workrequests -# github.com/osbuild/images v0.81.0 +# github.com/osbuild/images v0.82.0 ## explicit; go 1.21.0 github.com/osbuild/images/internal/common github.com/osbuild/images/internal/environment