Skip to content

Commit 49b3632

Browse files
mate4stxrstfahmedwaleedmalik
authored
[release/v1.54] Adjust kubevirt image repo and vsphere datastore (#1589)
* update vsphere datastore * Adjust kubevirt image repo * more adjustments to vsphere and kubevirt e2e * adjust VPC to the new one after we recently switched AWS accounts (#1591) * adjust VPC to the new one after we recently switched AWS accounts * fix misleading documentation --------- Signed-off-by: Waleed Malik <[email protected]> Co-authored-by: Christoph Mewes <[email protected]> Co-authored-by: Waleed Malik <[email protected]>
1 parent 1866aa7 commit 49b3632

File tree

5 files changed

+16
-24
lines changed

5 files changed

+16
-24
lines changed

test/e2e/provisioning/testdata/machinedeployment-kubevirt.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,13 @@ spec:
3434
cpus: "1"
3535
memory: "4096M"
3636
primaryDisk:
37-
osImage: http://image-repo.kube-system.svc.cluster.local/images/<< KUBEVIRT_OS_IMAGE >>.img
37+
osImage: http://image-repo.kube-system.svc/images/<< KUBEVIRT_OS_IMAGE >>.img
3838
size: "25Gi"
39-
storageClassName: longhorn
39+
storageClassName: px-csi-db
4040
dnsPolicy: "None"
4141
dnsConfig:
4242
nameservers:
4343
- 8.8.8.8
44-
affinity:
45-
podAffinityPreset: "" # Allowed values: "", "soft", "hard"
46-
podAntiAffinityPreset: "" # Allowed values: "", "soft", "hard"
47-
nodeAffinityPreset:
48-
type: "" # Allowed values: "", "soft", "hard"
49-
key: "foo"
50-
values:
51-
- bar
5244
operatingSystem: "<< OS_NAME >>"
5345
operatingSystemSpec:
5446
distUpgradeOnBoot: false

test/e2e/provisioning/testdata/machinedeployment-vsphere-datastore-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
username: '<< VSPHERE_USERNAME >>'
2929
vsphereURL: '<< VSPHERE_ADDRESS >>'
3030
datacenter: 'Hamburg'
31-
folder: '/Hamburg/vm/Kubermatic-dev'
31+
folder: '/Hamburg/vm/Kubermatic-ci'
3232
password: << VSPHERE_PASSWORD >>
3333
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
3434
datastoreCluster: 'dsc-1'

test/e2e/provisioning/testdata/machinedeployment-vsphere-resource-pool.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ spec:
2828
username: '<< VSPHERE_USERNAME >>'
2929
vsphereURL: '<< VSPHERE_ADDRESS >>'
3030
datacenter: 'Hamburg'
31-
folder: '/Hamburg/vm/Kubermatic-dev'
31+
folder: '/Hamburg/vm/Kubermatic-ci'
3232
password: << VSPHERE_PASSWORD >>
33-
datastoreCluster: 'dsc-1'
33+
datastore: 'vsan'
3434
resourcePool: 'e2e-resource-pool'
3535
cpus: 2
3636
MemoryMB: 2048

test/e2e/provisioning/testdata/machinedeployment-vsphere-static-ip.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,24 +28,24 @@ spec:
2828
username: '<< VSPHERE_USERNAME >>'
2929
vsphereURL: '<< VSPHERE_ADDRESS >>'
3030
datacenter: 'Hamburg'
31-
folder: '/Hamburg/vm/Kubermatic-dev'
31+
folder: '/Hamburg/vm/Kubermatic-ci'
3232
password: << VSPHERE_PASSWORD >>
3333
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
34-
datastore: ceph-vm
35-
allowInsecure: true
34+
datastore: vsan
3635
cpus: 2
3736
MemoryMB: 2048
37+
allowInsecure: true
3838
operatingSystem: "<< OS_NAME >>"
3939
operatingSystemSpec:
4040
distUpgradeOnBoot: false
4141
disableAutoUpdate: true
4242
rhsmOfflineToken: "<< REDHAT_SUBSCRIPTIONS_OFFLINE_TOKEN >>"
4343
network:
44-
cidr: "192.168.44.<< IP_OCTET >>/20"
45-
gateway: "192.168.32.1"
46-
dns:
47-
servers:
48-
- "192.168.32.1"
49-
- "8.8.8.8"
44+
cidr: "192.168.44.<< IP_OCTET >>/20"
45+
gateway: "192.168.32.1"
46+
dns:
47+
servers:
48+
- "192.168.32.1"
49+
- "8.8.8.8"
5050
versions:
5151
kubelet: "<< KUBERNETES_VERSION >>"

test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ spec:
2828
username: '<< VSPHERE_USERNAME >>'
2929
vsphereURL: '<< VSPHERE_ADDRESS >>'
3030
datacenter: 'Hamburg'
31-
folder: '/Hamburg/vm/Kubermatic-dev'
31+
folder: '/Hamburg/vm/Kubermatic-ci'
3232
password: << VSPHERE_PASSWORD >>
3333
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
34-
datastore: ceph-vm
34+
datastore: vsan
3535
cpus: 2
3636
MemoryMB: 4096
3737
diskSizeGB: << DISK_SIZE >>

0 commit comments

Comments
 (0)