Skip to content

Commit f98c206

Browse files
sujeet01sujeet01
authored
Upgrade k8s Dependencies to v0.30.4 & controller-runtime to v0.18.5 (#338)
1 parent c6e5eff commit f98c206

File tree

119 files changed

+1225
-1047
lines changed

Some content is hidden

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

119 files changed

+1225
-1047
lines changed

‎Makefile

+4-53
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ METALNETLET_IMG ?= metalnetlet:latest
77
KIND_CLUSTER_NAME ?= kind
88

99
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
10-
ENVTEST_K8S_VERSION = 1.29.0
10+
ENVTEST_K8S_VERSION = 1.30.3
1111

1212
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
1313
ifeq (,$(shell go env GOBIN))
@@ -64,17 +64,10 @@ manifests: controller-gen ## Generate rbac objects.
6464
./hack/promote-let-role.sh config/metalnetlet/apinet-rbac/role.yaml config/apiserver/rbac/metalnetlet_role.yaml apinet.ironcore.dev:system:metalnetlets
6565

6666
.PHONY: generate
67-
generate: vgopath models-schema deepcopy-gen client-gen lister-gen informer-gen defaulter-gen conversion-gen openapi-gen applyconfiguration-gen
67+
generate: vgopath models-schema openapi-gen
6868
VGOPATH=$(VGOPATH) \
6969
MODELS_SCHEMA=$(MODELS_SCHEMA) \
70-
DEEPCOPY_GEN=$(DEEPCOPY_GEN) \
71-
CLIENT_GEN=$(CLIENT_GEN) \
72-
LISTER_GEN=$(LISTER_GEN) \
73-
INFORMER_GEN=$(INFORMER_GEN) \
74-
DEFAULTER_GEN=$(DEFAULTER_GEN) \
75-
CONVERSION_GEN=$(CONVERSION_GEN) \
7670
OPENAPI_GEN=$(OPENAPI_GEN) \
77-
APPLYCONFIGURATION_GEN=$(APPLYCONFIGURATION_GEN) \
7871
./hack/update-codegen.sh
7972

8073
.PHONY: add-license
@@ -330,14 +323,7 @@ KUSTOMIZE ?= $(LOCALBIN)/kustomize
330323
CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
331324
ENVTEST ?= $(LOCALBIN)/setup-envtest
332325
OPENAPI_EXTRACTOR ?= $(LOCALBIN)/openapi-extractor
333-
DEEPCOPY_GEN ?= $(LOCALBIN)/deepcopy-gen
334-
CLIENT_GEN ?= $(LOCALBIN)/client-gen
335-
LISTER_GEN ?= $(LOCALBIN)/lister-gen
336-
INFORMER_GEN ?= $(LOCALBIN)/informer-gen
337-
DEFAULTER_GEN ?= $(LOCALBIN)/defaulter-gen
338-
CONVERSION_GEN ?= $(LOCALBIN)/conversion-gen
339326
OPENAPI_GEN ?= $(LOCALBIN)/openapi-gen
340-
APPLYCONFIGURATION_GEN ?= $(LOCALBIN)/applyconfiguration-gen
341327
VGOPATH ?= $(LOCALBIN)/vgopath
342328
GEN_CRD_API_REFERENCE_DOCS ?= $(LOCALBIN)/gen-crd-api-reference-docs
343329
ADDLICENSE ?= $(LOCALBIN)/addlicense
@@ -347,9 +333,8 @@ GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
347333

348334
## Tool Versions
349335
KUSTOMIZE_VERSION ?= v5.1.1
350-
CODE_GENERATOR_VERSION ?= v0.29.0
351336
VGOPATH_VERSION ?= v0.1.5
352-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
337+
CONTROLLER_TOOLS_VERSION ?= v0.15.0
353338
GEN_CRD_API_REFERENCE_DOCS_VERSION ?= v0.3.0
354339
ADDLICENSE_VERSION ?= v1.1.1
355340
GOIMPORTS_VERSION ?= v0.25.0
@@ -372,45 +357,11 @@ $(CONTROLLER_GEN): $(LOCALBIN)
372357
test -s $(LOCALBIN)/controller-gen && $(LOCALBIN)/controller-gen --version | grep -q $(CONTROLLER_TOOLS_VERSION) || \
373358
GOBIN=$(LOCALBIN) go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_TOOLS_VERSION)
374359

