Skip to content

Commit 3e7c92d

Browse files
batisteinbatistein
authored
Merge pull request #309 from syself/cluster-api-1-2-3
🌱 update to clusterctl 1.2.3
2 parents 2a3e684 + f505117 commit 3e7c92d

File tree

9 files changed

+129
-29
lines changed

9 files changed

+129
-29
lines changed

‎.github/workflows/coverage.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: Test and coverage
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- "releases/**"
8+
paths:
9+
- "**.go"
10+
- "**go.mod"
11+
- "**go.sum"
12+
jobs:
13+
build:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v3
17+
with:
18+
fetch-depth: 2
19+
- uses: ./.github/actions/setup-go
20+
- name: Run coverage
21+
run: make test-cover
22+
- name: Upload coverage to Codecov
23+
uses: codecov/codecov-action@v3
24+
with:
25+
files: out/coverage.txt

‎Makefile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ CI_KIND ?= true
4343
#
4444
# Binaries.
4545
#
46-
MINIMUM_CLUSTERCTL_VERSION=1.2.2 # https://github.com/kubernetes-sigs/cluster-api/releases
46+
MINIMUM_CLUSTERCTL_VERSION=1.2.3 # https://github.com/kubernetes-sigs/cluster-api/releases
4747
MINIMUM_CTLPTL_VERSION=0.8.8 # https://github.com/tilt-dev/ctlptl/releases
4848
MINIMUM_GO_VERSION=go$(GO_VERSION) # Check current project go version
4949
MINIMUM_HCLOUD_VERSION=1.30.3 # https://github.com/hetznercloud/cli/releases
@@ -490,9 +490,7 @@ test-verbose: ## Run tests with verbose settings
490490

491491
.PHONY: test-cover
492492
test-cover: $(RELEASE_DIR) ## Run tests with code coverage and code generate reports
493-
$(MAKE) test TEST_ARGS="$(TEST_ARGS) -coverprofile=out/coverage.out -covermode=atomic"
494-
go tool cover -func=out/coverage.out -o $(RELEASE_DIR)/coverage.txt
495-
go tool cover -html=out/coverage.out -o $(RELEASE_DIR)/coverage.html
493+
$(MAKE) test TEST_ARGS="$(TEST_ARGS) -coverprofile=out/coverage.txt -covermode=atomic"
496494

497495
.PHONY: test-junit
498496
test-junit: $(SETUP_ENVTEST) $(GOTESTSUM) ## Run tests with verbose setting and generate a junit report

