Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ site/resources
site/public
site/.hugo_build.lock
site/node_modules
site/package-lock.json
site/package-lock.json
_output/
25 changes: 25 additions & 0 deletions cmd/craned/app/manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,31 @@ func initControllers(ctx context.Context, oomRecorder oom.Recorder, mgr ctrl.Man
if err := tspController.SetupWithManager(mgr, opts.TimeSeriesPredictionMaxConcurrentReconciles); err != nil {
klog.Exit(err, "unable to create controller", "controller", "TspController")
}
// Initialize tspTemplateStore
tspTemplateStore := timeseriesprediction.NewTSPTemplateStore()

// Initialize and start TSP template ConfigMap Controller
tspTemplateConfigMapReconciler := &timeseriesprediction.TSPTemplateConfigMapReconciler{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
TemplateStore: tspTemplateStore,
ConfigMapName: timeseriesprediction.DefaultTSPTemplateConfigMapName,
Namespace: timeseriesprediction.DefaultTSPTemplateConfigMapNamespace,
}
if err := tspTemplateConfigMapReconciler.SetupWithManager(mgr); err != nil {
klog.Exit(err, "unable to create controller", "controller", "TSPTemplateConfigMapReconciler")
}

// Register TimeseriesPredictionRuleController
if err := (&timeseriesprediction.TimeSeriesPredictionRuleController{
Client: mgr.GetClient(),
Scheme: mgr.GetScheme(),
Recorder: mgr.GetEventRecorderFor("timeseriespredictionrule-controller"),
TargetFetcher: targetSelectorFetcher,
TemplateStore: tspTemplateStore,
}).SetupWithManager(mgr); err != nil {
klog.Exit(err, "unable to create controller", "controller", "TimeseriesPredictionRuleController")
}
}

// TODO(qmhu), change feature gate from analysis to recommendation
Expand Down
86 changes: 43 additions & 43 deletions docs/images/crane.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -220,3 +220,7 @@ replace (
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.22.3
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.22.3
)

replace (
github.com/gocrane/api => git.woa.com/lingxiaojin/craneapi.git v0.13.0
)
1 change: 1 addition & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RX
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
git.woa.com/lingxiaojin/craneapi.git v0.13.0/go.mod h1:GxI+t9AW8+NsHkz2JkPBIJN//9eLUjTZl1ScYAbXMbk=
github.com/Azure/azure-sdk-for-go v55.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
Expand Down
3 changes: 2 additions & 1 deletion pkg/controller/timeseriesprediction/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (c *MetricContext) WithApiConfig(conf *predictionapi.PredictionMetric) {
}
klog.InfoS("WithApiConfig WithQuery registered succeed", "tsp", klog.KObj(c.SeriesPrediction), "queryStr", queryStr)
} else {
klog.InfoS("WithApiConfig predictor %v not found, ignore tsp %v", conf.Algorithm.AlgorithmType, klog.KObj(c.SeriesPrediction))
klog.Infof("WithApiConfig predictor %v not found, ignore tsp %v", conf.Algorithm.AlgorithmType, klog.KObj(c.SeriesPrediction))
}
}

Expand Down Expand Up @@ -191,5 +191,6 @@ func (c *MetricContext) ConvertApiMetric2InternalConfig(metric *predictionapi.Pr
return &predconf.Config{
DSP: metric.Algorithm.DSP,
Percentile: metric.Algorithm.Percentile,
SP: metric.Algorithm.SP,
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: tsp-templates-configmap
namespace: crane-system
data:
Resource: |
predictionWindowSeconds: 86400
predictionMetrics:
- resourceIdentifier: workload-cpu
type: ExpressionQuery
expressionQuery:
expression: "max(rate(container_cpu_usage_seconds_total{namespace=\"%s\", pod=~\"%s\", container=\"\"}[3m]))"
algorithm:
algorithmType: SegmentedPercentile
sp:
histogram:
bucketSize: "0.01"
epsilon: "1e-10"
maxValue: "10.0"
halfLife: "0h"
minSampleWeight: "1.0"
sampleInterval: "5m"
historyLength: "24h"
Loading
Loading