Skip to content

Update to CAPI 1.9 #290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Feb 21, 2025
Merged

Update to CAPI 1.9 #290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3f4bc46
remove failurereason and message from machine
martiniadam Feb 12, 2025
5ce636d
finish error processing
martiniadam Feb 12, 2025
193f9bc
Update main
martiniadam Feb 12, 2025
5dc415d
Update make, manifests
martiniadam Feb 12, 2025
ab434b7
Revert api changes
martiniadam Feb 19, 2025
2a11326
fix typo
martiniadam Feb 19, 2025
d92041a
asset updates
martiniadam Feb 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export PATH := $(TOOLS_BIN_DIR):$(PATH)
OUTPUT_BASE := --output-base=$(ROOT_DIR)

# the current cluster API version
CAPI_VERSION := v1.7.2
CAPI_VERSION := v1.9.4

# Binaries.
GO_INSTALL = ./scripts/go_install.sh
Expand All @@ -74,7 +74,7 @@ CLUSTERCTL_VER := $(CAPI_VERSION)
CLUSTERCTL_BIN := clusterctl
CLUSTERCTL := $(TOOLS_BIN_DIR)/$(CLUSTERCTL_BIN)-$(CLUSTERCTL_VER)

CONTROLLER_GEN_VER := v0.15.0
CONTROLLER_GEN_VER := v0.17.2
CONTROLLER_GEN_BIN := controller-gen
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)

Expand Down Expand Up @@ -110,12 +110,12 @@ GINKGO_VER := v2.19.0
GINKGO_BIN := ginkgo
GINKGO := $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER)

KUBECTL_VER := v1.29.0
KUBECTL_VER := v1.31.0
KUBECTL_BIN := kubectl
KUBECTL := $(TOOLS_BIN_DIR)/$(KUBECTL_BIN)-$(KUBECTL_VER)

# ENVTEST is used for running controller tests.
SETUP_ENVTEST_VER := 116a1b831fffe7ccc3c8145306c3e1a3b1b14ffa # Note: this matches the commit ID of the dependent controller-runtime module.
SETUP_ENVTEST_VER := v0.0.0-20240522175850-2e9781e9fc60 # updating this to match the version that pulls from controller-tools, details in https://github.com/kubernetes-sigs/cluster-api/pull/10569
SETUP_ENVTEST_BIN := setup-envtest
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))

Expand Down
9 changes: 5 additions & 4 deletions cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/healthz"
ctrlmgr "sigs.k8s.io/controller-runtime/pkg/manager"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"sigs.k8s.io/controller-runtime/pkg/webhook"
)

