Remove memoryInGBs from our templates

We are removing this from our main templates otherwise we have to set a default which users might not set when changing the OCPU and could cause issues.
oracle · Mar 23, 2022 · 4025ace · 4025ace
1 parent a69c806
commit 4025ace
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 101 deletions.
diff --git a/docs/src/gs/create-workload-cluster.md b/docs/src/gs/create-workload-cluster.md
diff --git a/scripts/ci-conformance.sh b/scripts/ci-conformance.sh
@@ -27,12 +27,10 @@ export TAG="${defaultTag:-dev}"
 export GINKGO_NODES=3
 
 export OCI_SSH_KEY="${OCI_SSH_KEY:-""}"
-export OCI_CONTROL_PLANE_SHAPE="${OCI_CONTROL_PLANE_SHAPE:-"VM.Standard.E3.Flex"}"
-export OCI_CONTROL_PLANE_SHAPE_OCPUS="${OCI_CONTROL_PLANE_SHAPE_OCPUS:-"1"}"
-export OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS="${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS:-"16"}"
-export OCI_WORKER_SHAPE="${OCI_WORKER_SHAPE:-"VM.Standard.E3.Flex"}"
-export OCI_WORKER_SHAPE_OCPUS="${OCI_WORKER_SHAPE_OCPUS:-"1"}"
-export OCI_WORKER_SHAPE_MEMORY_IN_GBS="${OCI_WORKER_SHAPE_MEMORY_IN_GBS:-"16"}"
+export OCI_CONTROL_PLANE_MACHINE_TYPE="${OCI_CONTROL_PLANE_MACHINE_TYPE:-"VM.Standard.E3.Flex"}"
+export OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS="${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS:-"1"}"
+export OCI_NODE_MACHINE_TYPE="${OCI_NODE_MACHINE_TYPE:-"VM.Standard.E3.Flex"}"
+export OCI_NODE_MACHINE_TYPE_OCPUS="${OCI_NODE_MACHINE_TYPE_OCPUS:-"1"}"
 export KIND_EXPERIMENTAL_DOCKER_NETWORK="bridge"
 
 # Generate SSH key.

diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh
@@ -31,12 +31,10 @@ export TAG="${defaultTag:-dev}"
 export GINKGO_NODES=3
 
 export OCI_SSH_KEY="${OCI_SSH_KEY:-""}"
-export OCI_CONTROL_PLANE_SHAPE="${OCI_CONTROL_PLANE_SHAPE:-"VM.Standard.E3.Flex"}"
-export OCI_CONTROL_PLANE_SHAPE_OCPUS="${OCI_CONTROL_PLANE_SHAPE_OCPUS:-"1"}"
-export OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS="${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS:-"16"}"
-export OCI_WORKER_SHAPE="${OCI_WORKER_SHAPE:-"VM.Standard.E3.Flex"}"
-export OCI_WORKER_SHAPE_OCPUS="${OCI_WORKER_SHAPE_OCPUS:-"1"}"
-export OCI_WORKER_SHAPE_MEMORY_IN_GBS="${OCI_WORKER_SHAPE_MEMORY_IN_GBS:-"16"}"
+export OCI_CONTROL_PLANE_MACHINE_TYPE="${OCI_CONTROL_PLANE_MACHINE_TYPE:-"VM.Standard.E3.Flex"}"
+export OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS="${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS:-"1"}"
+export OCI_NODE_MACHINE_TYPE="${OCI_NODE_MACHINE_TYPE:-"VM.Standard.E3.Flex"}"
+export OCI_NODE_MACHINE_TYPE_OCPUS="${OCI_NODE_MACHINE_TYPE_OCPUS:-"1"}"
 export KIND_EXPERIMENTAL_DOCKER_NETWORK="bridge"
 
 # Generate SSH key.

diff --git a/templates/cluster-template-antrea.yaml b/templates/cluster-template-antrea.yaml
@@ -294,10 +294,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_CONTROL_PLANE_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true}
@@ -311,10 +310,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_WORKER_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_WORKER_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
@@ -338,7 +336,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:

diff --git a/templates/cluster-template-arm-free-tier.yaml b/templates/cluster-template-arm-free-tier.yaml
@@ -102,12 +102,11 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       networkDetails:
         assignPublicIp: true
       shapeConfig:
