upstream sync, vendor updates

Signed-off-by: Himanshu Roy <hroy@redhat.com>

Makefile

@@ -24,7 +24,7 @@ CRD_OPTIONS ?= "crd:allowDangerousTypes=true,crdVersions=v1"
 KUSTOMIZE = tools/bin/kustomize
 CONTROLLER_GEN = tools/bin/controller-gen
 GINKGO = tools/bin/ginkgo
-GINKGO_VER = v2.13.2
+GINKGO_VER = v2.17.1
 
 # See pkg/version.go for details
 SOURCE_GIT_COMMIT ?= $(shell git rev-parse --short HEAD)

PROJECT

@@ -79,4 +79,13 @@ resources:
   kind: DataImage
   path: github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1
   version: v1alpha1
+- api:
+    crdVersion: v1
+    namespaced: true
+  controller: true
+  domain: metal3.io
+  group: metal3.io
+  kind: DataImage
+  path: github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1
+  version: v1alpha1
 version: "3"

README.md

@@ -2,8 +2,8 @@
 
 [![CLOMonitor](https://img.shields.io/endpoint?url=https://clomonitor.io/api/projects/cncf/metal3-io/badge)](https://clomonitor.io/projects/cncf/metal3-io)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/metal3-io/baremetal-operator/badge)](https://securityscorecards.dev/viewer/?uri=github.com/metal3-io/baremetal-operator)
-[![Ubuntu daily main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_main_integration_test_ubuntu&subject=Ubuntu%20daily%20main)](https://jenkins.nordix.org/view/Metal3/job/metal3_daily_main_integration_test_ubuntu/)
-[![CentOS daily main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3_daily_main_integration_test_centos&subject=CentOS%20daily%20main)](https://jenkins.nordix.org/view/Metal3/job/metal3_daily_main_integration_test_centos/)
+[![Ubuntu daily main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-ubuntu-e2e-integration-test-main&subject=Ubuntu%20daily%20main)](https://jenkins.nordix.org/view/Metal3/job/metal3-periodic-ubuntu-e2e-integration-test-main/)
+[![CentOS daily main build status](https://jenkins.nordix.org/buildStatus/icon?job=metal3-periodic-centos-e2e-integration-test-main&subject=CentOS%20daily%20main)](https://jenkins.nordix.org/view/Metal3/job/metal3-periodic-centos-e2e-integration-test-main/)
 [![BMO e2e periodic main](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-bmo-e2e-test-periodic/badge/icon?subject=BMO%20e2e%20periodic%20main)](https://jenkins.nordix.org/view/Metal3%20Periodic/job/metal3-bmo-e2e-test-periodic/)
 
 The Bare Metal Operator implements a Kubernetes API for managing bare metal
@@ -51,31 +51,37 @@ For more details on the e2e tests, see [test/e2e/README.md](test/e2e/README.md).
 
 **Main branch:**
 
-- **/test-centos-e2e-integration-main** runs CAPM3 e2e integration tests with
-  CAPM3 main branch and BMO **main** branch on Centos
-- **/test-ubuntu-integration-main** runs ansible integration tests with CAPM3
-  main branch and BMO **main** branch on Ubuntu
+- **/test metal3-centos-e2e-integration-test-main** runs CAPM3 e2e integration
+  tests with CAPM3 main branch and BMO **main** branch on Centos
+- **/test metal3-ubuntu-e2e-integration-test-main** runs ansible integration
+  tests with CAPM3 main branch and BMO **main** branch on Ubuntu
 
-**Release-0.5 branch:**
+**Release-0.6 branch:**
 
-- **/test-centos-e2e-integration-release-1-6** runs CAPM3 e2e integration tests
-  with CAPM3 release-1.6 branch and BMO **release-0.5** branch on Centos
-- **/test-ubuntu-integration-release-1-6** runs ansible integration tests with
-  CAPM3 release-1.6 branch and BMO **release-0.5** branch on Ubuntu
+- **/test metal3-centos-e2e-integration-test-release-1-7** runs CAPM3 e2e
+  integration tests with CAPM3 release-1.7 branch and BMO **release-0.6**
+  branch on Centos
+- **/test metal3-ubuntu-e2e-integration-test-release-1-7** runs ansible
+  integration tests with CAPM3 release-1.7 branch and BMO **release-0.6**
+  branch on Ubuntu
 
-**Release-0.4 branch:**
+**Release-0.5 branch:**
 
-- **/test-centos-e2e-integration-release-1-5** runs CAPM3 e2e integration tests
-  with CAPM3 release-1.5 branch and BMO **release-0.4** branch on Centos
-- **/test-ubuntu-integration-release-1-5** runs ansible integration tests with
-  CAPM3 release-1.5 branch and BMO **release-0.4** branch on Ubuntu
+- **/test metal3-centos-e2e-integration-test-release-1-6** runs CAPM3 e2e
+  integration tests with CAPM3 release-1.6 branch and BMO **release-0.5**
+  branch on Centos
+- **/test metal3-ubuntu-e2e-integration-test-release-1-6** runs ansible
+  integration tests with CAPM3 release-1.6 branch and BMO **release-0.5**
+  branch on Ubuntu
 
-**Release-0.3 branch:**
+**Release-0.4 branch:**
 
-- **/test-centos-e2e-integration-release-1-4** runs CAPM3 e2e integration tests
-  with CAPM3 release-1.4 branch and BMO **release-0.3** branch on Centos
-- **/test-ubuntu-integration-release-1-4** runs ansible integration tests with
-  CAPM3 release-1.4 branch and BMO **release-0.3** branch on Ubuntu
+- **/test metal3-centos-e2e-integration-test-release-1-5** runs CAPM3 e2e
+  integration tests with CAPM3 release-1.5 branch and BMO **release-0.4**
+  branch on Centos
+- **/test metal3-ubuntu-e2e-integration-test-release-1-5** runs ansible
+  integration tests with CAPM3 release-1.5 branch and BMO **release-0.4**
+  branch on Ubuntu
 
 ### Important Notes
 

apis/go.mod

@@ -4,41 +4,40 @@ go 1.21
 
 require (
 	github.com/google/uuid v1.6.0
-	github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.0
+	github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1
 	github.com/stretchr/testify v1.9.0
-	k8s.io/api v0.28.5
-	k8s.io/apimachinery v0.28.5
-	sigs.k8s.io/controller-runtime v0.16.3
+	k8s.io/api v0.29.3
+	k8s.io/apimachinery v0.29.3
+	sigs.k8s.io/controller-runtime v0.16.5
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-openapi/jsonpointer v0.19.6 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
-	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.16.0 // indirect
-	github.com/prometheus/client_model v0.4.0 // indirect
-	github.com/prometheus/common v0.44.0 // indirect
-	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/prometheus/client_golang v1.18.0 // indirect
+	github.com/prometheus/client_model v0.5.0 // indirect
+	github.com/prometheus/common v0.45.0 // indirect
+	github.com/prometheus/procfs v0.12.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.8.0 // indirect
+	golang.org/x/oauth2 v0.12.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
@@ -49,13 +48,13 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/client-go v0.28.3 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
+	k8s.io/client-go v0.29.2 // indirect
+	k8s.io/klog/v2 v2.110.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
-	sigs.k8s.io/yaml v1.3.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace github.com/metal3-io/baremetal-operator/pkg/hardwareutils => ./../pkg/hardwareutils