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

chore(route-monitor-operator): add console monitor [OSD-5499] #736

Merged
merged 18 commits into from
Apr 7, 2021
Merged

chore(route-monitor-operator): add console monitor [OSD-5499] #736

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f00ebaf
chore(route-monitor-operator): add console monitor
georgettica Mar 4, 2021
fb344ad
on push: make
georgettica Mar 4, 2021
0d603c2
Delete OWNERS
georgettica Mar 4, 2021
5858304
Update deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml
georgettica Mar 4, 2021
262cfee
on push: make
georgettica Mar 4, 2021
0ecd01d
docs: add discalimer on names
georgettica Mar 7, 2021
373936e
fix(rmo): add namespace
georgettica Mar 15, 2021
9f1e629
on push: make
georgettica Mar 15, 2021
fd697a6
Update 100-openshift-console.console.RouteMonitor.yaml
georgettica Mar 17, 2021
4c0e06f
on push: make
georgettica Mar 17, 2021
88258c6
rename file
georgettica Mar 17, 2021
d654b28
Update 100-openshift-route-monitor-operator.console.RouteMonitor.yaml
georgettica Mar 18, 2021
3f788cf
on push: make
georgettica Mar 18, 2021
5c7ab5a
Update 100-openshift-route-monitor-operator.console.RouteMonitor.yaml
NautiluX Mar 23, 2021
d991386
on push: make
NautiluX Mar 23, 2021
4437a87
Create config.yaml
georgettica Apr 7, 2021
9594eb0
on push: make
georgettica Apr 7, 2021
fe0d22a
Create OWNERS
georgettica Apr 7, 2021
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
11 changes: 11 additions & 0 deletions ...osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: monitoring.openshift.io/v1alpha1
kind: RouteMonitor
metadata:
name: console
namespace: openshift-route-monitor-operator
spec:
route:
name: console
namespace: openshift-console
slo:
targetAvailabilityPercent: "99.95"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why now 99.95? According to the SLO doc it should be 99.5? Probably I miss some discussion here...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

turns out this was confused with the API server SLA. We'll change it back to 99.5.

22 changes: 22 additions & 0 deletions deploy/osd-route-monitor-operator/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# File Convention

the convention is:
```
${NUMBER}-${NS}.${NAME}.${TYPE}.yaml
```

## Number
a way to order the resources (if need be),
should be a 3 digit number just in case.

## Ns
the namespace the resource is created in

## Name
the name of the resource

## Type
the type of the resource

# Caveat
the alert name will be comprised from the RouteMonitor/ClusterUrlMonitor name, so be careful when renaming || Adding
25 changes: 25 additions & 0 deletions hack/00-osd-managed-cluster-config-integration.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7298,6 +7298,31 @@ objects:
name: cluster
patch: '{"spec":{"defaultRoute":true,"nodeSelector":{"node-role.kubernetes.io/infra":""},"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"}]}}'
patchType: merge
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-route-monitor-operator
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
resourceApplyMode: Sync
resources:
- apiVersion: monitoring.openshift.io/v1alpha1
kind: RouteMonitor
metadata:
name: console
namespace: openshift-route-monitor-operator
spec:
route:
name: console
namespace: openshift-console
slo:
targetAvailabilityPercent: '99.95'
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down
25 changes: 25 additions & 0 deletions hack/00-osd-managed-cluster-config-production.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7298,6 +7298,31 @@ objects:
name: cluster
patch: '{"spec":{"defaultRoute":true,"nodeSelector":{"node-role.kubernetes.io/infra":""},"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"}]}}'
patchType: merge
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-route-monitor-operator
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
resourceApplyMode: Sync
resources:
- apiVersion: monitoring.openshift.io/v1alpha1
kind: RouteMonitor
metadata:
name: console
namespace: openshift-route-monitor-operator
spec:
route:
name: console
namespace: openshift-console
slo:
targetAvailabilityPercent: '99.95'
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down
25 changes: 25 additions & 0 deletions hack/00-osd-managed-cluster-config-stage.yaml.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7298,6 +7298,31 @@ objects:
name: cluster
patch: '{"spec":{"defaultRoute":true,"nodeSelector":{"node-role.kubernetes.io/infra":""},"tolerations":[{"effect":"NoSchedule","key":"node-role.kubernetes.io/infra","operator":"Exists"}]}}'
patchType: merge
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
labels:
managed.openshift.io/gitHash: ${IMAGE_TAG}
managed.openshift.io/gitRepoName: ${REPO_NAME}
managed.openshift.io/osd: 'true'
name: osd-route-monitor-operator
spec:
clusterDeploymentSelector:
matchLabels:
api.openshift.com/managed: 'true'
resourceApplyMode: Sync
resources:
- apiVersion: monitoring.openshift.io/v1alpha1
kind: RouteMonitor
metadata:
name: console
namespace: openshift-route-monitor-operator
spec:
route:
name: console
namespace: openshift-console
slo:
targetAvailabilityPercent: '99.95'
- apiVersion: hive.openshift.io/v1
kind: SelectorSyncSet
metadata:
Expand Down