Skip to content

Commit b678aac

Browse files
committed
CNF-17181: Extend Core reference configuration with NHC/SNR operators
1 parent d53038b commit b678aac

16 files changed

Lines changed: 231 additions & 0 deletions

telco-core/configuration/core-baseline.yaml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,16 @@ policies:
8282
patches:
8383
- spec:
8484
installPlanApproval: Manual
85+
- path: reference-crs/required/node-health-check/NHCSubscriptionNS.yaml
86+
- path: reference-crs/required/node-health-check/NHCSubscriptionOperGroup.yaml
87+
- path: reference-crs/required/node-health-check/NHCSubscription.yaml
88+
patches:
89+
- spec:
90+
installPlanApproval: Manual
91+
- path: reference-crs/required/node-health-check/SNRSubscription.yaml
92+
patches:
93+
- spec:
94+
installPlanApproval: Manual
8595

8696
# Operator configuration
8797
- name: core-operator-config-4.20
@@ -102,6 +112,11 @@ policies:
102112

103113
- path: reference-crs/required/networking/NMState.yaml
104114

115+
# Node Health Check and Self Node Remediation configuration
116+
- path: reference-crs/required/node-health-check/SelfNodeRemediationTemplate.yaml
117+
- path: reference-crs/required/node-health-check/SelfNodeRemediationConfig.yaml
118+
- path: reference-crs/required/node-health-check/NodeHealthCheck.yaml
119+
105120
# Scheduling
106121
- path: reference-crs/required/scheduling/sched.yaml
107122
patches:

telco-core/configuration/reference-crs-kube-compare/metadata.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,22 @@ parts:
129129
ignore-unspecified-fields: true
130130
- path: required/scheduling/sched.yaml
131131
- path: required/scheduling/Scheduler.yaml
132+
- name: node-health-check
133+
description: |-
134+
Node Health Check and Self Node Remediation operators for automatic
135+
detection and remediation of unhealthy nodes.
136+
components:
137+
- name: node-health-check-operator
138+
allOrNoneOf:
139+
- path: required/node-health-check/NodeHealthCheck.yaml
140+
- path: required/node-health-check/SelfNodeRemediationTemplate.yaml
141+
- path: required/node-health-check/SelfNodeRemediationConfig.yaml
142+
- path: required/node-health-check/NHCSubscriptionNS.yaml
143+
- path: required/node-health-check/NHCSubscriptionOperGroup.yaml
144+
config:
145+
ignore-unspecified-fields: true
146+
- path: required/node-health-check/NHCSubscription.yaml
147+
- path: required/node-health-check/SNRSubscription.yaml
132148
- name: required-storage
133149
components:
134150
- name: storage-odf
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: operators.coreos.com/v1alpha1
2+
kind: Subscription
3+
metadata:
4+
name: node-healthcheck-operator
5+
namespace: openshift-workload-availability
6+
spec:
7+
channel: "stable"
8+
name: node-healthcheck-operator
9+
source: {{ .spec.source }}
10+
sourceNamespace: openshift-marketplace
11+
installPlanApproval: Manual
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: openshift-workload-availability
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: operators.coreos.com/v1
2+
kind: OperatorGroup
3+
metadata:
4+
name: node-healthcheck-operator
5+
namespace: openshift-workload-availability
6+
annotations:
7+
operatorframework.io/bundle-unpack-min-retry-interval: 10m
8+
spec:
9+
targetNamespaces:
10+
- openshift-workload-availability
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
apiVersion: remediation.medik8s.io/v1alpha1
2+
kind: NodeHealthCheck
3+
metadata:
4+
name: nhc-worker-self
5+
spec:
6+
{{ .spec | default dict | toYaml | indent 2 }}
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
apiVersion: operators.coreos.com/v1alpha1
2+
kind: Subscription
3+
metadata:
4+
name: self-node-remediation
5+
namespace: openshift-workload-availability
6+
spec:
7+
channel: "stable"
8+
name: self-node-remediation
9+
source: {{ .spec.source }}
10+
sourceNamespace: openshift-marketplace
11+
installPlanApproval: Manual
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: self-node-remediation.medik8s.io/v1alpha1
2+
kind: SelfNodeRemediationConfig
3+
metadata:
4+
name: self-node-remediation-config
5+
namespace: openshift-workload-availability
6+
spec:
7+
{{ .spec | default dict | toYaml | indent 2 }}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: self-node-remediation.medik8s.io/v1alpha1
2+
kind: SelfNodeRemediationTemplate
3+
metadata:
4+
name: self-node-remediation-outofservicetaint-strategy-template
5+
namespace: openshift-workload-availability
6+
spec:
7+
{{ .spec | default dict | toYaml | indent 2 }}
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# required
2+
# count: 1
3+
---
4+
apiVersion: operators.coreos.com/v1alpha1
5+
kind: Subscription
6+
metadata:
7+
name: node-healthcheck-operator
8+
namespace: openshift-workload-availability
9+
spec:
10+
channel: "stable"
11+
name: node-healthcheck-operator
12+
source: redhat-operators-disconnected
13+
sourceNamespace: openshift-marketplace
14+
installPlanApproval: Manual
15+
status:
16+
state: AtLatestKnown

0 commit comments

Comments
 (0)