Skip to content

Commit

Permalink
Merge pull request #447 from jayesh-srivastava/v0.4.4
Browse files Browse the repository at this point in the history
Update dependencies for v0.4.4
  • Loading branch information
k8s-ci-robot authored Oct 10, 2021
2 parents a8afe4b + 9b4e4ca commit 0921269
Show file tree
Hide file tree
Showing 6 changed files with 93 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ jobs:
- name: golangci-lint
uses: golangci/golangci-lint-action@v2
with:
version: v1.42.0
version: v1.42.1
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ ENVSUBST_VER := v1.2.0
ENVSUBST_BIN := envsubst
ENVSUBST := $(TOOLS_BIN_DIR)/$(ENVSUBST_BIN)

GOLANGCI_LINT_VER := v1.42.0
GOLANGCI_LINT_VER := v1.42.1
GOLANGCI_LINT_BIN := golangci-lint
GOLANGCI_LINT := $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)

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

# Deploy CAPI
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 -
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 -

# Deploy CAPG
kind load docker-image $(CONTROLLER_IMG)-$(ARCH):$(TAG) --name=clusterapi
Expand Down
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ settings = {
"deploy_cert_manager": True,
"preload_images_for_kind": True,
"kind_cluster_name": "capg",
"capi_version": "v0.4.3",
"capi_version": "v0.4.4",
"cert_manager_version": "v1.1.0",
"kubernetes_version": "v1.21.4",
}
Expand Down
16 changes: 8 additions & 8 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ require (
golang.org/x/mod v0.5.0
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d
google.golang.org/api v0.54.0
k8s.io/api v0.21.4
k8s.io/apimachinery v0.21.4
k8s.io/client-go v0.21.4
k8s.io/component-base v0.21.4
k8s.io/api v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v0.22.2
k8s.io/component-base v0.22.2
k8s.io/klog/v2 v2.10.0
k8s.io/utils v0.0.0-20210820185131-d34e5cb4466e
sigs.k8s.io/cluster-api v0.4.3
sigs.k8s.io/cluster-api/test v0.4.3
sigs.k8s.io/controller-runtime v0.9.7
sigs.k8s.io/cluster-api v0.4.4
sigs.k8s.io/cluster-api/test v0.4.4
sigs.k8s.io/controller-runtime v0.10.2
)

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

0 comments on commit 0921269

Please sign in to comment.