fix: remove amd_opteron mentions (#262)

ionos-cloud · Sep 5, 2024 · a430400 · a430400
1 parent 5421ebf
commit a430400
Show file tree

Hide file tree

Showing 16 changed files with 19 additions and 22 deletions.
diff --git a/cluster/local/integration_tests_k8s.sh b/cluster/local/integration_tests_k8s.sh
@@ -135,7 +135,7 @@ spec:
       time: "23:40:58"
     name: exampleK8sNodepool
     nodeCount: 1
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
     coresCount: 1
     ramSize: 2048
     availabilityZone: AUTO
@@ -233,7 +233,7 @@ spec:
   forProvider:
     name: exampleK8sNodepool
     nodeCount: 1
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
     coresCount: 1
     ramSize: 2048
     availabilityZone: AUTO

diff --git a/docs/api/compute-engine/server.md b/docs/api/compute-engine/server.md
@@ -85,7 +85,7 @@ In order to configure the IONOS Cloud Resource, the user can set the `spec.forPr
 * `cpuFamily` (string)
 	* description: CPU architecture on which server gets provisioned; not all CPU architectures are available in all datacenter regions;
 available CPU architectures can be retrieved from the datacenter resource.
-	* possible values: "AMD_OPTERON";"INTEL_SKYLAKE";"INTEL_XEON"
+	* possible values: "INTEL_SKYLAKE";"INTEL_XEON"
 * `datacenterConfig` (object)
 	* description: DatacenterConfig contains information about the datacenter resource
 on which the server will be created.
@@ -227,4 +227,3 @@ The corresponding resource definition can be found [here](https://github.com/ion
 ## Resource Instance Example
 
 An example of a resource instance can be found [here](https://github.com/ionos-cloud/crossplane-provider-ionoscloud/tree/master/examples/ionoscloud/compute/server.yaml).
-
diff --git a/docs/api/compute-engine/serverset.md b/docs/api/compute-engine/serverset.md
@@ -267,7 +267,7 @@ Version increases if the Server is re-created due to an immutable field changing
 				* `cpuFamily` (string)
 					* description: CPU architecture on which server gets provisioned; not all CPU architectures are available in all datacenter regions;
 available CPU architectures can be retrieved from the datacenter resource.
-					* possible values: "AMD_OPTERON";"INTEL_SKYLAKE";"INTEL_XEON"
+					* possible values: "INTEL_SKYLAKE";"INTEL_XEON"
 				* `nics` (array)
 					* description: NICs are the network interfaces of the server.
 					* properties:
@@ -314,4 +314,3 @@ The corresponding resource definition can be found [here](https://github.com/ion
 ## Resource Instance Example
 
 An example of a resource instance can be found [here](https://github.com/ionos-cloud/crossplane-provider-ionoscloud/tree/master/examples/ionoscloud/compute/serverset.yaml).
-
diff --git a/docs/api/compute-engine/statefulserverset.md b/docs/api/compute-engine/statefulserverset.md
@@ -293,7 +293,7 @@ Version increases if the Server is re-created due to an immutable field changing
 				* `cpuFamily` (string)
 					* description: CPU architecture on which server gets provisioned; not all CPU architectures are available in all datacenter regions;
 available CPU architectures can be retrieved from the datacenter resource.
-					* possible values: "AMD_OPTERON";"INTEL_SKYLAKE";"INTEL_XEON"
+					* possible values: "INTEL_SKYLAKE";"INTEL_XEON"
 				* `nics` (array)
 					* description: NICs are the network interfaces of the server.
 					* properties:
@@ -372,4 +372,3 @@ The corresponding resource definition can be found [here](https://github.com/ion
 ## Resource Instance Example
 
 An example of a resource instance can be found [here](https://github.com/ionos-cloud/crossplane-provider-ionoscloud/tree/master/examples/ionoscloud/compute/statefulserverset.yaml).
-
diff --git a/examples/composition/claim.yaml b/examples/composition/claim.yaml
@@ -12,4 +12,4 @@ spec:
     clusterName: testK8sCluster
     clusterPublic: true
     nodepoolName: testK8sNodepool
-    nodepoolCpuFamily: AMD_OPTERON
+    nodepoolCpuFamily: INTEL_XEON
diff --git a/examples/composition/composite.yaml b/examples/composition/composite.yaml
@@ -10,4 +10,4 @@ spec:
     clusterName: testK8sClusterXR
     clusterPublic: true
     nodepoolName: testK8sNodepoolXR
-    nodepoolCpuFamily: AMD_OPTERON
+    nodepoolCpuFamily: INTEL_XEON
diff --git a/examples/composition/composition.yaml b/examples/composition/composition.yaml
@@ -66,7 +66,7 @@ spec:
           forProvider:
             name: exampleK8sNodepool
             nodeCount: 1
-            cpuFamily: AMD_OPTERON
+            cpuFamily: INTEL_XEON
             coresCount: 1
             ramSize: 2048
             availabilityZone: AUTO

diff --git a/examples/ionoscloud/compute/all.yaml b/examples/ionoscloud/compute/all.yaml
@@ -62,7 +62,7 @@ spec:
     cores: 2
     ram: 2048
     availabilityZone: AUTO
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
     datacenterConfig:
       datacenterIdRef:
         name: example

diff --git a/examples/ionoscloud/compute/server.yaml b/examples/ionoscloud/compute/server.yaml
@@ -20,7 +20,7 @@ spec:
     cores: 4
     ram: 2048
     availabilityZone: AUTO
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
     datacenterConfig:
       datacenterIdRef:
         name: example

diff --git a/examples/ionoscloud/dataplatform/dataplatformcluster.yaml b/examples/ionoscloud/dataplatform/dataplatformcluster.yaml
@@ -31,6 +31,6 @@ spec:
       datacenterIdRef:
         name: example
     name: exampleCluster
-    version: "23.11"
+    version: "24.3"
   providerConfigRef:
     name: example
diff --git a/examples/ionoscloud/dataplatform/dataplatformnodepool.yaml b/examples/ionoscloud/dataplatform/dataplatformnodepool.yaml
@@ -17,7 +17,7 @@ spec:
     nodeCount: 2
     # Note: If the CPU Family is not set, the Crossplane Provider
     # will set the first one offered by the Datacenter.
-#    cpuFamily: AMD_OPTERON
+#    cpuFamily: INTEL_XEON
 #    coresCount: 1
 #    ramSize: 2048
 #    availabilityZone: AUTO

diff --git a/examples/ionoscloud/k8s/all.yaml b/examples/ionoscloud/k8s/all.yaml
@@ -90,7 +90,7 @@ spec:
     nodeCount: 1
     # Note: If the CPU Family is not set, the Crossplane Provider
     # will set the first one offered by the Datacenter.
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
     coresCount: 1
     ramSize: 2048
     availabilityZone: AUTO

diff --git a/examples/ionoscloud/k8s/k8s-nodepool.yaml b/examples/ionoscloud/k8s/k8s-nodepool.yaml
@@ -21,7 +21,7 @@ spec:
     nodeCount: 1
     # Note: If the CPU Family is not set, the Crossplane Provider
     # will set the first one offered by the Datacenter.
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
     coresCount: 1
     ramSize: 2048
     availabilityZone: AUTO

diff --git a/examples/server-composition/claim.yaml b/examples/server-composition/claim.yaml
@@ -13,4 +13,4 @@ spec:
     serverName: server
     cores: 4
     ram: 2048
-    cpuFamily: AMD_OPTERON
+    cpuFamily: INTEL_XEON
diff --git a/examples/server-composition/composition.yaml b/examples/server-composition/composition.yaml
@@ -56,7 +56,7 @@ spec:
             cores: 4
             ram: 2048
             availabilityZone: AUTO
-            cpuFamily: AMD_OPTERON
+            cpuFamily: INTEL_XEON
       patches:
         - type: FromCompositeFieldPath
           fromFieldPath: spec.parameters.serverName
@@ -102,7 +102,7 @@ spec:
             cores: 4
             ram: 2048
             availabilityZone: AUTO
-            cpuFamily: AMD_OPTERON
+            cpuFamily: INTEL_XEON
       patches:
         - type: FromCompositeFieldPath
           fromFieldPath: spec.parameters.serverName
@@ -348,4 +348,4 @@ spec:
       patches:
         - type: FromCompositeFieldPath
           fromFieldPath: spec.resourceRefs[0].name
-          toFieldPath: spec.forProvider.datacenterConfig.datacenterIdRef.name
+          toFieldPath: spec.forProvider.datacenterConfig.datacenterIdRef.name
diff --git a/internal/controller/serverset/serverset_test.go b/internal/controller/serverset/serverset_test.go
@@ -61,7 +61,7 @@ const (
 	server1Name        = "serverset-server-0-0"
 	server2Name        = "serverset-server-1-0"
 	serverNotReadyName = "server-not-ready"
-	serverSetCPUFamily = "AMD_OPTERON"
+	serverSetCPUFamily = "INTEL_XEON"
 	serverSetCores     = 2
 	serverSetRAM       = 4096
 	serverSetName      = "serverset"