Merge branch 'kubernetes-sigs:main' into main

Author: srm09

Makefile

@@ -66,7 +66,7 @@ CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR)/conversion-verifier)
 GO_APIDIFF := $(TOOLS_BIN_DIR)/go-apidiff
 RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
 TOOLING_BINARIES := $(CONTROLLER_GEN) $(CONVERSION_GEN) $(GINKGO) $(GOLANGCI_LINT) $(GOVC) $(KIND) $(KUSTOMIZE) $(CONVERSION_VERIFIER) $(GO_APIDIFF) $(RELEASE_NOTES)
-ARTIFACTS_PATH := $(ROOT_DIR)/_artifacts
+ARTIFACTS ?= $(ROOT_DIR)/_artifacts
 
 # Set --output-base for conversion-gen if we are not within GOPATH
 ifneq ($(abspath $(ROOT_DIR)),$(shell go env GOPATH)/src/sigs.k8s.io/cluster-api-provider-vsphere)
@@ -162,10 +162,11 @@ e2e-templates: ## Generate e2e cluster templates
 .PHONY: test-integration
 test-integration: e2e-image
 test-integration: $(GINKGO) $(KUSTOMIZE) $(KIND)
-	time $(GINKGO) -v ./test/integration -- --config="$(INTEGRATION_CONF_FILE)" --artifacts-folder="$(ARTIFACTS_PATH)"
+	time $(GINKGO) -v ./test/integration -- --config="$(INTEGRATION_CONF_FILE)" --artifacts-folder="$(ARTIFACTS)"
 
 GINKGO_FOCUS ?=
 GINKGO_SKIP ?=
+GINKGO_TEST_TIMEOUT ?= 2h
 
 # to set multiple ginkgo skip flags, if any
 ifneq ($(strip $(GINKGO_SKIP)),)
@@ -180,9 +181,10 @@ e2e: $(GINKGO) $(KUSTOMIZE) $(KIND) $(GOVC) ## Run e2e tests
 	@echo Contents of $(TOOLS_BIN_DIR):
 	@ls $(TOOLS_BIN_DIR)
 	@echo
-	time $(GINKGO) -v -focus="$(GINKGO_FOCUS)" $(_SKIP_ARGS) ./test/e2e -- \
+	time $(GINKGO) -v -focus="$(GINKGO_FOCUS)" $(_SKIP_ARGS) -timeout=$(GINKGO_TEST_TIMEOUT) \
+		--output-dir="$(ARTIFACTS)" --junit-report="junit.e2e_suite.1.xml" ./test/e2e -- \
 		--e2e.config="$(E2E_CONF_FILE)" \
-		--e2e.artifacts-folder="$(ARTIFACTS_PATH)" \
+		--e2e.artifacts-folder="$(ARTIFACTS)" \
 		--e2e.skip-resource-cleanup=$(SKIP_RESOURCE_CLEANUP) \
 		--e2e.use-existing-cluster="$(USE_EXISTING_CLUSTER)"
 

README.md

@@ -52,11 +52,11 @@ This provider's versions are compatible with the following versions of Cluster A
 
 Note: These OVAs are not updated for security fixes and it is recommended to always use the latest patch version for the Kubernetes version you wish to run. For production-like environments, it is highly recommended to build and use your own custom images.
 
