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.

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

[release/v1.45] Update filter for CentOS Linux images #1488

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ presubmits:
labels:
preset-hetzner: "true"
preset-e2e-ssh: "true"
preset-vsphere-legacy: "true"
preset-vsphere: "true"
preset-rhel: "true"
preset-goproxy: "true"
spec:
Expand Down Expand Up @@ -794,7 +794,7 @@ presubmits:
error_on_eviction: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
preset-vsphere-legacy: "true"
preset-vsphere: "true"
preset-rhel: "true"
preset-hetzner: "true"
preset-e2e-ssh: "true"
Expand All @@ -817,7 +817,7 @@ presubmits:
error_on_eviction: true
clone_uri: "ssh://[email protected]/kubermatic/machine-controller.git"
labels:
preset-vsphere-legacy: "true"
preset-vsphere: "true"
preset-rhel: "true"
preset-hetzner: "true"
preset-e2e-ssh: "true"
Expand Down
4 changes: 2 additions & 2 deletions pkg/cloudprovider/provider/aws/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,12 @@ var (
// Source: https://wiki.centos.org/Cloud/AWS
providerconfigtypes.OperatingSystemCentOS: {
awstypes.CPUArchitectureX86_64: {
description: "CentOS 7* x86_64",
description: "CentOS Linux 7* x86_64*",
// The AWS marketplace ID from CentOS Community Platform Engineering (CPE)
owner: "125523088429",
},
awstypes.CPUArchitectureARM64: {
description: "CentOS 7* aarch64",
description: "CentOS Linux 7* aarch64*",
// The AWS marketplace ID from CentOS Community Platform Engineering (CPE)
owner: "125523088429",
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ spec:
username: '<< NUTANIX_USERNAME >>'
password: '<< NUTANIX_PASSWORD >>'
endpoint: '<< NUTANIX_ENDPOINT >>'
proxyURL: '<< NUTANIX_PROXY_URL >>'
allowInsecure: true
clusterName: '<< NUTANIX_CLUSTER >>'
projectName: '<< NUTANIX_PROJECT >>'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
templateVMName: 'machine-controller-e2e-<< OS_NAME >>'
username: '<< VSPHERE_USERNAME >>'
vsphereURL: '<< VSPHERE_ADDRESS >>'
datacenter: 'dc-1'
folder: '/dc-1/vm/e2e-tests'
datacenter: 'Hamburg'
folder: '/Hamburg/vm/Kubermatic-ci'
password: << VSPHERE_PASSWORD >>
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
datastoreCluster: 'dsc-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ spec:
templateVMName: 'machine-controller-e2e-<< OS_NAME >>'
username: '<< VSPHERE_USERNAME >>'
vsphereURL: '<< VSPHERE_ADDRESS >>'
datacenter: 'dc-1'
folder: '/dc-1/vm/e2e-tests'
datacenter: 'Hamburg'
folder: '/Hamburg/vm/Kubermatic-ci'
password: << VSPHERE_PASSWORD >>
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
datastoreCluster: 'dsc-1'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ spec:
templateVMName: '<< OS_NAME >>-template'
username: '<< VSPHERE_USERNAME >>'
vsphereURL: '<< VSPHERE_ADDRESS >>'
datacenter: 'dc-1'
folder: '/dc-1/vm/e2e-tests'
datacenter: 'Hamburg'
folder: '/Hamburg/vm/Kubermatic-ci'
password: << VSPHERE_PASSWORD >>
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
datastore: datastore1
datastore: ceph-vm
allowInsecure: true
cpus: 2
MemoryMB: 2048
Expand Down
6 changes: 3 additions & 3 deletions test/e2e/provisioning/testdata/machinedeployment-vsphere.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ spec:
templateVMName: 'machine-controller-e2e-<< OS_NAME >>'
username: '<< VSPHERE_USERNAME >>'
vsphereURL: '<< VSPHERE_ADDRESS >>'
datacenter: 'dc-1'
folder: '/dc-1/vm/e2e-tests'
datacenter: 'Hamburg'
folder: '/Hamburg/vm/Kubermatic-ci'
password: << VSPHERE_PASSWORD >>
# example: 'https://your-vcenter:8443'. '/sdk' gets appended automatically
datastore: HS-FreeNAS
datastore: ceph-vm
cpus: 2
MemoryMB: 4096
diskSizeGB: << DISK_SIZE >>
Expand Down