375-
.PHONY: deepcopy-gen
376-
deepcopy-gen: $(DEEPCOPY_GEN) ## Download deepcopy-gen locally if necessary.
377-
$(DEEPCOPY_GEN): $(LOCALBIN)
378-
test -s $(LOCALBIN)/deepcopy-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/deepcopy-gen@$(CODE_GENERATOR_VERSION)
379-
380-
.PHONY: client-gen
381-
client-gen: $(CLIENT_GEN) ## Download client-gen locally if necessary.
382-
$(CLIENT_GEN): $(LOCALBIN)
383-
test -s $(LOCALBIN)/client-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/client-gen@$(CODE_GENERATOR_VERSION)
384-
385-
.PHONY: lister-gen
386-
lister-gen: $(LISTER_GEN) ## Download lister-gen locally if necessary.
387-
$(LISTER_GEN): $(LOCALBIN)
388-
test -s $(LOCALBIN)/lister-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/lister-gen@$(CODE_GENERATOR_VERSION)
389-
390-
.PHONY: informer-gen
391-
informer-gen: $(INFORMER_GEN) ## Download informer-gen locally if necessary.
392-
$(INFORMER_GEN): $(LOCALBIN)
393-
test -s $(LOCALBIN)/informer-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/informer-gen@$(CODE_GENERATOR_VERSION)
394-
395-
.PHONY: defaulter-gen
396-
defaulter-gen: $(DEFAULTER_GEN) ## Download defaulter-gen locally if necessary.
397-
$(DEFAULTER_GEN): $(LOCALBIN)
398-
test -s $(LOCALBIN)/defaulter-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/defaulter-gen@$(CODE_GENERATOR_VERSION)
399-
400-
.PHONY: conversion-gen
401-
conversion-gen: $(CONVERSION_GEN) ## Download conversion-gen locally if necessary.
402-
$(CONVERSION_GEN): $(LOCALBIN)
403-
test -s $(LOCALBIN)/conversion-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/conversion-gen@$(CODE_GENERATOR_VERSION)
404-
405360
.PHONY: openapi-gen
406361
openapi-gen: $(OPENAPI_GEN) ## Download openapi-gen locally if necessary.
407362
$(OPENAPI_GEN): $(LOCALBIN)
408-
test -s $(LOCALBIN)/openapi-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/openapi-gen@$(CODE_GENERATOR_VERSION)
363+
test -s $(LOCALBIN)/openapi-gen || GOBIN=$(LOCALBIN) go install k8s.io/kube-openapi/cmd/openapi-gen
409364

410-
.PHONY: applyconfiguration-gen
411-
applyconfiguration-gen: $(APPLYCONFIGURATION_GEN) ## Download applyconfiguration-gen locally if necessary.
412-
$(APPLYCONFIGURATION_GEN): $(LOCALBIN)
413-
test -s $(LOCALBIN)/applyconfiguration-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/applyconfiguration-gen@$(CODE_GENERATOR_VERSION)
414365

415366
.PHONY: vgopath
416367
vgopath: $(VGOPATH) ## Download vgopath locally if necessary.

‎api/core/v1alpha1/zz_generated.defaults.go

+20
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎apinetlet/controllers/controllers_suite_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
apinetclient "github.com/ironcore-dev/ironcore-net/internal/client"
1818

1919
apinetv1alpha1 "github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
20-
"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
20+
ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
2121
ipamv1alpha1 "github.com/ironcore-dev/ironcore/api/ipam/v1alpha1"
2222
networkingv1alpha1 "github.com/ironcore-dev/ironcore/api/networking/v1alpha1"
2323
envtestutils "github.com/ironcore-dev/ironcore/utils/envtest"

‎apinetlet/controllers/conversion.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
apinetv1alpha1 "github.com/ironcore-dev/ironcore-net/api/core/v1alpha1"
1212
"github.com/ironcore-dev/ironcore-net/apimachinery/api/net"
1313
apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
14-
apinetmetav1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/meta/v1"
14+
metav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
1515

1616
commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
1717
corev1alpha1 "github.com/ironcore-dev/ironcore/api/core/v1alpha1"
@@ -163,19 +163,19 @@ func translateObjectSelector(objSel *corev1alpha1.ObjectSelector) *apinetv1alpha
163163
WithMatchExpressions(translateLabelSelectorRequirements(objSel.MatchExpressions)...)
164164
}
165165

