Skip to content

Commit 739c6e7

Browse files
joekrjoekr
committed
bump CAPI to 1.9.7
1 parent 22a4d4c commit 739c6e7

27 files changed

+274
-273
lines changed

‎Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ CONVERSION_GEN := $(BIN_DIR)/conversion-gen
8787

8888
# set up `setup-envtest` to install kubebuilder dependency
8989
export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.24.2
90-
SETUP_ENVTEST_VER := v0.0.0-20230131074648-f5014c077fc3
90+
SETUP_ENVTEST_VER := release-0.19
9191
SETUP_ENVTEST_BIN := setup-envtest
9292
SETUP_ENVTEST := $(abspath $(TOOLS_BIN_DIR)/$(SETUP_ENVTEST_BIN)-$(SETUP_ENVTEST_VER))
9393
SETUP_ENVTEST_PKG := sigs.k8s.io/controller-runtime/tools/setup-envtest
@@ -377,10 +377,10 @@ envsubst: $(ENVSUBST) ## Build a local copy of envsubst.
377377
kubectl: $(KUBECTL) ## Build a local copy of kubectl.
378378

379379
$(CONTROLLER_GEN): ## Download controller-gen locally if necessary.
380-
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.14.0
380+
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/controller-tools/cmd/controller-gen $(CONTROLLER_GEN_BIN) v0.16.1
381381

382382
$(CONVERSION_GEN): ## Download controller-gen locally if necessary.
383-
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) v0.23.1
383+
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) k8s.io/code-generator/cmd/conversion-gen $(CONVERSION_GEN_BIN) v0.31.0
384384

385385
$(KUSTOMIZE): ## Download kustomize locally if necessary.
386386
GOBIN=$(BIN_DIR)/ $(GO_INSTALL) sigs.k8s.io/kustomize/kustomize/v4 $(KUSTOMIZE_BIN) v4.5.2

‎Tiltfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ settings = {
1919
"deploy_cert_manager": True,
2020
"preload_images_for_kind": True,
2121
"kind_cluster_name": "capoci",
22-
"capi_version": "v1.8.1",
23-
"cert_manager_version": "v1.15.2",
22+
"capi_version": "v1.9.7",
23+
"cert_manager_version": "v1.16.2",
2424
"kubernetes_version": "v1.30.0",
2525
}
2626

‎api/v1beta1/ocimachine_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1beta1
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22-
"sigs.k8s.io/cluster-api/errors"
2322
)
2423

2524
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
@@ -160,7 +159,7 @@ type OCIMachineStatus struct {
160159

161160
// Error status on the machine.
162161
// +optional
163-
FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
162+
FailureReason *string `json:"failureReason,omitempty"`
164163

165164
// The error message corresponding to the error on the machine.
166165
// +optional

‎api/v1beta1/zz_generated.conversion.go‎

Lines changed: 2 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/v1beta2/ocimachine_types.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1beta2
1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2121
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
22-
"sigs.k8s.io/cluster-api/errors"
2322
)
2423

2524
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.
@@ -154,7 +153,7 @@ type OCIMachineStatus struct {
154153

155154
// Error status on the machine.
156155
// +optional
157-
FailureReason *errors.MachineStatusError `json:"failureReason,omitempty"`
156+
FailureReason *string `json:"failureReason,omitempty"`
158157

159158
// The error message corresponding to the error on the machine.
160159
// +optional

‎api/v1beta2/zz_generated.deepcopy.go‎

Lines changed: 1 addition & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cloud/scope/machine.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import (
4343
"k8s.io/klog/v2/klogr"
4444
"k8s.io/utils/pointer"
4545
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
46-
capierrors "sigs.k8s.io/cluster-api/errors"
4746
capiUtil "sigs.k8s.io/cluster-api/util"
4847
"sigs.k8s.io/cluster-api/util/conditions"
4948
"sigs.k8s.io/cluster-api/util/patch"
@@ -437,7 +436,7 @@ func (m *MachineScope) SetFailureMessage(v error) {
437436
}
438437

439438
// SetFailureReason sets the OCIMachine status error reason.
440-
func (m *MachineScope) SetFailureReason(v capierrors.MachineStatusError) {
439+
func (m *MachineScope) SetFailureReason(v string) {
441440
m.OCIMachine.Status.FailureReason = &v
442441
}
443442

‎cloud/scope/machine_pool.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ import (
4040
"k8s.io/klog/v2/klogr"
4141
"k8s.io/utils/pointer"
4242
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
43-
capierrors "sigs.k8s.io/cluster-api/errors"
4443
expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4544
"sigs.k8s.io/cluster-api/util/conditions"
4645
"sigs.k8s.io/cluster-api/util/patch"
@@ -132,7 +131,7 @@ func (m *MachinePoolScope) SetFailureMessage(v error) {
132131
}
133132

134133
// SetFailureReason sets the OCIMachine status error reason.
135-
func (m *MachinePoolScope) SetFailureReason(v capierrors.MachineStatusError) {
134+
func (m *MachinePoolScope) SetFailureReason(v string) {
136135
m.OCIMachinePool.Status.FailureReason = &v
137136
}
138137

‎cloud/scope/managed_machine_pool.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
"github.com/pkg/errors"
3939
"k8s.io/klog/v2/klogr"
4040
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
41-
capierrors "sigs.k8s.io/cluster-api/errors"
4241
expclusterv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
4342
"sigs.k8s.io/cluster-api/util/annotations"
4443
"sigs.k8s.io/cluster-api/util/patch"
@@ -119,7 +118,7 @@ func (m *ManagedMachinePoolScope) Close(ctx context.Context) error {
119118
}
120119

121120
// SetFailureReason sets the OCIMachine status error reason.
122-
func (m *ManagedMachinePoolScope) SetFailureReason(v capierrors.MachineStatusError) {
121+
func (m *ManagedMachinePoolScope) SetFailureReason(v string) {
123122
m.OCIManagedMachinePool.Status.FailureReason = &v
124123
}
125124

0 commit comments

Comments
 (0)