Skip to content

Commit e8eee6c

Browse files
authored
Merge pull request #1127 from XudongLiuHarold/remove-vsphere-thumbprint
⚙️ CI: remove VSPHERE_TLS_THUMBPRINT default value and switch to sha256
2 parents ba94c76 + 4726710 commit e8eee6c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

pkg/common/vclib/connection_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package vclib_test
1818

1919
import (
2020
"context"
21-
"crypto/sha1"
21+
"crypto/sha256"
2222
"crypto/tls"
2323
"crypto/x509"
2424
"fmt"
@@ -71,7 +71,7 @@ func createTestServer(
7171
}
7272
x509LeafCert := server.TLS.Certificates[0].Certificate[0]
7373
var tpString string
74-
for i, b := range sha1.Sum(x509LeafCert) {
74+
for i, b := range sha256.Sum256(x509LeafCert) {
7575
if i > 0 {
7676
tpString += ":"
7777
}

test/e2e/README.md

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ The first step to running the e2e tests is setting up the required environment v
1717
| `VSPHERE_SERVER` | The IP address or FQDN of a vCenter 6.7u3 server (required) | `my.vcenter.com` |
1818
| `VSPHERE_USERNAME` | The username used to access the vSphere server (required) | `my-username` |
1919
| `VSPHERE_PASSWORD` | The password used to access the vSphere server (required) | `my-password` |
20+
| `VSPHERE_TLS_THUMBPRINT` | The thumbprint is the cryptographic hash of a certificate used to access the vSphere server (required)| `18:EC:35:60:54:68:92:F6:F8:92:3E:4D:11:A1:0D:...` |
2021
| `VSPHERE_DATACENTER` | The unique name or inventory path of the datacenter in which VMs will be created | `my-datacenter` or `/my-datacenter` |
2122
| `VSPHERE_FOLDER` | The unique name or inventory path of the folder in which VMs will be created | `my-folder` or `/my-datacenter/vm/my-folder` |
2223
| `VSPHERE_RESOURCE_POOL` | The unique name or inventory path of the resource pool in which VMs will be created | `my-resource-pool` or `/my-datacenter/host/Cluster-1/Resources/my-resource-pool` |

test/e2e/config/vsphere-ci.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ variables:
8282
IP_FAMILY: "IPv4"
8383
CLUSTER_CLASS_NAME: "quick-start"
8484
# Following CAPV variables should be set before testing
85-
VSPHERE_TLS_THUMBPRINT: "18:EC:35:60:54:68:92:F6:F8:92:3E:4D:11:A1:0D:13:9C:E9:3E:B6"
8685
VSPHERE_COMPUTE_CLUSTER: "Cluster-1"
8786
VSPHERE_DATACENTER: "SDDC-Datacenter"
8887
VSPHERE_FOLDER: "/SDDC-Datacenter/vm/Workloads/cloud-provider-vsphere"

0 commit comments

Comments
 (0)