Skip to content

Commit 57078a8

Browse files
Merge pull request #854 from flavianmissi/bump-go
OCPBUGS-12132: Updating ose-cluster-image-registry-operator images to be consistent with ART
2 parents 84ab4a5 + 7bfc0f7 commit 57078a8

File tree

4 files changed

+3
-6
lines changed

4 files changed

+3
-6
lines changed

.ci-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: rhel-8-release-golang-1.19-openshift-4.14
4+
tag: rhel-8-release-golang-1.20-openshift-4.14

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-8-golang-1.19-openshift-4.14 AS builder
1+
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14 AS builder
22
WORKDIR /go/src/github.com/openshift/cluster-image-registry-operator
33
COPY . .
44
RUN make build

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ PROG := cluster-image-registry-operator
44

55
GOLANGCI_LINT = _output/tools/golangci-lint
66
GOLANGCI_LINT_CACHE = $(PWD)/_output/golangci-lint-cache
7-
GOLANGCI_LINT_VERSION = v1.50.1
7+
GOLANGCI_LINT_VERSION = v1.51.0
88

99
GO_REQUIRED_MIN_VERSION = 1.16
1010

cmd/cluster-image-registry-operator/main.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,8 @@ import (
44
"context"
55
"flag"
66
"log"
7-
"math/rand"
87
"os"
98
"runtime"
10-
"time"
119

1210
"github.com/spf13/cobra"
1311

@@ -63,7 +61,6 @@ func main() {
6361
func(ctx context.Context, cctx *controllercmd.ControllerContext) error {
6462
printVersion()
6563
klog.Infof("Watching files %v...", filesToWatch)
66-
rand.Seed(time.Now().UnixNano())
6764
go metrics.RunServer(metricsPort)
6865
return operator.RunOperator(ctx, cctx.KubeConfig)
6966
},

0 commit comments

Comments
 (0)