Skip to content

Commit

Permalink
Proper revert
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Greco authored and jonathan-innis committed Jan 23, 2024
1 parent 1724fbc commit a80e7f1
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 16 deletions.
16 changes: 8 additions & 8 deletions website/content/en/v0.30/concepts/deprovisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ In special cases, drift can correspond to multiple values and must be handled di
Behavioral Fields are treated as over-arching settings on the NodePool to dictate how Karpenter behaves. These fields don’t correspond to settings on the NodeClaim or instance. They’re set by the user to control Karpenter’s Provisioning and disruption logic. Since these don’t map to a desired state of NodeClaims, __behavioral fields are not considered for Drift__.
__Behavioral Fields__
- Weight
- Limits
- ConsolidationPolicy
- ConsolidateAfter
- ExpireAfter
---
- Weight
- Limits
- ConsolidationPolicy
- ConsolidateAfter
- ExpireAfter
---
Read the [Drift Design](https://github.com/aws/karpenter-core/blob/main/designs/drift.md) for more.
Expand Down Expand Up @@ -216,7 +216,7 @@ Voluntary node removal does not include [Interruption]({{<ref "#interruption" >}
### Node-Level Controls
Nodes can be opted out of consolidation and expiration deprovisioning by setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the node.
Nodes can be opted out of consolidation deprovisioning by setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the node.
```yaml
apiVersion: v1
Expand All @@ -228,7 +228,7 @@ metadata:
#### Example: Disable Consolidation on Provisioner
Provisioner `.spec.annotations` allow you to set annotations that will be applied to all nodes launched by this provisioner. By setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the provisioner, you will selectively prevent all nodes launched by this Provisioner from being considered in consolidation or expiration actions.
Provisioner `.spec.annotations` allow you to set annotations that will be applied to all nodes launched by this provisioner. By setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the provisioner, you will selectively prevent all nodes launched by this Provisioner from being considered in consolidation calculations.
```yaml
apiVersion: karpenter.sh/v1alpha5
Expand Down
16 changes: 8 additions & 8 deletions website/content/en/v0.31/concepts/deprovisioning.md
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@ In special cases, drift can correspond to multiple values and must be handled di
Behavioral Fields are treated as over-arching settings on the NodePool to dictate how Karpenter behaves. These fields don’t correspond to settings on the NodeClaim or instance. They’re set by the user to control Karpenter’s Provisioning and disruption logic. Since these don’t map to a desired state of NodeClaims, __behavioral fields are not considered for Drift__.
__Behavioral Fields__
- Weight
- Limits
- ConsolidationPolicy
- ConsolidateAfter
- ExpireAfter
---
- Weight
- Limits
- ConsolidationPolicy
- ConsolidateAfter
- ExpireAfter
---
Read the [Drift Design](https://github.com/aws/karpenter-core/blob/main/designs/drift.md) for more.
Expand Down Expand Up @@ -215,7 +215,7 @@ Voluntary node removal does not include [Interruption]({{<ref "#interruption" >}
### Node-Level Controls
Nodes can be opted out of consolidation and expiration deprovisioning by setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the node.
Nodes can be opted out of consolidation deprovisioning by setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the node.
```yaml
apiVersion: v1
Expand All @@ -227,7 +227,7 @@ metadata:
#### Example: Disable Consolidation on Provisioner
Provisioner `.spec.annotations` allow you to set annotations that will be applied to all nodes launched by this provisioner. By setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the provisioner, you will selectively prevent all nodes launched by this Provisioner from being considered in consolidation or expiration actions.
Provisioner `.spec.annotations` allow you to set annotations that will be applied to all nodes launched by this provisioner. By setting the annotation `karpenter.sh/do-not-consolidate: "true"` on the provisioner, you will selectively prevent all nodes launched by this Provisioner from being considered in consolidation calculations.
```yaml
apiVersion: karpenter.sh/v1alpha5
Expand Down

0 comments on commit a80e7f1

Please sign in to comment.