Skip to content

Commit

Permalink
Merge pull request #2199 from jan--f/go.mod-1.20
Browse files Browse the repository at this point in the history
OCPBUGS-24977: use 1.20 in go.mod
  • Loading branch information
openshift-merge-bot[bot] authored Dec 14, 2023
2 parents b31a3b4 + cb93a46 commit 0e876ff
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 79 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.21-openshift-4.16
tag: rhel-9-release-golang-1.20-openshift-4.16
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BIN_DIR ?= $(shell pwd)/tmp/bin
# Docgen related variables
TYPES_TARGET=pkg/manifests/types.go
K8S_VERSION=$(shell echo -n v1. && cat go.mod | grep -w "k8s.io/api" | awk '{ print $$2 }' | cut -d "." -f 2)
PO_VERSION=$(shell cat go.mod | grep -w "github.com/prometheus-operator/prometheus-operator" | awk '{ print $$2 }' | sort -u)
PO_VERSION=$(shell cat go.mod | grep "github.com/prometheus-operator/prometheus-operator[^=>]\+$$" | awk '{ print $$2 }' | sort -u)

EMBEDMD_BIN=$(BIN_DIR)/embedmd
JB_BIN=$(BIN_DIR)/jb
Expand Down
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/openshift/cluster-monitoring-operator

go 1.21
go 1.20

require (
github.com/Jeffail/gabs v1.4.0
Expand Down Expand Up @@ -158,3 +158,5 @@ require (
)

replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230928195430-ce36a0c3bb67

replace github.com/prometheus-operator/prometheus-operator v0.70.0 => github.com/openshift/prometheus-operator v0.20.1-0.20231211152750-5bf04f3ca997
Loading

0 comments on commit 0e876ff

Please sign in to comment.