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

Jump to bottom

CNF-12007: d/s: CSV adjustment for sriov-network-metrics-exporter #951

Closed
wants to merge 1 commit into from
Closed

CNF-12007: d/s: CSV adjustment for sriov-network-metrics-exporter #951

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
18 changes: 17 additions & 1 deletion bundle/manifests/sriov-network-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ metadata:
categories: Networking
certified: "false"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.17
createdAt: "2024-07-17T16:58:50Z"
createdAt: "2024-07-29T07:35:08Z"
description: An operator for configuring SR-IOV components and initializing SRIOV
network devices in Openshift cluster.
features.operators.openshift.io/cnf: "false"
Expand All @@ -114,6 +114,7 @@ metadata:
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.3.0-0 <4.17.0'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/initialization-resource: |-
{
"apiVersion": "sriovnetwork.openshift.io/v1",
Expand Down Expand Up @@ -394,6 +395,20 @@ spec:
value: operator-webhook-service
- name: ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_SECRET_NAME
value: network-resources-injector-secret
- name: METRICS_EXPORTER_IMAGE
value: quay.io/openshift/origin-sriov-network-metrics-exporter:4.17
- name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
value: quay.io/openshift/origin-kube-rbac-proxy:4.17
- name: METRICS_EXPORTER_SECRET_NAME
value: metrics-exporter-cert
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED
value: "true"
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_NAMESPACE
value: openshift-monitoring
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_SERVICE_ACCOUNT
value: prometheus-k8s
- name: METRICS_EXPORTER_PORT
value: "9110"
- name: NAMESPACE
valueFrom:
fieldRef:
Expand Down Expand Up @@ -541,6 +556,7 @@ spec:
- monitoring.coreos.com
resources:
- servicemonitors
- prometheusrules
verbs:
- get
- create
Expand Down
14 changes: 14 additions & 0 deletions config/manager/manager.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,20 @@ spec:
value: operator-webhook-service
- name: ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_SECRET_NAME
value: network-resources-injector-secret
- name: METRICS_EXPORTER_IMAGE
value: quay.io/openshift/origin-sriov-network-metrics-exporter:4.17
- name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
value: quay.io/openshift/origin-kube-rbac-proxy:4.17
- name: METRICS_EXPORTER_SECRET_NAME
value: metrics-exporter-cert
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED
value: "true"
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_NAMESPACE
value: openshift-monitoring
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_SERVICE_ACCOUNT
value: prometheus-k8s
- name: METRICS_EXPORTER_PORT
value: "9110"
- name: NAMESPACE
valueFrom:
fieldRef:
Expand Down
1 change: 1 addition & 0 deletions config/manifests/bases/sriov-network-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ metadata:
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.3.0-0 <4.17.0'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/initialization-resource: |-
{
"apiVersion": "sriovnetwork.openshift.io/v1",
Expand Down
1 change: 1 addition & 0 deletions config/rbac/role.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ rules:
- monitoring.coreos.com
resources:
- servicemonitors
- prometheusrules
verbs:
- get
- create
Expand Down
9 changes: 9 additions & 0 deletions manifests/stable/image-references
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,12 @@ spec:
from:
kind: DockerImage
name: quay.io/openshift/origin-rdma-cni:4.17
- name: sriov-network-metrics-exporter
from:
kind: DockerImage
name: quay.io/openshift/origin-sriov-network-metrics-exporter:4.17
- name: kube-rbac-proxy
from:
kind: DockerImage
name: quay.io/openshift/origin-kube-rbac-proxy:4.17

18 changes: 17 additions & 1 deletion manifests/stable/sriov-network-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ metadata:
categories: Networking
certified: "false"
containerImage: quay.io/openshift/origin-sriov-network-operator:4.17
createdAt: "2024-07-17T16:58:50Z"
createdAt: "2024-07-29T07:35:08Z"
description: An operator for configuring SR-IOV components and initializing SRIOV
network devices in Openshift cluster.
features.operators.openshift.io/cnf: "false"
Expand All @@ -114,6 +114,7 @@ metadata:
features.operators.openshift.io/token-auth-azure: "false"
features.operators.openshift.io/token-auth-gcp: "false"
olm.skipRange: '>=4.3.0-0 <4.17.0'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/initialization-resource: |-
{
"apiVersion": "sriovnetwork.openshift.io/v1",
Expand Down Expand Up @@ -394,6 +395,20 @@ spec:
value: operator-webhook-service
- name: ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_SECRET_NAME
value: network-resources-injector-secret
- name: METRICS_EXPORTER_IMAGE
value: quay.io/openshift/origin-sriov-network-metrics-exporter:4.17
- name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
value: quay.io/openshift/origin-kube-rbac-proxy:4.17
- name: METRICS_EXPORTER_SECRET_NAME
value: metrics-exporter-cert
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED
value: "true"
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_NAMESPACE
value: openshift-monitoring
- name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_SERVICE_ACCOUNT
value: prometheus-k8s
- name: METRICS_EXPORTER_PORT
value: "9110"
- name: NAMESPACE
valueFrom:
fieldRef:
Expand Down Expand Up @@ -541,6 +556,7 @@ spec:
- monitoring.coreos.com
resources:
- servicemonitors
- prometheusrules
verbs:
- get
- create
Expand Down