Skip to content

Commit e03f98a

Browse files
authored
Merge branch 'kubernetes-sigs:main' into e2efix
2 parents a1865cd + 526ea91 commit e03f98a

File tree

199 files changed

+7270
-1273
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

199 files changed

+7270
-1273
lines changed

.github/workflows/pr-dependabot.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
id: vars
2525
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
2626
- name: Set up Go
27-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
27+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
2828
with:
2929
go-version: ${{ steps.vars.outputs.go_version }}
30-
- uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # tag=v4.1.2
30+
- uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # tag=v4.2.0
3131
name: Restore go cache
3232
with:
3333
path: |

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
id: vars
2525
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
2626
- name: Set up Go
27-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
27+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
2828
with:
2929
go-version: ${{ steps.vars.outputs.go_version }}
3030
- name: golangci-lint

.github/workflows/pr-md-link-check.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
18-
- uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368 # tag=v1
18+
- uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # tag=1.0.15
1919
with:
2020
use-quiet-mode: 'yes'
2121
config-file: .markdownlinkcheck.json

.github/workflows/release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323
- name: Get changed files
2424
id: changed-files
25-
uses: tj-actions/changed-files@4edd678ac3f81e2dc578756871e4d00c19191daf # tag=v45.0.4
25+
uses: tj-actions/changed-files@d6e91a2266cdb9d62096cebf1e8546899c6aa18f # tag=v45.0.6
2626
- name: Get release version
2727
id: release-version
2828
run: |
@@ -94,7 +94,7 @@ jobs:
9494
- name: Calculate go version
9595
run: echo "go_version=$(make go-version)" >> $GITHUB_ENV
9696
- name: Set up Go
97-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
97+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
9898
with:
9999
go-version: ${{ env.go_version }}
100100
- name: generate release artifacts

.github/workflows/weekly-md-link-check.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ jobs:
1414
strategy:
1515
fail-fast: false
1616
matrix:
17-
branch: [ main, release-1.8, release-1.7 ]
17+
branch: [ main, release-1.9, release-1.8 ]
1818
runs-on: ubuntu-latest
1919
steps:
2020
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
2121
with:
2222
ref: ${{ matrix.branch }}
23-
- uses: gaurav-nelson/github-action-markdown-link-check@5c5dfc0ac2e225883c0e5f03a85311ec2830d368 # tag=v1
23+
- uses: gaurav-nelson/github-action-markdown-link-check@d53a906aa6b22b8979d33bc86170567e619495ec # tag=1.0.15
2424
with:
2525
use-quiet-mode: 'yes'
2626
config-file: .markdownlinkcheck.json

.github/workflows/weekly-security-scan.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
strategy:
1414
fail-fast: false
1515
matrix:
16-
branch: [ main, release-1.8, release-1.7 ]
16+
branch: [ main, release-1.9, release-1.8 ]
1717
name: Trivy
1818
runs-on: ubuntu-latest
1919
steps:
@@ -25,7 +25,7 @@ jobs:
2525
id: vars
2626
run: echo "go_version=$(make go-version)" >> $GITHUB_OUTPUT
2727
- name: Set up Go
28-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
28+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
2929
with:
3030
go-version: ${{ steps.vars.outputs.go_version }}
3131
- name: Run verify security target

.github/workflows/weekly-test-release.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
branch: [ main, release-1.8, release-1.7 ]
20+
branch: [ main, release-1.9, release-1.8 ]
2121
runs-on: ubuntu-latest
2222
steps:
2323
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # tag=v4.2.2
@@ -32,7 +32,7 @@ jobs:
3232
- name: Calculate go version
3333
run: echo "go_version=$(make go-version)" >> $GITHUB_ENV
3434
- name: Set up Go
35-
uses: actions/setup-go@41dfa10bad2bb2ae585af6ee5bb4d7d973ad74ed # tag=v5.1.0
35+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # tag=v5.2.0
3636
with:
3737
go-version: ${{ env.go_version }}
3838
- name: Test release

.golangci.yml

