-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
7 changed files
with
263 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: Cluster | ||
| metadata: | ||
| labels: | ||
| cluster.x-k8s.io/cluster-name: "${CLUSTER_NAME}" | ||
| cni: calico | ||
| csi-proxy: enabled | ||
| windows: enabled | ||
| name: "${CLUSTER_NAME}" | ||
| namespace: "${NAMESPACE}" | ||
| spec: | ||
| clusterNetwork: | ||
| pods: | ||
| cidrBlocks: | ||
| - ${POD_CIDR:="192.168.0.0/16"} | ||
| serviceDomain: ${SERVICE_DOMAIN:="cluster.local"} | ||
| services: | ||
| cidrBlocks: | ||
| - ${SERVICE_CIDR:="10.128.0.0/12"} | ||
| infrastructureRef: | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: OCICluster | ||
| name: "${CLUSTER_NAME}" | ||
| namespace: "${NAMESPACE}" | ||
| controlPlaneRef: | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmControlPlane | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| namespace: "${NAMESPACE}" | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: OCICluster | ||
| metadata: | ||
| labels: | ||
| cluster.x-k8s.io/cluster-name: "${CLUSTER_NAME}" | ||
| name: "${CLUSTER_NAME}" | ||
| spec: | ||
| compartmentId: "${OCI_COMPARTMENT_ID}" | ||
| --- | ||
| kind: KubeadmControlPlane | ||
| apiVersion: controlplane.cluster.x-k8s.io/v1beta1 | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| namespace: "${NAMESPACE}" | ||
| spec: | ||
| version: "${KUBERNETES_VERSION}" | ||
| replicas: ${CONTROL_PLANE_MACHINE_COUNT} | ||
| machineTemplate: | ||
| infrastructureRef: | ||
| kind: OCIMachineTemplate | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| namespace: "${NAMESPACE}" | ||
| kubeadmConfigSpec: | ||
| clusterConfiguration: | ||
| kubernetesVersion: ${KUBERNETES_VERSION} | ||
| apiServer: | ||
| certSANs: [localhost, 127.0.0.1] | ||
| extraArgs: | ||
| cloud-provider: oci | ||
| dns: {} | ||
| etcd: {} | ||
| networking: {} | ||
| scheduler: {} | ||
| initConfiguration: | ||
| nodeRegistration: | ||
| criSocket: /var/run/containerd/containerd.sock | ||
| kubeletExtraArgs: | ||
| cloud-provider: external | ||
| provider-id: oci://{{ ds["id"] }} | ||
| joinConfiguration: | ||
| discovery: {} | ||
| nodeRegistration: | ||
| criSocket: /var/run/containerd/containerd.sock | ||
| kubeletExtraArgs: | ||
| cloud-provider: external | ||
| provider-id: oci://{{ ds["id"] }} | ||
| --- | ||
| kind: OCIMachineTemplate | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-control-plane" | ||
| spec: | ||
| template: | ||
| spec: | ||
| imageId: "${OCI_CONTROL_PLANE_IMAGE_ID}" | ||
| compartmentId: "${OCI_COMPARTMENT_ID}" | ||
| shape: "${OCI_CONTROL_PLANE_MACHINE_TYPE=VM.Standard.E4.Flex}" | ||
| shapeConfig: | ||
| ocpus: "${OCI_CONTROL_PLANE_MACHINE_TYPE_OCPUS=1}" | ||
| metadata: | ||
| ssh_authorized_keys: "${OCI_SSH_KEY}" | ||
| isPvEncryptionInTransitEnabled: ${OCI_CONTROL_PLANE_PV_TRANSIT_ENCRYPTION=true} | ||
| --- | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: OCIMachineTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-win" | ||
| spec: | ||
| template: | ||
| spec: | ||
| imageId: "${OCI_NODE_IMAGE_ID}" | ||
| compartmentId: "${OCI_COMPARTMENT_ID}" | ||
| shape: "${OCI_NODE_MACHINE_TYPE=VM.Standard.E4.Flex}" | ||
| shapeConfig: | ||
| ocpus: "${OCI_NODE_MACHINE_TYPE_OCPUS=1}" | ||
| vnicAttachments: | ||
| - displayName: "CalicoNic" | ||
| nicIndex: 1 # second nic must be used for hyper-v | ||
| metadata: | ||
| ssh_authorized_keys: "${OCI_SSH_KEY}" | ||
| isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=true} | ||
| --- | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4 | ||
| kind: KubeadmConfigTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-win" | ||
| spec: | ||
| template: | ||
| spec: | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| criSocket: npipe:////./pipe/containerd-containerd | ||
| kubeletExtraArgs: | ||
| cloud-provider: external | ||
| provider-id: oci://{{ ds.meta_data["instance_id"] }} | ||
| feature-gates: WindowsHostProcessContainers=true | ||
| v: "2" | ||
| windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS | ||
| name: '{{ ds.meta_data["local_hostname"] }}' | ||
| preKubeadmCommands: | ||
| - powershell C:\Windows\Setup\Scripts\enable_second_nic.ps1 | ||
| - powershell C:\Users\opc\attach_secondary_vnic.ps1 > C:\Users\opc\attach_secondary_vnic_log.txt | ||
| --- | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: MachineDeployment | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-win" | ||
| spec: | ||
| clusterName: "${CLUSTER_NAME}" | ||
| replicas: ${NODE_MACHINE_COUNT} | ||
| selector: | ||
| matchLabels: | ||
| template: | ||
| spec: | ||
| clusterName: "${CLUSTER_NAME}" | ||
| version: "${KUBERNETES_VERSION}" | ||
| bootstrap: | ||
| configRef: | ||
| name: "${CLUSTER_NAME}-md-win" | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 | ||
| kind: KubeadmConfigTemplate | ||
| infrastructureRef: | ||
| name: "${CLUSTER_NAME}-md-win" | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: OCIMachineTemplate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-windows-calico/kustomization.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| bases: | ||
| - ../bases/cluster.yaml | ||
| - ../bases/md.yaml | ||
| - ../bases/crs.yaml | ||
| - ../bases/ccm.yaml | ||
| patchesStrategicMerge: | ||
| - ./md.yaml |
46 changes: 46 additions & 0 deletions
46
test/e2e/data/infrastructure-oci/v1beta1/cluster-template-windows-calico/md.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 | ||
| kind: OCIMachineTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| labels: | ||
| os: windows | ||
| spec: | ||
| template: | ||
| spec: | ||
| imageId: "${OCI_WINDOWS_IMAGE_ID}" | ||
| shape: "BM.Standard.E4.128" | ||
| shapeConfig: | ||
| ocpus: "128" | ||
| vnicAttachments: | ||
| - displayName: "CalicoNic" | ||
| nicIndex: 1 # second nic must be used for hyper-v | ||
| isPvEncryptionInTransitEnabled: ${OCI_NODE_PV_TRANSIT_ENCRYPTION=false} | ||
| --- | ||
| apiVersion: bootstrap.cluster.x-k8s.io/v1alpha4 | ||
| kind: KubeadmConfigTemplate | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| spec: | ||
| template: | ||
| spec: | ||
| joinConfiguration: | ||
| nodeRegistration: | ||
| criSocket: npipe:////./pipe/containerd-containerd | ||
| kubeletExtraArgs: | ||
| provider-id: oci://{{ ds.meta_data["instance_id"] }} | ||
| feature-gates: WindowsHostProcessContainers=true | ||
| v: "2" | ||
| windows-priorityclass: ABOVE_NORMAL_PRIORITY_CLASS | ||
| name: '{{ ds.meta_data["local_hostname"] }}' | ||
| preKubeadmCommands: | ||
| - powershell C:\Windows\Setup\Scripts\enable_second_nic.ps1 | ||
| - powershell C:\Users\opc\attach_secondary_vnic.ps1 > C:\Users\opc\attach_secondary_vnic_log.txt | ||
| --- | ||
| apiVersion: cluster.x-k8s.io/v1beta1 | ||
| kind: MachineDeployment | ||
| metadata: | ||
| name: "${CLUSTER_NAME}-md-0" | ||
| spec: | ||
| template: | ||
| spec: | ||
| failureDomain: "2" |