Merge pull request #211 from syself/update/capi

🌱 Updating capi to 1.1.4

.github/workflows/pr-golangci-lint.yml

@@ -4,20 +4,20 @@ on:
     types: [opened, edited, synchronize, reopened]
     branches:
       - main
-      - 'releases/**'
+      - "releases/**"
     paths:
-      - '**.go'
-      - '**go.mod'
-      - '**go.sum'
-      - '!tilt_modules/**'
+      - "**.go"
+      - "**go.mod"
+      - "**go.sum"
+      - "!tilt_modules/**"
 jobs:
   golangci:
     name: lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.45.2  # https://github.com/golangci/golangci-lint/releases
-          working-directory: ${{matrix.working-directory}}
+          version: v1.46.2 # https://github.com/golangci/golangci-lint/releases
+          working-directory: ${{matrix.working-directory}}

Makefile

@@ -43,7 +43,7 @@ CI_KIND ?= true
 #
 # Binaries.
 #
-MINIMUM_CLUSTERCTL_VERSION=1.1.3				# https://github.com/kubernetes-sigs/cluster-api/releases
+MINIMUM_CLUSTERCTL_VERSION=1.1.4				# https://github.com/kubernetes-sigs/cluster-api/releases
 MINIMUM_CTLPTL_VERSION=0.7.8						# https://github.com/tilt-dev/ctlptl/releases
 MINIMUM_GO_VERSION=go$(GO_VERSION)			# Check current project go version
 MINIMUM_HCLOUD_VERSION=1.29.4						# https://github.com/hetznercloud/cli/releases

Tiltfile

@@ -20,10 +20,10 @@ settings = {
     "deploy_observability": False,
     "preload_images_for_kind": True,
     "kind_cluster_name": "caph",
-    "capi_version": "v1.1.3",
+    "capi_version": "v1.1.4",
     "cabpt_version": "v0.5.2",
     "cacppt_version": "v0.4.5",
-    "cert_manager_version": "v1.1.0",
+    "cert_manager_version": "v1.7.2",
     "kustomize_substitutions": {
         "HCLOUD_REGION": "fsn1",
         "CONTROL_PLANE_MACHINE_COUNT": "3",

docs/developers/tilt.md

@@ -7,10 +7,10 @@
     "deploy_observability": False,
     "preload_images_for_kind": True,
     "kind_cluster_name": "caph",
-    "capi_version": "v1.1.3",
+    "capi_version": "v1.1.4",
     "cabpt_version": "v0.5.2",
     "cacppt_version": "v0.4.5",
-    "cert_manager_version": "v1.1.0",
+    "cert_manager_version": "v1.7.2",
     "kustomize_substitutions": {
         "HCLOUD_REGION": "fsn1",
         "CONTROL_PLANE_MACHINE_COUNT": "3",
@@ -34,7 +34,7 @@
 | deploy_observability | bool | false | no | If true, installs grafana, loki and promtail in the dev cluster. Grafana UI will be accessible via a link in the tilt console. Important! This feature requires the `helm` command to be available in the user's path |
 | preload_images_for_kind | bool | true | no | If set to true, uses `kind load docker-image` to preload images into a kind cluster |
 | kind_cluster_name | []object | "caph" | no | The name of the kind cluster to use when preloading images |
-| capi_version | string | "v1.1.3" | no | Version of CAPI |
+| capi_version | string | "v1.1.4" | no | Version of CAPI |
 | cabpt_version | string | "v0.5.2" | no | Version of Cluster API Bootstrap Provider Talos |
 | cacppt_version | string | "v0.4.5" | no | Version of Cluster API Control Plane Provider Talos |
 | cert_manager_version | string | "v1.1.0" | no | Version of cert manager |

go.mod

@@ -22,14 +22,14 @@ require (
 	k8s.io/klog/v2 v2.60.1
 	k8s.io/kubectl v0.24.1
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
-	sigs.k8s.io/cluster-api v1.1.3
-	sigs.k8s.io/cluster-api/test v1.1.3
+	sigs.k8s.io/cluster-api v1.1.4
+	sigs.k8s.io/cluster-api/test v1.1.4
 	sigs.k8s.io/controller-runtime v0.11.2
 	sigs.k8s.io/kind v0.14.0
 )
 
 require (
-	cloud.google.com/go v0.93.3 // indirect
+	cloud.google.com/go v0.99.0 // indirect
 	github.com/Azure/go-autorest v14.2.0+incompatible // indirect
 	github.com/Azure/go-autorest/autorest v0.11.18 // indirect
 	github.com/Azure/go-autorest/autorest/adal v0.9.13 // indirect
@@ -46,12 +46,11 @@ require (
 	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
-	github.com/containerd/containerd v1.5.9 // indirect
 	github.com/coredns/caddy v1.1.0 // indirect
 	github.com/coredns/corefile-migration v1.0.14 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.8.1+incompatible // indirect
-	github.com/docker/docker v20.10.12+incompatible // indirect
+	github.com/docker/docker v20.10.16+incompatible // indirect
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/docker/go-units v0.4.0 // indirect
 	github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -119,7 +118,6 @@ require (
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220107163113-42d7afdf6368 // indirect
-	google.golang.org/grpc v1.42.0 // indirect
 	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.63.2 // indirect