-        ocpus: "${OCI_CONTROL_PLANE_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       IsPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true}
@@ -121,12 +120,11 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       networkDetails:
         assignPublicIp: true
       shapeConfig:
-        ocpus: "${OCI_WORKER_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_WORKER_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       IsPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
@@ -153,7 +151,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:

diff --git a/templates/cluster-template-failure-domain-spread.yaml b/templates/cluster-template-failure-domain-spread.yaml
@@ -80,10 +80,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_CONTROL_PLANE_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true}
@@ -97,10 +96,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_WORKER_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_WORKER_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
@@ -124,7 +122,7 @@ metadata:
   name: "${CLUSTER_NAME}-fd-1-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:
@@ -148,7 +146,7 @@ metadata:
   name: "${CLUSTER_NAME}-fd-2-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:
@@ -172,7 +170,7 @@ metadata:
   name: "${CLUSTER_NAME}-fd-3-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:

diff --git a/templates/cluster-template-oci-addons.yaml b/templates/cluster-template-oci-addons.yaml
@@ -80,10 +80,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_CONTROL_PLANE_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true}
@@ -97,10 +96,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_WORKER_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_WORKER_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
@@ -124,7 +122,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:

diff --git a/templates/cluster-template-oraclelinux.yaml b/templates/cluster-template-oraclelinux.yaml
@@ -82,10 +82,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_CONTROL_PLANE_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true}
@@ -99,10 +98,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_WORKER_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_WORKER_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
@@ -129,7 +127,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:

diff --git a/templates/cluster-template.yaml b/templates/cluster-template.yaml
@@ -80,10 +80,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_CONTROL_PLANE_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_CONTROL_PLANE_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true}
@@ -97,10 +96,9 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE=VM.Standard.E4.Flex}"
+      shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}"
       shapeConfig:
-        ocpus: "${OCI_WORKER_SHAPE_OCPUS=1}"
-        memoryInGBs: "${OCI_WORKER_SHAPE_MEMORY_IN_GBS=16}"
+        ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}"
       metadata:
         ssh_authorized_keys: "${OCI_SSH_KEY}"
       isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true}
@@ -124,7 +122,7 @@ metadata:
   name: "${CLUSTER_NAME}-md-0"
 spec:
   clusterName: "${CLUSTER_NAME}"
-  replicas: ${WORKER_MACHINE_COUNT}
+  replicas: ${NODE_MACHINE_COUNT}
   selector:
     matchLabels:
   template:

diff --git a/test/e2e/data/infrastructure-oci/v1beta1/bases/cluster.yaml b/test/e2e/data/infrastructure-oci/v1beta1/bases/cluster.yaml
@@ -81,7 +81,7 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_CONTROL_PLANE_SHAPE}"
+      shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE}"
       shapeConfig:
         ocpus: "1"
       metadata:

diff --git a/test/e2e/data/infrastructure-oci/v1beta1/bases/md.yaml b/test/e2e/data/infrastructure-oci/v1beta1/bases/md.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE}"
+      shape: "${OCI_NODE_MACHINE_TYPE}"
       shapeConfig:
         ocpus: "1"
       metadata:

diff --git a/test/e2e/data/infrastructure-oci/v1beta1/cluster-template-multiple-node-nsg/md.yaml b/test/e2e/data/infrastructure-oci/v1beta1/cluster-template-multiple-node-nsg/md.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       imageId: "${OCI_IMAGE_ID}"
       compartmentId: "${OCI_COMPARTMENT_ID}"
-      shape: "${OCI_WORKER_SHAPE}"
+      shape: "${OCI_NODE_MACHINE_TYPE}"
       subnetName: "worker-subnet-2"
       nsgName: "worker-nsg-2"
       shapeConfig:

diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go
@@ -188,7 +188,7 @@ func makeOCIMachineTemplate(namespace, name string) *infrastructurev1beta1.OCIMa
 			Template: infrastructurev1beta1.OCIMachineTemplateResource{
 				Spec: infrastructurev1beta1.OCIMachineSpec{
 					ImageId: os.Getenv("OCI_UPGRADE_IMAGE_ID"),
-					Shape:   os.Getenv("OCI_WORKER_SHAPE"),
+					Shape:   os.Getenv("OCI_NODE_MACHINE_TYPE"),
 					ShapeConfig: infrastructurev1beta1.ShapeConfig{
 						Ocpus: "1",
 					},