166-
func translateLabelSelectorRequirements(reqs []metav1.LabelSelectorRequirement) []*apinetmetav1ac.LabelSelectorRequirementApplyConfiguration {
167-
var translated []*apinetmetav1ac.LabelSelectorRequirementApplyConfiguration
166+
func translateLabelSelectorRequirements(reqs []metav1.LabelSelectorRequirement) []*metav1ac.LabelSelectorRequirementApplyConfiguration {
167+
var translated []*metav1ac.LabelSelectorRequirementApplyConfiguration
168168
for _, req := range reqs {
169-
translated = append(translated, apinetmetav1ac.LabelSelectorRequirement().
169+
translated = append(translated, metav1ac.LabelSelectorRequirement().
170170
WithKey(req.Key).
171171
WithOperator(req.Operator).
172172
WithValues(req.Values...))
173173
}
174174
return translated
175175
}
176176

177-
func translateLabelSelector(labelSelector metav1.LabelSelector) *apinetmetav1ac.LabelSelectorApplyConfiguration {
178-
return apinetmetav1ac.LabelSelector().
177+
func translateLabelSelector(labelSelector metav1.LabelSelector) *metav1ac.LabelSelectorApplyConfiguration {
178+
return metav1ac.LabelSelector().
179179
WithMatchLabels(labelSelector.MatchLabels).
180180
WithMatchExpressions(translateLabelSelectorRequirements(labelSelector.MatchExpressions)...)
181181
}

‎apinetlet/controllers/loadbalancer_controller.go

+7-4
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
apinetlethandler "github.com/ironcore-dev/ironcore-net/apinetlet/handler"
1818
"github.com/ironcore-dev/ironcore-net/apinetlet/provider"
1919
apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
20-
metav1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/meta/v1"
21-
"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
20+
ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
21+
metav1ac "k8s.io/client-go/applyconfigurations/meta/v1"
2222

2323
"github.com/ironcore-dev/controller-utils/clientutils"
2424
commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
@@ -342,8 +342,11 @@ func (r *LoadBalancerReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache
342342
),
343343
).
344344
WatchesRawSource(
345-
source.Kind(apiNetCache, &apinetv1alpha1.LoadBalancer{}),
346-
apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.LoadBalancer{}),
345+
source.Kind[client.Object](
346+
apiNetCache,
347+
&apinetv1alpha1.LoadBalancer{},
348+
apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.LoadBalancer{}),
349+
),
347350
).
348351
Owns(&ipamv1alpha1.Prefix{}).
349352
Watches(

‎apinetlet/controllers/natgateway_controller.go

+11-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
apinetletclient "github.com/ironcore-dev/ironcore-net/apinetlet/client"
1515
"github.com/ironcore-dev/ironcore-net/apinetlet/handler"
1616
apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
17-
"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
17+
ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
1818

1919
"github.com/ironcore-dev/controller-utils/clientutils"
2020
commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
@@ -215,12 +215,18 @@ func (r *NATGatewayReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache ca
215215
),
216216
).
217217
WatchesRawSource(
218-
source.Kind(apiNetCache, &apinetv1alpha1.NATGateway{}),
219-
handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
218+
source.Kind[client.Object](
219+
apiNetCache,
220+
&apinetv1alpha1.NATGateway{},
221+
handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
222+
),
220223
).
221224
WatchesRawSource(
222-
source.Kind(apiNetCache, &apinetv1alpha1.NATGatewayAutoscaler{}),
223-
handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
225+
source.Kind[client.Object](
226+
apiNetCache,
227+
&apinetv1alpha1.NATGatewayAutoscaler{},
228+
handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.NATGateway{}),
229+
),
224230
).
225231
Complete(r)
226232
}

‎apinetlet/controllers/network_controller.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -307,8 +307,11 @@ func (r *NetworkReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache cache
307307
),
308308
).
309309
WatchesRawSource(
310-
source.Kind(apiNetCache, &apinetv1alpha1.Network{}),
311-
handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.Network{}),
310+
source.Kind[client.Object](
311+
apiNetCache,
312+
&apinetv1alpha1.Network{},
313+
handler.EnqueueRequestForSource(mgr.GetScheme(), mgr.GetRESTMapper(), &networkingv1alpha1.Network{}),
314+
),
312315
).
313316
Complete(r)
314317
}

