Skip to content

Commit 2cde7b9

Browse files
pierDipiknative-automation
pierDipi
and
knative-automation
authored
Upgrade dependencies (#4189)
* upgrade to latest dependencies bumping knative.dev/eventing ef6b31a...7c97e6f: > 7c97e6f Schduler: MAXFILLUP strategy will spread vreplicas across multiple pods (# 8263) Signed-off-by: Knative Automation <automation@knative.team> * Fix consumer group build error and remove unused configs Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Additional logging for sacura tests Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Increase nodes Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Additional logging Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Test knative/eventing#8388 Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Apply patch Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Increase sacura receiver timeout Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Point to real eventing dep Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Tmp: Shorter processing time Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> * Fix data race in watch and log resources Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> --------- Signed-off-by: Knative Automation <automation@knative.team> Signed-off-by: Pierangelo Di Pilato <pierdipi@redhat.com> Co-authored-by: Knative Automation <automation@knative.team>
1 parent db85e46 commit 2cde7b9

File tree

174 files changed

+6932
-3266
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

174 files changed

+6932
-3266
lines changed

‎control-plane/config/eventing-kafka-broker/200-controller/100-config-kafka-descheduler.yaml‎

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎control-plane/config/eventing-kafka-broker/200-controller/100-config-kafka-scheduler.yaml‎

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎control-plane/pkg/reconciler/consumergroup/controller.go‎

Lines changed: 8 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@ package consumergroup
1818

1919
import (
2020
"context"
21-
"encoding/json"
2221
"fmt"
2322
"strings"
2423
"time"
2524

2625
v1 "k8s.io/client-go/informers/core/v1"
2726

2827
"github.com/kelseyhightower/envconfig"
29-
"go.uber.org/multierr"
3028
"go.uber.org/zap"
3129
appsv1 "k8s.io/api/apps/v1"
3230
corev1 "k8s.io/api/core/v1"
@@ -45,7 +43,6 @@ import (
4543
kubeclient "knative.dev/pkg/client/injection/kube/client"
4644
"knative.dev/pkg/client/injection/kube/informers/apps/v1/statefulset"
4745
configmapinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/configmap"
48-
nodeinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/node"
4946
podinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/pod/filtered"
5047
secretinformer "knative.dev/pkg/client/injection/kube/informers/core/v1/secret"
5148
"knative.dev/pkg/configmap"
@@ -93,11 +90,9 @@ type envConfig struct {
9390
}
9491

9592
type SchedulerConfig struct {
96-
StatefulSetName string
97-
RefreshPeriod time.Duration
98-
Capacity int32
99-
SchedulerPolicy *scheduler.SchedulerPolicy
100-
DeSchedulerPolicy *scheduler.SchedulerPolicy
93+
StatefulSetName string
94+
RefreshPeriod time.Duration
95+
Capacity int32
10196
}
10297

10398
func NewController(ctx context.Context, watcher configmap.Watcher) *controller.Impl {
@@ -109,10 +104,8 @@ func NewController(ctx context.Context, watcher configmap.Watcher) *controller.I
109104
}
110105

111106
c := SchedulerConfig{
112-
RefreshPeriod: time.Duration(env.SchedulerRefreshPeriod) * time.Second,
113-
Capacity: env.PodCapacity,
114-
SchedulerPolicy: schedulerPolicyFromConfigMapOrFail(ctx, env.SchedulerPolicyConfigMap),
115-
DeSchedulerPolicy: schedulerPolicyFromConfigMapOrFail(ctx, env.DeSchedulerPolicyConfigMap),
107+
RefreshPeriod: time.Duration(env.SchedulerRefreshPeriod) * time.Second,
108+
Capacity: env.PodCapacity,
116109
}
117110

118111
dispatcherPodInformer := podinformer.Get(ctx, internalsapi.DispatcherLabelSelectorStr)
@@ -332,11 +325,9 @@ func createKafkaScheduler(ctx context.Context, c SchedulerConfig, ssName string,
332325
return createStatefulSetScheduler(
333326
ctx,
334327
SchedulerConfig{
335-
StatefulSetName: ssName,
336-
RefreshPeriod: c.RefreshPeriod,
337-
Capacity: c.Capacity,
338-
SchedulerPolicy: c.SchedulerPolicy,
339-
DeSchedulerPolicy: c.DeSchedulerPolicy,
328+
StatefulSetName: ssName,
329+
RefreshPeriod: c.RefreshPeriod,
330+
Capacity: c.Capacity,
340331
},
341332
func() ([]scheduler.VPod, error) {
342333
consumerGroups, err := lister.List(labels.SelectorFromSet(getSelectorLabel(ssName)))
@@ -380,12 +371,8 @@ func createStatefulSetScheduler(ctx context.Context, c SchedulerConfig, lister s
380371
ScaleCacheConfig: scheduler.ScaleCacheConfig{RefreshPeriod: statefulSetScaleCacheRefreshPeriod},
381372
PodCapacity: c.Capacity,
382373
RefreshPeriod: c.RefreshPeriod,
383-
SchedulerPolicy: scheduler.MAXFILLUP,
384-
SchedPolicy: c.SchedulerPolicy,
385-
DeschedPolicy: c.DeSchedulerPolicy,
386374
Evictor: newEvictor(ctx, zap.String("kafka.eventing.knative.dev/component", "evictor")).evict,
387375
VPodLister: lister,
388-
NodeLister: nodeinformer.Get(ctx).Lister(),
389376
PodLister: dispatcherPodInformer.Lister().Pods(system.Namespace()),
390377
})
391378

@@ -394,60 +381,3 @@ func createStatefulSetScheduler(ctx context.Context, c SchedulerConfig, lister s
394381
SchedulerConfig: c,
395382
}
396383
}
397-
398-
// schedulerPolicyFromConfigMapOrFail reads predicates and priorities data from configMap
399-
func schedulerPolicyFromConfigMapOrFail(ctx context.Context, configMapName string) *scheduler.SchedulerPolicy {
400-
p, err := schedulerPolicyFromConfigMap(ctx, configMapName)
401-
if err != nil {
402-
logging.FromContext(ctx).Fatal(zap.Error(err))
403-
}
404-
return p
405-
}
406-
407-
// schedulerPolicyFromConfigMap reads predicates and priorities data from configMap
408-
func schedulerPolicyFromConfigMap(ctx context.Context, configMapName string) (*scheduler.SchedulerPolicy, error) {
409-
policyConfigMap, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(system.Namespace()).Get(ctx, configMapName, metav1.GetOptions{})
410-
if err != nil {
411-
return nil, fmt.Errorf("couldn't get scheduler policy config map %s/%s: %v", system.Namespace(), configMapName, err)
412-
}
413-
414-
logger := logging.FromContext(ctx).
415-
Desugar().
416-
With(zap.String("configmap", configMapName))
417-
policy := &scheduler.SchedulerPolicy{}
418-
419-
preds, found := policyConfigMap.Data["predicates"]
420-
if !found {
421-
return nil, fmt.Errorf("missing policy config map %s/%s value at key predicates", system.Namespace(), configMapName)
422-
}
423-
if err := json.NewDecoder(strings.NewReader(preds)).Decode(&policy.Predicates); err != nil {
424-
return nil, fmt.Errorf("invalid policy %v: %v", preds, err)
425-
}
426-
427-
priors, found := policyConfigMap.Data["priorities"]
428-
if !found {
429-
return nil, fmt.Errorf("missing policy config map value at key priorities")
430-
}
431-
if err := json.NewDecoder(strings.NewReader(priors)).Decode(&policy.Priorities); err != nil {
432-
return nil, fmt.Errorf("invalid policy %v: %v", preds, err)
433-
}
434-
435-
if errs := validatePolicy(policy); errs != nil {
436-
return nil, multierr.Combine(err)
437-
}
438-
439-
logger.Info("Schedulers policy registration", zap.Any("policy", policy))
440-
441-
return policy, nil
442-
}
443-
444-
func validatePolicy(policy *scheduler.SchedulerPolicy) []error {
445-
var validationErrors []error
446-
447-
for _, priority := range policy.Priorities {
448-
if priority.Weight < scheduler.MinWeight || priority.Weight > scheduler.MaxWeight {
449-
validationErrors = append(validationErrors, fmt.Errorf("priority %s should have a positive weight applied to it or it has overflown", priority.Name))
450-
}
451-
}
452-
return validationErrors
453-
}

‎go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module knative.dev/eventing-kafka-broker
22

3-
go 1.22.0
3+
go 1.22.7
44

55
require (
66
github.com/IBM/sarama v1.43.3
@@ -28,17 +28,17 @@ require (
2828
go.uber.org/atomic v1.10.0
2929
go.uber.org/multierr v1.11.0
3030
go.uber.org/zap v1.27.0
31-
google.golang.org/protobuf v1.35.1
31+
google.golang.org/protobuf v1.35.2
3232
k8s.io/api v0.30.3
3333
k8s.io/apiextensions-apiserver v0.30.3
3434
k8s.io/apimachinery v0.30.3
3535
k8s.io/apiserver v0.30.3
3636
k8s.io/client-go v0.30.3
3737
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
38-
knative.dev/eventing v0.43.1-0.20241028083747-ef6b31a697e7
39-
knative.dev/hack v0.0.0-20241025103803-ef6e7e983a60
40-
knative.dev/pkg v0.0.0-20241026180704-25f6002b00f3
41-
knative.dev/reconciler-test v0.0.0-20241024141702-aae114c1c0e3
38+
knative.dev/eventing v0.43.1-0.20241223131119-c9047a198255
39+
knative.dev/hack v0.0.0-20241227080210-e92a16ae0893
40+
knative.dev/pkg v0.0.0-20241223131119-4c901591eb4a
41+
knative.dev/reconciler-test v0.0.0-20241223131247-96258bea6ce4
4242
sigs.k8s.io/controller-runtime v0.12.3
4343
sigs.k8s.io/yaml v1.4.0
4444
)
@@ -115,20 +115,20 @@ require (
115115
github.com/xdg-go/stringprep v1.0.4 // indirect
116116
go.uber.org/automaxprocs v1.6.0 // indirect
117117
golang.org/x/crypto v0.31.0 // indirect
118-
golang.org/x/mod v0.21.0 // indirect
119-
golang.org/x/net v0.30.0 // indirect
120-
golang.org/x/oauth2 v0.22.0 // indirect
118+
golang.org/x/mod v0.22.0 // indirect
119+
golang.org/x/net v0.31.0 // indirect
120+
golang.org/x/oauth2 v0.23.0 // indirect
121121
golang.org/x/sync v0.10.0 // indirect
122122
golang.org/x/sys v0.28.0 // indirect
123123
golang.org/x/term v0.27.0 // indirect
124124
golang.org/x/text v0.21.0 // indirect
125125
golang.org/x/time v0.6.0 // indirect
126-
golang.org/x/tools v0.26.0 // indirect
126+
golang.org/x/tools v0.27.0 // indirect
127127
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
128128
google.golang.org/api v0.183.0 // indirect
129-
google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142 // indirect
130-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142 // indirect
131-
google.golang.org/grpc v1.67.1 // indirect
129+
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
131+
google.golang.org/grpc v1.68.0 // indirect
132132
gopkg.in/inf.v0 v0.9.1 // indirect
133133
gopkg.in/yaml.v2 v2.4.0 // indirect
134134
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)