Skip to content

Commit

Permalink
Update dependencies (#131)
Browse files Browse the repository at this point in the history 
/cherry-pick

Signed-off-by: 1gtm <1gtm@appscode.com>
  • Loading branch information
@1gtm
1gtm authored Aug 27, 2021
1 parent f9b4bcc commit 3d1a293
Show file tree
Hide file tree
Showing 7 changed files with 63 additions and 50 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ require (
gomodules.xyz/logs v0.0.4
gomodules.xyz/pointer v0.1.0
gomodules.xyz/runtime v0.2.0
gomodules.xyz/sets v0.2.0 // indirect
gomodules.xyz/x v0.0.7
k8s.io/api v0.21.1
k8s.io/apimachinery v0.21.1
Expand All @@ -20,7 +19,8 @@ require (
k8s.io/klog/v2 v2.8.0
k8s.io/kubectl v0.21.1
kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f
kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9
kmodules.xyz/custom-resources v0.0.0-20210812193424-1631fae03a1a // indirect
kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e
kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d
kmodules.xyz/openshift v0.0.0-20210618001443-f2507caa512f
kmodules.xyz/webhook-runtime v0.0.0-20210804101750-5c602fd5cf06 // indirect
Expand Down
7 changes: 5 additions & 2 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -982,6 +982,7 @@ gomodules.xyz/blobfs v0.1.7/go.mod h1:DTBwaFUwRuDuk/rqpmgINkmo1fQR8oNMjj1DihfCpg
gomodules.xyz/cert v1.2.0/go.mod h1:3p4FzumuJeDY0l+Byr3zK5vRL8f1r2RxyamgGWncDso=
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f h1:hTyhR4r+tj1Uq7/PpFxLTzbeA0LhMVp7bEYfhkzFjdY=
gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f/go.mod h1:K3m7N+nBOlf91/tpv8REUGwsAgaKFwElQCuiLhm12AQ=
gomodules.xyz/encoding v0.0.2/go.mod h1:ZD+5Llh/9P/xTqoiurjs2w3XfAV2jNtsh04FbucIpLw=
gomodules.xyz/envsubst v0.1.0/go.mod h1:2o5f7bd13XIITbE2ZKieE05YkqB2KDoZkqKccGebduA=
gomodules.xyz/flags v0.1.0/go.mod h1:H9lmar5MMXuxHBrSgrGZt4q2gkD+8GCm/3Fs2FCE2zA=
gomodules.xyz/flags v0.1.2 h1:z/XHHGmduLYY/aSkzcQWJgXWIs3TCTSTLkmwtCjoizg=
Expand Down Expand Up @@ -1151,11 +1152,13 @@ kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f/go.mod h1:0gkPeALtYjB2
kmodules.xyz/constants v0.0.0-20210218100002-2c304bfda278/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY=
kmodules.xyz/crd-schema-fuzz v0.0.0-20210618002152-fae23aef5fb4/go.mod h1:IIkUctlfoptoci0BOrsUf8ya+MOG5uaeh1PE4uzaIbA=
kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM=
kmodules.xyz/custom-resources v0.0.0-20210715200638-d7eae69a48fb h1:aDSJPD5bkB8dLbZDnvvikOQSqo+eH9U39aG6QYGf4Yg=
kmodules.xyz/custom-resources v0.0.0-20210715200638-d7eae69a48fb/go.mod h1:VYtz1fgHgLqCk+sdSUGBClfZfJ6z4873wB5MYOXxpS8=
kmodules.xyz/custom-resources v0.0.0-20210812193424-1631fae03a1a h1:ivsga5FiRMpVr+WlFF3BxkAHchJ2B+HQUeqtbhZjfyo=
kmodules.xyz/custom-resources v0.0.0-20210812193424-1631fae03a1a/go.mod h1:VYtz1fgHgLqCk+sdSUGBClfZfJ6z4873wB5MYOXxpS8=
kmodules.xyz/monitoring-agent-api v0.0.0-20210618005119-a8c212adc2bf/go.mod h1:QsbPe5SefM7XmLzJgdMX/1iXxwqAC1Do1eHa98TCq3k=
kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9 h1:ezrR+Up8kiD8b/xLoDanGQ+DqM4acunR+LGkmQJXSB4=
kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9/go.mod h1:8sCfgZQImwjTLh2mDxYiim6+GecFN+DamkPSF9joyu4=
kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e h1:e9Q0JFAWPmhjGYmNa9OBxewV3SKf82ZDJ1h0b7YdRms=
kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e/go.mod h1:Tkcf9uTplnrJ6C8o0zlw2kpgS1SaWAiMO5P2YgLjTo8=
kmodules.xyz/offshoot-api v0.0.0-20210618005544-5217a24765da/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns=
kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d h1:RXuVF3wMeqR+GMgZA7nK2WnsJ63pCnz56KyQpu+0obQ=
kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d/go.mod h1:3LECbAL3FgbyK80NP3V3Pmiuo/a3hFWg/PR6SPFhTns=
Expand Down
23 changes: 13 additions & 10 deletions vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.proto
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 13 additions & 10 deletions vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/metricsconfiguration_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,23 +282,26 @@ type MetricValue struct {
//
// Available expression evaluation functions are:
//
// toInt() returns 1 if the expression is true otherwise 0,
// example: toInt(phase == 'Running')
// int() returns 1 if the expression is true otherwise 0,
// example: int(phase == 'Running')
//
// evaluatePercentage(a, b) returns the value of (a * b%)
// example: evaluatePercentage(replicas, maxUnavailable)
// percentage(a, b) returns the value of (a * b%)
// example: percentage(replicas, maxUnavailable)
//
// calculateCPU() returns the cpu in unit core
// example: calculateCPU(cpu), for cpu value 150m, it will return 0.15
// cpuCores() returns the cpu in unit core
// example: cpuCores(cpu), for cpu value 150m, it will return 0.15
//
// calculateMemory() returns the memory size in byte
// example: calculateMemory(memory), for memory value 1 ki, it will return 1024
// bytes() returns the memory size in byte
// example: bytes(memory), for memory value 1 ki, it will return 1024
//
// toUnix() returns the DateTime string into unix format.
// example: toUnix(dateTime) will return the corresponding unix value for the given dateTime
// unix() returns the DateTime string into unix format.
// example: unix(dateTime) will return the corresponding unix value for the given dateTime
//
// in above examples phase, replicas, maxUnavailable, cpu, memory, dateTime are Parameter's key
// those values will come from corresponding Parameter's value
//
// Some expression evaluation functions are used for calculating resource requests and limits.
// Those functions are stated here: https://github.com/kmodules/resource-metrics/blob/master/eval.go
// +optional
ValueFromExpression string `json:"valueFromExpression,omitempty" protobuf:"bytes,3,opt,name=valueFromExpression"`
}
Expand Down
2 changes: 1 addition & 1 deletion vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 26 additions & 22 deletions vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,20 +144,22 @@ spec:
description: "ValueFromExpression contains an expression
for the metric value expression can be a function as well.
Parameters is used in the expression string \n Available
expression evaluation functions are: \n toInt() returns
1 if the expression is true otherwise 0, example: toInt(phase
== 'Running') \n evaluatePercentage(a, b) returns the
value of (a * b%) example: evaluatePercentage(replicas,
maxUnavailable) \n calculateCPU() returns the cpu in unit
core example: calculateCPU(cpu), for cpu value 150m, it
will return 0.15 \n calculateMemory() returns the memory
size in byte example: calculateMemory(memory), for memory
value 1 ki, it will return 1024 \n toUnix() returns the
DateTime string into unix format. example: toUnix(dateTime)
expression evaluation functions are: \n int() returns
1 if the expression is true otherwise 0, example: int(phase
== 'Running') \n percentage(a, b) returns the value of
(a * b%) example: percentage(replicas, maxUnavailable)
\n cpuCores() returns the cpu in unit core example: cpuCores(cpu),
for cpu value 150m, it will return 0.15 \n bytes() returns
the memory size in byte example: bytes(memory), for memory
value 1 ki, it will return 1024 \n unix() returns the
DateTime string into unix format. example: unix(dateTime)
will return the corresponding unix value for the given
dateTime \n in above examples phase, replicas, maxUnavailable,
cpu, memory, dateTime are Parameter's key those values
will come from corresponding Parameter's value"
will come from corresponding Parameter's value \n Some
expression evaluation functions are used for calculating
resource requests and limits. Those functions are stated
here: https://github.com/kmodules/resource-metrics/blob/master/eval.go"
type: string
valueFromPath:
description: "ValueFromPath contains the field path of the
Expand Down Expand Up @@ -255,22 +257,24 @@ spec:
expression for the metric value expression can
be a function as well. Parameters is used in
the expression string \n Available expression
evaluation functions are: \n toInt() returns
1 if the expression is true otherwise 0, example:
toInt(phase == 'Running') \n evaluatePercentage(a,
b) returns the value of (a * b%) example: evaluatePercentage(replicas,
maxUnavailable) \n calculateCPU() returns the
cpu in unit core example: calculateCPU(cpu),
for cpu value 150m, it will return 0.15 \n calculateMemory()
returns the memory size in byte example: calculateMemory(memory),
evaluation functions are: \n int() returns 1
if the expression is true otherwise 0, example:
int(phase == 'Running') \n percentage(a, b)
returns the value of (a * b%) example: percentage(replicas,
maxUnavailable) \n cpuCores() returns the cpu
in unit core example: cpuCores(cpu), for cpu
value 150m, it will return 0.15 \n bytes() returns
the memory size in byte example: bytes(memory),
for memory value 1 ki, it will return 1024 \n
toUnix() returns the DateTime string into unix
format. example: toUnix(dateTime) will return
unix() returns the DateTime string into unix
format. example: unix(dateTime) will return
the corresponding unix value for the given dateTime
\n in above examples phase, replicas, maxUnavailable,
cpu, memory, dateTime are Parameter's key those
values will come from corresponding Parameter's
value"
value \n Some expression evaluation functions
are used for calculating resource requests and
limits. Those functions are stated here: https://github.com/kmodules/resource-metrics/blob/master/eval.go"
type: string
valueFromPath:
description: "ValueFromPath contains the field
Expand Down
6 changes: 3 additions & 3 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,6 @@ gomodules.xyz/pointer
## explicit
gomodules.xyz/runtime
# gomodules.xyz/sets v0.2.0
## explicit
gomodules.xyz/sets
# gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545
gomodules.xyz/wait
Expand Down Expand Up @@ -676,7 +675,8 @@ kmodules.xyz/client-go/tools/clientcmd
kmodules.xyz/client-go/tools/clusterid
kmodules.xyz/client-go/tools/exec
kmodules.xyz/client-go/tools/pushgateway
# kmodules.xyz/custom-resources v0.0.0-20210715200638-d7eae69a48fb
# kmodules.xyz/custom-resources v0.0.0-20210812193424-1631fae03a1a
## explicit
kmodules.xyz/custom-resources/apis/appcatalog
kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1
kmodules.xyz/custom-resources/apis/auditor
Expand All @@ -689,7 +689,7 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/appcatalog/v1alph
kmodules.xyz/custom-resources/client/clientset/versioned/typed/auditor/v1alpha1
kmodules.xyz/custom-resources/client/clientset/versioned/typed/metrics/v1alpha1
kmodules.xyz/custom-resources/crds
# kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9
# kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e
## explicit
kmodules.xyz/objectstore-api/api/v1
# kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d
Expand Down

0 comments on commit 3d1a293

Please sign in to comment.