From f00ebaf75ee8ec6e3c3805c7357032902d04c2f3 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 4 Mar 2021 09:51:00 +0200 Subject: [PATCH 01/18] chore(route-monitor-operator): add console monitor --- .../100-rmo.RouteMonitor.yaml | 10 ++++++++++ deploy/osd-route-monitor-operator/OWNERS | 0 2 files changed, 10 insertions(+) create mode 100644 deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml create mode 100644 deploy/osd-route-monitor-operator/OWNERS diff --git a/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml new file mode 100644 index 0000000000..08d503a5df --- /dev/null +++ b/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml @@ -0,0 +1,10 @@ +apiVersion: monitoring.openshift.io/v1alpha1 +kind: RouteMonitor +metadata: + name: routemonitor-sample +spec: + route: + name: console + namespace: openshift-console + slo: + targetAvailabilityPercent: "99.5" diff --git a/deploy/osd-route-monitor-operator/OWNERS b/deploy/osd-route-monitor-operator/OWNERS new file mode 100644 index 0000000000..e69de29bb2 From fb344adf21ec1cc8d3a3d3f35d77666226332420 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 4 Mar 2021 07:52:13 +0000 Subject: [PATCH 02/18] on push: make --- ...naged-cluster-config-integration.yaml.tmpl | 24 +++++++++++++++++++ ...anaged-cluster-config-production.yaml.tmpl | 24 +++++++++++++++++++ ...osd-managed-cluster-config-stage.yaml.tmpl | 24 +++++++++++++++++++ 3 files changed, 72 insertions(+) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index c88c10b721..97b53433b6 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7298,6 +7298,30 @@ 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: routemonitor-sample + spec: + route: + name: console + namespace: openshift-console + slo: + targetAvailabilityPercent: '99.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index f636f1aa42..fb5873460b 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7298,6 +7298,30 @@ 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: routemonitor-sample + spec: + route: + name: console + namespace: openshift-console + slo: + targetAvailabilityPercent: '99.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index e253564dec..9d8a9d85c4 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7298,6 +7298,30 @@ 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: routemonitor-sample + spec: + route: + name: console + namespace: openshift-console + slo: + targetAvailabilityPercent: '99.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: From 0d603c23e08a4877533552ab273e4a6d6ac0ecdd Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 4 Mar 2021 10:16:15 +0200 Subject: [PATCH 03/18] Delete OWNERS --- deploy/osd-route-monitor-operator/OWNERS | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 deploy/osd-route-monitor-operator/OWNERS diff --git a/deploy/osd-route-monitor-operator/OWNERS b/deploy/osd-route-monitor-operator/OWNERS deleted file mode 100644 index e69de29bb2..0000000000 From 5858304c9ce4bb8d805750f36e32e733c57306ef Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 4 Mar 2021 19:05:33 +0200 Subject: [PATCH 04/18] Update deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml Co-authored-by: Rick Rackow --- deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml index 08d503a5df..0f88cfcf60 100644 --- a/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml +++ b/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml @@ -1,7 +1,7 @@ apiVersion: monitoring.openshift.io/v1alpha1 kind: RouteMonitor metadata: - name: routemonitor-sample + name: console spec: route: name: console From 262cfee54b6694ae6a2e28271550ebb748f0b470 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 4 Mar 2021 17:06:48 +0000 Subject: [PATCH 05/18] on push: make --- hack/00-osd-managed-cluster-config-integration.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-production.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-stage.yaml.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 97b53433b6..70cd280f2f 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7315,7 +7315,7 @@ objects: - apiVersion: monitoring.openshift.io/v1alpha1 kind: RouteMonitor metadata: - name: routemonitor-sample + name: console spec: route: name: console diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index fb5873460b..7c48ef00fd 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7315,7 +7315,7 @@ objects: - apiVersion: monitoring.openshift.io/v1alpha1 kind: RouteMonitor metadata: - name: routemonitor-sample + name: console spec: route: name: console diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 9d8a9d85c4..4a2f644037 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7315,7 +7315,7 @@ objects: - apiVersion: monitoring.openshift.io/v1alpha1 kind: RouteMonitor metadata: - name: routemonitor-sample + name: console spec: route: name: console From 0ecd01db6823cd04996316c56f43fb83305522ba Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Sun, 7 Mar 2021 17:24:30 +0200 Subject: [PATCH 06/18] docs: add discalimer on names --- deploy/osd-route-monitor-operator/README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 deploy/osd-route-monitor-operator/README.md diff --git a/deploy/osd-route-monitor-operator/README.md b/deploy/osd-route-monitor-operator/README.md new file mode 100644 index 0000000000..fd93ec77c9 --- /dev/null +++ b/deploy/osd-route-monitor-operator/README.md @@ -0,0 +1,2 @@ +# Caveat +the alert name will be comprised from the RouteMonitor/ClusterUrlMonitor name, so be careful when renaming || Adding From 373936eaacbc1b1e67fba89261fe50c9692cb97e Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Mon, 15 Mar 2021 15:29:20 +0200 Subject: [PATCH 07/18] fix(rmo): add namespace - change file format - add file schema in README.md --- ...enshift-console.console.RouteMonitor.yaml} | 1 + deploy/osd-route-monitor-operator/README.md | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) rename deploy/osd-route-monitor-operator/{100-rmo.RouteMonitor.yaml => 100-openshift-console.console.RouteMonitor.yaml} (86%) diff --git a/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml similarity index 86% rename from deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml rename to deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml index 0f88cfcf60..073306fac9 100644 --- a/deploy/osd-route-monitor-operator/100-rmo.RouteMonitor.yaml +++ b/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml @@ -2,6 +2,7 @@ apiVersion: monitoring.openshift.io/v1alpha1 kind: RouteMonitor metadata: name: console + namespace: openshift-console spec: route: name: console diff --git a/deploy/osd-route-monitor-operator/README.md b/deploy/osd-route-monitor-operator/README.md index fd93ec77c9..fae6436fd6 100644 --- a/deploy/osd-route-monitor-operator/README.md +++ b/deploy/osd-route-monitor-operator/README.md @@ -1,2 +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 From 9f1e629252cea3e83a4c1fdb559219e0e42697c0 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Mon, 15 Mar 2021 13:30:36 +0000 Subject: [PATCH 08/18] on push: make --- hack/00-osd-managed-cluster-config-integration.yaml.tmpl | 1 + hack/00-osd-managed-cluster-config-production.yaml.tmpl | 1 + hack/00-osd-managed-cluster-config-stage.yaml.tmpl | 1 + 3 files changed, 3 insertions(+) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 70cd280f2f..79f4487b41 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7316,6 +7316,7 @@ objects: kind: RouteMonitor metadata: name: console + namespace: openshift-console spec: route: name: console diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index 7c48ef00fd..ab09b8ce41 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7316,6 +7316,7 @@ objects: kind: RouteMonitor metadata: name: console + namespace: openshift-console spec: route: name: console diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 4a2f644037..e8dba302fe 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7316,6 +7316,7 @@ objects: kind: RouteMonitor metadata: name: console + namespace: openshift-console spec: route: name: console From fd697a66154337008797596b75d6fcd126a3f7eb Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Wed, 17 Mar 2021 17:19:04 +0200 Subject: [PATCH 09/18] Update 100-openshift-console.console.RouteMonitor.yaml --- .../100-openshift-console.console.RouteMonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml index 073306fac9..ab79f3a3b4 100644 --- a/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml +++ b/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml @@ -2,7 +2,7 @@ apiVersion: monitoring.openshift.io/v1alpha1 kind: RouteMonitor metadata: name: console - namespace: openshift-console + namespace: openshift-route-monitor-operator spec: route: name: console From 4c0e06fe7d47cd44c3cba95a58e80e73ed5bac04 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Wed, 17 Mar 2021 15:20:12 +0000 Subject: [PATCH 10/18] on push: make --- hack/00-osd-managed-cluster-config-integration.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-production.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-stage.yaml.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 79f4487b41..27476ffbec 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7316,7 +7316,7 @@ objects: kind: RouteMonitor metadata: name: console - namespace: openshift-console + namespace: openshift-route-monitor-operator spec: route: name: console diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index ab09b8ce41..af6b590a53 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7316,7 +7316,7 @@ objects: kind: RouteMonitor metadata: name: console - namespace: openshift-console + namespace: openshift-route-monitor-operator spec: route: name: console diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index e8dba302fe..9650af5038 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7316,7 +7316,7 @@ objects: kind: RouteMonitor metadata: name: console - namespace: openshift-console + namespace: openshift-route-monitor-operator spec: route: name: console From 88258c66ace639ad13c8877fffcc02e597655184 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Wed, 17 Mar 2021 17:20:52 +0200 Subject: [PATCH 11/18] rename file --- ...00-openshift-route-monitor-operator.console.RouteMonitor.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename deploy/osd-route-monitor-operator/{100-openshift-console.console.RouteMonitor.yaml => 100-openshift-route-monitor-operator.console.RouteMonitor.yaml} (100%) diff --git a/deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml similarity index 100% rename from deploy/osd-route-monitor-operator/100-openshift-console.console.RouteMonitor.yaml rename to deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml From d654b2832f9e0fc1ef230ca524269f856532d8a8 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 18 Mar 2021 16:30:02 +0200 Subject: [PATCH 12/18] Update 100-openshift-route-monitor-operator.console.RouteMonitor.yaml --- ...0-openshift-route-monitor-operator.console.RouteMonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml index ab79f3a3b4..c24c6d7f2b 100644 --- a/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml +++ b/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml @@ -8,4 +8,4 @@ spec: name: console namespace: openshift-console slo: - targetAvailabilityPercent: "99.5" + targetAvailabilityPercent: "99.95" From 3f788cf3dfc66f7f20578d82941195d1ce5ad544 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Thu, 18 Mar 2021 14:31:23 +0000 Subject: [PATCH 13/18] on push: make --- hack/00-osd-managed-cluster-config-integration.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-production.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-stage.yaml.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 27476ffbec..a4e4fe57ef 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7322,7 +7322,7 @@ objects: name: console namespace: openshift-console slo: - targetAvailabilityPercent: '99.5' + targetAvailabilityPercent: '99.95' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index af6b590a53..e5f19a95c3 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7322,7 +7322,7 @@ objects: name: console namespace: openshift-console slo: - targetAvailabilityPercent: '99.5' + targetAvailabilityPercent: '99.95' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 9650af5038..b00cc1169a 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7322,7 +7322,7 @@ objects: name: console namespace: openshift-console slo: - targetAvailabilityPercent: '99.5' + targetAvailabilityPercent: '99.95' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: From 5c7ab5a26132211d00a33acdf13471e9c8e111ee Mon Sep 17 00:00:00 2001 From: Manuel Dewald Date: Tue, 23 Mar 2021 09:23:20 +0100 Subject: [PATCH 14/18] Update 100-openshift-route-monitor-operator.console.RouteMonitor.yaml --- ...0-openshift-route-monitor-operator.console.RouteMonitor.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml b/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml index c24c6d7f2b..ab79f3a3b4 100644 --- a/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml +++ b/deploy/osd-route-monitor-operator/100-openshift-route-monitor-operator.console.RouteMonitor.yaml @@ -8,4 +8,4 @@ spec: name: console namespace: openshift-console slo: - targetAvailabilityPercent: "99.95" + targetAvailabilityPercent: "99.5" From d9913864ac535d13c271db1f4c0e7cf23470b3a7 Mon Sep 17 00:00:00 2001 From: Manuel Dewald Date: Tue, 23 Mar 2021 08:24:36 +0000 Subject: [PATCH 15/18] on push: make --- hack/00-osd-managed-cluster-config-integration.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-production.yaml.tmpl | 2 +- hack/00-osd-managed-cluster-config-stage.yaml.tmpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index a4e4fe57ef..27476ffbec 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7322,7 +7322,7 @@ objects: name: console namespace: openshift-console slo: - targetAvailabilityPercent: '99.95' + targetAvailabilityPercent: '99.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index e5f19a95c3..af6b590a53 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7322,7 +7322,7 @@ objects: name: console namespace: openshift-console slo: - targetAvailabilityPercent: '99.95' + targetAvailabilityPercent: '99.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index b00cc1169a..9650af5038 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7322,7 +7322,7 @@ objects: name: console namespace: openshift-console slo: - targetAvailabilityPercent: '99.95' + targetAvailabilityPercent: '99.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: From 4437a875543a949b7c8ba05957736a6f791682f1 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Wed, 7 Apr 2021 16:50:41 +0300 Subject: [PATCH 16/18] Create config.yaml --- deploy/osd-route-monitor-operator/config.yaml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 deploy/osd-route-monitor-operator/config.yaml diff --git a/deploy/osd-route-monitor-operator/config.yaml b/deploy/osd-route-monitor-operator/config.yaml new file mode 100644 index 0000000000..83246d4f47 --- /dev/null +++ b/deploy/osd-route-monitor-operator/config.yaml @@ -0,0 +1,3 @@ +deploymentMode: "Direct" +direct: + environments: ["integration", "stage"] From 9594eb03b9fa92ee4a21081585e26ed374728956 Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Wed, 7 Apr 2021 13:51:55 +0000 Subject: [PATCH 17/18] on push: make --- ...naged-cluster-config-integration.yaml.tmpl | 36 ++++++------------- ...anaged-cluster-config-production.yaml.tmpl | 25 ------------- ...osd-managed-cluster-config-stage.yaml.tmpl | 36 ++++++------------- 3 files changed, 22 insertions(+), 75 deletions(-) diff --git a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl index 27476ffbec..19948b9d4c 100644 --- a/hack/00-osd-managed-cluster-config-integration.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-integration.yaml.tmpl @@ -7298,31 +7298,6 @@ 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.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: @@ -10577,3 +10552,14 @@ objects: metadata: name: hive-environment namespace: openshift-config +- 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.5' diff --git a/hack/00-osd-managed-cluster-config-production.yaml.tmpl b/hack/00-osd-managed-cluster-config-production.yaml.tmpl index af6b590a53..f636f1aa42 100644 --- a/hack/00-osd-managed-cluster-config-production.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-production.yaml.tmpl @@ -7298,31 +7298,6 @@ 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.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: diff --git a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl index 9650af5038..cb9f7e2882 100644 --- a/hack/00-osd-managed-cluster-config-stage.yaml.tmpl +++ b/hack/00-osd-managed-cluster-config-stage.yaml.tmpl @@ -7298,31 +7298,6 @@ 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.5' - apiVersion: hive.openshift.io/v1 kind: SelectorSyncSet metadata: @@ -10577,3 +10552,14 @@ objects: metadata: name: hive-environment namespace: openshift-config +- 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.5' From fe0d22ae1b58a687392aa1decfcc3358dc5524fe Mon Sep 17 00:00:00 2001 From: Ron Green <11993626+georgettica@users.noreply.github.com> Date: Wed, 7 Apr 2021 18:26:00 +0300 Subject: [PATCH 18/18] Create OWNERS --- deploy/osd-route-monitor-operator/OWNERS | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 deploy/osd-route-monitor-operator/OWNERS diff --git a/deploy/osd-route-monitor-operator/OWNERS b/deploy/osd-route-monitor-operator/OWNERS new file mode 100644 index 0000000000..e8c63777cb --- /dev/null +++ b/deploy/osd-route-monitor-operator/OWNERS @@ -0,0 +1,3 @@ +reviewers: +- georgettica +- RiRa12621