From 9e681daf648e7bf12644c7a41fc929d98d714ea0 Mon Sep 17 00:00:00 2001 From: Jakub Hadvig Date: Thu, 2 Apr 2026 17:00:45 +0200 Subject: [PATCH] Updating openshift-enterprise-console-operator-container image to be consistent with ART for 4.12 --- .ci-operator.yaml | 2 +- Dockerfile.rhel7 | 2 +- go.mod | 2 +- pkg/console/assets/bindata.go | 12 +++++++----- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.ci-operator.yaml b/.ci-operator.yaml index a4eb6d9654..b14fb3fdf0 100644 --- a/.ci-operator.yaml +++ b/.ci-operator.yaml @@ -1,4 +1,4 @@ build_root_image: name: release namespace: openshift - tag: rhel-8-release-golang-1.18-openshift-4.12 + tag: rhel-8-release-golang-1.19-openshift-4.12 diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7 index bed42475c7..95b1bb0a4f 100644 --- a/Dockerfile.rhel7 +++ b/Dockerfile.rhel7 @@ -1,4 +1,4 @@ -FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder +FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.12 AS builder WORKDIR /go/src/github.com/openshift/console-operator COPY . . ENV GO_PACKAGE github.com/openshift/console-operator diff --git a/go.mod b/go.mod index 42b322ba34..c61581f78d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/openshift/console-operator -go 1.18 +go 1.19 require ( github.com/blang/semver v3.5.1+incompatible diff --git a/pkg/console/assets/bindata.go b/pkg/console/assets/bindata.go index c1081f10b0..5cc89aecaf 100644 --- a/pkg/console/assets/bindata.go +++ b/pkg/console/assets/bindata.go @@ -956,11 +956,13 @@ var _bindata = map[string]func() (*asset, error){ // directory embedded in the file by go-bindata. // For example if you run go-bindata on data/... and data contains the // following hierarchy: -// data/ -// foo.txt -// img/ -// a.png -// b.png +// +// data/ +// foo.txt +// img/ +// a.png +// b.png +// // then AssetDir("data") would return []string{"foo.txt", "img"} // AssetDir("data/img") would return []string{"a.png", "b.png"} // AssetDir("foo.txt") and AssetDir("notexist") would return an error