From dba7b66200c21371b593a28e6271dc53315737a4 Mon Sep 17 00:00:00 2001 From: Carlo Lobrano Date: Wed, 15 May 2024 11:15:16 +0200 Subject: [PATCH] Add missing spec descriptor for RemediationStrategy field Signed-off-by: Carlo Lobrano --- api/v1alpha1/fenceagentsremediation_types.go | 1 + ...nts-remediation.clusterserviceversion.yaml | 20 +++++++++++++++++++ ...nts-remediation.clusterserviceversion.yaml | 20 +++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/api/v1alpha1/fenceagentsremediation_types.go b/api/v1alpha1/fenceagentsremediation_types.go index 89ef2a00..f0c21605 100644 --- a/api/v1alpha1/fenceagentsremediation_types.go +++ b/api/v1alpha1/fenceagentsremediation_types.go @@ -96,6 +96,7 @@ type FenceAgentsRemediationSpec struct { // that enables automatic deletion of pv-attached pods on failed nodes, "out-of-service" taint is only supported on clusters with k8s version 1.26+ or OCP/OKD version 4.13+. // +kubebuilder:default:="ResourceDeletion" // +kubebuilder:validation:Enum=ResourceDeletion;OutOfServiceTaint + // +operator-sdk:csv:customresourcedefinitions:type=spec RemediationStrategy RemediationStrategyType `json:"remediationStrategy,omitempty"` } diff --git a/bundle/manifests/fence-agents-remediation.clusterserviceversion.yaml b/bundle/manifests/fence-agents-remediation.clusterserviceversion.yaml index 1772443c..34f82019 100644 --- a/bundle/manifests/fence-agents-remediation.clusterserviceversion.yaml +++ b/bundle/manifests/fence-agents-remediation.clusterserviceversion.yaml @@ -84,6 +84,16 @@ spec: node that is fenced, since they are node specific displayName: Node Parameters path: nodeparameters + - description: RemediationStrategy is the remediation method for unhealthy nodes. + Currently, it could be either "OutOfServiceTaint" or "ResourceDeletion". + ResourceDeletion will iterate over all pods related to the unhealthy node + and delete them. OutOfServiceTaint will add the out-of-service taint which + is a new well-known taint "node.kubernetes.io/out-of-service" that enables + automatic deletion of pv-attached pods on failed nodes, "out-of-service" + taint is only supported on clusters with k8s version 1.26+ or OCP/OKD version + 4.13+. + displayName: Remediation Strategy + path: remediationStrategy - description: RetryCount is the number of times the fencing agent will be executed displayName: Retry Count path: retrycount @@ -130,6 +140,16 @@ spec: node that is fenced, since they are node specific displayName: Node Parameters path: template.spec.nodeparameters + - description: RemediationStrategy is the remediation method for unhealthy nodes. + Currently, it could be either "OutOfServiceTaint" or "ResourceDeletion". + ResourceDeletion will iterate over all pods related to the unhealthy node + and delete them. OutOfServiceTaint will add the out-of-service taint which + is a new well-known taint "node.kubernetes.io/out-of-service" that enables + automatic deletion of pv-attached pods on failed nodes, "out-of-service" + taint is only supported on clusters with k8s version 1.26+ or OCP/OKD version + 4.13+. + displayName: Remediation Strategy + path: template.spec.remediationStrategy - description: RetryCount is the number of times the fencing agent will be executed displayName: Retry Count path: template.spec.retrycount diff --git a/config/manifests/bases/fence-agents-remediation.clusterserviceversion.yaml b/config/manifests/bases/fence-agents-remediation.clusterserviceversion.yaml index b1539a23..d75d98b4 100644 --- a/config/manifests/bases/fence-agents-remediation.clusterserviceversion.yaml +++ b/config/manifests/bases/fence-agents-remediation.clusterserviceversion.yaml @@ -39,6 +39,16 @@ spec: node that is fenced, since they are node specific displayName: Node Parameters path: nodeparameters + - description: RemediationStrategy is the remediation method for unhealthy nodes. + Currently, it could be either "OutOfServiceTaint" or "ResourceDeletion". + ResourceDeletion will iterate over all pods related to the unhealthy node + and delete them. OutOfServiceTaint will add the out-of-service taint which + is a new well-known taint "node.kubernetes.io/out-of-service" that enables + automatic deletion of pv-attached pods on failed nodes, "out-of-service" + taint is only supported on clusters with k8s version 1.26+ or OCP/OKD version + 4.13+. + displayName: Remediation Strategy + path: remediationStrategy - description: RetryCount is the number of times the fencing agent will be executed displayName: Retry Count path: retrycount @@ -85,6 +95,16 @@ spec: node that is fenced, since they are node specific displayName: Node Parameters path: template.spec.nodeparameters + - description: RemediationStrategy is the remediation method for unhealthy nodes. + Currently, it could be either "OutOfServiceTaint" or "ResourceDeletion". + ResourceDeletion will iterate over all pods related to the unhealthy node + and delete them. OutOfServiceTaint will add the out-of-service taint which + is a new well-known taint "node.kubernetes.io/out-of-service" that enables + automatic deletion of pv-attached pods on failed nodes, "out-of-service" + taint is only supported on clusters with k8s version 1.26+ or OCP/OKD version + 4.13+. + displayName: Remediation Strategy + path: template.spec.remediationStrategy - description: RetryCount is the number of times the fencing agent will be executed displayName: Retry Count path: template.spec.retrycount