Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update go dependencies (#1240)

Browse Source 
NOTES for update k8s dependencies

In go.mod

require (
    k8s.io/api kubernetes-x.x.x
    k8s.io/apiextensions-apiserver kubernetes-x.x.x
    k8s.io/apimachinery kubernetes-x.x.x
    // check here https://github.com/kubernetes/client-go#compatibility-matrix
    k8s.io/client-go v12.0.0+incompatible
)
This commit is contained in:
Ta-Ching Chen
2019-08-23 16:17:12 +08:00
committed by GitHub
parent 31b8c1ee3b
commit ee18a88664
8 changed files with 317 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/canaryconfigmgr/prometheusClient.go
+11 -6
View File
@@ -21,7 +21,8 @@ import (
"time"
"github.com/pkg/errors"
promClient "github.com/prometheus/client_golang/api/prometheus"
prometheus "github.com/prometheus/client_golang/api"
prometheusv1 "github.com/prometheus/client_golang/api/prometheus/v1"
"github.com/prometheus/common/model"
"go.uber.org/zap"
"golang.org/x/net/context"
@@ -29,20 +30,20 @@ import (
type PrometheusApiClient struct {
logger *zap.Logger
client promClient.QueryAPI
client prometheusv1.API
}
func MakePrometheusClient(logger *zap.Logger, prometheusSvc string) (*PrometheusApiClient, error) {
promApiConfig := promClient.Config{
promApiConfig := prometheus.Config{
Address: prometheusSvc,
}
promApiClient, err := promClient.New(promApiConfig)
promApiClient, err := prometheus.NewClient(promApiConfig)
if err != nil {
return nil, errors.Wrapf(err, "error creating prometheus api client for svc: %s", prometheusSvc)
}
apiQueryClient := promClient.NewQueryAPI(promApiClient)
apiQueryClient := prometheusv1.NewAPI(promApiClient)
return &PrometheusApiClient{
logger: logger.Named("prometheus_api_client"),
@@ -124,11 +125,15 @@ func (promApiClient *PrometheusApiClient) GetTotalFailedRequestsToFuncInWindow(f
}
func (promApiClient *PrometheusApiClient) executeQuery(queryString string) (float64, error) {
val, err := promApiClient.client.Query(context.Background(), queryString, time.Now())
val, warn, err := promApiClient.client.Query(context.Background(), queryString, time.Now())
if err != nil {
return 0, errors.Wrapf(err, "error querying prometheus")
}
if warn != nil {
promApiClient.logger.Warn("receive prometheus client query warning", zap.Any("msg", warn))
}
switch {
case val.Type() == model.ValScalar:
scalarVal := val.(*model.Scalar)
pkg/executor/cms/cmscontroller.go
+2 -2
View File
@@ -68,7 +68,7 @@ func (csController *ConfigSecretController) Run(ctx context.Context) {
func initConfigmapController(logger *zap.Logger, fissionClient *crd.FissionClient,
kubernetesClient *kubernetes.Clientset, ndm *nd.NewDeploy, gpm *gpm.GenericPoolManager) (cache.Store, cache.Controller) {
resyncPeriod := 30 * time.Second
listWatch := cache.NewListWatchFromClient(kubernetesClient.Core().RESTClient(), "configmaps", metav1.NamespaceAll, fields.Everything())
listWatch := cache.NewListWatchFromClient(kubernetesClient.AppsV1().RESTClient(), "configmaps", metav1.NamespaceAll, fields.Everything())
store, controller := cache.NewInformer(listWatch, &apiv1.ConfigMap{}, resyncPeriod, cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) {},
DeleteFunc: func(obj interface{}) {},
@@ -116,7 +116,7 @@ func getConfigmapRelatedFuncs(logger *zap.Logger, m *metav1.ObjectMeta, fissionC
func initSecretController(logger *zap.Logger, fissionClient *crd.FissionClient,
kubernetesClient *kubernetes.Clientset, ndm *nd.NewDeploy, gpm *gpm.GenericPoolManager) (cache.Store, cache.Controller) {
resyncPeriod := 30 * time.Second
listWatch := cache.NewListWatchFromClient(kubernetesClient.Core().RESTClient(), "secrets", metav1.NamespaceAll, fields.Everything())
listWatch := cache.NewListWatchFromClient(kubernetesClient.AppsV1().RESTClient(), "secrets", metav1.NamespaceAll, fields.Everything())
store, controller := cache.NewInformer(listWatch, &apiv1.Secret{}, resyncPeriod, cache.ResourceEventHandlerFuncs{
AddFunc: func(obj interface{}) {},
DeleteFunc: func(obj interface{}) {},
pkg/logger/logger.go
+1 -1
View File
@@ -18,6 +18,7 @@ package logger
import (
"fmt"
"log"
"os"
"path/filepath"
"strings"
@@ -25,7 +26,6 @@ import (
"github.com/fission/fission/pkg/types"
"github.com/fission/fission/pkg/utils"
log "github.com/sirupsen/logrus"
"go.uber.org/zap"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"