Skip to content

Commit 905a0ef

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1205 from vr4manta/SPLAT-1293
SPLAT-1293: Bump IPAM types to v1beta1.
2 parents 8d0f4a1 + ed7cc85 commit 905a0ef

File tree

723 files changed

+43263
-11272
lines changed

Some content is hidden

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

723 files changed

+43263
-11272
lines changed

‎Makefile

+20-12
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,12 @@ ifeq ($(DBG),1)
1818
GOGCFLAGS ?= -gcflags=all="-N -l"
1919
endif
2020

21-
TOOLS_DIR=./tools
21+
#
22+
# Directories.
23+
#
24+
TOOLS_DIR=$(abspath ./tools)
2225
BIN_DIR=bin
2326
TOOLS_BIN_DIR := $(TOOLS_DIR)/$(BIN_DIR)
24-
CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/controller-gen)
2527

2628
.PHONY: all
2729
all: check build test
@@ -55,9 +57,6 @@ ENVTEST = go run ${PROJECT_DIR}/vendor/sigs.k8s.io/controller-runtime/tools/setu
5557
# ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
5658
ENVTEST_K8S_VERSION = 1.29
5759

58-
$(CONTROLLER_GEN): $(TOOLS_DIR)/go.mod # Build controller-gen from tools folder.
59-
cd $(TOOLS_DIR); GO111MODULE=on GOFLAGS=-mod=vendor go build -tags=tools -o $(BIN_DIR)/controller-gen sigs.k8s.io/controller-tools/cmd/controller-gen
60-
6160
.PHONY: vendor
6261
vendor:
6362
$(DOCKER_CMD) ./hack/go-mod.sh
@@ -81,7 +80,7 @@ machine-healthcheck:
8180
$(DOCKER_CMD) ./hack/go-build.sh machine-healthcheck
8281

8382
.PHONY: vsphere
84-
vsphere: generate-third-party-deepcopy
83+
vsphere:
8584
$(DOCKER_CMD) ./hack/go-build.sh vsphere
8685

8786
.PHONY: machineset
@@ -136,12 +135,6 @@ goimports: ## Go fmt your code
136135
vet: ## Apply go vet to all go files
137136
$(DOCKER_CMD) hack/go-vet.sh ./pkg/... ./cmd/...
138137

139-
.PHONY: generate-third-party-deepcopy
140-
generate-third-party-deepcopy: $(CONTROLLER_GEN)
141-
$(CONTROLLER_GEN) object paths="./third_party/cluster-api/..."
142-
$(CONTROLLER_GEN) crd paths="./third_party/cluster-api/..." output\:crd\:artifacts\:config=./third_party/cluster-api/crd
143-
144-
145138
.PHONY: crds-sync
146139
crds-sync: ## Sync crds in install with the ones in the vendored oc/api
147140
$(DOCKER_CMD) hack/crds-sync.sh .
@@ -154,6 +147,21 @@ verify-crds-sync: ## Verify that the crds in install and the ones in vendored oc
154147
help:
155148
@grep -E '^[a-zA-Z0-9_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
156149

150+
## --------------------------------------
151+
## Cleanup / Verification
152+
## --------------------------------------
153+
154+
##@ clean:
155+
156+
.PHONY: clean
157+
clean: ## Remove generated binaries, GitBook files, Helm charts, and Tilt build files
158+
$(MAKE) clean-bin
159+
160+
.PHONY: clean-bin
161+
clean-bin: ## Remove all generated binaries
162+
rm -rf $(BIN_DIR)
163+
rm -rf $(TOOLS_BIN_DIR)
164+
157165
define ensure-home
158166
@ export HOME=$${HOME:=/tmp/kubebuilder-testing}; \
159167
if [ $${HOME} == "/" ]; then \

