Skip to content

Commit 2ead02b

Browse files
mboersmamboersma
authored
Merge pull request #1 from nojnhuh/jon-capi-1.8
CAPI 1.8 build fixes
2 parents c738d12 + dedebb7 commit 2ead02b

File tree

9 files changed

+79
-98
lines changed

9 files changed

+79
-98
lines changed

‎api/v1beta1/azuremanagedcluster_webhook_test.go‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
. "github.com/onsi/gomega"
2323
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2424
utilfeature "k8s.io/component-base/featuregate/testing"
25+
"k8s.io/utils/ptr"
2526
"sigs.k8s.io/cluster-api-provider-azure/feature"
2627
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2728
capifeature "sigs.k8s.io/cluster-api/feature"
@@ -135,27 +136,29 @@ func TestAzureManagedCluster_ValidateCreate(t *testing.T) {
135136

136137
func TestAzureManagedCluster_ValidateCreateFailure(t *testing.T) {
137138
tests := []struct {
138-
name string
139-
amc *AzureManagedCluster
140-
deferFunc func()
141-
expectError bool
139+
name string
140+
amc *AzureManagedCluster
141+
featureGateEnabled *bool
142+
expectError bool
142143
}{
143144
{
144-
name: "feature gate explicitly disabled",
145-
amc: getKnownValidAzureManagedCluster(),
146-
deferFunc: utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, false),
147-
expectError: true,
145+
name: "feature gate explicitly disabled",
146+
amc: getKnownValidAzureManagedCluster(),
147+
featureGateEnabled: ptr.To(false),
148+
expectError: true,
148149
},
149150
{
150-
name: "feature gate implicitly enabled",
151-
amc: getKnownValidAzureManagedCluster(),
152-
deferFunc: func() {},
153-
expectError: false,
151+
name: "feature gate implicitly enabled",
152+
amc: getKnownValidAzureManagedCluster(),
153+
featureGateEnabled: nil,
154+
expectError: false,
154155
},
155156
}
156157
for _, tc := range tests {
157158
t.Run(tc.name, func(t *testing.T) {
158-
defer tc.deferFunc()
159+
if tc.featureGateEnabled != nil {
160+
defer utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)()
161+
}
159162
g := NewWithT(t)
160163
_, err := tc.amc.ValidateCreate()
161164
if tc.expectError {

‎controllers/azureasomanagedmachinepool_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ type ClusterTracker interface {
6262

6363
// SetupWithManager sets up the controller with the Manager.
6464
func (r *AzureASOManagedMachinePoolReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) error {
65-
_, log, done := tele.StartSpanWithLogger(ctx,
65+
ctx, log, done := tele.StartSpanWithLogger(ctx,
6666
"controllers.AzureASOManagedMachinePoolReconciler.SetupWithManager",
6767
tele.KVP("controller", infrav1alpha.AzureASOManagedMachinePoolKind),
6868
)
@@ -89,8 +89,8 @@ func (r *AzureASOManagedMachinePoolReconciler) SetupWithManager(ctx context.Cont
8989
).
9090
Watches(
9191
&expv1.MachinePool{},
92-
handler.EnqueueRequestsFromMapFunc(utilexp.MachinePoolToInfrastructureMapFunc(
93-
infrav1alpha.GroupVersion.WithKind(infrav1alpha.AzureASOManagedMachinePoolKind), log),
92+
handler.EnqueueRequestsFromMapFunc(utilexp.MachinePoolToInfrastructureMapFunc(ctx,
93+
infrav1alpha.GroupVersion.WithKind(infrav1alpha.AzureASOManagedMachinePoolKind)),
9494
),
9595
builder.WithPredicates(
9696
predicates.ResourceHasFilterLabel(log, r.WatchFilterValue),

‎controllers/azurejson_machinetemplate_controller.go‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@ import (
3838
"sigs.k8s.io/cluster-api/util/annotations"
3939
"sigs.k8s.io/cluster-api/util/predicates"
4040
ctrl "sigs.k8s.io/controller-runtime"
41+
"sigs.k8s.io/controller-runtime/pkg/builder"
4142
"sigs.k8s.io/controller-runtime/pkg/client"
4243
"sigs.k8s.io/controller-runtime/pkg/controller"
4344
"sigs.k8s.io/controller-runtime/pkg/handler"
4445
"sigs.k8s.io/controller-runtime/pkg/reconcile"
45-
"sigs.k8s.io/controller-runtime/pkg/source"
4646
)
4747

4848
// AzureJSONTemplateReconciler reconciles Azure json secrets for AzureMachineTemplate objects.
@@ -65,29 +65,22 @@ func (r *AzureJSONTemplateReconciler) SetupWithManager(ctx context.Context, mgr
6565
return errors.Wrap(err, "failed to create mapper for Cluster to AzureMachineTemplates")
6666
}
6767

68-
c, err := ctrl.NewControllerManagedBy(mgr).
68+
return ctrl.NewControllerManagedBy(mgr).
6969
WithOptions(options).
7070
For(&infrav1.AzureMachineTemplate{}).
7171
WithEventFilter(predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue)).
7272
Owns(&corev1.Secret{}).
73-
Build(r)
74-
75-
if err != nil {
76-
return errors.Wrap(err, "failed to create controller")
77-
}
78-
79-
// Add a watch on Clusters to requeue when the infraRef is set. This is needed because the infraRef is not initially
80-
// set in Clusters created from a ClusterClass.
81-
if err := c.Watch(
82-
source.Kind(mgr.GetCache(), &clusterv1.Cluster{}),
83-
handler.EnqueueRequestsFromMapFunc(azureMachineTemplateMapper),
84-
predicates.ClusterUnpausedAndInfrastructureReady(log),
85-
predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue),
86-
); err != nil {
87-
return errors.Wrap(err, "failed adding a watch for Clusters")
88-
}
89-
90-
return nil
73+
// Add a watch on Clusters to requeue when the infraRef is set. This is needed because the infraRef is not initially
74+
// set in Clusters created from a ClusterClass.
75+
Watches(
76+
&clusterv1.Cluster{},
77+
handler.EnqueueRequestsFromMapFunc(azureMachineTemplateMapper),
78+
builder.WithPredicates(
79+
predicates.ClusterUnpausedAndInfrastructureReady(log),
80+
predicates.ResourceNotPausedAndHasFilterLabel(log, r.WatchFilterValue),
81+
),
82+
).
83+
Complete(r)
9184
}
9285

9386
// Reconcile reconciles Azure json secrets for Azure machine templates.

‎controllers/resource_reconciler.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
29-
"k8s.io/apimachinery/pkg/runtime"
3029
"k8s.io/apimachinery/pkg/runtime/schema"
3130
"k8s.io/klog/v2"
3231
infrav1alpha "sigs.k8s.io/cluster-api-provider-azure/api/v1alpha1"
@@ -48,7 +47,7 @@ type ResourceReconciler struct {
4847
}
4948

5049
type watcher interface {
51-
Watch(log logr.Logger, obj runtime.Object, handler handler.EventHandler, p ...predicate.Predicate) error
50+
Watch(log logr.Logger, obj client.Object, handler handler.EventHandler, p ...predicate.Predicate) error
5251
}
5352

5453
type resourceStatusObject interface {

‎controllers/resource_reconciler_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ type FakeWatcher struct {
5555
watching map[string]struct{}
5656
}
5757

58-
func (w *FakeWatcher) Watch(_ logr.Logger, obj runtime.Object, _ handler.EventHandler, _ ...predicate.Predicate) error {
58+
func (w *FakeWatcher) Watch(_ logr.Logger, obj client.Object, _ handler.EventHandler, _ ...predicate.Predicate) error {
5959
if w.watching == nil {
6060
w.watching = make(map[string]struct{})
6161
}

‎go.mod‎

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ require (
3737
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
3838
go.opentelemetry.io/otel/exporters/prometheus v0.46.0
3939
go.opentelemetry.io/otel/sdk v1.27.0
40-
go.opentelemetry.io/otel/sdk/metric v1.24.0
40+
go.opentelemetry.io/otel/sdk/metric v1.27.0
4141
go.opentelemetry.io/otel/trace v1.27.0
4242
go.uber.org/mock v0.4.0
4343
golang.org/x/crypto v0.25.0
@@ -222,27 +222,8 @@ require (
222222

223223
replace sigs.k8s.io/cluster-api => sigs.k8s.io/cluster-api v1.8.0-rc.0
224224

225-
// kube-openapi should match the version imported by CAPI.
226-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
227-
228-
// Play nice with ASO 2.8. Most of these can probably be removed with CAPI 1.8.
229225
replace (
230226
github.com/google/cel-go => github.com/google/cel-go v0.17.8
231227
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.18.0
232228
github.com/prometheus/common => github.com/prometheus/common v0.46.0
233-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0
234-
go.opentelemetry.io/otel => go.opentelemetry.io/otel v1.24.0
235-
go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0
236-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0
237-
go.opentelemetry.io/otel/metric => go.opentelemetry.io/otel/metric v1.24.0
238-
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v1.24.0
239-
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v1.24.0
240-
go.opentelemetry.io/proto/otlp => go.opentelemetry.io/proto/otlp v1.1.0
241-
k8s.io/api => k8s.io/api v0.29.3
242-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.29.3
243-
k8s.io/apimachinery => k8s.io/apimachinery v0.29.3
244-
k8s.io/apiserver => k8s.io/apiserver v0.29.3
245-
k8s.io/client-go => k8s.io/client-go v0.29.3
246-
k8s.io/component-base => k8s.io/component-base v0.29.3
247-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.17.3
248229
)

‎go.sum‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -497,28 +497,28 @@ go.etcd.io/etcd/server/v3 v3.5.10 h1:4NOGyOwD5sUZ22PiWYKmfxqoeh72z6EhYjNosKGLmZg
497497
go.etcd.io/etcd/server/v3 v3.5.10/go.mod h1:gBplPHfs6YI0L+RpGkTQO7buDbHv5HJGG/Bst0/zIPo=
498498
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
499499
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
500-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0 h1:1eHu3/pUSWaOgltNK3WJFaywKsTIr/PwvHyDmi0lQA0=
501-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.0/go.mod h1:HyABWq60Uy1kjJSa2BVOxUVao8Cdick5AWSKPutqy6U=
502-
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
503-
go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
504-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0 h1:t6wl9SPayj+c7lEIFgm4ooDBZVb01IhLB4InpomhRw8=
505-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.24.0/go.mod h1:iSDOcsnSA5INXzZtwaBPrKp/lWu/V14Dd+llD0oI2EA=
506-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0 h1:Mw5xcxMwlqoJd97vwPxA8isEaIoxsta9/Q51+TTJLGE=
507-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.24.0/go.mod h1:CQNu9bj7o7mC6U7+CA/schKEYakYXWr79ucDHTMGhCM=
500+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0 h1:9l89oX4ba9kHbBol3Xin3leYJ+252h0zszDtBwyKe2A=
501+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.52.0/go.mod h1:XLZfZboOJWHNKUv7eH0inh0E9VV6eWDFB/9yJyTLPp0=
502+
go.opentelemetry.io/otel v1.27.0 h1:9BZoF3yMK/O1AafMiQTVu0YDj5Ea4hPhxCs7sGva+cg=
503+
go.opentelemetry.io/otel v1.27.0/go.mod h1:DMpAK8fzYRzs+bi3rS5REupisuqTheUlSZJ1WnZaPAQ=
504+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0 h1:R9DE4kQ4k+YtfLI2ULwX82VtNQ2J8yZmA7ZIF/D+7Mc=
505+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.27.0/go.mod h1:OQFyQVrDlbe+R7xrEyDr/2Wr67Ol0hRUgsfA+V5A95s=
506+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 h1:qFffATk0X+HD+f1Z8lswGiOQYKHRlzfmdJm0wEaVrFA=
507+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0/go.mod h1:MOiCmryaYtc+V0Ei+Tx9o5S1ZjA7kzLucuVuyzBZloQ=
508508
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0 h1:FyjCyI9jVEfqhUh2MoSkmolPjfh5fp2hnV0b0irxH4Q=
509509
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.22.0/go.mod h1:hYwym2nDEeZfG/motx0p7L7J1N1vyzIThemQsb4g2qY=
510510
go.opentelemetry.io/otel/exporters/prometheus v0.46.0 h1:I8WIFXR351FoLJYuloU4EgXbtNX2URfU/85pUPheIEQ=
511511
go.opentelemetry.io/otel/exporters/prometheus v0.46.0/go.mod h1:ztwVUHe5DTR/1v7PeuGRnU5Bbd4QKYwApWmuutKsJSs=
512-
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
513-
go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
514-
go.opentelemetry.io/otel/sdk v1.24.0 h1:YMPPDNymmQN3ZgczicBY3B6sf9n62Dlj9pWD3ucgoDw=
515-
go.opentelemetry.io/otel/sdk v1.24.0/go.mod h1:KVrIYw6tEubO9E96HQpcmpTKDVn9gdv35HoYiQWGDFg=
516-
go.opentelemetry.io/otel/sdk/metric v1.24.0 h1:yyMQrPzF+k88/DbH7o4FMAs80puqd+9osbiBrJrz/w8=
517-
go.opentelemetry.io/otel/sdk/metric v1.24.0/go.mod h1:I6Y5FjH6rvEnTTAYQz3Mmv2kl6Ek5IIrmwTLqMrrOE0=
518-
go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
519-
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
520-
go.opentelemetry.io/proto/otlp v1.1.0 h1:2Di21piLrCqJ3U3eXGCTPHE9R8Nh+0uglSnOyxikMeI=
521-
go.opentelemetry.io/proto/otlp v1.1.0/go.mod h1:GpBHCBWiqvVLDqmHZsoMM3C5ySeKTC7ej/RNTae6MdY=
512+
go.opentelemetry.io/otel/metric v1.27.0 h1:hvj3vdEKyeCi4YaYfNjv2NUje8FqKqUY8IlF0FxV/ik=
513+
go.opentelemetry.io/otel/metric v1.27.0/go.mod h1:mVFgmRlhljgBiuk/MP/oKylr4hs85GZAylncepAX/ak=
514+
go.opentelemetry.io/otel/sdk v1.27.0 h1:mlk+/Y1gLPLn84U4tI8d3GNJmGT/eXe3ZuOXN9kTWmI=
515+
go.opentelemetry.io/otel/sdk v1.27.0/go.mod h1:Ha9vbLwJE6W86YstIywK2xFfPjbWlCuwPtMkKdz/Y4A=
516+
go.opentelemetry.io/otel/sdk/metric v1.27.0 h1:5uGNOlpXi+Hbo/DRoI31BSb1v+OGcpv2NemcCrOL8gI=
517+
go.opentelemetry.io/otel/sdk/metric v1.27.0/go.mod h1:we7jJVrYN2kh3mVBlswtPU22K0SA+769l93J6bsyvqw=
518+
go.opentelemetry.io/otel/trace v1.27.0 h1:IqYb813p7cmbHk0a5y6pD5JPakbVfftRXABGt5/Rscw=
519+
go.opentelemetry.io/otel/trace v1.27.0/go.mod h1:6RiD1hkAprV4/q+yd2ln1HG9GoPx39SuvvstaLBl+l4=
520+
go.opentelemetry.io/proto/otlp v1.3.1 h1:TrMUixzpM0yuc/znrFTP9MMRh8trP93mkCiDVeXrui0=
521+
go.opentelemetry.io/proto/otlp v1.3.1/go.mod h1:0X1WI4de4ZsLrrJNLAQbFeLCm3T7yBkR0XqQ7niQU+8=
522522
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY=
523523
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
524524
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
@@ -690,30 +690,30 @@ gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
690690
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
691691
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
692692
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
693-
k8s.io/api v0.29.3 h1:2ORfZ7+bGC3YJqGpV0KSDDEVf8hdGQ6A03/50vj8pmw=
694-
k8s.io/api v0.29.3/go.mod h1:y2yg2NTyHUUkIoTC+phinTnEa3KFM6RZ3szxt014a80=
695-
k8s.io/apiextensions-apiserver v0.29.3 h1:9HF+EtZaVpFjStakF4yVufnXGPRppWFEQ87qnO91YeI=
696-
k8s.io/apiextensions-apiserver v0.29.3/go.mod h1:po0XiY5scnpJfFizNGo6puNU6Fq6D70UJY2Cb2KwAVc=
697-
k8s.io/apimachinery v0.29.3 h1:2tbx+5L7RNvqJjn7RIuIKu9XTsIZ9Z5wX2G22XAa5EU=
698-
k8s.io/apimachinery v0.29.3/go.mod h1:hx/S4V2PNW4OMg3WizRrHutyB5la0iCUbZym+W0EQIU=
699-
k8s.io/apiserver v0.29.3 h1:xR7ELlJ/BZSr2n4CnD3lfA4gzFivh0wwfNfz9L0WZcE=
700-
k8s.io/apiserver v0.29.3/go.mod h1:hrvXlwfRulbMbBgmWRQlFru2b/JySDpmzvQwwk4GUOs=
693+
k8s.io/api v0.30.3 h1:ImHwK9DCsPA9uoU3rVh4QHAHHK5dTSv1nxJUapx8hoQ=
694+
k8s.io/api v0.30.3/go.mod h1:GPc8jlzoe5JG3pb0KJCSLX5oAFIW3/qNJITlDj8BH04=
695+
k8s.io/apiextensions-apiserver v0.30.3 h1:oChu5li2vsZHx2IvnGP3ah8Nj3KyqG3kRSaKmijhB9U=
696+
k8s.io/apiextensions-apiserver v0.30.3/go.mod h1:uhXxYDkMAvl6CJw4lrDN4CPbONkF3+XL9cacCT44kV4=
697+
k8s.io/apimachinery v0.30.3 h1:q1laaWCmrszyQuSQCfNB8cFgCuDAoPszKY4ucAjDwHc=
698+
k8s.io/apimachinery v0.30.3/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc=
699+
k8s.io/apiserver v0.30.3 h1:QZJndA9k2MjFqpnyYv/PH+9PE0SHhx3hBho4X0vE65g=
700+
k8s.io/apiserver v0.30.3/go.mod h1:6Oa88y1CZqnzetd2JdepO0UXzQX4ZnOekx2/PtEjrOg=
701701
k8s.io/cli-runtime v0.30.3 h1:aG69oRzJuP2Q4o8dm+f5WJIX4ZBEwrvdID0+MXyUY6k=
702702
k8s.io/cli-runtime v0.30.3/go.mod h1:hwrrRdd9P84CXSKzhHxrOivAR9BRnkMt0OeP5mj7X30=
703-
k8s.io/client-go v0.29.3 h1:R/zaZbEAxqComZ9FHeQwOh3Y1ZUs7FaHKZdQtIc2WZg=
704-
k8s.io/client-go v0.29.3/go.mod h1:tkDisCvgPfiRpxGnOORfkljmS+UrW+WtXAy2fTvXJB0=
703+
k8s.io/client-go v0.30.3 h1:bHrJu3xQZNXIi8/MoxYtZBBWQQXwy16zqJwloXXfD3k=
704+
k8s.io/client-go v0.30.3/go.mod h1:8d4pf8vYu665/kUbsxWAQ/JDBNWqfFeZnvFiVdmx89U=
705705
k8s.io/cloud-provider v0.30.2 h1:yov6r02v7sMUNNvzEz51LtL2krn2c1wsC+dy/8BxKQI=
706706
k8s.io/cloud-provider v0.30.2/go.mod h1:w69t2dSjDtI9BYK6SEqj6HmMKIojEk08fXRoUzjFN2I=
707707
k8s.io/cluster-bootstrap v0.30.3 h1:MgxyxMkpaC6mu0BKWJ8985XCOnKU+eH3Iy+biwtDXRk=
708708
k8s.io/cluster-bootstrap v0.30.3/go.mod h1:h8BoLDfdD7XEEIXy7Bx9FcMzxHwz29jsYYi34bM5DKU=
709-
k8s.io/component-base v0.29.3 h1:Oq9/nddUxlnrCuuR2K/jp6aflVvc0uDvxMzAWxnGzAo=
710-
k8s.io/component-base v0.29.3/go.mod h1:Yuj33XXjuOk2BAaHsIGHhCKZQAgYKhqIxIjIr2UXYio=
709+
k8s.io/component-base v0.30.3 h1:Ci0UqKWf4oiwy8hr1+E3dsnliKnkMLZMVbWzeorlk7s=
710+
k8s.io/component-base v0.30.3/go.mod h1:C1SshT3rGPCuNtBs14RmVD2xW0EhRSeLvBh7AGk1quA=
711711
k8s.io/component-helpers v0.30.3 h1:KPc8l0eGx9Wg2OcKc58k9ozNcVcOInAi3NGiuS2xJ/c=
712712
k8s.io/component-helpers v0.30.3/go.mod h1:VOQ7g3q+YbKWwKeACG2BwPv4ftaN8jXYJ5U3xpzuYAE=
713713
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
714714
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
715-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/AuzbMm96cd3YHRTU83I780=
716-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA=
715+
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a h1:zD1uj3Jf+mD4zmA7W+goE5TxDkI7OGJjBNBzq5fJtLA=
716+
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
717717
k8s.io/kubectl v0.30.3 h1:YIBBvMdTW0xcDpmrOBzcpUVsn+zOgjMYIu7kAq+yqiI=
718718
k8s.io/kubectl v0.30.3/go.mod h1:IcR0I9RN2+zzTRUa1BzZCm4oM0NLOawE6RzlDvd1Fpo=
719719
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
@@ -730,8 +730,8 @@ sigs.k8s.io/cluster-api v1.8.0-rc.0 h1:Q103UfK++rI160mtURBjg4ovJ9vxJTIrrdkL7NQBd
730730
sigs.k8s.io/cluster-api v1.8.0-rc.0/go.mod h1:TNkfly2mrCG8O6DjGFru0USq1NhWbo2njpSXxKrRgL0=
731731
sigs.k8s.io/cluster-api/test v1.8.0-rc.0 h1:JNAxc+8QE4Vk51NFgtex6Yh4KlTJfVOjOH6ybiO3HTI=
732732
sigs.k8s.io/cluster-api/test v1.8.0-rc.0/go.mod h1:dwVWpEtSXNUTYb+rSQ/KNNv4lVadx26teQB9CS+yaXM=
733-
sigs.k8s.io/controller-runtime v0.17.3 h1:65QmN7r3FWgTxDMz9fvGnO1kbf2nu+acg9p2R9oYYYk=
734-
sigs.k8s.io/controller-runtime v0.17.3/go.mod h1:N0jpP5Lo7lMTF9aL56Z/B2oWBJjey6StQM0jRbKQXtY=
733+
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
734+
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
735735
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
736736
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
737737
sigs.k8s.io/kind v0.23.0 h1:8fyDGWbWTeCcCTwA04v4Nfr45KKxbSPH1WO9K+jVrBg=

‎main.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ var (
113113
healthAddr string
114114
webhookPort int
115115
webhookCertDir string
116-
diagnosticsOptions = flags.DiagnosticsOptions{}
116+
managerOptions = flags.ManagerOptions{}
117117
timeouts reconciler.Timeouts
118118
enableTracing bool
119119
)
@@ -262,7 +262,7 @@ func InitFlags(fs *pflag.FlagSet) {
262262
"Provide fully qualified GVK string to override default kubeadm config watch source, in the form of Kind.version.group (default: KubeadmConfig.v1beta1.bootstrap.cluster.x-k8s.io)",
263263
)
264264

265-
flags.AddDiagnosticsOptions(fs, &diagnosticsOptions)
265+
flags.AddManagerOptions(fs, &managerOptions)
266266

267267
feature.MutableGates.AddFlag(fs)
268268
}
@@ -286,7 +286,11 @@ func main() {
286286
BurstSize: 100,
287287
})
288288

289-
diagnosticsOpts := flags.GetDiagnosticsOptions(diagnosticsOptions)
289+
tlsOptions, metricsOptions, err := flags.GetManagerOptions(managerOptions)
290+
if err != nil {
291+
setupLog.Error(err, "Unable to start manager: invalid flags")
292+
os.Exit(1)
293+
}
290294

291295
var watchNamespaces map[string]cache.Config
292296
if watchNamespace != "" {
@@ -309,7 +313,7 @@ func main() {
309313
LeaderElectionResourceLock: resourcelock.LeasesResourceLock,
310314
HealthProbeBindAddress: healthAddr,
311315
PprofBindAddress: profilerAddress,
312-
Metrics: diagnosticsOpts,
316+
Metrics: *metricsOptions,
313317
Cache: cache.Options{
314318
DefaultNamespaces: watchNamespaces,
315319
SyncPeriod: &syncPeriod,
@@ -325,6 +329,7 @@ func main() {
325329
WebhookServer: webhook.NewServer(webhook.Options{
326330
Port: webhookPort,
327331
CertDir: webhookCertDir,
332+
TLSOpts: tlsOptions,
328333
}),
329334
EventBroadcaster: broadcaster,
330335
})

‎test/e2e/cni.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func InstallCNIManifest(ctx context.Context, input clusterctl.ApplyCustomCluster
5959
cniYaml, err := os.ReadFile(input.CNIManifestPath)
6060
Expect(err).NotTo(HaveOccurred())
6161

62-
Expect(workloadCluster.Apply(ctx, cniYaml)).To(Succeed())
62+
Expect(workloadCluster.CreateOrUpdate(ctx, cniYaml)).To(Succeed())
6363
}
6464

6565
// EnsureCalicoIsReady copies the kubeadm configmap to the calico-system namespace and waits for the calico pods to be ready.

0 commit comments

Comments
 (0)