Merge pull request #1127 from XudongLiuHarold/remove-vsphere-thumbprint

⚙️ CI: remove VSPHERE_TLS_THUMBPRINT default value and switch to sha256
kubernetes · Jun 28, 2024 · e8eee6c · e8eee6c
2 parents ba94c76 + 4726710
commit e8eee6c
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/pkg/common/vclib/connection_test.go b/pkg/common/vclib/connection_test.go
@@ -18,7 +18,7 @@ package vclib_test
 
 import (
 	"context"
-	"crypto/sha1"
+	"crypto/sha256"
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
@@ -71,7 +71,7 @@ func createTestServer(
 	}
 	x509LeafCert := server.TLS.Certificates[0].Certificate[0]
 	var tpString string
-	for i, b := range sha1.Sum(x509LeafCert) {
+	for i, b := range sha256.Sum256(x509LeafCert) {
 		if i > 0 {
 			tpString += ":"
 		}

diff --git a/test/e2e/README.md b/test/e2e/README.md
@@ -17,6 +17,7 @@ The first step to running the e2e tests is setting up the required environment v
 | `VSPHERE_SERVER`              | The IP address or FQDN of a vCenter 6.7u3 server   (required)                                      | `my.vcenter.com`                                                                 |
 | `VSPHERE_USERNAME`            | The username used to access the vSphere server     (required)                                      | `my-username`                                                                    |
 | `VSPHERE_PASSWORD`            | The password used to access the vSphere server      (required)                                     | `my-password`                                                                    |
+| `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:...`                               |
 | `VSPHERE_DATACENTER`          | The unique name or inventory path of the datacenter in which VMs will be created                      | `my-datacenter` or `/my-datacenter`                                              |
 | `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`                                     |
 | `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` |

diff --git a/test/e2e/config/vsphere-ci.yaml b/test/e2e/config/vsphere-ci.yaml
@@ -82,7 +82,6 @@ variables:
   IP_FAMILY: "IPv4"
   CLUSTER_CLASS_NAME: "quick-start"
   # Following CAPV variables should be set before testing
-  VSPHERE_TLS_THUMBPRINT: "18:EC:35:60:54:68:92:F6:F8:92:3E:4D:11:A1:0D:13:9C:E9:3E:B6"
   VSPHERE_COMPUTE_CLUSTER: "Cluster-1"
   VSPHERE_DATACENTER:  "SDDC-Datacenter"
   VSPHERE_FOLDER: "/SDDC-Datacenter/vm/Workloads/cloud-provider-vsphere"