-
Notifications
You must be signed in to change notification settings - Fork 57
Add documentation for resource customization #1292
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
bmangoen
wants to merge
2
commits into
istio-ecosystem:main
Choose a base branch
from
bmangoen:doc/sailoperator-ignore-annotation
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,202 @@ | ||
| link:../../README.adoc[Return to Project Root] | ||
|
|
||
| == Table of Contents | ||
|
|
||
| * <<custom-resource-annotations>> | ||
| ** <<sailoperator-ignore-annotation>> | ||
| *** <<use-cases>> | ||
| *** <<how-it-works>> | ||
| *** <<usage>> | ||
| **** <<example-adding-annotation-to-webhook>> | ||
| *** <<removing-annotation>> | ||
| *** <<supported-resources>> | ||
| *** <<limitations>> | ||
| *** <<implementation-details>> | ||
|
|
||
| == Resource Customization | ||
|
|
||
| The Sail Operator supports customizing resources that it manages. This document describes the available customization options and how to use them. | ||
|
|
||
| [[custom-resource-annotations]] | ||
| === Custom Resource Annotations | ||
|
|
||
| Special annotations can be added to resources to modify Sail Operator's behavior. | ||
|
|
||
| [[sailoperator-ignore-annotation]] | ||
| ==== sailoperator.io/ignore Annotation | ||
|
|
||
| The `sailoperator.io/ignore` annotation allows you to prevent the Sail Operator from reconciling changes to specific resources that it manages. This is useful when you need to make manual modifications to operator-managed resources that should not be automatically reverted. | ||
|
|
||
| [[use-cases]] | ||
| ===== Use Cases | ||
|
|
||
| The `sailoperator.io/ignore` annotation is helpful in the following scenarios (non-exhaustive list): | ||
|
|
||
| * **Customizing webhook configurations**: You need to modify webhook settings that should persist across reconciliation cycles | ||
| * **Adding labels or annotations**: You want to add custom labels or annotations to resources without them being removed | ||
| * **Tuning autoscaler settings**: You need to adjust `HorizontalPodAutoscaler` configurations based on observed behavior | ||
| * **Managing image pull secrets**: You want to add additional image pull secrets to `ServiceAccount` resources | ||
| * **Testing and debugging**: You need to temporarily modify a resource for troubleshooting purposes | ||
|
|
||
| [[how-it-works]] | ||
| ===== How It Works | ||
|
|
||
| Sail Operator re-applies all helm charts when it detects a change in any of the resources it deployed. | ||
| When the `sailoperator.io/ignore` annotation is set to `"true"` on a resource: | ||
|
|
||
| * **Ownership is preserved** - The resource must remain owned by its associated `Istio` (the ownerReference remains the associated `IstioRevision`) | ||
| * **UPDATE event reconciliation is skipped** - The operator ignores update events for that specific resource, allowing manual modifications to persist | ||
| * **CREATE and DELETE events remain active** - The annotation only affects UPDATE events; creation and deletion are processed normally (ie. the reconciliation will be triggered and all the changes will be reverted back to the state defined in the `Istio` or `IstioRevision` resource) | ||
| * **Global reconciliation still applies** - When other resources change, Sail Operator re-applies all Helm charts, including resources with this annotation. The `sailoperator.io/ignore: "true"` annotation still remains set on the resources. | ||
| * **Partial field protection** - Only fields defined in the Helm templates are reverted; additional annotations and labels you add will persist, but modifications to existing template-defined fields (such as labels or pod command-line arguments) will be reverted | ||
|
|
||
| [NOTE] | ||
| ==== | ||
| The annotation value must be exactly the string `"true"`. Any other value, such as `"True"`, `"yes"`, or `"1"`, will result in normal reconciliation behavior. | ||
| ==== | ||
|
|
||
| [[usage]] | ||
| ===== Usage | ||
|
|
||
| To prevent the operator from reconciling a resource, add the annotation to the resource's metadata: | ||
|
|
||
| [source,yaml] | ||
| ---- | ||
| metadata: | ||
| annotations: | ||
| sailoperator.io/ignore: "true" | ||
| ---- | ||
|
|
||
| [[example-adding-annotation-to-webhook]] | ||
| ====== Example: Preventing Reconciliation of a MutatingWebhookConfiguration | ||
|
|
||
| In this example, we will add the annotation to a `MutatingWebhookConfiguration` and then modify it without the changes being reverted by Sail Operator: | ||
|
|
||
| . Add the annotation to the webhook configuration: | ||
|
|
||
| [source,bash] | ||
| ---- | ||
| kubectl annotate mutatingwebhookconfiguration \ | ||
| istio-sidecar-injector \ | ||
| -n istio-system \ | ||
| sailoperator.io/ignore=true | ||
| ---- | ||
|
|
||
| . Verify the annotation was added: | ||
|
|
||
| [source,bash] | ||
| ---- | ||
| kubectl get mutatingwebhookconfiguration \ | ||
| istio-sidecar-injector \ | ||
| -n istio-system \ | ||
| -o jsonpath='{.metadata.annotations.sailoperator\.io/ignore}' | ||
| ---- | ||
|
|
||
| Expected output: | ||
|
|
||
| [source,console] | ||
| ---- | ||
| true | ||
| ---- | ||
|
|
||
| . Check the value of the field you want to modify: | ||
|
|
||
| [source,bash] | ||
| ---- | ||
| kubectl get mutatingwebhookconfiguration \ | ||
| istio-sidecar-injector \ | ||
| -n istio-system \ | ||
| -o jsonpath='{.metadata.labels.app}' | ||
| ---- | ||
|
|
||
| Expected output: | ||
|
|
||
| [source,console] | ||
| ---- | ||
| sidecar-injector | ||
| ---- | ||
|
|
||
| . Now you can modify the webhook and the changes will persist: | ||
|
|
||
| [source,bash] | ||
| ---- | ||
| kubectl patch mutatingwebhookconfiguration \ | ||
| istio-sidecar-injector \ | ||
| -n istio-system \ | ||
| --type=json \ | ||
| -p='[{"op": "add", "path": "/metadata/labels/app", "value": "sidecar-injector-test"}]' | ||
| ---- | ||
|
|
||
| . Verify the change persisted: | ||
|
|
||
| [source,bash] | ||
| ---- | ||
| kubectl get mutatingwebhookconfiguration \ | ||
| istio-sidecar-injector \ | ||
| -n istio-system \ | ||
| -o jsonpath='{.metadata.labels.app}' | ||
| ---- | ||
|
|
||
| Expected output: | ||
|
|
||
| [source,console] | ||
| ---- | ||
| sidecar-injector-test | ||
| ---- | ||
|
|
||
| [[removing-annotation]] | ||
| ===== Removing the Annotation | ||
|
|
||
| To re-enable reconciliation for a resource, simply remove the annotation: | ||
|
|
||
| [source,bash] | ||
| ---- | ||
| kubectl annotate mutatingwebhookconfiguration \ | ||
| istio-sidecar-injector \ | ||
| -n istio-system \ | ||
| sailoperator.io/ignore- | ||
| ---- | ||
|
|
||
| [NOTE] | ||
| ==== | ||
| After removing the annotation, the operator will reconcile the resource on the next UPDATE event, reverting any manual changes back to the state defined in the `Istio` or `IstioRevision` resource. | ||
| ==== | ||
|
|
||
| [[supported-resources]] | ||
| ===== Supported Resources | ||
|
|
||
| The `sailoperator.io/ignore` annotation works on any resource that is: | ||
|
|
||
| * Owned by an `Istio` (has an `ownerReference` pointing to an `IstioRevision`) | ||
| * Subject to UPDATE events | ||
|
|
||
| Common resources include: | ||
|
|
||
| * `Deployment` | ||
| * `Service` | ||
| * `ServiceAccount` | ||
| * `ConfigMap` | ||
| * `MutatingWebhookConfiguration` | ||
| * `ValidatingWebhookConfiguration` | ||
| * `HorizontalPodAutoscaler` | ||
| * `PodDisruptionBudget` | ||
|
|
||
| [[limitations]] | ||
| ===== Limitations and Considerations | ||
|
|
||
| * **CREATE and DELETE events are not affected**: The annotation only prevents reconciliation of UPDATE events. If the resource is deleted, the operator will recreate it *without* the annotation set. | ||
| * **OwnerReference must remain**: The resource must still be owned by the `IstioRevision`. Removing the ownerReference will cause the operator to lose track of the resource. | ||
| * **Manual maintenance required**: You are responsible for maintaining resources with this annotation. The operator will update and revert them automatically when the parent `Istio` or `IstioRevision` resource changes. | ||
| * **Version upgrades**: When upgrading Istio versions, resources with this annotation will be updated automatically and all changes will be reverted. You may need to apply back the changes manually. | ||
| * **Configuration drift**: Using this annotation can lead to configuration drift between your intended state and the actual state. Use it sparingly and record which resources have this annotation in your documentation. | ||
|
|
||
| [[implementation-details]] | ||
| ===== Implementation Details | ||
|
|
||
| Here is the technical implementation: | ||
|
|
||
| * **Predicate Function**: `pkg/predicate/predicate.go:IgnoreUpdateWhenAnnotation()` | ||
| * **Integration Test**: `tests/integration/api/istiorevision_test.go:565` | ||
| * **Documentation**: This annotation was introduced in commit `2543fb8` | ||
|
|
||
| The implementation uses a controller-runtime predicate that filters UPDATE events based on the annotation value, preventing them from triggering reconciliation. | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please use regular bullets here in the document. For some reason the render view is always showing each step as 1.