Skip to content

Commit 0328357

Browse files
NO-ISSUE: bumping to to 1.25 in the backplane-2.6 branch
1 parent 0f39e4b commit 0328357

5 files changed

Lines changed: 8 additions & 7 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 as builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.21 as builder
22
ARG TARGETOS
33
ARG TARGETARCH
44

Dockerfile.konflux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.24 as builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:v1.25 as builder
22
ARG TARGETOS
33
ARG TARGETARCH
44

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ else
6060
GOBIN=$(shell go env GOBIN)
6161
endif
6262

63+
TEST ?= $(shell go list -f '{{if or .TestGoFiles .XTestGoFiles}}{{.ImportPath}}{{end}}' ./...)
6364
# Setting SHELL to bash allows bash commands to be executed by recipes.
6465
# Options are set to exit when a recipe line exits non-zero or a piped command fails.
6566
SHELL = /usr/bin/env bash -o pipefail
@@ -105,7 +106,7 @@ vet: ## Run go vet against code.
105106

106107
.PHONY: test
107108
test: manifests generate fmt vet ## Run tests.
108-
go test ./... -coverprofile cover.out
109+
go test $(TEST) -coverprofile cover.out
109110

110111
.PHONY: deploy-integration-test
111112
deploy-integration-test:
@@ -175,7 +176,7 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
175176

176177
## Tool Versions
177178
KUSTOMIZE_VERSION ?= v5.4.3
178-
CONTROLLER_TOOLS_VERSION ?= v0.16.2
179+
CONTROLLER_TOOLS_VERSION ?= v0.17.0
179180

180181
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
181182
.PHONY: kustomize

config/crd/bases/extensions.hive.openshift.io_imageclusterinstalls.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.16.2
6+
controller-gen.kubebuilder.io/version: v0.17.0
77
name: imageclusterinstalls.extensions.hive.openshift.io
88
spec:
99
group: extensions.hive.openshift.io

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/openshift/image-based-install-operator
22

3-
go 1.22
3+
go 1.25.0
44

5-
toolchain go1.22.5
5+
toolchain go1.25.5
66

77
require (
88
github.com/containers/image/v5 v5.29.0

0 commit comments

Comments
 (0)