feat: implement controller for component config and annotations (EP-1898)#127
Open
swghosh wants to merge 2 commits intoopenshift:ai-staging-release-1.0from
Open
feat: implement controller for component config and annotations (EP-1898)#127swghosh wants to merge 2 commits intoopenshift:ai-staging-release-1.0from
swghosh wants to merge 2 commits intoopenshift:ai-staging-release-1.0from
Conversation
|
Important Review skippedAuto reviews are disabled on base/target branches other than the default branch. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: swghosh The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
swghosh
force-pushed
the
feature/controller-impl-1898
branch
2 times, most recently
from
9034bd5 to
c93ed1f
Compare
…-1898) Extend the ExternalSecretsConfig API with annotations and componentConfig fields in ControllerConfig to support per-component deployment overrides. New types added: - ComponentConfig: per-component configuration with deploymentConfigs and overrideEnv - DeploymentConfig: deployment-level overrides (revisionHistoryLimit) - KVPair/Annotation: reusable key-value pair types for custom annotations New ComponentName enum values: Webhook, CertController (extending existing ExternalSecretsCoreController and BitwardenSDKServer). Includes CEL validation rules for: - Reserved annotation prefix rejection (kubernetes.io/, openshift.io/, etc.) - Reserved environment variable prefix rejection (HOSTNAME, KUBERNETES_, EXTERNAL_SECRETS_) - Component name uniqueness enforcement - RevisionHistoryLimit minimum value of 1 Also includes comprehensive integration test suite covering all new fields, validation rules, and update scenarios. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
swghosh
force-pushed
the
feature/controller-impl-1898
branch
from
c93ed1f to
b60b8fc
Compare
…(EP-1898) Add controller implementation to reconcile the new annotations and componentConfig fields from ExternalSecretsConfig into operand deployments. New file: component_config.go - applyAnnotations: merges custom annotations onto Deployment and Pod template - applyComponentConfig: applies per-component overrides (revisionHistoryLimit, overrideEnv) - applyOverrideEnv: merges override environment variables with existing container env - componentNameToDeploymentAsset/componentNameToContainerName: mapping tables - getComponentNameForAsset: reverse lookup from asset to component name Modified files: - deployments.go: integrates annotation and component config application into getDeploymentObject pipeline - networkpolicy.go: extends getPodSelectorForComponent with Webhook and CertController pod selectors Unit tests: component_config_test.go - TestApplyAnnotations: empty, single, multiple, override scenarios - TestApplyComponentConfig: revisionHistoryLimit, overrideEnv, no-match, combined - TestApplyOverrideEnv: add, override, no-match container scenarios - TestGetComponentNameForAsset: all 4 components + unknown asset error Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
swghosh
force-pushed
the
feature/controller-impl-1898
branch
from
b60b8fc to
fda2e55
Compare
3 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
annotationsandcomponentConfigsAPI fields from EP-1898component_config.gowith functions to apply per-component deployment overrides and global annotationsgetDeploymentObject()flow indeployments.gocomponent_config_test.goEnhancement Proposal
openshift/enhancements#1898
Depends On
Changes
pkg/controller/external_secrets/component_config.gopkg/controller/external_secrets/component_config_test.gopkg/controller/external_secrets/deployments.goapplyAnnotations()andapplyComponentConfig()Implementation Details
applyAnnotations()— merges user annotations onto Deployment + Pod template metadataapplyComponentConfig()— maps ComponentName → deployment asset, appliesrevisionHistoryLimitandoverrideEnvapplyOverrideEnv()— merges user env vars into the correct container, overriding conflictsTest plan
make generatepassesmake buildpasses (compilation verified)🤖 Generated with Claude Code