session with round tripper keep alive

Dockerfile

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-ARG GOLANG_VERSION=golang:1.13.5
+ARG GOLANG_VERSION=golang:1.16.0
 FROM $GOLANG_VERSION as builder
 WORKDIR /workspace
 

Makefile

@@ -112,7 +112,7 @@ help: ## Display this help
 
 .PHONY: test
 test: generate lint-go ## Run tests
-	go test -v ./api/... ./controllers/... ./pkg/...
+	source ./hack/fetch_ext_bins.sh; fetch_tools; setup_envs; go test -v ./api/... ./controllers/... ./pkg/...
 
 .PHONY: e2e-image
 e2e-image: ## Build the e2e manager image
@@ -268,9 +268,9 @@ dev-manifests:
 manifests:  $(STAGE)-version-check $(STAGE)-flavors $(MANIFEST_DIR) $(BUILD_DIR) $(KUSTOMIZE)
 	rm -rf $(BUILD_DIR)/config
 	cp -R config $(BUILD_DIR)
-	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(BUILD_DIR)/config/manager/manager_pull_policy.yaml
-	sed -i'' -e 's@image: .*@image: '"$(IMAGE)"'@' $(BUILD_DIR)/config/manager/manager_image_patch.yaml
-	"$(KUSTOMIZE)" build $(BUILD_DIR)/config > $(MANIFEST_DIR)/infrastructure-components.yaml
+	sed -i'' -e 's@imagePullPolicy: .*@imagePullPolicy: '"$(PULL_POLICY)"'@' $(BUILD_DIR)/config/default/manager_pull_policy.yaml
+	sed -i'' -e 's@image: .*@image: '"$(IMAGE)"'@' $(BUILD_DIR)/config/default/manager_image_patch.yaml
+	"$(KUSTOMIZE)" build $(BUILD_DIR)/config/default > $(MANIFEST_DIR)/infrastructure-components.yaml
 
 ## --------------------------------------
 ## Cleanup / Verification

PROJECT

@@ -1,31 +1,42 @@
-version: "2"
 domain: cluster.x-k8s.io
 repo: sigs.k8s.io/cluster-api-provider-vsphere
 resources:
 - group: infrastructure
-  version: v1alpha3
   kind: VSphereCluster
-- group: infrastructure
   version: v1alpha3
-  kind: VSphereMachine
 - group: infrastructure
+  kind: VSphereMachine
   version: v1alpha3
-  kind: VSphereMachineTemplate
 - group: infrastructure
+  kind: VSphereMachineTemplate
   version: v1alpha3
+- group: infrastructure
   kind: VSphereVM
+  version: v1alpha3
 - group: infrastructure
+  kind: VSphereFailureDomain
   version: v1alpha3
+- group: infrastructure
+  kind: VSphereDeploymentZone
+  version: v1alpha3
+- group: infrastructure
   kind: HAProxyLoadBalancer
- - group: infrastructure
-   version: v1alpha4
-   kind: VSphereCluster
- - group: infrastructure
-   version: v1alpha4
-   kind: VSphereMachine
- - group: infrastructure
-   version: v1alpha4
-   kind: VSphereMachineTemplate
- - group: infrastructure
-   version: v1alpha4
-   kind: VSphereVM
+- group: infrastructure
+  kind: VSphereCluster
+  version: v1alpha4
+- group: infrastructure
+  kind: VSphereMachine
+  version: v1alpha4
+- group: infrastructure
+  kind: VSphereMachineTemplate
+  version: v1alpha4
+- group: infrastructure
+  kind: VSphereVM
+  version: v1alpha4
+- group: infrastructure
+  kind: VSphereDeploymentZone
+  version: v1alpha4
+- group: infrastructure
+  kind: VSphereFailureDomain
+  version: v1alpha4
+version: "2"

README.md

@@ -52,10 +52,10 @@ Note: These OVAs are not updated for security fixes and it is recommended to alw
 
 | Kubernetes |                                                                                               CentOS 7                                                                                               |                                                                                                Ubuntu 18.04                                                                                                |                                                                                               Photon 3                                                                                                |
 | :--------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: | :---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------: |
