Merge pull request #952 from yanirq/4_12

openshift-merge-robot · web-flow · commit 122dd66ad6b1 · 2022-11-03T08:35:50.000-04:00
move master to point to 4.12
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 IMAGE_BUILD_CMD ?= "docker"
 IMAGE_REGISTRY ?= "quay.io"
 REGISTRY_NAMESPACE ?= "openshift-kni"
-IMAGE_TAG ?= "4.11-snapshot"
+IMAGE_TAG ?= "4.12-snapshot"
 
 TARGET_GOOS=linux
 TARGET_GOARCH=amd64
diff --git a/must-gather/README.md b/must-gather/README.md
@@ -7,7 +7,7 @@ In addition to the performance-operator logs and manifests, the command will col
 This information is useful to understand and verify resource allocation to pods, whose proper alignment is critical for low-latency workloads.
 
 To collect the container-native performance-related data with must-gather, you must specify the extra image using the `--image` option.
-In the following examples, `TAG` has the format `major.minor-snapshot`. For example, the TAG for OpenShift 4.11 will be `4.11-snapshot`.
+In the following examples, `TAG` has the format `major.minor-snapshot`. For example, the TAG for OpenShift 4.12 will be `4.12-snapshot`.
 
 Example command line:
 ```bash
diff --git a/openshift-ci/Dockerfile.must-gather b/openshift-ci/Dockerfile.must-gather
@@ -1,4 +1,4 @@
-FROM quay.io/openshift/origin-must-gather:4.10.0 AS builder
+FROM quay.io/openshift/origin-must-gather:4.12.0 AS builder
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:latest
 RUN microdnf install -y pciutils util-linux hostname rsync tar ethtool

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM quay.io/openshift/origin-must-gather:4.10.0 AS builder`
	`1`	`+FROM quay.io/openshift/origin-must-gather:4.12.0 AS builder`
`2`	`2`
`3`	`3`	`FROM registry.access.redhat.com/ubi8/ubi-minimal:latest`
`4`	`4`	`RUN microdnf install -y pciutils util-linux hostname rsync tar ethtool`