Expand Down Expand Up @@ -206,7 +207,7 @@ func main() {
Recorder: mgr.GetEventRecorderFor("azurestackhcimachine-reconciler"),
}).SetupWithManager(mgr, controller.Options{
MaxConcurrentReconciles: azureStackHCIMachineConcurrency,
RateLimiter: workqueue.DefaultControllerRateLimiter(),
RateLimiter: workqueue.DefaultTypedControllerRateLimiter[reconcile.Request](),
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "AzureStackHCIMachine")
os.Exit(1)
Expand All @@ -217,7 +218,7 @@ func main() {
Recorder: mgr.GetEventRecorderFor("azurestackhcicluster-reconciler"),
}).SetupWithManager(mgr, controller.Options{
MaxConcurrentReconciles: azureStackHCIClusterConcurrency,
RateLimiter: workqueue.DefaultControllerRateLimiter(),
RateLimiter: workqueue.DefaultTypedControllerRateLimiter[reconcile.Request](),
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "AzureStackHCICluster")
os.Exit(1)
Expand All @@ -228,7 +229,7 @@ func main() {
Recorder: mgr.GetEventRecorderFor("azurestackhciloadbalancer-reconciler"),
}).SetupWithManager(mgr, controller.Options{
MaxConcurrentReconciles: azureStackHCIloadBalancerConcurrency,
RateLimiter: workqueue.DefaultControllerRateLimiter(),
RateLimiter: workqueue.DefaultTypedControllerRateLimiter[reconcile.Request](),
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "AzureStackHCILoadBalancer")
os.Exit(1)
Expand All @@ -240,7 +241,7 @@ func main() {
Recorder: mgr.GetEventRecorderFor("azurestackhcivirtualmachine-reconciler"),
}).SetupWithManager(mgr, controller.Options{
MaxConcurrentReconciles: azureStackHCIVirtualMachineConcurrency,
RateLimiter: workqueue.DefaultControllerRateLimiter(),
RateLimiter: workqueue.DefaultTypedControllerRateLimiter[reconcile.Request](),
}); err != nil {
setupLog.Error(err, "unable to create controller", "controller", "AzureStackHCIVirtualMachine")
os.Exit(1)
Expand Down
10 changes: 5 additions & 5 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_azurestackhciclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.17.2
name: azurestackhciclusters.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down Expand Up @@ -286,20 +286,20 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
description: status of the condition, one of True, False, Unknown.
type: string
type:
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_azurestackhciclustertemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.17.2
name: azurestackhciclustertemplates.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down
14 changes: 5 additions & 9 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_azurestackhciloadbalancers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.17.2
name: azurestackhciloadbalancers.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down Expand Up @@ -150,20 +150,20 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
description: status of the condition, one of True, False, Unknown.
type: string
type:
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
Expand All @@ -179,7 +179,6 @@ spec:
reconciling the Machine and will contain a more verbose string suitable
for logging and human consumption.


This field should not be set for transitive errors that a controller
faces that are expected to be fixed automatically over
time (like service outages), but instead indicate that something is
Expand All @@ -189,7 +188,6 @@ spec:
spec, values that are unsupported by the controller, or the
responsible controller itself being critically misconfigured.


Any transient errors that occur during the reconciliation of Machines
can be added as events to the Machine object and/or logged in the
controller's output.
Expand All @@ -200,7 +198,6 @@ spec:
reconciling the Machine and will contain a succinct value suitable
for machine interpretation.


This field should not be set for transitive errors that a controller
faces that are expected to be fixed automatically over
time (like service outages), but instead indicate that something is
Expand All @@ -210,7 +207,6 @@ spec:
spec, values that are unsupported by the controller, or the
responsible controller itself being critically misconfigured.


Any transient errors that occur during the reconciliation of Machines
can be added as events to the Machine object and/or logged in the
controller's output.
Expand Down
14 changes: 5 additions & 9 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_azurestackhcimachines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.17.2
name: azurestackhcimachines.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down Expand Up @@ -213,20 +213,20 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
description: status of the condition, one of True, False, Unknown.
type: string
type:
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
Expand All @@ -242,7 +242,6 @@ spec:
reconciling the Machine and will contain a more verbose string suitable
for logging and human consumption.


This field should not be set for transitive errors that a controller
faces that are expected to be fixed automatically over
time (like service outages), but instead indicate that something is
Expand All @@ -252,7 +251,6 @@ spec:
spec, values that are unsupported by the controller, or the
responsible controller itself being critically misconfigured.


Any transient errors that occur during the reconciliation of Machines
can be added as events to the Machine object and/or logged in the
controller's output.
Expand All @@ -263,7 +261,6 @@ spec:
reconciling the Machine and will contain a succinct value suitable
for machine interpretation.


This field should not be set for transitive errors that a controller
faces that are expected to be fixed automatically over
time (like service outages), but instead indicate that something is
Expand All @@ -273,7 +270,6 @@ spec:
spec, values that are unsupported by the controller, or the
responsible controller itself being critically misconfigured.


Any transient errors that occur during the reconciliation of Machines
can be added as events to the Machine object and/or logged in the
controller's output.
Expand Down
2 changes: 1 addition & 1 deletion config/crd/bases/infrastructure.cluster.x-k8s.io_azurestackhcimachinetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.17.2
name: azurestackhcimachinetemplates.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down
10 changes: 5 additions & 5 deletions config/crd/bases/infrastructure.cluster.x-k8s.io_azurestackhcivirtualmachines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.17.2
name: azurestackhcivirtualmachines.infrastructure.cluster.x-k8s.io
spec:
group: infrastructure.cluster.x-k8s.io
Expand Down Expand Up @@ -233,20 +233,20 @@ spec:
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
This field may be empty.
type: string
severity:
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
description: status of the condition, one of True, False, Unknown.
type: string
type:
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
Expand Down
3 changes: 0 additions & 3 deletions config/crd/patches/webhook_in_azurestackhciclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ spec:
webhook:
conversionReviewVersions: ["v1", "v1beta1"]
clientConfig:
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
caBundle: Cg==
service:
namespace: system
name: webhook-service
Expand Down
3 changes: 0 additions & 3 deletions config/crd/patches/webhook_in_azurestackhciloadbalancers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ spec:
webhook:
conversionReviewVersions: ["v1", "v1beta1"]
clientConfig:
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
caBundle: Cg==
service:
namespace: system
name: webhook-service
Expand Down
3 changes: 0 additions & 3 deletions config/crd/patches/webhook_in_azurestackhcimachines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ spec:
webhook:
conversionReviewVersions: ["v1", "v1beta1"]
clientConfig:
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
caBundle: Cg==
service:
namespace: system
name: webhook-service
Expand Down
3 changes: 0 additions & 3 deletions config/crd/patches/webhook_in_azurestackhcimachinetemplates.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ spec:
webhook:
conversionReviewVersions: ["v1", "v1beta1"]
clientConfig:
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
caBundle: Cg==
service:
namespace: system
name: webhook-service
Expand Down
3 changes: 0 additions & 3 deletions config/crd/patches/webhook_in_azurestackhcivirtualmachines.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ spec:
webhook:
conversionReviewVersions: ["v1", "v1beta1"]
clientConfig:
# this is "\n" used as a placeholder, otherwise it will be rejected by the apiserver for being blank,
# but we're going to set it later using the cert-manager (or potentially a patch if not using cert-manager)
caBundle: Cg==
service:
namespace: system
name: webhook-service
Expand Down
3 changes: 2 additions & 1 deletion config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
containers:
- args:
- "--v=6"
- "--metrics-bind-addr=127.0.0.1:8080"
- "--diagnostics-address=127.0.0.1:8080"
image: ecpacr.azurecr.io/public/aksarc/caphcontroller:latest
imagePullPolicy: Always
name: manager
Expand All @@ -34,4 +34,5 @@ spec:
httpGet:
path: /healthz
port: healthz
terminationMessagePolicy: FallbackToLogsOnError
terminationGracePeriodSeconds: 10
Loading