Skip to content

Commit 534365a

Browse files
mboersmamboersma
committed
Bump CAPI to v1.9.0-rc.0
1 parent 983bf8b commit 534365a

File tree

57 files changed

+302
-592
lines changed

Some content is hidden

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

57 files changed

+302
-592
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ ifneq ($(abspath $(ROOT_DIR)),$(GOPATH)/src/sigs.k8s.io/cluster-api-provider-azu
7070
endif
7171

7272
# Binaries.
73-
CONTROLLER_GEN_VER := v0.15.0
73+
CONTROLLER_GEN_VER := v0.16.0
7474
CONTROLLER_GEN_BIN := controller-gen
7575
CONTROLLER_GEN := $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
7676

@@ -325,7 +325,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
325325
./hack/create-custom-cloud-provider-config.sh
326326

327327
# Deploy CAPI
328-
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.8.5/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
328+
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.9.0-rc.0/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
329329

330330
# Deploy CAAPH
331331
timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.2.5/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

‎Tiltfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ settings = {
2020
"deploy_cert_manager": True,
2121
"preload_images_for_kind": True,
2222
"kind_cluster_name": "capz",
23-
"capi_version": "v1.8.5",
23+
"capi_version": "v1.9.0-rc.0",
2424
"caaph_version": "v0.2.5",
2525
"cert_manager_version": "v1.16.1",
2626
"kubernetes_version": "v1.28.3",

‎api/v1beta1/azuremachine_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"k8s.io/apimachinery/pkg/api/resource"
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
24-
"sigs.k8s.io/cluster-api/errors"
24+
"sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
2525
)
2626

2727
const (

‎api/v1beta1/azuremanagedcluster_webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ func TestAzureManagedCluster_ValidateCreateFailure(t *testing.T) {
158158
for _, tc := range tests {
159159
t.Run(tc.name, func(t *testing.T) {
160160
if tc.featureGateEnabled != nil {
161-
defer utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)()
161+
utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)
162162
}
163163
g := NewWithT(t)
164164
_, err := tc.amc.ValidateCreate()

‎api/v1beta1/azuremanagedcontrolplane_webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1682,7 +1682,7 @@ func TestAzureManagedControlPlane_ValidateCreateFailure(t *testing.T) {
16821682
t.Run(tc.name, func(t *testing.T) {
16831683
g := NewWithT(t)
16841684
if tc.featureGateEnabled != nil {
1685-
defer utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)()
1685+
utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)
16861686
}
16871687
mcpw := &azureManagedControlPlaneWebhook{
16881688
Client: client,

‎api/v1beta1/azuremanagedmachinepool_types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22-
capierrors "sigs.k8s.io/cluster-api/errors"
22+
capierrors "sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
2323
)
2424

2525
const (

‎api/v1beta1/azuremanagedmachinepool_webhook_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1328,7 +1328,7 @@ func TestAzureManagedMachinePool_ValidateCreateFailure(t *testing.T) {
13281328
for _, tc := range tests {
13291329
t.Run(tc.name, func(t *testing.T) {
13301330
if tc.featureGateEnabled != nil {
1331-
defer utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)()
1331+
utilfeature.SetFeatureGateDuringTest(t, feature.Gates, capifeature.MachinePool, *tc.featureGateEnabled)
13321332
}
13331333
g := NewWithT(t)
13341334
mw := &azureManagedMachinePoolWebhook{}

‎azure/scope/machine.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"k8s.io/apimachinery/pkg/types"
3030
"k8s.io/utils/ptr"
3131
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
32-
capierrors "sigs.k8s.io/cluster-api/errors"
32+
capierrors "sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
3333
"sigs.k8s.io/cluster-api/util"
3434
"sigs.k8s.io/cluster-api/util/conditions"
3535
"sigs.k8s.io/cluster-api/util/patch"

‎azure/scope/machinepool.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"k8s.io/klog/v2"
3434
"k8s.io/utils/ptr"
3535
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
36-
capierrors "sigs.k8s.io/cluster-api/errors"
36+
capierrors "sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
3737
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
3838
"sigs.k8s.io/cluster-api/util"
3939
"sigs.k8s.io/cluster-api/util/annotations"

‎azure/scope/machinepoolmachine.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2929
"sigs.k8s.io/cluster-api/controllers/noderefutil"
3030
"sigs.k8s.io/cluster-api/controllers/remote"
31-
capierrors "sigs.k8s.io/cluster-api/errors"
31+
capierrors "sigs.k8s.io/cluster-api/errors" //nolint:staticcheck
3232
expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
3333
"sigs.k8s.io/cluster-api/util/conditions"
3434
"sigs.k8s.io/cluster-api/util/patch"

0 commit comments

Comments
 (0)