Skip to content

Commit 9b6b090

Browse files
committed
controller: Add AdditiveCELDependencyCheck feature gate
Signed-off-by: Stefan Prodan <[email protected]>
1 parent 6d5856c commit 9b6b090

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

internal/features/features.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ const (
6868
// digest changes. When enabled, the controller will not
6969
// append the digest to the chart version in Chart.yaml.
7070
DisableChartDigestTracking = "DisableChartDigestTracking"
71+
72+
// AdditiveCELDependencyCheck controls whether the CEL dependency check
73+
// should be additive, meaning that the built-in readiness check will
74+
// be added to the user-defined CEL expressions.
75+
AdditiveCELDependencyCheck = "AdditiveCELDependencyCheck"
7176
)
7277

7378
var features = map[string]bool{
@@ -92,6 +97,9 @@ var features = map[string]bool{
9297
// DisableChartDigestTracking
9398
// opt-in from v1.3.0
9499
DisableChartDigestTracking: false,
100+
// AdditiveCELDependencyCheck
101+
// opt-in from v1.4.0
102+
AdditiveCELDependencyCheck: false,
95103
}
96104

97105
func init() {

main.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,13 @@ func main() {
204204

205205
disableChartDigestTracking, err := features.Enabled(features.DisableChartDigestTracking)
206206
if err != nil {
207-
setupLog.Error(err, "unable to check feature gate DisableChartDigestTracking")
207+
setupLog.Error(err, "unable to check feature gate "+features.DisableChartDigestTracking)
208+
os.Exit(1)
209+
}
210+
211+
additiveCELDependencyCheck, err := features.Enabled(features.AdditiveCELDependencyCheck)
212+
if err != nil {
213+
setupLog.Error(err, "unable to check feature gate "+features.AdditiveCELDependencyCheck)
208214
os.Exit(1)
209215
}
210216

@@ -318,6 +324,7 @@ func main() {
318324
KubeConfigOpts: kubeConfigOpts,
319325
FieldManager: controllerName,
320326
DisableChartDigestTracking: disableChartDigestTracking,
327+
AdditiveCELDependencyCheck: additiveCELDependencyCheck,
321328
TokenCache: tokenCache,
322329
}).SetupWithManager(ctx, mgr, controller.HelmReleaseReconcilerOptions{
323330
DependencyRequeueInterval: requeueDependency,

0 commit comments

Comments
 (0)