‎Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ settings = {
2020
"deploy_observability": False,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "caph",
23-
"capi_version": "v1.2.2",
23+
"capi_version": "v1.2.3",
2424
"cabpt_version": "v0.5.4",
2525
"cacppt_version": "v0.4.6",
2626
"cert_manager_version": "v1.9.1",

‎docs/developers/tilt.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"deploy_observability": False,
88
"preload_images_for_kind": True,
99
"kind_cluster_name": "caph",
10-
"capi_version": "v1.2.2",
10+
"capi_version": "v1.2.3",
1111
"cabpt_version": "v0.5.2",
1212
"cacppt_version": "v0.4.5",
1313
"cert_manager_version": "v1.9.1",
@@ -34,7 +34,7 @@
3434
| 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 |
3535
| preload_images_for_kind | bool | true | no | If set to true, uses `kind load docker-image` to preload images into a kind cluster |
3636
| kind_cluster_name | []object | "caph" | no | The name of the kind cluster to use when preloading images |
37-
| capi_version | string | "v1.2.2" | no | Version of CAPI |
37+
| capi_version | string | "v1.2.3" | no | Version of CAPI |
3838
| cabpt_version | string | "v0.5.4" | no | Version of Cluster API Bootstrap Provider Talos |
3939
| cacppt_version | string | "v0.4.6" | no | Version of Cluster API Control Plane Provider Talos |
4040
| cert_manager_version | string | "v1.9.1" | no | Version of cert manager |

‎go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module github.com/syself/cluster-api-provider-hetzner
22

33
go 1.19
44

5-
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.2
5+
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.2.3
66

77
require (
88
github.com/blang/semver v3.5.1+incompatible
@@ -24,8 +24,8 @@ require (
2424
k8s.io/klog/v2 v2.80.1
2525
k8s.io/kubectl v0.25.2
2626
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
27-
sigs.k8s.io/cluster-api v1.2.2
28-
sigs.k8s.io/cluster-api/test v1.2.2
27+
sigs.k8s.io/cluster-api v1.2.3
28+
sigs.k8s.io/cluster-api/test v1.2.3
2929
sigs.k8s.io/controller-runtime v0.12.3
3030
sigs.k8s.io/kind v0.16.0
3131
)

‎go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1141,10 +1141,10 @@ k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/
11411141
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
11421142
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
11431143
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
1144-
sigs.k8s.io/cluster-api v1.2.2 h1:acx31Eyv5s4xeublsbxWpRFjcQ5h4BmDPI0glm3sEoE=
1145-
sigs.k8s.io/cluster-api v1.2.2/go.mod h1:oiuV+mlCV1QxDnuI+PfElFlAfuXHo9ZGVBojoihVtHY=
1146-
sigs.k8s.io/cluster-api/test v1.2.2 h1:DUVmlCVQ0H7zY1doxzS1JuooUjXxTN80i9swc16tZd0=
1147-
sigs.k8s.io/cluster-api/test v1.2.2/go.mod h1:JdMqpv9rEOFWQVQ8danpBduqxoQkZMiOvpIGJ7v8qjw=
1144+
sigs.k8s.io/cluster-api v1.2.3 h1:NWtaadQHhl/H1hWp6Z6jXJwZU8o6SDRgN5stkVqk5L8=
1145+
sigs.k8s.io/cluster-api v1.2.3/go.mod h1:YaLJOC9mSsIOpdbh7BpthGmC8uxIJADzrMMIGpgahfM=
1146+
sigs.k8s.io/cluster-api/test v1.2.3 h1:B8UKXBwLrEl0GTlzZrHtpQDiZXWXHRKbSHsHI3gYrmI=
1147+
sigs.k8s.io/cluster-api/test v1.2.3/go.mod h1:C+UT2CXWNu3eAoeI0HHI19ex90pAdzAqR6YjhxRNHyM=
11481148
sigs.k8s.io/controller-runtime v0.12.3 h1:FCM8xeY/FI8hoAfh/V4XbbYMY20gElh9yh+A98usMio=
11491149
sigs.k8s.io/controller-runtime v0.12.3/go.mod h1:qKsk4WE6zW2Hfj0G4v10EnNB2jMG1C+NTb8h+DwCoU0=
11501150
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2/go.mod h1:B+TnT182UBxE84DiCz4CVE26eOSDAeYCpfDnC2kdKMY=

‎hack/ensure-boilerplate.sh

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎hack/ensure-boilerplate.sh

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
#!/usr/bin/env bash
2+
3+
# Copyright 2014 The Kubernetes Authors.
4+
#
5+
# Licensed under the Apache License, Version 2.0 (the "License");
6+
# you may not use this file except in compliance with the License.
7+
# You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
17+
set -o errexit
18+
set -o nounset
19+
set -o pipefail
20+
21+
if [ "$(uname)" = 'Darwin' ]; then
22+
readlinkf(){ perl -MCwd -e 'print Cwd::abs_path shift' "$1";}
23+
else
24+
readlinkf(){ readlink -f "$1"; }
25+
fi
26+
27+
# shellcheck disable=SC2128
28+
SCRIPT_DIR="$(cd "$(dirname "$(readlinkf "$BASH_SOURCE")")" ; pwd)"
29+
30+
# We assume the link to the script ( {ensure,verify}-boilerplate.sh ) to be
31+
# in a directory 2 levels down from the repo root, e.g. in
32+
# <root>/repo-infra/verify/verify-boilerplate.sh
33+
# Alternatively, you can set the project root by setting the variable
34+
# `REPO_ROOT`.
35+
#
36+
# shellcheck disable=SC2128
37+
: "${REPO_ROOT:="$(cd "${SCRIPT_DIR}/.." ; pwd)"}"
38+
39+
boilerDir="${SCRIPT_DIR}/boilerplate/"
40+
boiler="${boilerDir}/boilerplate.py"
41+
42+
verify() {
43+
# shellcheck disable=SC2207
44+
files_need_boilerplate=(
45+
$( "$boiler" --rootdir="$REPO_ROOT" --boilerplate-dir="$boilerDir" "$@")
46+
)
47+
48+
# Run boilerplate check
49+
if [[ ${#files_need_boilerplate[@]} -gt 0 ]]; then
50+
for file in "${files_need_boilerplate[@]}"; do
51+
echo "Boilerplate header is wrong for: ${file}" >&2
52+
done
53+
54+
return 1
55+
fi
56+
}
57+
58+
ensure() {
59+
"$boiler" --rootdir="$REPO_ROOT" --boilerplate-dir="$boilerDir" --ensure "$@"
60+
}
61+
62+
case "$0" in
63+
*/ensure-boilerplate.sh)
64+
ensure "$@"
65+
;;
66+
*/verify-boilerplate.sh)
67+
verify "$@"
68+
;;
69+
*)
70+
{
71+
echo "unknown command '$0'"
72+
echo ""
73+
echo "Call the script as either 'verify-boilerplate.sh' or 'ensure-boilerplate.sh'"
74+
} >&2
75+
76+
exit 1
77+
;;
78+
esac

‎test/e2e/config/hetzner-ci.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ providers:
1313
- name: cluster-api
1414
type: CoreProvider
1515
versions:
16-
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1
17-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/core-components.yaml"
16+
- name: v1.2.3 # latest published release in the v1beta1 series; this is used for v1beta1
17+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.3/core-components.yaml"
1818
type: "url"
1919
contract: v1beta1
2020
files:
@@ -30,8 +30,8 @@ providers:
3030
- name: kubeadm
3131
type: BootstrapProvider
3232
versions:
33-
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1
34-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/bootstrap-components.yaml"
33+
- name: v1.2.3 # latest published release in the v1beta1 series; this is used for v1beta1
34+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.3/bootstrap-components.yaml"
3535
type: "url"
3636
contract: "v1beta1"
3737
files:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: ControlPlaneProvider
4949
versions:
50-
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/control-plane-components.yaml"
50+
- name: v1.2.3 # latest published release in the v1beta1 series; this is used for v1beta1
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.3/control-plane-components.yaml"
5252
type: "url"
5353
files:
5454
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -158,7 +158,7 @@ variables:
158158

159159
intervals:
160160
default/wait-cluster: ["20m", "10s"]
161-
default/wait-control-plane: ["20m", "10s"]
161+
default/wait-control-plane: ["25m", "10s"]
162162
default/wait-worker-nodes: ["15m", "10s"]
163163
default/wait-controllers: ["5m", "10s"]
164164
default/wait-delete-cluster: ["20m", "10s"]

‎test/e2e/config/hetzner.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ providers:
1313
- name: cluster-api
1414
type: CoreProvider
1515
versions:
16-
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1
17-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/core-components.yaml"
16+
- name: v1.2.3 # latest published release in the v1beta1 series; this is used for v1beta1
17+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.3/core-components.yaml"
1818
type: "url"
1919
contract: v1beta1
2020
files:
@@ -30,8 +30,8 @@ providers:
3030
- name: kubeadm
3131
type: BootstrapProvider
3232
versions:
33-
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1
34-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/bootstrap-components.yaml"
33+
- name: v1.2.3 # latest published release in the v1beta1 series; this is used for v1beta1
34+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.3/bootstrap-components.yaml"
3535
type: "url"
3636
contract: "v1beta1"
3737
files:
@@ -47,8 +47,8 @@ providers:
4747
- name: kubeadm
4848
type: ControlPlaneProvider
4949
versions:
50-
- name: v1.2.2 # latest published release in the v1beta1 series; this is used for v1beta1
51-
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.2/control-plane-components.yaml"
50+
- name: v1.2.3 # latest published release in the v1beta1 series; this is used for v1beta1
51+
value: "https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.2.3/control-plane-components.yaml"
5252
type: "url"
5353
files:
5454
- sourcePath: "../data/shared/v1beta1/metadata.yaml"
@@ -164,7 +164,7 @@ variables:
164164

165165
intervals:
166166
default/wait-cluster: ["20m", "10s"]
167-
default/wait-control-plane: ["20m", "10s"]
167+
default/wait-control-plane: ["25m", "10s"]
168168
default/wait-worker-nodes: ["15m", "10s"]
169169
default/wait-controllers: ["5m", "10s"]
170170
default/wait-delete-cluster: ["20m", "10s"]

0 commit comments

Comments
 (0)