Merge branch 'main' into v1.6736.0

Author: jremy42

packages_generated/k8s/src/v1/marshalling.gen.ts

@@ -528,6 +528,7 @@ export const unmarshalNodeMetadata = (data: unknown): NodeMetadata => {
     externalIp: data.external_ip,
     hasGpu: data.has_gpu,
     id: data.id,
+    installerTags: data.installer_tags,
     kubeletConfig: data.kubelet_config,
     name: data.name,
     nodeLabels: data.node_labels,
@@ -536,7 +537,12 @@ export const unmarshalNodeMetadata = (data: unknown): NodeMetadata => {
       unmarshalNodeMetadataCoreV1Taint,
     ),
     poolVersion: data.pool_version,
+    providerId: data.provider_id,
     repoUri: data.repo_uri,
+    resolvconfPath: data.resolvconf_path,
+    updaterBinPath: data.updater_bin_path,
+    updaterBinUrl: data.updater_bin_url,
+    updaterBinVersion: data.updater_bin_version,
   } as NodeMetadata
 }
 

packages_generated/k8s/src/v1/types.gen.ts

@@ -1500,9 +1500,15 @@ export interface NodeMetadata {
   kubeletConfig: string
   nodeLabels: Record<string, string>
   nodeTaints: NodeMetadataCoreV1Taint[]
+  providerId: string
+  resolvconfPath: string
   hasGpu: boolean
   externalIp: string
   repoUri: string
+  installerTags: string
+  updaterBinUrl: string
+  updaterBinVersion: string
+  updaterBinPath: string
 }
 
 export type RebootNodeRequest = {

packages_generated/product_catalog/src/v2alpha1/marshalling.gen.ts

@@ -14,6 +14,7 @@ import type {
   PublicCatalogProductPrice,
   PublicCatalogProductProperties,
   PublicCatalogProductPropertiesAppleSilicon,
+  PublicCatalogProductPropertiesBlockStorage,
   PublicCatalogProductPropertiesDedibox,
   PublicCatalogProductPropertiesElasticMetal,
   PublicCatalogProductPropertiesHardware,
@@ -163,6 +164,21 @@ const unmarshalPublicCatalogProductPropertiesAppleSilicon = (
   } as PublicCatalogProductPropertiesAppleSilicon
 }
 
+const unmarshalPublicCatalogProductPropertiesBlockStorage = (
+  data: unknown,
+): PublicCatalogProductPropertiesBlockStorage => {
+  if (!isJSONObject(data)) {
+    throw new TypeError(
+      `Unmarshalling the type 'PublicCatalogProductPropertiesBlockStorage' failed as data isn't a dictionary.`,
+    )
+  }
+
+  return {
+    maxVolumeSize: data.max_volume_size,
+    minVolumeSize: data.min_volume_size,
+  } as PublicCatalogProductPropertiesBlockStorage
+}
+
 const unmarshalPublicCatalogProductPropertiesDedibox = (
   data: unknown,
 ): PublicCatalogProductPropertiesDedibox => {
@@ -296,6 +312,9 @@ const unmarshalPublicCatalogProductProperties = (
     appleSilicon: data.apple_silicon
       ? unmarshalPublicCatalogProductPropertiesAppleSilicon(data.apple_silicon)
       : undefined,
+    blockStorage: data.block_storage
+      ? unmarshalPublicCatalogProductPropertiesBlockStorage(data.block_storage)
+      : undefined,
     dedibox: data.dedibox
       ? unmarshalPublicCatalogProductPropertiesDedibox(data.dedibox)
       : undefined,

packages_generated/product_catalog/src/v2alpha1/types.gen.ts

@@ -185,6 +185,17 @@ export interface PublicCatalogProductPropertiesAppleSilicon {
   range: string
 }
 
+export interface PublicCatalogProductPropertiesBlockStorage {
+  /**
+   * The minimum size of storage volume for this product in bytes.
+   */
+  minVolumeSize: number
+  /**
+   * The maximum size of storage volume for this product in bytes.
+   */
+  maxVolumeSize: number
+}
+
 export interface PublicCatalogProductPropertiesDedibox {
   /**
    * The range of the Dedibox server.
@@ -284,27 +295,33 @@ export interface PublicCatalogProductProperties {
   /**
    * The properties of Dedibox products.
    *
-   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance' could be set.
+   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance', 'blockStorage' could be set.
    */
   dedibox?: PublicCatalogProductPropertiesDedibox
   /**
    * The properties of Elastic Metal products.
    *
-   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance' could be set.
+   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance', 'blockStorage' could be set.
    */
   elasticMetal?: PublicCatalogProductPropertiesElasticMetal
   /**
    * The properties of Apple Silicon products.
    *
-   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance' could be set.
+   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance', 'blockStorage' could be set.
    */
   appleSilicon?: PublicCatalogProductPropertiesAppleSilicon
   /**
    * The properties of Instance products.
    *
-   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance' could be set.
+   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance', 'blockStorage' could be set.
    */
   instance?: PublicCatalogProductPropertiesInstance
+  /**
+   * The properties of Block Storage products.
+   *
+   * One-of ('properties'): at most one of 'dedibox', 'elasticMetal', 'appleSilicon', 'instance', 'blockStorage' could be set.
+   */
+  blockStorage?: PublicCatalogProductPropertiesBlockStorage
 }
 
 export interface PublicCatalogProductUnitOfMeasure {