-| Kubernetes | Ubuntu 18.04 | Ubuntu 20.04 | Photon 3 |
-| :--------: | :----------: | :----------: | :------: |
-|  v1.23.15   |   [ova](https://storage.googleapis.com/capv-templates/v1.23.15/ubuntu-1804-kube-v1.23.15.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.23.15/ubuntu-1804-kube-v1.23.15.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.23.15/ubuntu-2004-kube-v1.23.15.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.23.15/ubuntu-2004-kube-v1.23.15.ova.sha256)|   [ova](https://storage.googleapis.com/capv-templates/v1.23.15/photon-3-kube-v1.23.15.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.23.15/photon-3-kube-v1.23.15.ova.sha256)    |
-|  v1.24.9   |   [ova](https://storage.googleapis.com/capv-templates/v1.24.9/ubuntu-1804-kube-v1.24.9.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.9/ubuntu-1804-kube-v1.24.9.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.24.9/ubuntu-2004-kube-v1.24.9.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.9/ubuntu-2004-kube-v1.24.9.ova.sha256)|   [ova](https://storage.googleapis.com/capv-templates/v1.24.9/photon-3-kube-v1.24.9.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.9/photon-3-kube-v1.24.9.ova.sha256)    |
-|  v1.25.5   |   [ova](https://storage.googleapis.com/capv-templates/v1.25.5/ubuntu-1804-kube-v1.25.5.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.5/ubuntu-1804-kube-v1.25.5.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.25.5/ubuntu-2004-kube-v1.25.5.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.5/ubuntu-2004-kube-v1.25.5.ova.sha256)|   [ova](https://storage.googleapis.com/capv-templates/v1.25.5/photon-3-kube-v1.25.5.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.5/photon-3-kube-v1.25.5.ova.sha256)    |
+| Kubernetes | Ubuntu 18.04 | Ubuntu 20.04 | Photon 3 | Flatcar Stable |
+| :--------: | :----------: | :----------: | :------: | :------------: |
+|  v1.23.16  |   [ova](https://storage.googleapis.com/capv-templates/v1.23.16/ubuntu-1804-kube-v1.23.16.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.23.16/ubuntu-1804-kube-v1.23.16.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.23.16/ubuntu-2004-kube-v1.23.16.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.23.16/ubuntu-2004-kube-v1.23.16.ova.sha256)|   [ova](https://storage.googleapis.com/capv-templates/v1.23.16/photon-3-kube-v1.23.16.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.23.16/photon-3-kube-v1.23.16.ova.sha256)   |   n/a   |
+|  v1.24.10  |   [ova](https://storage.googleapis.com/capv-templates/v1.24.10/ubuntu-1804-kube-v1.24.10.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.10/ubuntu-1804-kube-v1.24.10.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.24.10/ubuntu-2004-kube-v1.24.10.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.10/ubuntu-2004-kube-v1.24.10.ova.sha256)|   [ova](https://storage.googleapis.com/capv-templates/v1.24.10/photon-3-kube-v1.24.10.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.24.10/photon-3-kube-v1.24.10.ova.sha256)   |   n/a   |
+|  v1.25.6   |   [ova](https://storage.googleapis.com/capv-templates/v1.25.6/ubuntu-1804-kube-v1.25.6.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.6/ubuntu-1804-kube-v1.25.6.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.25.6/ubuntu-2004-kube-v1.25.6.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.6/ubuntu-2004-kube-v1.25.6.ova.sha256)|   [ova](https://storage.googleapis.com/capv-templates/v1.25.6/photon-3-kube-v1.25.6.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.6/photon-3-kube-v1.25.6.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-templates/v1.25.6/flatcar-stable-3374.2.4-kube-v1.25.6.ova), [sha256](https://storage.googleapis.com/capv-templates/v1.25.6/flatcar-stable-3374.2.4-kube-v1.25.6.ova.sha256)   |
 
 A full list of the published machine images for CAPV may be obtained with the following command:
 

apis/v1beta1/condition_consts.go

@@ -93,8 +93,19 @@ const (
 	// NOTE: This reason does not apply to VSphereVM (this state happens after the VSphereVM is in ready state).
 	WaitingForNetworkAddressesReason = "WaitingForNetworkAddresses"
 
-	// TagsAttachmentFailedReason (Severity=Error) documents a VSPhereMachine/VSphereVM tags attachment failure.
+	// TagsAttachmentFailedReason (Severity=Error) documents a VSphereMachine/VSphereVM tags attachment failure.
 	TagsAttachmentFailedReason = "TagsAttachmentFailed"
+
+	// PCIDevicesDetachedCondition documents the status of the attached PCI devices on the VSphereVM.
+	// It is a negative condition to notify the user that the device(s) is no longer attached to
+	// the underlying VM and would require manual intervention to fix the situation.
+	//
+	// NOTE: This condition does not apply to VSphereMachine.
+	PCIDevicesDetachedCondition clusterv1.ConditionType = "PCIDevicesDetached"
+
+	// NotFoundReason (Severity=Warning) documents the VSphereVM not having the PCI device attached during VM startup.
+	// This would indicate that the PCI devices were removed out of band by an external entity.
+	NotFoundReason = "NotFound"
 )
 
 // Conditions and Reasons related to utilizing a VSphereIdentity to make connections to a VCenter.

apis/v1beta1/vspherevm_types.go

@@ -142,7 +142,7 @@ type VSphereVMStatus struct {
 }
 
 // +kubebuilder:object:root=true
-// +kubebuilder:resource:path=vspherevms,scope=Namespaced
+// +kubebuilder:resource:path=vspherevms,scope=Namespaced,categories=cluster-api
 // +kubebuilder:storageversion
 // +kubebuilder:subresource:status
 

apis/v1beta1/vspherevm_webhook.go

@@ -20,7 +20,6 @@ import (
 	"fmt"
 	"net"
 	"reflect"
-	"strings"
 
 	"github.com/pkg/errors"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
@@ -44,11 +43,6 @@ func (r *VSphereVM) Default() {
 	if r.Spec.OS == "" {
 		r.Spec.OS = Linux
 	}
-
-	// Windows hostnames must be < 16 characters in length
-	if r.Spec.OS == Windows && len(r.Name) > 15 {
-		r.Name = strings.TrimSuffix(r.Name[0:9], "-") + "-" + r.Name[len(r.Name)-5:]
-	}
 }
 
 // ValidateCreate implements webhook.Validator so a webhook will be registered for the type.

apis/v1beta1/vspherevm_webhook_test.go

@@ -45,10 +45,6 @@ func TestVSphereVM_Default(t *testing.T) {
 	g.Expect(LinuxVM.Spec.OS).To(Equal(Linux))
 	g.Expect(WindowsVM.Spec.OS).To(Equal(Windows))
 	g.Expect(NoOSVM.Spec.OS).To(Equal(Linux))
-
-	// WindowsVM gets name updated to be 15 characters. Linux remains unchanged
-	g.Expect(WindowsVM.Name).To(Equal("cluster-m-2qj6q"))
-	g.Expect(LinuxVM.Name).To(Equal("linux-control-plane-qkkbv"))
 }
 
 //nolint
@@ -81,7 +77,7 @@ func TestVSphereVM_ValidateCreate(t *testing.T) {
 			wantErr:   true,
 		},
 		{
-			name:      "name too long for Linux VM",
+			name:      "no error with name too long for Linux VM",
 			vSphereVM: createVSphereVM(linuxVMName, "foo.com", "", "", []string{"192.168.0.1/32", "192.168.0.3/32"}, nil, Linux),
 			wantErr:   false,
 		},

clusterctl-settings.json

@@ -2,6 +2,6 @@
   "name": "infrastructure-vsphere",
   "config": {
     "componentsFile": "infrastructure-components.yaml",
-    "nextVersion": "v1.6.0"
+    "nextVersion": "v1.7.0"
   }
 }

config/default/crd/bases/infrastructure.cluster.x-k8s.io_vspherevms.yaml

@@ -9,6 +9,8 @@ metadata:
 spec:
   group: infrastructure.cluster.x-k8s.io
   names:
+    categories:
+    - cluster-api
     kind: VSphereVM
     listKind: VSphereVMList
     plural: vspherevms

docs/getting_started.md

@@ -41,7 +41,7 @@ vCenter. Ensure you have credentials to your vCenter server (user, password and
 
 #### Uploading the machine images
 
-It is required that machines provisioned by CAPV have cloudinit, kubeadm and a container runtime pre-installed. You can
+It is required that machines provisioned by CAPV have cloudinit or Ignition, kubeadm and a container runtime pre-installed. You can
 use one of the CAPV machine images generated by SIG Cluster Lifecycle as a VM template.
 
 The machine images are retrievable from public URLs. CAPV currently supports machine images based on Ubuntu 18.04 and
@@ -118,12 +118,11 @@ CONTROL_PLANE_ENDPOINT_IP: "192.168.9.230"                    # the IP that kube
 VIP_NETWORK_INTERFACE: "ens192"                               # The interface that kube-vip should apply the IP to. Omit to tell kube-vip to autodetect the interface.
 VSPHERE_TLS_THUMBPRINT: "..."                                 # sha1 thumbprint of the vcenter certificate: openssl x509 -sha1 -fingerprint -in ca.crt -noout
 EXP_CLUSTER_RESOURCE_SET: "true"                              # This enables the ClusterResourceSet feature that we are using to deploy CSI
-VSPHERE_SSH_AUTHORIZED_KEY: "ssh-rsa AAAAB3N..."              # The public ssh authorized key on all machines
-                                                              #   in this cluster.
-                                                              #   Set to "" if you don't want to enable SSH,
-                                                              #   or are using another solution.
-VSPHERE_STORAGE_POLICY: ""                                    # This is the vSphere storage policy.
-                                                              #  Set it to "" if you don't want to use a storage policy.
+VSPHERE_SSH_AUTHORIZED_KEY: "ssh-rsa AAAAB3N..."              # The public ssh authorized key on all machines in this cluster.
+                                                              #  Set to "" if you don't want to enable SSH, or are using another solution.
+VSPHERE_STORAGE_POLICY: ""                                    # This is the vSphere storage policy. Set it to "" if you don't want to use a storage policy.
+"CPI_IMAGE_K8S_VERSION": "v1.25.0"                            # The version of the vSphere CPI image to be used by the CPI workloads
+                                                              #  Keep this close to the minimum Kubernetes version of the cluster being created.
 ```
 
 If you are using the **DEPRECATED** `haproxy` flavour you will need to add the following variable to your `clusterctl.yaml`:

docs/ignition.md

@@ -6,13 +6,20 @@ support Ignition could likely be used as well.
 
 ## Requirements
 
+- A vSphere environment
+- A Flatcar OVA template (see blow)
 - Docker
 - [Kind][3] version `0.14.0` or higher
 - kubectl
 - [clusterctl][4]
 
 ## Deployment
 
+Ensure your vSphere environment has a Flatcar OVA template either by [building an image][5] using
+image-builder (recommended) or by [importing a prebuilt image][6] using a published [OVA URL][7].
+Ensure the built/imported image is marked as a template. Use the template name as the value of the
+`VSPHERE_TEMPLATE` variable below.
+
 Set required environment variables:
 
 ```shell
@@ -171,3 +178,6 @@ kind delete cluster
 [2]: https://www.flatcar.org/
 [3]: https://kind.sigs.k8s.io/
 [4]: https://cluster-api.sigs.k8s.io/user/quick-start.html#install-clusterctl
+[5]: https://image-builder.sigs.k8s.io/capi/providers/vsphere.html
+[6]: https://docs.vmware.com/en/VMware-vSphere/7.0/com.vmware.vsphere.vm_admin.doc/GUID-17BEDA21-43F6-41F4-8FB2-E01D275FE9B4.html
+[7]: https://storage.googleapis.com/capv-templates/v1.25.6/flatcar-stable-3374.2.4-kube-v1.25.6.ova