-|  v1.17.16   |   [ova](http://storage.googleapis.com/capv-images/release/v1.17.16/centos-7-kube-v1.17.16.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.17.16/centos-7-kube-v1.17.16.ova.sha256)   |   [ova](http://storage.googleapis.com/capv-images/release/v1.17.16/ubuntu-1804-kube-v1.17.16.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.17.16/ubuntu-1804-kube-v1.17.16.ova.sha256)   | [ova](http://storage.googleapis.com/capv-images/release/v1.17.16/photon-3-kube-v1.17.16.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.17.16/photon-3-1804-kube-v1.17.16.ova.sha256) |
-|  v1.18.14  | [ova](http://storage.googleapis.com/capv-images/release/v1.18.14/centos-7-kube-v1.18.14.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.18.14/centos-7-kube-v1.18.14.ova.sha256) | [ova](http://storage.googleapis.com/capv-images/release/v1.18.14/ubuntu-1804-kube-v1.18.14.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.18.14/ubuntu-1804-kube-v1.18.14.ova.sha256) | [ova](http://storage.googleapis.com/capv-images/release/v1.18.14/photon-3-kube-v1.18.14.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.18.14/photon-3-kube-v1.18.14.ova.sha256)  |
-|  v1.19.6   |   [ova](http://storage.googleapis.com/capv-images/release/v1.19.6/centos-7-kube-v1.19.6.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.19.6/centos-7-kube-v1.19.6.ova.sha256)   |   [ova](http://storage.googleapis.com/capv-images/release/v1.19.6/ubuntu-1804-kube-v1.19.6.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.19.6/ubuntu-1804-kube-v1.19.6.ova.sha256)   |   [ova](http://storage.googleapis.com/capv-images/release/v1.19.6/photon-3-kube-v1.19.6.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.19.6/photon-3-kube-v1.19.6.ova.sha256)    |
-|  v1.20.1   |   [ova](http://storage.googleapis.com/capv-images/release/v1.20.1/centos-7-kube-v1.20.1.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.20.1/centos-7-kube-v1.20.1.ova.sha256)   |   [ova](http://storage.googleapis.com/capv-images/release/v1.20.1/ubuntu-1804-kube-v1.20.1.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.20.1/ubuntu-1804-kube-v1.20.1.ova.sha256)   |   [ova](http://storage.googleapis.com/capv-images/release/v1.20.1/photon-3-kube-v1.20.1.ova), [sha256](http://storage.googleapis.com/capv-images/release/v1.20.1/photon-3-kube-v1.20.1.ova.sha256)    |
+|  v1.17.16   |   [ova](https://storage.googleapis.com/capv-images/release/v1.17.16/centos-7-kube-v1.17.16.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.17.16/centos-7-kube-v1.17.16.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-images/release/v1.17.16/ubuntu-1804-kube-v1.17.16.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.17.16/ubuntu-1804-kube-v1.17.16.ova.sha256)   | [ova](https://storage.googleapis.com/capv-images/release/v1.17.16/photon-3-kube-v1.17.16.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.17.16/photon-3-1804-kube-v1.17.16.ova.sha256) |
+|  v1.18.14  | [ova](https://storage.googleapis.com/capv-images/release/v1.18.14/centos-7-kube-v1.18.14.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.18.14/centos-7-kube-v1.18.14.ova.sha256) | [ova](https://storage.googleapis.com/capv-images/release/v1.18.14/ubuntu-1804-kube-v1.18.14.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.18.14/ubuntu-1804-kube-v1.18.14.ova.sha256) | [ova](https://storage.googleapis.com/capv-images/release/v1.18.14/photon-3-kube-v1.18.14.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.18.14/photon-3-kube-v1.18.14.ova.sha256)  |
+|  v1.19.6   |   [ova](https://storage.googleapis.com/capv-images/release/v1.19.6/centos-7-kube-v1.19.6.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.19.6/centos-7-kube-v1.19.6.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-images/release/v1.19.6/ubuntu-1804-kube-v1.19.6.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.19.6/ubuntu-1804-kube-v1.19.6.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-images/release/v1.19.6/photon-3-kube-v1.19.6.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.19.6/photon-3-kube-v1.19.6.ova.sha256)    |
+|  v1.20.1   |   [ova](https://storage.googleapis.com/capv-images/release/v1.20.1/centos-7-kube-v1.20.1.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.20.1/centos-7-kube-v1.20.1.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-images/release/v1.20.1/ubuntu-1804-kube-v1.20.1.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.20.1/ubuntu-1804-kube-v1.20.1.ova.sha256)   |   [ova](https://storage.googleapis.com/capv-images/release/v1.20.1/photon-3-kube-v1.20.1.ova), [sha256](https://storage.googleapis.com/capv-images/release/v1.20.1/photon-3-kube-v1.20.1.ova.sha256)    |
 
 A full list of the published machine images for CAPV may be obtained with the following command:
 
@@ -66,7 +66,7 @@ gsutil ls gs://capv-images/release/*
 Or, to produce a list of URLs for the same image files (and their checksums), the following command may be used:
 
 ```shell
-gsutil ls gs://capv-images/release/*/*.{ova,sha256} | sed 's~^gs://~http://storage.googleapis.com/~'
+gsutil ls gs://capv-images/release/*/*.{ova,sha256} | sed 's~^gs://~https://storage.googleapis.com/~'
 ```
 
 ## HAProxy published OVAs
@@ -75,7 +75,7 @@ Note: These OVAs are not updated for security fixes and it is recommended to alw
 
 | HAProxy Dataplane API | Photon 3 |
 |:--------------------: | :------: |
-|  v1.2.4  |  [ova](http://storage.googleapis.com/capv-images/extra/haproxy/release/v1.2.4/photon-3-haproxy-v1.2.4.ova), [sha256](http://storage.googleapis.com/capv-images/extra/haproxy/release/v1.2.4/photon-3-haproxy-v1.2.4.ova.sha256)  |
+|  v1.2.4  |  [ova](https://storage.googleapis.com/capv-images/extra/haproxy/release/v1.2.4/photon-3-haproxy-v1.2.4.ova), [sha256](https://storage.googleapis.com/capv-images/extra/haproxy/release/v1.2.4/photon-3-haproxy-v1.2.4.ova.sha256)  |
 
 A full list of the published HAProxy images for CAPV may be obtained with the following command:
 
@@ -86,7 +86,7 @@ gsutil ls gs://capv-images/extra/haproxy/release/*
 Or, to produce a list of URLs for the same image files (and their checksums), the following command may be used:
 
 ```shell
-gsutil ls gs://capv-images/extra/haproxy/release/*/*.{ova,sha256} | sed 's~^gs://~http://storage.googleapis.com/~'
+gsutil ls gs://capv-images/extra/haproxy/release/*/*.{ova,sha256} | sed 's~^gs://~https://storage.googleapis.com/~'
 ```
 
 ## Documentation

api/v1alpha3/condition_consts.go

@@ -47,14 +47,6 @@ const (
 	// while installing the container storage interface  addon; those kind of errors are usually transient
 	// the operation is automatically re-tried by the controller.
 	CSIProvisioningFailedReason = "CSIProvisioningFailed"
-
-	// VCenterAvailableCondition documents the connectivity with vcenter
-	// for a given VSphereCluster
-	VCenterAvailableCondition clusterv1.ConditionType = "VCenterAvailable"
-
-	// VCenterUnreachableReason (Severity=Error) documents a VSphereCluster controller detecting
-	// issues with VCenter reachability;
-	VCenterUnreachableReason = "VCenterUnreachable"
 )
 
 // Conditions and condition Reasons for the VSphereMachine and the VSphereVM object.
@@ -108,3 +100,24 @@ const (
 	// NOTE: This reason does not apply to VSphereVM (this state happens after the VSphereVM is in ready state).
 	WaitingForNetworkAddressesReason = "WaitingForNetworkAddresses"
 )
+
+// Conditions and Reasons related to utilizing a VSphereIdentity to make connections to a VCenter. Can currently be used by VSphereCluster and VSphereVM
+
+const (
+	// VCenterAvailableCondition documents the connectivity with vcenter
+	// for a given VSphereCluster
+	VCenterAvailableCondition clusterv1.ConditionType = "VCenterAvailable"
+
+	// VCenterUnreachableReason (Severity=Error) documents a VSphereCluster controller detecting
+	// issues with VCenter reachability;
+	VCenterUnreachableReason = "VCenterUnreachable"
+
+	// CredentialsAvailableCondidtion is used by VSphereClusterIdentity when a credential secret is available and unused by other VSphereClusterIdentities
+	CredentialsAvailableCondidtion clusterv1.ConditionType = "CredentialsAvailable"
+
+	// SecretNotAvailableReason is used when the secret referenced by the VSphereClusterIdentity cannot be found
+	SecretNotAvailableReason = "SecretNotAvailable"
+
+	// SecretAlreadyInUseReason is used when another VSphereClusterIdentity is using the secret
+	SecretAlreadyInUseReason = "SecretInUse"
+)

api/v1alpha3/conversion_test.go

@@ -33,12 +33,24 @@ func TestFuzzyConversion(t *testing.T) {
 	g.Expect(AddToScheme(scheme)).To(Succeed())
 	g.Expect(nextver.AddToScheme(scheme)).To(Succeed())
 
-	t.Run("for VSphereCluster", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereCluster{}, &VSphereCluster{}))
-	t.Run("for VSphereCluster", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereClusterList{}, &VSphereClusterList{}))
-	t.Run("for VSphereMachine", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachine{}, &VSphereMachine{}))
-	t.Run("for VSphereMachineList", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachineList{}, &VSphereMachineList{}))
-	t.Run("for VSphereMachineTemplate", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachineTemplate{}, &VSphereMachineTemplate{}))
-	t.Run("for VSphereMachineTemplateList", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereMachineTemplateList{}, &VSphereMachineTemplateList{}))
-	t.Run("for VSphereVM", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereVM{}, &VSphereVM{}))
-	t.Run("for VSphereVMList", utilconversion.FuzzTestFunc(scheme, &nextver.VSphereVMList{}, &VSphereVMList{}))
+	t.Run("for VSphereCluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
+		Scheme: scheme,
+		Hub:    &nextver.VSphereCluster{},
+		Spoke:  &VSphereCluster{},
+	}))
+	t.Run("for VSphereMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
+		Scheme: scheme,
+		Hub:    &nextver.VSphereMachine{},
+		Spoke:  &VSphereMachine{},
+	}))
+	t.Run("for VSphereMachineTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
+		Scheme: scheme,
+		Hub:    &nextver.VSphereMachineTemplate{},
+		Spoke:  &VSphereMachineTemplate{},
+	}))
+	t.Run("for VSphereVM", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
+		Scheme: scheme,
+		Hub:    &nextver.VSphereVM{},
+		Spoke:  &VSphereVM{},
+	}))
 }

