Skip to content

Commit e48f3ef

Browse files
committed
Enable PriorityQueue per default
Move PriorityQueue to Beta and enable by default. This is to stay in-line with: - controller-runtime >= v0.23 where PQ is enabled by default - cluster-api >= v1.13 where PQ is also beta and enabled by default
1 parent 3951890 commit e48f3ef

4 files changed

Lines changed: 19 additions & 6 deletions

File tree

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
- "--v=2"
2525
- "--diagnostics-address=127.0.0.1:8080"
2626
- "--insecure-diagnostics=true"
27-
- "--feature-gates=PriorityQueue=${EXP_CAPO_PRIORITY_QUEUE:=false},AutoScaleFromZero=${EXP_CAPO_AUTOSCALE_FROM_ZERO:=false}"
27+
- "--feature-gates=PriorityQueue=${EXP_CAPO_PRIORITY_QUEUE:=true},AutoScaleFromZero=${EXP_CAPO_AUTOSCALE_FROM_ZERO:=false}"
2828
image: controller:latest
2929
imagePullPolicy: Always
3030
name: manager
Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Priority Queue
22

3-
> **Note:** PriorityQueue is available in >= 0.14
3+
> **Note:** PriorityQueue is available as an alpha feature in 0.14 (disabled by
4+
> default) and graduated to beta in 0.15 (enabled by default).
45
56
The `PriorityQueue` feature flag enables the usage of the controller-runtime PriorityQueue.
67

@@ -11,10 +12,21 @@ More information on controller-runtime PriorityQueue:
1112
- [design docs](https://github.com/kubernetes-sigs/controller-runtime/pull/3013)
1213
- [tracking issue](https://github.com/kubernetes-sigs/controller-runtime/issues/2374)
1314

14-
## Enabling Priority Queue
15+
## Feature gate maturity
1516

16-
You can enable `PriorityQueue` using the following.
17+
| Version | Stage | Default |
18+
|---------|-------|----------|
19+
| 0.14 | Alpha | Disabled |
20+
| 0.15 | Beta | Enabled |
1721

22+
## Enabling/Disabling Priority Queue
23+
24+
To enable:
1825
- Environment variable: `EXP_CAPO_PRIORITY_QUEUE=true`
1926
- clusterctl.yaml variable: `EXP_CAPO_PRIORITY_QUEUE: true`
2027
- --feature-gates argument: `PriorityQueue=true`
28+
29+
To disable:
30+
- Environment variable: `EXP_CAPO_PRIORITY_QUEUE=false`
31+
- clusterctl.yaml variable: `EXP_CAPO_PRIORITY_QUEUE: false`
32+
- `--feature-gates` argument: `PriorityQueue=false`

feature/feature.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ const (
3333
// instead of the default queue implementation.
3434
//
3535
// alpha: v0.14
36+
// beta: v0.15
3637
PriorityQueue featuregate.Feature = "PriorityQueue"
3738

3839
// AutoScaleFromZero is a feature gate that enables the OpenStackMachineTemplate controller that adds
@@ -51,6 +52,6 @@ func init() {
5152
// To add a new feature, define a key for it above and add it here.
5253
var defaultCAPOFeatureGates = map[featuregate.Feature]featuregate.FeatureSpec{
5354
// Every feature should be initiated here:
54-
PriorityQueue: {Default: false, PreRelease: featuregate.Alpha},
55+
PriorityQueue: {Default: true, PreRelease: featuregate.Beta},
5556
AutoScaleFromZero: {Default: false, PreRelease: featuregate.Alpha},
5657
}

test/e2e/data/e2e_conf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ variables:
216216
WORKERS_MACHINE_TEMPLATE_UPGRADE_TO: "upgrade-to-md-0"
217217
CNI: "../../data/cni/calico.yaml"
218218
CCM: "../../data/ccm/cloud-controller-manager.yaml"
219-
EXP_CAPO_PRIORITY_QUEUE: "false"
219+
EXP_CAPO_PRIORITY_QUEUE: "true"
220220
EXP_CAPO_AUTOSCALE_FROM_ZERO: "true"
221221
IP_FAMILY: "ipv4"
222222
OPENSTACK_BASTION_IMAGE_NAME: "cirros-0.6.1-x86_64-disk"

0 commit comments

Comments
 (0)