From 15fd3fee437d62c6826a263932c4fee3c0ae61c7 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sun, 13 Aug 2023 20:23:03 -0700 Subject: [PATCH] Update deps /cherry-pick Signed-off-by: Tamal Saha --- go.mod | 6 +- go.sum | 15 +- .../gomodules.xyz/jsonpatch/v2/jsonpatch.go | 4 + vendor/gomodules.xyz/logs/lib.go | 9 +- vendor/kmodules.xyz/client-go/Makefile | 4 +- .../client-go/api/v1/conditions.go | 216 +++---------- .../client-go/api/v1/generated.pb.go | 300 ++++++++++-------- .../client-go/api/v1/generated.proto | 35 +- .../client-go/api/v1/openapi_generated.go | 22 +- .../client-go/api/v1/zz_generated.deepcopy.go | 22 ++ .../client-go/apiextensions/kubernetes.go | 2 +- .../kmodules.xyz/client-go/client/client.go | 69 ++-- .../client-go/tools/clientcmd/rest_config.go | 74 +++++ vendor/modules.txt | 6 +- 14 files changed, 420 insertions(+), 364 deletions(-) create mode 100644 vendor/kmodules.xyz/client-go/tools/clientcmd/rest_config.go diff --git a/go.mod b/go.mod index 77bdbceb..12a83f7c 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/spf13/cobra v1.7.0 github.com/spf13/pflag v1.0.5 go.bytebuilders.dev/license-verifier v0.13.2 - gomodules.xyz/logs v0.0.6 + gomodules.xyz/logs v0.0.7 gomodules.xyz/pointer v0.1.0 gomodules.xyz/x v0.0.15 k8s.io/api v0.25.1 @@ -17,7 +17,7 @@ require ( k8s.io/client-go v0.25.1 k8s.io/klog/v2 v2.80.1 kmodules.xyz/authorizer v0.25.0 - kmodules.xyz/client-go v0.25.23 + kmodules.xyz/client-go v0.25.29 kmodules.xyz/custom-resources v0.25.2 kmodules.xyz/resource-metrics v0.25.2 sigs.k8s.io/controller-runtime v0.13.1 @@ -121,7 +121,7 @@ require ( gomodules.xyz/clock v0.0.0-20200817085942-06523dba733f // indirect gomodules.xyz/encoding v0.0.7 // indirect gomodules.xyz/flags v0.1.3 // indirect - gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect gomodules.xyz/sets v0.2.1 // indirect gomodules.xyz/wait v0.2.0 // indirect google.golang.org/appengine v1.6.7 // indirect diff --git a/go.sum b/go.sum index 1170355b..a920e6a6 100644 --- a/go.sum +++ b/go.sum @@ -152,7 +152,6 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= -github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -429,6 +428,7 @@ github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTd github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= @@ -754,10 +754,10 @@ gomodules.xyz/encoding v0.0.7 h1:Y4PaflVS+vkYgkw6FwyF1S0ab4Y1BAdOqB3Uwjcx8qI= gomodules.xyz/encoding v0.0.7/go.mod h1:blYJWy456Bzxj3L2G7G5WV1l5rFXl6uYXrmeFqxxqk8= gomodules.xyz/flags v0.1.3 h1:jQ06+EfmoMv5NvjXvJon03dOhLU+FF0TQMWN7I6qpzs= gomodules.xyz/flags v0.1.3/go.mod h1:e+kvBLnqdEWGG670SKOYag1CXStM2Slrxq01OIK3tFs= -gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc= -gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= -gomodules.xyz/logs v0.0.6 h1:8+9Wkud5yBPtIvkVszubyTeFxNII30lWODom0+GZD8U= -gomodules.xyz/logs v0.0.6/go.mod h1:Q+fFtZFLEB5q86KmDehXCGuMP72Rv+Rwz0KuVxK+Gi4= +gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw= +gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY= +gomodules.xyz/logs v0.0.7 h1:dkhpdQuzj+pOS3S7VaOq+JV7BVU7f68/k3uDYufhPow= +gomodules.xyz/logs v0.0.7/go.mod h1:IEIZbRl9zua2jb35NU4KoqxUEDPmKvem3PhfRHqQI54= gomodules.xyz/pointer v0.1.0 h1:sG2UKrYVSo6E3r4itAjXfPfe4fuXMi0KdyTHpR3vGCg= gomodules.xyz/pointer v0.1.0/go.mod h1:sPLsC0+yLTRecUiC5yVlyvXhZ6LAGojNCRWNNqoplvo= gomodules.xyz/sets v0.2.0/go.mod h1:jKgNp01/iDs+svOWXaPk5cKP3VXy0mWUoTF/ore+aMc= @@ -909,7 +909,6 @@ k8s.io/component-base v0.25.1/go.mod h1:j78+TFdsKM8RXHfM88oeAdZu2v9qMZdQZOfg0LGW k8s.io/component-helpers v0.25.1 h1:ViHJJjHYy2cjyfIzkgqf4t+a8U3tfRer8atEXiiyngw= k8s.io/component-helpers v0.25.1/go.mod h1:C0zYGZ5jvaPaXsQCIxkTEQ+HqsPvT3cvAtQY8EDu/nk= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= -k8s.io/klog/v2 v2.8.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 h1:MQ8BAZPZlWk3S9K4a9NCkIFQtZShWqoha7snGixVgEA= @@ -918,8 +917,8 @@ k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 h1:H9TCJUUx+2VA0ZiD9lvtaX8fthFsM k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= kmodules.xyz/authorizer v0.25.0 h1:yRrLtMOdlU1p4mLzaSz5pmSLpBLsVXLQHkUfiME12iQ= kmodules.xyz/authorizer v0.25.0/go.mod h1:Jb99YsLRJE4R4d8F5fFtlxEaxk0prdSk2LApZl4JdyI= -kmodules.xyz/client-go v0.25.23 h1:qz5XJYHLVZUowqfRXEJD7JQ4iaLLzQ1O1zPMmsdrkJw= -kmodules.xyz/client-go v0.25.23/go.mod h1:wbdzLEoDYiCPI6dTW0mIAGNwkwFV4lC5BN1FJxiDsbw= +kmodules.xyz/client-go v0.25.29 h1:6CYoTJdLBqdXAaNtWJb1LLowG6KuDwb53ey8u7DS88Y= +kmodules.xyz/client-go v0.25.29/go.mod h1:r/Va2Y6t1G8X1sPRjrQC6FWB3oh/i6rjssmlfJnbCmg= kmodules.xyz/crd-schema-fuzz v0.25.0 h1:c5ZxNRqJak1bkGhECmyrKpzKGThFMB4088Kynyvngbc= kmodules.xyz/custom-resources v0.25.2 h1:+PJgUZvbbSgyNT7EX9gUZ3PIzY2LAW03TDW8cevvXqo= kmodules.xyz/custom-resources v0.25.2/go.mod h1:b9XjjKQMZ6KrLHXKqQz7YwV3M3BK8Hwi4KEwu5RadCo= diff --git a/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go b/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go index a411d542..0d7823b3 100644 --- a/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go +++ b/vendor/gomodules.xyz/jsonpatch/v2/jsonpatch.go @@ -1,6 +1,7 @@ package jsonpatch import ( + "bytes" "encoding/json" "fmt" "reflect" @@ -64,6 +65,9 @@ func NewOperation(op, path string, value interface{}) Operation { // // An error will be returned if any of the two documents are invalid. func CreatePatch(a, b []byte) ([]Operation, error) { + if bytes.Equal(a, b) { + return []Operation{}, nil + } var aI interface{} var bI interface{} err := json.Unmarshal(a, &aI) diff --git a/vendor/gomodules.xyz/logs/lib.go b/vendor/gomodules.xyz/logs/lib.go index 3bec711b..03a8214f 100644 --- a/vendor/gomodules.xyz/logs/lib.go +++ b/vendor/gomodules.xyz/logs/lib.go @@ -37,9 +37,12 @@ const logFlushFreqFlagName = "log-flush-frequency" var logFlushFreq = pflag.Duration(logFlushFreqFlagName, 5*time.Second, "Maximum number of seconds between log flushes") -func init() { - _ = flag.Set("stderrthreshold", "INFO") -} +/* +panic: flag stderrthreshold set before being defined +*/ +// func init() { +// _ = flag.Set("stderrthreshold", "INFO") +// } // AddFlags registers this package's flags on arbitrary FlagSets, such that they point to the // same value as the global flags. diff --git a/vendor/kmodules.xyz/client-go/Makefile b/vendor/kmodules.xyz/client-go/Makefile index 441dd38e..a54fa85d 100644 --- a/vendor/kmodules.xyz/client-go/Makefile +++ b/vendor/kmodules.xyz/client-go/Makefile @@ -45,7 +45,7 @@ endif ### These variables should not need tweaking. ### -SRC_PKGS := admissionregistration api apiextensions apiregistration apps batch certificates client core discovery dynamic extensions meta networking openapi policy rbac storage tools +SRC_PKGS := admissionregistration api apiextensions apiregistration apps batch certificates client conditions core discovery dynamic extensions meta networking openapi policy rbac storage tools SRC_DIRS := $(SRC_PKGS) *.go DOCKER_PLATFORMS := linux/amd64 linux/arm linux/arm64 @@ -154,7 +154,7 @@ gen-crd-protos: --packages=-k8s.io/api/core/v1,kmodules.xyz/client-go/api/v1 .PHONY: gen-enum -gen-enum: +gen-enum: $(BUILD_DIRS) @docker run \ -i \ --rm \ diff --git a/vendor/kmodules.xyz/client-go/api/v1/conditions.go b/vendor/kmodules.xyz/client-go/api/v1/conditions.go index 332a460c..148531c8 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/conditions.go +++ b/vendor/kmodules.xyz/client-go/api/v1/conditions.go @@ -1,5 +1,5 @@ /* -Copyright AppsCode Inc. and Contributors +Copyright 2020 The Kubernetes Authors. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -17,190 +17,72 @@ limitations under the License. package v1 import ( - "fmt" - - core "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// KEP: https://github.com/kubernetes/enhancements/blob/ced773ab59f0ff080888a912ab99474245623dad/keps/sig-api-machinery/1623-standardize-conditions/README.md +// ConditionSeverity expresses the severity of a Condition Type failing. +type ConditionSeverity string -// List of common condition types const ( - ConditionProgressing = "Progressing" - ConditionInitialized = "Initialized" - ConditionReady = "Ready" - ConditionAvailable = "Available" - ConditionFailed = "Failed" - - ConditionRequestApproved = "Approved" - ConditionRequestDenied = "Denied" + // ConditionSeverityError specifies that a condition with `Status=False` is an error. + ConditionSeverityError ConditionSeverity = "Error" + + // ConditionSeverityWarning specifies that a condition with `Status=False` is a warning. + ConditionSeverityWarning ConditionSeverity = "Warning" + + // ConditionSeverityInfo specifies that a condition with `Status=False` is informative. + ConditionSeverityInfo ConditionSeverity = "Info" + + // ConditionSeverityNone should apply only to util with `Status=True`. + ConditionSeverityNone ConditionSeverity = "" ) +// ConditionType is a valid value for Condition.Type. +type ConditionType string + +const ( + // ReadyCondition defines the Ready condition type that summarizes the operational state of an object. + ReadyCondition ConditionType = "Ready" +) + +// Condition defines an observation of a object operational state. type Condition struct { // Type of condition in CamelCase or in foo.example.com/CamelCase. - // Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - // useful (see .node.status.conditions), the ability to deconflict is important. - // +required - Type string `json:"type" protobuf:"bytes,1,opt,name=type"` + // Many .condition.type values are consistent across resources like Available, but because arbitrary util + // can be useful (see .node.status.util), the ability to deconflict is important. + Type ConditionType `json:"type" protobuf:"bytes,4,opt,name=type,casttype=ConditionType"` + // Status of the condition, one of True, False, Unknown. - // +required - Status core.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"` + Status metav1.ConditionStatus `json:"status" protobuf:"bytes,5,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"` + // If set, this represents the .metadata.generation that the condition was set based upon. // For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date // with respect to the current state of the instance. // +optional ObservedGeneration int64 `json:"observedGeneration,omitempty" protobuf:"varint,3,opt,name=observedGeneration"` - // Last time the condition transitioned from one status to another. - // This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - // +required - LastTransitionTime metav1.Time `json:"lastTransitionTime" protobuf:"bytes,4,opt,name=lastTransitionTime"` - // The reason for the condition's last transition in CamelCase. - // The specific API may choose whether or not this field is considered a guaranteed API. - // This field may not be empty. - // +required - Reason string `json:"reason" protobuf:"bytes,5,opt,name=reason"` - // A human readable message indicating details about the transition. - // This field may be empty. - // +required - Message string `json:"message" protobuf:"bytes,6,opt,name=message"` -} - -func NewCondition(reason string, message string, generation int64, conditionStatus ...bool) Condition { - cs := core.ConditionTrue - if len(conditionStatus) > 0 && !conditionStatus[0] { - cs = core.ConditionFalse - } - - return Condition{ - Type: reason, - Reason: reason, - Message: message, - Status: cs, - LastTransitionTime: metav1.Now(), - ObservedGeneration: generation, - } -} - -// HasCondition returns "true" if the desired condition provided in "condType" is present in the condition list. -// Otherwise, it returns "false". -func HasCondition(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType { - return true - } - } - return false -} - -// GetCondition returns a pointer to the desired condition referred by "condType". Otherwise, it returns nil. -func GetCondition(conditions []Condition, condType string) (int, *Condition) { - for i := range conditions { - c := conditions[i] - if c.Type == condType { - return i, &c - } - } - return -1, nil -} -// SetCondition add/update the desired condition to the condition list. It does nothing if the condition is already in -// its desired state. -func SetCondition(conditions []Condition, newCondition Condition) []Condition { - idx, curCond := GetCondition(conditions, newCondition.Type) - // If the current condition is in its desired state, we have nothing to do. Just return the original condition list. - if curCond != nil && - curCond.Status == newCondition.Status && - curCond.Reason == newCondition.Reason && - curCond.Message == newCondition.Message && - curCond.ObservedGeneration == newCondition.ObservedGeneration { - return conditions - } - // The desired conditions is not in the condition list or is not in its desired state. - // Update it if present in the condition list, or append the new condition if it does not present. - newCondition.LastTransitionTime = metav1.Now() - if idx == -1 { - conditions = append(conditions, newCondition) - } else if newCondition.ObservedGeneration >= curCond.ObservedGeneration { - // only update if the new condition is based on observed generation at least as updated as the current condition - conditions[idx] = newCondition - } - return conditions -} - -// RemoveCondition remove a condition from the condition list referred by "condType" parameter. -func RemoveCondition(conditions []Condition, condType string) []Condition { - idx, _ := GetCondition(conditions, condType) - if idx == -1 { - // The desired condition is not present in the condition list. So, nothing to do. - return conditions - } - return append(conditions[:idx], conditions[idx+1:]...) -} - -// IsConditionTrue returns "true" if the desired condition is in true state. -// It returns "false" if the desired condition is not in "true" state or is not in the condition list. -func IsConditionTrue(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == core.ConditionTrue { - return true - } - } - return false -} - -// IsConditionFalse returns "true" if the desired condition is in false state. -// It returns "false" if the desired condition is not in "false" state or is not in the condition list. -func IsConditionFalse(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == core.ConditionFalse { - return true - } - } - return false -} - -// IsConditionUnknown returns "true" if the desired condition is in unknown state. -// It returns "false" if the desired condition is not in "unknown" state or is not in the condition list. -func IsConditionUnknown(conditions []Condition, condType string) bool { - for i := range conditions { - if conditions[i].Type == condType && conditions[i].Status == core.ConditionUnknown { - return true - } - } - return false -} - -// Status defines the set of statuses a resource can have. -// Based on kstatus: https://github.com/kubernetes-sigs/cli-utils/tree/master/pkg/kstatus -// +kubebuilder:validation:Enum=InProgress;Failed;Current;Terminating;NotFound;Unknown -type Status string + // Severity provides an explicit classification of Reason code, so the users or machines can immediately + // understand the current situation and act accordingly. + // The Severity field MUST be set only when Status=False. + // +optional + Severity ConditionSeverity `json:"severity,omitempty" protobuf:"bytes,6,opt,name=severity,casttype=ConditionSeverity"` -const ( - // The set of status conditions which can be assigned to resources. - InProgressStatus Status = "InProgress" - FailedStatus Status = "Failed" - CurrentStatus Status = "Current" - TerminatingStatus Status = "Terminating" - NotFoundStatus Status = "NotFound" - UnknownStatus Status = "Unknown" -) + // Last time the condition transitioned from one status to another. + // This should be when the underlying condition changed. If that is not known, then using the time when + // the API field changed is acceptable. + LastTransitionTime metav1.Time `json:"lastTransitionTime" protobuf:"bytes,7,opt,name=lastTransitionTime"` -var Statuses = []Status{InProgressStatus, FailedStatus, CurrentStatus, TerminatingStatus, UnknownStatus} + // The reason for the condition's last transition in CamelCase. + // The specific API may choose whether this field is considered a guaranteed API. + // This field may not be empty. + // +optional + Reason string `json:"reason,omitempty" protobuf:"bytes,8,opt,name=reason"` -// String returns the status as a string. -func (s Status) String() string { - return string(s) + // A human-readable message indicating details about the transition. + // This field may be empty. + // +optional + Message string `json:"message,omitempty" protobuf:"bytes,9,opt,name=message"` } -// StatusFromStringOrDie turns a string into a Status. Will panic if the provided string is -// not a valid status. -func StatusFromStringOrDie(text string) Status { - s := Status(text) - for _, r := range Statuses { - if s == r { - return s - } - } - panic(fmt.Errorf("string has invalid status: %s", s)) -} +// Conditions provide observations of the operational state of a object. +type Conditions []Condition diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go index d369fcc4..afb78575 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.pb.go @@ -28,8 +28,8 @@ import ( strings "strings" proto "github.com/gogo/protobuf/proto" - k8s_io_api_core_v1 "k8s.io/api/core/v1" v1 "k8s.io/api/core/v1" + k8s_io_apimachinery_pkg_apis_meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" v11 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -540,113 +540,115 @@ func init() { } var fileDescriptor_af8e7a11c7a1ccd9 = []byte{ - // 1687 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x1b, 0x59, - 0x1d, 0xf7, 0xd4, 0x71, 0xe2, 0xf9, 0x3a, 0xa9, 0xdb, 0xd7, 0xa2, 0x9a, 0x8a, 0x7a, 0x82, 0x57, - 0xaa, 0x52, 0xa0, 0x63, 0x5a, 0x75, 0x61, 0x59, 0x09, 0x41, 0xc7, 0x59, 0xba, 0xde, 0x4d, 0x93, - 0xf0, 0x9c, 0xb2, 0xab, 0x05, 0x09, 0xbd, 0xcc, 0x7c, 0xed, 0x3c, 0x32, 0x9e, 0x19, 0xbd, 0x37, - 0x0e, 0x64, 0x4f, 0x7b, 0x84, 0xdb, 0xc2, 0x89, 0xe3, 0x56, 0xe2, 0x4f, 0xe0, 0xc2, 0x5f, 0x40, - 0xc5, 0xa9, 0x5c, 0xd0, 0x1e, 0x90, 0x45, 0xcd, 0x15, 0x71, 0x41, 0x5c, 0x7a, 0x42, 0xef, 0xcd, - 0x4f, 0x3b, 0x4e, 0xd3, 0x45, 0x48, 0xdc, 0xe2, 0xef, 0xe7, 0xf3, 0xfd, 0xbc, 0x5f, 0xdf, 0x5f, - 0x13, 0xb8, 0x7b, 0x3c, 0x0e, 0xbd, 0x89, 0x8f, 0xd2, 0xfe, 0xc5, 0xe9, 0xc7, 0x5d, 0xd7, 0xe7, - 0x18, 0xc4, 0x77, 0x47, 0x61, 0x97, 0x45, 0xbc, 0x7b, 0x72, 0xaf, 0x3b, 0xc2, 0x00, 0x05, 0x8b, - 0xd1, 0xb3, 0x23, 0x11, 0xc6, 0x21, 0xb9, 0x55, 0xa6, 0xdb, 0x09, 0xfd, 0xa7, 0xa3, 0xd0, 0x66, - 0x11, 0xb7, 0x4f, 0xee, 0xdd, 0xbc, 0x3b, 0xe2, 0xf1, 0xd1, 0xe4, 0xd0, 0x76, 0xc3, 0x71, 0x77, - 0x14, 0x8e, 0xc2, 0xae, 0xf6, 0x3a, 0x9c, 0x0c, 0xf5, 0x2f, 0xfd, 0x43, 0xff, 0x95, 0xa8, 0xdd, - 0xec, 0x1c, 0xbf, 0x25, 0x6d, 0x9e, 0x2c, 0xe6, 0x86, 0x02, 0x97, 0xac, 0x78, 0xf3, 0x41, 0xc1, - 0x19, 0x33, 0xf7, 0x88, 0x07, 0x28, 0x4e, 0xbb, 0xd1, 0xf1, 0x48, 0x19, 0x64, 0x77, 0x8c, 0x31, - 0x5b, 0xe2, 0xd5, 0xf9, 0x31, 0x7c, 0xa9, 0x87, 0x22, 0xe6, 0x43, 0xee, 0xb2, 0x18, 0xf7, 0x05, - 0x3f, 0x61, 0x31, 0xbe, 0x8f, 0xa7, 0xc4, 0x81, 0x3a, 0x06, 0x6e, 0xe8, 0xf1, 0x60, 0xd4, 0x32, - 0x36, 0x8d, 0x2d, 0xd3, 0xb9, 0xfd, 0x6c, 0x6a, 0x55, 0x66, 0x53, 0xab, 0xfe, 0x4e, 0x6a, 0x7f, - 0x39, 0xb5, 0x48, 0xe1, 0x91, 0x59, 0x69, 0xee, 0xd7, 0xf9, 0x57, 0x0d, 0x9a, 0x25, 0xf5, 0x41, - 0x84, 0x2e, 0x79, 0x03, 0x6a, 0xcc, 0xe7, 0x4c, 0xa6, 0xa2, 0x1b, 0xa9, 0x68, 0xed, 0xa1, 0x32, - 0xd2, 0x04, 0x23, 0x1f, 0x81, 0xc9, 0xa5, 0x9c, 0xa0, 0xa0, 0x38, 0x6c, 0x5d, 0xda, 0x34, 0xb6, - 0x1a, 0xf7, 0xef, 0xda, 0xc9, 0xf9, 0xf4, 0x0d, 0xaa, 0x3b, 0xb0, 0x4f, 0xee, 0xd9, 0x07, 0xa7, - 0x11, 0x7a, 0x3b, 0xa1, 0xcb, 0xfc, 0xbd, 0xc3, 0x9f, 0xa1, 0x1b, 0x53, 0x1c, 0xa2, 0xc0, 0xc0, - 0x45, 0x67, 0x63, 0x36, 0xb5, 0xcc, 0x7e, 0xa6, 0x41, 0x0b, 0x39, 0x72, 0x1f, 0x40, 0xa2, 0x2b, - 0x30, 0xde, 0x65, 0x63, 0x6c, 0x55, 0xf5, 0x2e, 0x48, 0xba, 0x0b, 0x18, 0xe4, 0x08, 0x2d, 0xb1, - 0xc8, 0x0f, 0x61, 0x4d, 0x4e, 0xf4, 0x0a, 0xad, 0x15, 0xbd, 0x9b, 0xaf, 0xd9, 0xaf, 0x7c, 0x5f, - 0xfb, 0xc3, 0x37, 0xbf, 0xf9, 0x9d, 0x41, 0xe2, 0xe1, 0x34, 0x66, 0x53, 0x6b, 0x2d, 0xfd, 0x41, - 0x33, 0x1d, 0xf2, 0x21, 0xd4, 0xbd, 0x89, 0x60, 0x31, 0x0f, 0x83, 0x56, 0x4d, 0x6b, 0xda, 0xa5, - 0x13, 0xe6, 0x2f, 0x68, 0x47, 0xc7, 0x23, 0x65, 0x90, 0xb6, 0x7a, 0x41, 0x25, 0xbd, 0x9d, 0x7a, - 0x39, 0xeb, 0xea, 0x2d, 0xb2, 0x5f, 0x34, 0x57, 0x23, 0x0c, 0x1a, 0x02, 0x03, 0xfc, 0xb9, 0x83, - 0xc3, 0x50, 0x60, 0x6b, 0xf5, 0xbf, 0x12, 0x6f, 0xce, 0xa6, 0x56, 0x83, 0x16, 0x32, 0xb4, 0xac, - 0x49, 0xb6, 0xa0, 0xee, 0x05, 0x52, 0x5d, 0x8d, 0x6c, 0xad, 0x6d, 0x56, 0xb7, 0xcc, 0x74, 0x33, - 0xbb, 0x03, 0x6d, 0xa3, 0x39, 0x4a, 0xee, 0x41, 0x83, 0x47, 0x0f, 0x3d, 0x4f, 0xa0, 0x94, 0x28, - 0x5b, 0x75, 0x4d, 0xd6, 0xe2, 0xfd, 0xfd, 0xdc, 0x4c, 0xcb, 0x1c, 0xf2, 0x15, 0x58, 0x99, 0x08, - 0x2e, 0x5b, 0xa6, 0xe6, 0xd6, 0x67, 0x53, 0x6b, 0xe5, 0x09, 0xed, 0x4b, 0xaa, 0xad, 0xe4, 0x6d, - 0xb8, 0x8c, 0x63, 0xc6, 0xfd, 0x42, 0x13, 0x34, 0x8f, 0xcc, 0xa6, 0xd6, 0xe5, 0x77, 0xe6, 0x10, - 0xba, 0xc0, 0x24, 0x1e, 0x40, 0x94, 0xc7, 0x6b, 0xab, 0xa1, 0x2f, 0xe6, 0xc1, 0x05, 0x2f, 0xb9, - 0x34, 0x3b, 0x9c, 0xcb, 0x2a, 0x58, 0x8a, 0xdf, 0xb4, 0xa4, 0xdb, 0xf9, 0x93, 0x01, 0xcd, 0x9e, - 0x3f, 0x91, 0x31, 0x8a, 0xc7, 0x18, 0x33, 0x8f, 0xc5, 0x8c, 0xdc, 0x82, 0xea, 0x84, 0x7b, 0x69, - 0xcc, 0x37, 0xd2, 0x68, 0xab, 0x3e, 0xe9, 0x6f, 0x53, 0x65, 0x27, 0x9b, 0xb0, 0x12, 0xa8, 0x68, - 0xbc, 0xa4, 0xf1, 0xf5, 0x14, 0x5f, 0xd1, 0x71, 0xa8, 0x11, 0xf2, 0x26, 0x34, 0x3c, 0x2e, 0x23, - 0x9f, 0x9d, 0x96, 0xc2, 0xf6, 0x5a, 0x4a, 0x6c, 0x6c, 0x17, 0x10, 0x2d, 0xf3, 0xc8, 0xf7, 0xa0, - 0x1e, 0x89, 0xf0, 0x84, 0x7b, 0x28, 0x74, 0xe4, 0x9a, 0xce, 0x1b, 0x59, 0x16, 0xef, 0xa7, 0xf6, - 0x97, 0x53, 0xab, 0xf9, 0x6e, 0x28, 0x63, 0x1e, 0x8c, 0x32, 0x13, 0xcd, 0x9d, 0x3a, 0xbf, 0xa9, - 0x82, 0xd9, 0x0b, 0x03, 0x8f, 0xeb, 0xd0, 0xda, 0x84, 0x95, 0xf8, 0x34, 0xc2, 0xf4, 0x1c, 0xf9, - 0x3e, 0x55, 0x1a, 0x52, 0x8d, 0x90, 0x1d, 0x58, 0x95, 0x31, 0x8b, 0x27, 0x32, 0x3d, 0xcb, 0x83, - 0x94, 0xb3, 0x3a, 0xd0, 0xd6, 0x97, 0x53, 0x6b, 0x49, 0x2d, 0xb3, 0xf3, 0x15, 0x12, 0x16, 0x4d, - 0x35, 0xc8, 0x7b, 0x40, 0xc2, 0x43, 0x89, 0xe2, 0x04, 0xbd, 0x47, 0x49, 0xe1, 0x52, 0xe9, 0xa2, - 0x0e, 0x5f, 0x75, 0x6e, 0xa6, 0xca, 0x64, 0xef, 0x0c, 0x83, 0x2e, 0xf1, 0x22, 0x27, 0x40, 0x7c, - 0x26, 0xe3, 0x03, 0xc1, 0x02, 0xa9, 0xd7, 0x3a, 0xe0, 0x63, 0x2c, 0xd2, 0xf9, 0x75, 0xb2, 0x43, - 0x79, 0x14, 0xeb, 0xee, 0x9c, 0x51, 0xa3, 0x4b, 0x56, 0x20, 0xb7, 0x61, 0x55, 0x20, 0x93, 0x69, - 0x9a, 0x9b, 0xce, 0xe5, 0xec, 0x46, 0xa8, 0xb6, 0xd2, 0x14, 0x25, 0x77, 0x60, 0x6d, 0x8c, 0x52, - 0xb2, 0x51, 0x92, 0xb2, 0xa6, 0xd3, 0x4c, 0x89, 0x6b, 0x8f, 0x13, 0x33, 0xcd, 0xf0, 0xce, 0x3f, - 0x0d, 0x68, 0xbe, 0x8b, 0xcc, 0x8f, 0x8f, 0x7a, 0x47, 0xe8, 0x1e, 0xeb, 0xba, 0xfa, 0x6b, 0x03, - 0x6e, 0x08, 0x64, 0x5e, 0x18, 0xf8, 0xa7, 0x0b, 0x98, 0x7e, 0xae, 0xc6, 0xfd, 0x6f, 0x5d, 0x10, - 0xe9, 0x74, 0xb9, 0xb7, 0x63, 0xa5, 0xfb, 0xb8, 0x71, 0x0e, 0x81, 0x9e, 0xb7, 0x2e, 0x79, 0x04, - 0x57, 0x3d, 0x2e, 0xd9, 0xa1, 0x8f, 0x1f, 0x08, 0x1e, 0xa3, 0x06, 0x74, 0x5c, 0xd4, 0x9d, 0x2f, - 0xa7, 0xa2, 0x57, 0xb7, 0x17, 0x09, 0xf4, 0xac, 0x4f, 0xe7, 0xdf, 0x06, 0x98, 0xfd, 0x31, 0x1b, - 0x61, 0x3f, 0x18, 0x86, 0xaa, 0x85, 0x70, 0xf5, 0x63, 0xb1, 0x85, 0x68, 0x06, 0x4d, 0x30, 0x72, - 0x00, 0x75, 0x9f, 0x07, 0xc8, 0x46, 0xa8, 0x42, 0xb1, 0xba, 0xd5, 0xb8, 0x7f, 0xfb, 0x82, 0xf3, - 0xef, 0x24, 0x74, 0xe7, 0x4a, 0x96, 0x21, 0xa9, 0x41, 0xd2, 0x5c, 0x89, 0x8c, 0xa1, 0x19, 0x4d, - 0x7c, 0xbf, 0x27, 0xd0, 0xc3, 0x20, 0xe6, 0xcc, 0x97, 0x3a, 0x1a, 0x75, 0x7d, 0x7d, 0xa5, 0xf8, - 0xfe, 0xbc, 0x97, 0x73, 0x6d, 0x36, 0xb5, 0x9a, 0x0b, 0x46, 0xba, 0xa8, 0xdd, 0xf9, 0x95, 0x01, - 0x6b, 0xe9, 0x2e, 0xc8, 0x2e, 0xd4, 0xdc, 0x23, 0xc6, 0x83, 0x96, 0xa1, 0x4f, 0x73, 0xe7, 0x82, - 0x05, 0x93, 0x86, 0xa8, 0xee, 0xab, 0xb8, 0xa0, 0x9e, 0xf2, 0xa7, 0x89, 0x0c, 0xb1, 0x01, 0xdc, - 0x30, 0x88, 0x99, 0x8a, 0xf5, 0xe4, 0x8a, 0xcc, 0xa4, 0xac, 0xf5, 0x72, 0x2b, 0x2d, 0x31, 0x3a, - 0xbf, 0x33, 0xa0, 0x9e, 0x8a, 0x6e, 0xab, 0x27, 0x18, 0x89, 0x70, 0x12, 0x2d, 0x3e, 0xc1, 0x23, - 0x65, 0xa4, 0x09, 0xa6, 0xaa, 0xc5, 0x31, 0x0f, 0xbc, 0xc5, 0xaa, 0xf6, 0x3e, 0x0f, 0x3c, 0xaa, - 0x11, 0xd2, 0x05, 0x53, 0x55, 0x37, 0x19, 0x31, 0x37, 0xab, 0x69, 0x57, 0x53, 0x9a, 0xb9, 0x9b, - 0x01, 0xb4, 0xe0, 0xe4, 0x85, 0x72, 0xe5, 0xbc, 0x42, 0xd9, 0xf9, 0xbd, 0x01, 0x50, 0x9c, 0x9d, - 0x7c, 0x00, 0x75, 0x81, 0x32, 0x9c, 0x08, 0x17, 0xd3, 0x34, 0xb8, 0x73, 0x61, 0x1a, 0x24, 0xf4, - 0xfe, 0x76, 0x11, 0x09, 0x99, 0x8d, 0xe6, 0x62, 0xe4, 0x31, 0x54, 0x45, 0x3e, 0x9c, 0xd8, 0xaf, - 0xf5, 0x18, 0xc5, 0x74, 0x92, 0x77, 0x00, 0x35, 0x9b, 0x28, 0x9d, 0x8e, 0x07, 0xcd, 0x05, 0xd2, - 0xfc, 0xe5, 0x18, 0x5f, 0xe0, 0x72, 0xce, 0xed, 0x22, 0x9d, 0x7f, 0x18, 0xb0, 0x18, 0x74, 0x5f, - 0x7c, 0x99, 0xf7, 0x80, 0xa8, 0xe2, 0xca, 0x5d, 0x7c, 0xe8, 0xba, 0xe1, 0x24, 0x48, 0x06, 0xa9, - 0x64, 0xd1, 0xbc, 0x38, 0x0e, 0xce, 0x30, 0xe8, 0x12, 0x2f, 0xf2, 0x93, 0x6c, 0x18, 0xa3, 0x38, - 0x54, 0xa9, 0xa4, 0x22, 0x7b, 0x6b, 0xd9, 0xa4, 0xb7, 0x74, 0xc8, 0x5b, 0x18, 0xdb, 0x94, 0x06, - 0x2d, 0xe9, 0x75, 0x9e, 0x1b, 0x70, 0x5e, 0xd1, 0x22, 0xdf, 0x86, 0x8d, 0x08, 0x05, 0x0f, 0xbd, - 0x01, 0xba, 0x61, 0xe0, 0x25, 0xf3, 0x68, 0xcd, 0xb9, 0x3a, 0x9b, 0x5a, 0x1b, 0xfb, 0x65, 0x80, - 0xce, 0xf3, 0xd4, 0x00, 0x12, 0xf3, 0x31, 0x86, 0x93, 0x38, 0xf3, 0xbc, 0xa4, 0x3d, 0xf5, 0x00, - 0x72, 0x30, 0x87, 0xd0, 0x05, 0x26, 0xf9, 0x3e, 0x5c, 0x19, 0x32, 0xee, 0x4f, 0x04, 0x1e, 0x1c, - 0x09, 0x94, 0x47, 0xa1, 0xef, 0xe9, 0xb0, 0xaf, 0x39, 0xd7, 0x67, 0x53, 0xeb, 0xca, 0x0f, 0x16, - 0x30, 0x7a, 0x86, 0xdd, 0xf9, 0x8b, 0x01, 0x50, 0x44, 0xe8, 0xeb, 0xe5, 0xe1, 0x1d, 0x58, 0x3b, - 0x41, 0x21, 0x55, 0xeb, 0xbc, 0x34, 0xdf, 0x59, 0x7e, 0x94, 0x98, 0x69, 0x86, 0xe7, 0x21, 0x54, - 0x3d, 0x77, 0x10, 0xc9, 0x92, 0x7a, 0xe5, 0xdc, 0xa4, 0x7e, 0x00, 0x35, 0xe9, 0x86, 0x11, 0xa6, - 0xfd, 0xae, 0x9d, 0xed, 0x69, 0xa0, 0x8c, 0x2f, 0xa7, 0xd6, 0x46, 0xb6, 0x7f, 0x6d, 0xa0, 0x09, - 0xb9, 0xf3, 0x67, 0x03, 0xcc, 0x83, 0x9d, 0x41, 0x2f, 0x0c, 0x86, 0x7c, 0x34, 0xff, 0x01, 0x60, - 0xfc, 0x6f, 0x3f, 0x00, 0x8e, 0x60, 0xdd, 0x2d, 0x86, 0xba, 0xac, 0x3b, 0xd8, 0xaf, 0x3f, 0x07, - 0xea, 0xae, 0x78, 0x3d, 0x3d, 0xd6, 0x7a, 0x09, 0x90, 0x74, 0x4e, 0xb9, 0xf3, 0x55, 0x30, 0x55, - 0x40, 0xec, 0x0d, 0xb7, 0xd9, 0xe9, 0xdb, 0xd7, 0x7f, 0xfb, 0x99, 0x55, 0xf9, 0xe5, 0x53, 0xab, - 0xf2, 0xe9, 0x53, 0xab, 0xf2, 0xd9, 0x53, 0xab, 0xf2, 0xc9, 0x5f, 0x37, 0x2b, 0x9d, 0x3f, 0x18, - 0x70, 0x5d, 0x1f, 0x62, 0x31, 0xfb, 0xbf, 0x01, 0x75, 0x16, 0xf1, 0x47, 0xa5, 0xc7, 0xcd, 0xab, - 0xd1, 0xc3, 0xfd, 0x7e, 0xf2, 0xbe, 0x39, 0xe3, 0xff, 0x53, 0x6a, 0xff, 0x58, 0x85, 0x46, 0xe9, - 0x43, 0x47, 0xa5, 0x54, 0x28, 0x46, 0x2c, 0xe0, 0x1f, 0xeb, 0x89, 0x4b, 0xea, 0x4e, 0x65, 0x26, - 0x29, 0xb5, 0x57, 0x06, 0xe8, 0x3c, 0x8f, 0x7c, 0x1d, 0x4c, 0x5d, 0x12, 0x04, 0xc7, 0xac, 0x13, - 0xe9, 0xe7, 0xeb, 0x65, 0x46, 0x5a, 0xe0, 0xa4, 0x0f, 0xd7, 0xca, 0xde, 0xcc, 0x7f, 0x12, 0xf0, - 0x38, 0xa9, 0x1d, 0xa6, 0x73, 0x63, 0x36, 0xb5, 0xae, 0xed, 0x9d, 0x85, 0xe9, 0x32, 0x1f, 0xd5, - 0x02, 0x7d, 0x15, 0x3b, 0x3c, 0x56, 0x0b, 0xaf, 0x14, 0x2d, 0x70, 0x27, 0xb7, 0xd2, 0x12, 0x43, - 0xed, 0x53, 0x0f, 0xc6, 0x81, 0x8b, 0xb2, 0x55, 0x2b, 0xf6, 0xb9, 0x9f, 0x19, 0x69, 0x81, 0x93, - 0xef, 0x42, 0x53, 0xc6, 0x02, 0x31, 0x2e, 0xbe, 0x54, 0x56, 0xb5, 0x8b, 0x6e, 0xfd, 0x83, 0x79, - 0x88, 0x2e, 0x72, 0xd5, 0x87, 0x53, 0x14, 0xca, 0x98, 0xf9, 0xbd, 0xd0, 0xcb, 0xbf, 0xb2, 0xf4, - 0x87, 0xd3, 0x7e, 0x61, 0xa6, 0x65, 0x0e, 0x79, 0x0b, 0xd6, 0x25, 0x0a, 0xce, 0xfc, 0xdd, 0xc9, - 0xf8, 0x10, 0x45, 0xab, 0xae, 0x5f, 0x2e, 0x0f, 0xd4, 0x41, 0x09, 0xa3, 0x73, 0x4c, 0xa7, 0xf7, - 0xec, 0x45, 0xbb, 0xf2, 0xfc, 0x45, 0xbb, 0xf2, 0xf9, 0x8b, 0x76, 0xe5, 0x93, 0x59, 0xdb, 0x78, - 0x36, 0x6b, 0x1b, 0xcf, 0x67, 0x6d, 0xe3, 0xf3, 0x59, 0xdb, 0xf8, 0xdb, 0xac, 0x6d, 0x7c, 0xfa, - 0xf7, 0x76, 0xe5, 0xa3, 0x5b, 0xaf, 0xfc, 0x17, 0xc8, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x3d, - 0x8f, 0x54, 0x44, 0x22, 0x11, 0x00, 0x00, + // 1728 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcf, 0x6f, 0x23, 0x49, + 0x15, 0x76, 0xc7, 0x4e, 0xe2, 0x2e, 0x27, 0xe3, 0x49, 0xcd, 0xa0, 0x31, 0x23, 0xc6, 0x1d, 0xbc, + 0x62, 0x94, 0x01, 0xa6, 0x4d, 0x46, 0xb3, 0xb0, 0xac, 0x84, 0x20, 0xed, 0xec, 0x66, 0xbd, 0x9b, + 0x49, 0x42, 0x39, 0xc3, 0xae, 0x16, 0x04, 0xaa, 0x74, 0x3f, 0x3b, 0x45, 0xda, 0xdd, 0xad, 0xaa, + 0x6e, 0x83, 0xf7, 0xb4, 0x47, 0xb8, 0x2d, 0x37, 0x8e, 0x3b, 0x12, 0x7f, 0x02, 0x17, 0xfe, 0x02, + 0x46, 0x9c, 0x86, 0x0b, 0xda, 0x03, 0xb2, 0x18, 0x73, 0x45, 0x5c, 0x10, 0x12, 0xca, 0x09, 0x55, + 0xf5, 0x4f, 0x3b, 0xce, 0x24, 0x8b, 0x90, 0xf6, 0xe6, 0xfe, 0xde, 0xf7, 0xbe, 0xaa, 0xae, 0x7a, + 0xbf, 0xda, 0xe8, 0xe1, 0xd9, 0xd0, 0x77, 0x22, 0x17, 0x84, 0xf9, 0xcb, 0xf1, 0x47, 0x6d, 0xdb, + 0x65, 0xe0, 0x85, 0x0f, 0x07, 0x7e, 0x9b, 0x06, 0xac, 0x3d, 0xda, 0x6e, 0x0f, 0xc0, 0x03, 0x4e, + 0x43, 0x70, 0xcc, 0x80, 0xfb, 0xa1, 0x8f, 0xef, 0x15, 0xe9, 0x66, 0x4c, 0xff, 0xd9, 0xc0, 0x37, + 0x69, 0xc0, 0xcc, 0xd1, 0xf6, 0xdd, 0x87, 0x03, 0x16, 0x9e, 0x46, 0x27, 0xa6, 0xed, 0x0f, 0xdb, + 0x03, 0x7f, 0xe0, 0xb7, 0x95, 0xd7, 0x49, 0xd4, 0x57, 0x4f, 0xea, 0x41, 0xfd, 0x8a, 0xd5, 0xee, + 0xb6, 0xce, 0xde, 0x10, 0x26, 0x8b, 0x17, 0xb3, 0x7d, 0x0e, 0x0b, 0x56, 0xbc, 0xfb, 0x38, 0xe7, + 0x0c, 0xa9, 0x7d, 0xca, 0x3c, 0xe0, 0xe3, 0x76, 0x70, 0x36, 0x90, 0x80, 0x68, 0x0f, 0x21, 0xa4, + 0x0b, 0xbc, 0x5a, 0x3f, 0x46, 0x5f, 0xea, 0x00, 0x0f, 0x59, 0x9f, 0xd9, 0x34, 0x84, 0x23, 0xce, + 0x46, 0x34, 0x84, 0xf7, 0x60, 0x8c, 0x2d, 0x54, 0x05, 0xcf, 0xf6, 0x1d, 0xe6, 0x0d, 0x1a, 0xda, + 0xa6, 0xb6, 0xa5, 0x5b, 0xf7, 0x9f, 0x4f, 0x8c, 0xd2, 0x74, 0x62, 0x54, 0xdf, 0x4a, 0xf0, 0xf3, + 0x89, 0x81, 0x73, 0x8f, 0x14, 0x25, 0x99, 0x5f, 0xeb, 0x5f, 0xcb, 0xa8, 0x5e, 0x50, 0xef, 0x05, + 0x60, 0xe3, 0xd7, 0xd0, 0x32, 0x75, 0x19, 0x15, 0x89, 0xe8, 0x7a, 0x22, 0xba, 0xbc, 0x23, 0x41, + 0x12, 0xdb, 0xf0, 0x87, 0x48, 0x67, 0x42, 0x44, 0xc0, 0x09, 0xf4, 0x1b, 0x4b, 0x9b, 0xda, 0x56, + 0xed, 0xd1, 0x43, 0x33, 0x7e, 0x3f, 0x75, 0x82, 0xf2, 0x0c, 0xcc, 0xd1, 0xb6, 0x79, 0x3c, 0x0e, + 0xc0, 0xd9, 0xf7, 0x6d, 0xea, 0x1e, 0x9e, 0xfc, 0x1c, 0xec, 0x90, 0x40, 0x1f, 0x38, 0x78, 0x36, + 0x58, 0xeb, 0xd3, 0x89, 0xa1, 0x77, 0x53, 0x0d, 0x92, 0xcb, 0xe1, 0x47, 0x08, 0x09, 0xb0, 0x39, + 0x84, 0x07, 0x74, 0x08, 0x8d, 0xb2, 0xda, 0x05, 0x4e, 0x76, 0x81, 0x7a, 0x99, 0x85, 0x14, 0x58, + 0xf8, 0x87, 0x68, 0x55, 0x44, 0x6a, 0x85, 0x46, 0x45, 0xed, 0xe6, 0xeb, 0xe6, 0x2b, 0xef, 0xd7, + 0xfc, 0xe0, 0xf5, 0x6f, 0x7d, 0xb7, 0x17, 0x7b, 0x58, 0xb5, 0xe9, 0xc4, 0x58, 0x4d, 0x1e, 0x48, + 0xaa, 0x83, 0x3f, 0x40, 0x55, 0x27, 0xe2, 0x34, 0x64, 0xbe, 0xd7, 0x58, 0x56, 0x9a, 0x66, 0xe1, + 0x0d, 0xb3, 0x1b, 0x34, 0x83, 0xb3, 0x81, 0x04, 0x84, 0x29, 0x6f, 0x50, 0x4a, 0xef, 0x26, 0x5e, + 0xd6, 0x9a, 0xbc, 0x8b, 0xf4, 0x89, 0x64, 0x6a, 0x98, 0xa2, 0x1a, 0x07, 0x0f, 0x7e, 0x61, 0x41, + 0xdf, 0xe7, 0xd0, 0x58, 0xf9, 0x9f, 0xc4, 0xeb, 0xd3, 0x89, 0x51, 0x23, 0xb9, 0x0c, 0x29, 0x6a, + 0xe2, 0x2d, 0x54, 0x75, 0x3c, 0x21, 0x8f, 0x46, 0x34, 0x56, 0x37, 0xcb, 0x5b, 0x7a, 0xb2, 0x99, + 0x83, 0x9e, 0xc2, 0x48, 0x66, 0xc5, 0xdb, 0xa8, 0xc6, 0x82, 0x1d, 0xc7, 0xe1, 0x20, 0x04, 0x88, + 0x46, 0x55, 0x91, 0x95, 0x78, 0xf7, 0x28, 0x83, 0x49, 0x91, 0x83, 0xbf, 0x82, 0x2a, 0x11, 0x67, + 0xa2, 0xa1, 0x2b, 0x6e, 0x75, 0x3a, 0x31, 0x2a, 0x4f, 0x49, 0x57, 0x10, 0x85, 0xe2, 0x37, 0xd1, + 0x0d, 0x18, 0x52, 0xe6, 0xe6, 0x9a, 0x48, 0xf1, 0xf0, 0x74, 0x62, 0xdc, 0x78, 0x6b, 0xc6, 0x42, + 0xe6, 0x98, 0xd8, 0x41, 0x28, 0xc8, 0xe2, 0xb5, 0x51, 0x53, 0x07, 0xf3, 0xf8, 0x8a, 0x9b, 0x5c, + 0x98, 0x1d, 0xd6, 0x0d, 0x19, 0x2c, 0xf9, 0x33, 0x29, 0xe8, 0xb6, 0xfe, 0xa4, 0xa1, 0x7a, 0xc7, + 0x8d, 0x44, 0x08, 0xfc, 0x09, 0x84, 0xd4, 0xa1, 0x21, 0xc5, 0xf7, 0x50, 0x39, 0x62, 0x4e, 0x12, + 0xf3, 0xb5, 0x24, 0xda, 0xca, 0x4f, 0xbb, 0xbb, 0x44, 0xe2, 0x78, 0x13, 0x55, 0x3c, 0x19, 0x8d, + 0x4b, 0xca, 0xbe, 0x96, 0xd8, 0x2b, 0x2a, 0x0e, 0x95, 0x05, 0xbf, 0x8e, 0x6a, 0x0e, 0x13, 0x81, + 0x4b, 0xc7, 0x85, 0xb0, 0xbd, 0x95, 0x10, 0x6b, 0xbb, 0xb9, 0x89, 0x14, 0x79, 0xf8, 0xfb, 0xa8, + 0x1a, 0x70, 0x7f, 0xc4, 0x1c, 0xe0, 0x2a, 0x72, 0x75, 0xeb, 0xb5, 0x34, 0x8b, 0x8f, 0x12, 0xfc, + 0x7c, 0x62, 0xd4, 0xdf, 0xf1, 0x45, 0xc8, 0xbc, 0x41, 0x0a, 0x91, 0xcc, 0xa9, 0xf5, 0x9f, 0x32, + 0xd2, 0x3b, 0xbe, 0xe7, 0x30, 0x15, 0x5a, 0xdb, 0xa8, 0x12, 0x8e, 0x03, 0x48, 0xa4, 0xee, 0xa5, + 0xfb, 0x94, 0x69, 0x78, 0x3e, 0x31, 0xd6, 0x33, 0xa2, 0x04, 0x88, 0xa2, 0xe2, 0x9f, 0xa2, 0x15, + 0x11, 0xd2, 0x30, 0x12, 0x2a, 0xca, 0x75, 0xeb, 0xed, 0xc4, 0x69, 0xa5, 0xa7, 0xd0, 0xf3, 0x89, + 0x71, 0xad, 0xc2, 0x65, 0x66, 0xda, 0xb1, 0x1f, 0x49, 0x54, 0xf1, 0xbb, 0x08, 0xfb, 0x27, 0x02, + 0xf8, 0x08, 0x9c, 0xbd, 0xb8, 0xb6, 0xc9, 0x8c, 0x92, 0xe7, 0x53, 0xb6, 0xee, 0x26, 0x6b, 0xe1, + 0xc3, 0x0b, 0x0c, 0xb2, 0xc0, 0x0b, 0xef, 0xa0, 0xaa, 0x80, 0x11, 0x70, 0x16, 0x8e, 0x55, 0xda, + 0xe8, 0xd6, 0xd7, 0xd2, 0xd3, 0xea, 0x25, 0xf8, 0xf9, 0xc4, 0xd8, 0xc8, 0xb7, 0x92, 0x80, 0x24, + 0x73, 0xc3, 0x23, 0x84, 0x5d, 0x2a, 0xc2, 0x63, 0x4e, 0x3d, 0x11, 0x1f, 0x05, 0x1b, 0x42, 0x63, + 0x35, 0x2d, 0x1a, 0xd7, 0xc9, 0x41, 0xe9, 0x91, 0x6f, 0x7d, 0xff, 0x82, 0x1a, 0x59, 0xb0, 0x02, + 0xbe, 0x8f, 0x56, 0x38, 0x50, 0xe1, 0x7b, 0x8d, 0xaa, 0xda, 0xf8, 0x8d, 0xf4, 0x98, 0x89, 0x42, + 0x49, 0x62, 0xc5, 0x0f, 0xd0, 0xea, 0x10, 0x84, 0xa0, 0x03, 0x68, 0xe8, 0x8a, 0x58, 0x4f, 0x88, + 0xab, 0x4f, 0x62, 0x98, 0xa4, 0xf6, 0xd6, 0x3f, 0x35, 0x54, 0x7f, 0x07, 0xa8, 0x1b, 0x9e, 0x76, + 0x4e, 0xc1, 0x3e, 0x53, 0xd5, 0xfb, 0x37, 0x1a, 0xba, 0xc3, 0x81, 0x3a, 0xbe, 0xe7, 0x8e, 0xe7, + 0x6c, 0x2a, 0xb8, 0x6b, 0x8f, 0xbe, 0x7d, 0x45, 0x3e, 0x91, 0xc5, 0xde, 0x96, 0x91, 0xec, 0xe3, + 0xce, 0x25, 0x04, 0x72, 0xd9, 0xba, 0x78, 0x0f, 0x6d, 0x38, 0x4c, 0xd0, 0x13, 0x17, 0xde, 0xe7, + 0x2c, 0x04, 0x65, 0x50, 0x99, 0x54, 0xb5, 0xbe, 0x9c, 0x88, 0x6e, 0xec, 0xce, 0x13, 0xc8, 0x45, + 0x9f, 0xd6, 0xbf, 0x35, 0xa4, 0x77, 0x87, 0x74, 0x00, 0x5d, 0xaf, 0xef, 0xcb, 0x46, 0xc5, 0xe4, + 0xc3, 0x7c, 0xa3, 0x52, 0x0c, 0x12, 0xdb, 0xf0, 0x31, 0xaa, 0xba, 0xcc, 0x03, 0x3a, 0x00, 0xd1, + 0x58, 0xda, 0x2c, 0x6f, 0xd5, 0x1e, 0xdd, 0xbf, 0xe2, 0xfd, 0xf7, 0x63, 0xba, 0x75, 0x33, 0x8d, + 0xac, 0x04, 0x10, 0x24, 0x53, 0xc2, 0x43, 0x54, 0x0f, 0x22, 0xd7, 0xed, 0x70, 0x70, 0xc0, 0x0b, + 0x19, 0x75, 0x85, 0x0a, 0x68, 0x55, 0xc5, 0x5f, 0x29, 0x7e, 0x34, 0xeb, 0x65, 0xdd, 0x9a, 0x4e, + 0x8c, 0xfa, 0x1c, 0x48, 0xe6, 0xb5, 0x5b, 0xbf, 0xd6, 0xd0, 0x6a, 0xb2, 0x0b, 0x7c, 0x80, 0x96, + 0xed, 0x53, 0xca, 0xbc, 0x86, 0xa6, 0xde, 0xe6, 0xc1, 0x15, 0x0b, 0xc6, 0x6d, 0x57, 0x9e, 0x57, + 0x7e, 0x40, 0x1d, 0xe9, 0x4f, 0x62, 0x19, 0x6c, 0x22, 0x64, 0xfb, 0x5e, 0x48, 0x65, 0xac, 0xc7, + 0x47, 0xa4, 0xc7, 0xc5, 0xb3, 0x93, 0xa1, 0xa4, 0xc0, 0x68, 0xfd, 0x4e, 0x43, 0xd5, 0x44, 0x74, + 0x57, 0x5e, 0xc1, 0x80, 0xfb, 0x51, 0x30, 0x7f, 0x05, 0x7b, 0x12, 0x24, 0xb1, 0x4d, 0xd6, 0xce, + 0x33, 0xe6, 0x39, 0xf3, 0xb5, 0xf3, 0x3d, 0xe6, 0x39, 0x44, 0x59, 0x70, 0x1b, 0xe9, 0xb2, 0x86, + 0x8a, 0x80, 0xda, 0x69, 0xe5, 0xdc, 0x48, 0x68, 0xfa, 0x41, 0x6a, 0x20, 0x39, 0x27, 0x2b, 0xc7, + 0x95, 0xcb, 0xca, 0x71, 0xeb, 0xf7, 0x1a, 0x42, 0xf9, 0xbb, 0xe3, 0xf7, 0x51, 0x95, 0x83, 0xf0, + 0x23, 0x6e, 0x43, 0x92, 0x06, 0x0f, 0xae, 0x4c, 0x83, 0x98, 0xde, 0xdd, 0xcd, 0x23, 0x21, 0xc5, + 0x48, 0x26, 0x86, 0x9f, 0xa0, 0x32, 0xcf, 0x46, 0x20, 0xf3, 0x5a, 0x97, 0x91, 0xcf, 0x40, 0x59, + 0x9f, 0x91, 0x13, 0x90, 0xd4, 0x69, 0x39, 0xa8, 0x3e, 0x47, 0x9a, 0x3d, 0x1c, 0xed, 0x73, 0x1c, + 0xce, 0xa5, 0xbd, 0xaa, 0xf5, 0x0f, 0x0d, 0xcd, 0x07, 0xdd, 0xe7, 0x5f, 0xe6, 0x5d, 0x84, 0x65, + 0x7d, 0x66, 0x36, 0xec, 0xd8, 0xb6, 0x1f, 0x79, 0xf1, 0xb8, 0x16, 0x2f, 0x9a, 0x15, 0xc7, 0xde, + 0x05, 0x06, 0x59, 0xe0, 0x85, 0x7f, 0x92, 0x8e, 0x7c, 0x04, 0xfa, 0x32, 0x95, 0x64, 0x64, 0x6f, + 0x2d, 0x9a, 0x27, 0x17, 0x8e, 0x92, 0x73, 0xc3, 0xa1, 0xd4, 0x20, 0x05, 0xbd, 0xd6, 0x0b, 0x0d, + 0x5d, 0x56, 0xb4, 0xf0, 0x77, 0xd0, 0x7a, 0x00, 0x9c, 0xf9, 0x4e, 0x0f, 0x6c, 0xdf, 0x73, 0xe2, + 0xa9, 0x77, 0xd9, 0xda, 0x98, 0x4e, 0x8c, 0xf5, 0xa3, 0xa2, 0x81, 0xcc, 0xf2, 0xe4, 0x98, 0x13, + 0xb2, 0x21, 0xf8, 0x51, 0x98, 0x7a, 0x2e, 0x29, 0x4f, 0x35, 0xe6, 0x1c, 0xcf, 0x58, 0xc8, 0x1c, + 0x13, 0xff, 0x00, 0xdd, 0xec, 0x53, 0xe6, 0x46, 0x1c, 0x8e, 0x4f, 0x39, 0x88, 0x53, 0xdf, 0x75, + 0x54, 0xd8, 0x2f, 0x5b, 0xb7, 0xa7, 0x13, 0xe3, 0xe6, 0xdb, 0x73, 0x36, 0x72, 0x81, 0xdd, 0xfa, + 0x8b, 0x86, 0x50, 0x1e, 0xa1, 0xd7, 0xcb, 0xc3, 0x07, 0x68, 0x75, 0x04, 0x5c, 0xc8, 0xee, 0xbb, + 0x34, 0xdb, 0x59, 0x7e, 0x14, 0xc3, 0x24, 0xb5, 0x67, 0x21, 0x54, 0xbe, 0x74, 0xdc, 0x49, 0x93, + 0xba, 0x72, 0x69, 0x52, 0x3f, 0x46, 0xcb, 0xc2, 0xf6, 0x03, 0x48, 0xc6, 0x8a, 0x66, 0xba, 0xa7, + 0x9e, 0x04, 0xe5, 0x30, 0x92, 0xee, 0x5f, 0x01, 0x24, 0x26, 0xb7, 0xfe, 0xac, 0x21, 0xfd, 0x78, + 0xbf, 0xd7, 0xf1, 0xbd, 0x3e, 0x1b, 0xcc, 0x7e, 0x66, 0x68, 0xff, 0xdf, 0xcf, 0x8c, 0x53, 0xb4, + 0x66, 0xe7, 0xa3, 0x63, 0xda, 0x1d, 0xcc, 0xeb, 0x4f, 0x9b, 0xaa, 0x2b, 0xde, 0x4e, 0x5e, 0x6b, + 0xad, 0x60, 0x10, 0x64, 0x46, 0xb9, 0xf5, 0x55, 0xa4, 0xcb, 0x80, 0x38, 0xec, 0xef, 0xd2, 0xf1, + 0x9b, 0xb7, 0x7f, 0xfb, 0xa9, 0x51, 0xfa, 0xd5, 0x33, 0xa3, 0xf4, 0xc9, 0x33, 0xa3, 0xf4, 0xe9, + 0x33, 0xa3, 0xf4, 0xf1, 0x5f, 0x37, 0x4b, 0xad, 0x3f, 0x68, 0xe8, 0xb6, 0x7a, 0x89, 0xf9, 0xec, + 0xff, 0x26, 0xaa, 0xd2, 0x80, 0xed, 0x15, 0x2e, 0x37, 0xab, 0x46, 0x3b, 0x47, 0xdd, 0xf8, 0x7e, + 0x33, 0xc6, 0x17, 0x53, 0x6a, 0xff, 0x58, 0x46, 0xb5, 0xc2, 0xe7, 0x94, 0x4c, 0x29, 0x9f, 0x0f, + 0xa8, 0xc7, 0x3e, 0x52, 0x43, 0x9b, 0x50, 0x9d, 0x4a, 0x8f, 0x53, 0xea, 0xb0, 0x68, 0x20, 0xb3, + 0x3c, 0xfc, 0x0d, 0xa4, 0xab, 0x92, 0xc0, 0x19, 0xa4, 0x9d, 0x48, 0x5d, 0x5f, 0x27, 0x05, 0x49, + 0x6e, 0xc7, 0x5d, 0x74, 0xab, 0xe8, 0x4d, 0xdd, 0xa7, 0x1e, 0x0b, 0xe3, 0xda, 0xa1, 0x5b, 0x77, + 0xa6, 0x13, 0xe3, 0xd6, 0xe1, 0x45, 0x33, 0x59, 0xe4, 0x23, 0x5b, 0xa0, 0x2b, 0x63, 0x87, 0x85, + 0x72, 0xe1, 0x4a, 0xde, 0x02, 0xf7, 0x33, 0x94, 0x14, 0x18, 0x72, 0x9f, 0x6a, 0xfc, 0xf6, 0x6c, + 0x90, 0x43, 0x73, 0xb6, 0xcf, 0xa3, 0x14, 0x24, 0xb9, 0x1d, 0x7f, 0x0f, 0xd5, 0x45, 0xc8, 0x01, + 0xc2, 0xfc, 0x7b, 0x68, 0x45, 0xb9, 0xa8, 0xd6, 0xdf, 0x9b, 0x35, 0x91, 0x79, 0xae, 0xfc, 0x3c, + 0x0b, 0x7c, 0x11, 0x52, 0xb7, 0xe3, 0x3b, 0xd9, 0xb7, 0x9c, 0xfa, 0x3c, 0x3b, 0xca, 0x61, 0x52, + 0xe4, 0xe0, 0x37, 0xd0, 0x9a, 0x00, 0xce, 0xa8, 0x7b, 0x10, 0x0d, 0x4f, 0x80, 0x27, 0xf3, 0x66, + 0x16, 0xa8, 0xbd, 0x82, 0x8d, 0xcc, 0x30, 0xad, 0xce, 0xf3, 0x97, 0xcd, 0xd2, 0x8b, 0x97, 0xcd, + 0xd2, 0x67, 0x2f, 0x9b, 0xa5, 0x8f, 0xa7, 0x4d, 0xed, 0xf9, 0xb4, 0xa9, 0xbd, 0x98, 0x36, 0xb5, + 0xcf, 0xa6, 0x4d, 0xed, 0x6f, 0xd3, 0xa6, 0xf6, 0xc9, 0xdf, 0x9b, 0xa5, 0x0f, 0xef, 0xbd, 0xf2, + 0x8f, 0x96, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe4, 0x6b, 0xda, 0x16, 0x88, 0x11, 0x00, 0x00, } func (m *CertificatePrivateKey) Marshal() (dAtA []byte, err error) { @@ -873,12 +875,12 @@ func (m *Condition) MarshalToSizedBuffer(dAtA []byte) (int, error) { copy(dAtA[i:], m.Message) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Message))) i-- - dAtA[i] = 0x32 + dAtA[i] = 0x4a i -= len(m.Reason) copy(dAtA[i:], m.Reason) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Reason))) i-- - dAtA[i] = 0x2a + dAtA[i] = 0x42 { size, err := m.LastTransitionTime.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -888,20 +890,25 @@ func (m *Condition) MarshalToSizedBuffer(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(size)) } i-- - dAtA[i] = 0x22 - i = encodeVarintGenerated(dAtA, i, uint64(m.ObservedGeneration)) + dAtA[i] = 0x3a + i -= len(m.Severity) + copy(dAtA[i:], m.Severity) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Severity))) i-- - dAtA[i] = 0x18 + dAtA[i] = 0x32 i -= len(m.Status) copy(dAtA[i:], m.Status) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Status))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0x2a i -= len(m.Type) copy(dAtA[i:], m.Type) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Type))) i-- - dAtA[i] = 0xa + dAtA[i] = 0x22 + i = encodeVarintGenerated(dAtA, i, uint64(m.ObservedGeneration)) + i-- + dAtA[i] = 0x18 return len(dAtA) - i, nil } @@ -1583,11 +1590,13 @@ func (m *Condition) Size() (n int) { } var l int _ = l + n += 1 + sovGenerated(uint64(m.ObservedGeneration)) l = len(m.Type) n += 1 + l + sovGenerated(uint64(l)) l = len(m.Status) n += 1 + l + sovGenerated(uint64(l)) - n += 1 + sovGenerated(uint64(m.ObservedGeneration)) + l = len(m.Severity) + n += 1 + l + sovGenerated(uint64(l)) l = m.LastTransitionTime.Size() n += 1 + l + sovGenerated(uint64(l)) l = len(m.Reason) @@ -1893,9 +1902,10 @@ func (this *Condition) String() string { return "nil" } s := strings.Join([]string{`&Condition{`, + `ObservedGeneration:` + fmt.Sprintf("%v", this.ObservedGeneration) + `,`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `ObservedGeneration:` + fmt.Sprintf("%v", this.ObservedGeneration) + `,`, + `Severity:` + fmt.Sprintf("%v", this.Severity) + `,`, `LastTransitionTime:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.LastTransitionTime), "Time", "v11.Time", 1), `&`, ``, 1) + `,`, `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, `Message:` + fmt.Sprintf("%v", this.Message) + `,`, @@ -2790,7 +2800,26 @@ func (m *Condition) Unmarshal(dAtA []byte) error { return fmt.Errorf("proto: Condition: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { - case 1: + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ObservedGeneration", wireType) + } + m.ObservedGeneration = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ObservedGeneration |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + case 4: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Type", wireType) } @@ -2820,9 +2849,9 @@ func (m *Condition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Type = string(dAtA[iNdEx:postIndex]) + m.Type = ConditionType(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 2: + case 5: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Status", wireType) } @@ -2852,13 +2881,13 @@ func (m *Condition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Status = k8s_io_api_core_v1.ConditionStatus(dAtA[iNdEx:postIndex]) + m.Status = k8s_io_apimachinery_pkg_apis_meta_v1.ConditionStatus(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 3: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field ObservedGeneration", wireType) + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Severity", wireType) } - m.ObservedGeneration = 0 + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowGenerated @@ -2868,12 +2897,25 @@ func (m *Condition) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.ObservedGeneration |= int64(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - case 4: + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Severity = ConditionSeverity(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 7: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field LastTransitionTime", wireType) } @@ -2906,7 +2948,7 @@ func (m *Condition) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex - case 5: + case 8: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Reason", wireType) } @@ -2938,7 +2980,7 @@ func (m *Condition) Unmarshal(dAtA []byte) error { } m.Reason = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex - case 6: + case 9: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Message", wireType) } diff --git a/vendor/kmodules.xyz/client-go/api/v1/generated.proto b/vendor/kmodules.xyz/client-go/api/v1/generated.proto index ff235455..d8fc1a44 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/generated.proto +++ b/vendor/kmodules.xyz/client-go/api/v1/generated.proto @@ -97,16 +97,15 @@ message ClusterMetadata { optional string provider = 4; } +// Condition defines an observation of a object operational state. message Condition { // Type of condition in CamelCase or in foo.example.com/CamelCase. - // Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be - // useful (see .node.status.conditions), the ability to deconflict is important. - // +required - optional string type = 1; + // Many .condition.type values are consistent across resources like Available, but because arbitrary util + // can be useful (see .node.status.util), the ability to deconflict is important. + optional string type = 4; // Status of the condition, one of True, False, Unknown. - // +required - optional string status = 2; + optional string status = 5; // If set, this represents the .metadata.generation that the condition was set based upon. // For instance, if .metadata.generation is currently 12, but the .status.condition[x].observedGeneration is 9, the condition is out of date @@ -114,21 +113,27 @@ message Condition { // +optional optional int64 observedGeneration = 3; + // Severity provides an explicit classification of Reason code, so the users or machines can immediately + // understand the current situation and act accordingly. + // The Severity field MUST be set only when Status=False. + // +optional + optional string severity = 6; + // Last time the condition transitioned from one status to another. - // This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable. - // +required - optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 4; + // This should be when the underlying condition changed. If that is not known, then using the time when + // the API field changed is acceptable. + optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 7; // The reason for the condition's last transition in CamelCase. - // The specific API may choose whether or not this field is considered a guaranteed API. + // The specific API may choose whether this field is considered a guaranteed API. // This field may not be empty. - // +required - optional string reason = 5; + // +optional + optional string reason = 8; - // A human readable message indicating details about the transition. + // A human-readable message indicating details about the transition. // This field may be empty. - // +required - optional string message = 6; + // +optional + optional string message = 9; } // HealthCheckSpec defines attributes of the health check diff --git a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go index daeb1a75..e33f3756 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/client-go/api/v1/openapi_generated.go @@ -233,11 +233,12 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Type: []string{"object"}, + Description: "Condition defines an observation of a object operational state.", + Type: []string{"object"}, Properties: map[string]spec.Schema{ "type": { SchemaProps: spec.SchemaProps{ - Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important.", + Description: "Type of condition in CamelCase or in foo.example.com/CamelCase. Many .condition.type values are consistent across resources like Available, but because arbitrary util can be useful (see .node.status.util), the ability to deconflict is important.", Default: "", Type: []string{"string"}, Format: "", @@ -258,31 +259,36 @@ func schema_kmodulesxyz_client_go_api_v1_Condition(ref common.ReferenceCallback) Format: "int64", }, }, + "severity": { + SchemaProps: spec.SchemaProps{ + Description: "Severity provides an explicit classification of Reason code, so the users or machines can immediately understand the current situation and act accordingly. The Severity field MUST be set only when Status=False.", + Type: []string{"string"}, + Format: "", + }, + }, "lastTransitionTime": { SchemaProps: spec.SchemaProps{ - Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", + Description: "Last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.", Default: map[string]interface{}{}, Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.Time"), }, }, "reason": { SchemaProps: spec.SchemaProps{ - Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether or not this field is considered a guaranteed API. This field may not be empty.", - Default: "", + Description: "The reason for the condition's last transition in CamelCase. The specific API may choose whether this field is considered a guaranteed API. This field may not be empty.", Type: []string{"string"}, Format: "", }, }, "message": { SchemaProps: spec.SchemaProps{ - Description: "A human readable message indicating details about the transition. This field may be empty.", - Default: "", + Description: "A human-readable message indicating details about the transition. This field may be empty.", Type: []string{"string"}, Format: "", }, }, }, - Required: []string{"type", "status", "lastTransitionTime", "reason", "message"}, + Required: []string{"type", "status", "lastTransitionTime"}, }, }, Dependencies: []string{ diff --git a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go index dd2040bf..85fa8084 100644 --- a/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go @@ -136,6 +136,28 @@ func (in *Condition) DeepCopy() *Condition { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in Conditions) DeepCopyInto(out *Conditions) { + { + in := &in + *out = make(Conditions, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + return + } +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Conditions. +func (in Conditions) DeepCopy() Conditions { + if in == nil { + return nil + } + out := new(Conditions) + in.DeepCopyInto(out) + return *out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HealthCheckSpec) DeepCopyInto(out *HealthCheckSpec) { *out = *in diff --git a/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go b/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go index 0316e88a..a628ca66 100644 --- a/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go +++ b/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go @@ -58,7 +58,7 @@ func RegisterCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) err }, metav1.UpdateOptions{}, ) - if err != nil { + if err != nil && !kerr.IsAlreadyExists(err) { return err } } diff --git a/vendor/kmodules.xyz/client-go/client/client.go b/vendor/kmodules.xyz/client-go/client/client.go index ae6f44eb..66b0b0d1 100644 --- a/vendor/kmodules.xyz/client-go/client/client.go +++ b/vendor/kmodules.xyz/client-go/client/client.go @@ -18,6 +18,7 @@ package client import ( "context" + "reflect" "strings" kmapi "kmodules.xyz/client-go/api/v1" @@ -68,12 +69,13 @@ type ( TransformStatusFunc func(obj client.Object) client.Object ) -func CreateOrPatch(ctx context.Context, c client.Client, obj client.Object, transform TransformFunc, opts ...client.PatchOption) (client.Object, kutil.VerbType, error) { +func CreateOrPatch(ctx context.Context, c client.Client, obj client.Object, transform TransformFunc, opts ...client.PatchOption) (kutil.VerbType, error) { + cur := obj.DeepCopyObject().(client.Object) key := types.NamespacedName{ - Namespace: obj.GetNamespace(), - Name: obj.GetName(), + Namespace: cur.GetNamespace(), + Name: cur.GetName(), } - err := c.Get(ctx, key, obj) + err := c.Get(ctx, key, cur) if kerr.IsNotFound(err) { klog.V(3).Infof("Creating %+v %s/%s.", obj.GetObjectKind().GroupVersionKind(), key.Namespace, key.Name) @@ -83,42 +85,58 @@ func CreateOrPatch(ctx context.Context, c client.Client, obj client.Object, tran createOpts = append(createOpts, opt) } } - obj = transform(obj.DeepCopyObject().(client.Object), true) - err := c.Create(ctx, obj, createOpts...) - return obj, kutil.VerbCreated, err + mod := transform(obj.DeepCopyObject().(client.Object), true) + err := c.Create(ctx, mod, createOpts...) + if err != nil { + return kutil.VerbUnchanged, err + } + + assign(obj, mod) + return kutil.VerbCreated, err } else if err != nil { - return nil, kutil.VerbUnchanged, err + return kutil.VerbUnchanged, err } gvk, err := apiutil.GVKForObject(obj, c.Scheme()) if err != nil { - return nil, kutil.VerbUnchanged, errors.Wrapf(err, "failed to get GVK for object %T", obj) + return kutil.VerbUnchanged, errors.Wrapf(err, "failed to get GVK for object %T", obj) } _, unstructuredObj := obj.(*unstructured.Unstructured) var patch client.Patch if isOfficialTypes(gvk.Group) && !unstructuredObj { - patch = client.StrategicMergeFrom(obj) + patch = client.StrategicMergeFrom(cur) } else { - patch = client.MergeFrom(obj) + patch = client.MergeFrom(cur) } - obj = transform(obj.DeepCopyObject().(client.Object), false) - err = c.Patch(ctx, obj, patch, opts...) + mod := transform(cur.DeepCopyObject().(client.Object), false) + err = c.Patch(ctx, mod, patch, opts...) if err != nil { - return nil, kutil.VerbUnchanged, err + return kutil.VerbUnchanged, err + } + + assign(obj, mod) + return kutil.VerbPatched, nil +} + +func assign(target, src any) { + srcValue := reflect.ValueOf(src) + if srcValue.Kind() == reflect.Pointer { + srcValue = srcValue.Elem() } - return obj, kutil.VerbPatched, nil + reflect.ValueOf(target).Elem().Set(srcValue) } -func PatchStatus(ctx context.Context, c client.Client, obj client.Object, transform TransformStatusFunc, opts ...client.PatchOption) (client.Object, kutil.VerbType, error) { +func PatchStatus(ctx context.Context, c client.Client, obj client.Object, transform TransformStatusFunc, opts ...client.PatchOption) (kutil.VerbType, error) { + cur := obj.DeepCopyObject().(client.Object) key := types.NamespacedName{ - Namespace: obj.GetNamespace(), - Name: obj.GetName(), + Namespace: cur.GetNamespace(), + Name: cur.GetName(), } - err := c.Get(ctx, key, obj) + err := c.Get(ctx, key, cur) if err != nil { - return nil, kutil.VerbUnchanged, err + return kutil.VerbUnchanged, err } // The body of the request was in an unknown format - @@ -126,13 +144,14 @@ func PatchStatus(ctx context.Context, c client.Client, obj client.Object, transf // - application/json-patch+json, // - application/merge-patch+json, // - application/apply-patch+yaml - patch := client.MergeFrom(obj) - obj = transform(obj.DeepCopyObject().(client.Object)) - err = c.Status().Patch(ctx, obj, patch, opts...) + patch := client.MergeFrom(cur) + mod := transform(cur.DeepCopyObject().(client.Object)) + err = c.Status().Patch(ctx, mod, patch, opts...) if err != nil { - return nil, kutil.VerbUnchanged, err + return kutil.VerbUnchanged, err } - return obj, kutil.VerbPatched, nil + assign(obj, mod) + return kutil.VerbPatched, nil } func isOfficialTypes(group string) bool { diff --git a/vendor/kmodules.xyz/client-go/tools/clientcmd/rest_config.go b/vendor/kmodules.xyz/client-go/tools/clientcmd/rest_config.go new file mode 100644 index 00000000..833e7b95 --- /dev/null +++ b/vendor/kmodules.xyz/client-go/tools/clientcmd/rest_config.go @@ -0,0 +1,74 @@ +/* +Copyright AppsCode Inc. and Contributors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package clientcmd + +import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/client-go/rest" + clientcmdapi "k8s.io/client-go/tools/clientcmd/api" + clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest" +) + +// https://github.com/kubernetes/client-go/issues/711#issuecomment-730112049 +func GenerateKubeConfiguration(cfg *rest.Config, namespace string) ([]byte, error) { + if err := rest.LoadTLSFiles(cfg); err != nil { + return nil, err + } + + clusters := make(map[string]*clientcmdapi.Cluster) + clusters["default-cluster"] = &clientcmdapi.Cluster{ + Server: cfg.Host, + CertificateAuthorityData: cfg.CAData, + } + + contexts := make(map[string]*clientcmdapi.Context) + contexts["default-context"] = &clientcmdapi.Context{ + Cluster: "default-cluster", + Namespace: namespace, + AuthInfo: "default-user", + } + + authinfos := make(map[string]*clientcmdapi.AuthInfo) + authinfos["default-user"] = &clientcmdapi.AuthInfo{ + LocationOfOrigin: "", + ClientCertificate: "", + ClientCertificateData: cfg.CertData, + ClientKey: "", + ClientKeyData: cfg.KeyData, + Token: cfg.BearerToken, + TokenFile: "", + Impersonate: cfg.Impersonate.UserName, + ImpersonateUID: cfg.Impersonate.UID, + ImpersonateGroups: cfg.Impersonate.Groups, + ImpersonateUserExtra: cfg.Impersonate.Extra, + Username: cfg.Username, + Password: cfg.Password, + AuthProvider: cfg.AuthProvider, + Exec: cfg.ExecProvider, + Extensions: nil, + } + + clientConfig := clientcmdapi.Config{ + Kind: "Config", + APIVersion: "v1", + Clusters: clusters, + Contexts: contexts, + CurrentContext: "default-context", + AuthInfos: authinfos, + } + return runtime.Encode(clientcmdlatest.Codec, &clientConfig) +} diff --git a/vendor/modules.txt b/vendor/modules.txt index a10192ea..91e8b32d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -429,10 +429,10 @@ gomodules.xyz/encoding/json # gomodules.xyz/flags v0.1.3 ## explicit; go 1.16 gomodules.xyz/flags -# gomodules.xyz/jsonpatch/v2 v2.3.0 +# gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 -# gomodules.xyz/logs v0.0.6 +# gomodules.xyz/logs v0.0.7 ## explicit; go 1.16 gomodules.xyz/logs # gomodules.xyz/pointer v0.1.0 @@ -1176,7 +1176,7 @@ k8s.io/utils/trace kmodules.xyz/authorizer/rbac kmodules.xyz/authorizer/rbac/helpers kmodules.xyz/authorizer/rbac/validation -# kmodules.xyz/client-go v0.25.23 +# kmodules.xyz/client-go v0.25.29 ## explicit; go 1.18 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1