‎cmd/vsphere/main.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ import (
2020
"github.com/openshift/machine-api-operator/pkg/metrics"
2121
"github.com/openshift/machine-api-operator/pkg/util"
2222
"github.com/openshift/machine-api-operator/pkg/version"
23-
ipamv1alpha1 "github.com/openshift/machine-api-operator/third_party/cluster-api/exp/ipam/api/v1alpha1"
2423
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2524
"k8s.io/klog/v2"
2625
"k8s.io/klog/v2/textlogger"
26+
ipamv1beta1 "sigs.k8s.io/cluster-api/exp/ipam/api/v1beta1"
2727
ctrl "sigs.k8s.io/controller-runtime"
2828
"sigs.k8s.io/controller-runtime/pkg/cache"
2929
"sigs.k8s.io/controller-runtime/pkg/client/config"
@@ -196,8 +196,8 @@ func main() {
196196
klog.Fatal(err)
197197
}
198198

199-
if err := ipamv1alpha1.AddToScheme(mgr.GetScheme()); err != nil {
200-
klog.Fatalf("unable to add ipamv1alpha1 to scheme: %v", err)
199+
if err := ipamv1beta1.AddToScheme(mgr.GetScheme()); err != nil {
200+
klog.Fatalf("unable to add ipamv1beta1 to scheme: %v", err)
201201
}
202202

203203
if err := capimachine.AddWithActuator(mgr, machineActuator); err != nil {

‎go.mod

+15-12
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ require (
2727
k8s.io/klog/v2 v2.110.1
2828
k8s.io/kubectl v0.29.0
2929
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
30+
sigs.k8s.io/cluster-api v1.6.1
3031
sigs.k8s.io/controller-runtime v0.17.0
3132
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240116121732-6747c42ce339
3233
sigs.k8s.io/yaml v1.4.0
@@ -69,15 +70,15 @@ require (
6970
github.com/chavacava/garif v0.0.0-20230227094218-b8c73b2037b8 // indirect
7071
github.com/curioswitch/go-reassign v0.2.0 // indirect
7172
github.com/daixiang0/gci v0.10.1 // indirect
72-
github.com/davecgh/go-spew v1.1.1 // indirect
73+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
7374
github.com/denis-tingaikin/go-header v0.4.3 // indirect
7475
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
7576
github.com/esimonov/ifshort v1.0.4 // indirect
7677
github.com/ettle/strcase v0.1.1 // indirect
7778
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7879
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
7980
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
80-
github.com/fatih/color v1.15.0 // indirect
81+
github.com/fatih/color v1.16.0 // indirect
8182
github.com/fatih/structtag v1.2.0 // indirect
8283
github.com/firefart/nonamedreturns v1.0.4 // indirect
8384
github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -156,7 +157,7 @@ require (
156157
github.com/maratori/testpackage v1.1.1 // indirect
157158
github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
158159
github.com/mattn/go-colorable v0.1.13 // indirect
159-
github.com/mattn/go-isatty v0.0.17 // indirect
160+
github.com/mattn/go-isatty v0.0.20 // indirect
160161
github.com/mattn/go-runewidth v0.0.14 // indirect
161162
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
162163
github.com/mbilski/exhaustivestruct v1.2.0 // indirect
@@ -178,10 +179,10 @@ require (
178179
github.com/nishanths/predeclared v0.2.2 // indirect
179180
github.com/nunnatsa/ginkgolinter v0.9.0 // indirect
180181
github.com/olekukonko/tablewriter v0.0.5 // indirect
181-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
182+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
182183
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
183184
github.com/pkg/errors v0.9.1 // indirect
184-
github.com/pmezard/go-difflib v1.0.0 // indirect
185+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
185186
github.com/polyfloyd/go-errorlint v1.4.0 // indirect
186187
github.com/prometheus/client_model v0.5.0 // indirect
187188
github.com/prometheus/common v0.45.0 // indirect
@@ -195,6 +196,8 @@ require (
195196
github.com/russross/blackfriday/v2 v2.1.0 // indirect
196197
github.com/ryancurrah/gomodguard v1.3.0 // indirect
197198
github.com/ryanrolds/sqlclosecheck v0.4.0 // indirect
199+
github.com/sagikazarmark/locafero v0.3.0 // indirect
200+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
198201
github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
199202
github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
200203
github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
@@ -205,15 +208,15 @@ require (
205208
github.com/sivchari/nosnakecase v1.7.0 // indirect
206209
github.com/sivchari/tenv v1.7.1 // indirect
207210
github.com/sonatard/noctx v0.0.2 // indirect
211+
github.com/sourcegraph/conc v0.3.0 // indirect
208212
github.com/sourcegraph/go-diff v0.7.0 // indirect
209-
github.com/spf13/afero v1.9.3 // indirect
210-
github.com/spf13/cast v1.5.0 // indirect
211-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
212-
github.com/spf13/viper v1.15.0 // indirect
213+
github.com/spf13/afero v1.10.0 // indirect
214+
github.com/spf13/cast v1.5.1 // indirect
215+
github.com/spf13/viper v1.17.0 // indirect
213216
github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
214217
github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
215218
github.com/stretchr/objx v0.5.0 // indirect
216-
github.com/subosito/gotenv v1.4.2 // indirect
219+
github.com/subosito/gotenv v1.6.0 // indirect
217220
github.com/t-yuki/gocover-cobertura v0.0.0-20180217150009-aaee18c8195c // indirect
218221
github.com/tdakkota/asciicheck v0.2.0 // indirect
219222
github.com/tetafro/godot v1.4.11 // indirect
@@ -231,10 +234,10 @@ require (
231234
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
232235
go.uber.org/multierr v1.11.0 // indirect
233236
go.uber.org/zap v1.26.0 // indirect
234-
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
237+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
235238
golang.org/x/exp/typeparams v0.0.0-20230224173230-c95f2b4c22f2 // indirect
236239
golang.org/x/mod v0.14.0 // indirect
237-
golang.org/x/oauth2 v0.12.0 // indirect
240+
golang.org/x/oauth2 v0.14.0 // indirect
238241
golang.org/x/sync v0.5.0 // indirect
239242
golang.org/x/sys v0.16.0 // indirect
240243
golang.org/x/term v0.16.0 // indirect

0 commit comments

Comments
 (0)