Skip to content

Commit

Permalink
Updates v1alpha3 refs to v1alpha4
Browse files Browse the repository at this point in the history
- This patch updates the cluster-api dependency version to use the
latest from the main branch. As a result, the controller-runtime version
is also updates to v0.8.2
- This patch also updates the v1alpha3 refs in the codebase to v1alpha4.
- It also updates golang version to 1.15
- Changes to incorporate nightly CAPI builds

Signed-off-by: Sagar Muchhal <muchhals@vmware.com>
  • Loading branch information
srm09 committed Mar 30, 2021
1 parent b57405b commit 9e74698
Show file tree
Hide file tree
Showing 95 changed files with 1,487 additions and 3,252 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -13,7 +13,7 @@
# limitations under the License.

# Build the manager binary
ARG GOLANG_VERSION=golang:1.13.5
ARG GOLANG_VERSION=golang:1.15.0
FROM $GOLANG_VERSION as builder
WORKDIR /workspace

Expand Down
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -263,9 +263,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
Expand Down
4 changes: 0 additions & 4 deletions api/v1alpha3/conversion_test.go
Expand Up @@ -34,11 +34,7 @@ func TestFuzzyConversion(t *testing.T) {
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{}))
}
27 changes: 0 additions & 27 deletions api/v1alpha3/haproxyloadbalancer_webhook.go

This file was deleted.

27 changes: 0 additions & 27 deletions api/v1alpha3/haproxyloadbalancerlist_webhook.go

This file was deleted.

53 changes: 0 additions & 53 deletions api/v1alpha3/vspherecluster_webhook.go

This file was deleted.

71 changes: 0 additions & 71 deletions api/v1alpha3/vspherecluster_webhook_test.go

This file was deleted.

27 changes: 0 additions & 27 deletions api/v1alpha3/vsphereclusterlist_webhook.go

This file was deleted.

96 changes: 0 additions & 96 deletions api/v1alpha3/vspheremachine_webhook.go

This file was deleted.

0 comments on commit 9e74698

Please sign in to comment.