Skip to content

feat: remove finalizer on topics in eph #1036

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.

Sign up for GitHub

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

Merged
psav merged 9 commits into from
Aug 30, 2024
Merged

feat: remove finalizer on topics in eph #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c13452
fix: remove finalizer on topics in eph
maknop Aug 28, 2024
6ad4aae
fix: remove finalizer on topics in eph
maknop Aug 28, 2024
49d5d14
feat: creates feature flag to enable strimzi finalizer use
maknop Aug 28, 2024
b781430
feat: toggle feature flag to set finalizers on topics
maknop Aug 28, 2024
e10a3dc
feat: fixing syntax issue
maknop Aug 28, 2024
939b8e5
feat: updated name of ff
maknop Aug 29, 2024
2a0f465
feat: improved code readability
maknop Aug 29, 2024
3c4f85c
flip ff and logic
maknop Aug 29, 2024
88d7204
feat: flip values
maknop Aug 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions controllers/cloud.redhat.com/clowderconfig/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ type ClowderConfig struct {
DisableCloudWatchLogging bool `json:"disableCloudWatchLogging"`
EnableExternalStrimzi bool `json:"enableExternalStrimzi"`
DisableRandomRoutes bool `json:"disableRandomRoutes"`
DisableStrimziFinalizer bool `json:"disableStrimziFinalizerUse"`
} `json:"features"`
Settings struct {
ManagedKafkaEphemDeleteRegex string `json:"managedKafkaEphemDeleteRegex"`
Expand Down
21 changes: 21 additions & 0 deletions controllers/cloud.redhat.com/providers/kafka/strimzi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,24 @@ func (s *strimziProvider) configureKafkaCluster() error {
return fmt.Errorf("could not unmarshal klabels: %w", err)
}

var useFinalizersEnv []strimzi.KafkaSpecEntityOperatorTemplateTopicOperatorContainerEnvElem

if clowderconfig.LoadedConfig.Features.DisableStrimziFinalizer {
useFinalizersEnv = []strimzi.KafkaSpecEntityOperatorTemplateTopicOperatorContainerEnvElem{
{
Name: utils.StringPtr("STRIMZI_USE_FINALIZERS"),
Value: utils.StringPtr("false"),
},
}
} else {
useFinalizersEnv = []strimzi.KafkaSpecEntityOperatorTemplateTopicOperatorContainerEnvElem{
{
Name: utils.StringPtr("STRIMZI_USE_FINALIZERS"),
Value: utils.StringPtr("true"),
},
}
}

k.Spec = &strimzi.KafkaSpec{
Kafka: strimzi.KafkaSpecKafka{
Config: &kafConfig,
Expand Down Expand Up @@ -339,6 +357,9 @@ func (s *strimziProvider) configureKafkaCluster() error {
Labels: &klabels,
},
},
TopicOperatorContainer: &strimzi.KafkaSpecEntityOperatorTemplateTopicOperatorContainer{
Env: useFinalizersEnv,
},
},
TopicOperator: &strimzi.KafkaSpecEntityOperatorTopicOperator{
Resources: &strimzi.KafkaSpecEntityOperatorTopicOperatorResources{
Expand Down