added e2e test for nsg-feature

Author: dranicu

Makefile

@@ -297,6 +297,7 @@ generate-e2e-templates: $(KUSTOMIZE)
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-managed-self-managed-nodes --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-managed-self-managed-nodes.yaml
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-machine-with-ipv6 --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-machine-with-ipv6.yaml
 	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-with-paravirt-bv --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-with-paravirt-bv.yaml
+	$(KUSTOMIZE) build $(OCI_TEMPLATES)/v1beta2/cluster-template-self-manage-nsg --load-restrictor LoadRestrictionsNone > $(OCI_TEMPLATES)/v1beta2/cluster-template-self-manage-nsg.yaml
 
 .PHONY: test-e2e-run
 test-e2e-run: generate-e2e-templates $(GINKGO) $(ENVSUBST) ## Run e2e tests

templates/cluster-template-with-nsg.yaml

@@ -36,7 +36,7 @@ spec:
   compartmentId: "${OCI_COMPARTMENT_ID}"
   networkSpec:
     vcn:
-      id: "${VCN_ID}"
+      id: "${EXTERNAL_VCN_ID}"
       skip: true
       networkSecurityGroup:
         skip: false
@@ -49,22 +49,22 @@ spec:
       routeTable:
         skip: true
       subnets:
-        - id: "${SUBNET_ID_CPE}"
+        - id: "${EXTERNAL_VCN_CPE_SUBNET}"
           role: control-plane-endpoint
           name: control-plane-endpoint
           type: public
           skip: true
-        - id: "${SUBNET_ID_W}"
+        - id: "${EXTERNAL_VCN_WORKER_SUBNET}"
           role: worker
           name: worker
           type: private
           skip: true
-        - id: "${SUBNET_ID_CP}"
+        - id: "${EXTERNAL_VCN_CP_SUBNET}"
           role: control-plane
           name: control-plane
           type: private
           skip: true
-        - id: "${SUBNET_ID_LB}"
+        - id: "${EXTERNAL_VCN_CPE_SUBNET}"
           role: service-lb
           name: service-lb
           type: public

test/e2e/cluster_test.go

@@ -582,6 +582,28 @@ var _ = Describe("Workload cluster creation", func() {
 		}, result)
 	})
 
+	It("Self manage NSG [PRBlocking]", func() {
+		clusterName = getClusterName(clusterNamePrefix, "self-manage-nsg")
+		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{
+			ClusterProxy: bootstrapClusterProxy,
+			ConfigCluster: clusterctl.ConfigClusterInput{
+				LogFolder:                filepath.Join(artifactFolder, "clusters", bootstrapClusterProxy.GetName()),
+				ClusterctlConfigPath:     clusterctlConfigPath,
+				KubeconfigPath:           bootstrapClusterProxy.GetKubeconfigPath(),
+				InfrastructureProvider:   clusterctl.DefaultInfrastructureProvider,
+				Flavor:                   "self-manage-nsg",
+				Namespace:                namespace.Name,
+				ClusterName:              clusterName,
+				KubernetesVersion:        e2eConfig.GetVariable(capi_e2e.KubernetesVersion),
+				ControlPlaneMachineCount: pointer.Int64(1),
+				WorkerMachineCount:       pointer.Int64(0),
+			},
+			CNIManifestPath:              e2eConfig.GetVariable(capi_e2e.CNIPath),
+			WaitForClusterIntervals:      e2eConfig.GetIntervals(specName, "wait-cluster"),
+			WaitForControlPlaneIntervals: e2eConfig.GetIntervals(specName, "wait-control-plane-nsg"),
+		}, result)
+	})
+
 	It("Machine Pool - Simple", func() {
 		clusterName = getClusterName(clusterNamePrefix, "machine-pool")
 		clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{

test/e2e/config/e2e_conf.yaml

@@ -79,6 +79,7 @@ providers:
           - sourcePath: "../data/infrastructure-oci/v1beta2/cluster-template-windows-calico.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta2/cluster-template-machine-with-ipv6.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta2/cluster-template-with-paravirt-bv.yaml"
+          - sourcePath: "../data/infrastructure-oci/v1beta2/cluster-template-self-manage-nsg.yaml"
           - sourcePath: "../data/infrastructure-oci/v1beta2/metadata.yaml"
 
 variables:
@@ -115,6 +116,7 @@ intervals:
   default/wait-controllers: ["3m", "10s"]
   default/wait-cluster: ["30m", "10s"]
   default/wait-control-plane: ["30m", "10s"]
+  default/wait-control-plane-nsg: ["10m", "10s"]
   default/wait-worker-nodes: ["30m", "10s"]
   default/wait-windows-worker-nodes: ["60m", "30s"]
   default/wait-cluster-bare-metal: [ "60m", "10s" ]

test/e2e/data/infrastructure-oci/v1beta2/cluster-template-self-manage-nsg/cluster.yaml

@@ -0,0 +1,44 @@
+---
+apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
+kind: OCICluster
+metadata:
+  labels:
+    cluster.x-k8s.io/cluster-name: "${CLUSTER_NAME}"
+  name: "${CLUSTER_NAME}"
+spec:
+  compartmentId: "${OCI_COMPARTMENT_ID}"
+  networkSpec:
+    vcn:
+      id: "${EXTERNAL_VCN_ID}"
+      skip: true
+      networkSecurityGroup:
+        skip: false
+      internetGateway:
+        skip: true
+      natGateway:
+        skip: true
+      serviceGateway:
+        skip: true
+      routeTable:
+        skip: true
+      subnets:
+        - id: "${EXTERNAL_VCN_CPE_SUBNET}"
+          role: control-plane-endpoint
+          name: control-plane-endpoint
+          type: public
+          skip: true
+        - id: "${EXTERNAL_VCN_WORKER_SUBNET}"
+          role: worker
+          name: worker
+          type: private
+          skip: true
+        - id: "${EXTERNAL_VCN_CP_SUBNET}"
+          role: control-plane
+          name: control-plane
+          type: private
+          skip: true
+        - id: "${EXTERNAL_VCN_LB_SUBNET}"
+          role: service-lb
+          name: service-lb
+          type: public
+          skip: true

test/e2e/data/infrastructure-oci/v1beta2/cluster-template-self-manage-nsg/kustomization.yaml

@@ -0,0 +1,7 @@
+bases:
+  - ../bases/cluster.yaml
+  - ../bases/md.yaml
+  - ../../bases/ccm.yaml
+patchesStrategicMerge:
+  - ./cluster.yaml
+