Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update prometheus operator from v4.10.0 to v4.15.0 #384

Closed
wants to merge 1 commit into from
Closed

Update prometheus operator from v4.10.0 to v4.15.0 #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundle/manifests/odf-operator-manager-config_v1_configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ data:
PROMETHEUS_SUBSCRIPTION_CHANNEL: beta
PROMETHEUS_SUBSCRIPTION_NAME: odf-prometheus-operator
PROMETHEUS_SUBSCRIPTION_PACKAGE: odf-prometheus-operator
PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.10.0
PROMETHEUS_SUBSCRIPTION_STARTINGCSV: odf-prometheus-operator.v4.15.0
ROOK_SUBSCRIPTION_CATALOGSOURCE: odf-catalogsource
ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE: openshift-marketplace
ROOK_SUBSCRIPTION_CHANNEL: alpha
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/odf-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ metadata:
categories: Storage
console.openshift.io/plugins: '["odf-console"]'
containerImage: quay.io/ocs-dev/odf-operator:latest
createdAt: "2024-03-22T02:45:54Z"
createdAt: "2024-03-25T08:19:27Z"
description: OpenShift Data Foundation provides a common control plane for storage
solutions on OpenShift Container Platform.
features.operators.openshift.io/token-auth-aws: "true"
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ dependencies:
- type: olm.package
value:
packageName: odf-prometheus-operator
version: "4.10.0"
version: "4.15.0"
2 changes: 1 addition & 1 deletion catalog/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,4 +84,4 @@ schema: olm.channel
package: odf-prometheus-operator
name: beta
entries:
- name: odf-prometheus-operator.v4.10.0
- name: odf-prometheus-operator.v4.15.0
2 changes: 1 addition & 1 deletion config/manager/manager.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ ROOK_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
PROMETHEUS_SUBSCRIPTION_NAME=odf-prometheus-operator
PROMETHEUS_SUBSCRIPTION_PACKAGE=odf-prometheus-operator
PROMETHEUS_SUBSCRIPTION_CHANNEL=beta
PROMETHEUS_SUBSCRIPTION_STARTINGCSV=odf-prometheus-operator.v4.10.0
PROMETHEUS_SUBSCRIPTION_STARTINGCSV=odf-prometheus-operator.v4.15.0
PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE=odf-catalogsource
PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE=openshift-marketplace
2 changes: 1 addition & 1 deletion controllers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ var (
"PROMETHEUS_SUBSCRIPTION_NAME": "odf-prometheus-operator",
"PROMETHEUS_SUBSCRIPTION_PACKAGE": "odf-prometheus-operator",
"PROMETHEUS_SUBSCRIPTION_CHANNEL": "beta",
"PROMETHEUS_SUBSCRIPTION_STARTINGCSV": "odf-prometheus-operator.v4.10.0",
"PROMETHEUS_SUBSCRIPTION_STARTINGCSV": "odf-prometheus-operator.v4.15.0",
"PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE": "odf-catalogsource",
"PROMETHEUS_SUBSCRIPTION_CATALOGSOURCE_NAMESPACE": "openshift-marketplace",
}
Expand Down
2 changes: 1 addition & 1 deletion hack/make-bundle-vars.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ ROOK_BUNDLE_IMG ?= $(ROOK_BUNDLE_IMG_LOCATION)/$(ROOK_BUNDLE_IMG_NAME):$(ROOK_BU
# To be changed when odf-prometheus-operator bundle exists
PROMETHEUS_BUNDLE_NAME ?= odf-prometheus-operator
PROMETHEUS_BUNDLE_IMG_NAME ?= $(PROMETHEUS_BUNDLE_NAME)-bundle
PROMETHEUS_BUNDLE_IMG_TAG ?= v4.10.0
PROMETHEUS_BUNDLE_IMG_TAG ?= v4.15.0
PROMETHEUS_BUNDLE_IMG_LOCATION ?= quay.io/ocs-dev
PROMETHEUS_BUNDLE_IMG ?= $(PROMETHEUS_BUNDLE_IMG_LOCATION)/$(PROMETHEUS_BUNDLE_IMG_NAME):$(PROMETHEUS_BUNDLE_IMG_TAG)

Expand Down
Loading