Skip to content

Commit 1ec8153

Browse files
build(deps): Bump sigs.k8s.io/cluster-api/test from 1.5.3 to 1.6.0 in /hack/third-party/capd (#268)
Bumps [sigs.k8s.io/cluster-api/test](https://github.com/kubernetes-sigs/cluster-api) from 1.5.3 to 1.6.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/kubernetes-sigs/cluster-api/releases">sigs.k8s.io/cluster-api/test's releases</a>.</em></p> <blockquote> <h2>v1.6.0</h2> <h2>👌 Kubernetes version support</h2> <ul> <li>Management Cluster: v1.25.x -&gt; v1.28.x</li> <li>Workload Cluster: v1.23.x -&gt; v1.28.x</li> </ul> <p><a href="https://cluster-api.sigs.k8s.io/reference/versions.html">More information about version support can be found here</a></p> <h2>Highlights</h2> <ul> <li>MachinePools are now supported in ClusterClass Clusters</li> <li>Metrics, profiling and other diagnostics are now served securely by default</li> <li>Types in <code>ipam.cluster.x-k8s.io</code> have graduated to <code>v1beta1</code></li> </ul> <h2>Deprecation Warning</h2> <ul> <li>The API version <code>v1alpha4</code> is no longer served in this release. <ul> <li><a href="https://main.cluster-api.sigs.k8s.io/developer/providers/version-migration.html">Version migration guide</a></li> <li>[GitHub issue <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8038">#8038</a>](<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8038">kubernetes-sigs/cluster-api#8038</a>)</li> <li><a href="https://main.cluster-api.sigs.k8s.io/contributing#removal-of-v1alpha3--v1alpha4-apiversions">API deprecation details</a></li> </ul> </li> <li>The API version <code>v1alpha3</code> has been completely removed in this release.</li> <li>Flag <code>--metrics-bind-addr</code> is <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/pull/9264">deprecated</a> for all controllers</li> </ul> <h2>Changes since v1.5.0</h2> <h2>:chart_with_upwards_trend: Overview</h2> <ul> <li>389 new commits merged</li> <li>5 breaking changes :warning:</li> <li>15 feature additions ✨</li> <li>35 bugs fixed 🐛</li> </ul> <h2>:memo: Proposals</h2> <ul> <li>Community meeting: Add proposal for karpenter integration feature group (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9571">#9571</a>)</li> </ul> <h2>:warning: Breaking Changes</h2> <ul> <li>API: Remove v1alpha3 API Version (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8997">#8997</a>)</li> <li>API: Stop serving v1alpha4 API Versions (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8996">#8996</a>)</li> <li>clusterctl: Improve Context handling in clusterctl (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8939">#8939</a>)</li> <li>Dependency: Bump to controller-runtime v0.16 (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8999">#8999</a>)</li> <li>Metrics/Logging: Implement secure diagnostics (metrics, pprof, log level changes) (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9264">#9264</a>)</li> </ul> <h2>:sparkles: New Features</h2> <ul> <li>API: Add validation to nested ObjectMeta fields (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8431">#8431</a>)</li> <li>CAPD: Add config maps to CAPD RBAC (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9528">#9528</a>)</li> <li>CAPD: Add MachinePool Machine implementation to CAPD components (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8842">#8842</a>)</li> <li>CAPD: Allow adding custom HA proxy config for CAPD load balancer (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8785">#8785</a>)</li> <li>CAPD: Initialize configmap object before getting it (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9529">#9529</a>)</li> <li>ClusterClass: Add topology-owned label to MachineHealthChecks. (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9191">#9191</a>)</li> <li>ClusterClass: Introduce NamingStrategy and allow generating names using go templates (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9340">#9340</a>)</li> <li>ClusterClass: Update API with ClusterClass MachinePool support (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/8820">#8820</a>)</li> <li>clusterctl: Add RKE2 bootstrap provider to clusterctl (<a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9720">#9720</a>)</li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/14efefeb46dbe8d0cd0f5b7d1718e00ec58fc079"><code>14efefe</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9812">#9812</a> from k8s-infra-cherrypick-robot/cherry-pick-9798-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/b0c1d914e47a4dc4b75bdadf88ab0068c5fc1538"><code>b0c1d91</code></a> Remove clusterctl config for proxmox from quickstart docs</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/b014cc1888c7ff2c8d6357926d2f5dd5404e2316"><code>b014cc1</code></a> Add Proxmox infrastructure provider to clusterctl</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/7cab626fad5171acba1751aa5dfc79d0929e00b2"><code>7cab626</code></a> Add Proxmox provider quickstart</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/aaba1ef4c1f7c7a94dd4d972d838b0f109f4fba1"><code>aaba1ef</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9802">#9802</a> from k8s-infra-cherrypick-robot/cherry-pick-9791-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/5bc1b1af7992d8507c5930b1d062150d83eb19e9"><code>5bc1b1a</code></a> Use ssa Patch to create machines in MP controller</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/cb515e4bfa8a8550b92bff579ac644e0144fedb9"><code>cb515e4</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9788">#9788</a> from k8s-infra-cherrypick-robot/cherry-pick-9777-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/cdbe583cfdcf2b0e9b461d0ba38f0256310af0d0"><code>cdbe583</code></a> clusterresourceset: requeue after 1 minute if ErrClusterLocked got hit</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/58100d786b5cf3dccfd06a95b06df25a7e0f98ee"><code>58100d7</code></a> Merge pull request <a href="https://redirect.github.com/kubernetes-sigs/cluster-api/issues/9761">#9761</a> from k8s-infra-cherrypick-robot/cherry-pick-9737-to-...</li> <li><a href="https://github.com/kubernetes-sigs/cluster-api/commit/73c61665d1211fd9371a07ec2da30c6a5d15c50c"><code>73c6166</code></a> Improve output of exec.KubectlApply</li> <li>Additional commits viewable in <a href="https://github.com/kubernetes-sigs/cluster-api/compare/v1.5.3...v1.6.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sigs.k8s.io/cluster-api/test&package-manager=go_modules&previous-version=1.5.3&new-version=1.6.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jimmi Dyson <[email protected]>
1 parent 7cfea0a commit 1ec8153

File tree

8 files changed

+105
-76
lines changed

8 files changed

+105
-76
lines changed

common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockercluster_types.go

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20+
corev1 "k8s.io/api/core/v1"
2021
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2122

2223
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -53,6 +54,17 @@ type DockerClusterSpec struct {
5354
type DockerLoadBalancer struct {
5455
// ImageMeta allows customizing the image used for the cluster load balancer.
5556
ImageMeta `json:",inline"`
57+
58+
// CustomHAProxyConfigTemplateRef allows you to replace the default HAProxy config file.
59+
// This field is a reference to a config map that contains the configuration template. The key of the config map should be equal to 'value'.
60+
// The content of the config map will be processed and will replace the default HAProxy config file. Please use it with caution, as there are
61+
// no checks to ensure the validity of the configuration. This template will support the following variables that will be passed by the controller:
62+
// $IPv6 (bool) indicates if the cluster is IPv6, $FrontendControlPlanePort (string) indicates the frontend control plane port,
63+
// $BackendControlPlanePort (string) indicates the backend control plane port, $BackendServers (map[string]string) indicates the backend server
64+
// where the key is the server name and the value is the address. This map is dynamic and is updated every time a new control plane
65+
// node is added or removed. The template will also support the JoinHostPort function to join the host and port of the backend server.
66+
// +optional
67+
CustomHAProxyConfigTemplateRef *corev1.LocalObjectReference `json:"customHAProxyConfigTemplateRef,omitempty"`
5668
}
5769

5870
// ImageMeta allows customizing the image used for components that are not
@@ -131,5 +143,5 @@ type DockerClusterList struct {
131143
}
132144

133145
func init() {
134-
SchemeBuilder.Register(&DockerCluster{}, &DockerClusterList{})
146+
objectTypes = append(objectTypes, &DockerCluster{}, &DockerClusterList{})
135147
}

common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockerclustertemplate_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type DockerClusterTemplateList struct {
5050
}
5151

5252
func init() {
53-
SchemeBuilder.Register(&DockerClusterTemplate{}, &DockerClusterTemplateList{})
53+
objectTypes = append(objectTypes, &DockerClusterTemplate{}, &DockerClusterTemplateList{})
5454
}
5555

5656
// DockerClusterTemplateResource describes the data needed to create a DockerCluster from a template.

common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachine_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,5 +133,5 @@ type DockerMachineList struct {
133133
}
134134

135135
func init() {
136-
SchemeBuilder.Register(&DockerMachine{}, &DockerMachineList{})
136+
objectTypes = append(objectTypes, &DockerMachine{}, &DockerMachineList{})
137137
}

common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/dockermachinetemplate_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ type DockerMachineTemplateList struct {
5050
}
5151

5252
func init() {
53-
SchemeBuilder.Register(&DockerMachineTemplate{}, &DockerMachineTemplateList{})
53+
objectTypes = append(objectTypes, &DockerMachineTemplate{}, &DockerMachineTemplateList{})
5454
}
5555

5656
// DockerMachineTemplateResource describes the data needed to create a DockerMachine from a template.

common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/groupversion_info.go

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,26 @@ limitations under the License.
2020
package v1beta1
2121

2222
import (
23+
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
24+
"k8s.io/apimachinery/pkg/runtime"
2325
"k8s.io/apimachinery/pkg/runtime/schema"
24-
"sigs.k8s.io/controller-runtime/pkg/scheme"
2526
)
2627

2728
var (
2829
// GroupVersion is group version used to register these objects.
2930
GroupVersion = schema.GroupVersion{Group: "infrastructure.cluster.x-k8s.io", Version: "v1beta1"}
3031

31-
// SchemeBuilder is used to add go types to the GroupVersionKind scheme.
32-
SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
32+
// schemeBuilder is used to add go types to the GroupVersionKind scheme.
33+
schemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
3334

3435
// AddToScheme adds the types in this group-version to the given scheme.
35-
AddToScheme = SchemeBuilder.AddToScheme
36+
AddToScheme = schemeBuilder.AddToScheme
37+
38+
objectTypes = []runtime.Object{}
3639
)
40+
41+
func addKnownTypes(scheme *runtime.Scheme) error {
42+
scheme.AddKnownTypes(GroupVersion, objectTypes...)
43+
metav1.AddToGroupVersion(scheme, GroupVersion)
44+
return nil
45+
}

common/pkg/external/sigs.k8s.io/cluster-api/test/infrastructure/docker/api/v1beta1/zz_generated.deepcopy.go

Lines changed: 7 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hack/third-party/capd/go.mod

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module github.com/d2iq-labs/capi-runtime-extensions/external/capd
55

66
go 1.21
77

8-
require sigs.k8s.io/cluster-api/test v1.5.3
8+
require sigs.k8s.io/cluster-api/test v1.6.0
99

1010
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.5.2
1111

@@ -14,21 +14,21 @@ require (
1414
github.com/blang/semver v3.5.1+incompatible // indirect
1515
github.com/blang/semver/v4 v4.0.0 // indirect
1616
github.com/cespare/xxhash/v2 v2.2.0 // indirect
17-
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1818
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1919
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
2020
github.com/fsnotify/fsnotify v1.6.0 // indirect
21-
github.com/go-logr/logr v1.2.4 // indirect
21+
github.com/go-logr/logr v1.3.0 // indirect
2222
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2323
github.com/go-openapi/jsonreference v0.20.2 // indirect
2424
github.com/go-openapi/swag v0.22.3 // indirect
2525
github.com/gogo/protobuf v1.3.2 // indirect
2626
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2727
github.com/golang/protobuf v1.5.3 // indirect
2828
github.com/google/gnostic-models v0.6.8 // indirect
29-
github.com/google/go-cmp v0.5.9 // indirect
29+
github.com/google/go-cmp v0.6.0 // indirect
3030
github.com/google/gofuzz v1.2.0 // indirect
31-
github.com/google/uuid v1.3.0 // indirect
31+
github.com/google/uuid v1.3.1 // indirect
3232
github.com/imdario/mergo v0.3.13 // indirect
3333
github.com/josharian/intern v1.0.0 // indirect
3434
github.com/json-iterator/go v1.1.12 // indirect
@@ -38,35 +38,35 @@ require (
3838
github.com/modern-go/reflect2 v1.0.2 // indirect
3939
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4040
github.com/pkg/errors v0.9.1 // indirect
41-
github.com/prometheus/client_golang v1.16.0 // indirect
42-
github.com/prometheus/client_model v0.4.0 // indirect
41+
github.com/prometheus/client_golang v1.17.0 // indirect
42+
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
4343
github.com/prometheus/common v0.44.0 // indirect
44-
github.com/prometheus/procfs v0.10.1 // indirect
44+
github.com/prometheus/procfs v0.11.1 // indirect
4545
github.com/spf13/pflag v1.0.5 // indirect
46-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
47-
golang.org/x/net v0.17.0 // indirect
48-
golang.org/x/oauth2 v0.12.0 // indirect
49-
golang.org/x/sys v0.13.0 // indirect
50-
golang.org/x/term v0.13.0 // indirect
51-
golang.org/x/text v0.13.0 // indirect
46+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
47+
golang.org/x/net v0.18.0 // indirect
48+
golang.org/x/oauth2 v0.14.0 // indirect
49+
golang.org/x/sys v0.14.0 // indirect
50+
golang.org/x/term v0.14.0 // indirect
51+
golang.org/x/text v0.14.0 // indirect
5252
golang.org/x/time v0.3.0 // indirect
5353
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
5454
google.golang.org/appengine v1.6.7 // indirect
5555
google.golang.org/protobuf v1.31.0 // indirect
5656
gopkg.in/inf.v0 v0.9.1 // indirect
5757
gopkg.in/yaml.v2 v2.4.0 // indirect
5858
gopkg.in/yaml.v3 v3.0.1 // indirect
59-
k8s.io/api v0.28.2 // indirect
60-
k8s.io/apiextensions-apiserver v0.28.2 // indirect
61-
k8s.io/apimachinery v0.28.2 // indirect
62-
k8s.io/client-go v0.28.2 // indirect
63-
k8s.io/component-base v0.28.2 // indirect
59+
k8s.io/api v0.28.4 // indirect
60+
k8s.io/apiextensions-apiserver v0.28.4 // indirect
61+
k8s.io/apimachinery v0.28.4 // indirect
62+
k8s.io/client-go v0.28.4 // indirect
63+
k8s.io/component-base v0.28.4 // indirect
6464
k8s.io/klog/v2 v2.100.1 // indirect
6565
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
6666
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
6767
sigs.k8s.io/cluster-api v0.0.0-00010101000000-000000000000 // indirect
68-
sigs.k8s.io/controller-runtime v0.16.2 // indirect
68+
sigs.k8s.io/controller-runtime v0.16.3 // indirect
6969
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7070
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
71-
sigs.k8s.io/yaml v1.3.0 // indirect
71+
sigs.k8s.io/yaml v1.4.0 // indirect
7272
)

0 commit comments

Comments
 (0)