api/v1alpha3/vspherecluster_conversion.go

@@ -17,20 +17,42 @@ limitations under the License.
 package v1alpha3
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	infrav1alpha4 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha4"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
 // ConvertTo converts this VSphereCluster to the Hub version (v1alpha4).
 func (src *VSphereCluster) ConvertTo(dstRaw conversion.Hub) error { // nolint
 	dst := dstRaw.(*infrav1alpha4.VSphereCluster)
-	return Convert_v1alpha3_VSphereCluster_To_v1alpha4_VSphereCluster(src, dst, nil)
+	if err := Convert_v1alpha3_VSphereCluster_To_v1alpha4_VSphereCluster(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Manually restore data.
+	restored := &infrav1alpha4.VSphereCluster{}
+	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
+		return err
+	}
+	if restored.Spec.IdentityRef != nil {
+		dst.Spec.IdentityRef = restored.Spec.IdentityRef
+	}
+	return nil
 }
 
 // ConvertFrom converts from the Hub version (v1alpha4) to this VSphereCluster.
 func (dst *VSphereCluster) ConvertFrom(srcRaw conversion.Hub) error { // nolint
 	src := srcRaw.(*infrav1alpha4.VSphereCluster)
-	return Convert_v1alpha4_VSphereCluster_To_v1alpha3_VSphereCluster(src, dst, nil)
+	if err := Convert_v1alpha4_VSphereCluster_To_v1alpha3_VSphereCluster(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Preserve Hub data on down-conversion.
+	if err := utilconversion.MarshalData(src, dst); err != nil {
+		return err
+	}
+	return nil
 }
 
 // ConvertTo converts this VSphereClusterList to the Hub version (v1alpha4).
@@ -44,3 +66,7 @@ func (dst *VSphereClusterList) ConvertFrom(srcRaw conversion.Hub) error { // nol
 	src := srcRaw.(*infrav1alpha4.VSphereClusterList)
 	return Convert_v1alpha4_VSphereClusterList_To_v1alpha3_VSphereClusterList(src, dst, nil)
 }
+
+func Convert_v1alpha4_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(in *infrav1alpha4.VSphereClusterSpec, out *VSphereClusterSpec, s apiconversion.Scope) error { // nolint
+	return autoConvert_v1alpha4_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(in, out, s)
+}

api/v1alpha3/vspherecluster_types.go

@@ -62,6 +62,11 @@ type VSphereClusterSpec struct {
 	// DEPRECATED: will be removed in v1alpha4
 	// +optional
 	LoadBalancerRef *corev1.ObjectReference `json:"loadBalancerRef,omitempty"`
+
+	// IdentityRef is a reference to either a Secret or VSphereClusterIdentity that contains
+	// the identity to use when reconciling the cluster.
+	// +optional
+	IdentityRef *VSphereIdentityReference `json:"identityRef,omitempty"`
 }
 
 // VSphereClusterStatus defines the observed state of VSphereClusterSpec
@@ -72,6 +77,9 @@ type VSphereClusterStatus struct {
 	// Conditions defines current service state of the VSphereCluster.
 	// +optional
 	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
+
+	// FailureDomains is a list of failure domain objects synced from the infrastructure provider.
+	FailureDomains clusterv1.FailureDomains `json:"failureDomains,omitempty"`
 }
 
 // +kubebuilder:object:root=true