mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-04 09:49:50 +00:00
Added GCM support for Initial Resources plugin
This commit is contained in:
parent
767445c87f
commit
9a1ec3dfb5
@ -134,7 +134,7 @@ function create-master-instance {
|
|||||||
--image "${MASTER_IMAGE}" \
|
--image "${MASTER_IMAGE}" \
|
||||||
--tags "${MASTER_TAG}" \
|
--tags "${MASTER_TAG}" \
|
||||||
--network "${NETWORK}" \
|
--network "${NETWORK}" \
|
||||||
--scopes "storage-ro,compute-rw,logging-write" \
|
--scopes "storage-ro,compute-rw,monitoring,logging-write" \
|
||||||
--can-ip-forward \
|
--can-ip-forward \
|
||||||
--metadata-from-file \
|
--metadata-from-file \
|
||||||
"startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
|
"startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
|
||||||
|
@ -147,7 +147,7 @@ function create-master-instance {
|
|||||||
--image "${MASTER_IMAGE}" \
|
--image "${MASTER_IMAGE}" \
|
||||||
--tags "${MASTER_TAG}" \
|
--tags "${MASTER_TAG}" \
|
||||||
--network "${NETWORK}" \
|
--network "${NETWORK}" \
|
||||||
--scopes "storage-ro,compute-rw,logging-write" \
|
--scopes "storage-ro,compute-rw,monitoring,logging-write" \
|
||||||
--can-ip-forward \
|
--can-ip-forward \
|
||||||
--metadata-from-file \
|
--metadata-from-file \
|
||||||
"startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
|
"startup-script=${KUBE_ROOT}/cluster/gce/configure-vm.sh,kube-env=${KUBE_TEMP}/master-kube-env.yaml" \
|
||||||
|
@ -180,13 +180,3 @@ func (s *influxdbSource) GetUsagePercentile(kind api.ResourceName, perc int64, i
|
|||||||
}
|
}
|
||||||
return int64(usage), int64(count), nil
|
return int64(usage), int64(count), nil
|
||||||
}
|
}
|
||||||
|
|
||||||
type gcmSource struct{}
|
|
||||||
|
|
||||||
func newGcmSource() (dataSource, error) {
|
|
||||||
return &gcmSource{}, fmt.Errorf("gcm source not implemented")
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *gcmSource) GetUsagePercentile(kind api.ResourceName, perc int64, image string, exactMatch bool, start, end time.Time) (int64, int64, error) {
|
|
||||||
return 0, 0, fmt.Errorf("gcm source not implemented")
|
|
||||||
}
|
|
||||||
|
124
plugin/pkg/admission/initialresources/gcm.go
Normal file
124
plugin/pkg/admission/initialresources/gcm.go
Normal file
@ -0,0 +1,124 @@
|
|||||||
|
/*
|
||||||
|
Copyright 2015 The Kubernetes Authors All rights reserved.
|
||||||
|
|
||||||
|
Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
you may not use this file except in compliance with the License.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package initialresources
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math"
|
||||||
|
"sort"
|
||||||
|
"time"
|
||||||
|
|
||||||
|
"k8s.io/kubernetes/pkg/api"
|
||||||
|
|
||||||
|
gcm "github.com/google/google-api-go-client/cloudmonitoring/v2beta2"
|
||||||
|
"golang.org/x/oauth2"
|
||||||
|
"golang.org/x/oauth2/google"
|
||||||
|
gce "google.golang.org/cloud/compute/metadata"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
kubePrefix = "custom.cloudmonitoring.googleapis.com/kubernetes.io/"
|
||||||
|
cpuMetricName = kubePrefix + "cpu/usage_rate"
|
||||||
|
memMetricName = kubePrefix + "memory/usage"
|
||||||
|
labelImage = kubePrefix + "label/container_base_image"
|
||||||
|
)
|
||||||
|
|
||||||
|
type gcmSource struct {
|
||||||
|
project string
|
||||||
|
gcmService *gcm.Service
|
||||||
|
}
|
||||||
|
|
||||||
|
func newGcmSource() (dataSource, error) {
|
||||||
|
// Detect project ID
|
||||||
|
projectId, err := gce.ProjectID()
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create Google Cloud Monitoring service.
|
||||||
|
client := oauth2.NewClient(oauth2.NoContext, google.ComputeTokenSource(""))
|
||||||
|
s, err := gcm.New(client)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
return &gcmSource{
|
||||||
|
project: projectId,
|
||||||
|
gcmService: s,
|
||||||
|
}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *gcmSource) query(metric, oldest, youngest, label, pageToken string) (*gcm.ListTimeseriesResponse, error) {
|
||||||
|
req := s.gcmService.Timeseries.List(s.project, metric, youngest, nil).
|
||||||
|
Oldest(oldest).
|
||||||
|
Labels(label).
|
||||||
|
Aggregator("mean").
|
||||||
|
Window("1m")
|
||||||
|
if pageToken != "" {
|
||||||
|
req = req.PageToken(pageToken)
|
||||||
|
}
|
||||||
|
return req.Do()
|
||||||
|
}
|
||||||
|
|
||||||
|
func retrieveRawSamples(res *gcm.ListTimeseriesResponse, output *[]int) {
|
||||||
|
for _, ts := range res.Timeseries {
|
||||||
|
for _, p := range ts.Points {
|
||||||
|
*output = append(*output, int(p.DoubleValue))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *gcmSource) GetUsagePercentile(kind api.ResourceName, perc int64, image string, exactMatch bool, start, end time.Time) (int64, int64, error) {
|
||||||
|
var metric string
|
||||||
|
if kind == api.ResourceCPU {
|
||||||
|
metric = cpuMetricName
|
||||||
|
} else if kind == api.ResourceMemory {
|
||||||
|
metric = memMetricName
|
||||||
|
}
|
||||||
|
|
||||||
|
var label string
|
||||||
|
if exactMatch {
|
||||||
|
label = labelImage + "==" + image
|
||||||
|
} else {
|
||||||
|
label = labelImage + "=~" + image + ".*"
|
||||||
|
}
|
||||||
|
|
||||||
|
oldest := start.Format(time.RFC3339)
|
||||||
|
youngest := end.Format(time.RFC3339)
|
||||||
|
|
||||||
|
rawSamples := make([]int, 0)
|
||||||
|
pageToken := ""
|
||||||
|
for {
|
||||||
|
res, err := s.query(metric, oldest, youngest, label, pageToken)
|
||||||
|
if err != nil {
|
||||||
|
return 0, 0, err
|
||||||
|
}
|
||||||
|
|
||||||
|
retrieveRawSamples(res, &rawSamples)
|
||||||
|
|
||||||
|
pageToken = res.NextPageToken
|
||||||
|
if pageToken == "" {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
count := len(rawSamples)
|
||||||
|
sort.Ints(rawSamples)
|
||||||
|
usageIndex := int64(math.Ceil(float64(count)*9/10)) - 1
|
||||||
|
usage := rawSamples[usageIndex]
|
||||||
|
|
||||||
|
return int64(usage), int64(count), nil
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user