merge upstream

Author: lingxiaojin

Dockerfile

@@ -1,7 +1,7 @@
 ARG PKGNAME
 
 # Build the manager binary
-FROM --platform=linux/amd64 golang:1.17.2-alpine as builder
+FROM golang:1.17.2-alpine as builder
 
 ARG LDFLAGS
 ARG PKGNAME
@@ -28,7 +28,7 @@ COPY cmd cmd/
 # Build
 RUN env
 RUN go build -ldflags="${LDFLAGS}" -a -o ${PKGNAME} /go/src/github.com/gocrane/crane/cmd/${PKGNAME}/main.go
-FROM --platform=linux/amd64 alpine:3.13.5
+FROM alpine:3.13.5
 RUN apk add --no-cache tzdata
 WORKDIR /
 ARG PKGNAME

Makefile

@@ -194,4 +194,4 @@ ifeq (, $(shell which mockgen))
 GO_MOCKGEN=$(shell go env GOPATH)/bin/mockgen
 else
 GO_MOCKGEN=$(shell which mockgen)
-endif
+endif

cmd/craned/app/manager.go

@@ -69,13 +69,13 @@ func NewManagerCommand(ctx context.Context) *cobra.Command {
 		Use:  "craned",
 		Long: `The crane manager is responsible for manage controllers in crane`,
 		Run: func(cmd *cobra.Command, args []string) {
-			klog.V(4).Infof("Data Source %v", opts.DataSource)
 			if err := opts.Complete(); err != nil {
 				klog.Exit(err)
 			}
 			if errs := opts.Validate(); len(errs) != 0 {
 				klog.Exit(errs)
 			}
+
 			if err := Run(ctx, opts); err != nil {
 				klog.Exit(err)
 			}
@@ -85,6 +85,7 @@ func NewManagerCommand(ctx context.Context) *cobra.Command {
 	cmd.Flags().AddGoFlagSet(flag.CommandLine)
 	opts.AddFlags(cmd.Flags())
 	utilfeature.DefaultMutableFeatureGate.AddFlag(cmd.Flags())
+
 	return cmd
 }
 

deploy/keys/ca.crt

@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICnDCCAYQCCQCovCBNnTUHfjANBgkqhkiG9w0BAQsFADAQMQ4wDAYDVQQDDAVj
+cmFuZTAeFw0yMjAyMjIxNDMyMTVaFw0zMjAyMjAxNDMyMTVaMBAxDjAMBgNVBAMM
+BWNyYW5lMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4uCY9tc8bpPq
+oklXEl3YvMWOo4n27EeCMmkFj+lA5hlg1mDjteqHWEU3P7I1DlNJ8aw+hGm7hKuC
+fQMOlBA2xjsN6//KKn5Nta0uqf6OCIyqWBkBG5uXdPFJ285fSQQKUjxppZja+sJ/
+W8rdZqYW3yx75Ky/dpXUyVT5cnLZSEwwnrh5PyYYCfMiSxwezO53WOY6ae/h6Rkc
+87VjLNKVj7amx2YLVV/3droj1LFjgSH3QMnMY7k/1ymVyc9bl+PqY2hDen4B/9wn
+yf112evverI9o2waZOBdTYYqUPQBL32aXAbZSZGOt22OUw2Jt6phgP8eXnk2700Z
+LbVyLR6H0QIDAQABMA0GCSqGSIb3DQEBCwUAA4IBAQBSXqAFvYZ8uqGfR2Za5LFs
+/xjcWtZYSJiVWT3e1mQYk+ppwG1D5dYsy7t3hZP3PF2wzleOxzeGIHgjwmnsjPZS
+jJG+dj1ow8KtIV6X7OGXDilgVrjk9hEaI8rSHYTxjeOe5ryKUVw0DQQpfrH5TUgT
+uXzXLwThyLZqyd32i07P0Qpln9IeDUs2GoNKlPNMTqKIybAX6Yo7Qbq1GKOlpmua
+IXmOeqbm3CTcQX23iVKOg5Dgtty025dEsk9r2DWoMV6mekJbj0S22wjzkd69H9Rk
+STenbymKwmCYQbSwdHgbxZ9UIE0p29BKmGjTuJxwPt4M2HEanpUo6jK5Uuflwgim
+-----END CERTIFICATE-----

deploy/keys/ca.key

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDi4Jj21zxuk+qi
+SVcSXdi8xY6jifbsR4IyaQWP6UDmGWDWYOO16odYRTc/sjUOU0nxrD6EabuEq4J9
+Aw6UEDbGOw3r/8oqfk21rS6p/o4IjKpYGQEbm5d08Unbzl9JBApSPGmlmNr6wn9b
+yt1mphbfLHvkrL92ldTJVPlyctlITDCeuHk/JhgJ8yJLHB7M7ndY5jpp7+HpGRzz
+tWMs0pWPtqbHZgtVX/d2uiPUsWOBIfdAycxjuT/XKZXJz1uX4+pjaEN6fgH/3CfJ
+/XXZ6+96sj2jbBpk4F1NhipQ9AEvfZpcBtlJkY63bY5TDYm3qmGA/x5eeTbvTRkt
+tXItHofRAgMBAAECggEAcqJ9Z6vVcyH2Gk3oWvVkP+2qZuOdCkIPfR0nnFGFYz5L
+eca3CAIapPVEN0D6IeTfpeccJ5etEhn+8t+KjDGtG3hXTnmOUu5CoZuByo8+gP9i
+SuVHdAWn/4Szhwa9io0qEedIkk2rx6xi4aSdPfKJ9/XoG+FVVLvcKmZvK+7v7uDs
+mNW5LcoywpLdx7I51WAcsMzOQ6vWAy5KX/lKnbdpxLYNpYNwvNAT0J3xQVFw5ugz
+bOZ9A429irCZ+pVq/d1gUaSndiz6VOqrg5y5yksBSNZkQYs/SD9pAH4Gn1dZ7Kwb
+OQbpqNnokqeFQVJn08+rmtfHFF/UUD7R6J2vu2BlSQKBgQD8hw6eN6slgydNqJOI
+yrAr8wTTTThMT3bmM9GrtdPa90u7H9yNEpPJnkdG/ixeZQXvkWckexGv6vCDrYdW
+Ikq/0f3KrRyyif2jOMjwGwrE2IrWUQg+uEZMfYUJTXC7SzrgoZfT8/ORXNajAwb0
+0uZFj+63YDOrG2FT0002cqInqwKBgQDl/z83QyLvVeDPOAxqmGSH6H1ba17GS/eM
+9lFCLgPxh6yJkYrGS5LTnvLHUiloT0OMMvsb+tD10+aH44qaVJ2WQEvNfsjieLDj
+DTzEpsyq48aqoJV74JA468f9PXqitVGN2sNb+9127NdlNNi6ipDvcFWcEn0UVsPR
+C+0vpQYicwKBgHg7SW91K8xRdI4Z/Bx9/IEAVMTSGELk9sRF2cc6bCLt6SWv1s9o
+D+tHq8IWVEOhL8FPZl9NJS+v2VGodi5BZ3uK3J357BbpclSbPbhr96WfQAMoU5eh
+Hv9eJ9A1Cb5y5BZ9eY9VsBr+q8azM0WvgCmQjOTMLe2CvMUvbqzEyYW/AoGAGxtW
+LAExoNuSP1nvvLBxSMNR4vBonx5c8rQlJ5Ocy16eKyiIHo7RozdcjblVQAH3iBKK
+HeYVsqNizCk5MK9AU3EIfhOvQWHQFzJ8MwElpg5qX7nFZHA3Dz5at7IDPiH4lqtt
+0u2AUH/hcwAjevjR1CZ9MIPNUhRXx8+MCM1+R5kCgYApajr4rgl+dwhUviIz6mcs
+lt7fYS7E3+8TXcMi5EEL/ZH7DDQS1UIaaxjeqzk/azaKCaAY0l54HY16nyJvqRjM
+hWC9pLjzm1xoVNwrmBslK/V8UCfMrCvs0t+tQ8oBHjbizxg2v8UIDYQbab5hu36B
+g9MpmmuxinDLk9u+ODqL/Q==
+-----END PRIVATE KEY-----

deploy/keys/tls.crt

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDOzCCAiOgAwIBAgIJAOoH7DJcyRC8MA0GCSqGSIb3DQEBBQUAMBAxDjAMBgNV
+BAMMBWNyYW5lMB4XDTIyMDIyMjE0MzIxNVoXDTMyMDIyMDE0MzIxNVowIjEgMB4G
+A1UEAwwXY3JhbmVkLmNyYW5lLXN5c3RlbS5zdmMwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDKCUNsbTOCMQc2/JsY/TUZv4M+3xy8a7+FSJCE182ieIBp
+qcSAvJckBV6htm2Q/2rtv3D3X2M/CUbX83wKcklIkmh/hFU+JG6MWJrh0UD3sVcN
+nLYCh1Ds54heNWvoMrbgSQfAXMSaFepUM53sXur3pJ3BeBa6CLbJ3JZxWFGIv/mW
+FJTTa9/4129MCGf2+O3zh6mHGeepXCHPz45NTJngxCMg7p1i66jz9QDK2OIDGklm
+KVhLHVSkE/ULSuVeP8Z+yoTIbwNW+4uRE9+2taOhfeHW2I81lvxTVUeTCnqPkMfL
+85ZJNtNRrz9+3IrgbjFi8RtvC6QuBGd7BGtd5a1RAgMBAAGjgYUwgYIwCQYDVR0T
+BAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MEkGA1UdEQRCMECCF2NyYW5lZC5jcmFuZS1zeXN0ZW0uc3ZjgiVjcmFuZWQuY3Jh
+bmUtc3lzdGVtLnN2Yy5jbHVzdGVyLmxvY2FsMA0GCSqGSIb3DQEBBQUAA4IBAQBY
+kAp5gX457l4LZC6B2aK1UjGK4Ejn/Q4nHHTXcFUm/7KYyRy7WvR3fwWwNqM43k1r
+b0+Kf8H5oAEyseIyuUanYUD4HcGGWtbM9Jxil8xkWPG/rhBIbHDRGXJJWE245U9W
+NpllFj/OlQan9cn+dcj0ds9lGPqsMSe5ryyFjIThxMYkAifRJjM2fLFja1e7nGig
+xJfAY+DXmbbA2K7FtvbGeBcMxBlT0PGeQhIeY6ETIP3Qlpg2ymt2iz0/Ur3O9uVb
+PPI9a3b5tXmgEC7+50YUXls0eJDfXV/7eY/yIn9Tfcj2DogtpV33rLXz/5/Wqiw9
+eALeHCfh8fc8ewDYORKR
+-----END CERTIFICATE-----

deploy/keys/tls.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAyglDbG0zgjEHNvybGP01Gb+DPt8cvGu/hUiQhNfNoniAaanE
+gLyXJAVeobZtkP9q7b9w919jPwlG1/N8CnJJSJJof4RVPiRujFia4dFA97FXDZy2
+AodQ7OeIXjVr6DK24EkHwFzEmhXqVDOd7F7q96SdwXgWugi2ydyWcVhRiL/5lhSU
+02vf+NdvTAhn9vjt84ephxnnqVwhz8+OTUyZ4MQjIO6dYuuo8/UAytjiAxpJZilY
+Sx1UpBP1C0rlXj/GfsqEyG8DVvuLkRPftrWjoX3h1tiPNZb8U1VHkwp6j5DHy/OW
+STbTUa8/ftyK4G4xYvEbbwukLgRnewRrXeWtUQIDAQABAoIBAFlBeGj5YW0d7dsM
+BBUpIAFtCzWGafKQA3+FjFsz36PsaobDuo1JQ9hlCuaUaplJTdsU3XpbyMO7fHHB
+HsaasOd/zuyu8N3QSIp2Ro6G3JXQ4e2gkwRQ9Z6Dt0ovfamKZiJ2AReppC2SiwCC
+AT3AvTuEnTEwtZGgceiCLHCMnRC1PkGbZbUBBU7+q9djOSnh8/bCL4qY1+dilfLI
+e1MUm0SJcz2X0YMU/1X2oZOb8QPWb35B2qpoDJ8slYJu+QR81xYlYhlNzoi8rE8B
+heEW1kwK09jraSlNsdLuYmb4/fW1jm83/W+2cgRErShQtT08CLCwOTDv61XyHElj
+oWzRSkECgYEA5UwPOg9ZAsAQ1q67WbrKZQyZ8WdGWOWXT+Oeb/40nowRsUXV1iQY
+3l9sy5GbsRFqdiwxQu35RtF8jl35/P/4hrxCpKkML7YhmqPSjzSVOfSZRCmXCtGo
+ugo8ERd8G8FnbI3TTvZeKPjiTbxDwcvjPWV82N76a+mnqUTCFe49YykCgYEA4ZB8
+NrI5aYHqkQcO/4ew0l9BxJEbCkaCib4oNG0sqzRCMJNaW50XZqGr45xO4NsgifcM
+5eOnyhm0gu+FIgW4DJU/RbgPbBx35IiDB1PDGcNgff1VuqNWXM5GCdPrM8P4mc9g
+mQaKqhfObRHQD2sO+zLcLhwoWQuTVvysJYbVpekCgYEA4+MZ5wxF3LPiiFsUnHNG
+n/NMNF39znAwWBfS6V9uEH0JQHQ1uCQcCzYvvIo0gGDcvCHju68j5jxhXGUOBWKp
+L89/NINGN0z+TOCwbd9GyFjO0q27Deedl3iAhkQe9r7a+UpjTsEQiAwDblrDxKHM
+cMKiuC+0Fvgbx+EsO/uRSzECgYEAuYMnZaS26ztaO+TeRPLITnzhjlT5ND5BZh/q
+2RNhRX05YtIN4oMUl+gngo8voGcYH9/7z6aofOMfPwDXMeAaOt8UprZ2mKfhQyey
++/e74hh556TPOSzU/ob3u2V7b5uhfn68J57ltHbX44Re5g9axuZRh+rIlFOc3lH5
+EvQOCuECgYACvvR0hUnc23jasMaspPUFMQry1ZLkDtG/Xs+QYVHAJYzDKdZEGh3T
+osMBx6I76l37Z5DcNroXIdRAQRWULiQb2zVLhoKb7sEtfl6f9AgVsWB2/R5UxuJu
+Jtp5g3iR6rwwIebpb4SGUep0rezyxYpYxZLw2dv0PKXsu477B0P7Vw==
+-----END RSA PRIVATE KEY-----

pkg/controller/timeseriesprediction/status.go

@@ -49,7 +49,7 @@ func (tc *Controller) syncPredictionStatus(ctx context.Context, tsPrediction *pr
 		predictionStart := windowStart
 		// double the time to predict so that crd consumer always see time series range [now, now + PredictionWindowSeconds] in PredictionWindowSeconds window
 		predictionEnd := predictionStart.Add(time.Duration(tsPrediction.Spec.PredictionWindowSeconds) * time.Second * 2)
-		// doPredict必然发生在initFromHistory之后，因为doPredict中会通过WithQuery向predictor注册查询，这个注册过程是串行的
+		// doPredict must happen after initFromHistory
 		predictedData, predictErr := tc.doPredict(tsPrediction, predictionStart, predictionEnd)
 		newStatus.PredictionMetrics = predictedData
 		if predictErr != nil {
@@ -178,10 +178,10 @@ func (tc *Controller) doPredict(tsPrediction *predictionapi.TimeSeriesPrediction
 			continue
 		}
 		predictedData := CommonTimeSeries2ApiTimeSeries(data)
-		if klog.V(4).Enabled() {
+		if klog.V(6).Enabled() {
 			apiDataBytes, err1 := json.Marshal(predictedData)
 			dataBytes, err2 := json.Marshal(data)
-			klog.V(4).Infof("DoPredict predicted data details, key: %v, queryExpr: %v, apiData: %v, predictData: %v, errs: %+v", klog.KObj(tsPrediction), namer.BuildUniqueKey(), string(apiDataBytes), string(dataBytes), []error{err1, err2})
+			klog.V(6).Infof("DoPredict predicted data details, key: %v, queryExpr: %v, apiData: %v, predictData: %v, errs: %+v", klog.KObj(tsPrediction), namer.BuildUniqueKey(), string(apiDataBytes), string(dataBytes), []error{err1, err2})
 		}
 		status.Prediction = predictedData