Skip to content

Commit

Permalink
initial change to v1alpha4 types
Browse files Browse the repository at this point in the history
 - update controller runtime to v0.8.1
 - includes updates to Subnets and IngressRules types along with conversion functions
  • Loading branch information
nader-ziada committed Feb 24, 2021
1 parent 27f1cf5 commit 70f6c5b
Show file tree
Hide file tree
Showing 301 changed files with 10,514 additions and 4,120 deletions.
2 changes: 1 addition & 1 deletion .golangci.yml
Expand Up @@ -40,7 +40,7 @@ issues:
- path: cloudtest\.go
linters:
- golint
- path: api/v1alpha2/types\.go
- path: api/v1alpha3/types\.go
linters:
- golint
- path: _test\.go
Expand Down
17 changes: 11 additions & 6 deletions Makefile
Expand Up @@ -52,11 +52,11 @@ ifneq ($(abspath $(ROOT_DIR)),$(GOPATH)/src/sigs.k8s.io/cluster-api-provider-azu
endif

# Binaries.
CONTROLLER_GEN_VER := v0.3.0
CONTROLLER_GEN_VER := v0.4.1-0.20201002000720-57250aac17f6
CONTROLLER_GEN_BIN := controller-gen
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)

CONVERSION_GEN_VER := v0.18.14
CONVERSION_GEN_VER := v0.20.2
CONVERSION_GEN_BIN := conversion-gen
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)

Expand All @@ -67,7 +67,7 @@ GOLANGCI_LINT_VER := v1.34.0
GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)

KUSTOMIZE_VER := v3.5.4
KUSTOMIZE_VER := v3.8.6
KUSTOMIZE_BIN := kustomize
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)

Expand All @@ -87,7 +87,7 @@ GINKGO_VER := v1.14.2
GINKGO_BIN := ginkgo
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)

KUBECTL_VER := v1.18.14
KUBECTL_VER := v1.19.2
KUBECTL_BIN := kubectl
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)

Expand Down Expand Up @@ -282,9 +282,14 @@ generate-go: $(CONTROLLER_GEN) $(MOCKGEN) $(CONVERSION_GEN) ## Runs Go related g
paths=./$(EXP_DIR)/api/... \
object:headerFile=./hack/boilerplate/boilerplate.generatego.txt
$(CONVERSION_GEN) \
--input-dirs=./api/v1alpha2 \
--input-dirs=./api/v1alpha3 \
--build-tag=ignore_autogenerated_core_v1alpha3 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
$(CONVERSION_GEN) \
--input-dirs=./$(EXP_DIR)/api/v1alpha3 \
--output-file-base=zz_generated.conversion \
--go-header-file=./hack/boilerplate/boilerplate.generatego.txt $(OUTPUT_BASE)
go generate ./...

.PHONY: generate-manifests
Expand Down Expand Up @@ -439,7 +444,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook

# Deploy CAPI
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.14/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
curl -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.3.11/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -

# Deploy CAPZ
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=capz
Expand Down
14 changes: 7 additions & 7 deletions PROJECT
@@ -1,22 +1,22 @@
version: "2"
version: "3"
domain: x-k8s.io
repo: sigs.k8s.io/cluster-api-provider-azure
resources:
- group: infrastructure
version: v1alpha2
version: v1alpha3
kind: AzureMachine
- group: infrastructure
version: v1alpha2
version: v1alpha3
kind: AzureCluster
- group: infrastructure
version: v1alpha2
version: v1alpha3
kind: AzureMachineTemplate
- group: infrastructure
version: v1alpha3
version: v1alpha4
kind: AzureMachine
- group: infrastructure
version: v1alpha3
version: v1alpha4
kind: AzureCluster
- group: infrastructure
version: v1alpha3
version: v1alpha4
kind: AzureMachineTemplate
2 changes: 1 addition & 1 deletion Tiltfile
Expand Up @@ -16,7 +16,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capz",
"capi_version": "v0.3.14",
"capi_version": "v0.3.11",
"cert_manager_version": "v0.16.1",
"kubernetes_version": "v1.19.7",
"aks_kubernetes_version": "v1.18.8"
Expand Down
270 changes: 0 additions & 270 deletions api/v1alpha2/azurecluster_conversion.go

This file was deleted.

0 comments on commit 70f6c5b

Please sign in to comment.