From 8cca68975e6462152b4f2e4bc223bde808480ca2 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Fri, 27 Aug 2021 12:14:49 -0700 Subject: [PATCH] [cherry-pick] Update dependencies (#873) (#874) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 5 +- go.sum | 8 +- .../apis/metrics/v1alpha1/generated.pb.go | 145 +++-- .../apis/metrics/v1alpha1/generated.proto | 23 +- .../v1alpha1/metricsconfiguration_types.go | 25 +- .../metrics/v1alpha1/openapi_generated.go | 3 +- .../metrics/v1alpha1/zz_generated.deepcopy.go | 6 +- ...ppcatalog.appscode.com_appbindings.v1.yaml | 225 ------- .../appcatalog.appscode.com_appbindings.yaml | 390 ++++++------ .../kmodules.xyz/custom-resources/crds/lib.go | 9 +- ...appscode.com_metricsconfigurations.v1.yaml | 334 ---------- ...cs.appscode.com_metricsconfigurations.yaml | 601 +++++++++--------- vendor/modules.txt | 7 +- 13 files changed, 622 insertions(+), 1159 deletions(-) delete mode 100644 vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml delete mode 100644 vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.v1.yaml diff --git a/go.mod b/go.mod index 0b9078841..853e3c080 100644 --- a/go.mod +++ b/go.mod @@ -3,20 +3,19 @@ module stash.appscode.dev/postgres go 1.15 require ( - github.com/json-iterator/go v1.1.11 // indirect github.com/spf13/cobra v1.1.3 go.bytebuilders.dev/license-verifier/kubernetes v0.9.3 gomodules.xyz/flags v0.1.2 gomodules.xyz/go-sh v0.1.0 gomodules.xyz/logs v0.0.4 - 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 k8s.io/client-go v0.21.1 k8s.io/klog/v2 v2.8.0 kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f - kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153 + kmodules.xyz/custom-resources v0.0.0-20210812193424-1631fae03a1a + kmodules.xyz/objectstore-api v0.0.0-20210817052835-df749235585e // indirect kmodules.xyz/offshoot-api v0.0.0-20210804100837-d0388be3e60d stash.appscode.dev/apimachinery v0.15.0 ) diff --git a/go.sum b/go.sum index 7c6e57b38..3655985f0 100644 --- a/go.sum +++ b/go.sum @@ -882,6 +882,7 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= 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/flags v0.1.2 h1:z/XHHGmduLYY/aSkzcQWJgXWIs3TCTSTLkmwtCjoizg= gomodules.xyz/flags v0.1.2/go.mod h1:CIzWYc2zYDs5lQyGJsjhqKgIj+LriNLpiYuX8Pk34gc= gomodules.xyz/go-sh v0.1.0 h1:1BJAuGREh2RhePt7HRrpmjnkbgfpXlCzc42SiyZ5dkc= @@ -1018,16 +1019,19 @@ k8s.io/system-validators v1.4.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6g k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw= k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= kmodules.xyz/client-go v0.0.0-20210617233340-13d22e91512b/go.mod h1:A6GAK6xP5zBuWK6A/vUkkjKzcuywkms7fIxRf5wblO4= +kmodules.xyz/client-go v0.0.0-20210715065708-d4f0cc74ead1/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M= kmodules.xyz/client-go v0.0.0-20210719120358-dd0503cf99cf/go.mod h1:E/vGngai00UtVwP8R4PWpPUBF/EZa6Ub9WS5+tVcs4M= kmodules.xyz/client-go v0.0.0-20210822203828-5e9cebbf1dfa/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f h1:yesFlt5yHpnklVxbVZWOQD2lWB5ETu85e1FGHdAorwg= kmodules.xyz/client-go v0.0.0-20210827153326-54ead9c6225f/go.mod h1:0gkPeALtYjB27OHt4rd6+ZmMgoVTHVLtEJQeU23/gtA= 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 h1:Hx2eTxUFKbOFXSd3ZdVANVNTf7QiA/6FpvmgO/JHVpA= kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153/go.mod h1:/NLuNSf299U0XVuNEh2swtw3EczWFRL3Sx24WhNoWCM= -kmodules.xyz/objectstore-api v0.0.0-20210618005912-71f8a80f48f9 h1:ezrR+Up8kiD8b/xLoDanGQ+DqM4acunR+LGkmQJXSB4= +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/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= diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.pb.go b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.pb.go index 2e798b8af..12160a2f1 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.pb.go +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.pb.go @@ -369,65 +369,65 @@ func init() { } var fileDescriptor_ef11ad1bbe6c7f42 = []byte{ - // 923 bytes of a gzipped FileDescriptorProto + // 926 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x55, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0xf6, 0xc4, 0x3f, 0xb1, 0xdb, 0x84, 0x9f, 0x0e, 0x48, 0x43, 0x10, 0x93, 0xc8, 0x5c, 0xf6, - 0x40, 0x7a, 0x48, 0x40, 0x08, 0x01, 0x42, 0x8b, 0x57, 0xac, 0x88, 0x92, 0x40, 0xd4, 0xbb, 0xb2, - 0x10, 0x42, 0x5a, 0xda, 0xe3, 0xf6, 0xcc, 0xe0, 0xf9, 0xd3, 0x74, 0x4f, 0x58, 0x23, 0x0e, 0xfb, - 0x08, 0xbc, 0x01, 0xef, 0xc1, 0x13, 0xe4, 0xb8, 0xc7, 0x3d, 0x45, 0xc4, 0x5c, 0xe0, 0xce, 0x05, - 0x4e, 0xa8, 0x6b, 0x7a, 0x7e, 0x62, 0xef, 0x0a, 0xe4, 0x20, 0xb8, 0x4d, 0x57, 0x7d, 0xf5, 0x7d, - 0x55, 0xd3, 0x55, 0xd5, 0xe8, 0xce, 0x2c, 0x8c, 0x27, 0x59, 0xc0, 0x05, 0x79, 0x38, 0xff, 0xce, - 0x76, 0x32, 0x21, 0xe3, 0x70, 0x3f, 0xe5, 0x22, 0xce, 0x52, 0x87, 0x0b, 0x9b, 0x25, 0xbe, 0xb0, - 0x43, 0x2e, 0x53, 0xdf, 0x11, 0xf6, 0xf9, 0x01, 0x0b, 0x12, 0x8f, 0x1d, 0xd8, 0x2e, 0x8f, 0x78, - 0xca, 0x24, 0x9f, 0x90, 0x24, 0x8d, 0x65, 0x8c, 0xdf, 0xae, 0x93, 0x90, 0x9c, 0xe4, 0x41, 0x49, - 0x42, 0x14, 0x09, 0xd1, 0x24, 0xa4, 0x20, 0xd9, 0xd9, 0x77, 0x7d, 0xe9, 0x65, 0x63, 0xe2, 0xc4, - 0xa1, 0xed, 0xc6, 0x6e, 0x6c, 0x03, 0xd7, 0x38, 0x9b, 0xc2, 0x09, 0x0e, 0xf0, 0x95, 0x6b, 0xec, - 0xbc, 0x33, 0x7b, 0x4f, 0x10, 0x3f, 0x56, 0x19, 0x85, 0xcc, 0xf1, 0xfc, 0x88, 0xa7, 0x73, 0x3b, - 0x99, 0xb9, 0x65, 0x8a, 0xcc, 0x3e, 0x5f, 0xc9, 0x6c, 0xc7, 0x7e, 0x56, 0x54, 0x9a, 0x45, 0xd2, - 0x0f, 0xf9, 0x4a, 0xc0, 0xbb, 0x7f, 0x17, 0x20, 0x1c, 0x8f, 0x87, 0x6c, 0x39, 0x6e, 0xf0, 0x05, - 0x6a, 0xdf, 0xf5, 0x79, 0x30, 0xc1, 0x7b, 0xa8, 0x95, 0x30, 0xe9, 0x99, 0xc6, 0x9e, 0x71, 0xab, - 0x37, 0x7c, 0xee, 0xe2, 0x72, 0xb7, 0xb1, 0xb8, 0xdc, 0x6d, 0x9d, 0x31, 0xe9, 0x51, 0xf0, 0xe0, - 0x7d, 0xd4, 0x92, 0xf3, 0x84, 0x9b, 0x1b, 0x80, 0x78, 0xb5, 0x40, 0xdc, 0x9f, 0x27, 0xfc, 0xcf, - 0xcb, 0xdd, 0x1e, 0xd0, 0xa8, 0x03, 0x05, 0xd8, 0xe0, 0x7b, 0xd4, 0x3e, 0x61, 0x63, 0x1e, 0xe0, - 0xd7, 0x51, 0x73, 0xc6, 0xe7, 0x9a, 0xb8, 0xaf, 0xc3, 0x9a, 0xc7, 0x7c, 0x4e, 0x95, 0x1d, 0xbf, - 0x81, 0xda, 0xe7, 0x2c, 0xc8, 0x0a, 0xde, 0x2d, 0x0d, 0x68, 0x8f, 0x94, 0x91, 0xe6, 0x3e, 0x6c, - 0xa3, 0x1e, 0x7c, 0xa8, 0x74, 0xcc, 0x26, 0x00, 0x5f, 0xd2, 0xc0, 0xde, 0xa8, 0x70, 0xd0, 0x0a, - 0x33, 0xf8, 0xc9, 0x40, 0xfd, 0x53, 0xb8, 0x3a, 0x70, 0xe3, 0xdd, 0x42, 0x45, 0xa5, 0x61, 0x0c, - 0x7b, 0x2b, 0x0a, 0x1f, 0xa0, 0x2d, 0xf8, 0xb8, 0x9b, 0xc6, 0x21, 0xa8, 0xe4, 0xe9, 0xbc, 0xa2, - 0x55, 0xb6, 0x46, 0x75, 0x27, 0xbd, 0x8e, 0xc5, 0xa7, 0x68, 0xbb, 0x34, 0x7c, 0xf2, 0x30, 0x49, - 0xb9, 0x10, 0x7e, 0x1c, 0xe9, 0x44, 0x5f, 0xd3, 0x14, 0xdb, 0xa3, 0x55, 0x08, 0x7d, 0x5a, 0xdc, - 0xe0, 0x8f, 0x16, 0xda, 0xcc, 0x93, 0x17, 0xea, 0x5e, 0x22, 0x16, 0xf2, 0xe5, 0x7b, 0xf9, 0x8c, - 0x85, 0x9c, 0x82, 0x47, 0x21, 0x3c, 0x1e, 0x24, 0x3a, 0xe1, 0x12, 0xf1, 0x29, 0x0f, 0x12, 0x0a, - 0x1e, 0x85, 0x80, 0x9b, 0x6b, 0x5e, 0x47, 0x54, 0x97, 0x85, 0x1f, 0xa0, 0xf6, 0x54, 0xdd, 0x9f, - 0xd9, 0xda, 0x33, 0x6e, 0xf5, 0x0f, 0xdf, 0x27, 0x6b, 0x4c, 0x06, 0x81, 0x0e, 0xa8, 0x2e, 0x10, - 0x8e, 0x34, 0xe7, 0xc5, 0x63, 0xd4, 0x09, 0x54, 0x37, 0x08, 0xb3, 0xbd, 0xd7, 0x5c, 0x5b, 0x01, - 0x1a, 0x6a, 0xf8, 0xbc, 0x56, 0xe8, 0xc0, 0x51, 0x50, 0xcd, 0x8c, 0xa7, 0xa8, 0x93, 0xb0, 0x94, - 0x85, 0xc2, 0xec, 0x80, 0xc6, 0x47, 0x6b, 0x69, 0x9c, 0x29, 0x0a, 0x2e, 0x79, 0x5a, 0xe9, 0x80, - 0x49, 0x50, 0xcd, 0xae, 0x6a, 0x11, 0x92, 0x49, 0x2e, 0xcc, 0xcd, 0x1b, 0xfc, 0xad, 0x7b, 0x8a, - 0xa2, 0xd2, 0x80, 0xa3, 0xa0, 0x9a, 0x19, 0x7f, 0x8b, 0xfa, 0x61, 0xd5, 0xbe, 0x66, 0x17, 0x84, - 0x6e, 0xaf, 0x25, 0x54, 0x1b, 0x83, 0xe1, 0xb6, 0x96, 0xab, 0xcf, 0x06, 0xad, 0x2b, 0x0d, 0x7e, - 0x33, 0xd0, 0xcb, 0xba, 0xf7, 0xee, 0xc4, 0xd1, 0xd4, 0x77, 0xb3, 0x94, 0x49, 0x3f, 0x8e, 0xf0, - 0xd7, 0xa8, 0xab, 0xb6, 0xd5, 0x84, 0x49, 0x06, 0xcd, 0xd8, 0x3f, 0x7c, 0x8b, 0xe4, 0x4b, 0x87, - 0xd4, 0x97, 0x0e, 0x49, 0x66, 0x6e, 0x99, 0x08, 0x23, 0xe7, 0x07, 0xe4, 0xf3, 0xf1, 0x37, 0xdc, - 0x91, 0xa7, 0x5c, 0xb2, 0x21, 0xd6, 0xf2, 0xa8, 0xb2, 0xd1, 0x92, 0x15, 0xc7, 0xa8, 0x25, 0x12, - 0xee, 0x40, 0x23, 0xf7, 0x0f, 0x4f, 0x6f, 0x50, 0xec, 0xf5, 0xd4, 0xef, 0x25, 0xdc, 0xa9, 0xba, - 0x5e, 0x9d, 0x28, 0x08, 0x0d, 0x7e, 0x35, 0x90, 0xf9, 0xb4, 0x80, 0x13, 0x5f, 0x48, 0xfc, 0xd5, - 0x4a, 0xbd, 0xe4, 0x9f, 0xd5, 0xab, 0xa2, 0xa1, 0xda, 0x17, 0xb5, 0x64, 0xb7, 0xb0, 0xd4, 0x6a, - 0x8d, 0x50, 0xdb, 0x97, 0x3c, 0x14, 0xe6, 0x06, 0xb4, 0xea, 0xd1, 0xbf, 0x56, 0x6c, 0x35, 0x7f, - 0x47, 0x8a, 0x9f, 0xe6, 0x32, 0x83, 0xdf, 0x9f, 0x51, 0xaa, 0xfa, 0x1b, 0x38, 0x46, 0x3d, 0xc9, - 0x52, 0x97, 0x4b, 0xca, 0xa7, 0xba, 0xd6, 0xf5, 0x66, 0xe7, 0x7e, 0xc1, 0x52, 0x6d, 0xe7, 0xd2, - 0x44, 0x2b, 0x0d, 0xec, 0xa2, 0x4d, 0x1d, 0xab, 0xeb, 0xff, 0xf0, 0x26, 0xf5, 0x0f, 0x5f, 0xd0, - 0x62, 0xc5, 0xd2, 0xa4, 0x05, 0xfb, 0xe0, 0x91, 0x81, 0x7a, 0xe5, 0x40, 0xff, 0x3f, 0x2f, 0xd1, - 0x8f, 0x06, 0x6a, 0xc3, 0x70, 0xe3, 0x37, 0x51, 0x17, 0x36, 0xd5, 0x71, 0x99, 0x43, 0xd5, 0x21, - 0xda, 0x4e, 0x4b, 0x04, 0xf6, 0x50, 0x07, 0x48, 0x8a, 0x5f, 0x74, 0x7b, 0xfd, 0x2d, 0x03, 0x79, - 0x89, 0x6a, 0xd7, 0xe4, 0x67, 0xaa, 0xf9, 0xe1, 0xad, 0xac, 0xe1, 0xf0, 0x21, 0x42, 0x90, 0xc5, - 0xa8, 0x7c, 0x30, 0x7b, 0xd5, 0xe4, 0x9e, 0x94, 0x1e, 0x5a, 0x43, 0x2d, 0xef, 0xab, 0x8d, 0xff, - 0x6c, 0x5f, 0x31, 0x54, 0xb5, 0x98, 0x7a, 0xe8, 0x66, 0x7e, 0x34, 0x59, 0x7e, 0x2c, 0x8f, 0xfd, - 0x68, 0x42, 0xc1, 0xa3, 0x6a, 0x63, 0x89, 0x3f, 0xe2, 0x29, 0x3c, 0xd0, 0x1b, 0xd7, 0x6b, 0xfb, - 0xf8, 0xec, 0x48, 0x7b, 0x68, 0x0d, 0x35, 0x24, 0x17, 0x57, 0x56, 0xe3, 0xf1, 0x95, 0xd5, 0x78, - 0x72, 0x65, 0x35, 0x1e, 0x2d, 0x2c, 0xe3, 0x62, 0x61, 0x19, 0x8f, 0x17, 0x96, 0xf1, 0x64, 0x61, - 0x19, 0x3f, 0x2f, 0x2c, 0xe3, 0x87, 0x5f, 0xac, 0xc6, 0x97, 0xdd, 0xa2, 0x80, 0xbf, 0x02, 0x00, - 0x00, 0xff, 0xff, 0x39, 0xf6, 0x6d, 0x2a, 0x9c, 0x0a, 0x00, 0x00, + 0x10, 0xf6, 0xc4, 0x3f, 0xb1, 0xcb, 0x84, 0x9f, 0x0e, 0x48, 0x43, 0x10, 0x4e, 0x64, 0x2e, 0x7b, + 0x20, 0x3d, 0x24, 0x20, 0x84, 0x00, 0xa1, 0xc5, 0x2b, 0x56, 0x44, 0x49, 0x20, 0xea, 0x5d, 0x59, + 0x08, 0x21, 0x96, 0xf6, 0xb8, 0x3d, 0x1e, 0xec, 0xf9, 0xd1, 0x74, 0x3b, 0xac, 0x11, 0x87, 0x7d, + 0x04, 0xde, 0x80, 0xf7, 0xe0, 0x09, 0x72, 0xdc, 0xe3, 0x9e, 0x22, 0x62, 0x2e, 0x70, 0x87, 0x0b, + 0x27, 0xd4, 0x35, 0x3d, 0x3f, 0x89, 0x37, 0x02, 0x39, 0x88, 0xbd, 0x4d, 0x57, 0x7d, 0xf5, 0x7d, + 0x55, 0xd3, 0x55, 0xd5, 0x70, 0x67, 0x12, 0x44, 0xc3, 0xd9, 0x54, 0x48, 0xfa, 0x70, 0xfe, 0xbd, + 0xe3, 0xce, 0xa4, 0x8a, 0x82, 0xdd, 0x44, 0xc8, 0x68, 0x96, 0xb8, 0x42, 0x3a, 0x3c, 0xf6, 0xa5, + 0x13, 0x08, 0x95, 0xf8, 0xae, 0x74, 0x4e, 0xf7, 0xf8, 0x34, 0x1e, 0xf3, 0x3d, 0xc7, 0x13, 0xa1, + 0x48, 0xb8, 0x12, 0x43, 0x1a, 0x27, 0x91, 0x8a, 0xc8, 0xdb, 0x65, 0x12, 0x9a, 0x92, 0x3c, 0xc8, + 0x49, 0xa8, 0x26, 0xa1, 0x86, 0x84, 0x66, 0x24, 0x5b, 0xbb, 0x9e, 0xaf, 0xc6, 0xb3, 0x01, 0x75, + 0xa3, 0xc0, 0xf1, 0x22, 0x2f, 0x72, 0x90, 0x6b, 0x30, 0x1b, 0xe1, 0x09, 0x0f, 0xf8, 0x95, 0x6a, + 0x6c, 0xbd, 0x33, 0x79, 0x4f, 0x52, 0x3f, 0xd2, 0x19, 0x05, 0xdc, 0x1d, 0xfb, 0xa1, 0x48, 0xe6, + 0x4e, 0x3c, 0xf1, 0xf2, 0x14, 0xb9, 0x73, 0xba, 0x94, 0xd9, 0x96, 0x73, 0x5d, 0x54, 0x32, 0x0b, + 0x95, 0x1f, 0x88, 0xa5, 0x80, 0x77, 0xff, 0x29, 0x40, 0xba, 0x63, 0x11, 0xf0, 0xab, 0x71, 0xdd, + 0x2f, 0xa0, 0x7e, 0xd7, 0x17, 0xd3, 0x21, 0xd9, 0x81, 0x5a, 0xcc, 0xd5, 0xd8, 0xb6, 0x76, 0xac, + 0x5b, 0xad, 0xde, 0x73, 0x67, 0xe7, 0xdb, 0x95, 0xc5, 0xf9, 0x76, 0xed, 0x84, 0xab, 0x31, 0x43, + 0x0f, 0xd9, 0x85, 0x9a, 0x9a, 0xc7, 0xc2, 0x5e, 0x43, 0xc4, 0xab, 0x19, 0xe2, 0xfe, 0x3c, 0x16, + 0x7f, 0x9d, 0x6f, 0xb7, 0x90, 0x46, 0x1f, 0x18, 0xc2, 0xba, 0x3f, 0x40, 0xfd, 0x88, 0x0f, 0xc4, + 0x94, 0xbc, 0x0e, 0xd5, 0x89, 0x98, 0x1b, 0xe2, 0xb6, 0x09, 0xab, 0x1e, 0x8a, 0x39, 0xd3, 0x76, + 0xf2, 0x06, 0xd4, 0x4f, 0xf9, 0x74, 0x96, 0xf1, 0x6e, 0x18, 0x40, 0xbd, 0xaf, 0x8d, 0x2c, 0xf5, + 0x11, 0x07, 0x5a, 0xf8, 0xa1, 0xd3, 0xb1, 0xab, 0x08, 0x7c, 0xc9, 0x00, 0x5b, 0xfd, 0xcc, 0xc1, + 0x0a, 0x4c, 0xf7, 0x67, 0x0b, 0xda, 0xc7, 0x78, 0x75, 0xe8, 0x26, 0xdb, 0x99, 0x8a, 0x4e, 0xc3, + 0xea, 0xb5, 0x96, 0x14, 0x3e, 0x80, 0x0d, 0xfc, 0xb8, 0x9b, 0x44, 0x01, 0xaa, 0xa4, 0xe9, 0xbc, + 0x62, 0x54, 0x36, 0xfa, 0x65, 0x27, 0xbb, 0x8c, 0x25, 0xc7, 0xb0, 0x99, 0x1b, 0x3e, 0x79, 0x18, + 0x27, 0x42, 0x4a, 0x3f, 0x0a, 0x4d, 0xa2, 0xaf, 0x19, 0x8a, 0xcd, 0xfe, 0x32, 0x84, 0x3d, 0x2d, + 0xae, 0xfb, 0x67, 0x0d, 0xd6, 0xd3, 0xe4, 0xa5, 0xbe, 0x97, 0x90, 0x07, 0xe2, 0xea, 0xbd, 0x7c, + 0xc6, 0x03, 0xc1, 0xd0, 0xa3, 0x11, 0x63, 0x31, 0x8d, 0x4d, 0xc2, 0x39, 0xe2, 0x53, 0x31, 0x8d, + 0x19, 0x7a, 0x34, 0x02, 0x6f, 0xae, 0x7a, 0x19, 0x51, 0x5c, 0x16, 0x79, 0x00, 0xf5, 0x91, 0xbe, + 0x3f, 0xbb, 0xb6, 0x63, 0xdd, 0x6a, 0xef, 0xbf, 0x4f, 0x57, 0x98, 0x0c, 0x8a, 0x1d, 0x50, 0x5c, + 0x20, 0x1e, 0x59, 0xca, 0x4b, 0x06, 0xd0, 0x98, 0xea, 0x6e, 0x90, 0x76, 0x7d, 0xa7, 0xba, 0xb2, + 0x02, 0x36, 0x54, 0xef, 0x79, 0xa3, 0xd0, 0xc0, 0xa3, 0x64, 0x86, 0x99, 0x8c, 0xa0, 0x11, 0xf3, + 0x84, 0x07, 0xd2, 0x6e, 0xa0, 0xc6, 0x47, 0x2b, 0x69, 0x9c, 0x68, 0x0a, 0xa1, 0x44, 0x52, 0xe8, + 0xa0, 0x49, 0x32, 0xc3, 0x4e, 0xbe, 0x86, 0x86, 0x54, 0x5c, 0x09, 0x69, 0xaf, 0xdf, 0xe0, 0x6f, + 0xdd, 0xd3, 0x14, 0x3d, 0xd0, 0xfc, 0xf8, 0x29, 0x99, 0x61, 0x25, 0xdf, 0x41, 0x3b, 0x28, 0x5a, + 0xd7, 0x6e, 0xa2, 0xc8, 0xed, 0x95, 0x44, 0x4a, 0x23, 0xd0, 0xdb, 0x34, 0xe5, 0x94, 0xe7, 0x82, + 0x95, 0x95, 0xba, 0xbf, 0x5b, 0xf0, 0xb2, 0xe9, 0xbb, 0x3b, 0x51, 0x38, 0xf2, 0xbd, 0x59, 0xc2, + 0x95, 0x1f, 0x85, 0xe4, 0x1b, 0x68, 0xea, 0x4d, 0x35, 0xe4, 0x8a, 0x63, 0x23, 0xb6, 0xf7, 0xdf, + 0xa2, 0xe9, 0xc2, 0xa1, 0xe5, 0x85, 0x43, 0xe3, 0x89, 0x97, 0x27, 0xc2, 0xe9, 0xe9, 0x1e, 0xfd, + 0x7c, 0xf0, 0xad, 0x70, 0xd5, 0xb1, 0x50, 0xbc, 0x47, 0x8c, 0x3c, 0x14, 0x36, 0x96, 0xb3, 0x92, + 0x08, 0x6a, 0x32, 0x16, 0x2e, 0x36, 0x71, 0x7b, 0xff, 0xf8, 0x06, 0xc5, 0x5e, 0x4e, 0xfd, 0x5e, + 0x2c, 0xdc, 0xa2, 0xe3, 0xf5, 0x89, 0xa1, 0x50, 0xf7, 0x37, 0x0b, 0xec, 0xa7, 0x05, 0x1c, 0xf9, + 0x52, 0x91, 0xaf, 0x96, 0xea, 0xa5, 0xff, 0xae, 0x5e, 0x1d, 0x8d, 0xd5, 0xbe, 0x68, 0x24, 0x9b, + 0x99, 0xa5, 0x54, 0x6b, 0x08, 0x75, 0x5f, 0x89, 0x40, 0xda, 0x6b, 0xd8, 0xa6, 0x07, 0xff, 0x59, + 0xb1, 0xc5, 0xec, 0x1d, 0x68, 0x7e, 0x96, 0xca, 0x74, 0xff, 0xb8, 0xa6, 0x54, 0xfd, 0x37, 0x48, + 0x04, 0x2d, 0xc5, 0x13, 0x4f, 0x28, 0x26, 0x46, 0xa6, 0xd6, 0xd5, 0xe6, 0xe6, 0x7e, 0xc6, 0x52, + 0x6c, 0xe6, 0xdc, 0xc4, 0x0a, 0x0d, 0xe2, 0xc1, 0xba, 0x89, 0x35, 0xf5, 0x7f, 0x78, 0x93, 0xfa, + 0x7b, 0x2f, 0x18, 0xb1, 0x6c, 0x61, 0xb2, 0x8c, 0xbd, 0xfb, 0xc8, 0x82, 0x56, 0x3e, 0xcc, 0xcf, + 0xe6, 0x15, 0xfa, 0xc9, 0x82, 0x3a, 0x0e, 0x37, 0x79, 0x13, 0x9a, 0xb8, 0xa5, 0x0e, 0xf3, 0x1c, + 0x8a, 0x0e, 0x31, 0x76, 0x96, 0x23, 0xc8, 0x18, 0x1a, 0x48, 0x92, 0xfd, 0xa2, 0xdb, 0xab, 0x6f, + 0x18, 0xcc, 0x4b, 0x16, 0xbb, 0x2c, 0x3d, 0x33, 0xc3, 0x8f, 0xef, 0x64, 0x09, 0x47, 0xf6, 0x01, + 0x30, 0x8b, 0x7e, 0xfe, 0x58, 0xb6, 0x8a, 0xc9, 0x3d, 0xca, 0x3d, 0xac, 0x84, 0xba, 0xba, 0xaf, + 0xd6, 0xfe, 0xb7, 0x7d, 0xc5, 0xa1, 0x68, 0x31, 0xfd, 0xc8, 0x4d, 0xfc, 0x70, 0x78, 0xf5, 0xa1, + 0x3c, 0xf4, 0xc3, 0x21, 0x43, 0x8f, 0xae, 0x8d, 0xc7, 0x7e, 0x5f, 0x24, 0xf8, 0x38, 0xaf, 0x5d, + 0xae, 0xed, 0xe3, 0x93, 0x03, 0xe3, 0x61, 0x25, 0x54, 0x8f, 0x9e, 0x5d, 0x74, 0x2a, 0x8f, 0x2f, + 0x3a, 0x95, 0x27, 0x17, 0x9d, 0xca, 0xa3, 0x45, 0xc7, 0x3a, 0x5b, 0x74, 0xac, 0xc7, 0x8b, 0x8e, + 0xf5, 0x64, 0xd1, 0xb1, 0x7e, 0x59, 0x74, 0xac, 0x1f, 0x7f, 0xed, 0x54, 0xbe, 0x6c, 0x66, 0x05, + 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x24, 0xf5, 0x4e, 0xc1, 0x98, 0x0a, 0x00, 0x00, } func (m *Field) Marshal() (dAtA []byte, err error) { @@ -570,16 +570,18 @@ func (m *Metrics) MarshalToSizedBuffer(dAtA []byte) (int, error) { } i-- dAtA[i] = 0x42 - { - size, err := m.States.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err + if m.States != nil { + { + size, err := m.States.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) + i-- + dAtA[i] = 0x3a } - i-- - dAtA[i] = 0x3a if len(m.Params) > 0 { for iNdEx := len(m.Params) - 1; iNdEx >= 0; iNdEx-- { { @@ -1005,8 +1007,10 @@ func (m *Metrics) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } - l = m.States.Size() - n += 1 + l + sovGenerated(uint64(l)) + if m.States != nil { + l = m.States.Size() + n += 1 + l + sovGenerated(uint64(l)) + } l = m.MetricValue.Size() n += 1 + l + sovGenerated(uint64(l)) return n @@ -1179,7 +1183,7 @@ func (this *Metrics) String() string { `Field:` + strings.Replace(strings.Replace(this.Field.String(), "Field", "Field", 1), `&`, ``, 1) + `,`, `Labels:` + repeatedStringForLabels + `,`, `Params:` + repeatedStringForParams + `,`, - `States:` + strings.Replace(strings.Replace(this.States.String(), "State", "State", 1), `&`, ``, 1) + `,`, + `States:` + strings.Replace(this.States.String(), "State", "State", 1) + `,`, `MetricValue:` + strings.Replace(strings.Replace(this.MetricValue.String(), "MetricValue", "MetricValue", 1), `&`, ``, 1) + `,`, `}`, }, "") @@ -1927,6 +1931,9 @@ func (m *Metrics) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } + if m.States == nil { + m.States = &State{} + } if err := m.States.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.proto b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.proto index 6d43b2187..08539a1d8 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.proto +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/generated.proto @@ -131,23 +131,26 @@ message MetricValue { // // 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 optional string valueFromExpression = 3; } diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/metricsconfiguration_types.go b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/metricsconfiguration_types.go index 35e44b145..dc2bd906c 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/metricsconfiguration_types.go +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/metricsconfiguration_types.go @@ -99,7 +99,7 @@ type Metrics struct { // Metrics must contain either States or MetricValue. // If both are specified, MetricValue will be ignored. // +optional - States State `json:"states,omitempty" protobuf:"bytes,7,opt,name=states"` + States *State `json:"states,omitempty" protobuf:"bytes,7,opt,name=states"` // MetricValue defines the configuration to obtain metric value. // @@ -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"` } diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go index 3a588969f..dbb30d2a1 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/openapi_generated.go @@ -15898,7 +15898,7 @@ func schema_custom_resources_apis_metrics_v1alpha1_MetricValue(ref common.Refere }, "valueFromExpression": { SchemaProps: spec.SchemaProps{ - Description: "ValueFromExpression contains an expression for the metric value expression can be a function as well. Parameters is used in the expression string\n\nAvailable expression evaluation functions are:\n\ntoInt() returns 1 if the expression is true otherwise 0, example: toInt(phase == 'Running')\n\nevaluatePercentage(a, b) returns the value of (a * b%) example: evaluatePercentage(replicas, maxUnavailable)\n\ncalculateCPU() returns the cpu in unit core example: calculateCPU(cpu), for cpu value 150m, it will return 0.15\n\ncalculateMemory() returns the memory size in byte example: calculateMemory(memory), for memory value 1 ki, it will return 1024\n\ntoUnix() returns the DateTime string into unix format. example: toUnix(dateTime) will return the corresponding unix value for the given dateTime\n\nin above examples phase, replicas, maxUnavailable, cpu, memory, dateTime are Parameter's key those values will come from corresponding Parameter's value", + Description: "ValueFromExpression contains an expression for the metric value expression can be a function as well. Parameters is used in the expression string\n\nAvailable expression evaluation functions are:\n\nint() returns 1 if the expression is true otherwise 0, example: int(phase == 'Running')\n\npercentage(a, b) returns the value of (a * b%) example: percentage(replicas, maxUnavailable)\n\ncpuCores() returns the cpu in unit core example: cpuCores(cpu), for cpu value 150m, it will return 0.15\n\nbytes() returns the memory size in byte example: bytes(memory), for memory value 1 ki, it will return 1024\n\nunix() returns the DateTime string into unix format. example: unix(dateTime) will return the corresponding unix value for the given dateTime\n\nin above examples phase, replicas, maxUnavailable, cpu, memory, dateTime are Parameter's key those values will come from corresponding Parameter's value\n\nSome 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{"string"}, Format: "", }, @@ -15978,7 +15978,6 @@ func schema_custom_resources_apis_metrics_v1alpha1_Metrics(ref common.ReferenceC "states": { SchemaProps: spec.SchemaProps{ Description: "States handle metrics with label cardinality. States specify the possible states for a label and their corresponding MetricValue configuration.\n\nMetrics must contain either States or MetricValue. If both are specified, MetricValue will be ignored.", - Default: map[string]interface{}{}, Ref: ref("kmodules.xyz/custom-resources/apis/metrics/v1alpha1.State"), }, }, diff --git a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go index f7f921990..8ab72d5dc 100644 --- a/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/custom-resources/apis/metrics/v1alpha1/zz_generated.deepcopy.go @@ -91,7 +91,11 @@ func (in *Metrics) DeepCopyInto(out *Metrics) { *out = make([]Parameter, len(*in)) copy(*out, *in) } - in.States.DeepCopyInto(&out.States) + if in.States != nil { + in, out := &in.States, &out.States + *out = new(State) + (*in).DeepCopyInto(*out) + } in.MetricValue.DeepCopyInto(&out.MetricValue) return } diff --git a/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml b/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml deleted file mode 100644 index 17b920ea0..000000000 --- a/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.v1.yaml +++ /dev/null @@ -1,225 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - app.kubernetes.io/name: catalog - name: appbindings.appcatalog.appscode.com -spec: - group: appcatalog.appscode.com - names: - categories: - - catalog - - appscode - - all - kind: AppBinding - listKind: AppBindingList - plural: appbindings - singular: appbinding - scope: Namespaced - versions: - - additionalPrinterColumns: - - jsonPath: .spec.type - name: Type - type: string - - jsonPath: .spec.version - name: Version - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: AppBindingSpec is the spec for app - properties: - clientConfig: - description: ClientConfig defines how to communicate with the app. - Required - properties: - caBundle: - description: CABundle is a PEM encoded CA bundle which will be - used to validate the serving certificate of this app. - format: byte - type: string - insecureSkipTLSVerify: - description: InsecureSkipTLSVerify disables TLS certificate verification - when communicating with this app. This is strongly discouraged. You - should use the CABundle instead. - type: boolean - service: - description: "`service` is a reference to the service for this - app. Either `service` or `url` must be specified. \n If the - webhook is running within the cluster, then you should use `service`." - properties: - name: - description: '`name` is the name of the service. Required' - type: string - path: - description: '`path` is an optional URL path which will be - sent in any request to this service.' - type: string - port: - description: The port that will be exposed by this app. - format: int32 - type: integer - query: - description: '`query` is optional encoded query string, without - ''?'' which will be sent in any request to this service.' - type: string - scheme: - description: 'Specifies which scheme to use, for example: - http, https If specified, then it will applied as prefix - in this format: scheme:// If not specified, then nothing - will be prefixed' - type: string - required: - - name - - port - - scheme - type: object - url: - description: "`url` gives the location of the app, in standard - URL form (`[scheme://]host:port/path`). Exactly one of `url` - or `service` must be specified. \n The `host` should not refer - to a service running in the cluster; use the `service` field - instead. The host might be resolved via external DNS in some - apiservers (e.g., `kube-apiserver` cannot resolve in-cluster - DNS as that would be a layering violation). `host` may also - be an IP address. \n A path is optional, and if present may - be any string permissible in a URL. You may use the path to - pass an arbitrary string to the app, for example, a cluster - identifier. \n Attempting to use a user or basic auth e.g. \"user:password@\" - is not allowed. Fragments (\"#...\") and query parameters (\"?...\") - are not allowed, either." - type: string - type: object - parameters: - description: "Parameters is a set of the parameters to be used to - connect to the app. The inline YAML/JSON payload to be translated - into equivalent JSON object. \n The Parameters field is NOT secret - or secured in any way and should NEVER be used to hold sensitive - information. To set parameters that contain secret information, - you should ALWAYS store that information in a Secret." - type: object - x-kubernetes-embedded-resource: true - x-kubernetes-preserve-unknown-fields: true - secret: - description: Secret is the name of the secret to create in the AppBinding's - namespace that will hold the credentials associated with the AppBinding. - properties: - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - TODO: Add other useful fields. apiVersion, kind, uid?' - type: string - type: object - secretTransforms: - description: List of transformations that should be applied to the - credentials associated with the ServiceBinding before they are inserted - into the Secret. - items: - description: 'SecretTransform is a single transformation that is - applied to the credentials returned from the broker before they - are inserted into the Secret associated with the ServiceBinding. - Because different brokers providing the same type of service may - each return a different credentials structure, users can specify - the transformations that should be applied to the Secret to adapt - its entries to whatever the service consumer expects. For example, - the credentials returned by the broker may include the key "USERNAME", - but the consumer requires the username to be exposed under the - key "DB_USER" instead. To have the Service Catalog transform the - Secret, the following SecretTransform must be specified in ServiceBinding.spec.secretTransform: - - {"renameKey": {"from": "USERNAME", "to": "DB_USER"}} Only one - of the SecretTransform''s members may be specified.' - properties: - addKey: - description: AddKey represents a transform that adds an additional - key to the credentials Secret - properties: - key: - description: The name of the key to add - type: string - stringValue: - description: The string (non-binary) value to add to the - Secret under the specified key. - type: string - value: - description: The binary value (possibly non-string) to add - to the Secret under the specified key. If both value and - stringValue are specified, then value is ignored and stringValue - is stored. - format: byte - type: string - required: - - key - type: object - addKeysFrom: - description: AddKeysFrom represents a transform that merges - all the entries of an existing Secret into the credentials - Secret - properties: - secretRef: - description: The reference to the Secret that should be - merged into the credentials Secret. - properties: - name: - description: Name of the referent. - type: string - namespace: - description: Namespace of the referent. - type: string - type: object - type: object - removeKey: - description: RemoveKey represents a transform that removes a - credentials Secret entry - properties: - key: - description: The key to remove from the Secret - type: string - required: - - key - type: object - renameKey: - description: RenameKey represents a transform that renames a - credentials Secret entry's key - properties: - from: - description: The name of the key to rename - type: string - to: - description: The new name for the key - type: string - required: - - from - - to - type: object - type: object - type: array - type: - description: Type used to facilitate programmatic handling of application. - type: string - version: - description: Version used to facilitate programmatic handling of application. - type: string - required: - - clientConfig - type: object - type: object - served: true - storage: true - subresources: {} diff --git a/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml b/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml index 9172a0034..17b920ea0 100644 --- a/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml +++ b/vendor/kmodules.xyz/custom-resources/crds/appcatalog.appscode.com_appbindings.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: creationTimestamp: null @@ -6,16 +6,6 @@ metadata: app.kubernetes.io/name: catalog name: appbindings.appcatalog.appscode.com spec: - additionalPrinterColumns: - - JSONPath: .spec.type - name: Type - type: string - - JSONPath: .spec.version - name: Version - type: string - - JSONPath: .metadata.creationTimestamp - name: Age - type: date group: appcatalog.appscode.com names: categories: @@ -26,198 +16,210 @@ spec: listKind: AppBindingList plural: appbindings singular: appbinding - preserveUnknownFields: false scope: Namespaced - subresources: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: AppBindingSpec is the spec for app - properties: - clientConfig: - description: ClientConfig defines how to communicate with the app. Required - properties: - caBundle: - description: CABundle is a PEM encoded CA bundle which will be used - to validate the serving certificate of this app. - format: byte - type: string - insecureSkipTLSVerify: - description: InsecureSkipTLSVerify disables TLS certificate verification - when communicating with this app. This is strongly discouraged. You - should use the CABundle instead. - type: boolean - service: - description: "`service` is a reference to the service for this app. - Either `service` or `url` must be specified. \n If the webhook - is running within the cluster, then you should use `service`." - properties: - name: - description: '`name` is the name of the service. Required' - type: string - path: - description: '`path` is an optional URL path which will be sent - in any request to this service.' - type: string - port: - description: The port that will be exposed by this app. - format: int32 - type: integer - query: - description: '`query` is optional encoded query string, without - ''?'' which will be sent in any request to this service.' - type: string - scheme: - description: 'Specifies which scheme to use, for example: http, - https If specified, then it will applied as prefix in this - format: scheme:// If not specified, then nothing will be prefixed' - type: string - required: - - name - - port - - scheme - type: object - url: - description: "`url` gives the location of the app, in standard URL - form (`[scheme://]host:port/path`). Exactly one of `url` or `service` - must be specified. \n The `host` should not refer to a service - running in the cluster; use the `service` field instead. The host - might be resolved via external DNS in some apiservers (e.g., `kube-apiserver` - cannot resolve in-cluster DNS as that would be a layering violation). - `host` may also be an IP address. \n A path is optional, and if - present may be any string permissible in a URL. You may use the - path to pass an arbitrary string to the app, for example, a cluster - identifier. \n Attempting to use a user or basic auth e.g. \"user:password@\" - is not allowed. Fragments (\"#...\") and query parameters (\"?...\") - are not allowed, either." - type: string - type: object - parameters: - description: "Parameters is a set of the parameters to be used to connect - to the app. The inline YAML/JSON payload to be translated into equivalent - JSON object. \n The Parameters field is NOT secret or secured in any - way and should NEVER be used to hold sensitive information. To set - parameters that contain secret information, you should ALWAYS store - that information in a Secret." - type: object - x-kubernetes-embedded-resource: true - x-kubernetes-preserve-unknown-fields: true - secret: - description: Secret is the name of the secret to create in the AppBinding's - namespace that will hold the credentials associated with the AppBinding. - properties: - name: - description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names - TODO: Add other useful fields. apiVersion, kind, uid?' - type: string - type: object - secretTransforms: - description: List of transformations that should be applied to the credentials - associated with the ServiceBinding before they are inserted into the - Secret. - items: - description: 'SecretTransform is a single transformation that is applied - to the credentials returned from the broker before they are inserted - into the Secret associated with the ServiceBinding. Because different - brokers providing the same type of service may each return a different - credentials structure, users can specify the transformations that - should be applied to the Secret to adapt its entries to whatever - the service consumer expects. For example, the credentials returned - by the broker may include the key "USERNAME", but the consumer requires - the username to be exposed under the key "DB_USER" instead. To have - the Service Catalog transform the Secret, the following SecretTransform - must be specified in ServiceBinding.spec.secretTransform: - {"renameKey": - {"from": "USERNAME", "to": "DB_USER"}} Only one of the SecretTransform''s - members may be specified.' + versions: + - additionalPrinterColumns: + - jsonPath: .spec.type + name: Type + type: string + - jsonPath: .spec.version + name: Version + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 + schema: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: AppBindingSpec is the spec for app + properties: + clientConfig: + description: ClientConfig defines how to communicate with the app. + Required properties: - addKey: - description: AddKey represents a transform that adds an additional - key to the credentials Secret + caBundle: + description: CABundle is a PEM encoded CA bundle which will be + used to validate the serving certificate of this app. + format: byte + type: string + insecureSkipTLSVerify: + description: InsecureSkipTLSVerify disables TLS certificate verification + when communicating with this app. This is strongly discouraged. You + should use the CABundle instead. + type: boolean + service: + description: "`service` is a reference to the service for this + app. Either `service` or `url` must be specified. \n If the + webhook is running within the cluster, then you should use `service`." properties: - key: - description: The name of the key to add + name: + description: '`name` is the name of the service. Required' type: string - stringValue: - description: The string (non-binary) value to add to the Secret - under the specified key. + path: + description: '`path` is an optional URL path which will be + sent in any request to this service.' type: string - value: - description: The binary value (possibly non-string) to add - to the Secret under the specified key. If both value and - stringValue are specified, then value is ignored and stringValue - is stored. - format: byte + port: + description: The port that will be exposed by this app. + format: int32 + type: integer + query: + description: '`query` is optional encoded query string, without + ''?'' which will be sent in any request to this service.' type: string - required: - - key - type: object - addKeysFrom: - description: AddKeysFrom represents a transform that merges all - the entries of an existing Secret into the credentials Secret - properties: - secretRef: - description: The reference to the Secret that should be merged - into the credentials Secret. - properties: - name: - description: Name of the referent. - type: string - namespace: - description: Namespace of the referent. - type: string - type: object - type: object - removeKey: - description: RemoveKey represents a transform that removes a credentials - Secret entry - properties: - key: - description: The key to remove from the Secret + scheme: + description: 'Specifies which scheme to use, for example: + http, https If specified, then it will applied as prefix + in this format: scheme:// If not specified, then nothing + will be prefixed' type: string required: - - key - type: object - renameKey: - description: RenameKey represents a transform that renames a credentials - Secret entry's key - properties: - from: - description: The name of the key to rename - type: string - to: - description: The new name for the key - type: string - required: - - from - - to + - name + - port + - scheme type: object + url: + description: "`url` gives the location of the app, in standard + URL form (`[scheme://]host:port/path`). Exactly one of `url` + or `service` must be specified. \n The `host` should not refer + to a service running in the cluster; use the `service` field + instead. The host might be resolved via external DNS in some + apiservers (e.g., `kube-apiserver` cannot resolve in-cluster + DNS as that would be a layering violation). `host` may also + be an IP address. \n A path is optional, and if present may + be any string permissible in a URL. You may use the path to + pass an arbitrary string to the app, for example, a cluster + identifier. \n Attempting to use a user or basic auth e.g. \"user:password@\" + is not allowed. Fragments (\"#...\") and query parameters (\"?...\") + are not allowed, either." + type: string type: object - type: array - type: - description: Type used to facilitate programmatic handling of application. - type: string - version: - description: Version used to facilitate programmatic handling of application. - type: string - required: - - clientConfig - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 + parameters: + description: "Parameters is a set of the parameters to be used to + connect to the app. The inline YAML/JSON payload to be translated + into equivalent JSON object. \n The Parameters field is NOT secret + or secured in any way and should NEVER be used to hold sensitive + information. To set parameters that contain secret information, + you should ALWAYS store that information in a Secret." + type: object + x-kubernetes-embedded-resource: true + x-kubernetes-preserve-unknown-fields: true + secret: + description: Secret is the name of the secret to create in the AppBinding's + namespace that will hold the credentials associated with the AppBinding. + properties: + name: + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names + TODO: Add other useful fields. apiVersion, kind, uid?' + type: string + type: object + secretTransforms: + description: List of transformations that should be applied to the + credentials associated with the ServiceBinding before they are inserted + into the Secret. + items: + description: 'SecretTransform is a single transformation that is + applied to the credentials returned from the broker before they + are inserted into the Secret associated with the ServiceBinding. + Because different brokers providing the same type of service may + each return a different credentials structure, users can specify + the transformations that should be applied to the Secret to adapt + its entries to whatever the service consumer expects. For example, + the credentials returned by the broker may include the key "USERNAME", + but the consumer requires the username to be exposed under the + key "DB_USER" instead. To have the Service Catalog transform the + Secret, the following SecretTransform must be specified in ServiceBinding.spec.secretTransform: + - {"renameKey": {"from": "USERNAME", "to": "DB_USER"}} Only one + of the SecretTransform''s members may be specified.' + properties: + addKey: + description: AddKey represents a transform that adds an additional + key to the credentials Secret + properties: + key: + description: The name of the key to add + type: string + stringValue: + description: The string (non-binary) value to add to the + Secret under the specified key. + type: string + value: + description: The binary value (possibly non-string) to add + to the Secret under the specified key. If both value and + stringValue are specified, then value is ignored and stringValue + is stored. + format: byte + type: string + required: + - key + type: object + addKeysFrom: + description: AddKeysFrom represents a transform that merges + all the entries of an existing Secret into the credentials + Secret + properties: + secretRef: + description: The reference to the Secret that should be + merged into the credentials Secret. + properties: + name: + description: Name of the referent. + type: string + namespace: + description: Namespace of the referent. + type: string + type: object + type: object + removeKey: + description: RemoveKey represents a transform that removes a + credentials Secret entry + properties: + key: + description: The key to remove from the Secret + type: string + required: + - key + type: object + renameKey: + description: RenameKey represents a transform that renames a + credentials Secret entry's key + properties: + from: + description: The name of the key to rename + type: string + to: + description: The new name for the key + type: string + required: + - from + - to + type: object + type: object + type: array + type: + description: Type used to facilitate programmatic handling of application. + type: string + version: + description: Version used to facilitate programmatic handling of application. + type: string + required: + - clientConfig + type: object + type: object served: true storage: true + subresources: {} diff --git a/vendor/kmodules.xyz/custom-resources/crds/lib.go b/vendor/kmodules.xyz/custom-resources/crds/lib.go index 2efaca473..826bf6bff 100644 --- a/vendor/kmodules.xyz/custom-resources/crds/lib.go +++ b/vendor/kmodules.xyz/custom-resources/crds/lib.go @@ -40,17 +40,12 @@ func load(filename string, o interface{}) error { func CustomResourceDefinition(gvr schema.GroupVersionResource) (*apiextensions.CustomResourceDefinition, error) { var out apiextensions.CustomResourceDefinition - v1file := fmt.Sprintf("%s_%s.v1.yaml", gvr.Group, gvr.Resource) + v1file := fmt.Sprintf("%s_%s.yaml", gvr.Group, gvr.Resource) if err := load(v1file, &out.V1); err != nil { return nil, err } - v1beta1file := fmt.Sprintf("%s_%s.yaml", gvr.Group, gvr.Resource) - if err := load(v1beta1file, &out.V1beta1); err != nil { - return nil, err - } - - if out.V1 == nil && out.V1beta1 == nil { + if out.V1 == nil { return nil, fmt.Errorf("missing crd yamls for gvr: %s", gvr) } diff --git a/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.v1.yaml b/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.v1.yaml deleted file mode 100644 index 8bffcbdae..000000000 --- a/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.v1.yaml +++ /dev/null @@ -1,334 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - creationTimestamp: null - labels: - app.kubernetes.io/name: metrics - name: metricsconfigurations.metrics.appscode.com -spec: - group: metrics.appscode.com - names: - categories: - - metrics - - appscode - - all - kind: MetricsConfiguration - listKind: MetricsConfigurationList - plural: metricsconfigurations - singular: metricsconfiguration - scope: Cluster - versions: - - additionalPrinterColumns: - - jsonPath: .spec.targetRef.apiVersion - name: APIVersion - type: string - - jsonPath: .spec.targetRef.kind - name: Kind - type: string - - jsonPath: .metadata.creationTimestamp - name: Age - type: date - name: v1alpha1 - schema: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: MetricsConfigurationSpec is the spec of MetricsConfiguration - object. - properties: - metrics: - description: List of Metrics configuration for the resource object - defined in TargetRef - items: - description: Metrics contains the configuration of a metric in prometheus - style. - properties: - field: - description: Field defines the metric value path of the manifest - file and the type of that value - properties: - path: - description: 'Path defines the json path of the object. - Example: For deployment spec replica count, the path will - be .spec.replicas' - type: string - type: - description: Type defines the type of the value in the given - Path Type can be "Integer" for integer value like .spec.replicas, - "DateTime" for time stamp value like .metadata.creationTimestamp - "Array" for array field like .spec.containers "String" - for string field like .statue.phase (for pod status) - enum: - - Integer - - DateTime - - Array - - String - type: string - required: - - path - - type - type: object - help: - description: 'Help is used to describe the metrics. Example: - For kube_deployment_spec_replicas, help string can be "Number - of desired pods for a deployment."' - type: string - labels: - description: Labels defines the metric labels as a key-value - pair - items: - description: "Label contains the information of a metric label. - Given labels are always added in the metrics along with - resource name and namespace. Resource's name and namespace - are always added in the labels by default. No configuration - is needed for name and namespace labels. \n Example: kube_pod_info{pod=\"\", - namespace=\"\", host_ip=\"172.18.0.2\", pod_ip=\"10.244.0.14\", - node=\"kind-control-plane\"} 1 In the example pod, namespace, - host_ip, pod_ip, node are labels. pod(resource name) and - namespace are default labels. No configurations is needed - for those. \n To generate others labels, config should be - given in the following way \n labels: - key: host_ip valuePath: - .status.hostIP - key: pod_ip valuePath: .status.podIP - \ - key: node valuePath: .spec.nodeName \n Either Value - or ValuePath must be specified for a Label. If both is specified, - ValuePath is ignored. Note that if a valuePath doesn't exist - for a label key, the label will be ignored." - properties: - key: - description: Key defines the label key - type: string - value: - description: 'Value defines the hard coded label value. - Example: labels: - key: unit value: byte - key: - environment value: production' - type: string - valuePath: - description: 'ValuePath defines the label value path. - Example: To add deployment''s resource version as labels, - labels: - key: version valuePath: .metadata.resourceVersion' - type: string - required: - - key - type: object - type: array - metricValue: - description: "MetricValue defines the configuration to obtain - metric value. \n Metrics must contain either States or MetricValue. - If both are specified, MetricValue will be ignored." - properties: - value: - description: "Value contains the metric value. It is always - equal to 1. It is defined when some information of the - object is collected as labels but there is no specific - metric value. \n Example: For metrics \"kube_pod_info\", - there are some information like host_ip, pod_ip, node - name is collected as labels. As there must be a metric - value, metric value is kept as 1. The metric will look - like `kube_pod_info{host_ip=\"172.18.0.2\", pod_ip=\"10.244.0.14\", - node=\"kind-control-plane\" .....} 1`" - format: double - type: number - valueFromExpression: - 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) - 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" - type: string - valueFromPath: - description: "ValueFromPath contains the field path of the - manifest file of a object. ValueFromPath is used when - the metric value is coming from any specific json path - of the object. \n Example: For metrics \"kube_deployment_spec_replicas\", - the metricValue is coming from a specific path .spec.replicas - In this case, valueFromPath: .spec.replicas Some example - of json path: .metadata.observedGeneration, .spec.restartPolicy, - .status.startTime \n Some example of json path which is - coming from an element of an array: .spec.containers[*].image, - .status.containerStatuses[*].restartCount" - type: string - type: object - name: - description: 'Name defines the metrics name. Name should be - in snake case. Example: kube_deployment_spec_replicas' - type: string - params: - description: Params is list of parameters configuration used - in expression evaluation - items: - description: Parameter contains the information of a parameter - used in expression evaluation Parameter should contain an - user defined key and corresponding Value or ValuePath. Either - Value or ValuePath must be specified. If both are specified, - ValuePath is ignored. - properties: - key: - description: Key defines the parameter's key - type: string - value: - description: Value defines user defined parameter's value. - type: string - valuePath: - description: 'ValuePath defines the manifest field path - for the parameter''s value. Example: To add deployment''s - spec replica count as parameter, params: - key: replica valuePath: - .spec.replicas' - type: string - required: - - key - type: object - type: array - states: - description: "States handle metrics with label cardinality. - States specify the possible states for a label and their corresponding - MetricValue configuration. \n Metrics must contain either - States or MetricValue. If both are specified, MetricValue - will be ignored." - properties: - labelKey: - description: 'LabelKey defines an user defined label key - of the label which label cardinality is greater than one. - Example: For metric "kube_pod_status_phase", the LabelKey - can be "phase"' - type: string - values: - description: 'Values contains the list of state values. - The size of the list is always equal to the cardinality - of that label. Example: "kube_pod_statue_phase" metric - has a label "phase" which cardinality is equal to 5. So - Values should have StateValues config for all of them.' - items: - description: StateValues contains the information of a - state value. StateValues is used to define state with - all possible label values and corresponding MetricValue. - properties: - labelValue: - description: 'LabelValue defines the value of the - label. Example: For labelKey "phase" (metric: kube_pod_status_phase - path: .status.phase ) label value can be "Running", - "Succeeded", "Failed", "Unknown" and "Pending"' - type: string - metricValue: - description: MetricValue defines the configuration - of the metric value for the corresponding LabelValue - properties: - value: - description: "Value contains the metric value. - It is always equal to 1. It is defined when - some information of the object is collected - as labels but there is no specific metric value. - \n Example: For metrics \"kube_pod_info\", there - are some information like host_ip, pod_ip, node - name is collected as labels. As there must be - a metric value, metric value is kept as 1. The - metric will look like `kube_pod_info{host_ip=\"172.18.0.2\", - pod_ip=\"10.244.0.14\", node=\"kind-control-plane\" - .....} 1`" - format: double - type: number - valueFromExpression: - 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) 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" - type: string - valueFromPath: - description: "ValueFromPath contains the field - path of the manifest file of a object. ValueFromPath - is used when the metric value is coming from - any specific json path of the object. \n Example: - For metrics \"kube_deployment_spec_replicas\", - the metricValue is coming from a specific path - .spec.replicas In this case, valueFromPath: - .spec.replicas Some example of json path: .metadata.observedGeneration, - .spec.restartPolicy, .status.startTime \n Some - example of json path which is coming from an - element of an array: .spec.containers[*].image, - .status.containerStatuses[*].restartCount" - type: string - type: object - required: - - labelValue - - metricValue - type: object - type: array - required: - - labelKey - - values - type: object - type: - description: Type defines the metrics type. For kubernetes based - object, types can only be "gauge" - enum: - - gauge - type: string - required: - - help - - name - - type - type: object - type: array - targetRef: - description: TargetRef defines the object for which metrics will be - collected - properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation - of an object. - type: string - kind: - description: Kind is a string value representing the REST resource - this object represents. In CamelCase. - type: string - required: - - apiVersion - - kind - type: object - required: - - metrics - - targetRef - type: object - type: object - served: true - storage: true - subresources: {} diff --git a/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.yaml b/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.yaml index 7992b762c..e918f3e6d 100644 --- a/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.yaml +++ b/vendor/kmodules.xyz/custom-resources/crds/metrics.appscode.com_metricsconfigurations.yaml @@ -1,4 +1,4 @@ -apiVersion: apiextensions.k8s.io/v1beta1 +apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: creationTimestamp: null @@ -6,16 +6,6 @@ metadata: app.kubernetes.io/name: metrics name: metricsconfigurations.metrics.appscode.com spec: - additionalPrinterColumns: - - JSONPath: .spec.targetRef.apiVersion - name: APIVersion - type: string - - JSONPath: .spec.targetRef.kind - name: Kind - type: string - - JSONPath: .metadata.creationTimestamp - name: Age - type: date group: metrics.appscode.com names: categories: @@ -26,306 +16,323 @@ spec: listKind: MetricsConfigurationList plural: metricsconfigurations singular: metricsconfiguration - preserveUnknownFields: false scope: Cluster - subresources: {} - validation: - openAPIV3Schema: - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: MetricsConfigurationSpec is the spec of MetricsConfiguration - object. - properties: - metrics: - description: List of Metrics configuration for the resource object defined - in TargetRef - items: - description: Metrics contains the configuration of a metric in prometheus - style. - properties: - field: - description: Field defines the metric value path of the manifest - file and the type of that value - properties: - path: - description: 'Path defines the json path of the object. Example: - For deployment spec replica count, the path will be .spec.replicas' - type: string - type: - description: Type defines the type of the value in the given - Path Type can be "Integer" for integer value like .spec.replicas, - "DateTime" for time stamp value like .metadata.creationTimestamp - "Array" for array field like .spec.containers "String" for - string field like .statue.phase (for pod status) - enum: - - Integer - - DateTime - - Array - - String - type: string - required: - - path - - type - type: object - help: - description: 'Help is used to describe the metrics. Example: For - kube_deployment_spec_replicas, help string can be "Number of - desired pods for a deployment."' - type: string - labels: - description: Labels defines the metric labels as a key-value pair - items: - description: "Label contains the information of a metric label. - Given labels are always added in the metrics along with resource - name and namespace. Resource's name and namespace are always - added in the labels by default. No configuration is needed - for name and namespace labels. \n Example: kube_pod_info{pod=\"\", - namespace=\"\", host_ip=\"172.18.0.2\", pod_ip=\"10.244.0.14\", - node=\"kind-control-plane\"} 1 In the example pod, namespace, - host_ip, pod_ip, node are labels. pod(resource name) and namespace - are default labels. No configurations is needed for those. - \n To generate others labels, config should be given in the - following way \n labels: - key: host_ip valuePath: .status.hostIP - \ - key: pod_ip valuePath: .status.podIP - key: node - \ valuePath: .spec.nodeName \n Either Value or ValuePath - must be specified for a Label. If both is specified, ValuePath - is ignored. Note that if a valuePath doesn't exist for a label - key, the label will be ignored." + versions: + - additionalPrinterColumns: + - jsonPath: .spec.targetRef.apiVersion + name: APIVersion + type: string + - jsonPath: .spec.targetRef.kind + name: Kind + type: string + - jsonPath: .metadata.creationTimestamp + name: Age + type: date + name: v1alpha1 + schema: + openAPIV3Schema: + properties: + apiVersion: + description: 'APIVersion defines the versioned schema of this representation + of an object. Servers should convert recognized schemas to the latest + internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' + type: string + kind: + description: 'Kind is a string value representing the REST resource this + object represents. Servers may infer this from the endpoint the client + submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + type: string + metadata: + type: object + spec: + description: MetricsConfigurationSpec is the spec of MetricsConfiguration + object. + properties: + metrics: + description: List of Metrics configuration for the resource object + defined in TargetRef + items: + description: Metrics contains the configuration of a metric in prometheus + style. + properties: + field: + description: Field defines the metric value path of the manifest + file and the type of that value properties: - key: - description: Key defines the label key + path: + description: 'Path defines the json path of the object. + Example: For deployment spec replica count, the path will + be .spec.replicas' type: string - value: - description: 'Value defines the hard coded label value. - Example: labels: - key: unit value: byte - key: - environment value: production' - type: string - valuePath: - description: 'ValuePath defines the label value path. Example: - To add deployment''s resource version as labels, labels: - - key: version valuePath: .metadata.resourceVersion' + type: + description: Type defines the type of the value in the given + Path Type can be "Integer" for integer value like .spec.replicas, + "DateTime" for time stamp value like .metadata.creationTimestamp + "Array" for array field like .spec.containers "String" + for string field like .statue.phase (for pod status) + enum: + - Integer + - DateTime + - Array + - String type: string required: - - key + - path + - type type: object - type: array - metricValue: - description: "MetricValue defines the configuration to obtain - metric value. \n Metrics must contain either States or MetricValue. - If both are specified, MetricValue will be ignored." - properties: - value: - description: "Value contains the metric value. It is always - equal to 1. It is defined when some information of the object - is collected as labels but there is no specific metric value. - \n Example: For metrics \"kube_pod_info\", there are some - information like host_ip, pod_ip, node name is collected - as labels. As there must be a metric value, metric value - is kept as 1. The metric will look like `kube_pod_info{host_ip=\"172.18.0.2\", - pod_ip=\"10.244.0.14\", node=\"kind-control-plane\" .....} - \ 1`" - format: double - type: number - valueFromExpression: - 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) - 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" - type: string - valueFromPath: - description: "ValueFromPath contains the field path of the - manifest file of a object. ValueFromPath is used when the - metric value is coming from any specific json path of the - object. \n Example: For metrics \"kube_deployment_spec_replicas\", - the metricValue is coming from a specific path .spec.replicas - In this case, valueFromPath: .spec.replicas Some example - of json path: .metadata.observedGeneration, .spec.restartPolicy, - .status.startTime \n Some example of json path which is - coming from an element of an array: .spec.containers[*].image, - .status.containerStatuses[*].restartCount" - type: string - type: object - name: - description: 'Name defines the metrics name. Name should be in - snake case. Example: kube_deployment_spec_replicas' - type: string - params: - description: Params is list of parameters configuration used in - expression evaluation - items: - description: Parameter contains the information of a parameter - used in expression evaluation Parameter should contain an - user defined key and corresponding Value or ValuePath. Either - Value or ValuePath must be specified. If both are specified, - ValuePath is ignored. + help: + description: 'Help is used to describe the metrics. Example: + For kube_deployment_spec_replicas, help string can be "Number + of desired pods for a deployment."' + type: string + labels: + description: Labels defines the metric labels as a key-value + pair + items: + description: "Label contains the information of a metric label. + Given labels are always added in the metrics along with + resource name and namespace. Resource's name and namespace + are always added in the labels by default. No configuration + is needed for name and namespace labels. \n Example: kube_pod_info{pod=\"\", + namespace=\"\", host_ip=\"172.18.0.2\", pod_ip=\"10.244.0.14\", + node=\"kind-control-plane\"} 1 In the example pod, namespace, + host_ip, pod_ip, node are labels. pod(resource name) and + namespace are default labels. No configurations is needed + for those. \n To generate others labels, config should be + given in the following way \n labels: - key: host_ip valuePath: + .status.hostIP - key: pod_ip valuePath: .status.podIP + \ - key: node valuePath: .spec.nodeName \n Either Value + or ValuePath must be specified for a Label. If both is specified, + ValuePath is ignored. Note that if a valuePath doesn't exist + for a label key, the label will be ignored." + properties: + key: + description: Key defines the label key + type: string + value: + description: 'Value defines the hard coded label value. + Example: labels: - key: unit value: byte - key: + environment value: production' + type: string + valuePath: + description: 'ValuePath defines the label value path. + Example: To add deployment''s resource version as labels, + labels: - key: version valuePath: .metadata.resourceVersion' + type: string + required: + - key + type: object + type: array + metricValue: + description: "MetricValue defines the configuration to obtain + metric value. \n Metrics must contain either States or MetricValue. + If both are specified, MetricValue will be ignored." properties: - key: - description: Key defines the parameter's key - type: string value: - description: Value defines user defined parameter's value. + description: "Value contains the metric value. It is always + equal to 1. It is defined when some information of the + object is collected as labels but there is no specific + metric value. \n Example: For metrics \"kube_pod_info\", + there are some information like host_ip, pod_ip, node + name is collected as labels. As there must be a metric + value, metric value is kept as 1. The metric will look + like `kube_pod_info{host_ip=\"172.18.0.2\", pod_ip=\"10.244.0.14\", + node=\"kind-control-plane\" .....} 1`" + format: double + type: number + valueFromExpression: + 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 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 \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 - valuePath: - description: 'ValuePath defines the manifest field path - for the parameter''s value. Example: To add deployment''s - spec replica count as parameter, params: - key: replica valuePath: - .spec.replicas' + valueFromPath: + description: "ValueFromPath contains the field path of the + manifest file of a object. ValueFromPath is used when + the metric value is coming from any specific json path + of the object. \n Example: For metrics \"kube_deployment_spec_replicas\", + the metricValue is coming from a specific path .spec.replicas + In this case, valueFromPath: .spec.replicas Some example + of json path: .metadata.observedGeneration, .spec.restartPolicy, + .status.startTime \n Some example of json path which is + coming from an element of an array: .spec.containers[*].image, + .status.containerStatuses[*].restartCount" type: string + type: object + name: + description: 'Name defines the metrics name. Name should be + in snake case. Example: kube_deployment_spec_replicas' + type: string + params: + description: Params is list of parameters configuration used + in expression evaluation + items: + description: Parameter contains the information of a parameter + used in expression evaluation Parameter should contain an + user defined key and corresponding Value or ValuePath. Either + Value or ValuePath must be specified. If both are specified, + ValuePath is ignored. + properties: + key: + description: Key defines the parameter's key + type: string + value: + description: Value defines user defined parameter's value. + type: string + valuePath: + description: 'ValuePath defines the manifest field path + for the parameter''s value. Example: To add deployment''s + spec replica count as parameter, params: - key: replica valuePath: + .spec.replicas' + type: string + required: + - key + type: object + type: array + states: + description: "States handle metrics with label cardinality. + States specify the possible states for a label and their corresponding + MetricValue configuration. \n Metrics must contain either + States or MetricValue. If both are specified, MetricValue + will be ignored." + properties: + labelKey: + description: 'LabelKey defines an user defined label key + of the label which label cardinality is greater than one. + Example: For metric "kube_pod_status_phase", the LabelKey + can be "phase"' + type: string + values: + description: 'Values contains the list of state values. + The size of the list is always equal to the cardinality + of that label. Example: "kube_pod_statue_phase" metric + has a label "phase" which cardinality is equal to 5. So + Values should have StateValues config for all of them.' + items: + description: StateValues contains the information of a + state value. StateValues is used to define state with + all possible label values and corresponding MetricValue. + properties: + labelValue: + description: 'LabelValue defines the value of the + label. Example: For labelKey "phase" (metric: kube_pod_status_phase + path: .status.phase ) label value can be "Running", + "Succeeded", "Failed", "Unknown" and "Pending"' + type: string + metricValue: + description: MetricValue defines the configuration + of the metric value for the corresponding LabelValue + properties: + value: + description: "Value contains the metric value. + It is always equal to 1. It is defined when + some information of the object is collected + as labels but there is no specific metric value. + \n Example: For metrics \"kube_pod_info\", there + are some information like host_ip, pod_ip, node + name is collected as labels. As there must be + a metric value, metric value is kept as 1. The + metric will look like `kube_pod_info{host_ip=\"172.18.0.2\", + pod_ip=\"10.244.0.14\", node=\"kind-control-plane\" + .....} 1`" + format: double + type: number + valueFromExpression: + 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 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 \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 manifest file of a object. ValueFromPath + is used when the metric value is coming from + any specific json path of the object. \n Example: + For metrics \"kube_deployment_spec_replicas\", + the metricValue is coming from a specific path + .spec.replicas In this case, valueFromPath: + .spec.replicas Some example of json path: .metadata.observedGeneration, + .spec.restartPolicy, .status.startTime \n Some + example of json path which is coming from an + element of an array: .spec.containers[*].image, + .status.containerStatuses[*].restartCount" + type: string + type: object + required: + - labelValue + - metricValue + type: object + type: array required: - - key + - labelKey + - values type: object - type: array - states: - description: "States handle metrics with label cardinality. States - specify the possible states for a label and their corresponding - MetricValue configuration. \n Metrics must contain either States - or MetricValue. If both are specified, MetricValue will be ignored." - properties: - labelKey: - description: 'LabelKey defines an user defined label key of - the label which label cardinality is greater than one. Example: - For metric "kube_pod_status_phase", the LabelKey can be - "phase"' - type: string - values: - description: 'Values contains the list of state values. The - size of the list is always equal to the cardinality of that - label. Example: "kube_pod_statue_phase" metric has a label - "phase" which cardinality is equal to 5. So Values should - have StateValues config for all of them.' - items: - description: StateValues contains the information of a state - value. StateValues is used to define state with all possible - label values and corresponding MetricValue. - properties: - labelValue: - description: 'LabelValue defines the value of the label. - Example: For labelKey "phase" (metric: kube_pod_status_phase - path: .status.phase ) label value can be "Running", - "Succeeded", "Failed", "Unknown" and "Pending"' - type: string - metricValue: - description: MetricValue defines the configuration of - the metric value for the corresponding LabelValue - properties: - value: - description: "Value contains the metric value. It - is always equal to 1. It is defined when some - information of the object is collected as labels - but there is no specific metric value. \n Example: - For metrics \"kube_pod_info\", there are some - information like host_ip, pod_ip, node name is - collected as labels. As there must be a metric - value, metric value is kept as 1. The metric will - look like `kube_pod_info{host_ip=\"172.18.0.2\", - pod_ip=\"10.244.0.14\", node=\"kind-control-plane\" - .....} 1`" - format: double - type: number - valueFromExpression: - 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) 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" - type: string - valueFromPath: - description: "ValueFromPath contains the field path - of the manifest file of a object. ValueFromPath - is used when the metric value is coming from any - specific json path of the object. \n Example: - For metrics \"kube_deployment_spec_replicas\", - the metricValue is coming from a specific path - .spec.replicas In this case, valueFromPath: .spec.replicas - Some example of json path: .metadata.observedGeneration, - .spec.restartPolicy, .status.startTime \n Some - example of json path which is coming from an element - of an array: .spec.containers[*].image, .status.containerStatuses[*].restartCount" - type: string - type: object - required: - - labelValue - - metricValue - type: object - type: array - required: - - labelKey - - values - type: object - type: - description: Type defines the metrics type. For kubernetes based - object, types can only be "gauge" - enum: - - gauge + type: + description: Type defines the metrics type. For kubernetes based + object, types can only be "gauge" + enum: + - gauge + type: string + required: + - help + - name + - type + type: object + type: array + targetRef: + description: TargetRef defines the object for which metrics will be + collected + properties: + apiVersion: + description: APIVersion defines the versioned schema of this representation + of an object. + type: string + kind: + description: Kind is a string value representing the REST resource + this object represents. In CamelCase. type: string required: - - help - - name - - type + - apiVersion + - kind type: object - type: array - targetRef: - description: TargetRef defines the object for which metrics will be - collected - properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation - of an object. - type: string - kind: - description: Kind is a string value representing the REST resource - this object represents. In CamelCase. - type: string - required: - - apiVersion - - kind - type: object - required: - - metrics - - targetRef - type: object - type: object - version: v1alpha1 - versions: - - name: v1alpha1 + required: + - metrics + - targetRef + type: object + type: object served: true storage: true + subresources: {} diff --git a/vendor/modules.txt b/vendor/modules.txt index c3fddd545..629a065a3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -82,7 +82,6 @@ github.com/inconshreveable/mousetrap # github.com/jpillora/go-ogle-analytics v0.0.0-20161213085824-14b04e0594ef github.com/jpillora/go-ogle-analytics # github.com/json-iterator/go v1.1.11 -## explicit github.com/json-iterator/go # github.com/mailru/easyjson v0.7.0 github.com/mailru/easyjson/buffer @@ -185,7 +184,6 @@ gomodules.xyz/mergo # gomodules.xyz/pointer v0.1.0 gomodules.xyz/pointer # gomodules.xyz/sets v0.2.0 -## explicit gomodules.xyz/sets # gomodules.xyz/wait v0.0.0-20210218105358-639bd9211545 gomodules.xyz/wait @@ -549,7 +547,7 @@ kmodules.xyz/client-go/meta kmodules.xyz/client-go/tools/analytics kmodules.xyz/client-go/tools/cli kmodules.xyz/client-go/tools/clusterid -# kmodules.xyz/custom-resources v0.0.0-20210618003440-c6bb400da153 +# kmodules.xyz/custom-resources v0.0.0-20210812193424-1631fae03a1a ## explicit kmodules.xyz/custom-resources/apis/appcatalog kmodules.xyz/custom-resources/apis/appcatalog/v1alpha1 @@ -563,7 +561,8 @@ 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 ## explicit