Merge branch 'main' into SPOTAUT-16530-umsSDKUpdate

spotinst · Sep 25, 2023 · a0081f5 · a0081f5
2 parents 1de51be + 7096568
commit a0081f5
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 1 deletion.
diff --git a/examples/service/ocean/providers/azure_np/create/main.go b/examples/service/ocean/providers/azure_np/create/main.go
@@ -75,6 +75,7 @@ func main() {
 					OsDiskType:         spotinst.String("Managed"),
 					OsType:             spotinst.String("Windows"),
 					OsSKU:              spotinst.String("Windows2019"),
+					KubernetesVersion:  spotinst.String("1.26"),
 				},
 				NodeCountLimits: &azure_np.NodeCountLimits{
 					MinCount: spotinst.Int(0),

diff --git a/examples/service/ocean/providers/azure_np/nodegroup/create/main.go b/examples/service/ocean/providers/azure_np/nodegroup/create/main.go
@@ -52,6 +52,7 @@ func main() {
 				OsDiskType:         spotinst.String("Managed"),
 				OsType:             spotinst.String("Windows"),
 				OsSKU:              spotinst.String("Windows2022"),
+				KubernetesVersion:  spotinst.String("1.26"),
 			},
 			NodeCountLimits: &azure_np.NodeCountLimits{
 				MinCount: spotinst.Int(0),

diff --git a/service/ocean/providers/aws/cluster.go b/service/ocean/providers/aws/cluster.go
@@ -2078,6 +2078,7 @@ type ClusterEBS struct {
 	VolumeSize          *int                      `json:"volumeSize,omitempty"`
 	Throughput          *int                      `json:"throughput,omitempty"`
 	DynamicVolumeSize   *ClusterDynamicVolumeSize `json:"dynamicVolumeSize,omitempty"`
+	DynamicIops         *ClusterDynamicIops       `json:"dynamicIops,omitempty"`
 
 	forceSendFields []string
 	nullFields      []string
@@ -2091,6 +2092,15 @@ type ClusterDynamicVolumeSize struct {
 	nullFields      []string
 }
 
+type ClusterDynamicIops struct {
+	BaseSize            *int    `json:"baseSize,omitempty"`
+	SizePerResourceUnit *int    `json:"sizePerResourceUnit,omitempty"`
+	Resource            *string `json:"resource,omitempty"`
+
+	forceSendFields []string
+	nullFields      []string
+}
+
 // region BlockDeviceMapping
 
 func (o ClusterBlockDeviceMappings) MarshalJSON() ([]byte, error) {
@@ -2186,6 +2196,13 @@ func (o *ClusterEBS) SetThroughput(v *int) *ClusterEBS {
 	return o
 }
 
+func (o *ClusterEBS) SetDynamicIops(v *ClusterDynamicIops) *ClusterEBS {
+	if o.DynamicIops = v; o.DynamicIops == nil {
+		o.nullFields = append(o.nullFields, "DynamicIops")
+	}
+	return o
+}
+
 // endregion
 
 // region DynamicVolumeSize
@@ -2219,6 +2236,37 @@ func (o *ClusterDynamicVolumeSize) SetSizePerResourceUnit(v *int) *ClusterDynami
 
 // endregion
 
+// region DynamicIops
+
+func (o ClusterDynamicIops) MarshalJSON() ([]byte, error) {
+	type noMethod ClusterDynamicIops
+	raw := noMethod(o)
+	return jsonutil.MarshalJSON(raw, o.forceSendFields, o.nullFields)
+}
+
+func (o *ClusterDynamicIops) SetBaseSize(v *int) *ClusterDynamicIops {
+	if o.BaseSize = v; o.BaseSize == nil {
+		o.nullFields = append(o.nullFields, "BaseSize")
+	}
+	return o
+}
+
+func (o *ClusterDynamicIops) SetResource(v *string) *ClusterDynamicIops {
+	if o.Resource = v; o.Resource == nil {
+		o.nullFields = append(o.nullFields, "Resource")
+	}
+	return o
+}
+
+func (o *ClusterDynamicIops) SetSizePerResourceUnit(v *int) *ClusterDynamicIops {
+	if o.SizePerResourceUnit = v; o.SizePerResourceUnit == nil {
+		o.nullFields = append(o.nullFields, "SizePerResourceUnit")
+	}
+	return o
+}
+
+// endregion
+
 // region ResourceTagSpecification
 
 func (o ResourceTagSpecification) MarshalJSON() ([]byte, error) {

diff --git a/service/ocean/providers/azure_np/common.go b/service/ocean/providers/azure_np/common.go
@@ -10,6 +10,7 @@ type NodePoolProperties struct {
 	OsDiskType         *string `json:"osDiskType,omitempty"`
 	OsType             *string `json:"osType,omitempty"`
 	OsSKU              *string `json:"osSKU,omitempty"`
+	KubernetesVersion  *string `json:"kubernetesVersion,omitempty"`
 
 	forceSendFields []string
 	nullFields      []string
@@ -63,6 +64,13 @@ func (o *NodePoolProperties) SetOsSKU(v *string) *NodePoolProperties {
 	return o
 }
 
+func (o *NodePoolProperties) SetKubernetesVersion(v *string) *NodePoolProperties {
+	if o.KubernetesVersion = v; o.KubernetesVersion == nil {
+		o.nullFields = append(o.nullFields, "KubernetesVersion")
+	}
+	return o
+}
+
 // endregion
 
 // NodeCountLimits region

diff --git a/spotinst/version.go b/spotinst/version.go
@@ -1,7 +1,7 @@
 package spotinst
 
 // SDKVersion is the current version of the SDK.
-const SDKVersion = "1.172.0"
+const SDKVersion = "1.174.0"
 
 // SDKName is the name of the SDK.
 const SDKName = "spotinst-sdk-go"