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.

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

Upgrade OpenStack 16.1 Service Telemetry Framework Demo to 1.1 version #3440

Merged
merged 9 commits into from
Feb 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 ansible/configs/osp-stf/files/amqsubscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
installPlanApproval: Automatic
name: amq7-cert-manager
source: redhat-operators
sourceNamespace: openshift-marketplace
sourceNamespace: openshift-marketplace
11 changes: 7 additions & 4 deletions ansible/configs/osp-stf/files/catalogsource.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: operatorhubio-operators
name: redhat-operators-stf
namespace: openshift-marketplace
spec:
displayName: Red Hat STF Operators
image: quay.io/redhat-operators-stf/stf-catalog:latest
publisher: Red Hat
sourceType: grpc
image: quay.io/operator-framework/upstream-community-operators:latest
displayName: OperatorHub.io Operators
publisher: OperatorHub.io
updateStrategy:
registryPoll:
interval: 30m
16 changes: 16 additions & 0 deletions ansible/configs/osp-stf/files/dashboardroute.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: route.openshift.io/v1
kind: Route
metadata:
name: dashboards
namespace: service-telemetry
spec:
port:
targetPort: 3000
tls:
insecureEdgeTerminationPolicy: Redirect
termination: edge
to:
kind: Service
name: grafana-service
weight: 100
wildcardPolicy: None
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ spec:
installPlanApproval: Automatic
name: elastic-cloud-eck
source: operatorhubio-operators
sourceNamespace: openshift-marketplace
sourceNamespace: openshift-marketplace
25 changes: 0 additions & 25 deletions ansible/configs/osp-stf/files/grafanaobject.yaml

This file was deleted.

1 change: 0 additions & 1 deletion ansible/configs/osp-stf/files/grafanasubscription.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,3 @@ spec:
name: grafana-operator
source: operatorhubio-operators
sourceNamespace: openshift-marketplace
startingCSV: grafana-operator.v3.2.0
10 changes: 10 additions & 0 deletions ansible/configs/osp-stf/files/operatorhubiocatalogsource.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
apiVersion: operators.coreos.com/v1alpha1
kind: CatalogSource
metadata:
name: operatorhubio-operators
namespace: openshift-marketplace
spec:
sourceType: grpc
image: quay.io/operator-framework/upstream-community-operators:latest
displayName: OperatorHub.io Operators
publisher: OperatorHub.io
Loading