Skip to content

Commit

Permalink
Merge pull request #52 from 3scale-ops/fix/cross-namespace-dashboard-…
Browse files Browse the repository at this point in the history
…import

fix/cross-namespace-dashboard-import
  • Loading branch information
3scale-robot authored May 9, 2024
2 parents 1b5a9fe + be7b4a7 commit 9f732cf
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# To re-generate a bundle for another specific version without changing the standard setup, you can:
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= 0.8.0
VERSION ?= 0.8.1

# CHANNELS define the bundle channels used in the bundle.
# Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ metadata:
operators.operatorframework.io/project_layout: ansible.sdk.operatorframework.io/v1
repository: https://github.com/3scale-ops/prometheus-exporter-operator
support: Red Hat, Inc.
name: prometheus-exporter-operator.v0.8.0
name: prometheus-exporter-operator.v0.8.1
namespace: placeholder
spec:
apiservicedefinitions: {}
Expand Down Expand Up @@ -125,7 +125,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.annotations['olm.targetNamespaces']
image: quay.io/3scale/prometheus-exporter-operator:v0.8.0
image: quay.io/3scale/prometheus-exporter-operator:v0.8.1
livenessProbe:
httpGet:
path: /healthz
Expand Down Expand Up @@ -310,4 +310,4 @@ spec:
provider:
name: Red Hat
url: https://www.redhat.com
version: 0.8.0
version: 0.8.1
2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ kind: Kustomization
images:
- name: controller
newName: quay.io/3scale/prometheus-exporter-operator
newTag: v0.8.0
newTag: v0.8.1
1 change: 1 addition & 0 deletions roles/prometheusexporter/templates/grafanadashboard.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ metadata:
{% endif %}
spec:
{% if grafana_dashboard_api_version == "v1beta1" %}
allowCrossNamespaceImport: true
instanceSelector:
matchLabels:
"{{ grafana_dashboard.label.key | default(grafana_dashboard_label_key) }}": "{{ grafana_dashboard.label.value | default(grafana_dashboard_label_value) }}"
Expand Down

0 comments on commit 9f732cf

Please sign in to comment.