Skip to content

Commit 2fe7fd9

Browse files
detiberdetiber
authored
Merge pull request kubernetes-retired#63 from cprivite/capi-v1
Update Makefile and conformance spec
2 parents 581a8e9 + 4f5ee4c commit 2fe7fd9

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

‎Makefile‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -65,23 +65,23 @@ CONVERSION_GEN_VER := v0.23.3
6565
CONVERSION_GEN_BIN := conversion-gen
6666
CONVERSION_GEN := $(TOOLS_BIN_DIR)/$(CONVERSION_GEN_BIN)-$(CONVERSION_GEN_VER)
6767

68-
ENVSUBST_VER := v1.2.0
68+
ENVSUBST_VER := v2.0.0-20210730161058-179042472c46
6969
ENVSUBST_BIN := envsubst
7070
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
7171

7272
GOLANGCI_LINT_VER := v1.44.0
7373
GOLANGCI_LINT_BIN := golangci-lint
7474
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7575

76-
KUSTOMIZE_VER := v3.9.1
76+
KUSTOMIZE_VER := v4.0.4
7777
KUSTOMIZE_BIN := kustomize
7878
KUSTOMIZE := $(TOOLS_BIN_DIR)/$(KUSTOMIZE_BIN)-$(KUSTOMIZE_VER)
7979

8080
GINKGO_VER := v1.16.5
8181
GINKGO_BIN := ginkgo
8282
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)
8383

84-
KUBECTL_VER := v1.20.4
84+
KUBECTL_VER := v1.21.2
8585
KUBECTL_BIN := kubectl
8686
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)
8787

@@ -93,7 +93,7 @@ TIMEOUT := $(shell command -v timeout || command -v gtimeout)
9393

9494
# Define Docker related variables. Releases should modify and double check these vars.
9595
REGISTRY ?= ghcr.io
96-
IMAGE_NAME ?= kubernetes-sigs/cluster-api-provider-packet
96+
export IMAGE_NAME ?= kubernetes-sigs/cluster-api-provider-packet
9797
export CONTROLLER_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
9898
export TAG ?= dev
9999
export ARCH ?= amd64
@@ -203,29 +203,29 @@ e2e-test-templates: $(KUSTOMIZE) e2e-test-templates-v1alpha3 e2e-test-templates-
203203

204204
e2e-test-templates-v1alpha3: $(KUSTOMIZE) ## Generate cluster templates for v1alpha3
205205
mkdir -p $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/
206-
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1alpha3/cluster-template-packet-ccm --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/cluster-template-packet-ccm.yaml
207-
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1alpha3/cluster-template-cpem --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/cluster-template-cpem.yaml
206+
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1alpha3/cluster-template-packet-ccm --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/cluster-template-packet-ccm.yaml
207+
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1alpha3/cluster-template-cpem --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1alpha3/cluster-template-cpem.yaml
208208

209209
e2e-test-templates-v1beta1: $(KUSTOMIZE) ## Generate cluster templates for v1beta1
210210
mkdir -p $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/
211-
$(KUSTOMIZE) build $(REPO_ROOT)/templates/experimental-crs-cni --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template.yaml
212-
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-kcp-scale-in --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-kcp-scale-in.yaml
213-
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-node-drain --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-node-drain.yaml
214-
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-md-remediation --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-md-remediation.yaml
215-
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-kcp-remediation --load_restrictor none > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-kcp-remediation.yaml
211+
$(KUSTOMIZE) build $(REPO_ROOT)/templates/experimental-crs-cni --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template.yaml
212+
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-kcp-scale-in --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-kcp-scale-in.yaml
213+
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-node-drain --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-node-drain.yaml
214+
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-md-remediation --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-md-remediation.yaml
215+
$(KUSTOMIZE) build $(REPO_ROOT)/test/e2e/data/v1beta1/cluster-template-kcp-remediation --load-restrictor LoadRestrictionsNone > $(TEST_TEMPLATES_TARGET_DIR)/v1beta1/cluster-template-kcp-remediation.yaml
216216

217217
## --------------------------------------
218218
## Tooling Binaries
219219
## --------------------------------------
220220

221221
$(ENVSUBST): ## Build envsubst from tools folder.
222-
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) github.com/a8m/envsubst/cmd/envsubst $(ENVSUBST_BIN) $(ENVSUBST_VER)
222+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) github.com/drone/envsubst/v2/cmd/envsubst $(ENVSUBST_BIN) $(ENVSUBST_VER)
223223

224224
$(GOLANGCI_LINT): ## Build golangci-lint from tools folder.
225225
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) github.com/golangci/golangci-lint/cmd/golangci-lint $(GOLANGCI_LINT_BIN) $(GOLANGCI_LINT_VER)
226226

227227
$(KUSTOMIZE): ## Build kustomize from tools folder.
228-
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v3 $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
228+
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v4 $(KUSTOMIZE_BIN) $(KUSTOMIZE_VER)
229229

230230
$(CONTROLLER_GEN): ## Build controller-gen from tools folder.
231231
GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) $(CONTROLLER_GEN_VER)
@@ -275,7 +275,7 @@ generate: ## Generate code
275275

276276
.PHONY: generate-templates
277277
generate-templates: $(KUSTOMIZE) ## Generate cluster templates
278-
$(KUSTOMIZE) build templates/experimental-crs-cni --load_restrictor none > templates/cluster-template-crs-cni.yaml
278+
$(KUSTOMIZE) build templates/experimental-crs-cni --load-restrictor LoadRestrictionsNone > templates/cluster-template-crs-cni.yaml
279279
$(KUSTOMIZE) build templates/addons/calico > templates/addons/calico.yaml
280280

281281
.PHONY: generate-go

‎templates/cluster-template-crs-cni.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ spec:
147147
netmask 255.255.255.255
148148
EOF
149149
- systemctl restart networking
150-
- |-
150+
- |
151151
if [ -f "/run/kubeadm/kubeadm.yaml" ]; then
152152
export KUBECONFIG=/etc/kubernetes/admin.conf
153153
export CPEM_YAML=https://raw.githubusercontent.com/detiber/packet-ccm/test/deploy/template/deployment.yaml

‎test/e2e/data/kubetest/conformance.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ginkgo.focus: \[Conformance\]
2+
ginkgo.skip: \[Serial\]
23
disable-log-dump: true
34
ginkgo.progress: true
45
ginkgo.slowSpecThreshold: 120.0

0 commit comments

Comments
 (0)