Skip to content

Commit

Permalink
Merge pull request #268 from slintes/fix-snr-template
Browse files Browse the repository at this point in the history
Update default SNR template
  • Loading branch information
openshift-merge-bot[bot] authored Nov 22, 2023
2 parents 051b1fe + 8d880ee commit d7c304d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ metadata:
"remediationTemplate": {
"apiVersion": "self-node-remediation.medik8s.io/v1alpha1",
"kind": "SelfNodeRemediationTemplate",
"name": "self-node-remediation-resource-deletion-template",
"name": "self-node-remediation-automatic-strategy-template",
"namespace": "openshift-operators"
},
"selector": {
Expand Down
2 changes: 1 addition & 1 deletion config/samples/remediation_v1alpha1_nodehealthcheck.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@ spec:
remediationTemplate:
apiVersion: self-node-remediation.medik8s.io/v1alpha1
kind: SelfNodeRemediationTemplate
name: self-node-remediation-resource-deletion-template
name: self-node-remediation-automatic-strategy-template
namespace: openshift-operators
2 changes: 1 addition & 1 deletion controllers/defaults/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const (
var DefaultTemplateRef = &corev1.ObjectReference{
Kind: "SelfNodeRemediationTemplate",
APIVersion: "self-node-remediation.medik8s.io/v1alpha1",
Name: "self-node-remediation-resource-deletion-template",
Name: "self-node-remediation-automatic-strategy-template",
}

var DefaultSelector = metav1.LabelSelector{
Expand Down
4 changes: 2 additions & 2 deletions docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ spec:
apiVersion: self-node-remediation.medik8s.io/v1alpha1
kind: SelfNodeRemediationTemplate
namespace: <SNR namespace>
name: self-node-remediation-resource-deletion-template
name: self-node-remediation-automatic-strategy-template
escalatingRemediations: # Note: mutually exclusive with remediationTemplate
- remediationTemplate:
apiVersion: self-node-remediation.medik8s.io/v1alpha1
kind: SelfNodeRemediationTemplate
namespace: <SNR namespace>
name: self-node-remediation-resource-deletion-template
name: self-node-remediation-automatic-strategy-template
order: 1
timeout: 300s
# Note: The remediator below is an example only, it doesn't exist
Expand Down
4 changes: 2 additions & 2 deletions e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ var _ = Describe("e2e", func() {
RemediationTemplate: &v1.ObjectReference{
Kind: "SelfNodeRemediationTemplate",
APIVersion: "self-node-remediation.medik8s.io/v1alpha1",
Name: "self-node-remediation-resource-deletion-template",
Name: "self-node-remediation-automatic-strategy-template",
Namespace: operatorNsName,
},
UnhealthyConditions: []v1alpha1.UnhealthyCondition{
Expand Down Expand Up @@ -222,7 +222,7 @@ var _ = Describe("e2e", func() {
RemediationTemplate: v1.ObjectReference{
Kind: "SelfNodeRemediationTemplate",
APIVersion: "self-node-remediation.medik8s.io/v1alpha1",
Name: "self-node-remediation-resource-deletion-template",
Name: "self-node-remediation-automatic-strategy-template",
Namespace: operatorNsName,
},
Order: 5,
Expand Down

0 comments on commit d7c304d

Please sign in to comment.