Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion inventory/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.31.4-dev
2.32.0
39 changes: 1 addition & 38 deletions inventory/api/compute/v1/compute.proto
Original file line number Diff line number Diff line change
Expand Up @@ -628,19 +628,9 @@ message InstanceResource {
HostResource host = 9 [(ent.edge) = {unique: true}]; // Host this Instance is placed on. Only applicable to baremetal instances.
reserved 10; // Reserve for User edge

os.v1.OperatingSystemResource desired_os = 11 [(ent.edge) = {
unique: true
required: true
}]; // Deprecated, use OSUpdatePolicy for driving day2, and os for day0 operations instead. OS resource that should be installed to this Instance.

os.v1.OperatingSystemResource current_os = 25 [(ent.edge) = {
unique: true
required: false
}]; // Deprecated, use os field instead. OS resource that is currently installed for this Instance.

os.v1.OperatingSystemResource os = 12 [(ent.edge) = {
unique: true
required: false
required: true
}]; // OS resource that is installed for this Instance.

os.v1.SecurityFeature security_feature = 14 [(ent.field) = {
Expand Down Expand Up @@ -680,11 +670,6 @@ message InstanceResource {
]; // textual message that describes the update status of Instance. Set by RMs only.
status.v1.StatusIndication update_status_indicator = 22 [(ent.field) = {optional: true}]; // Indicates interpretation of update_status. Set by RMs only.
uint64 update_status_timestamp = 23 [(ent.field) = {optional: true}]; // UTC timestamp when update_status was last changed. Set by RMs only.
string update_status_detail = 24 [
(ent.field) = {optional: true},
(buf.validate.field).string = {max_bytes: 100000},
(buf.validate.field).ignore = IGNORE_IF_UNPOPULATED
]; // Deprecated, will be removed in EMF v3.2.0, use OSUpdateRun instead. JSON field storing details of Instance update status. Set by RMs only. Beta, subject to change.

// A group of fields describing the Instance trusted_attestation status.
// trusted_attestation_status, trusted_attestation_status_indicator and
Expand Down Expand Up @@ -993,17 +978,6 @@ message OSUpdatePolicyResource {
}
];

string install_packages = 4 [
(ent.field) = {
immutable: true
optional: true
},
(buf.validate.field).string = {
pattern: "^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()\" \\\n]+$"
max_len: 500000
}
]; // Deprecated, use update_packages field instead. Freeform text, OS-dependent. A list of package names, one per line (newline separated). Should not contain version info. Applies only to Mutable OSes.

repeated string update_sources = 5 [
(ent.field) = {
immutable: true
Expand All @@ -1021,17 +995,6 @@ message OSUpdatePolicyResource {
}
]; // OS Update Sources. Should be in 'DEB822 Source Format' for Debian style OSs. Applies only to Mutable OSes.

string kernel_command = 6 [
(ent.field) = {
immutable: true
optional: true
},
(buf.validate.field).string = {
pattern: "^$|^[a-zA-Z-_0-9./:;=@?!#,<>*()\" ]+$"
max_len: 500
}
]; // Deprecated, use update_kernel_command field instead. Kernel Command Line Options. Applies only to Mutable OSes.

string update_packages = 7 [
(ent.field) = {
immutable: true
Expand Down
8 changes: 1 addition & 7 deletions inventory/api/os/v1/os.proto
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ message OperatingSystemResource {
immutable: true
}]; // user-provided, human-readable name of OS
string architecture = 3 [(ent.field) = {optional: true}]; // CPU architecture supported
string kernel_command = 4 [(ent.field) = {optional: true}]; // Kernel Command Line Options. Deprecated in EMF-v3.1, use OSUpdatePolicy.

repeated string update_sources = 5 [
(ent.field) = {optional: true},
(buf.validate.field).repeated.items.string = {max_bytes: 10000}
]; // OS Update Sources. Should be in 'DEB822 Source Format' for Debian style OSs. Deprecated in EMF-v3.1, use OSUpdatePolicy.

string image_url = 6 [(ent.field) = {
optional: true
Expand Down Expand Up @@ -107,7 +101,7 @@ message OperatingSystemResource {
string installed_packages = 9 [(ent.field) = {
optional: true
immutable: false
}]; // Freeform text, OS-dependent. A list of package names, one per line (newline separated). Should not contain version info. Deprecated in EMF-v3.1, use OSUpdatePolicy.
}]; // Freeform text, OS-dependent. A list of installed package names, one per line (newline separated). Populated internally for immutable OS only.

// The URL of the OS manifest which contains install packages details. This will be used to fill the installed_packages field
// for the advance use case to allow manual creation of OSProfiles when supported from backend.
Expand Down
9 changes: 1 addition & 8 deletions inventory/docs/api/inventory.md
Original file line number Diff line number Diff line change
Expand Up @@ -366,14 +366,12 @@
| resource_id | [string](#string) | | Resource ID of this OperatingSystemResource |
| name | [string](#string) | | user-provided, human-readable name of OS |
| architecture | [string](#string) | | CPU architecture supported |
| kernel_command | [string](#string) | | Kernel Command Line Options. Deprecated in EMF-v3.1, use OSUpdatePolicy. |
| update_sources | [string](#string) | repeated | OS Update Sources. Should be in &#39;DEB822 Source Format&#39; for Debian style OSs. Deprecated in EMF-v3.1, use OSUpdatePolicy. |
| image_url | [string](#string) | | OS image URL. URL of the original installation source. |
| image_id | [string](#string) | | OS image ID. This must be a unique identifier of OS image that can be retrieved from running OS. Used by IMMUTABLE only. |
| sha256 | [string](#string) | | SHA256 checksum of the OS resource in HEX. It&#39;s length is 32 bytes, but string representation of HEX is twice long (64 chars) |
| profile_name | [string](#string) | | Name of an OS profile that the OS resource belongs to. Uniquely identifies family of OSResources. |
| profile_version | [string](#string) | | Version of an OS profile that the OS resource belongs to. Along with profile_name uniquely identifies OS resource. |
| installed_packages | [string](#string) | | Freeform text, OS-dependent. A list of package names, one per line (newline separated). Should not contain version info. Deprecated in EMF-v3.1, use OSUpdatePolicy. |
| installed_packages | [string](#string) | | Freeform text, OS-dependent. A list of installed package names, one per line (newline separated). Populated internally for immutable OS only. |
| installed_packages_url | [string](#string) | | The URL of the OS manifest which contains install packages details. This will be used to fill the installed_packages field for the advance use case to allow manual creation of OSProfiles when supported from backend. |
| security_feature | [SecurityFeature](#os-v1-SecurityFeature) | | Indicating if this OS is capable of supporting features like Secure Boot (SB) and Full Disk Encryption (FDE). |
| os_type | [OsType](#os-v1-OsType) | | Indicating the type of OS (for example, mutable or immutable). |
Expand Down Expand Up @@ -740,8 +738,6 @@ host or hypervisor.
| vm_cpu_cores | [uint32](#uint32) | | Number of CPU cores. Only applicable to VM instances. |
| vm_storage_bytes | [uint64](#uint64) | | Storage quantity (primary), in bytes. Only applicable to VM instances. |
| host | [HostResource](#compute-v1-HostResource) | | Host this Instance is placed on. Only applicable to baremetal instances. |
| desired_os | [os.v1.OperatingSystemResource](#os-v1-OperatingSystemResource) | | Deprecated, use OSUpdatePolicy for driving day2, and os for day0 operations instead. OS resource that should be installed to this Instance. |
| current_os | [os.v1.OperatingSystemResource](#os-v1-OperatingSystemResource) | | Deprecated, use os field instead. OS resource that is currently installed for this Instance. |
| os | [os.v1.OperatingSystemResource](#os-v1-OperatingSystemResource) | | OS resource that is installed for this Instance. |
| security_feature | [os.v1.SecurityFeature](#os-v1-SecurityFeature) | | Select to enable security features such as Secure Boot (SB) and Full Disk Encryption (FDE). |
| instance_status | [string](#string) | | A group of fields describing the Instance runtime status. instance_status, instance_status_indicator and instance_status_timestamp should always be updated in one shot. If instance_status is empty during initialization, it is automatically set to a default value.
Expand All @@ -759,7 +755,6 @@ textual message that describes the provisioning status of Instance. Set by RMs o
textual message that describes the update status of Instance. Set by RMs only. |
| update_status_indicator | [status.v1.StatusIndication](#status-v1-StatusIndication) | | Indicates interpretation of update_status. Set by RMs only. |
| update_status_timestamp | [uint64](#uint64) | | UTC timestamp when update_status was last changed. Set by RMs only. |
| update_status_detail | [string](#string) | | Deprecated, will be removed in EMF v3.2.0, use OSUpdateRun instead. JSON field storing details of Instance update status. Set by RMs only. Beta, subject to change. |
| trusted_attestation_status | [string](#string) | | A group of fields describing the Instance trusted_attestation status. trusted_attestation_status, trusted_attestation_status_indicator and trusted_attestation_status_timestamp should always be updated in one shot. If trusted_attestation_status is empty during initialization, it is automatically set to a default value.

textual message that describes the trusted_attestation status of Instance. Set by RMs only. |
Expand Down Expand Up @@ -794,9 +789,7 @@ textual message that describes the trusted_attestation status of Instance. Set b
| resource_id | [string](#string) | | resource ID, generated by inventory on Create |
| name | [string](#string) | | User-provided, human-readable name of OSUpdatePolicy |
| description | [string](#string) | | |
| install_packages | [string](#string) | | Deprecated, use update_packages field instead. Freeform text, OS-dependent. A list of package names, one per line (newline separated). Should not contain version info. Applies only to Mutable OSes. |
| update_sources | [string](#string) | repeated | OS Update Sources. Should be in &#39;DEB822 Source Format&#39; for Debian style OSs. Applies only to Mutable OSes. |
| kernel_command | [string](#string) | | Deprecated, use update_kernel_command field instead. Kernel Command Line Options. Applies only to Mutable OSes. |
| update_packages | [string](#string) | | Freeform text, OS-dependent. A list of package names, one per line (newline separated). Should not contain version info. Applies only to Mutable OSes. |
| update_kernel_command | [string](#string) | | Kernel Command Line Options. Applies only to Mutable OSes. |
| target_os | [os.v1.OperatingSystemResource](#os-v1-OperatingSystemResource) | | OS resource that should be installed to this Instance. Applies only to Immutable OSes for A/B upgrades. The field is immutable. |
Expand Down
Loading
Loading