Skip to content

Commit 0921269

Browse files
authored
Merge pull request #447 from jayesh-srivastava/v0.4.4
Update dependencies for v0.4.4
2 parents a8afe4b + 9b4e4ca commit 0921269

File tree

6 files changed

+93
-35
lines changed

6 files changed

+93
-35
lines changed

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ jobs:
1010
- name: golangci-lint
1111
uses: golangci/golangci-lint-action@v2
1212
with:
13-
version: v1.42.0
13+
version: v1.42.1

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ ENVSUBST_VER := v1.2.0
6666
ENVSUBST_BIN := envsubst
6767
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)
6868

69-
GOLANGCI_LINT_VER := v1.42.0
69+
GOLANGCI_LINT_VER := v1.42.1
7070
GOLANGCI_LINT_BIN := golangci-lint
7171
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
7272

@@ -375,7 +375,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST)
375375
kubectl wait --for=condition=Available --timeout=5m -n cert-manager deployment/cert-manager-webhook
376376

377377
# Deploy CAPI
378-
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.3/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
378+
curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v0.4.4/cluster-api-components.yaml | $(ENVSUBST) | kubectl apply -f -
379379

380380
# Deploy CAPG
381381
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ settings = {
1616
"deploy_cert_manager": True,
1717
"preload_images_for_kind": True,
1818
"kind_cluster_name": "capg",
19-
"capi_version": "v0.4.3",
19+
"capi_version": "v0.4.4",
2020
"cert_manager_version": "v1.1.0",
2121
"kubernetes_version": "v1.21.4",
2222
}

go.mod

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ require (
1111
golang.org/x/mod v0.5.0
1212
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
1313
google.golang.org/api v0.54.0
14-
k8s.io/api v0.21.4
15-
k8s.io/apimachinery v0.21.4
16-
k8s.io/client-go v0.21.4
17-
k8s.io/component-base v0.21.4
14+
k8s.io/api v0.22.2
15+
k8s.io/apimachinery v0.22.2
16+
k8s.io/client-go v0.22.2
17+
k8s.io/component-base v0.22.2
1818
k8s.io/klog/v2 v2.10.0
1919
k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e
20-
sigs.k8s.io/cluster-api v0.4.3
21-
sigs.k8s.io/cluster-api/test v0.4.3
22-
sigs.k8s.io/controller-runtime v0.9.7
20+
sigs.k8s.io/cluster-api v0.4.4
21+
sigs.k8s.io/cluster-api/test v0.4.4
22+
sigs.k8s.io/controller-runtime v0.10.2
2323
)
2424

25-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.3
25+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v0.4.4

0 commit comments

Comments
 (0)