‎apinetlet/controllers/networkinterface_controller.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,11 @@ func (r *NetworkInterfaceReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCa
581581
),
582582
).
583583
WatchesRawSource(
584-
source.Kind(apiNetCache, &apinetv1alpha1.NetworkInterface{}),
585-
apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkInterface{}),
584+
source.Kind[client.Object](
585+
apiNetCache,
586+
&apinetv1alpha1.NetworkInterface{},
587+
apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkInterface{}),
588+
),
586589
).
587590
Owns(&ipamv1alpha1.Prefix{}).
588591
Watches(

‎apinetlet/controllers/networkpolicy_controller.go

+17-8
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
apinetletclient "github.com/ironcore-dev/ironcore-net/apinetlet/client"
1616
apinetlethandler "github.com/ironcore-dev/ironcore-net/apinetlet/handler"
1717
apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
18-
"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
18+
ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
1919
apinetclient "github.com/ironcore-dev/ironcore-net/internal/client"
2020

2121
"github.com/ironcore-dev/controller-utils/clientutils"
@@ -576,17 +576,26 @@ func (r *NetworkPolicyReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache
576576
),
577577
).
578578
WatchesRawSource(
579-
source.Kind(apiNetCache, &apinetv1alpha1.NetworkPolicy{}),
580-
apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkPolicy{}),
579+
source.Kind[client.Object](
580+
apiNetCache,
581+
&apinetv1alpha1.NetworkPolicy{},
582+
apinetlethandler.EnqueueRequestForSource(r.Scheme(), r.RESTMapper(), &networkingv1alpha1.NetworkPolicy{}),
583+
),
581584
).
582585
WatchesRawSource(
583-
source.Kind(apiNetCache, &apinetv1alpha1.Network{}),
584-
r.enqueueByNetwork(),
586+
source.Kind[client.Object](
587+
apiNetCache,
588+
&apinetv1alpha1.Network{},
589+
r.enqueueByNetwork(),
590+
),
585591
).
586592
WatchesRawSource(
587-
source.Kind(apiNetCache, &apinetv1alpha1.NetworkInterface{}),
588-
r.enqueueByNetworkInterface(),
589-
builder.WithPredicates(r.networkInterfaceReadyPredicate()),
593+
source.Kind[client.Object](
594+
apiNetCache,
595+
&apinetv1alpha1.NetworkInterface{},
596+
r.enqueueByNetworkInterface(),
597+
r.networkInterfaceReadyPredicate(),
598+
),
590599
).
591600
Complete(r)
592601
}

‎apinetlet/controllers/virtualip_controller.go

+6-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
apinetletclient "github.com/ironcore-dev/ironcore-net/apinetlet/client"
1515
"github.com/ironcore-dev/ironcore-net/apinetlet/handler"
1616
apinetv1alpha1ac "github.com/ironcore-dev/ironcore-net/client-go/applyconfigurations/core/v1alpha1"
17-
"github.com/ironcore-dev/ironcore-net/client-go/ironcorenet"
17+
ironcorenet "github.com/ironcore-dev/ironcore-net/client-go/ironcorenet/versioned"
1818

1919
"github.com/ironcore-dev/controller-utils/clientutils"
2020
commonv1alpha1 "github.com/ironcore-dev/ironcore/api/common/v1alpha1"
@@ -204,8 +204,11 @@ func (r *VirtualIPReconciler) SetupWithManager(mgr ctrl.Manager, apiNetCache cac
204204
),
205205
).
206206
WatchesRawSource(
207-
source.Kind(apiNetCache, &apinetv1alpha1.IP{}),
208-
handler.EnqueueRequestForSource(r.Scheme(), mgr.GetRESTMapper(), &networkingv1alpha1.VirtualIP{}),
207+
source.Kind[client.Object](
208+
apiNetCache,
209+
&apinetv1alpha1.IP{},
210+
handler.EnqueueRequestForSource(r.Scheme(), mgr.GetRESTMapper(), &networkingv1alpha1.VirtualIP{}),
211+
),
209212
).
210213
Complete(r)
211214
}

‎client-go/applyconfigurations/core/v1alpha1/daemonset.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client-go/applyconfigurations/core/v1alpha1/daemonsetspec.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client-go/applyconfigurations/core/v1alpha1/instance.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client-go/applyconfigurations/core/v1alpha1/instanceaffinityterm.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client-go/applyconfigurations/core/v1alpha1/instancetemplate.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client-go/applyconfigurations/core/v1alpha1/ip.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client-go/applyconfigurations/core/v1alpha1/ipaddress.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)