+12-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ linters:
2222
- errchkjson # invalid types passed to json encoder
2323
- gci # ensures imports are organized
2424
- ginkgolinter # ginkgo and gomega
25-
- goconst # strings that can be replaced by constants
2625
- gocritic # bugs, performance, style (we could add custom ones to this one)
2726
- godot # checks that comments end in a period
2827
- gofmt # warns about incorrect use of fmt functions
@@ -163,6 +162,8 @@ linters-settings:
163162
- pkg: sigs.k8s.io/cluster-api/exp/runtime/catalog
164163
alias: runtimecatalog
165164
- pkg: sigs.k8s.io/cluster-api/internal/runtime/client
165+
alias: internalruntimeclient
166+
- pkg: sigs.k8s.io/cluster-api/exp/runtime/client
166167
alias: runtimeclient
167168
- pkg: sigs.k8s.io/cluster-api/internal/runtime/registry
168169
alias: runtimeregistry
@@ -244,14 +245,21 @@ issues:
244245
- linters:
245246
- staticcheck
246247
text: "SA1019: ((deployment|m|md).Spec.RevisionHistoryLimit|clusterv1.RevisionHistoryAnnotation|c.RolloutUndo) is deprecated"
247-
# Deprecations for MHC MaxUnhealthy, UnhealthyRange
248+
# Deprecations for MD revision management
249+
- linters:
250+
- staticcheck
251+
text: "SA1019: (m|md).Spec.ProgressDeadlineSeconds is deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please see https://github.com/kubernetes-sigs/cluster-api/issues/11470 for more details."
252+
# Deprecations for MHC MaxUnhealthy, UnhealthyRange
248253
- linters:
249254
- staticcheck
250255
text: "SA1019: (mhc|m)(.Spec.MaxUnhealthy|.Spec.UnhealthyRange) is deprecated"
251-
# Deprecations for FailureMessage and FailureReason
256+
# Deprecations for FailureMessage, FailureReason, UnavailableReplicas and FullyLabeledReplicas
257+
- linters:
258+
- staticcheck
259+
text: "SA1019: .*\\.Status\\.(FailureMessage|FailureReason|UnavailableReplicas|FullyLabeledReplicas) is deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details."
252260
- linters:
253261
- staticcheck
254-
text: "SA1019: .*\\.Status\\.(FailureMessage|FailureReason) is deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details."
262+
text: "SA1019: newStatus.FullyLabeledReplicas is deprecated: This field is deprecated and is going to be removed in the next apiVersion. Please see https://github.com/kubernetes-sigs/cluster-api/blob/main/docs/proposals/20240916-improve-status-in-CAPI-resources.md for more details."
255263
# Specific exclude rules for deprecated packages that are still part of the codebase. These
256264
# should be removed as the referenced deprecated packages are removed from the project.
257265
- linters:

CHANGELOG/v1.7.9.md

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
## 👌 Kubernetes version support
2+
3+
- Management Cluster: v1.26.x -> v1.30.x
4+
- Workload Cluster: v1.24.x -> v1.30.x
5+
6+
[More information about version support can be found here](https://cluster-api.sigs.k8s.io/reference/versions.html)
7+
8+
## Changes since v1.7.8
9+
## :chart_with_upwards_trend: Overview
10+
- 6 new commits merged
11+
- 1 bug fixed 🐛
12+
13+
## :bug: Bug Fixes
14+
- clusterctl: Fix: considers objects in kube-system for cert-manager to avoid upgrading twice (#11455)
15+
16+
## :seedling: Others
17+
- clusterctl: Always run crd migration if possible to reduce conversion webhook usage (#11513)
18+
- Dependency: Bump github.com/coredns/corefile-migration to v1.0.24 (#11532)
19+
- Dependency: Bump go 1.22.10 (#11544)
20+
- Dependency: Bump Go version to v1.22.9 (#11420)
21+
- e2e: Add retry to clusterctl `UpgradeWithBinary` (#11542)
22+
23+
## Dependencies
24+
25+
### Added
26+
_Nothing has changed._
27+
28+
### Changed
29+
- github.com/coredns/caddy: [v1.1.0 → v1.1.1](https://github.com/coredns/caddy/compare/v1.1.0...v1.1.1)
30+
- github.com/coredns/corefile-migration: [v1.0.21 → v1.0.24](https://github.com/coredns/corefile-migration/compare/v1.0.21...v1.0.24)
31+
32+
### Removed
33+
- github.com/OneOfOne/xxhash: [v1.2.2](https://github.com/OneOfOne/xxhash/tree/v1.2.2)
34+
- github.com/alecthomas/template: [a0175ee](https://github.com/alecthomas/template/tree/a0175ee)
35+
- github.com/armon/circbuf: [bbbad09](https://github.com/armon/circbuf/tree/bbbad09)
36+
- github.com/armon/go-radix: [7fddfc3](https://github.com/armon/go-radix/tree/7fddfc3)
37+
- github.com/bgentry/speakeasy: [v0.1.0](https://github.com/bgentry/speakeasy/tree/v0.1.0)
38+
- github.com/bketelsen/crypt: [5cbc8cc](https://github.com/bketelsen/crypt/tree/5cbc8cc)
39+
- github.com/cespare/xxhash: [v1.1.0](https://github.com/cespare/xxhash/tree/v1.1.0)
40+
- github.com/coreos/bbolt: [v1.3.2](https://github.com/coreos/bbolt/tree/v1.3.2)
41+
- github.com/coreos/etcd: [v3.3.13+incompatible](https://github.com/coreos/etcd/tree/v3.3.13)
42+
- github.com/coreos/pkg: [399ea9e](https://github.com/coreos/pkg/tree/399ea9e)
43+
- github.com/dgrijalva/jwt-go: [v3.2.0+incompatible](https://github.com/dgrijalva/jwt-go/tree/v3.2.0)
44+
- github.com/dgryski/go-sip13: [e10d5fe](https://github.com/dgryski/go-sip13/tree/e10d5fe)
45+
- github.com/ghodss/yaml: [v1.0.0](https://github.com/ghodss/yaml/tree/v1.0.0)
46+
- github.com/go-kit/kit: [v0.8.0](https://github.com/go-kit/kit/tree/v0.8.0)
47+
- github.com/go-stack/stack: [v1.8.0](https://github.com/go-stack/stack/tree/v1.8.0)
48+
- github.com/hashicorp/consul/sdk: [v0.1.1](https://github.com/hashicorp/consul/tree/sdk/v0.1.1)
49+
- github.com/hashicorp/errwrap: [v1.0.0](https://github.com/hashicorp/errwrap/tree/v1.0.0)
50+
- github.com/hashicorp/go-msgpack: [v0.5.3](https://github.com/hashicorp/go-msgpack/tree/v0.5.3)
51+
- github.com/hashicorp/go-multierror: [v1.0.0](https://github.com/hashicorp/go-multierror/tree/v1.0.0)
52+
- github.com/hashicorp/go-sockaddr: [v1.0.0](https://github.com/hashicorp/go-sockaddr/tree/v1.0.0)
53+
- github.com/hashicorp/go-syslog: [v1.0.0](https://github.com/hashicorp/go-syslog/tree/v1.0.0)
54+
- github.com/hashicorp/go-uuid: [v1.0.1](https://github.com/hashicorp/go-uuid/tree/v1.0.1)
55+
- github.com/hashicorp/go.net: [v0.0.1](https://github.com/hashicorp/go.net/tree/v0.0.1)
56+
- github.com/hashicorp/logutils: [v1.0.0](https://github.com/hashicorp/logutils/tree/v1.0.0)
57+
- github.com/hashicorp/mdns: [v1.0.0](https://github.com/hashicorp/mdns/tree/v1.0.0)
58+
- github.com/hashicorp/memberlist: [v0.1.3](https://github.com/hashicorp/memberlist/tree/v0.1.3)
59+
- github.com/konsorten/go-windows-terminal-sequences: [v1.0.1](https://github.com/konsorten/go-windows-terminal-sequences/tree/v1.0.1)
60+
- github.com/kr/logfmt: [b84e30a](https://github.com/kr/logfmt/tree/b84e30a)
61+
- github.com/miekg/dns: [v1.0.14](https://github.com/miekg/dns/tree/v1.0.14)
62+
- github.com/mitchellh/cli: [v1.0.0](https://github.com/mitchellh/cli/tree/v1.0.0)
63+
- github.com/mitchellh/go-testing-interface: [v1.0.0](https://github.com/mitchellh/go-testing-interface/tree/v1.0.0)
64+
- github.com/mitchellh/gox: [v0.4.0](https://github.com/mitchellh/gox/tree/v0.4.0)
65+
- github.com/mitchellh/iochan: [v1.0.0](https://github.com/mitchellh/iochan/tree/v1.0.0)
66+
- github.com/oklog/ulid: [v1.3.1](https://github.com/oklog/ulid/tree/v1.3.1)
67+
- github.com/pascaldekloe/goe: [57f6aae](https://github.com/pascaldekloe/goe/tree/57f6aae)
68+
- github.com/pelletier/go-toml: [v1.2.0](https://github.com/pelletier/go-toml/tree/v1.2.0)
69+
- github.com/posener/complete: [v1.1.1](https://github.com/posener/complete/tree/v1.1.1)
70+
- github.com/prometheus/tsdb: [v0.7.1](https://github.com/prometheus/tsdb/tree/v0.7.1)
71+
- github.com/ryanuber/columnize: [9b3edd6](https://github.com/ryanuber/columnize/tree/9b3edd6)
72+
- github.com/sean-/seed: [e2103e2](https://github.com/sean-/seed/tree/e2103e2)
73+
- github.com/shurcooL/sanitized_anchor_name: [v1.0.0](https://github.com/shurcooL/sanitized_anchor_name/tree/v1.0.0)
74+
- github.com/spaolacci/murmur3: [f09979e](https://github.com/spaolacci/murmur3/tree/f09979e)
75+
- github.com/spf13/jwalterweatherman: [v1.0.0](https://github.com/spf13/jwalterweatherman/tree/v1.0.0)
76+
- gopkg.in/alecthomas/kingpin.v2: v2.2.6
77+
- gopkg.in/resty.v1: v1.12.0
78+
79+
_Thanks to all our contributors!_ 😊

CHANGELOG/v1.8.6.md

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
## 👌 Kubernetes version support
2+
3+
- Management Cluster: v1.27.x -> v1.31.x
4+
- Workload Cluster: v1.25.x -> v1.31.x
5+
6+
[More information about version support can be found here](https://cluster-api.sigs.k8s.io/reference/versions.html)
7+
8+
## Changes since v1.8.5
9+
## :chart_with_upwards_trend: Overview
10+
- 8 new commits merged
11+
- 1 bug fixed 🐛
12+
13+
## :bug: Bug Fixes
14+
- clusterctl: Fix: considers objects in kube-system for cert-manager to avoid upgrading twice (#11456)
15+
16+
## :seedling: Others
17+
- clusterctl: Add nutanix ipam & runtime extensions providers (#11414)
18+
- Dependency: Bump github.com/coredns/corefile-migration to v1.0.24 (#11533)
19+
- Dependency: Bump go to v1.22.10 (#11536)
20+
- Dependency: Bump Go version to v1.22.9 (#11410)
21+
- Dependency: Update controller runtime v0.18.6 (#11525)
22+
- e2e: Add dry-run CreateOrUpdate call in clusterctl upgrade e2e tests (#11458)
23+
- e2e: Add retry to clusterctl `UpgradeWithBinary` (#11541)
24+
25+
## Dependencies
26+
27+
### Added
28+
_Nothing has changed._
29+
30+
### Changed
31+
- github.com/coredns/corefile-migration: [v1.0.23 → v1.0.24](https://github.com/coredns/corefile-migration/compare/v1.0.23...v1.0.24)
32+
- sigs.k8s.io/controller-runtime: v0.18.5 → v0.18.6
33+
34+
### Removed
35+
_Nothing has changed._
36+
37+
_Thanks to all our contributors!_ 😊

CHANGELOG/v1.8.7.md

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
## 👌 Kubernetes version support
2+
3+
- Management Cluster: v1.27.x -> v1.31.x
4+
- Workload Cluster: v1.25.x -> v1.31.x
5+
6+
[More information about version support can be found here](https://cluster-api.sigs.k8s.io/reference/versions.html)
7+
8+
## Changes since v1.8.6
9+
## :chart_with_upwards_trend: Overview
10+
- 2 new commits merged
11+
12+
## :seedling: Others
13+
- Dependency: Bump golang.org/x/crypto (#11580)
14+
- Runtime SDK: Cache DiscoveryVariables calls (#11600)
15+
16+
## Dependencies
17+
18+
### Added
19+
_Nothing has changed._
20+
21+
### Changed
22+
- golang.org/x/crypto: v0.25.0 → v0.31.0
23+
- golang.org/x/sync: v0.7.0 → v0.10.0
24+
- golang.org/x/sys: v0.22.0 → v0.28.0
25+
- golang.org/x/term: v0.22.0 → v0.27.0
26+
- golang.org/x/text: v0.16.0 → v0.21.0
27+
28+
### Removed
29+
_Nothing has changed._
30+
31+
_Thanks to all our contributors!_ 😊

CHANGELOG/v1.8.8.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
## 👌 Kubernetes version support
2+
3+
- Management Cluster: v1.27.x -> v1.31.x
4+
- Workload Cluster: v1.25.x -> v1.31.x
5+
6+
[More information about version support can be found here](https://cluster-api.sigs.k8s.io/reference/versions.html)
7+
8+
## Changes since v1.8.7
9+
## :chart_with_upwards_trend: Overview
10+
- 2 new commits merged
11+
- 1 bug fixed 🐛
12+
13+
## :bug: Bug Fixes
14+
- ClusterClass: Export runtime.Client interface and cache package (#11613)
15+
16+
## :seedling: Others
17+
- Dependency: Bump to golang.org/x/net v0.23.0 (#11619)
18+
19+
## Dependencies
20+
21+
### Added
22+
_Nothing has changed._
23+
24+
### Changed
25+
- golang.org/x/net: v0.27.0 → v0.33.0
26+
27+
### Removed
28+
_Nothing has changed._
29+
30+
_Thanks to all our contributors!_ 😊

0 commit comments

Comments
 (0)