Skip to content

Commit da150a1

Browse files
committed
UPSTREAM: <carry>: Update catalogs for 4.23/5.0
Set catalog image tags to v5.0 for the 4.23/5.0 release.
1 parent c51658f commit da150a1

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

openshift/catalogd/manifests-experimental.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,7 +1005,7 @@ spec:
10051005
type: Image
10061006
image:
10071007
pollIntervalMinutes: 10
1008-
ref: registry.redhat.io/redhat/certified-operator-index:v4.22
1008+
ref: registry.redhat.io/redhat/certified-operator-index:v5.0
10091009
---
10101010
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-community-operators.yml
10111011
apiVersion: olm.operatorframework.io/v1
@@ -1018,7 +1018,7 @@ spec:
10181018
type: Image
10191019
image:
10201020
pollIntervalMinutes: 10
1021-
ref: registry.redhat.io/redhat/community-operator-index:v4.22
1021+
ref: registry.redhat.io/redhat/community-operator-index:v5.0
10221022
---
10231023
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml
10241024
apiVersion: olm.operatorframework.io/v1
@@ -1031,7 +1031,7 @@ spec:
10311031
type: Image
10321032
image:
10331033
pollIntervalMinutes: 10
1034-
ref: registry.redhat.io/redhat/redhat-operator-index:v4.22
1034+
ref: registry.redhat.io/redhat/redhat-operator-index:v5.0
10351035
---
10361036
# Source: olmv1/templates/mutatingwebhookconfiguration-catalogd-mutating-webhook-configuration.yml
10371037
apiVersion: admissionregistration.k8s.io/v1

openshift/catalogd/manifests.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,7 +1004,7 @@ spec:
10041004
type: Image
10051005
image:
10061006
pollIntervalMinutes: 10
1007-
ref: registry.redhat.io/redhat/certified-operator-index:v4.22
1007+
ref: registry.redhat.io/redhat/certified-operator-index:v5.0
10081008
---
10091009
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-community-operators.yml
10101010
apiVersion: olm.operatorframework.io/v1
@@ -1017,7 +1017,7 @@ spec:
10171017
type: Image
10181018
image:
10191019
pollIntervalMinutes: 10
1020-
ref: registry.redhat.io/redhat/community-operator-index:v4.22
1020+
ref: registry.redhat.io/redhat/community-operator-index:v5.0
10211021
---
10221022
# Source: olmv1/templates/openshift-catalogs/clustercatalog-openshift-redhat-operators.yml
10231023
apiVersion: olm.operatorframework.io/v1
@@ -1030,7 +1030,7 @@ spec:
10301030
type: Image
10311031
image:
10321032
pollIntervalMinutes: 10
1033-
ref: registry.redhat.io/redhat/redhat-operator-index:v4.22
1033+
ref: registry.redhat.io/redhat/redhat-operator-index:v5.0
10341034
---
10351035
# Source: olmv1/templates/mutatingwebhookconfiguration-catalogd-mutating-webhook-configuration.yml
10361036
apiVersion: admissionregistration.k8s.io/v1

openshift/default-catalog-consistency/test/validate/suite_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ var _ = Describe("OLM-Catalog-Validation", func() {
3131

3232
sysCtx := &types.SystemContext{}
3333
if authPath != "" {
34-
fmt.Println("Using registry auth file:", authPath)
34+
fmt.Fprintf(os.Stderr, "Using registry auth file\n")
3535
sysCtx.AuthFilePath = authPath
3636
}
3737

openshift/helm/catalogd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ options:
1616
openshift:
1717
enabled: true
1818
catalogs:
19-
version: v4.22
19+
version: v5.0
2020

2121
# The set of namespaces
2222
namespaces:

0 commit comments

Comments
 (0)