Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix up outstanding issues with e2e tests #516

Closed
wants to merge 2 commits into from
Closed

Fix up outstanding issues with e2e tests #516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6659b5
Dummy commit to open a PR against
squizzi Oct 17, 2024
de0bea6
Update test templates
squizzi Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dummy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
So dummy
3 changes: 0 additions & 3 deletions test/e2e/managedcluster/resources/aws-hosted-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ spec:
template: aws-hosted-cp-0-0-2
credential: ${AWS_CLUSTER_IDENTITY}-cred
config:
clusterIdentity:
name: ${AWS_CLUSTER_IDENTITY}
namespace: ${NAMESPACE}
vpcID: ${AWS_VPC_ID}
region: ${AWS_REGION}
subnets:
Expand Down
4 changes: 1 addition & 3 deletions test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ apiVersion: hmc.mirantis.com/v1alpha1
kind: ManagedCluster
metadata:
name: ${MANAGED_CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
template: aws-standalone-cp-0-0-2
credential: ${AWS_CLUSTER_IDENTITY}-cred
config:
clusterIdentity:
name: ${AWS_CLUSTER_IDENTITY}
namespace: ${NAMESPACE}
region: ${AWS_REGION}
publicIP: ${AWS_PUBLIC_IP:=true}
controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
Expand Down
5 changes: 1 addition & 4 deletions test/e2e/managedcluster/resources/azure-hosted-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,12 @@ metadata:
name: ${MANAGED_CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
template: azure-hosted-cp-0-0-2
template: azure-hosted-cp-0-0-3
credential: ${AZURE_CLUSTER_IDENTITY}-cred
config:
location: "${AZURE_REGION}"
subscriptionID: "${AZURE_SUBSCRIPTION_ID}"
vmSize: Standard_A4_v2
clusterIdentity:
name: ${AZURE_CLUSTER_IDENTITY}
namespace: hmc-system
resourceGroup: "${AZURE_RESOURCE_GROUP}"
network:
vnetName: "${AZURE_VM_NET_NAME}"
Expand Down
6 changes: 1 addition & 5 deletions test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: ${MANAGED_CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
template: azure-standalone-cp-0-0-2
template: azure-standalone-cp-0-0-3
credential: ${AZURE_CLUSTER_IDENTITY}-cred
config:
controlPlaneNumber: 1
Expand All @@ -15,10 +15,6 @@ spec:
vmSize: Standard_A4_v2
worker:
vmSize: Standard_A4_v2
credential: ${AZURE_CLUSTER_IDENTITY}-cred
clusterIdentity:
name: ${AZURE_CLUSTER_IDENTITY}
namespace: ${NAMESPACE}
tenantID: "${AZURE_TENANT_ID}"
clientID: "${AZURE_CLIENT_ID}"
clientSecret: "${AZURE_CLIENT_SECRET}"
30 changes: 19 additions & 11 deletions test/e2e/managedcluster/resources/vsphere-hosted-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ apiVersion: hmc.mirantis.com/v1alpha1
kind: ManagedCluster
metadata:
name: ${MANAGED_CLUSTER_NAME}
namespace: ${NAMESPACE}
spec:
template: vsphere-hosted-cp-0-0-2
credential: ${VSPHERE_CLUSTER_IDENTITY}-cred
config:
controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
workersNumber: ${WORKERS_NUMBER:=1}
clusterIdentity:
name: "${VSPHERE_CLUSTER_IDENTITY}"
vsphere:
server: "${VSPHERE_SERVER}"
thumbprint: "${VSPHERE_THUMBPRINT} "
Expand All @@ -20,15 +19,24 @@ spec:
username: "${VSPHERE_USER}"
password: "${VSPHERE_PASSWORD}"
controlPlaneEndpointIP: "${VSPHERE_CONTROL_PLANE_ENDPOINT}"

ssh:
user: ubuntu
publicKey: "${VSPHERE_SSH_KEY}"
rootVolumeSize: 50
cpus: 4
memory: 4096
vmTemplate: "${VSPHERE_VM_TEMPLATE}"
network: "${VSPHERE_NETWORK}"
controlPlane:
ssh:
user: ubuntu
publicKey: "${VSPHERE_SSH_KEY}"
rootVolumeSize: 50
cpus: 4
memory: 4096
vmTemplate: "${VSPHERE_VM_TEMPLATE}"
network: "${VSPHERE_NETWORK}"
worker:
ssh:
user: ubuntu
publicKey: "${VSPHERE_SSH_KEY}"
rootVolumeSize: 50
cpus: 4
memory: 4096
vmTemplate: ${VSPHERE_VM_TEMPLATE}
network: ${VSPHERE_NETWORK}

k0smotron:
service:
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/managedcluster/resources/vsphere-standalone-cp.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ spec:
config:
controlPlaneNumber: ${CONTROL_PLANE_NUMBER:=1}
workersNumber: ${WORKERS_NUMBER:=1}
clusterIdentity:
name: "${VSPHERE_CLUSTER_IDENTITY}"
vsphere:
server: "${VSPHERE_SERVER}"
thumbprint: "${VSPHERE_THUMBPRINT} "
Expand All @@ -20,7 +18,6 @@ spec:
username: "${VSPHERE_USER}"
password: "${VSPHERE_PASSWORD}"
controlPlaneEndpointIP: "${VSPHERE_CONTROL_PLANE_ENDPOINT}"

controlPlane:
ssh:
user: ubuntu
Expand All @@ -30,7 +27,6 @@ spec:
memory: 4096
vmTemplate: "${VSPHERE_VM_TEMPLATE}"
network: "${VSPHERE_NETWORK}"

worker:
ssh:
user: ubuntu
Expand Down
Loading