diff --git a/glide.lock b/glide.lock index ae6f7ada138a..a92e633f216c 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: cd012b6ba8b834df4dfba91a04531d00bb6cd862eb963e123c46c960f83fcea6 -updated: 2019-01-25T17:24:14.898922243+01:00 +hash: 8a5b99c7083c1f254e667e7aca9401ee2c2b4fb65e4ce039b6ef589fb475d1f8 +updated: 2019-01-31T13:19:38.099909+01:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -216,7 +216,7 @@ imports: - pkg/ns - pkg/utils/hwaddr - name: github.com/containers/image - version: 9dc3776eaea701cad0c09f04ec489c35a520e2b2 + version: 4bc6d24282b115f8b61a6d08470ed42ac7c91392 repo: https://github.com/openshift/containers-image.git subpackages: - docker @@ -882,7 +882,7 @@ imports: - go-selinux - go-selinux/label - name: github.com/openshift/api - version: 74cf02537628c9ca144e7f09c8db26ee7e7f56e4 + version: 0e93a752a8cbf93d6c542ab9eeb1a89c2a38f899 subpackages: - apps - apps/v1 @@ -928,7 +928,7 @@ imports: - webconsole - webconsole/v1 - name: github.com/openshift/client-go - version: 8fb54357b899c50a2c5b96408cb909818c3e25c8 + version: 9d9c3dc826335abee846500602f450ba1bdb70ed subpackages: - apps/clientset/versioned - apps/clientset/versioned/fake @@ -1052,7 +1052,7 @@ imports: - user/informers/externalversions/user/v1 - user/listers/user/v1 - name: github.com/openshift/library-go - version: 5d4485484d0a510bffbf146235694e28da5ecbe9 + version: bc1eaa8a350dacaf8e2f0571cb780337daf7686e subpackages: - pkg/config/configdefaults - pkg/config/helpers @@ -1076,7 +1076,7 @@ imports: - pkg/controller/servingcert/controller - pkg/controller/servingcert/cryptoextensions - name: github.com/openshift/source-to-image - version: b54d75d3de92d123e68a79c6ee09c2c5fe44e720 + version: bb50d6fa68f20128269ecec4d792be1e18ef4254 subpackages: - pkg/api - pkg/api/constants @@ -1559,7 +1559,7 @@ imports: - pkg/registry/customresourcedefinition - test/integration/fixtures - name: k8s.io/apimachinery - version: eff96bababfae8931b95de8149c7a0847e31c066 + version: cc581476df18d1280d23106cf104193e80d3ec73 repo: https://github.com/openshift/kubernetes-apimachinery.git subpackages: - pkg/api/apitesting @@ -1629,7 +1629,7 @@ imports: - third_party/forked/golang/netutil - third_party/forked/golang/reflect - name: k8s.io/apiserver - version: 11efb795044c61415883d94fa65a384d95607ca3 + version: 9d6ee14469634b6d64c25129cf228d818d7de385 repo: https://github.com/openshift/kubernetes-apiserver.git subpackages: - pkg/admission @@ -1962,12 +1962,12 @@ imports: version: aef8d122b95ddd821e3bd35d4013593b1e5eda16 repo: https://github.com/openshift/kubernetes-code-generator.git - name: k8s.io/component-base - version: 939a2693e908cbb76bd0dc26f3c376280816f218 + version: b9b4123fb418af909f7ead83fbfa22b5e7941910 subpackages: - config - config/v1alpha1 - name: k8s.io/csi-api - version: 9225cacc8063f94c82922f00a4eb25cf8572816d + version: 44b4e43813fb993187d8f6faab18309bb7050d3a subpackages: - pkg/apis/csi/v1alpha1 - pkg/client/clientset/versioned @@ -2016,7 +2016,7 @@ imports: - pkg/registry/apiservice/etcd - pkg/registry/apiservice/rest - name: k8s.io/kube-controller-manager - version: 23ab32967af199db0b37ef006a54e6b029c310d4 + version: 6daf3da58e35a702d71ea98f4f63bdedc13cd414 subpackages: - config/v1alpha1 - name: k8s.io/kube-openapi @@ -2031,7 +2031,7 @@ imports: - pkg/util/proto/testing - pkg/util/proto/validation - name: k8s.io/kube-proxy - version: 2dd02d8e32748ec2a02a88e3fe176dfe18193ee8 + version: 71a8e7da4add563e5b1a8038e627136d98257ca2 subpackages: - config/v1alpha1 - name: k8s.io/kubelet @@ -2039,7 +2039,7 @@ imports: subpackages: - config/v1beta1 - name: k8s.io/kubernetes - version: f21fc982207ad0e2b16e34edb777c5f36955cfc3 + version: 7e0dae94799766b4a4ea3456a33235d91c52ca0c repo: https://github.com/openshift/kubernetes.git subpackages: - cmd/cloud-controller-manager/app/apis/config @@ -2879,7 +2879,7 @@ imports: - pkg/client/custom_metrics/scheme - pkg/client/external_metrics - name: k8s.io/sample-apiserver - version: 564eb9fc24786fb1059dc32a82db1deec481bb41 + version: 059663b7284aa12a9aecc0d8f45977d5d1eb7e4f subpackages: - pkg/apis/wardle - pkg/apis/wardle/v1alpha1 diff --git a/glide.yaml b/glide.yaml index 4ffb38c05776..35ae95fd5079 100644 --- a/glide.yaml +++ b/glide.yaml @@ -131,6 +131,12 @@ import: # pinned to a level that includes two fixes we need to avoid crashes - package: github.com/evanphx/json-patch version: 36442dbdb585210f8d5a1b45e67aa323c197d5c4 +# pinned to a level that kubernetes 1.12 use +- package: github.com/gorilla/mux + version: 08e7f807d38d6a870193019bb439056118661505 +# pinned to a level that kubernetes 1.12 use +- package: github.com/ghodss/yaml + version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee # mine: specific to openshift # networking diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go index 05ee5964c573..8d498b42231f 100644 --- a/pkg/openapi/zz_generated.openapi.go +++ b/pkg/openapi/zz_generated.openapi.go @@ -125,6 +125,12 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/openshift/api/build/v1.StageInfo": schema_openshift_api_build_v1_StageInfo(ref), "github.com/openshift/api/build/v1.StepInfo": schema_openshift_api_build_v1_StepInfo(ref), "github.com/openshift/api/build/v1.WebHookTrigger": schema_openshift_api_build_v1_WebHookTrigger(ref), + "github.com/openshift/api/config/v1.APIServer": schema_openshift_api_config_v1_APIServer(ref), + "github.com/openshift/api/config/v1.APIServerList": schema_openshift_api_config_v1_APIServerList(ref), + "github.com/openshift/api/config/v1.APIServerNamedServingCert": schema_openshift_api_config_v1_APIServerNamedServingCert(ref), + "github.com/openshift/api/config/v1.APIServerServingCerts": schema_openshift_api_config_v1_APIServerServingCerts(ref), + "github.com/openshift/api/config/v1.APIServerSpec": schema_openshift_api_config_v1_APIServerSpec(ref), + "github.com/openshift/api/config/v1.APIServerStatus": schema_openshift_api_config_v1_APIServerStatus(ref), "github.com/openshift/api/config/v1.AdmissionPluginConfig": schema_openshift_api_config_v1_AdmissionPluginConfig(ref), "github.com/openshift/api/config/v1.AuditConfig": schema_openshift_api_config_v1_AuditConfig(ref), "github.com/openshift/api/config/v1.Authentication": schema_openshift_api_config_v1_Authentication(ref), @@ -153,6 +159,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/openshift/api/config/v1.ConfigMapFileReference": schema_openshift_api_config_v1_ConfigMapFileReference(ref), "github.com/openshift/api/config/v1.ConfigMapNameReference": schema_openshift_api_config_v1_ConfigMapNameReference(ref), "github.com/openshift/api/config/v1.Console": schema_openshift_api_config_v1_Console(ref), + "github.com/openshift/api/config/v1.ConsoleAuthentication": schema_openshift_api_config_v1_ConsoleAuthentication(ref), "github.com/openshift/api/config/v1.ConsoleList": schema_openshift_api_config_v1_ConsoleList(ref), "github.com/openshift/api/config/v1.ConsoleSpec": schema_openshift_api_config_v1_ConsoleSpec(ref), "github.com/openshift/api/config/v1.ConsoleStatus": schema_openshift_api_config_v1_ConsoleStatus(ref), @@ -423,6 +430,10 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA "github.com/openshift/api/operator/v1.OpenShiftAPIServerList": schema_openshift_api_operator_v1_OpenShiftAPIServerList(ref), "github.com/openshift/api/operator/v1.OpenShiftAPIServerSpec": schema_openshift_api_operator_v1_OpenShiftAPIServerSpec(ref), "github.com/openshift/api/operator/v1.OpenShiftAPIServerStatus": schema_openshift_api_operator_v1_OpenShiftAPIServerStatus(ref), + "github.com/openshift/api/operator/v1.OpenShiftControllerManager": schema_openshift_api_operator_v1_OpenShiftControllerManager(ref), + "github.com/openshift/api/operator/v1.OpenShiftControllerManagerList": schema_openshift_api_operator_v1_OpenShiftControllerManagerList(ref), + "github.com/openshift/api/operator/v1.OpenShiftControllerManagerSpec": schema_openshift_api_operator_v1_OpenShiftControllerManagerSpec(ref), + "github.com/openshift/api/operator/v1.OpenShiftControllerManagerStatus": schema_openshift_api_operator_v1_OpenShiftControllerManagerStatus(ref), "github.com/openshift/api/operator/v1.OperandContainerSpec": schema_openshift_api_operator_v1_OperandContainerSpec(ref), "github.com/openshift/api/operator/v1.OperandSpec": schema_openshift_api_operator_v1_OperandSpec(ref), "github.com/openshift/api/operator/v1.OperatorCondition": schema_openshift_api_operator_v1_OperatorCondition(ref), @@ -6747,6 +6758,198 @@ func schema_openshift_api_build_v1_WebHookTrigger(ref common.ReferenceCallback) } } +func schema_openshift_api_config_v1_APIServer(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "APIServer holds cluster-wide information about api-servers. The canonical name is `cluster`", + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/config/v1.APIServerSpec"), + }, + }, + "status": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/config/v1.APIServerStatus"), + }, + }, + }, + Required: []string{"spec", "status"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/config/v1.APIServerSpec", "github.com/openshift/api/config/v1.APIServerStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_openshift_api_config_v1_APIServerList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/config/v1.APIServer"), + }, + }, + }, + }, + }, + }, + Required: []string{"items"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/config/v1.APIServer", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_openshift_api_config_v1_APIServerNamedServingCert(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "APIServerNamedServingCert maps a server DNS name, as understood by a client, to a certificate.", + Properties: map[string]spec.Schema{ + "names": { + SchemaProps: spec.SchemaProps{ + Description: "names is a optional list of explicit DNS names (leading wildcards allowed) that should use this certificate to serve secure traffic. If no names are provided, the implicit names will be extracted from the certificates. Exact names trump over wildcard names. Explicit names defined here trump over extracted implicit names.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + "servingCertificate": { + SchemaProps: spec.SchemaProps{ + Description: "servingCertificate references a kubernetes.io/tls type secret containing the TLS cert info for serving secure traffic. The secret must exist in the openshift-config namespace and contain the following required fields: - Secret.Data[\"tls.key\"] - TLS private key. - Secret.Data[\"tls.crt\"] - TLS certificate.", + Ref: ref("github.com/openshift/api/config/v1.SecretNameReference"), + }, + }, + }, + Required: []string{"servingCertificate"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/config/v1.SecretNameReference"}, + } +} + +func schema_openshift_api_config_v1_APIServerServingCerts(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "defaultServingCertificate": { + SchemaProps: spec.SchemaProps{ + Description: "defaultServingCertificate references a kubernetes.io/tls type secret containing the default TLS cert info for serving secure traffic. If no named certificates match the server name as understood by a client, this default certificate will be used. If defaultServingCertificate is not specified, then a operator managed certificate will be used. The secret must exist in the openshift-config namespace and contain the following required fields: - Secret.Data[\"tls.key\"] - TLS private key. - Secret.Data[\"tls.crt\"] - TLS certificate.", + Ref: ref("github.com/openshift/api/config/v1.SecretNameReference"), + }, + }, + "namedCertificates": { + SchemaProps: spec.SchemaProps{ + Description: "namedCertificates references secrets containing the TLS cert info for serving secure traffic to specific hostnames. If no named certificates are provided, or no named certificates match the server name as understood by a client, the defaultServingCertificate will be used.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/config/v1.APIServerNamedServingCert"), + }, + }, + }, + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/config/v1.APIServerNamedServingCert", "github.com/openshift/api/config/v1.SecretNameReference"}, + } +} + +func schema_openshift_api_config_v1_APIServerSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "servingCerts": { + SchemaProps: spec.SchemaProps{ + Description: "servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates will be used for serving secure traffic.", + Ref: ref("github.com/openshift/api/config/v1.APIServerServingCerts"), + }, + }, + "clientCA": { + SchemaProps: spec.SchemaProps{ + Description: "clientCA references a ConfigMap containing a certificate bundle for the signers that will be recognized for incoming client certificates in addition to the operator managed signers. If this is empty, then only operator managed signers are valid. You usually only have to set this if you have your own PKI you wish to honor client certificates from. The ConfigMap must exist in the openshift-config namespace and contain the following required fields: - ConfigMap.Data[\"ca-bundle.crt\"] - CA bundle.", + Ref: ref("github.com/openshift/api/config/v1.ConfigMapNameReference"), + }, + }, + }, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/config/v1.APIServerServingCerts", "github.com/openshift/api/config/v1.ConfigMapNameReference"}, + } +} + +func schema_openshift_api_config_v1_APIServerStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{}, + }, + }, + Dependencies: []string{}, + } +} + func schema_openshift_api_config_v1_AdmissionPluginConfig(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -7772,9 +7975,9 @@ func schema_openshift_api_config_v1_ClusterVersionStatus(ref common.ReferenceCal }, }, }, - "generation": { + "observedGeneration": { SchemaProps: spec.SchemaProps{ - Description: "generation reports which version of the spec is being processed. If this value is not equal to metadata.generation, then the current and conditions fields have not yet been updated to reflect the latest request.", + Description: "observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent from a previous version.", Type: []string{"integer"}, Format: "int64", }, @@ -7813,7 +8016,7 @@ func schema_openshift_api_config_v1_ClusterVersionStatus(ref common.ReferenceCal }, }, }, - Required: []string{"desired", "history", "generation", "versionHash", "conditions", "availableUpdates"}, + Required: []string{"desired", "history", "observedGeneration", "versionHash", "conditions", "availableUpdates"}, }, }, Dependencies: []string{ @@ -7965,6 +8168,25 @@ func schema_openshift_api_config_v1_Console(ref common.ReferenceCallback) common } } +func schema_openshift_api_config_v1_ConsoleAuthentication(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "logoutRedirect": { + SchemaProps: spec.SchemaProps{ + Description: "An optional, absolute URL to redirect web browsers to after logging out of the console. If not specified, it will redirect to the default login page. This is required when using an identity provider that supports single sign-on (SSO) such as: - OpenID (Keycloak, Azure) - RequestHeader (GSSAPI, SSPI, SAML) - OAuth (GitHub, GitLab, Google) Logging out of the console will destroy the user's token. The logoutRedirect provides the user the option to perform single logout (SLO) through the identity provider to destroy their single sign-on session.", + Type: []string{"string"}, + Format: "", + }, + }, + }, + }, + }, + Dependencies: []string{}, + } +} + func schema_openshift_api_config_v1_ConsoleList(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ @@ -8015,10 +8237,17 @@ func schema_openshift_api_config_v1_ConsoleSpec(ref common.ReferenceCallback) co return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Properties: map[string]spec.Schema{}, + Properties: map[string]spec.Schema{ + "authentication": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/config/v1.ConsoleAuthentication"), + }, + }, + }, }, }, - Dependencies: []string{}, + Dependencies: []string{ + "github.com/openshift/api/config/v1.ConsoleAuthentication"}, } } @@ -8026,7 +8255,16 @@ func schema_openshift_api_config_v1_ConsoleStatus(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Properties: map[string]spec.Schema{}, + Properties: map[string]spec.Schema{ + "publicHostname": { + SchemaProps: spec.SchemaProps{ + Description: "The hostname for the console. This will match the host for the route that is created for the console.", + Type: []string{"string"}, + Format: "", + }, + }, + }, + Required: []string{"publicHostname"}, }, }, Dependencies: []string{}, @@ -9097,6 +9335,7 @@ func schema_openshift_api_config_v1_InfrastructureList(ref common.ReferenceCallb return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ + Description: "InfrastructureList is", Properties: map[string]spec.Schema{ "kind": { SchemaProps: spec.SchemaProps{ @@ -9143,7 +9382,8 @@ func schema_openshift_api_config_v1_InfrastructureSpec(ref common.ReferenceCallb return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Properties: map[string]spec.Schema{}, + Description: "InfrastructureSpec contains settings that apply to the cluster infrastructure.", + Properties: map[string]spec.Schema{}, }, }, Dependencies: []string{}, @@ -9154,15 +9394,31 @@ func schema_openshift_api_config_v1_InfrastructureStatus(ref common.ReferenceCal return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ + Description: "InfrastructureStatus describes the infrastructure the cluster is leveraging.", Properties: map[string]spec.Schema{ "platform": { SchemaProps: spec.SchemaProps{ - Description: "platform is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled.", + Description: "platform is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.", + Type: []string{"string"}, + Format: "", + }, + }, + "etcdDiscoveryDomain": { + SchemaProps: spec.SchemaProps{ + Description: "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery", + Type: []string{"string"}, + Format: "", + }, + }, + "apiServerURL": { + SchemaProps: spec.SchemaProps{ + Description: "apiServerURL is a valid URL with scheme(http/https), address and port. apiServerURL can be used by components like kubelet on machines, to contact the `apisever` using the infrastructure provider rather than the kubernetes networking.", Type: []string{"string"}, Format: "", }, }, }, + Required: []string{"etcdDiscoveryDomain", "apiServerURL"}, }, }, Dependencies: []string{}, @@ -10821,10 +11077,18 @@ func schema_openshift_api_config_v1_SchedulingSpec(ref common.ReferenceCallback) return common.OpenAPIDefinition{ Schema: spec.Schema{ SchemaProps: spec.SchemaProps{ - Properties: map[string]spec.Schema{}, + Properties: map[string]spec.Schema{ + "policy": { + SchemaProps: spec.SchemaProps{ + Description: "policy is a reference to a ConfigMap containing scheduler policy which has user specified predicates and priorities. If this ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider. The namespace for this configmap is openshift-config.", + Ref: ref("github.com/openshift/api/config/v1.ConfigMapNameReference"), + }, + }, + }, }, }, - Dependencies: []string{}, + Dependencies: []string{ + "github.com/openshift/api/config/v1.ConfigMapNameReference"}, } } @@ -20414,6 +20678,20 @@ func schema_openshift_api_operator_v1_KubeAPIServerSpec(ref common.ReferenceCall Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"), }, }, + "failedRevisionLimit": { + SchemaProps: spec.SchemaProps{ + Description: "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + Type: []string{"integer"}, + Format: "int32", + }, + }, + "succeededRevisionLimit": { + SchemaProps: spec.SchemaProps{ + Description: "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + Type: []string{"integer"}, + Format: "int32", + }, + }, "forceRedeploymentReason": { SchemaProps: spec.SchemaProps{ Description: "forceRedeploymentReason can be used to force the redeployment of the kube-apiserver by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", @@ -20647,6 +20925,20 @@ func schema_openshift_api_operator_v1_KubeControllerManagerSpec(ref common.Refer Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"), }, }, + "failedRevisionLimit": { + SchemaProps: spec.SchemaProps{ + Description: "failedRevisionLimit is the number of failed static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + Type: []string{"integer"}, + Format: "int32", + }, + }, + "succeededRevisionLimit": { + SchemaProps: spec.SchemaProps{ + Description: "succeededRevisionLimit is the number of successful static pod installer revisions to keep on disk and in the api -1 = unlimited, 0 or unset = 5 (default)", + Type: []string{"integer"}, + Format: "int32", + }, + }, "forceRedeploymentReason": { SchemaProps: spec.SchemaProps{ Description: "forceRedeploymentReason can be used to force the redeployment of the kube-controller-manager by providing a unique string. This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work this time instead of failing again on the same config.", @@ -21164,6 +21456,212 @@ func schema_openshift_api_operator_v1_OpenShiftAPIServerStatus(ref common.Refere } } +func schema_openshift_api_operator_v1_OpenShiftControllerManager(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "OpenShiftControllerManager provides information to configure an operator to manage openshift-controller-manager.", + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"), + }, + }, + "spec": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/operator/v1.OpenShiftControllerManagerSpec"), + }, + }, + "status": { + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/operator/v1.OpenShiftControllerManagerStatus"), + }, + }, + }, + Required: []string{"metadata", "spec", "status"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/operator/v1.OpenShiftControllerManagerSpec", "github.com/openshift/api/operator/v1.OpenShiftControllerManagerStatus", "k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta"}, + } +} + +func schema_openshift_api_operator_v1_OpenShiftControllerManagerList(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Description: "OpenShiftControllerManagerList is a collection of items", + Properties: map[string]spec.Schema{ + "kind": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#types-kinds", + Type: []string{"string"}, + Format: "", + }, + }, + "apiVersion": { + SchemaProps: spec.SchemaProps{ + 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/api-conventions.md#resources", + Type: []string{"string"}, + Format: "", + }, + }, + "metadata": { + SchemaProps: spec.SchemaProps{ + Description: "Standard object's metadata.", + Ref: ref("k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"), + }, + }, + "items": { + SchemaProps: spec.SchemaProps{ + Description: "Items contains the items", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/operator/v1.OpenShiftControllerManager"), + }, + }, + }, + }, + }, + }, + Required: []string{"items"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/operator/v1.OpenShiftControllerManager", "k8s.io/apimachinery/pkg/apis/meta/v1.ListMeta"}, + } +} + +func schema_openshift_api_operator_v1_OpenShiftControllerManagerSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "managementState": { + SchemaProps: spec.SchemaProps{ + Description: "managementState indicates whether and how the operator should manage the component", + Type: []string{"string"}, + Format: "", + }, + }, + "logLevel": { + SchemaProps: spec.SchemaProps{ + Description: "logLevel is an intent based logging for an overall component. It does not give fine grained control, but it is a simple way to manage coarse grained logging choices that operators have to interpret for their operands.", + Type: []string{"string"}, + Format: "", + }, + }, + "operandSpecs": { + SchemaProps: spec.SchemaProps{ + Description: "operandSpecs provide customization for functional units within the component", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/operator/v1.OperandSpec"), + }, + }, + }, + }, + }, + "unsupportedConfigOverrides": { + SchemaProps: spec.SchemaProps{ + Description: "unsupportedConfigOverrides holds a sparse config that will override any previously set options. It only needs to be the fields to override it will end up overlaying in the following order: 1. hardcoded defaults 2. observedConfig 3. unsupportedConfigOverrides", + Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"), + }, + }, + "observedConfig": { + SchemaProps: spec.SchemaProps{ + Description: "observedConfig holds a sparse config that controller has observed from the cluster state. It exists in spec because it is an input to the level for the operator", + Ref: ref("k8s.io/apimachinery/pkg/runtime.RawExtension"), + }, + }, + }, + Required: []string{"managementState", "logLevel", "operandSpecs", "unsupportedConfigOverrides", "observedConfig"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/operator/v1.OperandSpec", "k8s.io/apimachinery/pkg/runtime.RawExtension"}, + } +} + +func schema_openshift_api_operator_v1_OpenShiftControllerManagerStatus(ref common.ReferenceCallback) common.OpenAPIDefinition { + return common.OpenAPIDefinition{ + Schema: spec.Schema{ + SchemaProps: spec.SchemaProps{ + Properties: map[string]spec.Schema{ + "observedGeneration": { + SchemaProps: spec.SchemaProps{ + Description: "observedGeneration is the last generation change you've dealt with", + Type: []string{"integer"}, + Format: "int64", + }, + }, + "conditions": { + SchemaProps: spec.SchemaProps{ + Description: "conditions is a list of conditions and their status", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/operator/v1.OperatorCondition"), + }, + }, + }, + }, + }, + "version": { + SchemaProps: spec.SchemaProps{ + Description: "version is the level this availability applies to", + Type: []string{"string"}, + Format: "", + }, + }, + "readyReplicas": { + SchemaProps: spec.SchemaProps{ + Description: "readyReplicas indicates how many replicas are ready and at the desired state", + Type: []string{"integer"}, + Format: "int32", + }, + }, + "generations": { + SchemaProps: spec.SchemaProps{ + Description: "generations are used to determine when an item needs to be reconciled or has changed in a way that needs a reaction.", + Type: []string{"array"}, + Items: &spec.SchemaOrArray{ + Schema: &spec.Schema{ + SchemaProps: spec.SchemaProps{ + Ref: ref("github.com/openshift/api/operator/v1.GenerationStatus"), + }, + }, + }, + }, + }, + }, + Required: []string{"version", "readyReplicas", "generations"}, + }, + }, + Dependencies: []string{ + "github.com/openshift/api/operator/v1.GenerationStatus", "github.com/openshift/api/operator/v1.OperatorCondition"}, + } +} + func schema_openshift_api_operator_v1_OperandContainerSpec(ref common.ReferenceCallback) common.OpenAPIDefinition { return common.OpenAPIDefinition{ Schema: spec.Schema{ diff --git a/vendor/github.com/containers/image/openshift/openshift.go b/vendor/github.com/containers/image/openshift/openshift.go index 19ad25370f62..f494420d1a8b 100644 --- a/vendor/github.com/containers/image/openshift/openshift.go +++ b/vendor/github.com/containers/image/openshift/openshift.go @@ -136,7 +136,7 @@ func (c *openshiftClient) doRequest(ctx context.Context, method, path string, re // getImage loads the specified image object. func (c *openshiftClient) getImage(ctx context.Context, imageStreamImageName string) (*image, error) { // FIXME: validate components per validation.IsValidPathSegmentName? - path := fmt.Sprintf("/oapi/v1/namespaces/%s/imagestreamimages/%s@%s", c.ref.namespace, c.ref.stream, imageStreamImageName) + path := fmt.Sprintf("/apis/image.openshift.io/v1/namespaces/%s/imagestreamimages/%s@%s", c.ref.namespace, c.ref.stream, imageStreamImageName) body, err := c.doRequest(ctx, "GET", path, nil) if err != nil { return nil, err @@ -253,7 +253,7 @@ func (s *openshiftImageSource) ensureImageIsResolved(ctx context.Context) error } // FIXME: validate components per validation.IsValidPathSegmentName? - path := fmt.Sprintf("/oapi/v1/namespaces/%s/imagestreams/%s", s.client.ref.namespace, s.client.ref.stream) + path := fmt.Sprintf("/apis/image.openshift.io/v1/namespaces/%s/imagestreams/%s", s.client.ref.namespace, s.client.ref.stream) body, err := s.client.doRequest(ctx, "GET", path, nil) if err != nil { return err @@ -453,7 +453,7 @@ sigExists: Content: newSig, } body, err := json.Marshal(sig) - _, err = d.client.doRequest(context.TODO(), "POST", "/oapi/v1/imagesignatures", body) + _, err = d.client.doRequest(context.TODO(), "POST", "/apis/image.openshift.io/v1/imagesignatures", body) if err != nil { return err } diff --git a/vendor/github.com/openshift/api/Makefile b/vendor/github.com/openshift/api/Makefile index c4980b81676e..94544587431b 100644 --- a/vendor/github.com/openshift/api/Makefile +++ b/vendor/github.com/openshift/api/Makefile @@ -6,7 +6,7 @@ build: .PHONY: build test: - go test github.com/openshift/api/pkg/testing/... + go test github.com/openshift/api/... .PHONY: test verify: diff --git a/vendor/github.com/openshift/api/annotations/annotations.go b/vendor/github.com/openshift/api/annotations/annotations.go new file mode 100644 index 000000000000..4ed91b0fc90f --- /dev/null +++ b/vendor/github.com/openshift/api/annotations/annotations.go @@ -0,0 +1,28 @@ +package annotations + +// annotation keys +// NEVER ADD TO THIS LIST. Annotations need to be owned in the API groups they are associated with, so these constants end +// up nested in an API group, not top level in the OpenShift namespace. The items located here are examples of annotations +// claiming a global namespace key that have never achieved global reach. In the future, names should be based on the +// consuming component. +const ( + // OpenShiftDisplayName is a common, optional annotation that stores the name displayed by a UI when referencing a resource. + OpenShiftDisplayName = "openshift.io/display-name" + + // OpenShiftProviderDisplayNameAnnotation is the name of a provider of a resource, e.g. + // "Red Hat, Inc." + OpenShiftProviderDisplayNameAnnotation = "openshift.io/provider-display-name" + + // OpenShiftDocumentationURLAnnotation is the url where documentation associated with + // a resource can be found. + OpenShiftDocumentationURLAnnotation = "openshift.io/documentation-url" + + // OpenShiftSupportURLAnnotation is the url where support for a template can be found. + OpenShiftSupportURLAnnotation = "openshift.io/support-url" + + // OpenShiftDescription is a common, optional annotation that stores the description for a resource. + OpenShiftDescription = "openshift.io/description" + + // OpenShiftLongDescriptionAnnotation is a resource's long description + OpenShiftLongDescriptionAnnotation = "openshift.io/long-description" +) diff --git a/vendor/github.com/openshift/api/apps/v1/generated.pb.go b/vendor/github.com/openshift/api/apps/v1/generated.pb.go index 53b61c61a75e..59e0b0551623 100644 --- a/vendor/github.com/openshift/api/apps/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/apps/v1/generated.pb.go @@ -6332,7 +6332,7 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2517 bytes of a gzipped FileDescriptorProto + // 2512 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x59, 0xcb, 0x6f, 0x1c, 0x49, 0x19, 0x77, 0x7b, 0x66, 0xec, 0x99, 0xcf, 0xaf, 0xb8, 0x9c, 0xc7, 0xac, 0x17, 0xd9, 0xd6, 0xac, 0x36, 0x18, 0x58, 0x66, 0x12, 0x27, 0xac, 0xf2, 0xd0, 0x2e, 0x78, 0x1c, 0x67, 0xd7, 0xd1, 0x38, @@ -6347,148 +6347,147 @@ var fileDescriptorGenerated = []byte{ 0x2b, 0x4a, 0x71, 0xb7, 0xb5, 0xa7, 0xbe, 0xd4, 0x87, 0xfa, 0xa5, 0x01, 0xe7, 0x4b, 0x07, 0xd7, 0x82, 0x32, 0xe3, 0xca, 0xa8, 0xcd, 0x7d, 0xda, 0xc7, 0xe8, 0xfc, 0xd5, 0x58, 0xc6, 0x25, 0xf6, 0x3e, 0xf3, 0xa8, 0xdf, 0xa9, 0x34, 0x0f, 0x1a, 0x92, 0x10, 0x54, 0x5c, 0x2a, 0x48, 0x3f, 0xad, - 0xca, 0x20, 0x2d, 0xbf, 0xe5, 0x09, 0xe6, 0xd2, 0x1e, 0x85, 0xf7, 0x8f, 0x53, 0x08, 0xec, 0x7d, - 0xea, 0x92, 0x1e, 0xbd, 0x2b, 0x83, 0xf4, 0x5a, 0x82, 0x39, 0x15, 0xe6, 0x89, 0x40, 0xf8, 0xdd, - 0x4a, 0xa5, 0x3f, 0x5b, 0xb0, 0xb0, 0xd6, 0x0a, 0x04, 0x77, 0x6f, 0xd1, 0xa6, 0xc3, 0x3b, 0x2e, - 0xf5, 0xc4, 0xb6, 0x90, 0x12, 0x8d, 0xce, 0x16, 0xf1, 0x89, 0x1b, 0xa0, 0x77, 0x20, 0xc7, 0x5c, - 0xd2, 0xa0, 0x45, 0x6b, 0xc9, 0x5a, 0x2e, 0x54, 0xa7, 0x9e, 0x1f, 0x2e, 0x8e, 0x1c, 0x1d, 0x2e, - 0xe6, 0x36, 0x24, 0x11, 0x6b, 0x1e, 0xfa, 0x2e, 0x4c, 0x50, 0xaf, 0xcd, 0x7c, 0xee, 0x49, 0x84, - 0xe2, 0xe8, 0x52, 0x66, 0x79, 0x62, 0x65, 0xbe, 0xac, 0x97, 0xa4, 0x02, 0x23, 0xbd, 0x5a, 0x6e, - 0x5f, 0x2e, 0xaf, 0x7b, 0xed, 0x07, 0xc4, 0xaf, 0xce, 0x19, 0x98, 0x89, 0xf5, 0x58, 0x0d, 0x27, - 0x31, 0xd0, 0xbb, 0x30, 0x6e, 0x73, 0xd7, 0x25, 0x5e, 0xbd, 0x98, 0x59, 0xca, 0x2c, 0x17, 0xaa, - 0x13, 0x47, 0x87, 0x8b, 0xe3, 0x6b, 0x9a, 0x84, 0x43, 0x5e, 0xe9, 0x2f, 0x16, 0xcc, 0xc4, 0x6b, - 0x5f, 0x23, 0xad, 0x80, 0xa2, 0xeb, 0x90, 0x15, 0x9d, 0x66, 0xb8, 0xe2, 0x77, 0x8d, 0xa9, 0xec, - 0x4e, 0xa7, 0x49, 0x5f, 0x1e, 0x2e, 0x9e, 0x8b, 0xc5, 0x77, 0x7c, 0xd6, 0x68, 0x50, 0x5f, 0x32, - 0xb0, 0x52, 0x41, 0x01, 0x4c, 0xaa, 0x1d, 0x19, 0x4e, 0x71, 0x74, 0xc9, 0x5a, 0x9e, 0x58, 0xf9, - 0xa0, 0x7c, 0x5c, 0xc2, 0x95, 0xbb, 0xd6, 0xb0, 0x91, 0x00, 0xa9, 0x9e, 0x39, 0x3a, 0x5c, 0x9c, - 0x4c, 0x52, 0x70, 0xca, 0x48, 0xa9, 0x0e, 0x6f, 0xbf, 0x42, 0x1d, 0xad, 0x43, 0x76, 0xcf, 0xe7, - 0xae, 0xda, 0xce, 0xc4, 0xca, 0x3b, 0xfd, 0xbc, 0x7a, 0x6f, 0xf7, 0x13, 0x6a, 0x0b, 0x4c, 0xf7, - 0xa8, 0x4f, 0x3d, 0x9b, 0x56, 0x27, 0xc3, 0x3d, 0xdf, 0xf6, 0xb9, 0x8b, 0x95, 0x7a, 0xe9, 0x5f, - 0x19, 0x98, 0x4b, 0x98, 0xe1, 0x5e, 0x9d, 0x09, 0xc6, 0x3d, 0x74, 0x33, 0xe5, 0xad, 0xaf, 0x76, - 0x79, 0xeb, 0x42, 0x1f, 0x95, 0x84, 0xbf, 0x6a, 0x30, 0x16, 0x08, 0x22, 0x5a, 0x81, 0xf2, 0x54, - 0xa1, 0x7a, 0xd5, 0xa8, 0x8f, 0x6d, 0x2b, 0xea, 0xcb, 0xc3, 0xc5, 0x3e, 0xa5, 0x55, 0x8e, 0x90, - 0xb4, 0x14, 0x36, 0x18, 0xa8, 0x0d, 0xc8, 0x21, 0x81, 0xd8, 0xf1, 0x89, 0x17, 0x68, 0x4b, 0xcc, - 0xa5, 0xc5, 0x8c, 0xda, 0xf7, 0xd7, 0x13, 0xfb, 0x8e, 0x12, 0xbc, 0xdc, 0x3c, 0x68, 0x48, 0x42, - 0x50, 0x96, 0xf5, 0x27, 0x3d, 0x21, 0x35, 0xaa, 0xf3, 0x66, 0x15, 0xa8, 0xd6, 0x83, 0x86, 0xfb, - 0x58, 0x40, 0x17, 0x61, 0xcc, 0xa7, 0x24, 0xe0, 0x5e, 0x31, 0xab, 0x76, 0x31, 0x1d, 0xee, 0x02, - 0x2b, 0x2a, 0x36, 0x5c, 0xf4, 0x35, 0x18, 0x77, 0x69, 0x10, 0xc8, 0x6a, 0xc8, 0x29, 0xc1, 0x19, - 0x23, 0x38, 0xbe, 0xa9, 0xc9, 0x38, 0xe4, 0xa3, 0x4f, 0x60, 0x5a, 0x1a, 0xba, 0xdf, 0xac, 0x13, - 0x41, 0xd5, 0x36, 0xc6, 0x86, 0xde, 0xc6, 0x79, 0x83, 0x3e, 0x5d, 0x4b, 0x21, 0xe1, 0x2e, 0xe4, - 0xd2, 0x1f, 0x47, 0xe1, 0x4c, 0x2a, 0x4c, 0x7b, 0xac, 0x81, 0x9e, 0x40, 0x5e, 0x82, 0xd5, 0x89, - 0x20, 0x26, 0x73, 0x2e, 0x9d, 0xcc, 0xb4, 0xce, 0xa5, 0x4d, 0x2a, 0x48, 0x15, 0x99, 0x05, 0x40, - 0x4c, 0xc3, 0x11, 0x2a, 0xfa, 0x1e, 0x64, 0x83, 0x26, 0xb5, 0x4d, 0x8d, 0xbc, 0x3f, 0x54, 0x8d, - 0xa8, 0x35, 0x6e, 0x37, 0xa9, 0x1d, 0xa7, 0xaa, 0xfc, 0xc2, 0x0a, 0x11, 0x3d, 0x89, 0xb2, 0x4a, - 0xc7, 0xfe, 0xda, 0x29, 0xb0, 0x95, 0x7e, 0x1c, 0xc9, 0x74, 0xa6, 0x95, 0xfe, 0x6e, 0xc1, 0xd9, - 0x6e, 0x95, 0x1a, 0x0b, 0x04, 0xfa, 0x7e, 0x8f, 0xdb, 0xca, 0x27, 0x73, 0x9b, 0xd4, 0x56, 0x4e, - 0x3b, 0x63, 0x4c, 0xe6, 0x43, 0x4a, 0xc2, 0x65, 0x0f, 0x21, 0xc7, 0x04, 0x75, 0x03, 0xd3, 0x21, - 0x57, 0x86, 0xdf, 0x57, 0xa2, 0x01, 0x4b, 0x20, 0xac, 0xf1, 0x4a, 0x3f, 0xcf, 0x40, 0xb1, 0x5b, - 0x14, 0x73, 0xc7, 0xd9, 0x25, 0xf6, 0x01, 0x5a, 0x82, 0xac, 0x47, 0xdc, 0xb0, 0xc2, 0x23, 0x87, - 0xdf, 0x25, 0x2e, 0xc5, 0x8a, 0x83, 0x7e, 0x63, 0x01, 0x6a, 0xa9, 0x84, 0xaa, 0xaf, 0x7a, 0x1e, - 0x17, 0x44, 0x96, 0x46, 0xb8, 0x4a, 0x3c, 0xfc, 0x2a, 0x43, 0xd3, 0xe5, 0xfb, 0x3d, 0xa0, 0xeb, - 0x9e, 0xf0, 0x3b, 0x71, 0x85, 0xf6, 0x0a, 0xe0, 0x3e, 0x2b, 0x41, 0x4f, 0x4c, 0xae, 0xe9, 0x7c, - 0xf8, 0xf0, 0xf4, 0x2b, 0x1a, 0x94, 0x73, 0xf3, 0xeb, 0x70, 0x61, 0xc0, 0x62, 0xd1, 0x19, 0xc8, - 0x1c, 0xd0, 0x8e, 0x76, 0x1f, 0x96, 0x3f, 0xd1, 0x59, 0xc8, 0xb5, 0x89, 0xd3, 0xa2, 0xba, 0xeb, - 0x61, 0xfd, 0x71, 0x63, 0xf4, 0x9a, 0x55, 0xfa, 0x53, 0x06, 0xbe, 0xf2, 0x2a, 0xdb, 0x6f, 0xa8, - 0x9b, 0xa3, 0xf7, 0x20, 0xef, 0xd3, 0x36, 0x0b, 0x18, 0xf7, 0xd4, 0x22, 0x32, 0x71, 0xde, 0x61, - 0x43, 0xc7, 0x91, 0x04, 0x5a, 0x85, 0x19, 0xe6, 0xd9, 0x4e, 0xab, 0x1e, 0x1e, 0x2a, 0xba, 0xb2, - 0xf2, 0xd5, 0x0b, 0x46, 0x69, 0x66, 0x23, 0xcd, 0xc6, 0xdd, 0xf2, 0x49, 0x08, 0xea, 0x36, 0x1d, - 0x22, 0xa8, 0x6a, 0x96, 0x7d, 0x20, 0x0c, 0x1b, 0x77, 0xcb, 0xa3, 0x07, 0x70, 0xde, 0x90, 0x30, - 0x6d, 0x3a, 0xcc, 0x56, 0x3e, 0x96, 0x15, 0xa2, 0xba, 0x69, 0xbe, 0xba, 0x60, 0x90, 0xce, 0x6f, - 0xf4, 0x95, 0xc2, 0x03, 0xb4, 0x13, 0x4b, 0x0b, 0x67, 0x17, 0xd5, 0x6c, 0x7b, 0x97, 0x16, 0xb2, - 0x71, 0xb7, 0x7c, 0xe9, 0x7f, 0xb9, 0xde, 0x7e, 0xa0, 0xc2, 0xb5, 0x0b, 0xf9, 0x20, 0x04, 0xd5, - 0x21, 0xbb, 0x3a, 0x4c, 0xf2, 0x85, 0x06, 0xe2, 0xe8, 0x44, 0x6b, 0x88, 0x70, 0x11, 0x85, 0xbc, - 0x08, 0xc3, 0xa2, 0x9b, 0xe9, 0xcd, 0x61, 0x6c, 0x98, 0x10, 0x6d, 0x71, 0x87, 0xd9, 0x8c, 0x06, - 0xd5, 0x49, 0x69, 0x26, 0x0a, 0x64, 0x04, 0xad, 0x53, 0x46, 0x79, 0x4e, 0x47, 0x3f, 0x97, 0x4c, - 0x19, 0x4d, 0xc7, 0x91, 0x04, 0xaa, 0xc1, 0xd9, 0x30, 0x7d, 0x3e, 0x66, 0x81, 0xe0, 0x7e, 0xa7, - 0xc6, 0x5c, 0x26, 0x54, 0xd0, 0x73, 0xd5, 0xe2, 0xd1, 0xe1, 0xe2, 0x59, 0xdc, 0x87, 0x8f, 0xfb, - 0x6a, 0xc9, 0x16, 0x24, 0x68, 0x20, 0x4c, 0xa0, 0xa3, 0x84, 0xde, 0xa1, 0x81, 0xc0, 0x8a, 0x23, - 0xcf, 0xe0, 0xa6, 0x1c, 0x7d, 0xea, 0x26, 0x76, 0x51, 0xe7, 0xde, 0x52, 0x54, 0x6c, 0xb8, 0xc8, - 0x87, 0x7c, 0x40, 0x1d, 0x6a, 0x0b, 0xee, 0x17, 0xc7, 0x55, 0x7f, 0xba, 0x75, 0xba, 0x93, 0xa7, - 0xbc, 0x6d, 0x60, 0x74, 0x47, 0x8a, 0x03, 0x64, 0xc8, 0x38, 0xb2, 0x83, 0x36, 0x21, 0x2f, 0xc2, - 0xa4, 0xcf, 0x0f, 0xae, 0xdb, 0x2d, 0x5e, 0x0f, 0x73, 0x5d, 0xb7, 0x19, 0x15, 0x88, 0xb0, 0x1c, - 0x22, 0x08, 0x99, 0xaf, 0x2e, 0xf3, 0x30, 0x25, 0xf5, 0xce, 0x36, 0xb5, 0xb9, 0x57, 0x0f, 0x8a, - 0x05, 0xe5, 0xd5, 0x28, 0x5f, 0x37, 0xd3, 0x6c, 0xdc, 0x2d, 0x3f, 0x7f, 0x13, 0xa6, 0x52, 0xcb, - 0x1f, 0xaa, 0x47, 0xfd, 0x21, 0x07, 0xe7, 0xfb, 0x9f, 0x97, 0xe8, 0x26, 0x4c, 0xc9, 0x25, 0x06, - 0xe2, 0x01, 0xf5, 0x55, 0x6f, 0xb1, 0x54, 0x6f, 0x39, 0x67, 0x16, 0x36, 0x55, 0x4b, 0x32, 0x71, - 0x5a, 0x16, 0xdd, 0x01, 0xc4, 0x77, 0x03, 0xea, 0xb7, 0x69, 0xfd, 0x23, 0x7d, 0xd1, 0x88, 0xbb, - 0x53, 0xd4, 0xf0, 0xef, 0xf5, 0x48, 0xe0, 0x3e, 0x5a, 0x43, 0x26, 0xeb, 0x2a, 0xcc, 0x98, 0x43, - 0x23, 0x64, 0x9a, 0x3c, 0x8d, 0x3c, 0x7a, 0x3f, 0xcd, 0xc6, 0xdd, 0xf2, 0xe8, 0x23, 0x98, 0x25, - 0x6d, 0xc2, 0x1c, 0xb2, 0xeb, 0xd0, 0x08, 0x24, 0xa7, 0x40, 0xde, 0x32, 0x20, 0xb3, 0xab, 0xdd, - 0x02, 0xb8, 0x57, 0x07, 0x6d, 0xc2, 0x5c, 0xcb, 0xeb, 0x85, 0x1a, 0x53, 0x50, 0x6f, 0x1b, 0xa8, - 0xb9, 0xfb, 0xbd, 0x22, 0xb8, 0x9f, 0x1e, 0x7a, 0x0c, 0xe3, 0x75, 0x2a, 0x08, 0x73, 0x82, 0xe2, - 0xb8, 0x4a, 0xbd, 0x2b, 0xc3, 0xa4, 0xfb, 0x2d, 0xad, 0xaa, 0x2f, 0x4f, 0xe6, 0x03, 0x87, 0x80, - 0x88, 0x01, 0xd8, 0xe1, 0x28, 0x1e, 0x14, 0xf3, 0xaa, 0x9a, 0xbe, 0x35, 0x64, 0x35, 0x69, 0xed, - 0x78, 0x54, 0x8c, 0x48, 0x01, 0x4e, 0x80, 0xcb, 0xc4, 0xf2, 0x65, 0x02, 0x47, 0xfe, 0xd0, 0x19, - 0x1f, 0x25, 0x16, 0x4e, 0x32, 0x71, 0x5a, 0xb6, 0xf4, 0x6b, 0x0b, 0x66, 0x7b, 0xf6, 0x94, 0x9c, - 0xc6, 0xad, 0x63, 0xa6, 0xf1, 0x47, 0x30, 0x66, 0xcb, 0xf6, 0x11, 0x8e, 0x34, 0x97, 0x87, 0xbe, - 0xd0, 0xc5, 0xfd, 0x48, 0x7d, 0x06, 0xd8, 0x00, 0x96, 0x66, 0x60, 0x2a, 0x16, 0xad, 0xf1, 0x46, - 0xe9, 0xb3, 0x6c, 0xf2, 0x28, 0xa9, 0xf1, 0xc6, 0xbd, 0xa6, 0x76, 0x41, 0x05, 0x0a, 0x36, 0xf7, - 0x04, 0x91, 0x03, 0xa4, 0x59, 0xf1, 0xac, 0x01, 0x2d, 0xac, 0x85, 0x0c, 0x1c, 0xcb, 0xc8, 0x96, - 0xb8, 0xc7, 0x1d, 0x87, 0x3f, 0x55, 0x35, 0x94, 0x68, 0x89, 0xb7, 0x15, 0x15, 0x1b, 0xae, 0xac, - 0x95, 0xa6, 0xec, 0xba, 0xbc, 0x15, 0x1e, 0xeb, 0x51, 0xad, 0x6c, 0x19, 0x3a, 0x8e, 0x24, 0xd0, - 0x55, 0x98, 0x0c, 0x98, 0x67, 0xd3, 0xb0, 0xf5, 0x64, 0xf5, 0xf4, 0x20, 0xef, 0xa8, 0xdb, 0x09, - 0x3a, 0x4e, 0x49, 0xa1, 0x87, 0x50, 0x50, 0xdf, 0xea, 0x2a, 0x93, 0x1b, 0xfa, 0x2a, 0x33, 0x25, - 0x37, 0xb9, 0x1d, 0x02, 0xe0, 0x18, 0x0b, 0xad, 0x00, 0x08, 0xe6, 0xd2, 0x40, 0x10, 0xb7, 0x19, - 0x98, 0xde, 0x1f, 0x25, 0xd3, 0x4e, 0xc4, 0xc1, 0x09, 0x29, 0xf4, 0x0d, 0x28, 0xc8, 0x14, 0xa8, - 0x31, 0x8f, 0xea, 0xaa, 0xc8, 0x68, 0x03, 0x3b, 0x21, 0x11, 0xc7, 0x7c, 0x54, 0x06, 0x70, 0xe4, - 0x19, 0x54, 0xed, 0x08, 0x1a, 0xa8, 0xf6, 0x9d, 0xa9, 0x4e, 0x4b, 0xf0, 0x5a, 0x44, 0xc5, 0x09, - 0x09, 0xe9, 0x75, 0x8f, 0x3f, 0x25, 0x4c, 0xa8, 0x14, 0x4d, 0x78, 0xfd, 0x2e, 0x7f, 0x48, 0x98, - 0xc0, 0x86, 0x8b, 0xde, 0x85, 0xf1, 0xb6, 0x69, 0x92, 0xa0, 0x40, 0x55, 0x8d, 0x85, 0xad, 0x31, - 0xe4, 0x95, 0xfe, 0x9d, 0xca, 0x5d, 0x4c, 0x7f, 0xd4, 0x92, 0xa7, 0xdd, 0xf1, 0x23, 0xf9, 0x45, - 0x18, 0xd3, 0xdd, 0xb5, 0x3b, 0xf8, 0xba, 0x05, 0x63, 0xc3, 0x45, 0xef, 0x40, 0x6e, 0x8f, 0xfb, - 0x36, 0x35, 0x91, 0x8f, 0xae, 0x07, 0xb7, 0x25, 0x11, 0x6b, 0x1e, 0x7a, 0x00, 0x33, 0xf4, 0x59, - 0x7a, 0xfe, 0xcb, 0xaa, 0x47, 0x95, 0xf7, 0x64, 0x6f, 0x5c, 0x4f, 0xb3, 0x06, 0xbf, 0x91, 0x74, - 0x83, 0x94, 0xfe, 0x31, 0x0e, 0xa8, 0x77, 0xd8, 0x41, 0x37, 0x52, 0x4f, 0x0a, 0x17, 0xbb, 0x9e, - 0x14, 0xce, 0xf7, 0x6a, 0x24, 0x5e, 0x14, 0xda, 0x30, 0x69, 0xab, 0x17, 0x29, 0xfd, 0xfe, 0x64, - 0x06, 0xa2, 0xef, 0x1c, 0x5f, 0xb0, 0xaf, 0x7e, 0xc7, 0xd2, 0x09, 0xbe, 0x96, 0x40, 0xc6, 0x29, - 0x3b, 0xe8, 0xa7, 0x30, 0xed, 0x53, 0xdb, 0xa7, 0x44, 0x50, 0x63, 0x59, 0xdf, 0x35, 0xaa, 0xc7, - 0x5b, 0xc6, 0x46, 0x6f, 0xa0, 0x6d, 0x24, 0x2f, 0xf1, 0x38, 0x85, 0x8e, 0xbb, 0xac, 0xa1, 0x1f, - 0xc3, 0x94, 0xcf, 0x1d, 0x87, 0x79, 0x0d, 0x63, 0x3e, 0xab, 0xcc, 0xaf, 0x9e, 0xc0, 0xbc, 0x56, - 0x1b, 0x68, 0x7d, 0x56, 0xf5, 0xd7, 0x24, 0x36, 0x4e, 0x9b, 0x42, 0x8f, 0xa0, 0xe0, 0xd3, 0x80, - 0xb7, 0x7c, 0x9b, 0x06, 0xa6, 0xb8, 0x97, 0xfb, 0x0d, 0x38, 0xd8, 0x08, 0xc9, 0x2c, 0x66, 0x3e, - 0x95, 0xb6, 0x82, 0xb8, 0x87, 0x85, 0xdc, 0x00, 0xc7, 0x68, 0x68, 0x5f, 0xa6, 0xf1, 0x2e, 0x75, - 0x64, 0x69, 0x67, 0x4e, 0x16, 0xc8, 0xde, 0x8d, 0x94, 0x6b, 0x0a, 0x42, 0x0f, 0x6a, 0x89, 0x42, - 0x90, 0x44, 0x6c, 0xf0, 0xd1, 0x4f, 0x60, 0x82, 0x24, 0xee, 0xae, 0x7a, 0x36, 0x5c, 0x3f, 0x95, - 0xb9, 0x9e, 0xeb, 0x6a, 0xf4, 0x5c, 0x99, 0xbc, 0xa7, 0x26, 0xcd, 0xa1, 0x7b, 0x70, 0x8e, 0xd8, - 0x82, 0xb5, 0xe9, 0x2d, 0x4a, 0xea, 0x0e, 0xf3, 0xa2, 0xf6, 0xaa, 0x1b, 0xce, 0x5b, 0x47, 0x87, - 0x8b, 0xe7, 0x56, 0xfb, 0x09, 0xe0, 0xfe, 0x7a, 0xf3, 0xd7, 0x61, 0x22, 0xb1, 0xeb, 0x61, 0xe6, - 0xbb, 0xf9, 0x0f, 0xe1, 0xcc, 0x6b, 0xdd, 0x61, 0x7f, 0x37, 0x0a, 0xa5, 0x9e, 0x06, 0xa0, 0x9e, - 0x24, 0xd7, 0xf6, 0x89, 0xd7, 0x08, 0x33, 0xb6, 0x02, 0x05, 0xd2, 0x12, 0xdc, 0x25, 0x82, 0xd9, - 0x0a, 0x38, 0x1f, 0xe7, 0xc2, 0x6a, 0xc8, 0xc0, 0xb1, 0x0c, 0xba, 0x01, 0xd3, 0xd1, 0xe1, 0x26, - 0x3b, 0x9d, 0x3e, 0x8d, 0x0b, 0xba, 0x3c, 0xd6, 0x52, 0x1c, 0xdc, 0x25, 0x19, 0x5d, 0x9b, 0x33, - 0xaf, 0x77, 0x6d, 0xbe, 0x13, 0xbe, 0x30, 0xaa, 0x3d, 0xd1, 0xba, 0xda, 0x95, 0x79, 0xf5, 0xeb, - 0x7a, 0x35, 0x4c, 0x4a, 0xe0, 0x3e, 0x5a, 0xa5, 0x9f, 0x59, 0xf0, 0xd6, 0xc0, 0x5b, 0x18, 0xfa, - 0x41, 0xf8, 0xd4, 0x63, 0xa9, 0x44, 0xbc, 0x7e, 0xda, 0x1b, 0x5d, 0xa7, 0xff, 0x8b, 0xcf, 0x8d, - 0xfc, 0xaf, 0x7e, 0xbb, 0x38, 0xf2, 0xe9, 0x7f, 0x96, 0x46, 0x4a, 0x5f, 0x5a, 0x70, 0x61, 0x80, - 0xee, 0xeb, 0x3c, 0x85, 0xff, 0xc2, 0x82, 0x59, 0xd6, 0x1d, 0x74, 0xd3, 0x8e, 0x6f, 0x9d, 0x62, - 0x37, 0x3d, 0x09, 0x54, 0x3d, 0x27, 0x67, 0xea, 0x1e, 0x32, 0xee, 0xb5, 0x5a, 0xfa, 0xa7, 0x05, - 0xd3, 0xeb, 0xcf, 0xa8, 0x7d, 0x97, 0x3e, 0xdd, 0xe2, 0xf5, 0x8f, 0x39, 0x3f, 0x48, 0xfe, 0x3f, - 0x60, 0x0d, 0xfe, 0x7f, 0x00, 0x5d, 0x87, 0x0c, 0xf5, 0xda, 0x27, 0xf8, 0x47, 0x62, 0xc2, 0xf8, - 0x26, 0xb3, 0xee, 0xb5, 0xb1, 0xd4, 0x91, 0x23, 0x6b, 0x2a, 0x09, 0x55, 0xee, 0x15, 0xe2, 0x91, - 0x35, 0x95, 0xb1, 0x38, 0x2d, 0xab, 0xa6, 0x03, 0xee, 0xb4, 0x64, 0x92, 0x67, 0xe3, 0xe5, 0x3d, - 0xd0, 0x24, 0x1c, 0xf2, 0x4a, 0xbf, 0x1f, 0x85, 0xa9, 0x1a, 0xdb, 0xa3, 0x76, 0xc7, 0x76, 0xa8, - 0xda, 0xd7, 0x23, 0x98, 0xda, 0x23, 0xcc, 0x69, 0xf9, 0x54, 0x87, 0xd0, 0x84, 0xee, 0x4a, 0x68, - 0xf5, 0x76, 0x92, 0xf9, 0xf2, 0x70, 0x71, 0x3e, 0xa5, 0x9e, 0xe2, 0xe2, 0x34, 0x12, 0x7a, 0x02, - 0x40, 0x23, 0x27, 0x9a, 0x48, 0x5e, 0x3a, 0x3e, 0x92, 0x69, 0xc7, 0xeb, 0xd9, 0x29, 0xa6, 0xe1, - 0x04, 0x26, 0xfa, 0xa1, 0x1c, 0xcc, 0x1a, 0x2a, 0xa4, 0x81, 0xfa, 0xdb, 0x66, 0x62, 0xa5, 0x7c, - 0xbc, 0x81, 0x1d, 0xa3, 0xa2, 0xe0, 0xa3, 0x16, 0x12, 0x52, 0xd5, 0x30, 0x67, 0x7e, 0x96, 0xfe, - 0x3a, 0x0a, 0x4b, 0xc7, 0x1d, 0xb7, 0xb2, 0xcf, 0xc8, 0x61, 0x91, 0xb7, 0x44, 0xd8, 0x84, 0xf5, - 0x2d, 0x56, 0xf5, 0x99, 0x9d, 0x14, 0x07, 0x77, 0x49, 0xa2, 0x3b, 0x90, 0x69, 0xfa, 0xd4, 0x38, - 0xa7, 0x72, 0xfc, 0xda, 0x53, 0xde, 0xaf, 0x8e, 0xcb, 0x04, 0xda, 0xf2, 0x29, 0x96, 0x20, 0x12, - 0xcb, 0x65, 0x75, 0xd3, 0xb2, 0x4e, 0x87, 0xb5, 0xc9, 0xea, 0x58, 0x82, 0xa0, 0x4d, 0xc8, 0x36, - 0x79, 0x20, 0xcc, 0x54, 0x30, 0x34, 0x58, 0x5e, 0x56, 0xfd, 0x16, 0x0f, 0x04, 0x56, 0x30, 0xa5, - 0xbf, 0x65, 0x61, 0xf1, 0x98, 0xb9, 0x01, 0x6d, 0xc0, 0x9c, 0xbe, 0x24, 0x6f, 0x51, 0x9f, 0xf1, - 0x7a, 0xda, 0x97, 0x17, 0xd4, 0x25, 0xb6, 0x97, 0x8d, 0xfb, 0xe9, 0xa0, 0x0f, 0x60, 0x86, 0x79, - 0x82, 0xfa, 0x6d, 0xe2, 0x84, 0x30, 0xfa, 0x59, 0x60, 0x4e, 0xbf, 0xce, 0xa5, 0x58, 0xb8, 0x5b, - 0xb6, 0x4f, 0x40, 0x33, 0x27, 0x0e, 0xa8, 0x03, 0xd3, 0x2e, 0x79, 0x96, 0xb8, 0x6e, 0x1b, 0x17, - 0x0e, 0xfe, 0x37, 0xa4, 0x25, 0x98, 0x53, 0xd6, 0x7f, 0x98, 0x96, 0x37, 0x3c, 0x71, 0xcf, 0xdf, - 0x16, 0x3e, 0xf3, 0x1a, 0xda, 0xda, 0x66, 0x0a, 0x0b, 0x77, 0x61, 0xa3, 0xc7, 0x90, 0x77, 0xc9, - 0xb3, 0xed, 0x96, 0xdf, 0x08, 0x6f, 0x49, 0xc3, 0xdb, 0x51, 0xcf, 0x46, 0x9b, 0x06, 0x05, 0x47, - 0x78, 0x61, 0x6a, 0x8e, 0xbf, 0x89, 0xd4, 0x0c, 0xd3, 0x29, 0xff, 0x66, 0xd2, 0xe9, 0x33, 0x0b, - 0x26, 0x93, 0x55, 0xdc, 0xdb, 0x3b, 0xad, 0x21, 0x7a, 0xe7, 0xb7, 0x61, 0x54, 0x70, 0x53, 0x82, - 0x27, 0x3a, 0xe9, 0xc1, 0xc0, 0x8e, 0xee, 0x70, 0x3c, 0x2a, 0x78, 0x75, 0xf9, 0xf9, 0x8b, 0x85, - 0x91, 0xcf, 0x5f, 0x2c, 0x8c, 0x7c, 0xf1, 0x62, 0x61, 0xe4, 0xd3, 0xa3, 0x05, 0xeb, 0xf9, 0xd1, - 0x82, 0xf5, 0xf9, 0xd1, 0x82, 0xf5, 0xc5, 0xd1, 0x82, 0xf5, 0xe5, 0xd1, 0x82, 0xf5, 0xcb, 0xff, - 0x2e, 0x8c, 0x3c, 0x1e, 0x6d, 0x5f, 0xfe, 0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0c, 0xb6, 0x32, - 0x5f, 0x7c, 0x20, 0x00, 0x00, + 0xf7, 0x07, 0x69, 0xf9, 0x2d, 0x4f, 0x30, 0x97, 0x56, 0x02, 0x7b, 0x9f, 0xba, 0xa4, 0x47, 0xef, + 0xca, 0x20, 0xbd, 0x96, 0x60, 0x4e, 0x85, 0x79, 0x22, 0x10, 0x7e, 0xb7, 0x52, 0xe9, 0xcf, 0x16, + 0x2c, 0xac, 0xb5, 0x02, 0xc1, 0xdd, 0x5b, 0xb4, 0xe9, 0xf0, 0x8e, 0x4b, 0x3d, 0xb1, 0x2d, 0xa4, + 0x44, 0xa3, 0xb3, 0x45, 0x7c, 0xe2, 0x06, 0xe8, 0x1d, 0xc8, 0x31, 0x97, 0x34, 0x68, 0xd1, 0x5a, + 0xb2, 0x96, 0x0b, 0xd5, 0xa9, 0xe7, 0x87, 0x8b, 0x23, 0x47, 0x87, 0x8b, 0xb9, 0x0d, 0x49, 0xc4, + 0x9a, 0x87, 0xbe, 0x0b, 0x13, 0xd4, 0x6b, 0x33, 0x9f, 0x7b, 0x12, 0xa1, 0x38, 0xba, 0x94, 0x59, + 0x9e, 0x58, 0x99, 0x2f, 0xeb, 0x25, 0x29, 0x3f, 0x4b, 0x27, 0x95, 0xdb, 0x97, 0xcb, 0xeb, 0x5e, + 0xfb, 0x01, 0xf1, 0xab, 0x73, 0x06, 0x66, 0x62, 0x3d, 0x56, 0xc3, 0x49, 0x0c, 0xf4, 0x2e, 0x8c, + 0xdb, 0xdc, 0x75, 0x89, 0x57, 0x2f, 0x66, 0x96, 0x32, 0xcb, 0x85, 0xea, 0xc4, 0xd1, 0xe1, 0xe2, + 0xf8, 0x9a, 0x26, 0xe1, 0x90, 0x57, 0xfa, 0x8b, 0x05, 0x33, 0xf1, 0xda, 0xd7, 0x48, 0x2b, 0xa0, + 0xe8, 0x3a, 0x64, 0x45, 0xa7, 0x19, 0xae, 0xf8, 0x5d, 0x63, 0x2a, 0xbb, 0xd3, 0x69, 0xd2, 0x97, + 0x87, 0x8b, 0xe7, 0x62, 0xf1, 0x1d, 0x9f, 0x35, 0x1a, 0xd4, 0x97, 0x0c, 0xac, 0x54, 0x50, 0x00, + 0x93, 0x6a, 0x47, 0x86, 0x53, 0x1c, 0x5d, 0xb2, 0x96, 0x27, 0x56, 0x3e, 0x28, 0x1f, 0x97, 0x3f, + 0xe5, 0xae, 0x35, 0x6c, 0x24, 0x40, 0xaa, 0x67, 0x8e, 0x0e, 0x17, 0x27, 0x93, 0x14, 0x9c, 0x32, + 0x52, 0xaa, 0xc3, 0xdb, 0xaf, 0x50, 0x47, 0xeb, 0x90, 0xdd, 0xf3, 0xb9, 0xab, 0xb6, 0x33, 0xb1, + 0xf2, 0x4e, 0x3f, 0xaf, 0xde, 0xdb, 0xfd, 0x84, 0xda, 0x02, 0xd3, 0x3d, 0xea, 0x53, 0xcf, 0xa6, + 0xd5, 0xc9, 0x70, 0xcf, 0xb7, 0x7d, 0xee, 0x62, 0xa5, 0x5e, 0xfa, 0x57, 0x06, 0xe6, 0x12, 0x66, + 0xb8, 0x57, 0x67, 0x82, 0x71, 0x0f, 0xdd, 0x4c, 0x79, 0xeb, 0xab, 0x5d, 0xde, 0xba, 0xd0, 0x47, + 0x25, 0xe1, 0xaf, 0x1a, 0x8c, 0x05, 0x82, 0x88, 0x56, 0xa0, 0x3c, 0x55, 0xa8, 0x5e, 0x35, 0xea, + 0x63, 0xdb, 0x8a, 0xfa, 0xf2, 0x70, 0xb1, 0x4f, 0xa5, 0x94, 0x23, 0x24, 0x2d, 0x85, 0x0d, 0x06, + 0x6a, 0x03, 0x72, 0x48, 0x20, 0x76, 0x7c, 0xe2, 0x05, 0xda, 0x12, 0x73, 0x69, 0x31, 0xa3, 0xf6, + 0xfd, 0xf5, 0xc4, 0xbe, 0xa3, 0x04, 0x2f, 0x37, 0x0f, 0x1a, 0x92, 0x10, 0x94, 0x65, 0x39, 0x49, + 0x4f, 0x48, 0x8d, 0xea, 0xbc, 0x59, 0x05, 0xaa, 0xf5, 0xa0, 0xe1, 0x3e, 0x16, 0xd0, 0x45, 0x18, + 0xf3, 0x29, 0x09, 0xb8, 0x57, 0xcc, 0xaa, 0x5d, 0x4c, 0x87, 0xbb, 0xc0, 0x8a, 0x8a, 0x0d, 0x17, + 0x7d, 0x0d, 0xc6, 0x5d, 0x1a, 0x04, 0xb2, 0x1a, 0x72, 0x4a, 0x70, 0xc6, 0x08, 0x8e, 0x6f, 0x6a, + 0x32, 0x0e, 0xf9, 0xe8, 0x13, 0x98, 0x96, 0x86, 0xee, 0x37, 0xeb, 0x44, 0x50, 0xb5, 0x8d, 0xb1, + 0xa1, 0xb7, 0x71, 0xde, 0xa0, 0x4f, 0xd7, 0x52, 0x48, 0xb8, 0x0b, 0xb9, 0xf4, 0xc7, 0x51, 0x38, + 0x93, 0x0a, 0xd3, 0x1e, 0x6b, 0xa0, 0x27, 0x90, 0x97, 0x60, 0x75, 0x22, 0x88, 0xc9, 0x9c, 0x4b, + 0x27, 0x33, 0xad, 0x73, 0x69, 0x93, 0x0a, 0x52, 0x45, 0x66, 0x01, 0x10, 0xd3, 0x70, 0x84, 0x8a, + 0xbe, 0x07, 0xd9, 0xa0, 0x49, 0x6d, 0x53, 0x23, 0xef, 0x0f, 0x55, 0x23, 0x6a, 0x8d, 0xdb, 0x4d, + 0x6a, 0xc7, 0xa9, 0x2a, 0xbf, 0xb0, 0x42, 0x44, 0x4f, 0xa2, 0xac, 0xd2, 0xb1, 0xbf, 0x76, 0x0a, + 0x6c, 0xa5, 0x1f, 0x47, 0x32, 0x9d, 0x69, 0xa5, 0xbf, 0x5b, 0x70, 0xb6, 0x5b, 0xa5, 0xc6, 0x02, + 0x81, 0xbe, 0xdf, 0xe3, 0xb6, 0xf2, 0xc9, 0xdc, 0x26, 0xb5, 0x95, 0xd3, 0xce, 0x18, 0x93, 0xf9, + 0x90, 0x92, 0x70, 0xd9, 0x43, 0xc8, 0x31, 0x41, 0xdd, 0xc0, 0x74, 0xc8, 0x95, 0xe1, 0xf7, 0x95, + 0x68, 0xc0, 0x12, 0x08, 0x6b, 0xbc, 0xd2, 0xcf, 0x33, 0x50, 0xec, 0x16, 0xc5, 0xdc, 0x71, 0x76, + 0x89, 0x7d, 0x80, 0x96, 0x20, 0xeb, 0x11, 0x37, 0xac, 0xf0, 0xc8, 0xe1, 0x77, 0x89, 0x4b, 0xb1, + 0xe2, 0xa0, 0xdf, 0x58, 0x80, 0x5a, 0x2a, 0xa1, 0xea, 0xab, 0x9e, 0xc7, 0x05, 0x91, 0xa5, 0x11, + 0xae, 0x12, 0x0f, 0xbf, 0xca, 0xd0, 0x74, 0xf9, 0x7e, 0x0f, 0xe8, 0xba, 0x27, 0xfc, 0x4e, 0x5c, + 0xa1, 0xbd, 0x02, 0xb8, 0xcf, 0x4a, 0xd0, 0x13, 0x93, 0x6b, 0x3a, 0x1f, 0x3e, 0x3c, 0xfd, 0x8a, + 0x06, 0xe5, 0xdc, 0xfc, 0x3a, 0x5c, 0x18, 0xb0, 0x58, 0x74, 0x06, 0x32, 0x07, 0xb4, 0xa3, 0xdd, + 0x87, 0xe5, 0x4f, 0x74, 0x16, 0x72, 0x6d, 0xe2, 0xb4, 0xa8, 0xee, 0x7a, 0x58, 0x7f, 0xdc, 0x18, + 0xbd, 0x66, 0x95, 0xfe, 0x94, 0x81, 0xaf, 0xbc, 0xca, 0xf6, 0x1b, 0xea, 0xe6, 0xe8, 0x3d, 0xc8, + 0xfb, 0xb4, 0xcd, 0x02, 0xc6, 0x3d, 0xb5, 0x88, 0x4c, 0x9c, 0x77, 0xd8, 0xd0, 0x71, 0x24, 0x81, + 0x56, 0x61, 0x86, 0x79, 0xb6, 0xd3, 0xaa, 0x87, 0x87, 0x8a, 0xae, 0xac, 0x7c, 0xf5, 0x82, 0x51, + 0x9a, 0xd9, 0x48, 0xb3, 0x71, 0xb7, 0x7c, 0x12, 0x82, 0xba, 0x4d, 0x87, 0x08, 0xaa, 0x9a, 0x65, + 0x1f, 0x08, 0xc3, 0xc6, 0xdd, 0xf2, 0xe8, 0x01, 0x9c, 0x37, 0x24, 0x4c, 0x9b, 0x0e, 0xb3, 0x95, + 0x8f, 0x65, 0x85, 0xa8, 0x6e, 0x9a, 0xaf, 0x2e, 0x18, 0xa4, 0xf3, 0x1b, 0x7d, 0xa5, 0xf0, 0x00, + 0xed, 0xc4, 0xd2, 0xc2, 0xd9, 0x45, 0x35, 0xdb, 0xde, 0xa5, 0x85, 0x6c, 0xdc, 0x2d, 0x5f, 0xfa, + 0x5f, 0xae, 0xb7, 0x1f, 0xa8, 0x70, 0xed, 0x42, 0x3e, 0x08, 0x41, 0x75, 0xc8, 0xae, 0x0e, 0x93, + 0x7c, 0xa1, 0x81, 0x38, 0x3a, 0xd1, 0x1a, 0x22, 0x5c, 0x44, 0x21, 0x2f, 0xc2, 0xb0, 0xe8, 0x66, + 0x7a, 0x73, 0x18, 0x1b, 0x26, 0x44, 0x5b, 0xdc, 0x61, 0x36, 0xa3, 0x41, 0x75, 0x52, 0x9a, 0x89, + 0x02, 0x19, 0x41, 0xeb, 0x94, 0x51, 0x9e, 0xd3, 0xd1, 0xcf, 0x25, 0x53, 0x46, 0xd3, 0x71, 0x24, + 0x81, 0x6a, 0x70, 0x36, 0x4c, 0x9f, 0x8f, 0x59, 0x20, 0xb8, 0xdf, 0xa9, 0x31, 0x97, 0x09, 0x15, + 0xf4, 0x5c, 0xb5, 0x78, 0x74, 0xb8, 0x78, 0x16, 0xf7, 0xe1, 0xe3, 0xbe, 0x5a, 0xb2, 0x05, 0x09, + 0x1a, 0x08, 0x13, 0xe8, 0x28, 0xa1, 0x77, 0x68, 0x20, 0xb0, 0xe2, 0xc8, 0x33, 0xb8, 0x29, 0x47, + 0x9f, 0xba, 0x89, 0x5d, 0xd4, 0xb9, 0xb7, 0x14, 0x15, 0x1b, 0x2e, 0xf2, 0x21, 0x1f, 0x50, 0x87, + 0xda, 0x82, 0xfb, 0xc5, 0x71, 0xd5, 0x9f, 0x6e, 0x9d, 0xee, 0xe4, 0x29, 0x6f, 0x1b, 0x18, 0xdd, + 0x91, 0xe2, 0x00, 0x19, 0x32, 0x8e, 0xec, 0xa0, 0x4d, 0xc8, 0x8b, 0x30, 0xe9, 0xf3, 0x83, 0xeb, + 0x76, 0x8b, 0xd7, 0xc3, 0x5c, 0xd7, 0x6d, 0x46, 0x05, 0x22, 0x2c, 0x87, 0x08, 0x42, 0xe6, 0xab, + 0xcb, 0x3c, 0x4c, 0x49, 0xbd, 0xb3, 0x4d, 0x6d, 0xee, 0xd5, 0x83, 0x62, 0x41, 0x79, 0x35, 0xca, + 0xd7, 0xcd, 0x34, 0x1b, 0x77, 0xcb, 0xcf, 0xdf, 0x84, 0xa9, 0xd4, 0xf2, 0x87, 0xea, 0x51, 0x7f, + 0xc8, 0xc1, 0xf9, 0xfe, 0xe7, 0x25, 0xba, 0x09, 0x53, 0x72, 0x89, 0x81, 0x78, 0x40, 0x7d, 0xd5, + 0x5b, 0x2c, 0xd5, 0x5b, 0xce, 0x99, 0x85, 0x4d, 0xd5, 0x92, 0x4c, 0x9c, 0x96, 0x45, 0x77, 0x00, + 0xf1, 0xdd, 0x80, 0xfa, 0x6d, 0x5a, 0xff, 0x48, 0x5f, 0x34, 0xe2, 0xee, 0x14, 0x35, 0xfc, 0x7b, + 0x3d, 0x12, 0xb8, 0x8f, 0xd6, 0x90, 0xc9, 0xba, 0x0a, 0x33, 0xe6, 0xd0, 0x08, 0x99, 0x26, 0x4f, + 0x23, 0x8f, 0xde, 0x4f, 0xb3, 0x71, 0xb7, 0x3c, 0xfa, 0x08, 0x66, 0x49, 0x9b, 0x30, 0x87, 0xec, + 0x3a, 0x34, 0x02, 0xc9, 0x29, 0x90, 0xb7, 0x0c, 0xc8, 0xec, 0x6a, 0xb7, 0x00, 0xee, 0xd5, 0x41, + 0x9b, 0x30, 0xd7, 0xf2, 0x7a, 0xa1, 0xc6, 0x14, 0xd4, 0xdb, 0x06, 0x6a, 0xee, 0x7e, 0xaf, 0x08, + 0xee, 0xa7, 0x87, 0x1e, 0xc3, 0x78, 0x9d, 0x0a, 0xc2, 0x9c, 0xa0, 0x38, 0xae, 0x52, 0xef, 0xca, + 0x30, 0xe9, 0x7e, 0x4b, 0xab, 0xea, 0xcb, 0x93, 0xf9, 0xc0, 0x21, 0x20, 0x62, 0x00, 0x76, 0x38, + 0x8a, 0x07, 0xc5, 0xbc, 0xaa, 0xa6, 0x6f, 0x0d, 0x59, 0x4d, 0x5a, 0x3b, 0x1e, 0x15, 0x23, 0x52, + 0x80, 0x13, 0xe0, 0x32, 0xb1, 0x7c, 0x99, 0xc0, 0x91, 0x3f, 0x74, 0xc6, 0x47, 0x89, 0x85, 0x93, + 0x4c, 0x9c, 0x96, 0x2d, 0xfd, 0xda, 0x82, 0xd9, 0x9e, 0x3d, 0x25, 0xa7, 0x71, 0xeb, 0x98, 0x69, + 0xfc, 0x11, 0x8c, 0xd9, 0xb2, 0x7d, 0x84, 0x23, 0xcd, 0xe5, 0xa1, 0x2f, 0x74, 0x71, 0x3f, 0x52, + 0x9f, 0x01, 0x36, 0x80, 0xa5, 0x19, 0x98, 0x8a, 0x45, 0x6b, 0xbc, 0x51, 0xfa, 0x2c, 0x9b, 0x3c, + 0x4a, 0x6a, 0xbc, 0x71, 0xaf, 0xa9, 0x5d, 0x50, 0x81, 0x82, 0xcd, 0x3d, 0x41, 0xe4, 0x00, 0x69, + 0x56, 0x3c, 0x6b, 0x40, 0x0b, 0x6b, 0x21, 0x03, 0xc7, 0x32, 0xb2, 0x25, 0xee, 0x71, 0xc7, 0xe1, + 0x4f, 0x55, 0x0d, 0x25, 0x5a, 0xe2, 0x6d, 0x45, 0xc5, 0x86, 0x2b, 0x6b, 0xa5, 0x29, 0xbb, 0x2e, + 0x6f, 0x85, 0xc7, 0x7a, 0x54, 0x2b, 0x5b, 0x86, 0x8e, 0x23, 0x09, 0x74, 0x15, 0x26, 0x03, 0xe6, + 0xd9, 0x34, 0x6c, 0x3d, 0x59, 0x3d, 0x3d, 0xc8, 0x3b, 0xea, 0x76, 0x82, 0x8e, 0x53, 0x52, 0xe8, + 0x21, 0x14, 0xd4, 0xb7, 0xba, 0xca, 0xe4, 0x86, 0xbe, 0xca, 0x4c, 0xc9, 0x4d, 0x6e, 0x87, 0x00, + 0x38, 0xc6, 0x42, 0x2b, 0x00, 0x82, 0xb9, 0x34, 0x10, 0xc4, 0x6d, 0x06, 0xa6, 0xf7, 0x47, 0xc9, + 0xb4, 0x13, 0x71, 0x70, 0x42, 0x0a, 0x7d, 0x03, 0x0a, 0x32, 0x05, 0x6a, 0xcc, 0xa3, 0xba, 0x2a, + 0x32, 0xda, 0xc0, 0x4e, 0x48, 0xc4, 0x31, 0x1f, 0x95, 0x01, 0x1c, 0x79, 0x06, 0x55, 0x3b, 0x82, + 0x06, 0xaa, 0x7d, 0x67, 0xaa, 0xd3, 0x12, 0xbc, 0x16, 0x51, 0x71, 0x42, 0x42, 0x7a, 0xdd, 0xe3, + 0x4f, 0x09, 0x13, 0x2a, 0x45, 0x13, 0x5e, 0xbf, 0xcb, 0x1f, 0x12, 0x26, 0xb0, 0xe1, 0xa2, 0x77, + 0x61, 0xbc, 0x6d, 0x9a, 0x24, 0x28, 0x50, 0x55, 0x63, 0x61, 0x6b, 0x0c, 0x79, 0xa5, 0x7f, 0xa7, + 0x72, 0x17, 0xd3, 0x1f, 0xb5, 0xe4, 0x69, 0x77, 0xfc, 0x48, 0x7e, 0x11, 0xc6, 0x74, 0x77, 0xed, + 0x0e, 0xbe, 0x6e, 0xc1, 0xd8, 0x70, 0xd1, 0x3b, 0x90, 0xdb, 0xe3, 0xbe, 0x4d, 0x4d, 0xe4, 0xa3, + 0xeb, 0xc1, 0x6d, 0x49, 0xc4, 0x9a, 0x87, 0x1e, 0xc0, 0x0c, 0x7d, 0x96, 0x9e, 0xff, 0xb2, 0xea, + 0x51, 0xe5, 0x3d, 0xd9, 0x1b, 0xd7, 0xd3, 0xac, 0xc1, 0x6f, 0x24, 0xdd, 0x20, 0xa5, 0x7f, 0x8c, + 0x03, 0xea, 0x1d, 0x76, 0xd0, 0x8d, 0xd4, 0x93, 0xc2, 0xc5, 0xae, 0x27, 0x85, 0xf3, 0xbd, 0x1a, + 0x89, 0x17, 0x85, 0x36, 0x4c, 0xda, 0xea, 0x45, 0x4a, 0xbf, 0x3f, 0x99, 0x81, 0xe8, 0x3b, 0xc7, + 0x17, 0xec, 0xab, 0xdf, 0xb1, 0x74, 0x82, 0xaf, 0x25, 0x90, 0x71, 0xca, 0x0e, 0xfa, 0x29, 0x4c, + 0xfb, 0xd4, 0xf6, 0x29, 0x11, 0xd4, 0x58, 0xd6, 0x77, 0x8d, 0xea, 0xf1, 0x96, 0xb1, 0xd1, 0x1b, + 0x68, 0x1b, 0xc9, 0x4b, 0x3c, 0x4e, 0xa1, 0xe3, 0x2e, 0x6b, 0xe8, 0xc7, 0x30, 0xe5, 0x73, 0xc7, + 0x61, 0x5e, 0xc3, 0x98, 0xcf, 0x2a, 0xf3, 0xab, 0x27, 0x30, 0xaf, 0xd5, 0x06, 0x5a, 0x9f, 0x55, + 0xfd, 0x35, 0x89, 0x8d, 0xd3, 0xa6, 0xd0, 0x23, 0x28, 0xf8, 0x34, 0xe0, 0x2d, 0xdf, 0xa6, 0x81, + 0x29, 0xee, 0xe5, 0x7e, 0x03, 0x0e, 0x36, 0x42, 0x32, 0x8b, 0x99, 0x4f, 0xa5, 0xad, 0x20, 0xee, + 0x61, 0x21, 0x37, 0xc0, 0x31, 0x1a, 0xda, 0x97, 0x69, 0xbc, 0x4b, 0x1d, 0x59, 0xda, 0x99, 0x93, + 0x05, 0xb2, 0x77, 0x23, 0xe5, 0x9a, 0x82, 0xd0, 0x83, 0x5a, 0xa2, 0x10, 0x24, 0x11, 0x1b, 0x7c, + 0xf4, 0x13, 0x98, 0x20, 0x89, 0xbb, 0xab, 0x9e, 0x0d, 0xd7, 0x4f, 0x65, 0xae, 0xe7, 0xba, 0x1a, + 0x3d, 0x57, 0x26, 0xef, 0xa9, 0x49, 0x73, 0xe8, 0x1e, 0x9c, 0x23, 0xb6, 0x60, 0x6d, 0x7a, 0x8b, + 0x92, 0xba, 0xc3, 0xbc, 0xa8, 0xbd, 0xea, 0x86, 0xf3, 0xd6, 0xd1, 0xe1, 0xe2, 0xb9, 0xd5, 0x7e, + 0x02, 0xb8, 0xbf, 0xde, 0xfc, 0x75, 0x98, 0x48, 0xec, 0x7a, 0x98, 0xf9, 0x6e, 0xfe, 0x43, 0x38, + 0xf3, 0x5a, 0x77, 0xd8, 0xdf, 0x8d, 0x42, 0xa9, 0xa7, 0x01, 0xa8, 0x27, 0xc9, 0xb5, 0x7d, 0xe2, + 0x35, 0xc2, 0x8c, 0xad, 0x40, 0x81, 0xb4, 0x04, 0x77, 0x89, 0x60, 0xb6, 0x02, 0xce, 0xc7, 0xb9, + 0xb0, 0x1a, 0x32, 0x70, 0x2c, 0x83, 0x6e, 0xc0, 0x74, 0x74, 0xb8, 0xc9, 0x4e, 0xa7, 0x4f, 0xe3, + 0x82, 0x2e, 0x8f, 0xb5, 0x14, 0x07, 0x77, 0x49, 0x46, 0xd7, 0xe6, 0xcc, 0xeb, 0x5d, 0x9b, 0xef, + 0x84, 0x2f, 0x8c, 0x6a, 0x4f, 0xb4, 0xae, 0x76, 0x65, 0x5e, 0xfd, 0xba, 0x5e, 0x0d, 0x93, 0x12, + 0xb8, 0x8f, 0x56, 0xe9, 0x67, 0x16, 0xbc, 0x35, 0xf0, 0x16, 0x86, 0x7e, 0x10, 0x3e, 0xf5, 0x58, + 0x2a, 0x11, 0xaf, 0x9f, 0xf6, 0x46, 0xd7, 0xe9, 0xff, 0xe2, 0x73, 0x23, 0xff, 0xab, 0xdf, 0x2e, + 0x8e, 0x7c, 0xfa, 0x9f, 0xa5, 0x91, 0xd2, 0x97, 0x16, 0x5c, 0x18, 0xa0, 0xfb, 0x3a, 0x4f, 0xe1, + 0xbf, 0xb0, 0x60, 0x96, 0x75, 0x07, 0xdd, 0xb4, 0xe3, 0x5b, 0xa7, 0xd8, 0x4d, 0x4f, 0x02, 0x55, + 0xcf, 0xc9, 0x99, 0xba, 0x87, 0x8c, 0x7b, 0xad, 0x96, 0xfe, 0x69, 0xc1, 0xf4, 0xfa, 0x33, 0x6a, + 0xdf, 0xa5, 0x4f, 0xb7, 0x78, 0xfd, 0x63, 0xce, 0x0f, 0x92, 0xff, 0x0f, 0x58, 0x83, 0xff, 0x1f, + 0x40, 0xd7, 0x21, 0x43, 0xbd, 0xf6, 0x09, 0xfe, 0x91, 0x98, 0x30, 0xbe, 0xc9, 0xac, 0x7b, 0x6d, + 0x2c, 0x75, 0xe4, 0xc8, 0x9a, 0x4a, 0x42, 0x95, 0x7b, 0x85, 0x78, 0x64, 0x4d, 0x65, 0x2c, 0x4e, + 0xcb, 0xaa, 0xe9, 0x80, 0x3b, 0x2d, 0x99, 0xe4, 0xd9, 0x78, 0x79, 0x0f, 0x34, 0x09, 0x87, 0xbc, + 0xd2, 0xef, 0x47, 0x61, 0xaa, 0xc6, 0xf6, 0xa8, 0xdd, 0xb1, 0x1d, 0xaa, 0xf6, 0xf5, 0x08, 0xa6, + 0xf6, 0x08, 0x73, 0x5a, 0x3e, 0xd5, 0x21, 0x34, 0xa1, 0xbb, 0x12, 0x5a, 0xbd, 0x9d, 0x64, 0xbe, + 0x3c, 0x5c, 0x9c, 0x4f, 0xa9, 0xa7, 0xb8, 0x38, 0x8d, 0x84, 0x9e, 0x00, 0xd0, 0xc8, 0x89, 0x26, + 0x92, 0x97, 0x8e, 0x8f, 0x64, 0xda, 0xf1, 0x7a, 0x76, 0x8a, 0x69, 0x38, 0x81, 0x89, 0x7e, 0x28, + 0x07, 0xb3, 0x86, 0x0a, 0x69, 0xa0, 0xfe, 0xb6, 0x99, 0x58, 0x29, 0x1f, 0x6f, 0x60, 0xc7, 0xa8, + 0x28, 0xf8, 0xa8, 0x85, 0x84, 0x54, 0x35, 0xcc, 0x99, 0x9f, 0xa5, 0xbf, 0x8e, 0xc2, 0xd2, 0x71, + 0xc7, 0xad, 0xec, 0x33, 0x72, 0x58, 0xe4, 0x2d, 0x11, 0x36, 0x61, 0x7d, 0x8b, 0x55, 0x7d, 0x66, + 0x27, 0xc5, 0xc1, 0x5d, 0x92, 0xe8, 0x0e, 0x64, 0x9a, 0x3e, 0x35, 0xce, 0xa9, 0x1c, 0xbf, 0xf6, + 0x94, 0xf7, 0xab, 0xe3, 0x32, 0x81, 0xb6, 0x7c, 0x8a, 0x25, 0x88, 0xc4, 0x72, 0x59, 0xdd, 0xb4, + 0xac, 0xd3, 0x61, 0x6d, 0xb2, 0x3a, 0x96, 0x20, 0x68, 0x13, 0xb2, 0x4d, 0x1e, 0x08, 0x33, 0x15, + 0x0c, 0x0d, 0x96, 0x97, 0x55, 0xbf, 0xc5, 0x03, 0x81, 0x15, 0x4c, 0xe9, 0x6f, 0x59, 0x58, 0x3c, + 0x66, 0x6e, 0x40, 0x1b, 0x30, 0xa7, 0x2f, 0xc9, 0x5b, 0xd4, 0x67, 0xbc, 0x9e, 0xf6, 0xe5, 0x05, + 0x75, 0x89, 0xed, 0x65, 0xe3, 0x7e, 0x3a, 0xe8, 0x03, 0x98, 0x61, 0x9e, 0xa0, 0x7e, 0x9b, 0x38, + 0x21, 0x8c, 0x7e, 0x16, 0x98, 0xd3, 0xaf, 0x73, 0x29, 0x16, 0xee, 0x96, 0xed, 0x13, 0xd0, 0xcc, + 0x89, 0x03, 0xea, 0xc0, 0xb4, 0x4b, 0x9e, 0x25, 0xae, 0xdb, 0xc6, 0x85, 0x83, 0xff, 0x0d, 0x69, + 0x09, 0xe6, 0x94, 0xf5, 0x1f, 0xa6, 0xe5, 0x0d, 0x4f, 0xdc, 0xf3, 0xb7, 0x85, 0xcf, 0xbc, 0x86, + 0xb6, 0xb6, 0x99, 0xc2, 0xc2, 0x5d, 0xd8, 0xe8, 0x31, 0xe4, 0x5d, 0xf2, 0x6c, 0xbb, 0xe5, 0x37, + 0xc2, 0x5b, 0xd2, 0xf0, 0x76, 0xd4, 0xb3, 0xd1, 0xa6, 0x41, 0xc1, 0x11, 0x5e, 0x98, 0x9a, 0xe3, + 0x6f, 0x22, 0x35, 0xc3, 0x74, 0xca, 0xbf, 0x99, 0x74, 0xfa, 0xcc, 0x82, 0xc9, 0x64, 0x15, 0xf7, + 0xf6, 0x4e, 0x6b, 0x88, 0xde, 0xf9, 0x6d, 0x18, 0x15, 0xdc, 0x94, 0xe0, 0x89, 0x4e, 0x7a, 0x30, + 0xb0, 0xa3, 0x3b, 0x1c, 0x8f, 0x0a, 0x5e, 0x5d, 0x7e, 0xfe, 0x62, 0x61, 0xe4, 0xf3, 0x17, 0x0b, + 0x23, 0x5f, 0xbc, 0x58, 0x18, 0xf9, 0xf4, 0x68, 0xc1, 0x7a, 0x7e, 0xb4, 0x60, 0x7d, 0x7e, 0xb4, + 0x60, 0x7d, 0x71, 0xb4, 0x60, 0x7d, 0x79, 0xb4, 0x60, 0xfd, 0xf2, 0xbf, 0x0b, 0x23, 0x8f, 0x47, + 0xdb, 0x97, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x8f, 0x03, 0xf4, 0x57, 0x4b, 0x20, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/apps/v1/generated.proto b/vendor/github.com/openshift/api/apps/v1/generated.proto index 0b1a375e4322..80f882b902b6 100644 --- a/vendor/github.com/openshift/api/apps/v1/generated.proto +++ b/vendor/github.com/openshift/api/apps/v1/generated.proto @@ -7,7 +7,6 @@ package github.com.openshift.api.apps.v1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; diff --git a/vendor/github.com/openshift/api/authorization/v1/generated.pb.go b/vendor/github.com/openshift/api/authorization/v1/generated.pb.go index c0cbf3dd0aae..24f7fa52ee34 100644 --- a/vendor/github.com/openshift/api/authorization/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/authorization/v1/generated.pb.go @@ -7316,120 +7316,119 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1835 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x19, 0x4b, 0x8f, 0x1b, 0x49, - 0x79, 0xca, 0xf6, 0x78, 0xec, 0xcf, 0x99, 0x78, 0xb6, 0x92, 0x4d, 0x3a, 0x81, 0xd8, 0x56, 0x83, - 0x60, 0x56, 0xb0, 0x6d, 0x66, 0x16, 0x42, 0x92, 0x15, 0x5a, 0xd9, 0xd9, 0x51, 0x34, 0x52, 0x48, - 0x66, 0x6b, 0xd8, 0xd5, 0x6a, 0x79, 0x88, 0x76, 0x4f, 0x8d, 0xdd, 0x4c, 0xbb, 0xdb, 0xea, 0xea, - 0x76, 0x08, 0x08, 0x29, 0x20, 0x71, 0xe0, 0x82, 0xf6, 0x02, 0xe2, 0x08, 0xe2, 0x07, 0x20, 0x2e, - 0x48, 0x20, 0xc1, 0x89, 0x43, 0x0e, 0x1c, 0x56, 0xe2, 0xb2, 0x42, 0xc8, 0x10, 0x07, 0x71, 0xe0, - 0xc0, 0x6f, 0x40, 0x55, 0x5d, 0xed, 0x7e, 0xb8, 0xad, 0x71, 0xcf, 0xec, 0x8c, 0x00, 0xe5, 0xe6, - 0xae, 0xef, 0xfd, 0xac, 0xef, 0x2b, 0xc3, 0xed, 0xbe, 0xe9, 0x0d, 0xfc, 0x9e, 0x66, 0x38, 0xc3, - 0xb6, 0x33, 0xa2, 0x36, 0x1b, 0x98, 0x87, 0x5e, 0x5b, 0x1f, 0x99, 0x6d, 0xdd, 0xf7, 0x06, 0x8e, - 0x6b, 0x7e, 0x47, 0xf7, 0x4c, 0xc7, 0x6e, 0x8f, 0xb7, 0xda, 0x7d, 0x6a, 0x53, 0x57, 0xf7, 0xe8, - 0x81, 0x36, 0x72, 0x1d, 0xcf, 0xc1, 0xaf, 0x44, 0xa4, 0xda, 0x8c, 0x54, 0xd3, 0x47, 0xa6, 0x96, - 0x20, 0xd5, 0xc6, 0x5b, 0xd7, 0x5f, 0x8d, 0x49, 0xe9, 0x3b, 0x7d, 0xa7, 0x2d, 0x38, 0xf4, 0xfc, - 0x43, 0xf1, 0x25, 0x3e, 0xc4, 0xaf, 0x80, 0xf3, 0x75, 0xf5, 0xe8, 0x16, 0xd3, 0x4c, 0x47, 0xa8, - 0x61, 0x38, 0x2e, 0xcd, 0x90, 0x9e, 0xc0, 0x71, 0x7b, 0xba, 0x91, 0x85, 0xf3, 0xf9, 0x08, 0x67, - 0xa8, 0x1b, 0x03, 0xd3, 0xa6, 0xee, 0xe3, 0xf6, 0xe8, 0xa8, 0xcf, 0x0f, 0x58, 0x7b, 0x48, 0x3d, - 0x3d, 0x8b, 0xaa, 0xbd, 0x88, 0xca, 0xf5, 0x6d, 0xcf, 0x1c, 0xd2, 0x39, 0x82, 0x9b, 0xc7, 0x11, - 0x30, 0x63, 0x40, 0x87, 0xfa, 0x1c, 0xdd, 0x6b, 0x8b, 0xe8, 0x7c, 0xcf, 0xb4, 0xda, 0xa6, 0xed, - 0x31, 0xcf, 0x4d, 0x13, 0xa9, 0xdf, 0x2f, 0x41, 0xb9, 0x63, 0x70, 0xc7, 0xe2, 0x36, 0x54, 0x6d, - 0x7d, 0x48, 0xd9, 0x48, 0x37, 0xa8, 0x82, 0x5a, 0x68, 0xb3, 0xda, 0x7d, 0xe9, 0xe9, 0xa4, 0xb9, - 0x32, 0x9d, 0x34, 0xab, 0x0f, 0x42, 0x00, 0x89, 0x70, 0x70, 0x0b, 0x4a, 0x63, 0xea, 0xf6, 0x94, - 0x82, 0xc0, 0xbd, 0x20, 0x71, 0x4b, 0xef, 0x50, 0xb7, 0x47, 0x04, 0x04, 0xdf, 0x86, 0x0d, 0x97, - 0x32, 0xc7, 0x77, 0x0d, 0xda, 0xd9, 0xdb, 0xbd, 0xe7, 0x3a, 0xfe, 0x48, 0x29, 0x0a, 0xec, 0x75, - 0x89, 0xbd, 0x2a, 0x0e, 0xc9, 0x1c, 0x1a, 0x7e, 0x03, 0x70, 0xec, 0xec, 0x1d, 0xea, 0x32, 0xd3, - 0xb1, 0x95, 0x92, 0x20, 0xae, 0x4b, 0xe2, 0x35, 0x79, 0x4c, 0x32, 0x50, 0xf1, 0x67, 0xa1, 0x12, - 0x9e, 0x2a, 0xab, 0x82, 0x6c, 0x43, 0x92, 0x55, 0x88, 0x3c, 0x27, 0x33, 0x0c, 0x7c, 0x0b, 0x2e, - 0x84, 0xbf, 0xb9, 0xad, 0x4a, 0x59, 0x50, 0x5c, 0x96, 0x14, 0x17, 0x48, 0x0c, 0x46, 0x12, 0x98, - 0xf8, 0x5d, 0x58, 0x33, 0x1c, 0xdb, 0xa3, 0xb6, 0xa7, 0xac, 0xb5, 0xd0, 0x66, 0x6d, 0xfb, 0x55, - 0x2d, 0x08, 0x84, 0x16, 0x0f, 0x84, 0x36, 0x3a, 0xea, 0x6b, 0x32, 0x80, 0x1a, 0xd1, 0x1f, 0xed, - 0x7c, 0xdb, 0xa3, 0x36, 0xd7, 0x33, 0x32, 0xe6, 0x6e, 0xc0, 0x85, 0x84, 0xec, 0xb8, 0x7f, 0x47, - 0xba, 0x37, 0x50, 0x2a, 0x49, 0xff, 0xee, 0xe9, 0xde, 0x80, 0x08, 0x08, 0x7e, 0x13, 0x36, 0x4c, - 0xf6, 0xc0, 0xb1, 0x43, 0xf5, 0xde, 0x26, 0xf7, 0x95, 0x6a, 0x0b, 0x6d, 0x56, 0xba, 0x8a, 0xc4, - 0xde, 0xd8, 0x4d, 0xc1, 0xc9, 0x1c, 0x85, 0xfa, 0xab, 0x02, 0xd4, 0xee, 0x5a, 0x3e, 0xf3, 0xa8, - 0x4b, 0x1c, 0x8b, 0xe2, 0x6f, 0x42, 0x85, 0x27, 0xf3, 0x81, 0xee, 0xe9, 0x22, 0x0f, 0x6a, 0xdb, - 0x9f, 0x5b, 0x68, 0x12, 0x4f, 0x7d, 0x8d, 0x63, 0x6b, 0xe3, 0x2d, 0xed, 0x61, 0xef, 0x5b, 0xd4, - 0xf0, 0xbe, 0x4c, 0x3d, 0xbd, 0x8b, 0xa5, 0x7c, 0x88, 0xce, 0xc8, 0x8c, 0x2b, 0x7e, 0x0f, 0x56, - 0x5d, 0xdf, 0xa2, 0x4c, 0x29, 0xb4, 0x8a, 0x9b, 0xb5, 0xed, 0x2f, 0x68, 0x4b, 0xd7, 0xbe, 0xb6, - 0xe7, 0x58, 0xa6, 0xf1, 0x98, 0xf8, 0x16, 0x8d, 0x72, 0x88, 0x7f, 0x31, 0x12, 0xb0, 0xc4, 0x3d, - 0xa8, 0xeb, 0xfd, 0xbe, 0x4b, 0xfb, 0x82, 0x84, 0x83, 0x44, 0xca, 0xd5, 0xb6, 0x3f, 0x11, 0x33, - 0x42, 0xe3, 0x35, 0xce, 0xd9, 0x75, 0x92, 0xa8, 0xdd, 0x4b, 0xd3, 0x49, 0xb3, 0x9e, 0x3a, 0x24, - 0x69, 0x86, 0xea, 0xbf, 0x8a, 0x80, 0x63, 0x1e, 0xeb, 0x9a, 0xf6, 0x81, 0x69, 0xf7, 0xcf, 0xc1, - 0x71, 0x14, 0xaa, 0x3e, 0xa3, 0xae, 0x28, 0x47, 0x51, 0x77, 0xb5, 0xed, 0x5b, 0x39, 0x9c, 0xf7, - 0x70, 0xc4, 0x7f, 0xe9, 0x96, 0xa0, 0xef, 0xae, 0xf3, 0xca, 0x7e, 0x3b, 0x64, 0x47, 0x22, 0xce, - 0x78, 0x00, 0xd0, 0xe7, 0x55, 0x18, 0xc8, 0x29, 0x9e, 0x52, 0xce, 0x45, 0x6e, 0xce, 0xbd, 0x19, - 0x3f, 0x12, 0xe3, 0x8d, 0xdf, 0x82, 0x0a, 0xf3, 0x85, 0xa5, 0x4c, 0x29, 0x89, 0x64, 0x48, 0x84, - 0x89, 0xb7, 0xeb, 0xc8, 0x41, 0x84, 0x1e, 0x52, 0x97, 0xda, 0x06, 0x8d, 0x4a, 0x79, 0x5f, 0x12, - 0x93, 0x19, 0x1b, 0xfc, 0x00, 0xd6, 0x5c, 0xc7, 0xa2, 0x84, 0x1e, 0x8a, 0xba, 0x5f, 0x92, 0xe3, - 0xac, 0x0c, 0x49, 0x40, 0x4b, 0x42, 0x26, 0xea, 0x5f, 0x10, 0x5c, 0x99, 0x0f, 0xf6, 0x7d, 0x93, - 0x79, 0xf8, 0x6b, 0x73, 0x01, 0xd7, 0x96, 0x0b, 0x38, 0xa7, 0x16, 0xe1, 0x9e, 0x19, 0x12, 0x9e, - 0xc4, 0x82, 0xdd, 0x83, 0x55, 0xd3, 0xa3, 0xc3, 0xb0, 0x4a, 0xbe, 0x94, 0x23, 0x00, 0xf3, 0xfa, - 0x46, 0xd5, 0xb2, 0xcb, 0x79, 0x92, 0x80, 0xb5, 0xfa, 0x27, 0x04, 0xf5, 0x18, 0xf2, 0x39, 0x58, - 0xf5, 0xd5, 0xa4, 0x55, 0x37, 0x4f, 0x68, 0x55, 0xb6, 0x39, 0x3f, 0x45, 0xb0, 0x11, 0xdc, 0x28, - 0x94, 0x79, 0xae, 0x19, 0x5c, 0x6c, 0x2a, 0x94, 0x45, 0xc6, 0x31, 0x05, 0xb5, 0x8a, 0x9b, 0xd5, - 0x2e, 0x4c, 0x27, 0xcd, 0xb2, 0xc0, 0x62, 0x44, 0x42, 0xf0, 0x37, 0xa0, 0x6c, 0xe9, 0x3d, 0x6a, - 0x85, 0x6a, 0xbd, 0xb6, 0xa4, 0xc5, 0x9c, 0x66, 0x9f, 0x5a, 0xd4, 0xf0, 0x1c, 0x37, 0xba, 0x2e, - 0xc3, 0x13, 0x46, 0x24, 0x57, 0xb5, 0x09, 0x37, 0x76, 0xd9, 0x1e, 0x75, 0x19, 0x2f, 0x0b, 0x99, - 0xb4, 0x1d, 0xc3, 0xa0, 0x8c, 0x11, 0x3a, 0x36, 0xe9, 0x23, 0xd5, 0x82, 0x6b, 0xf7, 0x1d, 0x43, - 0xb7, 0xc2, 0xc6, 0x1c, 0x07, 0xe2, 0x87, 0xe1, 0x25, 0x2d, 0xe3, 0xb1, 0x95, 0xc3, 0x69, 0x01, - 0x61, 0xb7, 0xc4, 0x75, 0x23, 0x65, 0x5d, 0x7c, 0xa9, 0x3f, 0x29, 0x80, 0x22, 0xc4, 0x65, 0xa8, - 0xf2, 0x91, 0x4b, 0xe3, 0x17, 0x19, 0xef, 0x2d, 0xe9, 0x41, 0x81, 0xb7, 0x1e, 0x22, 0x20, 0xf8, - 0xd3, 0xb3, 0x10, 0x15, 0x45, 0x88, 0xea, 0xd3, 0x49, 0xb3, 0x16, 0x84, 0x68, 0xdf, 0x32, 0x0d, - 0x3a, 0x8b, 0xd3, 0xd7, 0xa1, 0xcc, 0x0c, 0x67, 0x44, 0x99, 0x18, 0x05, 0x6a, 0xdb, 0xb7, 0x4f, - 0xd0, 0x95, 0xf6, 0x05, 0x83, 0x20, 0x0d, 0x82, 0xdf, 0x44, 0x32, 0x55, 0x7f, 0x8c, 0x60, 0x83, - 0x37, 0xa6, 0x83, 0xf8, 0x7d, 0xd8, 0x82, 0x12, 0x1f, 0x7a, 0xe4, 0x4c, 0x34, 0x53, 0x5f, 0xcc, - 0x02, 0x02, 0x82, 0xdf, 0x85, 0x12, 0xef, 0x16, 0xb2, 0x23, 0x9f, 0x34, 0xa5, 0x67, 0x9c, 0x45, - 0x0b, 0x12, 0x1c, 0xd5, 0x5f, 0x23, 0xb8, 0x9a, 0x56, 0x28, 0xbc, 0x6e, 0x8e, 0xd7, 0xcb, 0x83, - 0x9a, 0x1b, 0x11, 0x48, 0xf5, 0x4e, 0xd9, 0x47, 0x2e, 0x49, 0x39, 0xb5, 0xd8, 0x21, 0x89, 0x8b, - 0x51, 0x9f, 0x20, 0x10, 0x03, 0xe3, 0xc1, 0x92, 0xde, 0x7b, 0x2b, 0xe1, 0xbd, 0x76, 0x0e, 0xf5, - 0x16, 0xba, 0xed, 0x97, 0x61, 0x1c, 0xf3, 0xf9, 0x6b, 0x98, 0xe5, 0xaf, 0x9b, 0x79, 0x15, 0x5a, - 0xda, 0x51, 0x77, 0x60, 0x3d, 0x71, 0x53, 0xe2, 0x66, 0xd8, 0x1b, 0x83, 0x46, 0x55, 0x4d, 0xf7, - 0xb7, 0x3b, 0x95, 0x9f, 0xfd, 0xbc, 0xb9, 0xf2, 0xe4, 0xaf, 0xad, 0x15, 0xf5, 0x75, 0xb8, 0x98, - 0xcc, 0xe7, 0x3c, 0xc4, 0x3f, 0x2a, 0x02, 0x44, 0x83, 0x14, 0xa7, 0xe4, 0xe3, 0x7a, 0x82, 0x92, - 0x4f, 0xf1, 0x8c, 0x04, 0xe7, 0xf8, 0x07, 0x08, 0x5e, 0xd6, 0x3d, 0xcf, 0x35, 0x7b, 0xbe, 0x47, - 0x63, 0xad, 0x35, 0x9c, 0x41, 0x72, 0x8e, 0xbc, 0x37, 0xa4, 0x67, 0x5e, 0xee, 0x64, 0xf1, 0x24, - 0xd9, 0xa2, 0xf0, 0x67, 0xa0, 0xaa, 0x8f, 0xcc, 0x7b, 0xf1, 0x36, 0x21, 0x26, 0x98, 0x70, 0x65, - 0x60, 0x24, 0x82, 0x73, 0xe4, 0x70, 0x4a, 0x0f, 0x06, 0x0b, 0x89, 0x1c, 0xb6, 0x57, 0x46, 0x22, - 0x38, 0xfe, 0x22, 0xac, 0xc7, 0x47, 0x7a, 0xa6, 0xac, 0x0a, 0x82, 0x97, 0xa6, 0x93, 0xe6, 0x7a, - 0x7c, 0xf2, 0x67, 0x24, 0x89, 0x87, 0xbb, 0x50, 0xb7, 0x13, 0xb3, 0x34, 0x53, 0xca, 0x82, 0x54, - 0x99, 0x4e, 0x9a, 0x97, 0x93, 0x63, 0xb6, 0x6c, 0x64, 0x69, 0x02, 0xb5, 0x0f, 0x97, 0xcf, 0xa7, - 0xe7, 0xff, 0x0d, 0xc1, 0xc7, 0xb3, 0x24, 0x11, 0xca, 0x46, 0x8e, 0xcd, 0x68, 0xfe, 0x05, 0xf0, - 0x93, 0xb0, 0xca, 0xbb, 0x77, 0x70, 0x67, 0x56, 0x83, 0x39, 0x8f, 0x37, 0x75, 0x69, 0x6a, 0x00, - 0x5c, 0xbe, 0xb7, 0xbf, 0x01, 0x17, 0xe9, 0x58, 0xb7, 0x7c, 0xae, 0xed, 0x8e, 0xeb, 0x3a, 0xae, - 0x5c, 0xf7, 0xae, 0x4a, 0x25, 0xea, 0x3b, 0x1c, 0xaa, 0xcf, 0xc0, 0x24, 0x85, 0xae, 0xfe, 0x11, - 0x41, 0xe9, 0x7f, 0x7f, 0x83, 0x51, 0x9f, 0x17, 0xa1, 0xf6, 0x62, 0xad, 0xf8, 0x7f, 0x5f, 0x2b, - 0xf8, 0xe4, 0x7d, 0xbe, 0xfb, 0xc4, 0x29, 0x26, 0xef, 0xe3, 0x17, 0x89, 0xe7, 0x08, 0xae, 0xc4, - 0x2f, 0xba, 0xd8, 0xfc, 0x7d, 0xf6, 0xf9, 0xdb, 0x87, 0x12, 0x1b, 0x51, 0x43, 0xa6, 0xee, 0xce, - 0xc9, 0x0c, 0x8b, 0xa9, 0xbc, 0x3f, 0xa2, 0x46, 0x34, 0x20, 0xf0, 0x2f, 0x22, 0x04, 0xa8, 0x53, - 0x04, 0xd7, 0xb3, 0x49, 0xce, 0x21, 0x7e, 0x87, 0xc9, 0xf8, 0x75, 0x4e, 0x6d, 0xe6, 0x82, 0x50, - 0xfe, 0xae, 0xb8, 0xc8, 0x48, 0xee, 0x09, 0xfc, 0x18, 0xea, 0xbc, 0xa4, 0xdd, 0xe8, 0x58, 0xda, - 0x7a, 0x27, 0x87, 0x42, 0x62, 0xf6, 0x8f, 0x69, 0x22, 0xde, 0x5d, 0x52, 0x87, 0x24, 0x2d, 0x07, - 0x7f, 0x0f, 0x36, 0x44, 0x91, 0xc7, 0x65, 0x07, 0x31, 0x7f, 0x3d, 0x87, 0xec, 0xf4, 0x82, 0xd8, - 0xbd, 0x3c, 0x9d, 0x34, 0xe7, 0xd6, 0x46, 0x32, 0x27, 0x0a, 0xff, 0x02, 0xc1, 0x35, 0x46, 0xdd, - 0xb1, 0x69, 0x50, 0xdd, 0x30, 0x1c, 0xdf, 0xf6, 0xe2, 0x8a, 0x04, 0xfd, 0xec, 0xcd, 0x1c, 0x8a, - 0xec, 0x07, 0xbc, 0x3a, 0x01, 0xaf, 0xb8, 0x46, 0x37, 0xa6, 0x93, 0xe6, 0xb5, 0x85, 0x60, 0xb2, - 0x58, 0x0b, 0xf5, 0x0f, 0x08, 0x2a, 0xe7, 0xb4, 0xc9, 0x7f, 0x25, 0x99, 0x8f, 0xb9, 0x07, 0xf7, - 0xec, 0xec, 0xfb, 0x37, 0x82, 0x2b, 0xfb, 0xd4, 0x3a, 0x94, 0x2d, 0x38, 0xb8, 0x19, 0x83, 0x91, - 0x28, 0x2c, 0x73, 0x94, 0xbb, 0xcc, 0xb3, 0x19, 0x2e, 0x2a, 0x73, 0x7c, 0x04, 0x65, 0xe6, 0xe9, - 0x9e, 0x1f, 0x5e, 0x86, 0x77, 0xf3, 0x88, 0x9a, 0x17, 0x23, 0x58, 0x75, 0x2f, 0x4a, 0x41, 0xe5, - 0xe0, 0x9b, 0x48, 0x11, 0xea, 0x77, 0xe1, 0xfa, 0x62, 0xf5, 0x62, 0x0b, 0x2f, 0x3a, 0x8b, 0x85, - 0xd7, 0x82, 0xab, 0xe9, 0x34, 0x93, 0x57, 0xd7, 0x12, 0xeb, 0x52, 0x62, 0x60, 0x2c, 0x1c, 0x3f, - 0x30, 0xaa, 0x7f, 0x46, 0xb0, 0x38, 0xab, 0xf1, 0x0f, 0x11, 0xd4, 0x93, 0x89, 0x1d, 0x6c, 0x24, - 0xb5, 0xed, 0xee, 0x29, 0x8a, 0x2a, 0xbc, 0x89, 0x67, 0x53, 0x64, 0x12, 0x81, 0x91, 0xb4, 0x4c, - 0xac, 0x01, 0xcc, 0x54, 0x4e, 0xcc, 0xb6, 0x33, 0x9b, 0x18, 0x89, 0x61, 0xa8, 0xef, 0x17, 0xe0, - 0xd2, 0x8b, 0x77, 0x94, 0x44, 0x5a, 0xfd, 0x03, 0xc1, 0xc7, 0x32, 0x5c, 0x72, 0xf2, 0x55, 0xe3, - 0x15, 0x58, 0xd3, 0x2d, 0xcb, 0x79, 0x44, 0x0f, 0x84, 0xf5, 0x95, 0x68, 0xb0, 0xea, 0x04, 0xc7, - 0x24, 0x84, 0xe3, 0x4f, 0x41, 0xd9, 0xa5, 0x3a, 0x93, 0x1d, 0xb9, 0x1a, 0xd5, 0x1d, 0x11, 0xa7, - 0x44, 0x42, 0x71, 0x07, 0xea, 0x34, 0xb9, 0x50, 0x1c, 0xb7, 0x6f, 0xa4, 0xf1, 0xd5, 0x7f, 0x22, - 0xc0, 0x19, 0x7d, 0xca, 0x48, 0xf4, 0xa9, 0xce, 0xe9, 0x9a, 0xc7, 0x7f, 0x45, 0x8f, 0xfa, 0x3d, - 0x6f, 0xca, 0xd9, 0x0d, 0x2a, 0x4c, 0x4a, 0xb4, 0x30, 0x29, 0xa3, 0xf7, 0xd7, 0xc2, 0xc2, 0xf7, - 0xd7, 0x28, 0x1f, 0x8b, 0x67, 0x91, 0x8f, 0xbf, 0x45, 0xa0, 0x2c, 0x32, 0x3a, 0xda, 0xe5, 0xd0, - 0x47, 0xff, 0x6f, 0x54, 0x46, 0x92, 0x15, 0x72, 0x26, 0xd9, 0x6f, 0x10, 0xa4, 0x27, 0x23, 0xdc, - 0x0c, 0x37, 0xef, 0xd8, 0x8b, 0x8d, 0xd8, 0xbc, 0xc3, 0xa5, 0x7b, 0x19, 0x9f, 0x47, 0x6f, 0xde, - 0xc5, 0xb3, 0x78, 0xf3, 0xee, 0x6e, 0x3e, 0x7d, 0xd6, 0x58, 0xf9, 0xe0, 0x59, 0x63, 0xe5, 0xc3, - 0x67, 0x8d, 0x95, 0x27, 0xd3, 0x06, 0x7a, 0x3a, 0x6d, 0xa0, 0x0f, 0xa6, 0x0d, 0xf4, 0xe1, 0xb4, - 0x81, 0xfe, 0x3e, 0x6d, 0xa0, 0xf7, 0x9f, 0x37, 0x56, 0xde, 0x2b, 0x8c, 0xb7, 0xfe, 0x13, 0x00, - 0x00, 0xff, 0xff, 0xf9, 0xd9, 0xfd, 0x26, 0x37, 0x20, 0x00, 0x00, + // 1821 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x19, 0xcd, 0x6f, 0x1b, 0x59, + 0x3d, 0xcf, 0x76, 0x1c, 0xfb, 0xe7, 0x26, 0xce, 0xbe, 0x66, 0xdb, 0x69, 0xa0, 0xb6, 0x35, 0x20, + 0xc8, 0x0a, 0x76, 0x4c, 0x02, 0x94, 0xb6, 0x2b, 0xb4, 0xb2, 0xbb, 0x51, 0x15, 0xa9, 0xb4, 0xd9, + 0x17, 0x76, 0xb5, 0x5a, 0x3e, 0xc4, 0x78, 0xf2, 0x62, 0x0f, 0x19, 0xcf, 0x58, 0xf3, 0xc6, 0x2e, + 0x05, 0x21, 0x15, 0x24, 0x0e, 0x5c, 0xd0, 0x5e, 0x40, 0x1c, 0x41, 0xfc, 0x01, 0x88, 0x0b, 0x12, + 0x48, 0x70, 0xe2, 0xd0, 0x03, 0x87, 0x95, 0xb8, 0x54, 0x08, 0x19, 0xea, 0x22, 0x0e, 0x1c, 0xf8, + 0x1b, 0xd0, 0x7b, 0xf3, 0xc6, 0xf3, 0xe1, 0xb1, 0xe2, 0x49, 0x9a, 0x08, 0x56, 0xbd, 0x79, 0xde, + 0xef, 0xfb, 0xf3, 0xfd, 0x7e, 0xcf, 0x70, 0xab, 0x6b, 0x7a, 0xbd, 0x61, 0x47, 0x33, 0x9c, 0x7e, + 0xd3, 0x19, 0x50, 0x9b, 0xf5, 0xcc, 0x23, 0xaf, 0xa9, 0x0f, 0xcc, 0xa6, 0x3e, 0xf4, 0x7a, 0x8e, + 0x6b, 0x7e, 0x57, 0xf7, 0x4c, 0xc7, 0x6e, 0x8e, 0xb6, 0x9b, 0x5d, 0x6a, 0x53, 0x57, 0xf7, 0xe8, + 0xa1, 0x36, 0x70, 0x1d, 0xcf, 0xc1, 0xaf, 0x85, 0xa4, 0xda, 0x94, 0x54, 0xd3, 0x07, 0xa6, 0x16, + 0x23, 0xd5, 0x46, 0xdb, 0x9b, 0xaf, 0x47, 0xa4, 0x74, 0x9d, 0xae, 0xd3, 0x14, 0x1c, 0x3a, 0xc3, + 0x23, 0xf1, 0x25, 0x3e, 0xc4, 0x2f, 0x9f, 0xf3, 0xa6, 0x7a, 0x7c, 0x93, 0x69, 0xa6, 0x23, 0xd4, + 0x30, 0x1c, 0x97, 0xa6, 0x48, 0x8f, 0xe1, 0xb8, 0x1d, 0xdd, 0x48, 0xc3, 0xf9, 0x42, 0x88, 0xd3, + 0xd7, 0x8d, 0x9e, 0x69, 0x53, 0xf7, 0x51, 0x73, 0x70, 0xdc, 0xe5, 0x07, 0xac, 0xd9, 0xa7, 0x9e, + 0x9e, 0x46, 0xd5, 0x9c, 0x47, 0xe5, 0x0e, 0x6d, 0xcf, 0xec, 0xd3, 0x19, 0x82, 0x1b, 0x27, 0x11, + 0x30, 0xa3, 0x47, 0xfb, 0x7a, 0x92, 0x4e, 0xfd, 0x41, 0x01, 0x8a, 0x2d, 0x83, 0xfb, 0x08, 0x37, + 0xa1, 0x6c, 0xeb, 0x7d, 0xca, 0x06, 0xba, 0x41, 0x15, 0xd4, 0x40, 0x5b, 0xe5, 0xf6, 0x2b, 0x4f, + 0xc6, 0xf5, 0xa5, 0xc9, 0xb8, 0x5e, 0xbe, 0x1f, 0x00, 0x48, 0x88, 0x83, 0x1b, 0x50, 0x18, 0x51, + 0xb7, 0xa3, 0xe4, 0x04, 0xee, 0x25, 0x89, 0x5b, 0x78, 0x97, 0xba, 0x1d, 0x22, 0x20, 0xf8, 0x16, + 0xac, 0xbb, 0x94, 0x39, 0x43, 0xd7, 0xa0, 0xad, 0xfd, 0xbd, 0xbb, 0xae, 0x33, 0x1c, 0x28, 0x79, + 0x81, 0xbd, 0x2a, 0xb1, 0x97, 0xc5, 0x21, 0x99, 0x41, 0xc3, 0x6f, 0x02, 0x8e, 0x9c, 0xbd, 0x4b, + 0x5d, 0x66, 0x3a, 0xb6, 0x52, 0x10, 0xc4, 0x55, 0x49, 0xbc, 0x22, 0x8f, 0x49, 0x0a, 0x2a, 0xfe, + 0x2c, 0x94, 0x82, 0x53, 0x65, 0x59, 0x90, 0xad, 0x4b, 0xb2, 0x12, 0x91, 0xe7, 0x64, 0x8a, 0x81, + 0x6f, 0xc2, 0xa5, 0xe0, 0x37, 0xb7, 0x55, 0x29, 0x0a, 0x8a, 0x0d, 0x49, 0x71, 0x89, 0x44, 0x60, + 0x24, 0x86, 0x89, 0xdf, 0x83, 0x15, 0xc3, 0xb1, 0x3d, 0x6a, 0x7b, 0xca, 0x4a, 0x03, 0x6d, 0x55, + 0x76, 0x5e, 0xd7, 0xfc, 0x58, 0x68, 0xd1, 0x58, 0x68, 0x83, 0xe3, 0xae, 0x26, 0x63, 0xa1, 0x11, + 0xfd, 0xe1, 0xee, 0x77, 0x3c, 0x6a, 0x73, 0x3d, 0x43, 0x63, 0xee, 0xf8, 0x5c, 0x48, 0xc0, 0x8e, + 0xfb, 0x77, 0xa0, 0x7b, 0x3d, 0xa5, 0x14, 0xf7, 0xef, 0xbe, 0xee, 0xf5, 0x88, 0x80, 0xe0, 0xb7, + 0x60, 0xdd, 0x64, 0xf7, 0x1d, 0x3b, 0x50, 0xef, 0x1d, 0x72, 0x4f, 0x29, 0x37, 0xd0, 0x56, 0xa9, + 0xad, 0x48, 0xec, 0xf5, 0xbd, 0x04, 0x9c, 0xcc, 0x50, 0xa8, 0xbf, 0xce, 0x41, 0xe5, 0x8e, 0x35, + 0x64, 0x1e, 0x75, 0x89, 0x63, 0x51, 0xfc, 0x2d, 0x28, 0xf1, 0xbc, 0x3c, 0xd4, 0x3d, 0x5d, 0xe4, + 0x41, 0x65, 0xe7, 0x73, 0x73, 0x4d, 0xe2, 0x59, 0xac, 0x71, 0x6c, 0x6d, 0xb4, 0xad, 0x3d, 0xe8, + 0x7c, 0x9b, 0x1a, 0xde, 0x57, 0xa8, 0xa7, 0xb7, 0xb1, 0x94, 0x0f, 0xe1, 0x19, 0x99, 0x72, 0xc5, + 0xef, 0xc3, 0xb2, 0x3b, 0xb4, 0x28, 0x53, 0x72, 0x8d, 0xfc, 0x56, 0x65, 0xe7, 0x8b, 0xda, 0xc2, + 0x65, 0xac, 0xed, 0x3b, 0x96, 0x69, 0x3c, 0x22, 0x43, 0x8b, 0x86, 0x39, 0xc4, 0xbf, 0x18, 0xf1, + 0x59, 0xe2, 0x0e, 0x54, 0xf5, 0x6e, 0xd7, 0xa5, 0x5d, 0x41, 0xc2, 0x41, 0x22, 0xe5, 0x2a, 0x3b, + 0x9f, 0x88, 0x18, 0xa1, 0xf1, 0x72, 0xe5, 0xec, 0x5a, 0x71, 0xd4, 0xf6, 0xe5, 0xc9, 0xb8, 0x5e, + 0x4d, 0x1c, 0x92, 0x24, 0x43, 0xf5, 0xdf, 0x79, 0xc0, 0x11, 0x8f, 0xb5, 0x4d, 0xfb, 0xd0, 0xb4, + 0xbb, 0x17, 0xe0, 0x38, 0x0a, 0xe5, 0x21, 0xa3, 0xae, 0x28, 0x47, 0x51, 0x77, 0x95, 0x9d, 0x9b, + 0x19, 0x9c, 0xf7, 0x60, 0xc0, 0x7f, 0xe9, 0x96, 0xa0, 0x6f, 0xaf, 0xf2, 0xca, 0x7e, 0x27, 0x60, + 0x47, 0x42, 0xce, 0xb8, 0x07, 0xd0, 0xe5, 0x55, 0xe8, 0xcb, 0xc9, 0x9f, 0x51, 0xce, 0x1a, 0x37, + 0xe7, 0xee, 0x94, 0x1f, 0x89, 0xf0, 0xc6, 0x6f, 0x43, 0x89, 0x0d, 0x85, 0xa5, 0x4c, 0x29, 0x88, + 0x64, 0x88, 0x85, 0x89, 0x77, 0xde, 0xd0, 0x41, 0x84, 0x1e, 0x51, 0x97, 0xda, 0x06, 0x0d, 0x4b, + 0xf9, 0x40, 0x12, 0x93, 0x29, 0x1b, 0x7c, 0x1f, 0x56, 0x5c, 0xc7, 0xa2, 0x84, 0x1e, 0x89, 0xba, + 0x5f, 0x90, 0xe3, 0xb4, 0x0c, 0x89, 0x4f, 0x4b, 0x02, 0x26, 0xea, 0x5f, 0x11, 0x5c, 0x99, 0x0d, + 0xf6, 0x3d, 0x93, 0x79, 0xf8, 0xeb, 0x33, 0x01, 0xd7, 0x16, 0x0b, 0x38, 0xa7, 0x16, 0xe1, 0x9e, + 0x1a, 0x12, 0x9c, 0x44, 0x82, 0xdd, 0x81, 0x65, 0xd3, 0xa3, 0xfd, 0xa0, 0x4a, 0xbe, 0x9c, 0x21, + 0x00, 0xb3, 0xfa, 0x86, 0xd5, 0xb2, 0xc7, 0x79, 0x12, 0x9f, 0xb5, 0xfa, 0x67, 0x04, 0xd5, 0x08, + 0xf2, 0x05, 0x58, 0xf5, 0xb5, 0xb8, 0x55, 0x37, 0x4e, 0x69, 0x55, 0xba, 0x39, 0x3f, 0x43, 0xb0, + 0xee, 0xdf, 0x28, 0x94, 0x79, 0xae, 0xe9, 0x5f, 0x6c, 0x2a, 0x14, 0x45, 0xc6, 0x31, 0x05, 0x35, + 0xf2, 0x5b, 0xe5, 0x36, 0x4c, 0xc6, 0xf5, 0xa2, 0xc0, 0x62, 0x44, 0x42, 0xf0, 0x37, 0xa1, 0x68, + 0xe9, 0x1d, 0x6a, 0x05, 0x6a, 0x7d, 0x7e, 0x41, 0x8b, 0x39, 0xcd, 0x01, 0xb5, 0xa8, 0xe1, 0x39, + 0x6e, 0x78, 0x5d, 0x06, 0x27, 0x8c, 0x48, 0xae, 0x6a, 0x1d, 0xae, 0xef, 0xb1, 0x7d, 0xea, 0x32, + 0x5e, 0x16, 0x32, 0x69, 0x5b, 0x86, 0x41, 0x19, 0x23, 0x74, 0x64, 0xd2, 0x87, 0xaa, 0x05, 0xd7, + 0xee, 0x39, 0x86, 0x6e, 0x05, 0x8d, 0x39, 0x0a, 0xc4, 0x0f, 0x82, 0x4b, 0x5a, 0xc6, 0x63, 0x3b, + 0x83, 0xd3, 0x7c, 0xc2, 0x76, 0x81, 0xeb, 0x46, 0x8a, 0xba, 0xf8, 0x52, 0x7f, 0x9a, 0x03, 0x45, + 0x88, 0x4b, 0x51, 0xe5, 0x85, 0x4b, 0xe3, 0x17, 0x19, 0xef, 0x2d, 0xc9, 0x41, 0x81, 0xb7, 0x1e, + 0x22, 0x20, 0xf8, 0xd3, 0xd3, 0x10, 0xe5, 0x45, 0x88, 0xaa, 0x93, 0x71, 0xbd, 0xe2, 0x87, 0xe8, + 0xc0, 0x32, 0x0d, 0x3a, 0x8d, 0xd3, 0x37, 0xa0, 0xc8, 0x0c, 0x67, 0x40, 0x99, 0x18, 0x05, 0x2a, + 0x3b, 0xb7, 0x4e, 0xd1, 0x95, 0x0e, 0x04, 0x03, 0x3f, 0x0d, 0xfc, 0xdf, 0x44, 0x32, 0x55, 0x7f, + 0x82, 0x60, 0x9d, 0x37, 0xa6, 0xc3, 0xe8, 0x7d, 0xd8, 0x80, 0x02, 0x1f, 0x7a, 0xe4, 0x4c, 0x34, + 0x55, 0x5f, 0xcc, 0x02, 0x02, 0x82, 0xdf, 0x83, 0x02, 0xef, 0x16, 0xb2, 0x23, 0x9f, 0x36, 0xa5, + 0xa7, 0x9c, 0x45, 0x0b, 0x12, 0x1c, 0xd5, 0xdf, 0x20, 0xb8, 0x9a, 0x54, 0x28, 0xb8, 0x6e, 0x4e, + 0xd6, 0xcb, 0x83, 0x8a, 0x1b, 0x12, 0x48, 0xf5, 0xce, 0xd8, 0x47, 0x2e, 0x4b, 0x39, 0x95, 0xc8, + 0x21, 0x89, 0x8a, 0x51, 0x1f, 0x23, 0x10, 0x03, 0xe3, 0xe1, 0x82, 0xde, 0x7b, 0x3b, 0xe6, 0xbd, + 0x66, 0x06, 0xf5, 0xe6, 0xba, 0xed, 0x57, 0x41, 0x1c, 0xb3, 0xf9, 0xab, 0x9f, 0xe6, 0xaf, 0x1b, + 0x59, 0x15, 0x5a, 0xd8, 0x51, 0xb7, 0x61, 0x35, 0x76, 0x53, 0xe2, 0x7a, 0xd0, 0x1b, 0xfd, 0x46, + 0x55, 0x4e, 0xf6, 0xb7, 0xdb, 0xa5, 0x9f, 0xff, 0xa2, 0xbe, 0xf4, 0xf8, 0x6f, 0x8d, 0x25, 0xf5, + 0x0d, 0x58, 0x8b, 0xe7, 0x73, 0x16, 0xe2, 0x1f, 0xe7, 0x01, 0xc2, 0x41, 0x8a, 0x53, 0xf2, 0x71, + 0x3d, 0x46, 0xc9, 0xa7, 0x78, 0x46, 0xfc, 0x73, 0xfc, 0x43, 0x04, 0xaf, 0xea, 0x9e, 0xe7, 0x9a, + 0x9d, 0xa1, 0x47, 0x23, 0xad, 0x35, 0x98, 0x41, 0x32, 0x8e, 0xbc, 0xd7, 0xa5, 0x67, 0x5e, 0x6d, + 0xa5, 0xf1, 0x24, 0xe9, 0xa2, 0xf0, 0x67, 0xa0, 0xac, 0x0f, 0xcc, 0xbb, 0xd1, 0x36, 0x21, 0x26, + 0x98, 0x60, 0x65, 0x60, 0x24, 0x84, 0x73, 0xe4, 0x60, 0x4a, 0xf7, 0x07, 0x0b, 0x89, 0x1c, 0xb4, + 0x57, 0x46, 0x42, 0x38, 0xfe, 0x12, 0xac, 0x46, 0x47, 0x7a, 0xa6, 0x2c, 0x0b, 0x82, 0x57, 0x26, + 0xe3, 0xfa, 0x6a, 0x74, 0xf2, 0x67, 0x24, 0x8e, 0x87, 0xdb, 0x50, 0xb5, 0x63, 0xb3, 0x34, 0x53, + 0x8a, 0x82, 0x54, 0x99, 0x8c, 0xeb, 0x1b, 0xf1, 0x31, 0x5b, 0x36, 0xb2, 0x24, 0x81, 0xda, 0x85, + 0x8d, 0x8b, 0xe9, 0xf9, 0x7f, 0x47, 0xf0, 0xf1, 0x34, 0x49, 0x84, 0xb2, 0x81, 0x63, 0x33, 0x9a, + 0x7d, 0x01, 0xfc, 0x24, 0x2c, 0xf3, 0xee, 0xed, 0xdf, 0x99, 0x65, 0x7f, 0xce, 0xe3, 0x4d, 0x5d, + 0x9a, 0xea, 0x03, 0x17, 0xef, 0xed, 0x6f, 0xc2, 0x1a, 0x1d, 0xe9, 0xd6, 0x90, 0x6b, 0xbb, 0xeb, + 0xba, 0x8e, 0x2b, 0xd7, 0xbd, 0xab, 0x52, 0x89, 0xea, 0x2e, 0x87, 0xea, 0x53, 0x30, 0x49, 0xa0, + 0xab, 0x7f, 0x42, 0x50, 0xf8, 0xff, 0xdf, 0x60, 0xd4, 0xe7, 0x79, 0xa8, 0xbc, 0x5c, 0x2b, 0x3e, + 0xea, 0x6b, 0x05, 0x9f, 0xbc, 0x2f, 0x76, 0x9f, 0x38, 0xc3, 0xe4, 0x7d, 0xf2, 0x22, 0xf1, 0x1c, + 0xc1, 0x95, 0xe8, 0x45, 0x17, 0x99, 0xbf, 0xcf, 0x3f, 0x7f, 0xbb, 0x50, 0x60, 0x03, 0x6a, 0xc8, + 0xd4, 0xdd, 0x3d, 0x9d, 0x61, 0x11, 0x95, 0x0f, 0x06, 0xd4, 0x08, 0x07, 0x04, 0xfe, 0x45, 0x84, + 0x00, 0x75, 0x82, 0x60, 0x33, 0x9d, 0xe4, 0x02, 0xe2, 0x77, 0x14, 0x8f, 0x5f, 0xeb, 0xcc, 0x66, + 0xce, 0x09, 0xe5, 0xef, 0xf3, 0xf3, 0x8c, 0xe4, 0x9e, 0xc0, 0x8f, 0xa0, 0xca, 0x4b, 0xda, 0x0d, + 0x8f, 0xa5, 0xad, 0xb7, 0x33, 0x28, 0x24, 0x66, 0xff, 0x88, 0x26, 0xe2, 0xdd, 0x25, 0x71, 0x48, + 0x92, 0x72, 0xf0, 0xf7, 0x61, 0x5d, 0x14, 0x79, 0x54, 0xb6, 0x1f, 0xf3, 0x37, 0x32, 0xc8, 0x4e, + 0x2e, 0x88, 0xed, 0x8d, 0xc9, 0xb8, 0x3e, 0xb3, 0x36, 0x92, 0x19, 0x51, 0xf8, 0x97, 0x08, 0xae, + 0x31, 0xea, 0x8e, 0x4c, 0x83, 0xea, 0x86, 0xe1, 0x0c, 0x6d, 0x2f, 0xaa, 0x88, 0xdf, 0xcf, 0xde, + 0xca, 0xa0, 0xc8, 0x81, 0xcf, 0xab, 0xe5, 0xf3, 0x8a, 0x6a, 0x74, 0x7d, 0x32, 0xae, 0x5f, 0x9b, + 0x0b, 0x26, 0xf3, 0xb5, 0x50, 0xff, 0x88, 0xa0, 0x74, 0x41, 0x9b, 0xfc, 0x57, 0xe3, 0xf9, 0x98, + 0x79, 0x70, 0x4f, 0xcf, 0xbe, 0xff, 0x20, 0xb8, 0x72, 0x40, 0xad, 0x23, 0xd9, 0x82, 0xfd, 0x9b, + 0xd1, 0x1f, 0x89, 0x82, 0x32, 0x47, 0x99, 0xcb, 0x3c, 0x9d, 0xe1, 0xbc, 0x32, 0xc7, 0xc7, 0x50, + 0x64, 0x9e, 0xee, 0x0d, 0x83, 0xcb, 0xf0, 0x4e, 0x16, 0x51, 0xb3, 0x62, 0x04, 0xab, 0xf6, 0x9a, + 0x14, 0x54, 0xf4, 0xbf, 0x89, 0x14, 0xa1, 0x7e, 0x0f, 0x36, 0xe7, 0xab, 0x17, 0x59, 0x78, 0xd1, + 0x79, 0x2c, 0xbc, 0x16, 0x5c, 0x4d, 0xa6, 0x99, 0xbc, 0xba, 0x16, 0x58, 0x97, 0x62, 0x03, 0x63, + 0xee, 0xe4, 0x81, 0x51, 0xfd, 0x0b, 0x82, 0xf9, 0x59, 0x8d, 0x7f, 0x84, 0xa0, 0x1a, 0x4f, 0x6c, + 0x7f, 0x23, 0xa9, 0xec, 0xb4, 0xcf, 0x50, 0x54, 0xc1, 0x4d, 0x3c, 0x9d, 0x22, 0xe3, 0x08, 0x8c, + 0x24, 0x65, 0x62, 0x0d, 0x60, 0xaa, 0x72, 0x6c, 0xb6, 0x9d, 0xda, 0xc4, 0x48, 0x04, 0x43, 0xfd, + 0x20, 0x07, 0x97, 0x5f, 0xbe, 0xa3, 0xc4, 0xd2, 0xea, 0x9f, 0x08, 0x3e, 0x96, 0xe2, 0x92, 0xd3, + 0xaf, 0x1a, 0xaf, 0xc1, 0x8a, 0x6e, 0x59, 0xce, 0x43, 0x7a, 0x28, 0xac, 0x2f, 0x85, 0x83, 0x55, + 0xcb, 0x3f, 0x26, 0x01, 0x1c, 0x7f, 0x0a, 0x8a, 0x2e, 0xd5, 0x99, 0xec, 0xc8, 0xe5, 0xb0, 0xee, + 0x88, 0x38, 0x25, 0x12, 0x8a, 0x5b, 0x50, 0xa5, 0xf1, 0x85, 0xe2, 0xa4, 0x7d, 0x23, 0x89, 0xaf, + 0xfe, 0x0b, 0x01, 0x4e, 0xe9, 0x53, 0x46, 0xac, 0x4f, 0xb5, 0xce, 0xd6, 0x3c, 0xfe, 0x27, 0x7a, + 0xd4, 0x1f, 0x78, 0x53, 0x4e, 0x6f, 0x50, 0x41, 0x52, 0xa2, 0xb9, 0x49, 0x19, 0xbe, 0xbf, 0xe6, + 0xe6, 0xbe, 0xbf, 0x86, 0xf9, 0x98, 0x3f, 0x8f, 0x7c, 0xfc, 0x1d, 0x02, 0x65, 0x9e, 0xd1, 0xe1, + 0x2e, 0x87, 0x5e, 0xfc, 0xbf, 0x51, 0x29, 0x49, 0x96, 0xcb, 0x98, 0x64, 0xbf, 0x45, 0x90, 0x9c, + 0x8c, 0x70, 0x3d, 0xd8, 0xbc, 0x23, 0x2f, 0x36, 0x62, 0xf3, 0x0e, 0x96, 0xee, 0x45, 0x7c, 0x1e, + 0xbe, 0x79, 0xe7, 0xcf, 0xe3, 0xcd, 0xbb, 0xbd, 0xf5, 0xe4, 0x59, 0x6d, 0xe9, 0xc3, 0x67, 0xb5, + 0xa5, 0xa7, 0xcf, 0x6a, 0x4b, 0x8f, 0x27, 0x35, 0xf4, 0x64, 0x52, 0x43, 0x1f, 0x4e, 0x6a, 0xe8, + 0xe9, 0xa4, 0x86, 0xfe, 0x31, 0xa9, 0xa1, 0x0f, 0x9e, 0xd7, 0x96, 0xde, 0xcf, 0x8d, 0xb6, 0xff, + 0x1b, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x5a, 0x6e, 0x82, 0x02, 0x20, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/authorization/v1/generated.proto b/vendor/github.com/openshift/api/authorization/v1/generated.proto index 2030ea49080b..fd5f2207ec9c 100644 --- a/vendor/github.com/openshift/api/authorization/v1/generated.proto +++ b/vendor/github.com/openshift/api/authorization/v1/generated.proto @@ -10,7 +10,6 @@ import "k8s.io/api/rbac/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/build/v1/generated.pb.go b/vendor/github.com/openshift/api/build/v1/generated.pb.go index 836b4bb4ff91..76cc3daaba78 100644 --- a/vendor/github.com/openshift/api/build/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/build/v1/generated.pb.go @@ -12913,251 +12913,250 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 3931 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcd, 0x6f, 0x1c, 0xc9, - 0x75, 0x57, 0xcf, 0x0c, 0x87, 0x33, 0x6f, 0x28, 0x7e, 0x14, 0xa5, 0xd5, 0x48, 0x96, 0x39, 0xda, - 0x5e, 0xec, 0x42, 0x9b, 0xdd, 0x1d, 0x9a, 0x5c, 0x49, 0x91, 0x6d, 0xc4, 0x01, 0x87, 0xa4, 0xb4, - 0x94, 0x29, 0x89, 0xa8, 0xa1, 0x77, 0x37, 0x5e, 0xc1, 0x49, 0xb3, 0xa7, 0x66, 0xd8, 0xcb, 0x9e, - 0xee, 0xde, 0xae, 0x1e, 0xee, 0xd2, 0x40, 0x80, 0x45, 0x00, 0x63, 0x61, 0xfb, 0x12, 0x5f, 0x8c, - 0x24, 0x97, 0x24, 0x08, 0x72, 0xca, 0x29, 0x87, 0x00, 0x06, 0x7c, 0x09, 0x10, 0x1f, 0xf6, 0xe0, - 0x83, 0x83, 0xe4, 0xb0, 0x40, 0x8c, 0x41, 0x76, 0x72, 0xc8, 0xff, 0xa0, 0x43, 0x10, 0xd4, 0x47, - 0x77, 0x57, 0xf7, 0xf4, 0x50, 0x3d, 0xa4, 0xac, 0x38, 0xc9, 0x8d, 0xf3, 0x3e, 0x7e, 0xaf, 0xaa, - 0xfa, 0x55, 0xbd, 0x8f, 0x2a, 0xc2, 0x5a, 0xcf, 0x0a, 0x0e, 0x07, 0x07, 0x4d, 0xd3, 0xed, 0xaf, - 0xba, 0x1e, 0x71, 0xe8, 0xa1, 0xd5, 0x0d, 0x56, 0x0d, 0xcf, 0x5a, 0x3d, 0x18, 0x58, 0x76, 0x67, - 0xf5, 0x78, 0x6d, 0xb5, 0x47, 0x1c, 0xe2, 0x1b, 0x01, 0xe9, 0x34, 0x3d, 0xdf, 0x0d, 0x5c, 0xf4, - 0x72, 0xac, 0xd2, 0x8c, 0x54, 0x9a, 0x86, 0x67, 0x35, 0xb9, 0x4a, 0xf3, 0x78, 0xed, 0xda, 0x5b, - 0x0a, 0x6a, 0xcf, 0xed, 0xb9, 0xab, 0x5c, 0xf3, 0x60, 0xd0, 0xe5, 0xbf, 0xf8, 0x0f, 0xfe, 0x97, - 0x40, 0xbc, 0xa6, 0x1f, 0xdd, 0xa5, 0x4d, 0xcb, 0xe5, 0x66, 0x4d, 0xd7, 0x27, 0x19, 0x56, 0xaf, - 0xdd, 0x8a, 0x65, 0xfa, 0x86, 0x79, 0x68, 0x39, 0xc4, 0x3f, 0x59, 0xf5, 0x8e, 0x7a, 0x8c, 0x40, - 0x57, 0xfb, 0x24, 0x30, 0xb2, 0xb4, 0x56, 0x27, 0x69, 0xf9, 0x03, 0x27, 0xb0, 0xfa, 0x64, 0x4c, - 0xe1, 0xce, 0xb3, 0x14, 0xa8, 0x79, 0x48, 0xfa, 0xc6, 0x98, 0xde, 0xdb, 0x93, 0xf4, 0x06, 0x81, - 0x65, 0xaf, 0x5a, 0x4e, 0x40, 0x03, 0x3f, 0xad, 0xa4, 0xff, 0x63, 0x09, 0xae, 0xb6, 0x2c, 0xc7, - 0xf0, 0x4f, 0x5a, 0x6c, 0xe5, 0x30, 0xf9, 0x68, 0x40, 0x68, 0xf0, 0xd8, 0x0b, 0x2c, 0xd7, 0xa1, - 0xe8, 0x8f, 0xa0, 0xc2, 0xa6, 0xd5, 0x31, 0x02, 0xa3, 0xae, 0xdd, 0xd0, 0x6e, 0xd6, 0xd6, 0xbf, - 0xd6, 0x14, 0x56, 0x9a, 0xaa, 0x95, 0xa6, 0x77, 0xd4, 0x63, 0x04, 0xda, 0x64, 0xd2, 0xcd, 0xe3, - 0xb5, 0xe6, 0xe3, 0x83, 0x0f, 0x89, 0x19, 0x3c, 0x24, 0x81, 0xd1, 0x42, 0x9f, 0x0f, 0x1b, 0x17, - 0x46, 0xc3, 0x06, 0xc4, 0x34, 0x1c, 0xa1, 0xa2, 0xd7, 0xa0, 0x6c, 0xd0, 0x7b, 0x96, 0x4d, 0xea, - 0x85, 0x1b, 0xda, 0xcd, 0x6a, 0x6b, 0x5e, 0x4a, 0x97, 0x37, 0x38, 0x15, 0x4b, 0x2e, 0xba, 0x03, - 0xf3, 0x3e, 0x39, 0xb6, 0xa8, 0xe5, 0x3a, 0x9b, 0x6e, 0xbf, 0x6f, 0x05, 0xf5, 0x62, 0x52, 0x5e, - 0x50, 0x71, 0x4a, 0x0a, 0x7d, 0x1d, 0x16, 0x42, 0xca, 0x43, 0x42, 0xa9, 0xd1, 0x23, 0xf5, 0x12, - 0x57, 0x5c, 0x90, 0x8a, 0xb3, 0x92, 0x8c, 0xd3, 0x72, 0xa8, 0x05, 0x28, 0x24, 0x6d, 0x0c, 0x82, - 0x43, 0xd7, 0x7f, 0x64, 0xf4, 0x49, 0x7d, 0x86, 0x6b, 0x47, 0x93, 0x8a, 0x39, 0x38, 0x43, 0x1a, - 0x6d, 0xc3, 0x72, 0x92, 0xba, 0xdd, 0x37, 0x2c, 0xbb, 0x5e, 0xe6, 0x20, 0xcb, 0x12, 0xa4, 0xa6, - 0xb0, 0x70, 0x96, 0x3c, 0xfa, 0x36, 0x5c, 0x4e, 0xce, 0x2b, 0x20, 0x62, 0x34, 0xb3, 0x1c, 0xe8, - 0xb2, 0x04, 0xba, 0x98, 0x60, 0xe2, 0x6c, 0x1d, 0xf4, 0x08, 0x5e, 0x1a, 0x63, 0x88, 0x61, 0x55, - 0x38, 0xda, 0x4b, 0x12, 0x6d, 0x3e, 0xc9, 0xc5, 0x13, 0xb4, 0xf4, 0x6f, 0xc2, 0x92, 0xe2, 0x41, - 0x6d, 0x77, 0xe0, 0x9b, 0x44, 0xf9, 0xae, 0xda, 0x69, 0xdf, 0x55, 0xff, 0x91, 0x06, 0x97, 0x5b, - 0x56, 0x70, 0x30, 0x30, 0x8f, 0x48, 0xf0, 0x1e, 0x39, 0x78, 0xc7, 0x75, 0x8f, 0x36, 0x8d, 0x01, - 0x25, 0xe8, 0x23, 0x00, 0xd3, 0xed, 0xf7, 0x5d, 0xa7, 0xed, 0x11, 0x53, 0x7a, 0xdf, 0xed, 0xe6, - 0x33, 0x37, 0x7e, 0x73, 0x93, 0x2b, 0xa9, 0x50, 0xad, 0x6b, 0xd2, 0x38, 0x1a, 0xe7, 0x61, 0xc5, - 0x88, 0xfe, 0x93, 0x02, 0xcc, 0xf0, 0x49, 0xbc, 0x00, 0xc7, 0x7f, 0x04, 0x25, 0xca, 0x26, 0x56, - 0xe0, 0xe8, 0x6f, 0xe6, 0x98, 0x98, 0x58, 0x5e, 0x8f, 0x98, 0xad, 0x39, 0x89, 0x5c, 0x62, 0xbf, - 0x30, 0xc7, 0x41, 0xef, 0x42, 0x99, 0x06, 0x46, 0x30, 0xa0, 0x7c, 0x63, 0xd4, 0xd6, 0x9b, 0xb9, - 0x11, 0xb9, 0x56, 0xfc, 0x81, 0xc4, 0x6f, 0x2c, 0xd1, 0xf4, 0xbf, 0x29, 0x40, 0x8d, 0xcb, 0x6d, - 0xba, 0x4e, 0xd7, 0xea, 0xbd, 0x80, 0x95, 0xd9, 0x4f, 0xac, 0xcc, 0x7a, 0xde, 0x79, 0x88, 0xf1, - 0x4d, 0x5c, 0x9f, 0x27, 0xa9, 0xf5, 0xb9, 0x35, 0x25, 0xee, 0xe9, 0xab, 0xf4, 0x0b, 0x0d, 0x16, - 0x14, 0xe9, 0x5d, 0x8b, 0x06, 0xe8, 0xc9, 0xd8, 0x4a, 0x35, 0xf3, 0xad, 0x14, 0xd3, 0xe6, 0xeb, - 0xb4, 0x28, 0xad, 0x55, 0x42, 0x8a, 0xb2, 0x4a, 0x6d, 0x98, 0xb1, 0x02, 0xd2, 0xa7, 0xf5, 0xc2, - 0x8d, 0xe2, 0x34, 0x9f, 0x5b, 0x0c, 0xb0, 0x75, 0x51, 0x42, 0xcf, 0xec, 0x30, 0x10, 0x2c, 0xb0, - 0xf4, 0x5f, 0x17, 0x13, 0xd3, 0x60, 0xcb, 0x87, 0x4c, 0xa8, 0x04, 0xbe, 0xd5, 0xeb, 0x11, 0x9f, - 0xd6, 0x35, 0x6e, 0xeb, 0x76, 0x5e, 0x5b, 0xfb, 0x42, 0x6f, 0xcf, 0xb5, 0x2d, 0xf3, 0x24, 0x9e, - 0x8d, 0x24, 0x53, 0x1c, 0x01, 0xa3, 0x0d, 0xa8, 0xfa, 0x03, 0x47, 0x08, 0xca, 0x48, 0xf0, 0x8a, - 0x14, 0xaf, 0xe2, 0x90, 0xf1, 0x74, 0xd8, 0x98, 0x17, 0x51, 0x2a, 0xa4, 0xe0, 0x58, 0x0b, 0x19, - 0x89, 0xf3, 0x42, 0x7c, 0xe4, 0xb7, 0x72, 0x9f, 0x17, 0xdc, 0x6f, 0x22, 0xbf, 0x8c, 0x69, 0xea, - 0xf9, 0x80, 0x3a, 0x70, 0x9d, 0x0e, 0x4c, 0x93, 0x50, 0xda, 0x1d, 0xd8, 0x7c, 0x24, 0xf4, 0x1d, - 0x8b, 0x06, 0xae, 0x7f, 0xb2, 0x6b, 0xb1, 0x90, 0xc4, 0x22, 0xcb, 0x4c, 0xeb, 0xc6, 0x68, 0xd8, - 0xb8, 0xde, 0x3e, 0x45, 0x0e, 0x9f, 0x8a, 0x82, 0xde, 0x87, 0x7a, 0xd7, 0xb0, 0x6c, 0xd2, 0xc9, - 0xb0, 0x30, 0xc3, 0x2d, 0x5c, 0x1f, 0x0d, 0x1b, 0xf5, 0x7b, 0x13, 0x64, 0xf0, 0x44, 0x6d, 0xfd, - 0x01, 0x2c, 0x8d, 0xb9, 0x34, 0xba, 0x0d, 0x35, 0xdb, 0xa0, 0xc1, 0xbb, 0xc4, 0x67, 0x67, 0x3b, - 0xf7, 0xd4, 0x62, 0x1c, 0x9a, 0x76, 0x63, 0x16, 0x56, 0xe5, 0xf4, 0x9f, 0x69, 0x50, 0xe5, 0x60, - 0x2f, 0xc0, 0xd7, 0x1f, 0x26, 0x7d, 0xfd, 0x66, 0x5e, 0xff, 0x9b, 0xe0, 0xe5, 0x00, 0x15, 0x31, - 0x72, 0xb7, 0xa7, 0x7f, 0x56, 0x92, 0x1e, 0xbf, 0xeb, 0xf6, 0xc2, 0xac, 0x67, 0x15, 0xaa, 0xa6, - 0xeb, 0x04, 0x06, 0x1b, 0xb2, 0x0c, 0x5f, 0x4b, 0xa1, 0x33, 0x6e, 0x86, 0x0c, 0x1c, 0xcb, 0xb0, - 0x60, 0xd7, 0x75, 0x6d, 0xdb, 0xfd, 0x98, 0xbb, 0x6e, 0x25, 0x3e, 0x25, 0xee, 0x71, 0x2a, 0x96, - 0x5c, 0xf4, 0x26, 0x54, 0x3c, 0x16, 0x44, 0x5d, 0x79, 0x0a, 0x55, 0xe2, 0x59, 0xef, 0x49, 0x3a, - 0x8e, 0x24, 0xd0, 0x2d, 0x98, 0xa3, 0x96, 0x63, 0x92, 0x36, 0x31, 0x5d, 0xa7, 0x43, 0xb9, 0x77, - 0x15, 0x5b, 0x8b, 0xa3, 0x61, 0x63, 0xae, 0xad, 0xd0, 0x71, 0x42, 0x0a, 0xbd, 0x07, 0x55, 0xfe, - 0x7b, 0xdf, 0x92, 0xc9, 0x4a, 0x6d, 0xfd, 0x77, 0xf2, 0x7d, 0x0a, 0xa6, 0xd1, 0xba, 0xc8, 0x26, - 0xd9, 0x0e, 0x01, 0x70, 0x8c, 0x85, 0xd6, 0x01, 0x58, 0xf6, 0x49, 0x03, 0xa3, 0xef, 0x51, 0x9e, - 0xc1, 0x54, 0xe2, 0x0d, 0xb3, 0x1f, 0x71, 0xb0, 0x22, 0x85, 0xde, 0x80, 0x6a, 0x60, 0x58, 0xf6, - 0xae, 0xe5, 0x10, 0xca, 0x73, 0x95, 0xa2, 0x30, 0xb0, 0x1f, 0x12, 0x71, 0xcc, 0x47, 0x4d, 0x00, - 0x9b, 0xb9, 0x69, 0xeb, 0x24, 0x20, 0x94, 0xe7, 0x22, 0xc5, 0xd6, 0x3c, 0x03, 0xdf, 0x8d, 0xa8, - 0x58, 0x91, 0x60, 0xab, 0xee, 0xb8, 0x1f, 0x1b, 0x56, 0x50, 0xaf, 0x26, 0x57, 0xfd, 0x91, 0xfb, - 0x9e, 0x61, 0x05, 0x58, 0x72, 0xd1, 0xab, 0x30, 0x7b, 0x2c, 0x9d, 0x1b, 0x38, 0x68, 0x8d, 0xa5, - 0x7d, 0xa1, 0x53, 0x87, 0x3c, 0xfd, 0x47, 0x61, 0xa0, 0x7b, 0x3c, 0x08, 0xbc, 0x41, 0x80, 0xbe, - 0x09, 0x85, 0xc0, 0x95, 0xce, 0xfc, 0x8a, 0xb2, 0x82, 0x4d, 0x56, 0x1e, 0xc4, 0x01, 0x0d, 0x93, - 0x2e, 0xf1, 0x89, 0x63, 0x92, 0x56, 0x79, 0x34, 0x6c, 0x14, 0xf6, 0x5d, 0x5c, 0x08, 0x5c, 0xf4, - 0x3e, 0x80, 0x37, 0xa0, 0x87, 0x6d, 0x62, 0xfa, 0x24, 0x90, 0x91, 0xec, 0x66, 0x16, 0xc8, 0xae, - 0x6b, 0x1a, 0x76, 0x1a, 0x89, 0xcf, 0x7a, 0x2f, 0xd2, 0xc7, 0x0a, 0x16, 0xea, 0x40, 0xcd, 0xea, - 0x1b, 0x3d, 0xb2, 0x6b, 0x1c, 0x10, 0x9b, 0xb9, 0x51, 0x31, 0xe7, 0x39, 0xb7, 0x13, 0x69, 0xc5, - 0xbb, 0x3b, 0xa6, 0x51, 0xac, 0xc2, 0xea, 0x7f, 0xa2, 0xc1, 0x32, 0x5f, 0x8c, 0x3d, 0x97, 0x06, - 0x22, 0xdf, 0xe3, 0x27, 0xe0, 0xab, 0x30, 0xcb, 0xce, 0x43, 0xc3, 0xe9, 0xf0, 0x58, 0x50, 0x15, - 0x6b, 0xb9, 0x29, 0x48, 0x38, 0xe4, 0xa1, 0xeb, 0x50, 0x32, 0xfc, 0x9e, 0xd8, 0xaf, 0xd5, 0x56, - 0x85, 0x85, 0xe2, 0x0d, 0xbf, 0x47, 0x31, 0xa7, 0xb2, 0x0f, 0x47, 0x4d, 0xdf, 0xf2, 0xc6, 0x72, - 0xf8, 0x36, 0xa7, 0x62, 0xc9, 0xd5, 0x7f, 0x31, 0x0b, 0x73, 0x6a, 0x55, 0xf2, 0x02, 0x72, 0x8f, - 0x0f, 0xa0, 0x12, 0x66, 0xb9, 0xf2, 0xab, 0xad, 0xe5, 0x58, 0x5a, 0x91, 0xf3, 0x62, 0xa9, 0xd8, - 0x9a, 0x63, 0x1b, 0x3a, 0xfc, 0x85, 0x23, 0x40, 0x44, 0x60, 0x51, 0x06, 0x3c, 0xd2, 0x69, 0x9d, - 0xf0, 0xb5, 0x97, 0x71, 0x2a, 0x97, 0x7f, 0x5d, 0x1a, 0x0d, 0x1b, 0x8b, 0xfb, 0x29, 0x00, 0x3c, - 0x06, 0x89, 0x36, 0xa0, 0xd4, 0xf5, 0xdd, 0x3e, 0x3f, 0x2f, 0x72, 0x42, 0xf3, 0x2f, 0x74, 0xcf, - 0x77, 0xfb, 0x98, 0xab, 0xa2, 0xf7, 0xa1, 0x7c, 0xc0, 0x53, 0x7a, 0x79, 0x82, 0xe4, 0x4a, 0x96, - 0xd2, 0x35, 0x40, 0x0b, 0xd8, 0x37, 0x15, 0x64, 0x2c, 0xf1, 0xd0, 0x5a, 0x32, 0xda, 0x94, 0xf9, - 0x86, 0x5c, 0x38, 0x2d, 0xd2, 0xa0, 0xaf, 0x43, 0x91, 0x38, 0xc7, 0xf5, 0x59, 0xee, 0xe9, 0xd7, - 0xb2, 0xa6, 0xb3, 0xed, 0x1c, 0xbf, 0x6b, 0xf8, 0xad, 0x9a, 0xfc, 0xb4, 0xc5, 0x6d, 0xe7, 0x18, - 0x33, 0x1d, 0x74, 0x04, 0x35, 0x65, 0x79, 0xea, 0x15, 0x0e, 0x71, 0x6b, 0xca, 0xf4, 0x45, 0xd4, - 0x10, 0xd1, 0x9e, 0x51, 0xbe, 0x00, 0x56, 0xd1, 0xd1, 0x0f, 0x35, 0xb8, 0xdc, 0x71, 0xcd, 0x23, - 0xe2, 0xb7, 0x03, 0x56, 0x62, 0xf7, 0x4e, 0x64, 0x40, 0xe1, 0xe7, 0x53, 0x6d, 0xfd, 0x6e, 0x0e, - 0xbb, 0x5b, 0x59, 0xfa, 0xad, 0xab, 0xa3, 0x61, 0xe3, 0x72, 0x26, 0x0b, 0x67, 0x5b, 0xe4, 0x63, - 0xa1, 0xfc, 0x2b, 0xa4, 0xc7, 0x02, 0xb9, 0xc7, 0xd2, 0xce, 0xd2, 0x17, 0x63, 0xc9, 0x64, 0xe1, - 0x6c, 0x8b, 0xfa, 0xbf, 0xce, 0xc8, 0x83, 0x55, 0x96, 0x86, 0x6f, 0x43, 0x29, 0x38, 0xf1, 0xc2, - 0xc2, 0xb0, 0x11, 0xe6, 0xea, 0xfb, 0x27, 0x1e, 0x79, 0x3a, 0x6c, 0x2c, 0x28, 0xa2, 0x8c, 0x84, - 0xb9, 0xb0, 0xe2, 0x91, 0x85, 0xe7, 0xec, 0x91, 0x4d, 0x00, 0xb1, 0x86, 0x5d, 0x56, 0xad, 0xca, - 0x13, 0x89, 0x1d, 0x10, 0x5b, 0x11, 0x15, 0x2b, 0x12, 0x68, 0x17, 0x8a, 0x3d, 0x99, 0xeb, 0xe5, - 0x3b, 0x1d, 0xee, 0x5b, 0x81, 0x3a, 0x86, 0x59, 0xe6, 0xa1, 0xf7, 0xad, 0x00, 0x33, 0x18, 0x56, - 0xb6, 0xf1, 0x73, 0x97, 0xd6, 0x67, 0x72, 0xe7, 0xf1, 0x7c, 0x9b, 0x4b, 0xb4, 0xe8, 0xec, 0xe4, - 0x44, 0x8a, 0x25, 0x1a, 0x8b, 0xd6, 0x2c, 0x3f, 0x21, 0x9f, 0x04, 0x5b, 0x96, 0x2f, 0xfb, 0x0d, - 0x4a, 0x7a, 0x1b, 0x72, 0xb0, 0x22, 0x85, 0xbe, 0x07, 0x73, 0xf2, 0x0b, 0x8a, 0xb0, 0x35, 0x3b, - 0x65, 0xd8, 0x12, 0xa9, 0x89, 0x82, 0x80, 0x13, 0x78, 0xe8, 0x0f, 0x61, 0x96, 0xf2, 0xbf, 0xe8, - 0x14, 0x3b, 0x51, 0xe8, 0xaa, 0x0b, 0x18, 0x75, 0x6e, 0x04, 0x8b, 0xe2, 0x10, 0x15, 0x1d, 0xf1, - 0x49, 0x77, 0xad, 0xde, 0x43, 0xc3, 0x63, 0xbb, 0x8e, 0xd9, 0xf8, 0xdd, 0x5c, 0x25, 0x80, 0x54, - 0x52, 0xcd, 0xa8, 0xab, 0x25, 0x21, 0xb1, 0x02, 0xaf, 0xff, 0x5b, 0x98, 0x00, 0xf3, 0xc0, 0x68, - 0x64, 0x74, 0x2b, 0x9e, 0x73, 0xf5, 0x91, 0x3a, 0xcc, 0x0a, 0xbf, 0xc9, 0xc3, 0x4c, 0xff, 0x6c, - 0x36, 0xdc, 0xb4, 0xa2, 0x4a, 0x58, 0x83, 0x19, 0xef, 0xd0, 0xa0, 0xe1, 0xae, 0xfd, 0x4a, 0x98, - 0x58, 0xef, 0x31, 0xe2, 0xd3, 0x61, 0x03, 0x44, 0xb6, 0xc0, 0x7e, 0x61, 0x21, 0xc9, 0xd3, 0x68, - 0xc3, 0x31, 0x89, 0x6d, 0x93, 0x8e, 0x4c, 0x8c, 0xe3, 0x34, 0x3a, 0x64, 0xe0, 0x58, 0x06, 0xdd, - 0x81, 0xb2, 0x4f, 0x0c, 0xea, 0x3a, 0x72, 0x17, 0xae, 0x84, 0xbe, 0x8d, 0x39, 0xf5, 0x29, 0xf3, - 0x2e, 0x51, 0x76, 0xf3, 0xdf, 0x58, 0x4a, 0xa3, 0xd7, 0x61, 0xb6, 0x7f, 0x7a, 0x6f, 0x2f, 0xe4, - 0xa3, 0x2e, 0xcc, 0xd3, 0xc0, 0xf0, 0x83, 0x28, 0x5f, 0x3d, 0x43, 0x8a, 0x8c, 0x46, 0xc3, 0xc6, - 0x7c, 0x3b, 0x81, 0x82, 0x53, 0xa8, 0x68, 0x00, 0xcb, 0xa6, 0xdb, 0xf7, 0x6c, 0xc2, 0x8e, 0xc0, - 0xd8, 0x58, 0x79, 0x6a, 0x63, 0x57, 0x46, 0xc3, 0xc6, 0xf2, 0xe6, 0x38, 0x14, 0xce, 0xc2, 0x47, - 0xbf, 0x07, 0x95, 0xce, 0xc0, 0x37, 0x18, 0x51, 0xa6, 0xdb, 0x2f, 0x87, 0x05, 0xc6, 0x96, 0xa4, - 0x3f, 0x1d, 0x36, 0x2e, 0xb2, 0x0c, 0xbd, 0x19, 0x12, 0x70, 0xa4, 0x82, 0x0e, 0xe0, 0x9a, 0xcb, - 0x93, 0x5f, 0x71, 0xf4, 0x89, 0x04, 0x23, 0xdc, 0xde, 0xb2, 0x3b, 0xa8, 0x4b, 0xc0, 0x6b, 0x8f, - 0x27, 0x4a, 0xe2, 0x53, 0x50, 0xd0, 0x7d, 0x28, 0x8b, 0x4d, 0x24, 0xa3, 0x62, 0xae, 0xfc, 0x04, - 0x44, 0x87, 0x97, 0xa9, 0x61, 0xa9, 0x8e, 0x9e, 0x40, 0x59, 0x98, 0x91, 0x21, 0xed, 0xd6, 0x74, - 0x0d, 0x2f, 0x31, 0xfc, 0xf8, 0xfc, 0x14, 0xbf, 0xb1, 0xc4, 0x44, 0xfb, 0xbc, 0x5d, 0xc4, 0xce, - 0xe5, 0x1a, 0xdf, 0x67, 0x79, 0x1a, 0x74, 0x6d, 0xa6, 0xb0, 0xe3, 0x74, 0xdd, 0x44, 0x9b, 0x88, - 0x9f, 0xca, 0x02, 0x8b, 0x9d, 0xca, 0xb6, 0xdb, 0x6b, 0x3b, 0x96, 0xe7, 0x91, 0xa0, 0x3e, 0x97, - 0x3c, 0x95, 0x77, 0x23, 0x0e, 0x56, 0xa4, 0x74, 0x53, 0x16, 0xed, 0xea, 0xb0, 0xd1, 0x23, 0xa5, - 0x38, 0xb9, 0x73, 0x96, 0x89, 0xef, 0xbb, 0x6a, 0xbd, 0xa2, 0xef, 0xca, 0x74, 0x3f, 0x29, 0x82, - 0x6e, 0xcb, 0x62, 0x63, 0xcb, 0xea, 0x11, 0x1a, 0xc8, 0xbd, 0x9f, 0xac, 0x1e, 0x04, 0x0b, 0xab, - 0x72, 0xfa, 0xcf, 0x4b, 0x70, 0x51, 0xc2, 0x89, 0x54, 0x00, 0xdd, 0x4e, 0xc4, 0xfc, 0x97, 0x53, - 0x31, 0x7f, 0x29, 0x21, 0xac, 0x44, 0x7d, 0x1f, 0xe6, 0x93, 0xf9, 0x8d, 0x8c, 0xfe, 0x77, 0x72, - 0xa7, 0x52, 0x09, 0x64, 0xb1, 0x75, 0x93, 0x89, 0x14, 0x4e, 0x59, 0x60, 0x36, 0x93, 0x79, 0x8c, - 0xcc, 0xd1, 0xef, 0xe4, 0x4e, 0x99, 0x32, 0x6c, 0x26, 0x13, 0x26, 0x9c, 0xb2, 0xc0, 0x6c, 0x9a, - 0x03, 0x1a, 0xb8, 0xfd, 0xc8, 0x66, 0x29, 0xb7, 0xcd, 0x4d, 0xae, 0x98, 0x61, 0x73, 0x33, 0x81, - 0x88, 0x53, 0x16, 0xd0, 0x4f, 0x35, 0xb8, 0xf2, 0x21, 0x71, 0x8e, 0x2c, 0x87, 0xee, 0x59, 0x1e, - 0xb1, 0x2d, 0x27, 0x9e, 0xb1, 0x38, 0x14, 0x7f, 0x3f, 0x87, 0xf5, 0x07, 0x49, 0x84, 0xe4, 0x30, - 0xbe, 0x32, 0x1a, 0x36, 0xae, 0x3c, 0xc8, 0xb6, 0x81, 0x27, 0x19, 0xd7, 0x7f, 0x30, 0x23, 0x3d, - 0x5e, 0x0d, 0x59, 0xea, 0x21, 0xaf, 0x3d, 0xe3, 0x90, 0xf7, 0x61, 0x9e, 0x5f, 0x73, 0x59, 0xa6, - 0xec, 0xf4, 0x4f, 0xe1, 0x35, 0xf7, 0x13, 0x8a, 0x22, 0x5a, 0xf2, 0xd5, 0x4c, 0x32, 0x70, 0xca, - 0x02, 0x72, 0xe0, 0xa2, 0x00, 0x0f, 0x4d, 0x16, 0x73, 0x5f, 0x58, 0xdc, 0xb7, 0x82, 0x77, 0x22, - 0x3d, 0x61, 0x71, 0x69, 0x34, 0x6c, 0x5c, 0x4c, 0xd0, 0x71, 0x12, 0x1e, 0x0d, 0x60, 0x91, 0xef, - 0xb8, 0xcd, 0x43, 0xc3, 0xe9, 0x89, 0x65, 0x97, 0x3e, 0xf3, 0x76, 0xde, 0x0c, 0x52, 0xa8, 0x0a, - 0x83, 0xbc, 0xb6, 0xdc, 0x49, 0x01, 0xe2, 0x31, 0x13, 0x72, 0x9a, 0xb6, 0x11, 0x4d, 0x73, 0x66, - 0x9a, 0x69, 0xee, 0x1a, 0xd9, 0xd3, 0x8c, 0xe9, 0x38, 0x09, 0x8f, 0xbe, 0x0f, 0x8b, 0x07, 0xa9, - 0xdb, 0x21, 0x19, 0x44, 0xef, 0xe6, 0x2a, 0x00, 0x32, 0x2e, 0x96, 0xc4, 0x5c, 0xd3, 0x2c, 0x3c, - 0x66, 0x47, 0xff, 0x59, 0x09, 0xd0, 0x78, 0x1b, 0x1b, 0xdd, 0x4a, 0x1c, 0x65, 0x37, 0x52, 0x47, - 0xd9, 0xa2, 0xaa, 0xa1, 0x9c, 0x64, 0x4f, 0xa0, 0x2c, 0xc6, 0x3b, 0x45, 0x5b, 0x41, 0x0e, 0x44, - 0x82, 0x65, 0x39, 0x85, 0xc4, 0x64, 0x99, 0xb5, 0xf4, 0x47, 0xe9, 0x77, 0x67, 0x80, 0xcf, 0xf2, - 0xf2, 0x10, 0x15, 0x1d, 0xca, 0x40, 0x20, 0x7c, 0x41, 0x7a, 0xda, 0xed, 0xe9, 0x3c, 0x2d, 0x34, - 0xb4, 0x10, 0xc5, 0x0e, 0x41, 0xc7, 0x2a, 0xb4, 0x5c, 0x28, 0xdb, 0x38, 0x90, 0xae, 0x75, 0x8e, - 0x85, 0x52, 0xdc, 0x4a, 0x62, 0x22, 0x02, 0xd5, 0xe8, 0x3b, 0x4b, 0x47, 0x3a, 0x83, 0x81, 0x6c, - 0x0f, 0x8a, 0x91, 0xf5, 0x5f, 0x96, 0x41, 0xc9, 0xe2, 0xd1, 0xb7, 0x60, 0x9e, 0x12, 0xff, 0xd8, - 0x32, 0xc9, 0x86, 0x69, 0xba, 0x03, 0x27, 0x8c, 0xa4, 0xd1, 0x4d, 0x6b, 0x3b, 0xc1, 0xc5, 0x29, - 0x69, 0x7e, 0xb7, 0xc7, 0x03, 0x86, 0x74, 0x9e, 0xfc, 0x77, 0x7b, 0xa9, 0x22, 0x51, 0x36, 0xaa, - 0x24, 0x5a, 0xa2, 0xdb, 0x55, 0x7c, 0xde, 0xdd, 0xae, 0xef, 0x41, 0x85, 0x26, 0xa3, 0xd9, 0xd7, - 0xf2, 0x27, 0x2a, 0x32, 0x80, 0x44, 0xed, 0xf1, 0x28, 0x6a, 0x44, 0x98, 0x6c, 0x51, 0x64, 0xfe, - 0x37, 0x33, 0xdd, 0xa2, 0x3c, 0x23, 0xf3, 0xfb, 0x03, 0xa8, 0xfa, 0x44, 0x2c, 0x10, 0x95, 0x2e, - 0x92, 0x59, 0x02, 0x63, 0x29, 0x84, 0xc9, 0x47, 0x03, 0xcb, 0x27, 0x7d, 0xe2, 0x04, 0x34, 0x2e, - 0x70, 0x42, 0x2e, 0xc5, 0x31, 0x1a, 0xfa, 0x10, 0xc0, 0x8b, 0xfa, 0xa9, 0xb2, 0xbc, 0xce, 0x9d, - 0xbd, 0x25, 0x3b, 0xb1, 0x71, 0xda, 0x18, 0xd3, 0xb1, 0x82, 0x8e, 0x3e, 0x80, 0xab, 0x71, 0x85, - 0xb0, 0x45, 0x8c, 0x0e, 0x8f, 0xb1, 0xf2, 0x2a, 0x41, 0x34, 0xd7, 0xbf, 0x3a, 0x1a, 0x36, 0xae, - 0x6e, 0x4e, 0x12, 0xc2, 0x93, 0xf5, 0x51, 0x1f, 0xe6, 0x1c, 0xb7, 0x43, 0xda, 0xc4, 0x26, 0x66, - 0xe0, 0xfa, 0x32, 0x95, 0xcf, 0x53, 0x6a, 0x8b, 0xa6, 0x90, 0x61, 0x3f, 0x52, 0xd4, 0x45, 0xe3, - 0x40, 0xa5, 0xe0, 0x04, 0xbc, 0xfe, 0xe7, 0x1a, 0x64, 0x5c, 0xdd, 0x27, 0xdc, 0x57, 0x7b, 0xde, - 0xee, 0xfb, 0x1a, 0x94, 0x69, 0xdc, 0xbd, 0x57, 0x9b, 0xd4, 0xa2, 0xb5, 0x21, 0xb9, 0xfa, 0xdf, - 0x6b, 0x70, 0x29, 0xab, 0x7f, 0xc0, 0xfc, 0x28, 0xea, 0x16, 0xc8, 0xe1, 0xe5, 0x6f, 0xa5, 0xa8, - 0xf7, 0x4d, 0x02, 0x02, 0xc7, 0x68, 0xec, 0x3c, 0xe9, 0x10, 0x1a, 0x58, 0x0e, 0x2f, 0xdb, 0xb6, - 0x2c, 0x5f, 0x8e, 0x31, 0x3a, 0x4f, 0xb6, 0x12, 0x5c, 0x9c, 0x92, 0xd6, 0x7f, 0x5c, 0x82, 0xe5, - 0x8c, 0xb4, 0x11, 0x6d, 0xcb, 0xce, 0xf1, 0x14, 0x97, 0x1e, 0xd1, 0x55, 0x7b, 0xa2, 0x7b, 0x0c, - 0xde, 0xc0, 0xb6, 0xcf, 0x77, 0xf9, 0x11, 0xea, 0x63, 0x05, 0x2b, 0x6c, 0x05, 0x17, 0xcf, 0xd0, - 0x0a, 0x7e, 0x00, 0x88, 0x7c, 0xe2, 0xb9, 0x94, 0xc8, 0xf4, 0xdf, 0xe5, 0x21, 0xa0, 0xc4, 0xdb, - 0x12, 0xd1, 0xfb, 0x90, 0xed, 0x31, 0x09, 0x9c, 0xa1, 0x85, 0x56, 0xa1, 0xda, 0x75, 0x7d, 0x93, - 0xb0, 0x51, 0xf2, 0xd3, 0x47, 0xe9, 0x6c, 0xdc, 0x0b, 0x19, 0x38, 0x96, 0x41, 0xef, 0xc7, 0x9d, - 0xaf, 0x72, 0xee, 0x0b, 0x1b, 0x31, 0x67, 0xbe, 0xd9, 0x27, 0xb7, 0xbc, 0x36, 0x60, 0x81, 0x2b, - 0x6c, 0xec, 0xed, 0x84, 0x3d, 0x75, 0xf1, 0x26, 0xe8, 0x8a, 0x54, 0x11, 0xfd, 0xd4, 0x98, 0x8d, - 0xd3, 0xf2, 0xfa, 0xe7, 0x25, 0x58, 0xce, 0x28, 0x96, 0xa2, 0x7b, 0x04, 0xed, 0x3c, 0xf7, 0x08, - 0xbf, 0x29, 0x4f, 0x78, 0x1d, 0x66, 0x1d, 0x77, 0xd3, 0x30, 0x0f, 0x89, 0xbc, 0x49, 0x8d, 0x96, - 0xe8, 0x91, 0x20, 0xe3, 0x90, 0x1f, 0x3a, 0x4d, 0xe9, 0x0c, 0x4e, 0x33, 0xf5, 0x87, 0xfe, 0x56, - 0x58, 0xb0, 0x76, 0x2d, 0x9b, 0xec, 0x19, 0xc1, 0xa1, 0x6c, 0xbd, 0xc6, 0x3b, 0x33, 0xc1, 0xc5, - 0x29, 0x69, 0xf4, 0x6d, 0xa8, 0x8a, 0xcf, 0xe3, 0xf7, 0x68, 0x8e, 0x1b, 0x8f, 0x68, 0x30, 0xad, - 0x50, 0x09, 0xc7, 0xfa, 0xc8, 0x83, 0x2b, 0x3c, 0xb3, 0x62, 0x67, 0x6e, 0xdf, 0xfa, 0x3e, 0xdf, - 0xfe, 0xf2, 0x89, 0x85, 0xe8, 0xe5, 0xdc, 0x61, 0xf5, 0xd9, 0x4e, 0xb6, 0xc8, 0xd3, 0xc9, 0x2c, - 0x3c, 0x09, 0x56, 0xff, 0xb1, 0x06, 0xd9, 0xf7, 0x14, 0xc9, 0x89, 0x69, 0xe7, 0x9c, 0xd8, 0xab, - 0xf1, 0xc7, 0x17, 0x7d, 0xc5, 0x5a, 0xd6, 0x87, 0xd7, 0xff, 0x42, 0x83, 0xe5, 0x8c, 0x7a, 0xee, - 0xb7, 0x23, 0x6e, 0x7c, 0x51, 0x48, 0x0f, 0x6e, 0xfb, 0x98, 0x38, 0xc1, 0xd9, 0x6e, 0x47, 0xb6, - 0xc5, 0x9d, 0x44, 0x41, 0xb6, 0x17, 0x73, 0x15, 0x63, 0xbc, 0x51, 0x95, 0xbc, 0x8c, 0x38, 0xc7, - 0xf1, 0x3a, 0xf9, 0xf2, 0xab, 0xf4, 0xa2, 0x2f, 0xbf, 0xf4, 0x7f, 0xd0, 0x60, 0x3e, 0x79, 0xe9, - 0x82, 0xbe, 0x0a, 0xc5, 0x81, 0x6f, 0xc9, 0x45, 0x8d, 0x46, 0xff, 0x1d, 0xbc, 0x83, 0x19, 0x9d, - 0xb1, 0x7d, 0xd2, 0x95, 0x5f, 0x2c, 0x62, 0x63, 0xd2, 0xc5, 0x8c, 0x8e, 0x08, 0xd4, 0x3c, 0xdf, - 0xfd, 0xe4, 0x44, 0x04, 0xe3, 0x29, 0x1e, 0xd8, 0xed, 0xc5, 0x5a, 0x71, 0xdb, 0x4c, 0x21, 0x62, - 0x15, 0x97, 0xa7, 0x39, 0xe3, 0xcd, 0x80, 0xdf, 0x0e, 0x77, 0xfd, 0x65, 0x01, 0x66, 0xa5, 0xd3, - 0xa0, 0x8f, 0x60, 0xbe, 0x97, 0x58, 0xde, 0x29, 0x86, 0x95, 0xba, 0x0c, 0x8b, 0xce, 0xc5, 0x24, - 0x1d, 0xa7, 0x0c, 0xa0, 0x3f, 0x86, 0xa5, 0x9e, 0x15, 0x24, 0xe7, 0x34, 0xc5, 0x4d, 0xe0, 0xfd, - 0xb4, 0x6e, 0xeb, 0xaa, 0x34, 0xbc, 0x34, 0xc6, 0xc2, 0xe3, 0x96, 0xd0, 0x63, 0x28, 0xf9, 0xa4, - 0x3b, 0xcd, 0x6b, 0x0b, 0xb6, 0xa7, 0x48, 0x97, 0xef, 0xb1, 0x28, 0x45, 0xc2, 0xa4, 0x4b, 0x31, - 0x07, 0xd2, 0x3f, 0x13, 0x9f, 0x3a, 0xd5, 0x10, 0xf9, 0x9f, 0x78, 0xf3, 0xfa, 0x5f, 0x1a, 0x40, - 0x3c, 0xd8, 0xff, 0x7f, 0xdf, 0x56, 0xff, 0xbb, 0x02, 0x8c, 0x0b, 0xb2, 0x7d, 0x61, 0x8a, 0x32, - 0x4d, 0xcb, 0x7c, 0x67, 0x2e, 0xb9, 0xe8, 0x09, 0x94, 0x0d, 0xfe, 0x50, 0x7b, 0x8a, 0x11, 0x0b, - 0x53, 0x9b, 0xae, 0x13, 0xf8, 0xae, 0xfd, 0x1d, 0x4a, 0x7c, 0xe5, 0x75, 0x34, 0xc7, 0xc2, 0x12, - 0x13, 0x11, 0x56, 0x43, 0xc8, 0xc7, 0xd6, 0x53, 0xbc, 0x5b, 0x1d, 0x37, 0xa0, 0xd4, 0x13, 0x12, - 0x0e, 0xc7, 0xc8, 0x53, 0x5c, 0xa0, 0xe9, 0x3f, 0xd4, 0x60, 0x31, 0xdd, 0x3d, 0x64, 0xfa, 0x3c, - 0x23, 0xd8, 0xd9, 0x4a, 0xf7, 0x66, 0x77, 0x04, 0x19, 0x87, 0x7c, 0xf4, 0x00, 0x66, 0x59, 0x66, - 0x88, 0xe5, 0x69, 0x9b, 0x33, 0xaf, 0xe4, 0xf1, 0xfd, 0x9e, 0xd0, 0xc3, 0x21, 0x80, 0xfe, 0xcf, - 0x1a, 0xa0, 0xf1, 0xfe, 0x12, 0xda, 0x83, 0x4b, 0xb6, 0x41, 0x83, 0xe8, 0x6a, 0x73, 0x27, 0x31, - 0xb4, 0xeb, 0x72, 0x68, 0x97, 0x76, 0x33, 0x64, 0x70, 0xa6, 0x66, 0x94, 0x09, 0x17, 0xce, 0x9e, - 0x09, 0xbf, 0x06, 0x65, 0x8f, 0xad, 0x55, 0x47, 0xa6, 0xab, 0xd1, 0x17, 0xdf, 0xe3, 0x54, 0x2c, - 0xb9, 0x7a, 0x1b, 0x20, 0x7e, 0x94, 0x85, 0x6e, 0x40, 0xc9, 0x31, 0xfa, 0x61, 0x32, 0x10, 0x1d, - 0x24, 0xfc, 0x75, 0x3f, 0xe7, 0xa0, 0x57, 0x60, 0xe6, 0xd8, 0xb0, 0x07, 0xe1, 0xbf, 0x4f, 0x44, - 0x0f, 0x1e, 0xdf, 0x65, 0x44, 0x2c, 0x78, 0xfa, 0x5f, 0x16, 0xa0, 0xa6, 0x3c, 0x1a, 0x78, 0x5e, - 0x75, 0xde, 0x7b, 0x30, 0xe3, 0x19, 0xc1, 0x61, 0xf8, 0x2c, 0x73, 0x7d, 0xba, 0xa7, 0x0b, 0x2c, - 0xdf, 0x8d, 0xc7, 0xcb, 0x7e, 0x51, 0x2c, 0xf0, 0x52, 0x65, 0x43, 0xf1, 0x39, 0x96, 0x0d, 0x2f, - 0x41, 0xc1, 0xa0, 0xbc, 0x14, 0xa8, 0x8a, 0xfb, 0xaf, 0x0d, 0x8a, 0x0b, 0x06, 0xd5, 0x7f, 0xa0, - 0xc1, 0x42, 0x6a, 0x6c, 0x68, 0x1d, 0x80, 0x46, 0xbf, 0xe4, 0x27, 0x88, 0xba, 0x2e, 0xb1, 0x1c, - 0x56, 0xa4, 0xce, 0x5d, 0x99, 0xff, 0x8b, 0x06, 0xd7, 0x4f, 0xbb, 0x52, 0x61, 0xf5, 0x9e, 0xbc, - 0x37, 0x89, 0x2a, 0x0c, 0x2d, 0x59, 0xef, 0x3d, 0x48, 0xb2, 0x71, 0x5a, 0x1e, 0xdd, 0x86, 0x9a, - 0x42, 0x92, 0x03, 0x8c, 0xb2, 0x13, 0x45, 0x1d, 0xab, 0x72, 0xe7, 0x48, 0x0e, 0xf5, 0x7f, 0xd2, - 0xe0, 0x52, 0x56, 0xe3, 0x07, 0xf5, 0xc2, 0x87, 0xbd, 0xa2, 0x22, 0x68, 0x9d, 0xb1, 0x81, 0xd4, - 0xe4, 0xcf, 0x7b, 0xb7, 0x9d, 0xc0, 0x3f, 0xc9, 0x7e, 0xf2, 0x7b, 0xed, 0x2e, 0x40, 0x2c, 0x83, - 0x16, 0xa1, 0x78, 0x44, 0x4e, 0xc4, 0xc2, 0x61, 0xf6, 0x27, 0xba, 0x94, 0xd8, 0x46, 0x72, 0xdf, - 0x7c, 0xa3, 0x70, 0x57, 0xfb, 0x46, 0xe5, 0xcf, 0xfe, 0xaa, 0x71, 0xe1, 0xd3, 0x5f, 0xdf, 0xb8, - 0xa0, 0xff, 0x44, 0x03, 0x35, 0x77, 0x43, 0x6f, 0x40, 0xf5, 0x30, 0x08, 0x3c, 0x4e, 0x92, 0x2f, - 0x16, 0xf8, 0xe3, 0xd6, 0x77, 0xf6, 0xf7, 0xf7, 0x38, 0x11, 0xc7, 0x7c, 0xd4, 0x04, 0x60, 0x3f, - 0xa8, 0x90, 0x2e, 0xc5, 0xaf, 0x8c, 0x98, 0x74, 0x5b, 0x88, 0x2b, 0x12, 0xa2, 0xc4, 0x11, 0xc2, - 0xe2, 0x3f, 0x8e, 0x64, 0x89, 0x23, 0x24, 0x43, 0x9e, 0xfe, 0xb7, 0x1a, 0x2c, 0x8d, 0xbd, 0x90, - 0x41, 0x7b, 0x51, 0x52, 0x37, 0x6d, 0xdf, 0x69, 0x42, 0xfa, 0x77, 0x6e, 0xbf, 0xbe, 0x0b, 0x97, - 0x04, 0x22, 0xb7, 0x1a, 0xbf, 0x06, 0x78, 0xe6, 0x01, 0xa7, 0xff, 0xb5, 0x06, 0x10, 0x77, 0x42, - 0xd0, 0x01, 0xcc, 0x89, 0x21, 0x25, 0xb2, 0x93, 0xfc, 0x13, 0xbc, 0x24, 0x4d, 0xcc, 0xb5, 0x15, - 0x14, 0x9c, 0xc0, 0x64, 0x55, 0x7f, 0xdf, 0x1d, 0x38, 0x01, 0xdf, 0x5d, 0x85, 0xe4, 0xfb, 0xef, - 0x87, 0x21, 0x03, 0xc7, 0x32, 0xfa, 0xa7, 0x45, 0x58, 0xce, 0xb8, 0xfa, 0xfd, 0x3f, 0xdd, 0x4f, - 0x7b, 0x1d, 0x66, 0xc5, 0x33, 0x5d, 0x9a, 0xce, 0x19, 0xc4, 0x2b, 0x5e, 0x8a, 0x43, 0x3e, 0x5a, - 0x83, 0x9a, 0xe5, 0x98, 0xa2, 0x45, 0x6e, 0x84, 0x7d, 0x14, 0x71, 0x0b, 0x14, 0x93, 0xb1, 0x2a, - 0x93, 0x6c, 0xbc, 0x94, 0x9f, 0xdd, 0x78, 0xd1, 0xbf, 0x0b, 0x4b, 0x63, 0x59, 0x4f, 0xbe, 0xf0, - 0x49, 0xf8, 0xbf, 0xbe, 0xa5, 0xc2, 0xa7, 0xf8, 0x8f, 0x37, 0xc1, 0xd3, 0x7f, 0xaa, 0xc1, 0x7c, - 0x2a, 0x3d, 0x3c, 0x53, 0x95, 0xfe, 0x58, 0xad, 0xd2, 0xcf, 0x96, 0xda, 0x26, 0xea, 0x75, 0xfd, - 0x01, 0x64, 0xbf, 0xc4, 0x4c, 0xaf, 0xb8, 0xf6, 0xec, 0x15, 0xd7, 0x7f, 0x5e, 0x80, 0x6a, 0xf4, - 0x80, 0x05, 0xbd, 0x95, 0x58, 0xb9, 0xab, 0xea, 0xca, 0x3d, 0x1d, 0x36, 0x84, 0xa0, 0xb2, 0x8c, - 0x1f, 0x40, 0x35, 0x7a, 0x00, 0x15, 0x75, 0x21, 0xf2, 0x3f, 0x72, 0x8a, 0x3e, 0x6d, 0xf4, 0xaa, - 0x0a, 0xc7, 0x78, 0x2c, 0x9f, 0x0b, 0x5f, 0x28, 0x3d, 0xb4, 0x6c, 0xdb, 0xa2, 0xf2, 0x12, 0xa3, - 0xc8, 0x2f, 0x31, 0xa2, 0x7c, 0x6e, 0x2b, 0x43, 0x06, 0x67, 0x6a, 0xa2, 0x3d, 0x98, 0xa1, 0x01, - 0xf1, 0xa8, 0xec, 0x09, 0xbe, 0x91, 0xeb, 0x6d, 0x0f, 0xf1, 0x78, 0x35, 0x17, 0xb9, 0x08, 0xa3, - 0x50, 0x2c, 0x80, 0xf4, 0xff, 0xd4, 0xa0, 0x12, 0x8a, 0xa0, 0x37, 0x13, 0x8b, 0x57, 0x4f, 0x2d, - 0x1e, 0x97, 0xfb, 0x5f, 0xbb, 0x76, 0xfa, 0x50, 0x83, 0xf9, 0xe4, 0x75, 0xa8, 0xd2, 0x43, 0xd0, - 0x4e, 0xeb, 0x21, 0xa0, 0x37, 0xa1, 0x62, 0xd8, 0xb6, 0xfb, 0xf1, 0xb6, 0x73, 0x2c, 0xfb, 0x76, - 0xd1, 0xfd, 0xde, 0x86, 0xa4, 0xe3, 0x48, 0x02, 0x1d, 0xc3, 0x82, 0xd0, 0x8b, 0x5f, 0xa0, 0x15, - 0x73, 0x5f, 0x33, 0x65, 0x05, 0x9b, 0xd6, 0x32, 0x4b, 0x8f, 0xda, 0x49, 0x4c, 0x9c, 0x36, 0xd2, - 0xba, 0xf9, 0xf9, 0x97, 0x2b, 0x17, 0x7e, 0xf5, 0xe5, 0xca, 0x85, 0x2f, 0xbe, 0x5c, 0xb9, 0xf0, - 0xe9, 0x68, 0x45, 0xfb, 0x7c, 0xb4, 0xa2, 0xfd, 0x6a, 0xb4, 0xa2, 0x7d, 0x31, 0x5a, 0xd1, 0xfe, - 0x7d, 0xb4, 0xa2, 0xfd, 0xe9, 0x7f, 0xac, 0x5c, 0xf8, 0x6e, 0xe1, 0x78, 0xed, 0xbf, 0x03, 0x00, - 0x00, 0xff, 0xff, 0x02, 0x55, 0x4e, 0xbf, 0xb9, 0x3e, 0x00, 0x00, + // 3912 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x5b, 0xcd, 0x6f, 0x24, 0xc7, + 0x75, 0xdf, 0x9e, 0x19, 0x0e, 0x67, 0xde, 0x70, 0xf9, 0x51, 0xe4, 0x6a, 0x67, 0xe9, 0x35, 0x67, + 0xd5, 0x82, 0x84, 0x55, 0x24, 0x0d, 0x4d, 0x7a, 0x77, 0xb3, 0xb6, 0x11, 0x07, 0x1c, 0x92, 0xbb, + 0xe2, 0x9a, 0xbb, 0x4b, 0xd4, 0xd0, 0x92, 0x62, 0x2d, 0x9c, 0x34, 0x7b, 0x6a, 0x86, 0x2d, 0xf6, + 0x74, 0xb7, 0xba, 0x7a, 0x28, 0xd1, 0x40, 0x00, 0x21, 0x80, 0x21, 0xd8, 0xbe, 0xc4, 0x17, 0x23, + 0xc9, 0x25, 0x09, 0x82, 0x9c, 0x72, 0xca, 0x21, 0x80, 0x01, 0x5f, 0x02, 0xc4, 0x07, 0x1d, 0x7c, + 0x70, 0x90, 0x1c, 0x04, 0xc4, 0x18, 0x44, 0x93, 0x43, 0xfe, 0x87, 0x3d, 0x04, 0x41, 0x7d, 0x74, + 0x77, 0x75, 0x4f, 0x93, 0xdb, 0x43, 0xae, 0x37, 0x4a, 0x72, 0xe3, 0xbc, 0x8f, 0xdf, 0xab, 0xaa, + 0x7e, 0x55, 0xef, 0xa3, 0x8a, 0xb0, 0xd6, 0xb3, 0x82, 0xc3, 0xc1, 0x41, 0xd3, 0x74, 0xfb, 0xab, + 0xae, 0x47, 0x1c, 0x7a, 0x68, 0x75, 0x83, 0x55, 0xc3, 0xb3, 0x56, 0x0f, 0x06, 0x96, 0xdd, 0x59, + 0x3d, 0x5e, 0x5b, 0xed, 0x11, 0x87, 0xf8, 0x46, 0x40, 0x3a, 0x4d, 0xcf, 0x77, 0x03, 0x17, 0xbd, + 0x1c, 0xab, 0x34, 0x23, 0x95, 0xa6, 0xe1, 0x59, 0x4d, 0xae, 0xd2, 0x3c, 0x5e, 0x5b, 0x7e, 0x4b, + 0x41, 0xed, 0xb9, 0x3d, 0x77, 0x95, 0x6b, 0x1e, 0x0c, 0xba, 0xfc, 0x17, 0xff, 0xc1, 0xff, 0x12, + 0x88, 0xcb, 0xfa, 0xd1, 0x5d, 0xda, 0xb4, 0x5c, 0x6e, 0xd6, 0x74, 0x7d, 0x92, 0x61, 0x75, 0xf9, + 0x56, 0x2c, 0xd3, 0x37, 0xcc, 0x43, 0xcb, 0x21, 0xfe, 0xc9, 0xaa, 0x77, 0xd4, 0x63, 0x04, 0xba, + 0xda, 0x27, 0x81, 0x91, 0xa5, 0x75, 0xe7, 0x34, 0x2d, 0x7f, 0xe0, 0x04, 0x56, 0x9f, 0xac, 0x52, + 0xf3, 0x90, 0xf4, 0x8d, 0xb4, 0x9e, 0xfe, 0x8f, 0x25, 0xb8, 0xd6, 0xb2, 0x1c, 0xc3, 0x3f, 0x69, + 0xb1, 0x39, 0x61, 0xf2, 0xe1, 0x80, 0xd0, 0xe0, 0xb1, 0x17, 0x58, 0xae, 0x43, 0xd1, 0x1f, 0x41, + 0x85, 0x19, 0xec, 0x18, 0x81, 0x51, 0xd7, 0x6e, 0x68, 0x37, 0x6b, 0xeb, 0x5f, 0x6b, 0x0a, 0x43, + 0x4d, 0xd5, 0x50, 0xd3, 0x3b, 0xea, 0x31, 0x02, 0x6d, 0x32, 0xe9, 0xe6, 0xf1, 0x5a, 0xf3, 0xf1, + 0xc1, 0x07, 0xc4, 0x0c, 0x1e, 0x92, 0xc0, 0x68, 0xa1, 0xcf, 0x86, 0x8d, 0x4b, 0xa3, 0x61, 0x03, + 0x62, 0x1a, 0x8e, 0x50, 0xd1, 0x6b, 0x50, 0x36, 0xe8, 0x3d, 0xcb, 0x26, 0xf5, 0xc2, 0x0d, 0xed, + 0x66, 0xb5, 0x35, 0x2b, 0xa5, 0xcb, 0x1b, 0x9c, 0x8a, 0x25, 0x17, 0xdd, 0x81, 0x59, 0x9f, 0x1c, + 0x5b, 0xd4, 0x72, 0x9d, 0x4d, 0xb7, 0xdf, 0xb7, 0x82, 0x7a, 0x31, 0x29, 0x2f, 0xa8, 0x38, 0x25, + 0x85, 0xbe, 0x01, 0x73, 0x21, 0xe5, 0x21, 0xa1, 0xd4, 0xe8, 0x91, 0x7a, 0x89, 0x2b, 0xce, 0x49, + 0xc5, 0x69, 0x49, 0xc6, 0x69, 0x39, 0xd4, 0x02, 0x14, 0x92, 0x36, 0x06, 0xc1, 0xa1, 0xeb, 0x3f, + 0x32, 0xfa, 0xa4, 0x3e, 0xc5, 0xb5, 0xa3, 0x49, 0xc5, 0x1c, 0x9c, 0x21, 0x8d, 0xb6, 0x61, 0x31, + 0x49, 0xdd, 0xee, 0x1b, 0x96, 0x5d, 0x2f, 0x73, 0x90, 0x45, 0x09, 0x52, 0x53, 0x58, 0x38, 0x4b, + 0x1e, 0x7d, 0x07, 0xae, 0x24, 0xe7, 0x15, 0x10, 0x31, 0x9a, 0x69, 0x0e, 0x74, 0x45, 0x02, 0x5d, + 0x4e, 0x30, 0x71, 0xb6, 0x0e, 0x7a, 0x04, 0x2f, 0x8d, 0x31, 0xc4, 0xb0, 0x2a, 0x1c, 0xed, 0x25, + 0x89, 0x36, 0x9b, 0xe4, 0xe2, 0x53, 0xb4, 0xf4, 0x6f, 0xc1, 0x82, 0xe2, 0x41, 0x6d, 0x77, 0xe0, + 0x9b, 0x44, 0xf9, 0xae, 0xda, 0x59, 0xdf, 0x55, 0xff, 0xb1, 0x06, 0x57, 0x5a, 0x56, 0x70, 0x30, + 0x30, 0x8f, 0x48, 0xf0, 0x2e, 0x39, 0x78, 0xdb, 0x75, 0x8f, 0x36, 0x8d, 0x01, 0x25, 0xe8, 0x43, + 0x00, 0xd3, 0xed, 0xf7, 0x5d, 0xa7, 0xed, 0x11, 0x53, 0x7a, 0xdf, 0xed, 0xe6, 0x33, 0xb7, 0x64, + 0x73, 0x93, 0x2b, 0xa9, 0x50, 0xad, 0x65, 0x69, 0x1c, 0x8d, 0xf3, 0xb0, 0x62, 0x44, 0xff, 0x69, + 0x01, 0xa6, 0xf8, 0x24, 0x5e, 0x80, 0xe3, 0x3f, 0x82, 0x12, 0x65, 0x13, 0x2b, 0x70, 0xf4, 0x37, + 0x73, 0x4c, 0x4c, 0x2c, 0xaf, 0x47, 0xcc, 0xd6, 0x8c, 0x44, 0x2e, 0xb1, 0x5f, 0x98, 0xe3, 0xa0, + 0x77, 0xa0, 0x4c, 0x03, 0x23, 0x18, 0x50, 0xbe, 0x31, 0x6a, 0xeb, 0xcd, 0xdc, 0x88, 0x5c, 0x2b, + 0xfe, 0x40, 0xe2, 0x37, 0x96, 0x68, 0xfa, 0xdf, 0x14, 0xa0, 0xc6, 0xe5, 0x36, 0x5d, 0xa7, 0x6b, + 0xf5, 0x5e, 0xc0, 0xca, 0xec, 0x27, 0x56, 0x66, 0x3d, 0xef, 0x3c, 0xc4, 0xf8, 0x4e, 0x5d, 0x9f, + 0x27, 0xa9, 0xf5, 0xb9, 0x35, 0x21, 0xee, 0xd9, 0xab, 0xf4, 0x4b, 0x0d, 0xe6, 0x14, 0xe9, 0x5d, + 0x8b, 0x06, 0xe8, 0xc9, 0xd8, 0x4a, 0x35, 0xf3, 0xad, 0x14, 0xd3, 0xe6, 0xeb, 0x34, 0x2f, 0xad, + 0x55, 0x42, 0x8a, 0xb2, 0x4a, 0x6d, 0x98, 0xb2, 0x02, 0xd2, 0xa7, 0xf5, 0xc2, 0x8d, 0xe2, 0x24, + 0x9f, 0x5b, 0x0c, 0xb0, 0x75, 0x59, 0x42, 0x4f, 0xed, 0x30, 0x10, 0x2c, 0xb0, 0xf4, 0xdf, 0x14, + 0x13, 0xd3, 0x60, 0xcb, 0x87, 0x4c, 0xa8, 0x04, 0xbe, 0xd5, 0xeb, 0x11, 0x9f, 0xd6, 0x35, 0x6e, + 0xeb, 0x76, 0x5e, 0x5b, 0xfb, 0x42, 0x6f, 0xcf, 0xb5, 0x2d, 0xf3, 0x24, 0x9e, 0x8d, 0x24, 0x53, + 0x1c, 0x01, 0xa3, 0x0d, 0xa8, 0xfa, 0x03, 0x47, 0x08, 0xca, 0x48, 0xf0, 0x8a, 0x14, 0xaf, 0xe2, + 0x90, 0xf1, 0x74, 0xd8, 0x98, 0x15, 0x51, 0x2a, 0xa4, 0xe0, 0x58, 0x0b, 0x19, 0x89, 0xf3, 0x42, + 0x7c, 0xe4, 0xb7, 0x72, 0x9f, 0x17, 0xdc, 0x6f, 0x22, 0xbf, 0x8c, 0x69, 0xea, 0xf9, 0x80, 0x3a, + 0x70, 0x9d, 0x0e, 0x4c, 0x93, 0x50, 0xda, 0x1d, 0xd8, 0x7c, 0x24, 0xf4, 0x6d, 0x8b, 0x06, 0xae, + 0x7f, 0xb2, 0x6b, 0xb1, 0x90, 0xc4, 0x22, 0xcb, 0x54, 0xeb, 0xc6, 0x68, 0xd8, 0xb8, 0xde, 0x3e, + 0x43, 0x0e, 0x9f, 0x89, 0x82, 0xde, 0x83, 0x7a, 0xd7, 0xb0, 0x6c, 0xd2, 0xc9, 0xb0, 0x30, 0xc5, + 0x2d, 0x5c, 0x1f, 0x0d, 0x1b, 0xf5, 0x7b, 0xa7, 0xc8, 0xe0, 0x53, 0xb5, 0xf5, 0x07, 0xb0, 0x30, + 0xe6, 0xd2, 0xe8, 0x36, 0xd4, 0x6c, 0x83, 0x06, 0xef, 0x10, 0x9f, 0x9d, 0xed, 0xdc, 0x53, 0x8b, + 0x71, 0x68, 0xda, 0x8d, 0x59, 0x58, 0x95, 0xd3, 0x7f, 0xae, 0x41, 0x95, 0x83, 0xbd, 0x00, 0x5f, + 0x7f, 0x98, 0xf4, 0xf5, 0x9b, 0x79, 0xfd, 0xef, 0x14, 0x2f, 0x07, 0xa8, 0x88, 0x91, 0xbb, 0x3d, + 0xfd, 0xd3, 0x92, 0xf4, 0xf8, 0x5d, 0xb7, 0x17, 0x66, 0x3d, 0xab, 0x50, 0x35, 0x5d, 0x27, 0x30, + 0xd8, 0x90, 0x65, 0xf8, 0x5a, 0x08, 0x9d, 0x71, 0x33, 0x64, 0xe0, 0x58, 0x86, 0x05, 0xbb, 0xae, + 0x6b, 0xdb, 0xee, 0x47, 0xdc, 0x75, 0x2b, 0xf1, 0x29, 0x71, 0x8f, 0x53, 0xb1, 0xe4, 0xa2, 0x37, + 0xa1, 0xe2, 0xb1, 0x20, 0xea, 0xca, 0x53, 0xa8, 0x12, 0xcf, 0x7a, 0x4f, 0xd2, 0x71, 0x24, 0x81, + 0x6e, 0xc1, 0x0c, 0xb5, 0x1c, 0x93, 0xb4, 0x89, 0xe9, 0x3a, 0x1d, 0xca, 0xbd, 0xab, 0xd8, 0x9a, + 0x1f, 0x0d, 0x1b, 0x33, 0x6d, 0x85, 0x8e, 0x13, 0x52, 0xe8, 0x5d, 0xa8, 0xf2, 0xdf, 0xfb, 0x96, + 0x4c, 0x56, 0x6a, 0xeb, 0xbf, 0x93, 0xef, 0x53, 0x30, 0x8d, 0xd6, 0x65, 0x36, 0xc9, 0x76, 0x08, + 0x80, 0x63, 0x2c, 0xb4, 0x0e, 0xc0, 0x12, 0x49, 0x1a, 0x18, 0x7d, 0x8f, 0xf2, 0x0c, 0xa6, 0x12, + 0x6f, 0x98, 0xfd, 0x88, 0x83, 0x15, 0x29, 0xf4, 0x06, 0x54, 0x03, 0xc3, 0xb2, 0x77, 0x2d, 0x87, + 0x50, 0x9e, 0xab, 0x14, 0x85, 0x81, 0xfd, 0x90, 0x88, 0x63, 0x3e, 0x6a, 0x02, 0xd8, 0xcc, 0x4d, + 0x5b, 0x27, 0x01, 0xa1, 0x3c, 0x17, 0x29, 0xb6, 0x66, 0x19, 0xf8, 0x6e, 0x44, 0xc5, 0x8a, 0x04, + 0x5b, 0x75, 0xc7, 0xfd, 0xc8, 0xb0, 0x82, 0x7a, 0x35, 0xb9, 0xea, 0x8f, 0xdc, 0x77, 0x0d, 0x2b, + 0xc0, 0x92, 0x8b, 0x5e, 0x85, 0xe9, 0x63, 0xe9, 0xdc, 0xc0, 0x41, 0x6b, 0x2c, 0xed, 0x0b, 0x9d, + 0x3a, 0xe4, 0xe9, 0x3f, 0x0e, 0x03, 0xdd, 0xe3, 0x41, 0xe0, 0x0d, 0x02, 0xf4, 0x2d, 0x28, 0x04, + 0xae, 0x74, 0xe6, 0x57, 0x94, 0x15, 0x6c, 0xb2, 0xc4, 0x3d, 0x0e, 0x68, 0x98, 0x74, 0x89, 0x4f, + 0x1c, 0x93, 0xb4, 0xca, 0xa3, 0x61, 0xa3, 0xb0, 0xef, 0xe2, 0x42, 0xe0, 0xa2, 0xf7, 0x00, 0xbc, + 0x01, 0x3d, 0x6c, 0x13, 0xd3, 0x27, 0x81, 0x8c, 0x64, 0x37, 0xb3, 0x40, 0x76, 0x5d, 0xd3, 0xb0, + 0xd3, 0x48, 0x7c, 0xd6, 0x7b, 0x91, 0x3e, 0x56, 0xb0, 0x50, 0x07, 0x6a, 0x56, 0xdf, 0xe8, 0x91, + 0x5d, 0xe3, 0x80, 0xd8, 0xcc, 0x8d, 0x8a, 0x39, 0xcf, 0xb9, 0x9d, 0x48, 0x2b, 0xde, 0xdd, 0x31, + 0x8d, 0x62, 0x15, 0x56, 0xff, 0x13, 0x0d, 0x16, 0xf9, 0x62, 0xec, 0xb9, 0x34, 0x10, 0xf9, 0x1e, + 0x3f, 0x01, 0x5f, 0x85, 0x69, 0x76, 0x1e, 0x1a, 0x4e, 0x87, 0xc7, 0x82, 0xaa, 0x58, 0xcb, 0x4d, + 0x41, 0xc2, 0x21, 0x0f, 0x5d, 0x87, 0x92, 0xe1, 0xf7, 0xc4, 0x7e, 0xad, 0xb6, 0x2a, 0x2c, 0x14, + 0x6f, 0xf8, 0x3d, 0x8a, 0x39, 0x95, 0x7d, 0x38, 0x6a, 0xfa, 0x96, 0x37, 0x96, 0xc3, 0xb7, 0x39, + 0x15, 0x4b, 0xae, 0xfe, 0xcb, 0x69, 0x98, 0x51, 0xab, 0x92, 0x17, 0x90, 0x7b, 0xbc, 0x0f, 0x95, + 0x30, 0xcb, 0x95, 0x5f, 0x6d, 0x2d, 0xc7, 0xd2, 0x8a, 0x9c, 0x17, 0x4b, 0xc5, 0xd6, 0x0c, 0xdb, + 0xd0, 0xe1, 0x2f, 0x1c, 0x01, 0x22, 0x02, 0xf3, 0x32, 0xe0, 0x91, 0x4e, 0xeb, 0x84, 0xaf, 0xbd, + 0x8c, 0x53, 0xb9, 0xfc, 0x6b, 0x69, 0x34, 0x6c, 0xcc, 0xef, 0xa7, 0x00, 0xf0, 0x18, 0x24, 0xda, + 0x80, 0x52, 0xd7, 0x77, 0xfb, 0xfc, 0xbc, 0xc8, 0x09, 0xcd, 0xbf, 0xd0, 0x3d, 0xdf, 0xed, 0x63, + 0xae, 0x8a, 0xde, 0x83, 0xf2, 0x01, 0x4f, 0xe9, 0xe5, 0x09, 0x92, 0x2b, 0x59, 0x4a, 0xd7, 0x00, + 0x2d, 0x60, 0xdf, 0x54, 0x90, 0xb1, 0xc4, 0x43, 0x6b, 0xc9, 0x68, 0x53, 0xe6, 0x1b, 0x72, 0xee, + 0xac, 0x48, 0x83, 0xbe, 0x01, 0x45, 0xe2, 0x1c, 0xd7, 0xa7, 0xb9, 0xa7, 0x2f, 0x67, 0x4d, 0x67, + 0xdb, 0x39, 0x7e, 0xc7, 0xf0, 0x5b, 0x35, 0xf9, 0x69, 0x8b, 0xdb, 0xce, 0x31, 0x66, 0x3a, 0xe8, + 0x08, 0x6a, 0xca, 0xf2, 0xd4, 0x2b, 0x1c, 0xe2, 0xd6, 0x84, 0xe9, 0x8b, 0xa8, 0x21, 0xa2, 0x3d, + 0xa3, 0x7c, 0x01, 0xac, 0xa2, 0xa3, 0x1f, 0x69, 0x70, 0xa5, 0xe3, 0x9a, 0x47, 0xc4, 0x6f, 0x07, + 0xac, 0xc4, 0xee, 0x9d, 0xc8, 0x80, 0xc2, 0xcf, 0xa7, 0xda, 0xfa, 0xdd, 0x1c, 0x76, 0xb7, 0xb2, + 0xf4, 0x5b, 0xd7, 0x46, 0xc3, 0xc6, 0x95, 0x4c, 0x16, 0xce, 0xb6, 0xc8, 0xc7, 0x42, 0xf9, 0x57, + 0x48, 0x8f, 0x05, 0x72, 0x8f, 0xa5, 0x9d, 0xa5, 0x2f, 0xc6, 0x92, 0xc9, 0xc2, 0xd9, 0x16, 0xf5, + 0x7f, 0x9d, 0x92, 0x07, 0xab, 0x2c, 0x0d, 0xbf, 0x0e, 0xa5, 0xe0, 0xc4, 0x0b, 0x0b, 0xc3, 0x46, + 0x98, 0xab, 0xef, 0x9f, 0x78, 0xe4, 0xe9, 0xb0, 0x31, 0xa7, 0x88, 0x32, 0x12, 0xe6, 0xc2, 0x8a, + 0x47, 0x16, 0x9e, 0xb3, 0x47, 0x36, 0x01, 0xc4, 0x1a, 0x76, 0x59, 0xb5, 0x2a, 0x4f, 0x24, 0x76, + 0x40, 0x6c, 0x45, 0x54, 0xac, 0x48, 0xa0, 0x5d, 0x28, 0xf6, 0x64, 0xae, 0x97, 0xef, 0x74, 0xb8, + 0x6f, 0x05, 0xea, 0x18, 0xa6, 0x99, 0x87, 0xde, 0xb7, 0x02, 0xcc, 0x60, 0x58, 0xd9, 0xc6, 0xcf, + 0x5d, 0x5a, 0x9f, 0xca, 0x9d, 0xc7, 0xf3, 0x6d, 0x2e, 0xd1, 0xa2, 0xb3, 0x93, 0x13, 0x29, 0x96, + 0x68, 0x2c, 0x5a, 0xb3, 0xfc, 0x84, 0x7c, 0x1c, 0x6c, 0x59, 0xbe, 0xec, 0x37, 0x28, 0xe9, 0x6d, + 0xc8, 0xc1, 0x8a, 0x14, 0xfa, 0x3e, 0xcc, 0xc8, 0x2f, 0x28, 0xc2, 0xd6, 0xf4, 0x84, 0x61, 0x4b, + 0xa4, 0x26, 0x0a, 0x02, 0x4e, 0xe0, 0xa1, 0x3f, 0x84, 0x69, 0xca, 0xff, 0xa2, 0x13, 0xec, 0x44, + 0xa1, 0xab, 0x2e, 0x60, 0xd4, 0xb9, 0x11, 0x2c, 0x8a, 0x43, 0x54, 0x74, 0xc4, 0x27, 0xdd, 0xb5, + 0x7a, 0x0f, 0x0d, 0x8f, 0xed, 0x3a, 0x66, 0xe3, 0x77, 0x73, 0x95, 0x00, 0x52, 0x49, 0x35, 0xa3, + 0xae, 0x96, 0x84, 0xc4, 0x0a, 0xbc, 0xfe, 0x6f, 0x61, 0x02, 0xcc, 0x03, 0xa3, 0x91, 0xd1, 0xad, + 0x78, 0xce, 0xd5, 0x47, 0xea, 0x30, 0x2b, 0xfc, 0x36, 0x0f, 0x33, 0xfd, 0xd3, 0xe9, 0x70, 0xd3, + 0x8a, 0x2a, 0x61, 0x0d, 0xa6, 0xbc, 0x43, 0x83, 0x86, 0xbb, 0xf6, 0x2b, 0x61, 0x62, 0xbd, 0xc7, + 0x88, 0x4f, 0x87, 0x0d, 0x10, 0xd9, 0x02, 0xfb, 0x85, 0x85, 0x24, 0x4f, 0xa3, 0x0d, 0xc7, 0x24, + 0xb6, 0x4d, 0x3a, 0x32, 0x31, 0x8e, 0xd3, 0xe8, 0x90, 0x81, 0x63, 0x19, 0x74, 0x07, 0xca, 0x3e, + 0x31, 0xa8, 0xeb, 0xc8, 0x5d, 0xb8, 0x12, 0xfa, 0x36, 0xe6, 0xd4, 0xa7, 0xcc, 0xbb, 0x44, 0xd9, + 0xcd, 0x7f, 0x63, 0x29, 0x8d, 0x5e, 0x87, 0xe9, 0xfe, 0xd9, 0xbd, 0xbd, 0x90, 0x8f, 0xba, 0x30, + 0x4b, 0x03, 0xc3, 0x0f, 0xa2, 0x7c, 0xf5, 0x1c, 0x29, 0x32, 0x1a, 0x0d, 0x1b, 0xb3, 0xed, 0x04, + 0x0a, 0x4e, 0xa1, 0xa2, 0x01, 0x2c, 0x9a, 0x6e, 0xdf, 0xb3, 0x09, 0x3b, 0x02, 0x63, 0x63, 0xe5, + 0x89, 0x8d, 0x5d, 0x1d, 0x0d, 0x1b, 0x8b, 0x9b, 0xe3, 0x50, 0x38, 0x0b, 0x1f, 0xfd, 0x1e, 0x54, + 0x3a, 0x03, 0xdf, 0x60, 0x44, 0x99, 0x6e, 0xbf, 0x1c, 0x16, 0x18, 0x5b, 0x92, 0xfe, 0x74, 0xd8, + 0xb8, 0xcc, 0x32, 0xf4, 0x66, 0x48, 0xc0, 0x91, 0x0a, 0x3a, 0x80, 0x65, 0x97, 0x27, 0xbf, 0xe2, + 0xe8, 0x13, 0x09, 0x46, 0xb8, 0xbd, 0x65, 0x77, 0x50, 0x97, 0x80, 0xcb, 0x8f, 0x4f, 0x95, 0xc4, + 0x67, 0xa0, 0xa0, 0xfb, 0x50, 0x16, 0x9b, 0x48, 0x46, 0xc5, 0x5c, 0xf9, 0x09, 0x88, 0x0e, 0x2f, + 0x53, 0xc3, 0x52, 0x1d, 0x3d, 0x81, 0xb2, 0x30, 0x23, 0x43, 0xda, 0xad, 0xc9, 0x1a, 0x5e, 0x62, + 0xf8, 0xf1, 0xf9, 0x29, 0x7e, 0x63, 0x89, 0x89, 0xf6, 0x79, 0xbb, 0x88, 0x9d, 0xcb, 0x35, 0xbe, + 0xcf, 0xf2, 0x34, 0xe8, 0xda, 0x4c, 0x61, 0xc7, 0xe9, 0xba, 0x89, 0x36, 0x11, 0x3f, 0x95, 0x05, + 0x16, 0x3b, 0x95, 0x6d, 0xb7, 0xd7, 0x76, 0x2c, 0xcf, 0x23, 0x41, 0x7d, 0x26, 0x79, 0x2a, 0xef, + 0x46, 0x1c, 0xac, 0x48, 0xe9, 0xa6, 0x2c, 0xda, 0xd5, 0x61, 0xa3, 0x47, 0x4a, 0x71, 0x72, 0xe7, + 0x3c, 0x13, 0xdf, 0x77, 0xd5, 0x7a, 0x45, 0xdf, 0x95, 0xe9, 0x7e, 0x52, 0x04, 0xdd, 0x96, 0xc5, + 0xc6, 0x96, 0xd5, 0x23, 0x34, 0x90, 0x7b, 0x3f, 0x59, 0x3d, 0x08, 0x16, 0x56, 0xe5, 0xf4, 0x5f, + 0x94, 0xe0, 0xb2, 0x84, 0x13, 0xa9, 0x00, 0xba, 0x9d, 0x88, 0xf9, 0x2f, 0xa7, 0x62, 0xfe, 0x42, + 0x42, 0x58, 0x89, 0xfa, 0x3e, 0xcc, 0x26, 0xf3, 0x1b, 0x19, 0xfd, 0xef, 0xe4, 0x4e, 0xa5, 0x12, + 0xc8, 0x62, 0xeb, 0x26, 0x13, 0x29, 0x9c, 0xb2, 0xc0, 0x6c, 0x26, 0xf3, 0x18, 0x99, 0xa3, 0xdf, + 0xc9, 0x9d, 0x32, 0x65, 0xd8, 0x4c, 0x26, 0x4c, 0x38, 0x65, 0x81, 0xd9, 0x34, 0x07, 0x34, 0x70, + 0xfb, 0x91, 0xcd, 0x52, 0x6e, 0x9b, 0x9b, 0x5c, 0x31, 0xc3, 0xe6, 0x66, 0x02, 0x11, 0xa7, 0x2c, + 0xa0, 0x9f, 0x69, 0x70, 0xf5, 0x03, 0xe2, 0x1c, 0x59, 0x0e, 0xdd, 0xb3, 0x3c, 0x62, 0x5b, 0x4e, + 0x3c, 0x63, 0x71, 0x28, 0xfe, 0x7e, 0x0e, 0xeb, 0x0f, 0x92, 0x08, 0xc9, 0x61, 0x7c, 0x65, 0x34, + 0x6c, 0x5c, 0x7d, 0x90, 0x6d, 0x03, 0x9f, 0x66, 0x5c, 0xff, 0xe1, 0x94, 0xf4, 0x78, 0x35, 0x64, + 0xa9, 0x87, 0xbc, 0xf6, 0x8c, 0x43, 0xde, 0x87, 0x59, 0x7e, 0xcd, 0x65, 0x99, 0xb2, 0xd3, 0x3f, + 0x81, 0xd7, 0xdc, 0x4f, 0x28, 0x8a, 0x68, 0xc9, 0x57, 0x33, 0xc9, 0xc0, 0x29, 0x0b, 0xc8, 0x81, + 0xcb, 0x02, 0x3c, 0x34, 0x59, 0xcc, 0x7d, 0x61, 0x71, 0xdf, 0x0a, 0xde, 0x8e, 0xf4, 0x84, 0xc5, + 0x85, 0xd1, 0xb0, 0x71, 0x39, 0x41, 0xc7, 0x49, 0x78, 0x34, 0x80, 0x79, 0xbe, 0xe3, 0x36, 0x0f, + 0x0d, 0xa7, 0x27, 0x96, 0x5d, 0xfa, 0xcc, 0xd7, 0xf3, 0x66, 0x90, 0x42, 0x55, 0x18, 0xe4, 0xb5, + 0xe5, 0x4e, 0x0a, 0x10, 0x8f, 0x99, 0x90, 0xd3, 0xb4, 0x8d, 0x68, 0x9a, 0x53, 0x93, 0x4c, 0x73, + 0xd7, 0xc8, 0x9e, 0x66, 0x4c, 0xc7, 0x49, 0x78, 0xf4, 0x03, 0x98, 0x3f, 0x48, 0xdd, 0x0e, 0xc9, + 0x20, 0x7a, 0x37, 0x57, 0x01, 0x90, 0x71, 0xb1, 0x24, 0xe6, 0x9a, 0x66, 0xe1, 0x31, 0x3b, 0xfa, + 0xcf, 0x4b, 0x80, 0xc6, 0xdb, 0xd8, 0xe8, 0x56, 0xe2, 0x28, 0xbb, 0x91, 0x3a, 0xca, 0xe6, 0x55, + 0x0d, 0xe5, 0x24, 0x7b, 0x02, 0x65, 0x31, 0xde, 0x09, 0xda, 0x0a, 0x72, 0x20, 0x12, 0x2c, 0xcb, + 0x29, 0x24, 0x26, 0xcb, 0xac, 0xa5, 0x3f, 0x4a, 0xbf, 0x3b, 0x07, 0x7c, 0x96, 0x97, 0x87, 0xa8, + 0xe8, 0x50, 0x06, 0x02, 0xe1, 0x0b, 0xd2, 0xd3, 0x6e, 0x4f, 0xe6, 0x69, 0xa1, 0xa1, 0xb9, 0x28, + 0x76, 0x08, 0x3a, 0x56, 0xa1, 0xe5, 0x42, 0xd9, 0xc6, 0x81, 0x74, 0xad, 0x0b, 0x2c, 0x94, 0xe2, + 0x56, 0x12, 0x13, 0x11, 0xa8, 0x46, 0xdf, 0x59, 0x3a, 0xd2, 0x39, 0x0c, 0x64, 0x7b, 0x50, 0x8c, + 0xac, 0xff, 0xaa, 0x0c, 0x4a, 0x16, 0x8f, 0xbe, 0x0d, 0xb3, 0x94, 0xf8, 0xc7, 0x96, 0x49, 0x36, + 0x4c, 0xd3, 0x1d, 0x38, 0x61, 0x24, 0x8d, 0x6e, 0x5a, 0xdb, 0x09, 0x2e, 0x4e, 0x49, 0xf3, 0xbb, + 0x3d, 0x1e, 0x30, 0xa4, 0xf3, 0xe4, 0xbf, 0xdb, 0x4b, 0x15, 0x89, 0xb2, 0x51, 0x25, 0xd1, 0x12, + 0xdd, 0xae, 0xe2, 0xf3, 0xee, 0x76, 0x7d, 0x1f, 0x2a, 0x34, 0x19, 0xcd, 0xbe, 0x96, 0x3f, 0x51, + 0x91, 0x01, 0x24, 0x6a, 0x8f, 0x47, 0x51, 0x23, 0xc2, 0x64, 0x8b, 0x22, 0xf3, 0xbf, 0xa9, 0xc9, + 0x16, 0xe5, 0x19, 0x99, 0xdf, 0x1f, 0x40, 0xd5, 0x27, 0x62, 0x81, 0xa8, 0x74, 0x91, 0xcc, 0x12, + 0x18, 0x4b, 0x21, 0x4c, 0x3e, 0x1c, 0x58, 0x3e, 0xe9, 0x13, 0x27, 0xa0, 0x71, 0x81, 0x13, 0x72, + 0x29, 0x8e, 0xd1, 0xd0, 0x07, 0x00, 0x5e, 0xd4, 0x4f, 0x95, 0xe5, 0x75, 0xee, 0xec, 0x2d, 0xd9, + 0x89, 0x8d, 0xd3, 0xc6, 0x98, 0x8e, 0x15, 0x74, 0xf4, 0x3e, 0x5c, 0x8b, 0x2b, 0x84, 0x2d, 0x62, + 0x74, 0x78, 0x8c, 0x95, 0x57, 0x09, 0xa2, 0xb9, 0xfe, 0xd5, 0xd1, 0xb0, 0x71, 0x6d, 0xf3, 0x34, + 0x21, 0x7c, 0xba, 0x3e, 0xea, 0xc3, 0x8c, 0xe3, 0x76, 0x48, 0x9b, 0xd8, 0xc4, 0x0c, 0x5c, 0x5f, + 0xa6, 0xf2, 0x79, 0x4a, 0x6d, 0xd1, 0x14, 0x32, 0xec, 0x47, 0x8a, 0xba, 0x68, 0x1c, 0xa8, 0x14, + 0x9c, 0x80, 0xd7, 0xff, 0x5c, 0x83, 0x8c, 0xab, 0xfb, 0x84, 0xfb, 0x6a, 0xcf, 0xdb, 0x7d, 0x5f, + 0x83, 0x32, 0x8d, 0xbb, 0xf7, 0x6a, 0x93, 0x5a, 0xb4, 0x36, 0x24, 0x57, 0xff, 0x7b, 0x0d, 0x96, + 0xb2, 0xfa, 0x07, 0xcc, 0x8f, 0xa2, 0x6e, 0x81, 0x1c, 0x5e, 0xfe, 0x56, 0x8a, 0x7a, 0xdf, 0x24, + 0x20, 0x70, 0x8c, 0xc6, 0xce, 0x93, 0x0e, 0xa1, 0x81, 0xe5, 0xf0, 0xb2, 0x6d, 0xcb, 0xf2, 0xe5, + 0x18, 0xa3, 0xf3, 0x64, 0x2b, 0xc1, 0xc5, 0x29, 0x69, 0xfd, 0x27, 0x25, 0x58, 0xcc, 0x48, 0x1b, + 0xd1, 0xb6, 0xec, 0x1c, 0x4f, 0x70, 0xe9, 0x11, 0x5d, 0xb5, 0x27, 0xba, 0xc7, 0xe0, 0x0d, 0x6c, + 0xfb, 0x62, 0x97, 0x1f, 0xa1, 0x3e, 0x56, 0xb0, 0xc2, 0x56, 0x70, 0xf1, 0x1c, 0xad, 0xe0, 0x07, + 0x80, 0xc8, 0xc7, 0x9e, 0x4b, 0x89, 0x4c, 0xff, 0x5d, 0x1e, 0x02, 0x4a, 0xbc, 0x2d, 0x11, 0xbd, + 0x0f, 0xd9, 0x1e, 0x93, 0xc0, 0x19, 0x5a, 0x68, 0x15, 0xaa, 0x5d, 0xd7, 0x37, 0x09, 0x1b, 0x25, + 0x3f, 0x7d, 0x94, 0xce, 0xc6, 0xbd, 0x90, 0x81, 0x63, 0x19, 0xf4, 0x5e, 0xdc, 0xf9, 0x2a, 0xe7, + 0xbe, 0xb0, 0x11, 0x73, 0xe6, 0x9b, 0xfd, 0xf4, 0x96, 0xd7, 0x06, 0xcc, 0x71, 0x85, 0x8d, 0xbd, + 0x9d, 0xb0, 0xa7, 0x2e, 0xde, 0x04, 0x5d, 0x95, 0x2a, 0xa2, 0x9f, 0x1a, 0xb3, 0x71, 0x5a, 0x5e, + 0xff, 0xac, 0x04, 0x8b, 0x19, 0xc5, 0x52, 0x74, 0x8f, 0xa0, 0x5d, 0xe4, 0x1e, 0xe1, 0xb7, 0xe5, + 0x09, 0xaf, 0xc3, 0xb4, 0xe3, 0x6e, 0x1a, 0xe6, 0x21, 0x91, 0x37, 0xa9, 0xd1, 0x12, 0x3d, 0x12, + 0x64, 0x1c, 0xf2, 0x43, 0xa7, 0x29, 0x9d, 0xc3, 0x69, 0x26, 0xfe, 0xd0, 0xdf, 0x0e, 0x0b, 0xd6, + 0xae, 0x65, 0x93, 0x3d, 0x23, 0x38, 0x94, 0xad, 0xd7, 0x78, 0x67, 0x26, 0xb8, 0x38, 0x25, 0x8d, + 0xbe, 0x03, 0x55, 0xf1, 0x79, 0xfc, 0x1e, 0xcd, 0x71, 0xe3, 0x11, 0x0d, 0xa6, 0x15, 0x2a, 0xe1, + 0x58, 0x1f, 0x79, 0x70, 0x95, 0x67, 0x56, 0xec, 0xcc, 0xed, 0x5b, 0x3f, 0xe0, 0xdb, 0x5f, 0x3e, + 0xb1, 0x10, 0xbd, 0x9c, 0x3b, 0xac, 0x3e, 0xdb, 0xc9, 0x16, 0x79, 0x7a, 0x3a, 0x0b, 0x9f, 0x06, + 0xab, 0xff, 0x44, 0x83, 0xec, 0x7b, 0x8a, 0xe4, 0xc4, 0xb4, 0x0b, 0x4e, 0xec, 0xd5, 0xf8, 0xe3, + 0x8b, 0xbe, 0x62, 0x2d, 0xeb, 0xc3, 0xeb, 0x7f, 0xa1, 0xc1, 0x62, 0x46, 0x3d, 0xf7, 0xe5, 0x88, + 0x1b, 0x9f, 0x17, 0xd2, 0x83, 0xdb, 0x3e, 0x26, 0x4e, 0x70, 0xbe, 0xdb, 0x91, 0x6d, 0x71, 0x27, + 0x51, 0x90, 0xed, 0xc5, 0x5c, 0xc5, 0x18, 0x6f, 0x54, 0x25, 0x2f, 0x23, 0x2e, 0x70, 0xbc, 0x9e, + 0x7e, 0xf9, 0x55, 0x7a, 0xd1, 0x97, 0x5f, 0xfa, 0x3f, 0x68, 0x30, 0x9b, 0xbc, 0x74, 0x41, 0x5f, + 0x85, 0xe2, 0xc0, 0xb7, 0xe4, 0xa2, 0x46, 0xa3, 0xff, 0x2e, 0xde, 0xc1, 0x8c, 0xce, 0xd8, 0x3e, + 0xe9, 0xca, 0x2f, 0x16, 0xb1, 0x31, 0xe9, 0x62, 0x46, 0x47, 0x04, 0x6a, 0x9e, 0xef, 0x7e, 0x7c, + 0x22, 0x82, 0xf1, 0x04, 0x0f, 0xec, 0xf6, 0x62, 0xad, 0xb8, 0x6d, 0xa6, 0x10, 0xb1, 0x8a, 0xcb, + 0xd3, 0x9c, 0xf1, 0x66, 0xc0, 0x97, 0xc3, 0x5d, 0x7f, 0x55, 0x80, 0x69, 0xe9, 0x34, 0xe8, 0x43, + 0x98, 0xed, 0x25, 0x96, 0x77, 0x82, 0x61, 0xa5, 0x2e, 0xc3, 0xa2, 0x73, 0x31, 0x49, 0xc7, 0x29, + 0x03, 0xe8, 0x8f, 0x61, 0xa1, 0x67, 0x05, 0xc9, 0x39, 0x4d, 0x70, 0x13, 0x78, 0x3f, 0xad, 0xdb, + 0xba, 0x26, 0x0d, 0x2f, 0x8c, 0xb1, 0xf0, 0xb8, 0x25, 0xf4, 0x18, 0x4a, 0x3e, 0xe9, 0x4e, 0xf2, + 0xda, 0x82, 0xed, 0x29, 0xd2, 0xe5, 0x7b, 0x2c, 0x4a, 0x91, 0x30, 0xe9, 0x52, 0xcc, 0x81, 0xf4, + 0x4f, 0xc5, 0xa7, 0x4e, 0x35, 0x44, 0xfe, 0x27, 0xde, 0xbc, 0xfe, 0x97, 0x06, 0x10, 0x0f, 0xf6, + 0xff, 0xdf, 0xb7, 0xd5, 0xff, 0xae, 0x00, 0xe3, 0x82, 0x6c, 0x5f, 0x98, 0xa2, 0x4c, 0xd3, 0x32, + 0xdf, 0x99, 0x4b, 0x2e, 0x7a, 0x02, 0x65, 0x83, 0x3f, 0xd4, 0x9e, 0x60, 0xc4, 0xc2, 0xd4, 0xa6, + 0xeb, 0x04, 0xbe, 0x6b, 0x7f, 0x97, 0x12, 0x5f, 0x79, 0x1d, 0xcd, 0xb1, 0xb0, 0xc4, 0x44, 0x84, + 0xd5, 0x10, 0xf2, 0xb1, 0xf5, 0x04, 0xef, 0x56, 0xc7, 0x0d, 0x28, 0xf5, 0x84, 0x84, 0xc3, 0x31, + 0xf2, 0x04, 0x17, 0x68, 0xfa, 0x8f, 0x34, 0x98, 0x4f, 0x77, 0x0f, 0x99, 0x3e, 0xcf, 0x08, 0x76, + 0xb6, 0xd2, 0xbd, 0xd9, 0x1d, 0x41, 0xc6, 0x21, 0x1f, 0x3d, 0x80, 0x69, 0x96, 0x19, 0x62, 0x79, + 0xda, 0xe6, 0xcc, 0x2b, 0x79, 0x7c, 0xbf, 0x27, 0xf4, 0x70, 0x08, 0xa0, 0xff, 0xb3, 0x06, 0x68, + 0xbc, 0xbf, 0x84, 0xf6, 0x60, 0xc9, 0x36, 0x68, 0x10, 0x5d, 0x6d, 0xee, 0x24, 0x86, 0x76, 0x5d, + 0x0e, 0x6d, 0x69, 0x37, 0x43, 0x06, 0x67, 0x6a, 0x46, 0x99, 0x70, 0xe1, 0xfc, 0x99, 0xf0, 0x6b, + 0x50, 0xf6, 0xd8, 0x5a, 0x75, 0x64, 0xba, 0x1a, 0x7d, 0xf1, 0x3d, 0x4e, 0xc5, 0x92, 0xab, 0xb7, + 0x01, 0xe2, 0x47, 0x59, 0xe8, 0x06, 0x94, 0x1c, 0xa3, 0x1f, 0x26, 0x03, 0xd1, 0x41, 0xc2, 0x5f, + 0xf7, 0x73, 0x0e, 0x7a, 0x05, 0xa6, 0x8e, 0x0d, 0x7b, 0x10, 0xfe, 0xfb, 0x44, 0xf4, 0xe0, 0xf1, + 0x1d, 0x46, 0xc4, 0x82, 0xa7, 0xff, 0x65, 0x01, 0x6a, 0xca, 0xa3, 0x81, 0xe7, 0x55, 0xe7, 0xbd, + 0x0b, 0x53, 0x9e, 0x11, 0x1c, 0x86, 0xcf, 0x32, 0xd7, 0x27, 0x7b, 0xba, 0xc0, 0xf2, 0xdd, 0x78, + 0xbc, 0xec, 0x17, 0xc5, 0x02, 0x2f, 0x55, 0x36, 0x14, 0x9f, 0x63, 0xd9, 0xf0, 0x12, 0x14, 0x0c, + 0xca, 0x4b, 0x81, 0xaa, 0xb8, 0xff, 0xda, 0xa0, 0xb8, 0x60, 0x50, 0xfd, 0x87, 0x1a, 0xcc, 0xa5, + 0xc6, 0x86, 0xd6, 0x01, 0x68, 0xf4, 0x4b, 0x7e, 0x82, 0xa8, 0xeb, 0x12, 0xcb, 0x61, 0x45, 0xea, + 0xc2, 0x95, 0xf9, 0xbf, 0x68, 0x70, 0xfd, 0xac, 0x2b, 0x15, 0x56, 0xef, 0xc9, 0x7b, 0x93, 0xa8, + 0xc2, 0xd0, 0x92, 0xf5, 0xde, 0x83, 0x24, 0x1b, 0xa7, 0xe5, 0xd1, 0x6d, 0xa8, 0x29, 0x24, 0x39, + 0xc0, 0x28, 0x3b, 0x51, 0xd4, 0xb1, 0x2a, 0x77, 0x81, 0xe4, 0x50, 0xff, 0x27, 0x0d, 0x96, 0xb2, + 0x1a, 0x3f, 0xa8, 0x17, 0x3e, 0xec, 0x15, 0x15, 0x41, 0xeb, 0x9c, 0x0d, 0xa4, 0x26, 0x7f, 0xde, + 0xbb, 0xed, 0x04, 0xfe, 0x49, 0xf6, 0x93, 0xdf, 0xe5, 0xbb, 0x00, 0xb1, 0x0c, 0x9a, 0x87, 0xe2, + 0x11, 0x39, 0x11, 0x0b, 0x87, 0xd9, 0x9f, 0x68, 0x29, 0xb1, 0x8d, 0xe4, 0xbe, 0xf9, 0x66, 0xe1, + 0xae, 0xf6, 0xcd, 0xca, 0x9f, 0xfd, 0x55, 0xe3, 0xd2, 0x27, 0xbf, 0xb9, 0x71, 0x49, 0xff, 0xa9, + 0x06, 0x6a, 0xee, 0x86, 0xde, 0x80, 0xea, 0x61, 0x10, 0x78, 0x9c, 0x24, 0x5f, 0x2c, 0xf0, 0xc7, + 0xad, 0x6f, 0xef, 0xef, 0xef, 0x71, 0x22, 0x8e, 0xf9, 0xa8, 0x09, 0xc0, 0x7e, 0x50, 0x21, 0x5d, + 0x8a, 0x5f, 0x19, 0x31, 0xe9, 0xb6, 0x10, 0x57, 0x24, 0x44, 0x89, 0x23, 0x84, 0xc5, 0x7f, 0x1c, + 0xc9, 0x12, 0x47, 0x48, 0x86, 0x3c, 0xfd, 0x6f, 0x35, 0x58, 0x18, 0x7b, 0x21, 0x83, 0xf6, 0xa2, + 0xa4, 0x6e, 0xd2, 0xbe, 0xd3, 0x29, 0xe9, 0xdf, 0x85, 0xfd, 0xfa, 0x2e, 0x2c, 0x09, 0x44, 0x6e, + 0x35, 0x7e, 0x0d, 0xf0, 0xcc, 0x03, 0x4e, 0xff, 0x6b, 0x0d, 0x20, 0xee, 0x84, 0xa0, 0x03, 0x98, + 0x11, 0x43, 0x4a, 0x64, 0x27, 0xf9, 0x27, 0xb8, 0x24, 0x4d, 0xcc, 0xb4, 0x15, 0x14, 0x9c, 0xc0, + 0x64, 0x55, 0x7f, 0xdf, 0x1d, 0x38, 0x01, 0xdf, 0x5d, 0x85, 0xe4, 0xfb, 0xef, 0x87, 0x21, 0x03, + 0xc7, 0x32, 0xfa, 0x27, 0x45, 0x58, 0xcc, 0xb8, 0xfa, 0xfd, 0x3f, 0xdd, 0x4f, 0x7b, 0x1d, 0xa6, + 0xc5, 0x33, 0x5d, 0x9a, 0xce, 0x19, 0xc4, 0x2b, 0x5e, 0x8a, 0x43, 0x3e, 0x5a, 0x83, 0x9a, 0xe5, + 0x98, 0xa2, 0x45, 0x6e, 0x84, 0x7d, 0x14, 0x71, 0x0b, 0x14, 0x93, 0xb1, 0x2a, 0x93, 0x6c, 0xbc, + 0x94, 0x9f, 0xdd, 0x78, 0xd1, 0xbf, 0x07, 0x0b, 0x63, 0x59, 0x4f, 0xbe, 0xf0, 0x49, 0xf8, 0xbf, + 0xbe, 0xa5, 0xc2, 0xa7, 0xf8, 0x8f, 0x37, 0xc1, 0xd3, 0x7f, 0xa6, 0xc1, 0x6c, 0x2a, 0x3d, 0x3c, + 0x57, 0x95, 0xfe, 0x58, 0xad, 0xd2, 0xcf, 0x97, 0xda, 0x26, 0xea, 0x75, 0xfd, 0x01, 0x64, 0xbf, + 0xc4, 0x4c, 0xaf, 0xb8, 0xf6, 0xec, 0x15, 0xd7, 0x7f, 0x51, 0x80, 0x6a, 0xf4, 0x80, 0x05, 0xbd, + 0x95, 0x58, 0xb9, 0x6b, 0xea, 0xca, 0x3d, 0x1d, 0x36, 0x84, 0xa0, 0xb2, 0x8c, 0xef, 0x43, 0x35, + 0x7a, 0x00, 0x15, 0x75, 0x21, 0xf2, 0x3f, 0x72, 0x8a, 0x3e, 0x6d, 0xf4, 0xaa, 0x0a, 0xc7, 0x78, + 0x2c, 0x9f, 0x0b, 0x5f, 0x28, 0x3d, 0xb4, 0x6c, 0xdb, 0xa2, 0xf2, 0x12, 0xa3, 0xc8, 0x2f, 0x31, + 0xa2, 0x7c, 0x6e, 0x2b, 0x43, 0x06, 0x67, 0x6a, 0xa2, 0x3d, 0x98, 0xa2, 0x01, 0xf1, 0xa8, 0xec, + 0x09, 0xbe, 0x91, 0xeb, 0x6d, 0x0f, 0xf1, 0x78, 0x35, 0x17, 0xb9, 0x08, 0xa3, 0x50, 0x2c, 0x80, + 0xf4, 0xff, 0xd4, 0xa0, 0x12, 0x8a, 0xa0, 0x37, 0x13, 0x8b, 0x57, 0x4f, 0x2d, 0x1e, 0x97, 0xfb, + 0x5f, 0xbb, 0x76, 0xfa, 0x50, 0x83, 0xd9, 0xe4, 0x75, 0xa8, 0xd2, 0x43, 0xd0, 0xce, 0xea, 0x21, + 0xa0, 0x37, 0xa1, 0x62, 0xd8, 0xb6, 0xfb, 0xd1, 0xb6, 0x73, 0x2c, 0xfb, 0x76, 0xd1, 0xfd, 0xde, + 0x86, 0xa4, 0xe3, 0x48, 0x02, 0x1d, 0xc3, 0x9c, 0xd0, 0x8b, 0x5f, 0xa0, 0x15, 0x73, 0x5f, 0x33, + 0x65, 0x05, 0x9b, 0xd6, 0x22, 0x4b, 0x8f, 0xda, 0x49, 0x4c, 0x9c, 0x36, 0xd2, 0xba, 0xf9, 0xd9, + 0x17, 0x2b, 0x97, 0x7e, 0xfd, 0xc5, 0xca, 0xa5, 0xcf, 0xbf, 0x58, 0xb9, 0xf4, 0xc9, 0x68, 0x45, + 0xfb, 0x6c, 0xb4, 0xa2, 0xfd, 0x7a, 0xb4, 0xa2, 0x7d, 0x3e, 0x5a, 0xd1, 0xfe, 0x7d, 0xb4, 0xa2, + 0xfd, 0xe9, 0x7f, 0xac, 0x5c, 0xfa, 0x5e, 0xe1, 0x78, 0xed, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x92, 0xe7, 0x15, 0xf6, 0x53, 0x3e, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/build/v1/generated.proto b/vendor/github.com/openshift/api/build/v1/generated.proto index a70d24247977..4ea4b3ec239a 100644 --- a/vendor/github.com/openshift/api/build/v1/generated.proto +++ b/vendor/github.com/openshift/api/build/v1/generated.proto @@ -7,9 +7,7 @@ package github.com.openshift.api.build.v1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/config/v1/register.go b/vendor/github.com/openshift/api/config/v1/register.go index cf1d1a3e6f4a..2f0ff20c4f3a 100644 --- a/vendor/github.com/openshift/api/config/v1/register.go +++ b/vendor/github.com/openshift/api/config/v1/register.go @@ -30,6 +30,8 @@ func Resource(resource string) schema.GroupResource { // Adds the list of known types to api.Scheme. func addKnownTypes(scheme *runtime.Scheme) error { scheme.AddKnownTypes(GroupVersion, + &APIServer{}, + &APIServerList{}, &Authentication{}, &AuthenticationList{}, &Build{}, diff --git a/vendor/github.com/openshift/api/config/v1/stringsource_test.go b/vendor/github.com/openshift/api/config/v1/stringsource_test.go deleted file mode 100644 index 5e58eec55c97..000000000000 --- a/vendor/github.com/openshift/api/config/v1/stringsource_test.go +++ /dev/null @@ -1,144 +0,0 @@ -package v1 - -import ( - "fmt" - "reflect" - "strings" - "testing" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" - - configapi "github.com/openshift/origin/pkg/cmd/server/apis/config" -) - -func TestStringSourceUnmarshaling(t *testing.T) { - codec := serializer.NewCodecFactory(configapi.Scheme).LegacyCodec(LegacySchemeGroupVersion) - - testcases := map[string]struct { - JSON string - ExpectedObject configapi.StringSource - ExpectedError string - }{ - "bool": { - JSON: `true`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "cannot unmarshal", - }, - "number": { - JSON: `1`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "cannot unmarshal", - }, - - "empty string": { - JSON: `""`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "", - }, - "string": { - JSON: `"foo"`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo"}}, - ExpectedError: "", - }, - - "empty struct": { - JSON: `{}`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "", - }, - "struct value": { - JSON: `{"value":"foo"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo"}}, - ExpectedError: "", - }, - "struct env": { - JSON: `{"env":"foo"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Env: "foo"}}, - ExpectedError: "", - }, - "struct file": { - JSON: `{"file":"foo"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo"}}, - ExpectedError: "", - }, - "struct file+keyFile": { - JSON: `{"file":"foo","keyFile":"bar"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo", KeyFile: "bar"}}, - ExpectedError: "", - }, - } - - for k, tc := range testcases { - // Wrap in a dummy object we can deserialize - input := fmt.Sprintf(`{"kind":"GitHubIdentityProvider","apiVersion":"v1","clientSecret":%s}`, tc.JSON) - obj, err := runtime.Decode(codec, []byte(input)) - if len(tc.ExpectedError) > 0 && (err == nil || !strings.Contains(err.Error(), tc.ExpectedError)) { - t.Errorf("%s: expected error containing %q, got %q", k, tc.ExpectedError, err.Error()) - } - if len(tc.ExpectedError) == 0 && err != nil { - t.Errorf("%s: got unexpected error: %v", k, err) - } - if err != nil { - continue - } - githubProvider, ok := obj.(*configapi.GitHubIdentityProvider) - if !ok { - t.Errorf("%s: wrapper object was not a GitHubIdentityProvider as expected: %#v", k, obj) - continue - } - if !reflect.DeepEqual(tc.ExpectedObject, githubProvider.ClientSecret) { - t.Errorf("%s: expected\n%#v\ngot\n%#v", k, tc.ExpectedObject, githubProvider.ClientSecret) - } - } -} - -func TestStringSourceMarshaling(t *testing.T) { - codec := serializer.NewCodecFactory(configapi.Scheme).LegacyCodec(LegacySchemeGroupVersion) - - testcases := map[string]struct { - Object configapi.StringSource - ExpectedJSON string - }{ - "empty string": { - Object: configapi.StringSource{}, - ExpectedJSON: `""`, - }, - "string": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo"}}, - ExpectedJSON: `"foo"`, - }, - "struct value+keyFile": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo", KeyFile: "bar"}}, - ExpectedJSON: `{"value":"foo","env":"","file":"","keyFile":"bar"}`, - }, - "struct env": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Env: "foo"}}, - ExpectedJSON: `{"value":"","env":"foo","file":"","keyFile":""}`, - }, - "struct file": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo"}}, - ExpectedJSON: `{"value":"","env":"","file":"foo","keyFile":""}`, - }, - "struct file+keyFile": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo", KeyFile: "bar"}}, - ExpectedJSON: `{"value":"","env":"","file":"foo","keyFile":"bar"}`, - }, - } - - for k, tc := range testcases { - provider := &configapi.GitHubIdentityProvider{ClientSecret: tc.Object} - - json, err := runtime.Encode(codec, provider) - if err != nil { - t.Errorf("%s: unexpected error: %v", k, err) - } - - // Wrap in a dummy JSON from the surrounding object - input := fmt.Sprintf(`{"kind":"GitHubIdentityProvider","apiVersion":"v1","clientID":"","clientSecret":%s,"organizations":null,"teams":null,"hostname":"","ca":""}`, tc.ExpectedJSON) - if strings.TrimSpace(string(json)) != input { - t.Log(len(input), len(json)) - t.Errorf("%s: expected\n%s\ngot\n%s", k, input, string(json)) - } - } -} diff --git a/vendor/github.com/openshift/api/config/v1/types_apiserver.go b/vendor/github.com/openshift/api/config/v1/types_apiserver.go new file mode 100644 index 000000000000..5f54f8f1a9c8 --- /dev/null +++ b/vendor/github.com/openshift/api/config/v1/types_apiserver.go @@ -0,0 +1,73 @@ +package v1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// +genclient +// +genclient:nonNamespaced +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// APIServer holds cluster-wide information about api-servers. The canonical name is `cluster` +type APIServer struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata,omitempty"` + Spec APIServerSpec `json:"spec"` + Status APIServerStatus `json:"status"` +} + +type APIServerSpec struct { + // servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates + // will be used for serving secure traffic. + // +optional + ServingCerts APIServerServingCerts `json:"servingCerts,omitempty"` + // clientCA references a ConfigMap containing a certificate bundle for the signers that will be recognized for + // incoming client certificates in addition to the operator managed signers. If this is empty, then only operator managed signers are valid. + // You usually only have to set this if you have your own PKI you wish to honor client certificates from. + // The ConfigMap must exist in the openshift-config namespace and contain the following required fields: + // - ConfigMap.Data["ca-bundle.crt"] - CA bundle. + // +optional + ClientCA ConfigMapNameReference `json:"clientCA,omitempty"` +} + +type APIServerServingCerts struct { + // defaultServingCertificate references a kubernetes.io/tls type secret containing the default TLS cert info for + // serving secure traffic. If no named certificates match the server name as understood by a client, this default + // certificate will be used. If defaultServingCertificate is not specified, then a operator managed certificate will + // be used. + // The secret must exist in the openshift-config namespace and contain the following required fields: + // - Secret.Data["tls.key"] - TLS private key. + // - Secret.Data["tls.crt"] - TLS certificate. + // +optional + DefaultServingCertificate SecretNameReference `json:"defaultServingCertificate,omitempty"` + // namedCertificates references secrets containing the TLS cert info for serving secure traffic to specific hostnames. + // If no named certificates are provided, or no named certificates match the server name as understood by a client, + // the defaultServingCertificate will be used. + // +optional + NamedCertificates []APIServerNamedServingCert `json:"namedCertificates,omitempty"` +} + +// APIServerNamedServingCert maps a server DNS name, as understood by a client, to a certificate. +type APIServerNamedServingCert struct { + // names is a optional list of explicit DNS names (leading wildcards allowed) that should use this certificate to + // serve secure traffic. If no names are provided, the implicit names will be extracted from the certificates. + // Exact names trump over wildcard names. Explicit names defined here trump over extracted implicit names. + // +optional + Names []string `json:"names"` + // servingCertificate references a kubernetes.io/tls type secret containing the TLS cert info for serving secure traffic. + // The secret must exist in the openshift-config namespace and contain the following required fields: + // - Secret.Data["tls.key"] - TLS private key. + // - Secret.Data["tls.crt"] - TLS certificate. + ServingCertificate SecretNameReference `json:"servingCertificate"` +} + +type APIServerStatus struct { +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +type APIServerList struct { + metav1.TypeMeta `json:",inline"` + metav1.ListMeta `json:"metadata,omitempty"` + Items []APIServer `json:"items"` +} diff --git a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go index 79eac48fb318..3f808ba92e03 100644 --- a/vendor/github.com/openshift/api/config/v1/types_cluster_version.go +++ b/vendor/github.com/openshift/api/config/v1/types_cluster_version.go @@ -88,11 +88,10 @@ type ClusterVersionStatus struct { // is preserved. History []UpdateHistory `json:"history"` - // generation reports which version of the spec is being processed. - // If this value is not equal to metadata.generation, then the - // current and conditions fields have not yet been updated to reflect - // the latest request. - Generation int64 `json:"generation"` + // observedGeneration reports which version of the spec is being synced. + // If this value is not equal to metadata.generation, then the desired + // and conditions fields may represent from a previous version. + ObservedGeneration int64 `json:"observedGeneration"` // versionHash is a fingerprint of the content that the cluster will be // updated with. It is used by the operator to avoid unnecessary work diff --git a/vendor/github.com/openshift/api/config/v1/types_console.go b/vendor/github.com/openshift/api/config/v1/types_console.go index 36beb4113c73..bbfc89c9cdea 100644 --- a/vendor/github.com/openshift/api/config/v1/types_console.go +++ b/vendor/github.com/openshift/api/config/v1/types_console.go @@ -7,7 +7,6 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Console holds cluster-wide information about Console. The canonical name is `cluster` -// TODO this object is an example of a possible grouping and is subject to change or removal type Console struct { metav1.TypeMeta `json:",inline"` // Standard object's metadata. @@ -20,11 +19,14 @@ type Console struct { } type ConsoleSpec struct { - // special console public url? + // +optional + Authentication ConsoleAuthentication `json:"authentication,omitempty"` } type ConsoleStatus struct { - // console public url + // The hostname for the console. This will match the host for the route that + // is created for the console. + PublicHostname string `json:"publicHostname"` } // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -35,3 +37,18 @@ type ConsoleList struct { metav1.ListMeta `json:"metadata,omitempty"` Items []Console `json:"items"` } + +type ConsoleAuthentication struct { + // An optional, absolute URL to redirect web browsers to after logging out of + // the console. If not specified, it will redirect to the default login page. + // This is required when using an identity provider that supports single + // sign-on (SSO) such as: + // - OpenID (Keycloak, Azure) + // - RequestHeader (GSSAPI, SSPI, SAML) + // - OAuth (GitHub, GitLab, Google) + // Logging out of the console will destroy the user's token. The logoutRedirect + // provides the user the option to perform single logout (SLO) through the identity + // provider to destroy their single sign-on session. + // +optional + LogoutRedirect string `json:"logoutRedirect,omitempty"` +} diff --git a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go index 42efc79db95a..425ac3a2bbb7 100644 --- a/vendor/github.com/openshift/api/config/v1/types_infrastructure.go +++ b/vendor/github.com/openshift/api/config/v1/types_infrastructure.go @@ -7,7 +7,6 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Infrastructure holds cluster-wide information about Infrastructure. The canonical name is `cluster` -// TODO this object is an example of a possible grouping and is subject to change or removal type Infrastructure struct { metav1.TypeMeta `json:",inline"` // Standard object's metadata. @@ -19,39 +18,64 @@ type Infrastructure struct { Status InfrastructureStatus `json:"status"` } +// InfrastructureSpec contains settings that apply to the cluster infrastructure. type InfrastructureSpec struct { // secret reference? // configmap reference to file? } +// InfrastructureStatus describes the infrastructure the cluster is leveraging. type InfrastructureStatus struct { // platform is the underlying infrastructure provider for the cluster. This // value controls whether infrastructure automation such as service load // balancers, dynamic volume provisioning, machine creation and deletion, and // other integrations are enabled. If None, no infrastructure automation is - // enabled. + // enabled. Allowed values are "AWS", "Azure", "GCP", "Libvirt", + // "OpenStack", "VSphere", and "None". Individual components may not support + // all platforms, and must handle unrecognized platforms as None if they do + // not support that platform. Platform PlatformType `json:"platform,omitempty"` + + // etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering + // etcd servers and clients. + // For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery + EtcdDiscoveryDomain string `json:"etcdDiscoveryDomain"` + + // apiServerURL is a valid URL with scheme(http/https), address and port. + // apiServerURL can be used by components like kubelet on machines, to contact the `apisever` + // using the infrastructure provider rather than the kubernetes networking. + APIServerURL string `json:"apiServerURL"` } -// platformType is a specific supported infrastructure provider. +// PlatformType is a specific supported infrastructure provider. type PlatformType string const ( - // awsPlatform represents Amazon AWS. + // AWSPlatform represents Amazon Web Services infrastructure. AWSPlatform PlatformType = "AWS" - // openStackPlatform represents OpenStack. - OpenStackPlatform PlatformType = "OpenStack" + // AzurePlatform represents Microsoft Azure infrastructure. + AzurePlatform PlatformType = "Azure" + + // GCPPlatform represents Google Cloud Platform infrastructure. + GCPPlatform PlatformType = "GCP" - // libvirtPlatform represents libvirt. + // LibvirtPlatform represents libvirt infrastructure. LibvirtPlatform PlatformType = "Libvirt" - // nonePlatform means there is no infrastructure provider. + // OpenStackPlatform represents OpenStack infrastructure. + OpenStackPlatform PlatformType = "OpenStack" + + // NonePlatform means there is no infrastructure provider. NonePlatform PlatformType = "None" + + // VSpherePlatform represents VMWare vSphere infrastructure. + VSpherePlatform PlatformType = "VSphere" ) // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object +// InfrastructureList is type InfrastructureList struct { metav1.TypeMeta `json:",inline"` // Standard object's metadata. diff --git a/vendor/github.com/openshift/api/config/v1/types_scheduling.go b/vendor/github.com/openshift/api/config/v1/types_scheduling.go index 603ed9054489..3cf135bdb08b 100644 --- a/vendor/github.com/openshift/api/config/v1/types_scheduling.go +++ b/vendor/github.com/openshift/api/config/v1/types_scheduling.go @@ -7,7 +7,6 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Scheduling holds cluster-wide information about Scheduling. The canonical name is `cluster` -// TODO this object is an example of a possible grouping and is subject to change or removal type Scheduling struct { metav1.TypeMeta `json:",inline"` // Standard object's metadata. @@ -20,7 +19,12 @@ type Scheduling struct { } type SchedulingSpec struct { - // default node selector (I would be happy to see this die....) + // policy is a reference to a ConfigMap containing scheduler policy which has + // user specified predicates and priorities. If this ConfigMap is not available + // scheduler will default to use DefaultAlgorithmProvider. + // The namespace for this configmap is openshift-config. + // +optional + Policy ConfigMapNameReference `json:"policy,omitempty"` } type SchedulingStatus struct { diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go index 71eb91ca4ac2..89d8df5a2865 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.go @@ -9,6 +9,147 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIServer) DeepCopyInto(out *APIServer) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + out.Status = in.Status + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServer. +func (in *APIServer) DeepCopy() *APIServer { + if in == nil { + return nil + } + out := new(APIServer) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *APIServer) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIServerList) DeepCopyInto(out *APIServerList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]APIServer, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServerList. +func (in *APIServerList) DeepCopy() *APIServerList { + if in == nil { + return nil + } + out := new(APIServerList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *APIServerList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIServerNamedServingCert) DeepCopyInto(out *APIServerNamedServingCert) { + *out = *in + if in.Names != nil { + in, out := &in.Names, &out.Names + *out = make([]string, len(*in)) + copy(*out, *in) + } + out.ServingCertificate = in.ServingCertificate + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServerNamedServingCert. +func (in *APIServerNamedServingCert) DeepCopy() *APIServerNamedServingCert { + if in == nil { + return nil + } + out := new(APIServerNamedServingCert) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIServerServingCerts) DeepCopyInto(out *APIServerServingCerts) { + *out = *in + out.DefaultServingCertificate = in.DefaultServingCertificate + if in.NamedCertificates != nil { + in, out := &in.NamedCertificates, &out.NamedCertificates + *out = make([]APIServerNamedServingCert, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServerServingCerts. +func (in *APIServerServingCerts) DeepCopy() *APIServerServingCerts { + if in == nil { + return nil + } + out := new(APIServerServingCerts) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIServerSpec) DeepCopyInto(out *APIServerSpec) { + *out = *in + in.ServingCerts.DeepCopyInto(&out.ServingCerts) + out.ClientCA = in.ClientCA + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServerSpec. +func (in *APIServerSpec) DeepCopy() *APIServerSpec { + if in == nil { + return nil + } + out := new(APIServerSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *APIServerStatus) DeepCopyInto(out *APIServerStatus) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new APIServerStatus. +func (in *APIServerStatus) DeepCopy() *APIServerStatus { + if in == nil { + return nil + } + out := new(APIServerStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *AdmissionPluginConfig) DeepCopyInto(out *AdmissionPluginConfig) { *out = *in @@ -701,6 +842,22 @@ func (in *Console) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ConsoleAuthentication) DeepCopyInto(out *ConsoleAuthentication) { + *out = *in + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ConsoleAuthentication. +func (in *ConsoleAuthentication) DeepCopy() *ConsoleAuthentication { + if in == nil { + return nil + } + out := new(ConsoleAuthentication) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConsoleList) DeepCopyInto(out *ConsoleList) { *out = *in @@ -737,6 +894,7 @@ func (in *ConsoleList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ConsoleSpec) DeepCopyInto(out *ConsoleSpec) { *out = *in + out.Authentication = in.Authentication return } @@ -2353,6 +2511,7 @@ func (in *SchedulingList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *SchedulingSpec) DeepCopyInto(out *SchedulingSpec) { *out = *in + out.Policy = in.Policy return } diff --git a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go index 81428ba85926..476c2e2d98b7 100644 --- a/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.go @@ -233,6 +233,42 @@ func (StringSourceSpec) SwaggerDoc() map[string]string { return map_StringSourceSpec } +var map_APIServer = map[string]string{ + "": "APIServer holds cluster-wide information about api-servers. The canonical name is `cluster`", +} + +func (APIServer) SwaggerDoc() map[string]string { + return map_APIServer +} + +var map_APIServerNamedServingCert = map[string]string{ + "": "APIServerNamedServingCert maps a server DNS name, as understood by a client, to a certificate.", + "names": "names is a optional list of explicit DNS names (leading wildcards allowed) that should use this certificate to serve secure traffic. If no names are provided, the implicit names will be extracted from the certificates. Exact names trump over wildcard names. Explicit names defined here trump over extracted implicit names.", + "servingCertificate": "servingCertificate references a kubernetes.io/tls type secret containing the TLS cert info for serving secure traffic. The secret must exist in the openshift-config namespace and contain the following required fields: - Secret.Data[\"tls.key\"] - TLS private key. - Secret.Data[\"tls.crt\"] - TLS certificate.", +} + +func (APIServerNamedServingCert) SwaggerDoc() map[string]string { + return map_APIServerNamedServingCert +} + +var map_APIServerServingCerts = map[string]string{ + "defaultServingCertificate": "defaultServingCertificate references a kubernetes.io/tls type secret containing the default TLS cert info for serving secure traffic. If no named certificates match the server name as understood by a client, this default certificate will be used. If defaultServingCertificate is not specified, then a operator managed certificate will be used. The secret must exist in the openshift-config namespace and contain the following required fields: - Secret.Data[\"tls.key\"] - TLS private key. - Secret.Data[\"tls.crt\"] - TLS certificate.", + "namedCertificates": "namedCertificates references secrets containing the TLS cert info for serving secure traffic to specific hostnames. If no named certificates are provided, or no named certificates match the server name as understood by a client, the defaultServingCertificate will be used.", +} + +func (APIServerServingCerts) SwaggerDoc() map[string]string { + return map_APIServerServingCerts +} + +var map_APIServerSpec = map[string]string{ + "servingCerts": "servingCert is the TLS cert info for serving secure traffic. If not specified, operator managed certificates will be used for serving secure traffic.", + "clientCA": "clientCA references a ConfigMap containing a certificate bundle for the signers that will be recognized for incoming client certificates in addition to the operator managed signers. If this is empty, then only operator managed signers are valid. You usually only have to set this if you have your own PKI you wish to honor client certificates from. The ConfigMap must exist in the openshift-config namespace and contain the following required fields: - ConfigMap.Data[\"ca-bundle.crt\"] - CA bundle.", +} + +func (APIServerSpec) SwaggerDoc() map[string]string { + return map_APIServerSpec +} + var map_Authentication = map[string]string{ "": "Authentication holds cluster-wide information about Authentication. The canonical name is `cluster`", "metadata": "Standard object's metadata.", @@ -453,13 +489,13 @@ func (ClusterVersionSpec) SwaggerDoc() map[string]string { } var map_ClusterVersionStatus = map[string]string{ - "": "ClusterVersionStatus reports the status of the cluster versioning, including any upgrades that are in progress. The current field will be set to whichever version the cluster is reconciling to, and the conditions array will report whether the update succeeded, is in progress, or is failing.", - "desired": "desired is the version that the cluster is reconciling towards. If the cluster is not yet fully initialized desired will be set with the information available, which may be an image or a tag.", - "history": "history contains a list of the most recent versions applied to the cluster. This value may be empty during cluster startup, and then will be updated when a new update is being applied. The newest update is first in the list and it is ordered by recency. Updates in the history have state Completed if the rollout completed - if an update was failing or halfway applied the state will be Partial. Only a limited amount of update history is preserved.", - "generation": "generation reports which version of the spec is being processed. If this value is not equal to metadata.generation, then the current and conditions fields have not yet been updated to reflect the latest request.", - "versionHash": "versionHash is a fingerprint of the content that the cluster will be updated with. It is used by the operator to avoid unnecessary work and is for internal use only.", - "conditions": "conditions provides information about the cluster version. The condition \"Available\" is set to true if the desiredUpdate has been reached. The condition \"Progressing\" is set to true if an update is being applied. The condition \"Failing\" is set to true if an update is currently blocked by a temporary or permanent error. Conditions are only valid for the current desiredUpdate when metadata.generation is equal to status.generation.", - "availableUpdates": "availableUpdates contains the list of updates that are appropriate for this cluster. This list may be empty if no updates are recommended, if the update service is unavailable, or if an invalid channel has been specified.", + "": "ClusterVersionStatus reports the status of the cluster versioning, including any upgrades that are in progress. The current field will be set to whichever version the cluster is reconciling to, and the conditions array will report whether the update succeeded, is in progress, or is failing.", + "desired": "desired is the version that the cluster is reconciling towards. If the cluster is not yet fully initialized desired will be set with the information available, which may be an image or a tag.", + "history": "history contains a list of the most recent versions applied to the cluster. This value may be empty during cluster startup, and then will be updated when a new update is being applied. The newest update is first in the list and it is ordered by recency. Updates in the history have state Completed if the rollout completed - if an update was failing or halfway applied the state will be Partial. Only a limited amount of update history is preserved.", + "observedGeneration": "observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent from a previous version.", + "versionHash": "versionHash is a fingerprint of the content that the cluster will be updated with. It is used by the operator to avoid unnecessary work and is for internal use only.", + "conditions": "conditions provides information about the cluster version. The condition \"Available\" is set to true if the desiredUpdate has been reached. The condition \"Progressing\" is set to true if an update is being applied. The condition \"Failing\" is set to true if an update is currently blocked by a temporary or permanent error. Conditions are only valid for the current desiredUpdate when metadata.generation is equal to status.generation.", + "availableUpdates": "availableUpdates contains the list of updates that are appropriate for this cluster. This list may be empty if no updates are recommended, if the update service is unavailable, or if an invalid channel has been specified.", } func (ClusterVersionStatus) SwaggerDoc() map[string]string { @@ -513,6 +549,14 @@ func (Console) SwaggerDoc() map[string]string { return map_Console } +var map_ConsoleAuthentication = map[string]string{ + "logoutRedirect": "An optional, absolute URL to redirect web browsers to after logging out of the console. If not specified, it will redirect to the default login page. This is required when using an identity provider that supports single sign-on (SSO) such as: - OpenID (Keycloak, Azure) - RequestHeader (GSSAPI, SSPI, SAML) - OAuth (GitHub, GitLab, Google) Logging out of the console will destroy the user's token. The logoutRedirect provides the user the option to perform single logout (SLO) through the identity provider to destroy their single sign-on session.", +} + +func (ConsoleAuthentication) SwaggerDoc() map[string]string { + return map_ConsoleAuthentication +} + var map_ConsoleList = map[string]string{ "metadata": "Standard object's metadata.", } @@ -521,6 +565,14 @@ func (ConsoleList) SwaggerDoc() map[string]string { return map_ConsoleList } +var map_ConsoleStatus = map[string]string{ + "publicHostname": "The hostname for the console. This will match the host for the route that is created for the console.", +} + +func (ConsoleStatus) SwaggerDoc() map[string]string { + return map_ConsoleStatus +} + var map_DNS = map[string]string{ "": "DNS holds cluster-wide information about DNS. The canonical name is `cluster`", "metadata": "Standard object's metadata.", @@ -608,6 +660,7 @@ func (Infrastructure) SwaggerDoc() map[string]string { } var map_InfrastructureList = map[string]string{ + "": "InfrastructureList is", "metadata": "Standard object's metadata.", } @@ -615,8 +668,19 @@ func (InfrastructureList) SwaggerDoc() map[string]string { return map_InfrastructureList } +var map_InfrastructureSpec = map[string]string{ + "": "InfrastructureSpec contains settings that apply to the cluster infrastructure.", +} + +func (InfrastructureSpec) SwaggerDoc() map[string]string { + return map_InfrastructureSpec +} + var map_InfrastructureStatus = map[string]string{ - "platform": "platform is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled.", + "": "InfrastructureStatus describes the infrastructure the cluster is leveraging.", + "platform": "platform is the underlying infrastructure provider for the cluster. This value controls whether infrastructure automation such as service load balancers, dynamic volume provisioning, machine creation and deletion, and other integrations are enabled. If None, no infrastructure automation is enabled. Allowed values are \"AWS\", \"Azure\", \"GCP\", \"Libvirt\", \"OpenStack\", \"VSphere\", and \"None\". Individual components may not support all platforms, and must handle unrecognized platforms as None if they do not support that platform.", + "etcdDiscoveryDomain": "etcdDiscoveryDomain is the domain used to fetch the SRV records for discovering etcd servers and clients. For more info: https://github.com/etcd-io/etcd/blob/329be66e8b3f9e2e6af83c123ff89297e49ebd15/Documentation/op-guide/clustering.md#dns-discovery", + "apiServerURL": "apiServerURL is a valid URL with scheme(http/https), address and port. apiServerURL can be used by components like kubelet on machines, to contact the `apisever` using the infrastructure provider rather than the kubernetes networking.", } func (InfrastructureStatus) SwaggerDoc() map[string]string { @@ -1018,4 +1082,12 @@ func (SchedulingList) SwaggerDoc() map[string]string { return map_SchedulingList } +var map_SchedulingSpec = map[string]string{ + "policy": "policy is a reference to a ConfigMap containing scheduler policy which has user specified predicates and priorities. If this ConfigMap is not available scheduler will default to use DefaultAlgorithmProvider. The namespace for this configmap is openshift-config.", +} + +func (SchedulingSpec) SwaggerDoc() map[string]string { + return map_SchedulingSpec +} + // AUTO-GENERATED FUNCTIONS END HERE diff --git a/vendor/github.com/openshift/api/glide.lock b/vendor/github.com/openshift/api/glide.lock index 5e0f3a6b1ac3..a49b0f9a25fa 100644 --- a/vendor/github.com/openshift/api/glide.lock +++ b/vendor/github.com/openshift/api/glide.lock @@ -1,5 +1,5 @@ -hash: d3bd5801900570f3638c2ffc55210bf58a8417e3ffff2b8c41d62915441a948f -updated: 2018-07-18T11:06:34.738986-04:00 +hash: b7aba7d584f746f71384bdde9f991d181c684adc8f841ea23e1047761c57cad0 +updated: 2019-01-28T08:23:58.779331783-05:00 imports: - name: github.com/davecgh/go-spew version: 782f4967f2dc4564575ca782fe2d04090b5faca8 @@ -18,10 +18,6 @@ imports: version: b4deda0973fb4c70b50d226b1af49f3da59f5265 subpackages: - proto - - ptypes - - ptypes/any - - ptypes/duration - - ptypes/timestamp - name: github.com/google/gofuzz version: 44d81051d367757e1c7c6a5a86423ece9afcf63c - name: github.com/json-iterator/go @@ -33,15 +29,12 @@ imports: - name: github.com/spf13/pflag version: 583c0c0531f06d5278b7d917446061adc344b5cd - name: golang.org/x/net - version: 1c05540f6879653db88113bc4a2b70aec4bd491f + version: 0ed95abb35c445290478a5348a7b38bb154135fd subpackages: - - html - - html/atom - http2 - http2/hpack - idna - lex/httplex - - websocket - name: golang.org/x/text version: b19bf474d317b857955b12035d2c5acb57ce8b01 subpackages: @@ -54,21 +47,48 @@ imports: - name: gopkg.in/yaml.v2 version: 670d4cfef0544295bc27a114dbac37980d83185a - name: k8s.io/api - version: 2d6f90ab1293a1fb871cf149423ebb72aa7423aa + version: 6db15a15d2d3874a6c3ddb2140ac9f3bc7058428 subpackages: + - admission/v1beta1 + - admissionregistration/v1alpha1 + - admissionregistration/v1beta1 + - apps/v1 - apps/v1beta1 + - apps/v1beta2 + - authentication/v1 + - authentication/v1beta1 + - authorization/v1 + - authorization/v1beta1 + - autoscaling/v1 + - autoscaling/v2beta1 + - batch/v1 + - batch/v1beta1 + - batch/v2alpha1 + - certificates/v1beta1 - core/v1 + - events/v1beta1 - extensions/v1beta1 + - imagepolicy/v1alpha1 + - networking/v1 + - policy/v1beta1 - rbac/v1 + - rbac/v1alpha1 + - rbac/v1beta1 + - scheduling/v1alpha1 + - scheduling/v1beta1 + - settings/v1alpha1 + - storage/v1 + - storage/v1alpha1 + - storage/v1beta1 - name: k8s.io/apimachinery - version: 103fd098999dc9c0c88536f5c9ad2e5da39373ae + version: 49ce2735e5074ffc3f8190c8406cf51a96302dad subpackages: + - pkg/api/apitesting + - pkg/api/apitesting/fuzzer + - pkg/api/apitesting/roundtrip - pkg/api/equality - pkg/api/meta - pkg/api/resource - - pkg/api/testing - - pkg/api/testing/fuzzer - - pkg/api/testing/roundtrip - pkg/apis/meta/fuzzer - pkg/apis/meta/v1 - pkg/apis/meta/v1/unstructured @@ -91,17 +111,17 @@ imports: - pkg/util/framer - pkg/util/intstr - pkg/util/json + - pkg/util/naming - pkg/util/net - pkg/util/runtime - pkg/util/sets - pkg/util/validation - pkg/util/validation/field - - pkg/util/wait - pkg/util/yaml - pkg/watch - third_party/forked/golang/reflect - name: k8s.io/code-generator - version: d7806fb979faad89dabf9e6a46aa18355962700c + version: aef8d122b95ddd821e3bd35d4013593b1e5eda16 repo: git@github.com:openshift/kubernetes-code-generator - name: k8s.io/gengo version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b diff --git a/vendor/github.com/openshift/api/glide.yaml b/vendor/github.com/openshift/api/glide.yaml index dcd4aaa201cc..50e341e34483 100644 --- a/vendor/github.com/openshift/api/glide.yaml +++ b/vendor/github.com/openshift/api/glide.yaml @@ -2,14 +2,14 @@ package: github.com/openshift/api import: - package: k8s.io/gengo repo: git@github.com:openshift/kubernetes-gengo - version: origin-3.11-kubernetes-1.11.0 + version: origin-3.11-kubernetes-1.11.1 - package: k8s.io/code-generator repo: git@github.com:openshift/kubernetes-code-generator - version: origin-3.11-kubernetes-1.11.0 -# this matches the 1.11 GA level of apimachinery which glide isn't wanting to pick + version: origin-4.0-kubernetes-1.12.4 +# this matches the 1.12.5 GA level of apimachinery which glide isn't wanting to pick - package: github.com/json-iterator/go version: f2b4162afba35581b6d4a50d3b8f34e33c144682 - package: k8s.io/apimachinery - version: kubernetes-1.11.1 + version: kubernetes-1.12.5 - package: k8s.io/api - version: kubernetes-1.11.1 + version: kubernetes-1.12.5 diff --git a/vendor/github.com/openshift/api/image/v1/generated.pb.go b/vendor/github.com/openshift/api/image/v1/generated.pb.go index b30e58868ba5..10b77e5c81a6 100644 --- a/vendor/github.com/openshift/api/image/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/image/v1/generated.pb.go @@ -8499,159 +8499,159 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0x1c, 0x49, - 0x15, 0x4e, 0x4f, 0xcf, 0x8c, 0xc7, 0xcf, 0x8e, 0x1d, 0x57, 0xe2, 0xdd, 0xd9, 0x49, 0xd6, 0xf6, - 0x76, 0x48, 0x14, 0x20, 0xdb, 0x83, 0xbd, 0xd9, 0xc5, 0x09, 0x12, 0xbb, 0x99, 0x4c, 0x88, 0x06, - 0x6c, 0xe2, 0x2d, 0x0f, 0x39, 0x44, 0x41, 0xa2, 0xdd, 0x53, 0x6e, 0x17, 0x9e, 0xe9, 0x1e, 0xba, - 0x7b, 0xbc, 0xeb, 0x08, 0x24, 0x0e, 0x68, 0xb5, 0x07, 0x0e, 0x70, 0xe2, 0xb0, 0x47, 0xb4, 0x42, - 0x9c, 0x11, 0x88, 0x3b, 0x20, 0x45, 0x5c, 0x58, 0x2d, 0x97, 0xbd, 0x60, 0x91, 0x81, 0x33, 0x37, - 0x2e, 0x7b, 0x42, 0x55, 0x5d, 0xdd, 0x5d, 0xdd, 0xd3, 0xe3, 0xf4, 0x84, 0xd8, 0x82, 0x9b, 0xa7, - 0xde, 0x7b, 0xdf, 0x7b, 0xf5, 0x5e, 0xbd, 0x9f, 0xaa, 0x36, 0xac, 0x5a, 0xd4, 0xdf, 0x1b, 0xec, - 0xe8, 0xa6, 0xd3, 0xab, 0x3b, 0x7d, 0x62, 0x7b, 0x7b, 0x74, 0xd7, 0xaf, 0x1b, 0x7d, 0x5a, 0xa7, - 0x3d, 0xc3, 0x22, 0xf5, 0x83, 0xd5, 0xba, 0x45, 0x6c, 0xe2, 0x1a, 0x3e, 0xe9, 0xe8, 0x7d, 0xd7, - 0xf1, 0x1d, 0xf4, 0x5a, 0x2c, 0xa2, 0x47, 0x22, 0xba, 0xd1, 0xa7, 0x3a, 0x17, 0xd1, 0x0f, 0x56, - 0x6b, 0xaf, 0x4b, 0xa8, 0x96, 0x63, 0x39, 0x75, 0x2e, 0xb9, 0x33, 0xd8, 0xe5, 0xbf, 0xf8, 0x0f, - 0xfe, 0x57, 0x80, 0x58, 0xd3, 0xf6, 0xd7, 0x3d, 0x9d, 0x3a, 0x5c, 0xad, 0xe9, 0xb8, 0x59, 0x5a, - 0x6b, 0x37, 0x62, 0x9e, 0x9e, 0x61, 0xee, 0x51, 0x9b, 0xb8, 0x87, 0xf5, 0xfe, 0xbe, 0xc5, 0x16, - 0xbc, 0x7a, 0x8f, 0xf8, 0x46, 0x96, 0x54, 0x7d, 0x9c, 0x94, 0x3b, 0xb0, 0x7d, 0xda, 0x23, 0x23, - 0x02, 0x6f, 0x3d, 0x4b, 0xc0, 0x33, 0xf7, 0x48, 0xcf, 0x18, 0x91, 0x7b, 0x63, 0x9c, 0xdc, 0xc0, - 0xa7, 0xdd, 0x3a, 0xb5, 0x7d, 0xcf, 0x77, 0xd3, 0x42, 0xda, 0xa7, 0x0a, 0x5c, 0x68, 0x3a, 0xe6, - 0x3e, 0x71, 0x5b, 0xcc, 0x73, 0x98, 0xec, 0x12, 0x97, 0xd8, 0x26, 0x41, 0xd7, 0xa1, 0xe2, 0x12, - 0x8b, 0x7a, 0xbe, 0x7b, 0x58, 0x55, 0x56, 0x94, 0x6b, 0xd3, 0x8d, 0x73, 0x4f, 0x8e, 0x96, 0xcf, - 0x0c, 0x8f, 0x96, 0x2b, 0x58, 0xac, 0xe3, 0x88, 0x03, 0xd5, 0x61, 0xda, 0x36, 0x7a, 0xc4, 0xeb, - 0x1b, 0x26, 0xa9, 0x16, 0x38, 0xfb, 0x82, 0x60, 0x9f, 0xfe, 0x76, 0x48, 0xc0, 0x31, 0x0f, 0x5a, - 0x81, 0x22, 0xfb, 0x51, 0x55, 0x39, 0xef, 0xac, 0xe0, 0x2d, 0x32, 0x5e, 0xcc, 0x29, 0xe8, 0x55, - 0x50, 0x7d, 0xc3, 0xaa, 0x16, 0x39, 0xc3, 0x8c, 0x60, 0x50, 0xdb, 0x86, 0x85, 0xd9, 0x3a, 0xaa, - 0x41, 0x81, 0x36, 0xab, 0x25, 0x4e, 0x05, 0x41, 0x2d, 0xb4, 0x9a, 0xb8, 0x40, 0x9b, 0xda, 0x5f, - 0xa6, 0xa0, 0xc4, 0xb7, 0x83, 0xbe, 0x07, 0x15, 0x16, 0x97, 0x8e, 0xe1, 0x1b, 0x7c, 0x17, 0x33, - 0x6b, 0x5f, 0xd1, 0x03, 0x37, 0xe9, 0xb2, 0x9b, 0xf4, 0xfe, 0xbe, 0xc5, 0x16, 0x3c, 0x9d, 0x71, - 0xeb, 0x07, 0xab, 0xfa, 0xfd, 0x9d, 0xef, 0x13, 0xd3, 0xdf, 0x24, 0xbe, 0xd1, 0x40, 0x02, 0x1d, - 0xe2, 0x35, 0x1c, 0xa1, 0xa2, 0x2d, 0xb8, 0xd0, 0xc9, 0xf0, 0x9f, 0x70, 0xc2, 0x25, 0x21, 0x9b, - 0xe9, 0x63, 0x9c, 0x29, 0x89, 0x7e, 0x08, 0xe7, 0xa5, 0xf5, 0xcd, 0xd0, 0x7c, 0x95, 0x9b, 0xff, - 0xfa, 0x58, 0xf3, 0xc5, 0xe9, 0xd0, 0xb1, 0xf1, 0xde, 0xdd, 0xf7, 0x7d, 0x62, 0x7b, 0xd4, 0xb1, - 0x1b, 0x17, 0x85, 0xfe, 0xf3, 0xcd, 0x51, 0x44, 0x9c, 0xa5, 0x06, 0xed, 0x40, 0x2d, 0x63, 0xf9, - 0x01, 0x71, 0x19, 0x9e, 0x88, 0x86, 0x26, 0x50, 0x6b, 0xcd, 0xb1, 0x9c, 0xf8, 0x18, 0x14, 0xb4, - 0x99, 0xdc, 0xa1, 0x61, 0xd3, 0x5d, 0xe2, 0xf9, 0x22, 0x98, 0x99, 0x26, 0x0b, 0x16, 0x9c, 0x25, - 0x87, 0x0e, 0x60, 0x41, 0x5a, 0xde, 0x30, 0x0e, 0x89, 0xeb, 0x55, 0xcb, 0x2b, 0x2a, 0x77, 0xd7, - 0x33, 0x2b, 0x85, 0x1e, 0x4b, 0x35, 0x5e, 0x11, 0xba, 0x17, 0x9a, 0x69, 0x3c, 0x3c, 0xaa, 0x02, - 0x11, 0x00, 0x8f, 0x5a, 0xb6, 0xe1, 0x0f, 0x5c, 0xe2, 0x55, 0xa7, 0xb8, 0xc2, 0xd5, 0xbc, 0x0a, - 0xb7, 0x43, 0xc9, 0xf8, 0x7c, 0x45, 0x4b, 0x1e, 0x96, 0x80, 0xd1, 0x7d, 0x58, 0x94, 0x74, 0xc7, - 0x4c, 0xd5, 0xca, 0x8a, 0x7a, 0x6d, 0xb6, 0xf1, 0xca, 0xf0, 0x68, 0x79, 0xb1, 0x99, 0xc5, 0x80, - 0xb3, 0xe5, 0xd0, 0x1e, 0x5c, 0xca, 0x70, 0xe3, 0x26, 0xe9, 0x50, 0xa3, 0x7d, 0xd8, 0x27, 0xd5, - 0x69, 0x1e, 0x87, 0x2f, 0x08, 0xb3, 0x2e, 0x35, 0x8f, 0xe1, 0xc5, 0xc7, 0x22, 0xa1, 0x7b, 0x89, - 0xc8, 0xdc, 0x71, 0xec, 0x5d, 0x6a, 0x55, 0x81, 0xc3, 0x67, 0xb9, 0x3a, 0x60, 0xc0, 0xa3, 0x32, - 0xda, 0x2f, 0x14, 0x38, 0xcf, 0x7f, 0x37, 0xba, 0xce, 0x4e, 0x94, 0x2a, 0x1e, 0xd2, 0xa0, 0xdc, - 0x0d, 0xe2, 0xad, 0xac, 0xa8, 0xac, 0x12, 0x0c, 0x8f, 0x96, 0xcb, 0x22, 0x62, 0x82, 0xc2, 0x78, - 0xcc, 0x40, 0x73, 0x90, 0x93, 0x9c, 0x47, 0xa8, 0x12, 0x14, 0xb4, 0x0e, 0xb3, 0x3c, 0x3c, 0x9b, - 0xd4, 0xf3, 0xa8, 0x6d, 0xf1, 0x64, 0xab, 0x34, 0x2e, 0x08, 0x1b, 0x67, 0x5b, 0x12, 0x0d, 0x27, - 0x38, 0xb5, 0x3f, 0xa9, 0x30, 0xcf, 0xc9, 0xad, 0x5e, 0xdf, 0x71, 0xfd, 0xed, 0x3e, 0x31, 0xd1, - 0x5d, 0x28, 0xee, 0xba, 0x4e, 0x4f, 0x54, 0x9c, 0xcb, 0x52, 0xca, 0xea, 0xac, 0xb7, 0xc4, 0xf5, - 0x25, 0xda, 0x49, 0x5c, 0x01, 0xbf, 0xe1, 0x3a, 0x3d, 0xcc, 0xc5, 0xd1, 0x3b, 0x50, 0xf0, 0x1d, - 0x6e, 0xf4, 0xcc, 0xda, 0xb5, 0x2c, 0x90, 0x0d, 0xc7, 0x34, 0xba, 0x69, 0xa4, 0x32, 0x2b, 0x84, - 0x6d, 0x07, 0x17, 0x7c, 0x07, 0x75, 0xd9, 0xb6, 0x98, 0x59, 0x5b, 0x4e, 0x97, 0x9a, 0x87, 0xa2, - 0x86, 0xac, 0xe5, 0x38, 0xa3, 0x6d, 0xc3, 0x6a, 0x49, 0x92, 0xb2, 0x2b, 0xe2, 0x55, 0x9c, 0x40, - 0x47, 0xb7, 0x61, 0x9e, 0xda, 0x66, 0x77, 0xd0, 0x89, 0x53, 0xba, 0xc8, 0xfd, 0xf8, 0xb2, 0x10, - 0x9e, 0x6f, 0x25, 0xc9, 0x38, 0xcd, 0x8f, 0xde, 0x87, 0x79, 0x37, 0xdc, 0x89, 0xb0, 0xb9, 0xc4, - 0x6d, 0x7e, 0x33, 0x9f, 0xcd, 0x38, 0x29, 0x1c, 0x6b, 0x4e, 0x11, 0x70, 0x5a, 0x8d, 0xf6, 0x57, - 0x05, 0x16, 0xe4, 0x38, 0xfa, 0x86, 0x3f, 0xf0, 0x50, 0x1b, 0xca, 0x1e, 0xff, 0x4b, 0xc4, 0xf2, - 0x7a, 0xbe, 0xee, 0x11, 0x48, 0x37, 0xe6, 0x84, 0xf6, 0x72, 0xf0, 0x1b, 0x0b, 0x2c, 0xd4, 0x82, - 0x12, 0x37, 0x3a, 0x8a, 0x6d, 0xce, 0x9a, 0xd1, 0x98, 0x1e, 0x1e, 0x2d, 0x07, 0x9d, 0x0d, 0x07, - 0x08, 0x61, 0x97, 0x54, 0xb3, 0xbb, 0xa4, 0xf6, 0x81, 0x02, 0x10, 0x97, 0xac, 0xa8, 0xeb, 0x2a, - 0x63, 0xbb, 0xee, 0x15, 0x28, 0x7a, 0xf4, 0x71, 0x60, 0x99, 0x1a, 0xf7, 0x70, 0x2e, 0xbe, 0x4d, - 0x1f, 0x13, 0xcc, 0xc9, 0xac, 0xdf, 0xf7, 0xa2, 0x7a, 0xa1, 0x26, 0xfb, 0x7d, 0x5c, 0x1c, 0x62, - 0x1e, 0xad, 0x03, 0x73, 0xb1, 0x1d, 0x4d, 0xd6, 0x68, 0x5e, 0x13, 0x9a, 0x14, 0xae, 0xe9, 0xec, - 0x33, 0xb5, 0x14, 0x72, 0x68, 0xf9, 0xbd, 0x02, 0xd3, 0x81, 0x1a, 0xea, 0xf9, 0xe8, 0xd1, 0x48, - 0xf3, 0xd7, 0xf3, 0x85, 0x8f, 0x49, 0xf3, 0xd6, 0x1f, 0x8d, 0x3c, 0xe1, 0x8a, 0xd4, 0xf8, 0x37, - 0xa1, 0x44, 0x7d, 0xd2, 0xf3, 0xaa, 0x05, 0x5e, 0xf8, 0xf3, 0x07, 0xf1, 0xac, 0x00, 0x2d, 0xb5, - 0x98, 0x38, 0x0e, 0x50, 0xb4, 0x75, 0x71, 0xfc, 0x36, 0x1c, 0x67, 0x7f, 0xd0, 0x17, 0x19, 0x75, - 0x19, 0x4a, 0x5d, 0x96, 0xe3, 0xa2, 0x1e, 0x45, 0x92, 0x3c, 0xf1, 0x71, 0x40, 0xd3, 0x7e, 0x53, - 0x16, 0xbe, 0x8d, 0x4a, 0xfc, 0x29, 0x8c, 0x3d, 0x2b, 0x50, 0xf4, 0xe3, 0xa8, 0x44, 0x27, 0x89, - 0x07, 0x84, 0x53, 0xd0, 0x15, 0x98, 0x32, 0x1d, 0xdb, 0x27, 0xb6, 0xcf, 0xad, 0x9f, 0x6d, 0xcc, - 0x0c, 0x8f, 0x96, 0xa7, 0xee, 0x04, 0x4b, 0x38, 0xa4, 0x21, 0x0a, 0x60, 0x3a, 0x76, 0x87, 0xfa, - 0xd4, 0xb1, 0xbd, 0x6a, 0x91, 0xfb, 0x32, 0x4f, 0xb2, 0x47, 0x9b, 0xbd, 0x13, 0x4a, 0xc7, 0x16, - 0x47, 0x4b, 0x1e, 0x96, 0xc0, 0xd1, 0xd7, 0xe0, 0x2c, 0x17, 0x6f, 0x75, 0x88, 0xed, 0x53, 0xff, - 0x50, 0x0c, 0x1c, 0x8b, 0x42, 0xec, 0x6c, 0x4b, 0x26, 0xe2, 0x24, 0x2f, 0xfa, 0x11, 0xcc, 0xb2, - 0x9e, 0x4c, 0x3a, 0x77, 0xba, 0x06, 0xed, 0x85, 0xf3, 0xc5, 0x9d, 0x89, 0xdb, 0x3d, 0x37, 0x3c, - 0x44, 0xb9, 0x6b, 0xfb, 0xae, 0x54, 0x5b, 0x65, 0x12, 0x4e, 0xa8, 0x43, 0xef, 0xc2, 0x94, 0xe9, - 0x12, 0x36, 0xb8, 0x57, 0xa7, 0x78, 0x40, 0xbf, 0x94, 0x2f, 0xa0, 0x6d, 0xda, 0x23, 0xc2, 0xf3, - 0x81, 0x38, 0x0e, 0x71, 0x58, 0x7a, 0x50, 0xcf, 0x1b, 0x90, 0x4e, 0xe3, 0xb0, 0x5a, 0xc9, 0xdd, - 0x18, 0xa2, 0x8d, 0xb4, 0x98, 0xac, 0xdb, 0x98, 0x65, 0xe9, 0xd1, 0x12, 0x38, 0x38, 0x42, 0x44, - 0xdf, 0x0d, 0xd1, 0xdb, 0x0e, 0x1f, 0x28, 0x66, 0xd6, 0xde, 0x98, 0x04, 0x7d, 0x7b, 0xc0, 0x4f, - 0x9d, 0x0c, 0xdf, 0x76, 0x70, 0x04, 0x59, 0x7b, 0x1b, 0x16, 0x46, 0x1c, 0x89, 0xce, 0x81, 0xba, - 0x4f, 0xc4, 0x75, 0x05, 0xb3, 0x3f, 0xd1, 0x05, 0x28, 0x1d, 0x18, 0xdd, 0x81, 0x38, 0xa7, 0x38, - 0xf8, 0x71, 0xab, 0xb0, 0xae, 0x68, 0xbf, 0x2c, 0xc0, 0x4c, 0x10, 0x19, 0xdf, 0x25, 0x46, 0xef, - 0x14, 0x52, 0xa6, 0x0d, 0x45, 0xaf, 0x4f, 0x4c, 0x51, 0xf4, 0xd7, 0x72, 0x9f, 0x1c, 0x6e, 0x1f, - 0x9b, 0x2b, 0xe2, 0x34, 0x63, 0xbf, 0x30, 0x47, 0x43, 0x8f, 0xa2, 0x0e, 0x15, 0x34, 0xf7, 0x1b, - 0x13, 0xe2, 0x1e, 0xdb, 0xa9, 0xb4, 0x3f, 0x28, 0x70, 0x4e, 0xe2, 0x3e, 0xad, 0x4b, 0xd5, 0xe6, - 0xf3, 0x36, 0xc8, 0xb8, 0xb6, 0x4a, 0x4d, 0x52, 0xfb, 0x6d, 0x41, 0x14, 0xd7, 0x70, 0x17, 0xac, - 0xc3, 0x9f, 0xc2, 0x36, 0x1e, 0x26, 0x22, 0xbe, 0x3e, 0x59, 0x64, 0xe2, 0x79, 0x32, 0x33, 0xee, - 0x3b, 0xa9, 0xb8, 0xdf, 0x7a, 0x2e, 0xf4, 0xe3, 0xa3, 0xff, 0x93, 0x02, 0x2c, 0x66, 0x5a, 0x84, - 0xae, 0x42, 0x39, 0x18, 0xfd, 0xb8, 0xe7, 0x2a, 0x31, 0x42, 0xc0, 0x83, 0x05, 0x15, 0x59, 0x00, - 0x2e, 0xe9, 0x3b, 0x1e, 0xf5, 0x1d, 0xf7, 0x50, 0xf8, 0xe1, 0xab, 0x39, 0x2c, 0xc5, 0x91, 0x90, - 0xe4, 0x86, 0x39, 0xe6, 0xe8, 0x98, 0x82, 0x25, 0x68, 0xf4, 0x90, 0x19, 0x64, 0x58, 0x84, 0xb9, - 0x43, 0x9d, 0x24, 0xbd, 0x64, 0xfc, 0x78, 0x13, 0x0c, 0x09, 0x0b, 0x44, 0xed, 0x77, 0x05, 0x78, - 0x79, 0x8c, 0xeb, 0x10, 0x4e, 0x38, 0x82, 0x4d, 0x18, 0x13, 0x85, 0x21, 0xb8, 0x8c, 0xa4, 0x9c, - 0x46, 0x33, 0x9c, 0x76, 0xf3, 0x79, 0x9c, 0x26, 0xa2, 0x7b, 0x8c, 0xdb, 0x1e, 0xa5, 0xdc, 0x76, - 0x63, 0x42, 0xb7, 0xa5, 0xce, 0x4f, 0xca, 0x71, 0x1f, 0x17, 0x13, 0x79, 0x27, 0xae, 0xcd, 0x27, - 0x9f, 0x77, 0x1d, 0x28, 0xed, 0x74, 0x9d, 0x9d, 0x70, 0x34, 0x7b, 0x7b, 0xb2, 0x98, 0x04, 0x66, - 0xea, 0xec, 0xa6, 0x29, 0x1a, 0x74, 0x54, 0x55, 0xf8, 0x1a, 0x0e, 0xc0, 0xd1, 0x5e, 0xca, 0x77, - 0xef, 0x3c, 0x97, 0x9a, 0xc0, 0x65, 0x81, 0x9e, 0x31, 0x7e, 0xac, 0xed, 0x03, 0xc4, 0xd6, 0x64, - 0x74, 0xb9, 0x7b, 0x72, 0x97, 0x9b, 0xe0, 0x0d, 0x22, 0x1a, 0xc6, 0xa5, 0xc6, 0x58, 0xfb, 0x81, - 0xe8, 0x8b, 0x63, 0xb5, 0x6d, 0x24, 0xb5, 0xbd, 0x95, 0xbb, 0x38, 0x27, 0xae, 0xee, 0x72, 0x2f, - 0xfe, 0xa3, 0x22, 0xee, 0xd0, 0xc2, 0x33, 0x27, 0x3f, 0xbc, 0x6f, 0x27, 0x87, 0xf7, 0x49, 0xb3, - 0x36, 0x7b, 0x84, 0xff, 0xa7, 0x02, 0x48, 0xe2, 0xda, 0x34, 0xfa, 0x7d, 0x6a, 0x5b, 0xff, 0x77, - 0xed, 0xf2, 0x59, 0x77, 0xca, 0x5f, 0x17, 0x12, 0xd1, 0xe2, 0xfd, 0x60, 0x3b, 0xf1, 0x46, 0x15, - 0x17, 0x1b, 0x71, 0xd3, 0x7c, 0x55, 0x80, 0x2c, 0x36, 0xb3, 0x98, 0x70, 0xb6, 0x2c, 0x7a, 0x17, - 0x8a, 0xbe, 0x61, 0x85, 0x31, 0xaa, 0x4f, 0xf8, 0x02, 0x20, 0x5d, 0x4a, 0x0c, 0xcb, 0xc3, 0x1c, - 0x0a, 0xd9, 0x30, 0xdb, 0x95, 0x2e, 0x58, 0x93, 0xce, 0x4c, 0xf2, 0xe5, 0x2c, 0x1e, 0xdb, 0xe5, - 0x55, 0x9c, 0xc0, 0xd7, 0x7e, 0x95, 0x9c, 0x3c, 0x44, 0xd3, 0x38, 0x11, 0x6f, 0x3d, 0x48, 0x78, - 0x2b, 0xcf, 0x96, 0xd8, 0xb5, 0xbf, 0xd3, 0x36, 0xac, 0xbb, 0x07, 0xc4, 0xf6, 0x59, 0x92, 0x64, - 0xba, 0x8c, 0xc0, 0xc5, 0xfe, 0x60, 0xa7, 0x4b, 0xcd, 0x4c, 0x6b, 0xc4, 0x29, 0xb9, 0x2c, 0x04, - 0x2f, 0x6e, 0x8d, 0x67, 0xc5, 0xc7, 0xe1, 0x68, 0x1f, 0x15, 0xc3, 0x5b, 0x2c, 0xf7, 0x54, 0xdb, - 0x38, 0x8d, 0xc4, 0xf9, 0x66, 0x70, 0xd2, 0x83, 0xb4, 0x99, 0xf8, 0x80, 0x4d, 0x25, 0x3e, 0x48, - 0xac, 0x01, 0x88, 0x8f, 0x2b, 0xd4, 0xb1, 0xb9, 0x5b, 0xd4, 0x58, 0xfb, 0xbd, 0x88, 0x82, 0x25, - 0x2e, 0xb4, 0x97, 0x71, 0xf9, 0xbd, 0x91, 0xcf, 0x0c, 0x1e, 0xb4, 0xfc, 0x77, 0xdf, 0xa8, 0x44, - 0x94, 0x5e, 0x48, 0x89, 0x48, 0xe7, 0x51, 0xf9, 0x84, 0xf3, 0xe8, 0xcf, 0xc9, 0xd2, 0xda, 0x36, - 0xac, 0x53, 0x68, 0x12, 0x0f, 0x92, 0x4d, 0x62, 0x75, 0xb2, 0x26, 0xd1, 0x36, 0xac, 0x31, 0x7d, - 0xe2, 0x5f, 0x0a, 0x2c, 0x8c, 0xe4, 0x5e, 0x58, 0x75, 0x95, 0x31, 0xdf, 0xbb, 0xb6, 0x92, 0xc6, - 0x7c, 0x79, 0x82, 0x53, 0x92, 0x6d, 0x46, 0xea, 0xf0, 0xa9, 0x27, 0x77, 0xf8, 0xb4, 0x0f, 0x55, - 0xb8, 0x90, 0x35, 0xd1, 0xbf, 0xa8, 0x87, 0xf2, 0xf4, 0x33, 0x77, 0xe1, 0xb4, 0x9f, 0xb9, 0xd5, - 0xff, 0xfe, 0x99, 0xbb, 0x78, 0x3a, 0xcf, 0xdc, 0x1f, 0x16, 0xe0, 0xa5, 0xec, 0x7b, 0xc2, 0x09, - 0xbd, 0x75, 0xc7, 0x37, 0x8c, 0xc2, 0x8b, 0xbf, 0x61, 0xa0, 0x5b, 0x30, 0x67, 0x74, 0x82, 0x63, - 0x66, 0x74, 0x59, 0xd3, 0xe2, 0xe7, 0x78, 0xba, 0x81, 0x86, 0x47, 0xcb, 0x73, 0xb7, 0x13, 0x14, - 0x9c, 0xe2, 0xd4, 0x3e, 0x55, 0x01, 0x8d, 0xbe, 0x22, 0xa2, 0x5b, 0xe2, 0x65, 0x33, 0x48, 0xc4, - 0xab, 0xf2, 0xcb, 0xe6, 0xe7, 0x47, 0xcb, 0x2f, 0x8d, 0x4a, 0x48, 0x6f, 0x9e, 0x1b, 0x91, 0x0b, - 0x83, 0x77, 0xd1, 0x1b, 0x49, 0xa7, 0x7c, 0x7e, 0xb4, 0x9c, 0xf1, 0x7f, 0x06, 0x7a, 0x84, 0x94, - 0x72, 0x9d, 0x05, 0x67, 0xbb, 0x86, 0xe7, 0x6f, 0xb9, 0xce, 0x0e, 0x69, 0x53, 0xf1, 0xb1, 0x7c, - 0xb2, 0x97, 0xbf, 0xe8, 0x6d, 0x73, 0x43, 0x06, 0xc2, 0x49, 0x5c, 0x74, 0x00, 0x88, 0x2d, 0xb4, - 0x5d, 0xc3, 0xf6, 0x82, 0x2d, 0x31, 0x6d, 0xc5, 0x89, 0xb5, 0xd5, 0x84, 0x36, 0xb4, 0x31, 0x82, - 0x86, 0x33, 0x34, 0xa0, 0xab, 0x50, 0x76, 0x89, 0xe1, 0x39, 0xb6, 0x78, 0x89, 0x8d, 0xa2, 0x8c, - 0xf9, 0x2a, 0x16, 0x54, 0xf4, 0x45, 0x98, 0xea, 0x11, 0xcf, 0x63, 0xed, 0xab, 0xcc, 0x19, 0xe7, - 0x05, 0xe3, 0xd4, 0x66, 0xb0, 0x8c, 0x43, 0xba, 0xf6, 0x81, 0x02, 0x71, 0x88, 0x78, 0xd7, 0xa5, - 0xe6, 0xdd, 0xe0, 0x05, 0x77, 0x1d, 0x66, 0x1d, 0xd7, 0x32, 0x6c, 0xfa, 0x38, 0x68, 0xd1, 0x41, - 0x80, 0xa3, 0x8c, 0xbf, 0x2f, 0xd1, 0x70, 0x82, 0x93, 0xb5, 0x76, 0xd3, 0xe9, 0xf5, 0x1c, 0x9b, - 0x55, 0x6d, 0x11, 0x5a, 0xa9, 0xe6, 0x85, 0x14, 0x2c, 0x71, 0x69, 0x1f, 0x2b, 0x30, 0x9f, 0x7a, - 0x2b, 0x45, 0x3f, 0x57, 0xe0, 0x25, 0x2f, 0xd3, 0x38, 0x91, 0x72, 0x37, 0x27, 0x79, 0x22, 0x4d, - 0x00, 0x34, 0x96, 0x84, 0x3d, 0x63, 0x76, 0x8f, 0xc7, 0x28, 0xd6, 0xfe, 0xa6, 0xc0, 0xb9, 0xf4, - 0xab, 0xeb, 0xff, 0xa2, 0xa1, 0xe8, 0x4d, 0x98, 0x09, 0xe6, 0xc7, 0x6f, 0x91, 0xc3, 0x56, 0x53, - 0x44, 0xe1, 0xbc, 0x00, 0x9b, 0xd9, 0x8a, 0x49, 0x58, 0xe6, 0xd3, 0x7e, 0x5a, 0x80, 0x4a, 0xd8, - 0xb1, 0xd0, 0x77, 0xe2, 0x57, 0x74, 0x65, 0xe2, 0xd3, 0x1d, 0x1d, 0xba, 0x91, 0x97, 0xf4, 0x17, - 0xff, 0x3f, 0x20, 0x97, 0xc3, 0x71, 0x2d, 0x18, 0xaf, 0xb3, 0x87, 0xb0, 0xe4, 0xc4, 0x59, 0xcc, - 0x33, 0x71, 0x6a, 0x1f, 0xa9, 0xb0, 0x30, 0xd2, 0xc0, 0xd1, 0xcd, 0x44, 0xcd, 0xbb, 0x92, 0xaa, - 0x79, 0x8b, 0x23, 0x02, 0x27, 0x56, 0xf2, 0xb2, 0x2b, 0x91, 0x7a, 0x8a, 0x95, 0xa8, 0x98, 0xb7, - 0x12, 0x95, 0x8e, 0xaf, 0x44, 0xa9, 0xe8, 0x94, 0x73, 0x45, 0xa7, 0x0f, 0xf3, 0xa9, 0x89, 0x04, - 0x5d, 0x87, 0x0a, 0xb5, 0x3d, 0x62, 0x0e, 0x5c, 0x22, 0xde, 0x5a, 0xa3, 0x91, 0xb5, 0x25, 0xd6, - 0x71, 0xc4, 0x81, 0xea, 0x30, 0xed, 0x99, 0x7b, 0xa4, 0x33, 0xe8, 0x92, 0x0e, 0x0f, 0x48, 0x25, - 0xfe, 0x62, 0xba, 0x1d, 0x12, 0x70, 0xcc, 0xa3, 0xfd, 0xbb, 0x08, 0xb3, 0xf2, 0x40, 0x91, 0xe3, - 0x13, 0xf1, 0x7b, 0x30, 0x63, 0xd8, 0xb6, 0xe3, 0x1b, 0xc1, 0xe0, 0x58, 0xc8, 0xfd, 0xf8, 0x25, - 0xeb, 0xd1, 0x6f, 0xc7, 0x10, 0xc1, 0xe3, 0x57, 0x94, 0xca, 0x12, 0x05, 0xcb, 0x9a, 0xd0, 0x6d, - 0x31, 0x2d, 0xaa, 0xf9, 0xa7, 0xc5, 0x4a, 0x6a, 0x52, 0xac, 0xc3, 0x74, 0x34, 0x11, 0x89, 0x7f, - 0x4e, 0x88, 0xfc, 0x13, 0xe7, 0x64, 0xcc, 0x83, 0xf4, 0x44, 0x14, 0x4b, 0x3c, 0x8a, 0x73, 0xc7, - 0xdc, 0xe8, 0xd2, 0xa3, 0x68, 0xf9, 0x44, 0x47, 0xd1, 0x8c, 0x39, 0x72, 0xea, 0x54, 0xe6, 0xc8, - 0xda, 0xd7, 0xe1, 0x5c, 0x3a, 0x82, 0x13, 0x7d, 0x7e, 0xdb, 0x02, 0x34, 0xaa, 0xff, 0x59, 0xb3, - 0xd7, 0xa8, 0x44, 0x5c, 0x88, 0x1a, 0xd7, 0x9e, 0x3c, 0x5d, 0x3a, 0xf3, 0xc9, 0xd3, 0xa5, 0x33, - 0x9f, 0x3d, 0x5d, 0x3a, 0xf3, 0xe3, 0xe1, 0x92, 0xf2, 0x64, 0xb8, 0xa4, 0x7c, 0x32, 0x5c, 0x52, - 0x3e, 0x1b, 0x2e, 0x29, 0x7f, 0x1f, 0x2e, 0x29, 0x3f, 0xfb, 0xc7, 0xd2, 0x99, 0x87, 0x85, 0x83, - 0xd5, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xfa, 0xef, 0x59, 0x71, 0x2a, 0x00, 0x00, + // 2450 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4f, 0x6c, 0x1c, 0x49, + 0xd5, 0x4f, 0x4f, 0xcf, 0x8c, 0xc7, 0xcf, 0x8e, 0x1d, 0x57, 0xe2, 0xec, 0xec, 0x24, 0x6b, 0x7b, + 0x3b, 0x5f, 0xa2, 0x7c, 0x90, 0xed, 0xc1, 0x26, 0xbb, 0x38, 0x41, 0x62, 0x37, 0x93, 0x09, 0xd1, + 0x80, 0x4d, 0xbc, 0xe5, 0x21, 0x87, 0x28, 0x48, 0x94, 0x7b, 0xca, 0xed, 0xc6, 0x33, 0xdd, 0x43, + 0x77, 0x8f, 0x77, 0x1d, 0x81, 0xc4, 0x01, 0xad, 0xf6, 0xc0, 0x01, 0x4e, 0x1c, 0xf6, 0x88, 0x56, + 0x88, 0x33, 0x02, 0x71, 0x07, 0xa4, 0x88, 0x0b, 0xab, 0xe5, 0xb2, 0x17, 0x2c, 0x32, 0x70, 0xe6, + 0xc6, 0x65, 0x4f, 0xa8, 0xaa, 0xab, 0xbb, 0xab, 0x7b, 0x7a, 0x9c, 0x9e, 0x10, 0x5b, 0x70, 0xf3, + 0xd4, 0x7b, 0xef, 0xf7, 0x5e, 0xbd, 0x57, 0xef, 0x4f, 0x55, 0x1b, 0x56, 0x4d, 0xcb, 0xdf, 0x1b, + 0xec, 0xe8, 0x86, 0xd3, 0xab, 0x3b, 0x7d, 0x6a, 0x7b, 0x7b, 0xd6, 0xae, 0x5f, 0x27, 0x7d, 0xab, + 0x6e, 0xf5, 0x88, 0x49, 0xeb, 0x07, 0xab, 0x75, 0x93, 0xda, 0xd4, 0x25, 0x3e, 0xed, 0xe8, 0x7d, + 0xd7, 0xf1, 0x1d, 0xf4, 0x7a, 0x2c, 0xa2, 0x47, 0x22, 0x3a, 0xe9, 0x5b, 0x3a, 0x17, 0xd1, 0x0f, + 0x56, 0x6b, 0x6f, 0x48, 0xa8, 0xa6, 0x63, 0x3a, 0x75, 0x2e, 0xb9, 0x33, 0xd8, 0xe5, 0xbf, 0xf8, + 0x0f, 0xfe, 0x57, 0x80, 0x58, 0xd3, 0xf6, 0xd7, 0x3d, 0xdd, 0x72, 0xb8, 0x5a, 0xc3, 0x71, 0xb3, + 0xb4, 0xd6, 0x6e, 0xc6, 0x3c, 0x3d, 0x62, 0xec, 0x59, 0x36, 0x75, 0x0f, 0xeb, 0xfd, 0x7d, 0x93, + 0x2d, 0x78, 0xf5, 0x1e, 0xf5, 0x49, 0x96, 0x54, 0x7d, 0x9c, 0x94, 0x3b, 0xb0, 0x7d, 0xab, 0x47, + 0x47, 0x04, 0xde, 0x7a, 0x9e, 0x80, 0x67, 0xec, 0xd1, 0x1e, 0x49, 0xcb, 0x69, 0x9f, 0x2a, 0x70, + 0xa1, 0xe9, 0x18, 0xfb, 0xd4, 0x6d, 0x31, 0x27, 0x60, 0xba, 0x4b, 0x5d, 0x6a, 0x1b, 0x14, 0xdd, + 0x80, 0x8a, 0x4b, 0x4d, 0xcb, 0xf3, 0xdd, 0xc3, 0xaa, 0xb2, 0xa2, 0x5c, 0x9f, 0x6e, 0x9c, 0x7b, + 0x7a, 0xb4, 0x7c, 0x66, 0x78, 0xb4, 0x5c, 0xc1, 0x62, 0x1d, 0x47, 0x1c, 0xa8, 0x0e, 0xd3, 0x36, + 0xe9, 0x51, 0xaf, 0x4f, 0x0c, 0x5a, 0x2d, 0x70, 0xf6, 0x05, 0xc1, 0x3e, 0xfd, 0xad, 0x90, 0x80, + 0x63, 0x1e, 0xb4, 0x02, 0x45, 0xf6, 0xa3, 0xaa, 0x72, 0xde, 0x59, 0xc1, 0x5b, 0x64, 0xbc, 0x98, + 0x53, 0xd0, 0x6b, 0xa0, 0xfa, 0xc4, 0xac, 0x16, 0x39, 0xc3, 0x8c, 0x60, 0x50, 0xdb, 0xc4, 0xc4, + 0x6c, 0x1d, 0xd5, 0xa0, 0x60, 0x35, 0xab, 0x25, 0x4e, 0x05, 0x41, 0x2d, 0xb4, 0x9a, 0xb8, 0x60, + 0x35, 0xb5, 0x3f, 0x4f, 0x41, 0x89, 0x6f, 0x07, 0x7d, 0x17, 0x2a, 0xcc, 0xc5, 0x1d, 0xe2, 0x13, + 0xbe, 0x8b, 0x99, 0xb5, 0x2f, 0xe9, 0x81, 0xa7, 0x74, 0xd9, 0x53, 0x7a, 0x7f, 0xdf, 0x64, 0x0b, + 0x9e, 0xce, 0xb8, 0xf5, 0x83, 0x55, 0xfd, 0xc1, 0xce, 0xf7, 0xa8, 0xe1, 0x6f, 0x52, 0x9f, 0x34, + 0x90, 0x40, 0x87, 0x78, 0x0d, 0x47, 0xa8, 0x68, 0x0b, 0x2e, 0x74, 0x32, 0xfc, 0x27, 0x9c, 0x70, + 0x59, 0xc8, 0x66, 0xfa, 0x18, 0x67, 0x4a, 0xa2, 0x1f, 0xc0, 0x79, 0x69, 0x7d, 0x33, 0x34, 0x5f, + 0xe5, 0xe6, 0xbf, 0x31, 0xd6, 0x7c, 0x11, 0x68, 0x1d, 0x93, 0xf7, 0xee, 0xbd, 0xef, 0x53, 0xdb, + 0xb3, 0x1c, 0xbb, 0x71, 0x49, 0xe8, 0x3f, 0xdf, 0x1c, 0x45, 0xc4, 0x59, 0x6a, 0xd0, 0x0e, 0xd4, + 0x32, 0x96, 0x1f, 0x52, 0x97, 0xe1, 0x89, 0x68, 0x68, 0x02, 0xb5, 0xd6, 0x1c, 0xcb, 0x89, 0x8f, + 0x41, 0x41, 0x9b, 0xc9, 0x1d, 0x12, 0xdb, 0xda, 0xa5, 0x9e, 0x2f, 0x82, 0x99, 0x69, 0xb2, 0x60, + 0xc1, 0x59, 0x72, 0xe8, 0x00, 0x16, 0xa4, 0xe5, 0x0d, 0x72, 0x48, 0x5d, 0xaf, 0x5a, 0x5e, 0x51, + 0xb9, 0xbb, 0x9e, 0x9b, 0xf4, 0x7a, 0x2c, 0xd5, 0x78, 0x55, 0xe8, 0x5e, 0x68, 0xa6, 0xf1, 0xf0, + 0xa8, 0x0a, 0x44, 0x01, 0x3c, 0xcb, 0xb4, 0x89, 0x3f, 0x70, 0xa9, 0x57, 0x9d, 0xe2, 0x0a, 0x57, + 0xf3, 0x2a, 0xdc, 0x0e, 0x25, 0xe3, 0xf3, 0x15, 0x2d, 0x79, 0x58, 0x02, 0x46, 0x0f, 0x60, 0x51, + 0xd2, 0x1d, 0x33, 0x55, 0x2b, 0x2b, 0xea, 0xf5, 0xd9, 0xc6, 0xab, 0xc3, 0xa3, 0xe5, 0xc5, 0x66, + 0x16, 0x03, 0xce, 0x96, 0x43, 0x7b, 0x70, 0x39, 0xc3, 0x8d, 0x9b, 0xb4, 0x63, 0x91, 0xf6, 0x61, + 0x9f, 0x56, 0xa7, 0x79, 0x1c, 0xfe, 0x4f, 0x98, 0x75, 0xb9, 0x79, 0x0c, 0x2f, 0x3e, 0x16, 0x09, + 0xdd, 0x4f, 0x44, 0xe6, 0xae, 0x63, 0xef, 0x5a, 0x66, 0x15, 0x38, 0x7c, 0x96, 0xab, 0x03, 0x06, + 0x3c, 0x2a, 0xa3, 0xfd, 0x5c, 0x81, 0xf3, 0xfc, 0x77, 0xa3, 0xeb, 0xec, 0x44, 0xa9, 0xe2, 0x21, + 0x0d, 0xca, 0xdd, 0x20, 0xde, 0xca, 0x8a, 0xca, 0x2a, 0xc1, 0xf0, 0x68, 0xb9, 0x2c, 0x22, 0x26, + 0x28, 0x8c, 0xc7, 0x08, 0x34, 0x07, 0x39, 0xc9, 0x79, 0x84, 0x2a, 0x41, 0x41, 0xeb, 0x30, 0xcb, + 0xc3, 0xb3, 0x69, 0x79, 0x9e, 0x65, 0x9b, 0x3c, 0xd9, 0x2a, 0x8d, 0x0b, 0xc2, 0xc6, 0xd9, 0x96, + 0x44, 0xc3, 0x09, 0x4e, 0xed, 0x8f, 0x2a, 0xcc, 0x73, 0x72, 0xab, 0xd7, 0x77, 0x5c, 0x7f, 0xbb, + 0x4f, 0x0d, 0x74, 0x0f, 0x8a, 0xbb, 0xae, 0xd3, 0x13, 0x15, 0xe7, 0x8a, 0x94, 0xb2, 0x3a, 0x6b, + 0x13, 0x71, 0x7d, 0x89, 0x76, 0x12, 0x57, 0xc0, 0xaf, 0xbb, 0x4e, 0x0f, 0x73, 0x71, 0xf4, 0x0e, + 0x14, 0x7c, 0x87, 0x1b, 0x3d, 0xb3, 0x76, 0x3d, 0x0b, 0x64, 0xc3, 0x31, 0x48, 0x37, 0x8d, 0x54, + 0x66, 0x85, 0xb0, 0xed, 0xe0, 0x82, 0xef, 0xa0, 0x2e, 0xdb, 0x16, 0x33, 0x6b, 0xcb, 0xe9, 0x5a, + 0xc6, 0xa1, 0xa8, 0x21, 0x6b, 0x39, 0xce, 0x68, 0x9b, 0x98, 0x2d, 0x49, 0x52, 0x76, 0x45, 0xbc, + 0x8a, 0x13, 0xe8, 0xe8, 0x0e, 0xcc, 0x5b, 0xb6, 0xd1, 0x1d, 0x74, 0xe2, 0x94, 0x2e, 0x72, 0x3f, + 0xbe, 0x22, 0x84, 0xe7, 0x5b, 0x49, 0x32, 0x4e, 0xf3, 0xa3, 0xf7, 0x61, 0xde, 0x0d, 0x77, 0x22, + 0x6c, 0x2e, 0x71, 0x9b, 0xdf, 0xcc, 0x67, 0x33, 0x4e, 0x0a, 0xc7, 0x9a, 0x53, 0x04, 0x9c, 0x56, + 0xa3, 0xfd, 0x45, 0x81, 0x05, 0x39, 0x8e, 0x3e, 0xf1, 0x07, 0x1e, 0x6a, 0x43, 0xd9, 0xe3, 0x7f, + 0x89, 0x58, 0xde, 0xc8, 0xd7, 0x3d, 0x02, 0xe9, 0xc6, 0x9c, 0xd0, 0x5e, 0x0e, 0x7e, 0x63, 0x81, + 0x85, 0x5a, 0x50, 0xe2, 0x46, 0x47, 0xb1, 0xcd, 0x59, 0x33, 0x1a, 0xd3, 0xc3, 0xa3, 0xe5, 0xa0, + 0xb3, 0xe1, 0x00, 0x21, 0xec, 0x92, 0x6a, 0x76, 0x97, 0xd4, 0x3e, 0x50, 0x00, 0xe2, 0x92, 0x15, + 0x75, 0x5d, 0x65, 0x6c, 0xd7, 0xbd, 0x0a, 0x45, 0xcf, 0x7a, 0x12, 0x58, 0xa6, 0xc6, 0x3d, 0x9c, + 0x8b, 0x6f, 0x5b, 0x4f, 0x28, 0xe6, 0x64, 0xd6, 0xef, 0x7b, 0x51, 0xbd, 0x50, 0x93, 0xfd, 0x3e, + 0x2e, 0x0e, 0x31, 0x8f, 0xd6, 0x81, 0xb9, 0xd8, 0x8e, 0x26, 0x6b, 0x34, 0xaf, 0x0b, 0x4d, 0x0a, + 0xd7, 0x74, 0xf6, 0xb9, 0x5a, 0x0a, 0x39, 0xb4, 0xfc, 0x4e, 0x81, 0xe9, 0x40, 0x8d, 0xe5, 0xf9, + 0xe8, 0xf1, 0x48, 0xf3, 0xd7, 0xf3, 0x85, 0x8f, 0x49, 0xf3, 0xd6, 0x1f, 0x8d, 0x3c, 0xe1, 0x8a, + 0xd4, 0xf8, 0x37, 0xa1, 0x64, 0xf9, 0xb4, 0xe7, 0x55, 0x0b, 0xbc, 0xf0, 0xe7, 0x0f, 0xe2, 0x59, + 0x01, 0x5a, 0x6a, 0x31, 0x71, 0x1c, 0xa0, 0x68, 0xeb, 0xe2, 0xf8, 0x6d, 0x38, 0xce, 0xfe, 0xa0, + 0x2f, 0x32, 0xea, 0x0a, 0x94, 0xba, 0x2c, 0xc7, 0x45, 0x3d, 0x8a, 0x24, 0x79, 0xe2, 0xe3, 0x80, + 0xa6, 0xfd, 0xba, 0x2c, 0x7c, 0x1b, 0x95, 0xf8, 0x53, 0x18, 0x7b, 0x56, 0xa0, 0xe8, 0xc7, 0x51, + 0x89, 0x4e, 0x12, 0x0f, 0x08, 0xa7, 0xa0, 0xab, 0x30, 0x65, 0x38, 0xb6, 0x4f, 0x6d, 0x9f, 0x5b, + 0x3f, 0xdb, 0x98, 0x19, 0x1e, 0x2d, 0x4f, 0xdd, 0x0d, 0x96, 0x70, 0x48, 0x43, 0x16, 0x80, 0xe1, + 0xd8, 0x1d, 0xcb, 0xb7, 0x1c, 0xdb, 0xab, 0x16, 0xb9, 0x2f, 0xf3, 0x24, 0x7b, 0xb4, 0xd9, 0xbb, + 0xa1, 0x74, 0x6c, 0x71, 0xb4, 0xe4, 0x61, 0x09, 0x1c, 0x7d, 0x15, 0xce, 0x72, 0xf1, 0x56, 0x87, + 0xda, 0xbe, 0xe5, 0x1f, 0x8a, 0x81, 0x63, 0x51, 0x88, 0x9d, 0x6d, 0xc9, 0x44, 0x9c, 0xe4, 0x45, + 0x3f, 0x84, 0x59, 0xd6, 0x93, 0x69, 0xe7, 0x6e, 0x97, 0x58, 0xbd, 0x70, 0xbe, 0xb8, 0x3b, 0x71, + 0xbb, 0xe7, 0x86, 0x87, 0x28, 0xf7, 0x6c, 0xdf, 0x95, 0x6a, 0xab, 0x4c, 0xc2, 0x09, 0x75, 0xe8, + 0x5d, 0x98, 0x32, 0x5c, 0xca, 0x06, 0xf7, 0xea, 0x14, 0x0f, 0xe8, 0x17, 0xf2, 0x05, 0xb4, 0x6d, + 0xf5, 0xa8, 0xf0, 0x7c, 0x20, 0x8e, 0x43, 0x1c, 0x96, 0x1e, 0x96, 0xe7, 0x0d, 0x68, 0xa7, 0x71, + 0x58, 0xad, 0xe4, 0x6e, 0x0c, 0xd1, 0x46, 0x5a, 0x4c, 0xd6, 0x6d, 0xcc, 0xb2, 0xf4, 0x68, 0x09, + 0x1c, 0x1c, 0x21, 0xa2, 0xef, 0x84, 0xe8, 0x6d, 0x87, 0x0f, 0x14, 0x33, 0x6b, 0x5f, 0x9e, 0x04, + 0x7d, 0x7b, 0xc0, 0x4f, 0x9d, 0x0c, 0xdf, 0x76, 0x70, 0x04, 0x59, 0x7b, 0x1b, 0x16, 0x46, 0x1c, + 0x89, 0xce, 0x81, 0xba, 0x4f, 0xc5, 0x75, 0x05, 0xb3, 0x3f, 0xd1, 0x05, 0x28, 0x1d, 0x90, 0xee, + 0x40, 0x9c, 0x53, 0x1c, 0xfc, 0xb8, 0x5d, 0x58, 0x57, 0xb4, 0x5f, 0x14, 0x60, 0x26, 0x88, 0x8c, + 0xef, 0x52, 0xd2, 0x3b, 0x85, 0x94, 0x69, 0x43, 0xd1, 0xeb, 0x53, 0x43, 0x14, 0xfd, 0xb5, 0xdc, + 0x27, 0x87, 0xdb, 0xc7, 0xe6, 0x8a, 0x38, 0xcd, 0xd8, 0x2f, 0xcc, 0xd1, 0xd0, 0xe3, 0xa8, 0x43, + 0x05, 0xcd, 0xfd, 0xe6, 0x84, 0xb8, 0xc7, 0x76, 0x2a, 0xed, 0xf7, 0x0a, 0x9c, 0x93, 0xb8, 0x4f, + 0xeb, 0x52, 0xb5, 0xf9, 0xa2, 0x0d, 0x32, 0xae, 0xad, 0x52, 0x93, 0xd4, 0x7e, 0x53, 0x10, 0xc5, + 0x35, 0xdc, 0x05, 0xeb, 0xf0, 0xa7, 0xb0, 0x8d, 0x47, 0x89, 0x88, 0xaf, 0x4f, 0x16, 0x99, 0x78, + 0x9e, 0xcc, 0x8c, 0xfb, 0x4e, 0x2a, 0xee, 0xb7, 0x5f, 0x08, 0xfd, 0xf8, 0xe8, 0xff, 0xb8, 0x00, + 0x8b, 0x99, 0x16, 0xa1, 0x6b, 0x50, 0x0e, 0x46, 0x3f, 0xee, 0xb9, 0x4a, 0x8c, 0x10, 0xf0, 0x60, + 0x41, 0x45, 0x26, 0x80, 0x4b, 0xfb, 0x8e, 0x67, 0xf9, 0x8e, 0x7b, 0x28, 0xfc, 0xf0, 0x95, 0x1c, + 0x96, 0xe2, 0x48, 0x48, 0x72, 0xc3, 0x1c, 0x73, 0x74, 0x4c, 0xc1, 0x12, 0x34, 0x7a, 0xc4, 0x0c, + 0x22, 0x26, 0x65, 0xee, 0x50, 0x27, 0x49, 0x2f, 0x19, 0x3f, 0xde, 0x04, 0x43, 0xc2, 0x02, 0x51, + 0xfb, 0x6d, 0x01, 0x5e, 0x19, 0xe3, 0x3a, 0x84, 0x13, 0x8e, 0x60, 0x13, 0xc6, 0x44, 0x61, 0x08, + 0x2e, 0x23, 0x29, 0xa7, 0x59, 0x19, 0x4e, 0xbb, 0xf5, 0x22, 0x4e, 0x13, 0xd1, 0x3d, 0xc6, 0x6d, + 0x8f, 0x53, 0x6e, 0xbb, 0x39, 0xa1, 0xdb, 0x52, 0xe7, 0x27, 0xe5, 0xb8, 0x8f, 0x8b, 0x89, 0xbc, + 0x13, 0xd7, 0xe6, 0x93, 0xcf, 0xbb, 0x0e, 0x94, 0x76, 0xba, 0xce, 0x4e, 0x38, 0x9a, 0xbd, 0x3d, + 0x59, 0x4c, 0x02, 0x33, 0x75, 0x76, 0xd3, 0x14, 0x0d, 0x3a, 0xaa, 0x2a, 0x7c, 0x0d, 0x07, 0xe0, + 0x68, 0x2f, 0xe5, 0xbb, 0x77, 0x5e, 0x48, 0x4d, 0xe0, 0xb2, 0x40, 0xcf, 0x18, 0x3f, 0xd6, 0xf6, + 0x01, 0x62, 0x6b, 0x32, 0xba, 0xdc, 0x7d, 0xb9, 0xcb, 0x4d, 0xf0, 0x06, 0x11, 0x0d, 0xe3, 0x52, + 0x63, 0xac, 0x7d, 0x5f, 0xf4, 0xc5, 0xb1, 0xda, 0x36, 0x92, 0xda, 0xde, 0xca, 0x5d, 0x9c, 0x13, + 0x57, 0x77, 0xb9, 0x17, 0xff, 0x41, 0x11, 0x77, 0x68, 0xe1, 0x99, 0x93, 0x1f, 0xde, 0xb7, 0x93, + 0xc3, 0xfb, 0xa4, 0x59, 0x9b, 0x3d, 0xc2, 0xff, 0x43, 0x01, 0x24, 0x71, 0x6d, 0x92, 0x7e, 0xdf, + 0xb2, 0xcd, 0xff, 0xb9, 0x76, 0xf9, 0xbc, 0x3b, 0xe5, 0xaf, 0x0a, 0x89, 0x68, 0xf1, 0x7e, 0xb0, + 0x9d, 0x78, 0xa3, 0x8a, 0x8b, 0x8d, 0xb8, 0x69, 0xbe, 0x26, 0x40, 0x16, 0x9b, 0x59, 0x4c, 0x38, + 0x5b, 0x16, 0xbd, 0x0b, 0x45, 0x9f, 0x98, 0x61, 0x8c, 0xea, 0x13, 0xbe, 0x00, 0x48, 0x97, 0x12, + 0x62, 0x7a, 0x98, 0x43, 0x21, 0x1b, 0x66, 0xbb, 0xd2, 0x05, 0x6b, 0xd2, 0x99, 0x49, 0xbe, 0x9c, + 0xc5, 0x63, 0xbb, 0xbc, 0x8a, 0x13, 0xf8, 0xda, 0x2f, 0x93, 0x93, 0x87, 0x68, 0x1a, 0x27, 0xe2, + 0xad, 0x87, 0x09, 0x6f, 0xe5, 0xd9, 0x12, 0xbb, 0xf6, 0x77, 0xda, 0xc4, 0xbc, 0x77, 0x40, 0x6d, + 0x9f, 0x25, 0x49, 0xa6, 0xcb, 0x28, 0x5c, 0xea, 0x0f, 0x76, 0xba, 0x96, 0x91, 0x69, 0x8d, 0x38, + 0x25, 0x57, 0x84, 0xe0, 0xa5, 0xad, 0xf1, 0xac, 0xf8, 0x38, 0x1c, 0xed, 0xa3, 0x62, 0x78, 0x8b, + 0xe5, 0x9e, 0x6a, 0x93, 0xd3, 0x48, 0x9c, 0x6f, 0x04, 0x27, 0x3d, 0x48, 0x9b, 0x89, 0x0f, 0xd8, + 0x54, 0xe2, 0x83, 0xc4, 0x1a, 0x80, 0xf8, 0xb8, 0x62, 0x39, 0x36, 0x77, 0x8b, 0x1a, 0x6b, 0xbf, + 0x1f, 0x51, 0xb0, 0xc4, 0x85, 0xf6, 0x32, 0x2e, 0xbf, 0x37, 0xf3, 0x99, 0xc1, 0x83, 0x96, 0xff, + 0xee, 0x1b, 0x95, 0x88, 0xd2, 0x4b, 0x29, 0x11, 0xe9, 0x3c, 0x2a, 0x9f, 0x70, 0x1e, 0xfd, 0x29, + 0x59, 0x5a, 0xdb, 0xc4, 0x3c, 0x85, 0x26, 0xf1, 0x30, 0xd9, 0x24, 0x56, 0x27, 0x6b, 0x12, 0x6d, + 0x62, 0x8e, 0xe9, 0x13, 0xff, 0x54, 0x60, 0x61, 0x24, 0xf7, 0xc2, 0xaa, 0xab, 0x8c, 0xf9, 0xde, + 0xb5, 0x95, 0x34, 0xe6, 0x8b, 0x13, 0x9c, 0x92, 0x6c, 0x33, 0x52, 0x87, 0x4f, 0x3d, 0xb9, 0xc3, + 0xa7, 0x7d, 0xa8, 0xc2, 0x85, 0xac, 0x89, 0xfe, 0x65, 0x3d, 0x94, 0xa7, 0x9f, 0xb9, 0x0b, 0xa7, + 0xfd, 0xcc, 0xad, 0xfe, 0xe7, 0xcf, 0xdc, 0xc5, 0xd3, 0x79, 0xe6, 0xfe, 0xb0, 0x00, 0x17, 0xb3, + 0xef, 0x09, 0x27, 0xf4, 0xd6, 0x1d, 0xdf, 0x30, 0x0a, 0x2f, 0xff, 0x86, 0x81, 0x6e, 0xc3, 0x1c, + 0xe9, 0x04, 0xc7, 0x8c, 0x74, 0x59, 0xd3, 0xe2, 0xe7, 0x78, 0xba, 0x81, 0x86, 0x47, 0xcb, 0x73, + 0x77, 0x12, 0x14, 0x9c, 0xe2, 0xd4, 0x3e, 0x55, 0x01, 0x8d, 0xbe, 0x22, 0xa2, 0xdb, 0xe2, 0x65, + 0x33, 0x48, 0xc4, 0x6b, 0xf2, 0xcb, 0xe6, 0xe7, 0x47, 0xcb, 0x17, 0x47, 0x25, 0xa4, 0x37, 0xcf, + 0x8d, 0xc8, 0x85, 0xc1, 0xbb, 0xe8, 0xcd, 0xa4, 0x53, 0x3e, 0x3f, 0x5a, 0xce, 0xf8, 0x97, 0x01, + 0x3d, 0x42, 0x4a, 0xb9, 0xce, 0x84, 0xb3, 0x5d, 0xe2, 0xf9, 0x5b, 0xae, 0xb3, 0x43, 0xdb, 0x96, + 0xf8, 0x58, 0x3e, 0xd9, 0xcb, 0x5f, 0xf4, 0xb6, 0xb9, 0x21, 0x03, 0xe1, 0x24, 0x2e, 0x3a, 0x00, + 0xc4, 0x16, 0xda, 0x2e, 0xb1, 0xbd, 0x60, 0x4b, 0x4c, 0x5b, 0x71, 0x62, 0x6d, 0x35, 0xa1, 0x0d, + 0x6d, 0x8c, 0xa0, 0xe1, 0x0c, 0x0d, 0xe8, 0x1a, 0x94, 0x5d, 0x4a, 0x3c, 0xc7, 0x16, 0x2f, 0xb1, + 0x51, 0x94, 0x31, 0x5f, 0xc5, 0x82, 0x8a, 0xfe, 0x1f, 0xa6, 0x7a, 0xd4, 0xf3, 0x58, 0xfb, 0x2a, + 0x73, 0xc6, 0x79, 0xc1, 0x38, 0xb5, 0x19, 0x2c, 0xe3, 0x90, 0xae, 0x7d, 0xa0, 0x40, 0x1c, 0x22, + 0xde, 0x75, 0x2d, 0xe3, 0x5e, 0xf0, 0x82, 0xbb, 0x0e, 0xb3, 0x8e, 0x6b, 0x12, 0xdb, 0x7a, 0x12, + 0xb4, 0xe8, 0x20, 0xc0, 0x51, 0xc6, 0x3f, 0x90, 0x68, 0x38, 0xc1, 0xc9, 0x5a, 0xbb, 0xe1, 0xf4, + 0x7a, 0x8e, 0xcd, 0xaa, 0xb6, 0x08, 0xad, 0x54, 0xf3, 0x42, 0x0a, 0x96, 0xb8, 0xb4, 0x8f, 0x15, + 0x98, 0x4f, 0xbd, 0x95, 0xa2, 0x9f, 0x29, 0x70, 0xd1, 0xcb, 0x34, 0x4e, 0xa4, 0xdc, 0xad, 0x49, + 0x9e, 0x48, 0x13, 0x00, 0x8d, 0x25, 0x61, 0xcf, 0x98, 0xdd, 0xe3, 0x31, 0x8a, 0xb5, 0xbf, 0x2a, + 0x70, 0x2e, 0xfd, 0xea, 0xfa, 0xdf, 0x68, 0x28, 0x7a, 0x13, 0x66, 0x82, 0xf9, 0xf1, 0x9b, 0xf4, + 0xb0, 0xd5, 0x14, 0x51, 0x38, 0x2f, 0xc0, 0x66, 0xb6, 0x62, 0x12, 0x96, 0xf9, 0xb4, 0x9f, 0x14, + 0xa0, 0x12, 0x76, 0x2c, 0xf4, 0xed, 0xf8, 0x15, 0x5d, 0x99, 0xf8, 0x74, 0x47, 0x87, 0x6e, 0xe4, + 0x25, 0xfd, 0xe5, 0xff, 0x0f, 0xc8, 0x95, 0x70, 0x5c, 0x0b, 0xc6, 0xeb, 0xec, 0x21, 0x2c, 0x39, + 0x71, 0x16, 0xf3, 0x4c, 0x9c, 0xda, 0x47, 0x2a, 0x2c, 0x8c, 0x34, 0x70, 0x74, 0x2b, 0x51, 0xf3, + 0xae, 0xa6, 0x6a, 0xde, 0xe2, 0x88, 0xc0, 0x89, 0x95, 0xbc, 0xec, 0x4a, 0xa4, 0x9e, 0x62, 0x25, + 0x2a, 0xe6, 0xad, 0x44, 0xa5, 0xe3, 0x2b, 0x51, 0x2a, 0x3a, 0xe5, 0x5c, 0xd1, 0xe9, 0xc3, 0x7c, + 0x6a, 0x22, 0x41, 0x37, 0xa0, 0x62, 0xd9, 0x1e, 0x35, 0x06, 0x2e, 0x15, 0x6f, 0xad, 0xd1, 0xc8, + 0xda, 0x12, 0xeb, 0x38, 0xe2, 0x40, 0x75, 0x98, 0xf6, 0x8c, 0x3d, 0xda, 0x19, 0x74, 0x69, 0x87, + 0x07, 0xa4, 0x12, 0x7f, 0x31, 0xdd, 0x0e, 0x09, 0x38, 0xe6, 0xd1, 0xfe, 0x55, 0x84, 0x59, 0x79, + 0xa0, 0xc8, 0xf1, 0x89, 0xf8, 0x3d, 0x98, 0x21, 0xb6, 0xed, 0xf8, 0x24, 0x18, 0x1c, 0x0b, 0xb9, + 0x1f, 0xbf, 0x64, 0x3d, 0xfa, 0x9d, 0x18, 0x22, 0x78, 0xfc, 0x8a, 0x52, 0x59, 0xa2, 0x60, 0x59, + 0x13, 0xba, 0x23, 0xa6, 0x45, 0x35, 0xff, 0xb4, 0x58, 0x49, 0x4d, 0x8a, 0x75, 0x98, 0x8e, 0x26, + 0x22, 0xf1, 0xcf, 0x09, 0x91, 0x7f, 0xe2, 0x9c, 0x8c, 0x79, 0x90, 0x9e, 0x88, 0x62, 0x89, 0x47, + 0x71, 0xee, 0x98, 0x1b, 0x5d, 0x7a, 0x14, 0x2d, 0x9f, 0xe8, 0x28, 0x9a, 0x31, 0x47, 0x4e, 0x9d, + 0xca, 0x1c, 0x59, 0xfb, 0x1a, 0x9c, 0x4b, 0x47, 0x70, 0xa2, 0xcf, 0x6f, 0x5b, 0x80, 0x46, 0xf5, + 0x3f, 0x6f, 0xf6, 0x1a, 0x95, 0x88, 0x0b, 0x51, 0xe3, 0xfa, 0xd3, 0x67, 0x4b, 0x67, 0x3e, 0x79, + 0xb6, 0x74, 0xe6, 0xb3, 0x67, 0x4b, 0x67, 0x7e, 0x34, 0x5c, 0x52, 0x9e, 0x0e, 0x97, 0x94, 0x4f, + 0x86, 0x4b, 0xca, 0x67, 0xc3, 0x25, 0xe5, 0x6f, 0xc3, 0x25, 0xe5, 0xa7, 0x7f, 0x5f, 0x3a, 0xf3, + 0xa8, 0x70, 0xb0, 0xfa, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x03, 0x52, 0xf9, 0x3c, 0x2a, + 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/image/v1/generated.proto b/vendor/github.com/openshift/api/image/v1/generated.proto index 36901bc6690a..5fbae3daf766 100644 --- a/vendor/github.com/openshift/api/image/v1/generated.proto +++ b/vendor/github.com/openshift/api/image/v1/generated.proto @@ -9,7 +9,6 @@ import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/legacyconfig/v1/stringsource_test.go b/vendor/github.com/openshift/api/legacyconfig/v1/stringsource_test.go deleted file mode 100644 index 5e58eec55c97..000000000000 --- a/vendor/github.com/openshift/api/legacyconfig/v1/stringsource_test.go +++ /dev/null @@ -1,144 +0,0 @@ -package v1 - -import ( - "fmt" - "reflect" - "strings" - "testing" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/runtime/serializer" - - configapi "github.com/openshift/origin/pkg/cmd/server/apis/config" -) - -func TestStringSourceUnmarshaling(t *testing.T) { - codec := serializer.NewCodecFactory(configapi.Scheme).LegacyCodec(LegacySchemeGroupVersion) - - testcases := map[string]struct { - JSON string - ExpectedObject configapi.StringSource - ExpectedError string - }{ - "bool": { - JSON: `true`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "cannot unmarshal", - }, - "number": { - JSON: `1`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "cannot unmarshal", - }, - - "empty string": { - JSON: `""`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "", - }, - "string": { - JSON: `"foo"`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo"}}, - ExpectedError: "", - }, - - "empty struct": { - JSON: `{}`, - ExpectedObject: configapi.StringSource{}, - ExpectedError: "", - }, - "struct value": { - JSON: `{"value":"foo"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo"}}, - ExpectedError: "", - }, - "struct env": { - JSON: `{"env":"foo"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Env: "foo"}}, - ExpectedError: "", - }, - "struct file": { - JSON: `{"file":"foo"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo"}}, - ExpectedError: "", - }, - "struct file+keyFile": { - JSON: `{"file":"foo","keyFile":"bar"}`, - ExpectedObject: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo", KeyFile: "bar"}}, - ExpectedError: "", - }, - } - - for k, tc := range testcases { - // Wrap in a dummy object we can deserialize - input := fmt.Sprintf(`{"kind":"GitHubIdentityProvider","apiVersion":"v1","clientSecret":%s}`, tc.JSON) - obj, err := runtime.Decode(codec, []byte(input)) - if len(tc.ExpectedError) > 0 && (err == nil || !strings.Contains(err.Error(), tc.ExpectedError)) { - t.Errorf("%s: expected error containing %q, got %q", k, tc.ExpectedError, err.Error()) - } - if len(tc.ExpectedError) == 0 && err != nil { - t.Errorf("%s: got unexpected error: %v", k, err) - } - if err != nil { - continue - } - githubProvider, ok := obj.(*configapi.GitHubIdentityProvider) - if !ok { - t.Errorf("%s: wrapper object was not a GitHubIdentityProvider as expected: %#v", k, obj) - continue - } - if !reflect.DeepEqual(tc.ExpectedObject, githubProvider.ClientSecret) { - t.Errorf("%s: expected\n%#v\ngot\n%#v", k, tc.ExpectedObject, githubProvider.ClientSecret) - } - } -} - -func TestStringSourceMarshaling(t *testing.T) { - codec := serializer.NewCodecFactory(configapi.Scheme).LegacyCodec(LegacySchemeGroupVersion) - - testcases := map[string]struct { - Object configapi.StringSource - ExpectedJSON string - }{ - "empty string": { - Object: configapi.StringSource{}, - ExpectedJSON: `""`, - }, - "string": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo"}}, - ExpectedJSON: `"foo"`, - }, - "struct value+keyFile": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Value: "foo", KeyFile: "bar"}}, - ExpectedJSON: `{"value":"foo","env":"","file":"","keyFile":"bar"}`, - }, - "struct env": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{Env: "foo"}}, - ExpectedJSON: `{"value":"","env":"foo","file":"","keyFile":""}`, - }, - "struct file": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo"}}, - ExpectedJSON: `{"value":"","env":"","file":"foo","keyFile":""}`, - }, - "struct file+keyFile": { - Object: configapi.StringSource{StringSourceSpec: configapi.StringSourceSpec{File: "foo", KeyFile: "bar"}}, - ExpectedJSON: `{"value":"","env":"","file":"foo","keyFile":"bar"}`, - }, - } - - for k, tc := range testcases { - provider := &configapi.GitHubIdentityProvider{ClientSecret: tc.Object} - - json, err := runtime.Encode(codec, provider) - if err != nil { - t.Errorf("%s: unexpected error: %v", k, err) - } - - // Wrap in a dummy JSON from the surrounding object - input := fmt.Sprintf(`{"kind":"GitHubIdentityProvider","apiVersion":"v1","clientID":"","clientSecret":%s,"organizations":null,"teams":null,"hostname":"","ca":""}`, tc.ExpectedJSON) - if strings.TrimSpace(string(json)) != input { - t.Log(len(input), len(json)) - t.Errorf("%s: expected\n%s\ngot\n%s", k, input, string(json)) - } - } -} diff --git a/vendor/github.com/openshift/api/network/v1/generated.pb.go b/vendor/github.com/openshift/api/network/v1/generated.pb.go index 0e71b3891fe9..942dec6f16a0 100644 --- a/vendor/github.com/openshift/api/network/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/network/v1/generated.pb.go @@ -2620,65 +2620,65 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 959 bytes of a gzipped FileDescriptorProto + // 946 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x56, 0x4f, 0x6f, 0xe3, 0x44, - 0x14, 0x8f, 0xd3, 0xa4, 0xdd, 0x4c, 0xda, 0xb4, 0x9a, 0x45, 0xac, 0x55, 0x24, 0x27, 0xf2, 0x4a, - 0x28, 0x68, 0x85, 0x4d, 0x5a, 0x84, 0x7a, 0x40, 0x20, 0xbc, 0xad, 0xb4, 0x91, 0x4a, 0x88, 0x26, - 0xd5, 0xaa, 0x42, 0x80, 0x70, 0x9d, 0x59, 0xc7, 0x34, 0xf1, 0x58, 0x9e, 0x49, 0x20, 0x42, 0xfc, - 0xfb, 0x06, 0x7c, 0x18, 0x3e, 0x00, 0x07, 0x0e, 0x3d, 0x70, 0xd8, 0x13, 0xec, 0x29, 0xa2, 0xe1, - 0xcc, 0x17, 0xe0, 0x84, 0x66, 0x3c, 0x8e, 0xed, 0xd6, 0x81, 0xa8, 0x68, 0x73, 0x4a, 0xe6, 0xfd, - 0xde, 0xdf, 0xf9, 0xbd, 0xf7, 0xc6, 0xe0, 0xd0, 0xf5, 0xd8, 0x60, 0x7c, 0x61, 0x38, 0x64, 0x64, - 0x92, 0x00, 0xfb, 0x74, 0xe0, 0x3d, 0x63, 0xa6, 0x1d, 0x78, 0xa6, 0x8f, 0xd9, 0x97, 0x24, 0xbc, - 0x34, 0x27, 0x2d, 0xd3, 0xc5, 0x3e, 0x0e, 0x6d, 0x86, 0xfb, 0x46, 0x10, 0x12, 0x46, 0xe0, 0xc3, - 0xc4, 0xc8, 0x58, 0x18, 0x19, 0x76, 0xe0, 0x19, 0xd2, 0xc8, 0x98, 0xb4, 0xf6, 0xdf, 0x4c, 0x79, - 0x76, 0x89, 0x4b, 0x4c, 0x61, 0x7b, 0x31, 0x7e, 0x26, 0x4e, 0xe2, 0x20, 0xfe, 0x45, 0x3e, 0xf7, - 0xdf, 0xbe, 0x3c, 0xa2, 0x86, 0x47, 0x78, 0xe8, 0x91, 0xed, 0x0c, 0x3c, 0x1f, 0x87, 0x53, 0x33, - 0xb8, 0x74, 0xb9, 0x80, 0x9a, 0x23, 0xcc, 0xec, 0x9c, 0x4c, 0xf6, 0xdf, 0x59, 0x66, 0x15, 0x8e, - 0x7d, 0xe6, 0x8d, 0xb0, 0x49, 0x9d, 0x01, 0x1e, 0xd9, 0xb7, 0xec, 0x0e, 0x97, 0xd9, 0x8d, 0x99, - 0x37, 0x34, 0x3d, 0x9f, 0x51, 0x16, 0xde, 0x34, 0xd2, 0x7f, 0x28, 0x81, 0xda, 0xe3, 0xe1, 0x98, - 0x32, 0x1c, 0x76, 0xa2, 0x3a, 0xe1, 0xe7, 0xe0, 0x1e, 0x4f, 0xad, 0x6f, 0x33, 0x5b, 0x55, 0x1a, - 0x4a, 0xb3, 0x7a, 0xf0, 0x96, 0x11, 0xb9, 0x36, 0xd2, 0xae, 0x8d, 0xe0, 0xd2, 0xe5, 0x02, 0x6a, - 0x70, 0x6d, 0x63, 0xd2, 0x32, 0x3e, 0xba, 0xf8, 0x02, 0x3b, 0xec, 0x43, 0xcc, 0x6c, 0x0b, 0x5e, - 0xcd, 0xea, 0x85, 0xf9, 0xac, 0x0e, 0x12, 0x19, 0x5a, 0x78, 0x85, 0x6f, 0x80, 0x2d, 0x79, 0xa9, - 0x6a, 0xb1, 0xa1, 0x34, 0x2b, 0xd6, 0xae, 0x54, 0xdf, 0x92, 0x39, 0xa0, 0x18, 0x87, 0xc7, 0x60, - 0x6f, 0x40, 0x28, 0xa3, 0xe3, 0x0b, 0x1f, 0xb3, 0x21, 0xf6, 0x5d, 0x36, 0x50, 0x37, 0x1a, 0x4a, - 0x73, 0xc7, 0x52, 0xa5, 0xcd, 0xde, 0x13, 0x42, 0x59, 0x4f, 0xe0, 0xa7, 0x02, 0x47, 0xb7, 0x2c, - 0xe0, 0x7b, 0xa0, 0x46, 0x71, 0x38, 0xf1, 0x1c, 0x2c, 0x03, 0xa8, 0x25, 0x11, 0xf7, 0x55, 0xe9, - 0xa3, 0xd6, 0xcb, 0xa0, 0xe8, 0x86, 0x36, 0x3c, 0x00, 0x20, 0x18, 0x8e, 0x5d, 0xcf, 0xef, 0xd8, - 0x23, 0xac, 0x96, 0x85, 0xed, 0xa2, 0xc4, 0xee, 0x02, 0x41, 0x29, 0x2d, 0xf8, 0x35, 0xd8, 0x75, - 0x32, 0x17, 0x4b, 0xd5, 0xcd, 0xc6, 0x46, 0xb3, 0x7a, 0x70, 0x64, 0xac, 0xd0, 0x6a, 0x46, 0x96, - 0x94, 0x13, 0x9f, 0x85, 0x53, 0xeb, 0x81, 0x0c, 0xb9, 0x9b, 0x05, 0x29, 0xba, 0x19, 0x09, 0x3e, - 0x02, 0x95, 0xc9, 0x57, 0x43, 0xdb, 0xef, 0x92, 0x90, 0xa9, 0x5b, 0xe2, 0xbe, 0x76, 0xe6, 0xb3, - 0x7a, 0xe5, 0xe9, 0xf9, 0xe9, 0x07, 0x1d, 0x2e, 0x44, 0x09, 0xae, 0x7f, 0x03, 0xee, 0xe7, 0x44, - 0x83, 0x0d, 0x50, 0x72, 0xbc, 0x7e, 0x28, 0x7a, 0xa0, 0x62, 0x6d, 0xcb, 0xd8, 0xa5, 0xc7, 0xed, - 0x63, 0x84, 0x04, 0x12, 0x93, 0x93, 0xbe, 0x7c, 0x41, 0xe8, 0x7f, 0x92, 0x93, 0x96, 0xe8, 0xbf, - 0x2a, 0x00, 0x66, 0xe3, 0x9f, 0x7a, 0x94, 0xc1, 0x4f, 0x6e, 0xb5, 0xa1, 0xb1, 0x5a, 0x1b, 0x72, - 0x6b, 0xd1, 0x84, 0x7b, 0x32, 0x89, 0x7b, 0xb1, 0x24, 0xd5, 0x82, 0xe7, 0xa0, 0xec, 0x31, 0x3c, - 0xa2, 0x6a, 0x51, 0x70, 0x72, 0x78, 0x07, 0x4e, 0xac, 0x1d, 0xe9, 0xbf, 0xdc, 0xe6, 0x9e, 0x50, - 0xe4, 0x50, 0xff, 0x5d, 0x01, 0xf7, 0x4f, 0xdc, 0x10, 0x53, 0x2a, 0xf5, 0xba, 0x64, 0xe8, 0x39, - 0xd3, 0x35, 0x8c, 0xd5, 0x67, 0xa0, 0x44, 0x03, 0xec, 0x08, 0x0a, 0xaa, 0x07, 0xef, 0xae, 0x54, - 0x52, 0x4e, 0xa6, 0xbd, 0x00, 0x3b, 0x09, 0xdd, 0xfc, 0x84, 0x84, 0x5f, 0xfd, 0x37, 0x05, 0x3c, - 0xc8, 0xd1, 0x5f, 0x03, 0x5b, 0x9f, 0x66, 0xd9, 0x3a, 0xba, 0x6b, 0x69, 0x4b, 0x28, 0xfb, 0x36, - 0xb7, 0xae, 0x2e, 0xc6, 0x21, 0x3c, 0x02, 0xdb, 0xbc, 0xd5, 0x7b, 0x78, 0x88, 0x1d, 0x46, 0xe2, - 0x61, 0x78, 0x45, 0xba, 0xd9, 0xe6, 0xc3, 0x10, 0x63, 0x28, 0xa3, 0xc9, 0x97, 0x5c, 0xdf, 0xa7, - 0x62, 0x61, 0xdc, 0x58, 0x72, 0xc7, 0x9d, 0x9e, 0xd8, 0x16, 0x31, 0xae, 0xff, 0x94, 0x7f, 0xb1, - 0x68, 0x3c, 0xc4, 0xf0, 0x7d, 0x50, 0x62, 0xd3, 0x00, 0xcb, 0xc0, 0x8f, 0x62, 0x5a, 0xce, 0xa6, - 0x01, 0xfe, 0x7b, 0x56, 0x7f, 0x6d, 0x89, 0x19, 0x87, 0x91, 0x30, 0x84, 0xe7, 0xa0, 0xc8, 0xc8, - 0xff, 0xed, 0x09, 0x7e, 0x17, 0x16, 0x90, 0xc1, 0x8b, 0x67, 0x04, 0x15, 0x19, 0xd1, 0xbf, 0xcb, - 0xcd, 0x9a, 0x37, 0x0c, 0xec, 0x83, 0x4d, 0x2c, 0x20, 0x55, 0x11, 0x8c, 0xdd, 0x39, 0x30, 0x2f, - 0xc6, 0xaa, 0xc9, 0xc0, 0x9b, 0x91, 0x02, 0x92, 0xbe, 0xf5, 0x9f, 0x8b, 0x00, 0x24, 0x0b, 0x66, - 0x0d, 0x13, 0xd6, 0x00, 0x25, 0xbe, 0xbe, 0x24, 0xa1, 0x8b, 0x19, 0xe1, 0x39, 0x20, 0x81, 0xc0, - 0xd7, 0xc1, 0x26, 0xff, 0x6d, 0x77, 0xc5, 0x2b, 0x55, 0x49, 0x52, 0x7f, 0x22, 0xa4, 0x48, 0xa2, - 0x5c, 0x2f, 0x7a, 0xa1, 0xe4, 0x4b, 0xb4, 0xd0, 0x8b, 0x6a, 0x41, 0x12, 0xe5, 0x8b, 0x3c, 0x2a, - 0xb6, 0xdd, 0xa5, 0x6a, 0xb9, 0xb1, 0xd1, 0xac, 0x44, 0x8b, 0xfc, 0x24, 0x16, 0xa2, 0x04, 0x87, - 0x2d, 0x50, 0x8d, 0x0e, 0xbc, 0x2d, 0xa3, 0xe7, 0xa6, 0x62, 0xed, 0xce, 0x67, 0xf5, 0xea, 0x49, - 0x22, 0x46, 0x69, 0x1d, 0xfd, 0x17, 0x05, 0xd4, 0x52, 0x3b, 0xfa, 0xe5, 0x8f, 0xf2, 0x59, 0x76, - 0x94, 0xcd, 0x95, 0x1a, 0x23, 0xc9, 0x70, 0xc9, 0x04, 0xff, 0xa5, 0x80, 0xed, 0x0e, 0x66, 0x7c, - 0x9a, 0x68, 0x60, 0x3b, 0x78, 0x6d, 0x1f, 0x31, 0x7e, 0xce, 0x7c, 0xcb, 0x44, 0x50, 0x8c, 0xc3, - 0x87, 0xa0, 0xec, 0x63, 0xe6, 0xf5, 0xe5, 0x97, 0xcb, 0xa2, 0x84, 0x0e, 0x66, 0xed, 0x63, 0x14, - 0x61, 0x59, 0xa6, 0x4b, 0xff, 0xce, 0xb4, 0x7e, 0xa5, 0x80, 0xbd, 0x74, 0xbd, 0x6b, 0x20, 0xee, - 0x69, 0x96, 0xb8, 0xd6, 0x4a, 0xc4, 0xa5, 0x73, 0xcc, 0xa7, 0xce, 0x6a, 0x5e, 0x5d, 0x6b, 0x85, - 0xe7, 0xd7, 0x5a, 0xe1, 0xc5, 0xb5, 0x56, 0xf8, 0x7e, 0xae, 0x29, 0x57, 0x73, 0x4d, 0x79, 0x3e, - 0xd7, 0x94, 0x17, 0x73, 0x4d, 0xf9, 0x63, 0xae, 0x29, 0x3f, 0xfe, 0xa9, 0x15, 0x3e, 0x2e, 0x4e, - 0x5a, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x50, 0xae, 0xec, 0x7e, 0xd8, 0x0b, 0x00, 0x00, + 0x14, 0x8f, 0xd3, 0xa4, 0xdd, 0x4c, 0xda, 0xb4, 0x9a, 0x45, 0xac, 0x55, 0xa4, 0x24, 0xf2, 0x4a, + 0x28, 0x68, 0x85, 0x4d, 0xba, 0x08, 0xf5, 0x80, 0x40, 0x78, 0x5b, 0x69, 0x23, 0x95, 0x10, 0x4d, + 0xaa, 0x55, 0x85, 0x00, 0xe1, 0x3a, 0x6f, 0x1d, 0xd3, 0xc4, 0xb6, 0x3c, 0x93, 0x40, 0x84, 0xf8, + 0xf7, 0x0d, 0xf8, 0x30, 0x7c, 0x00, 0x0e, 0x1c, 0x7a, 0xe0, 0xb0, 0x27, 0xd8, 0x53, 0x44, 0xc3, + 0x99, 0x2f, 0xc0, 0x09, 0xcd, 0x78, 0x1c, 0xdb, 0x5d, 0x17, 0xa2, 0xa2, 0xcd, 0x29, 0x99, 0xf7, + 0x7b, 0x7f, 0xe7, 0xf7, 0xde, 0x1b, 0xa3, 0x87, 0x8e, 0xcb, 0x86, 0x93, 0x73, 0xdd, 0xf6, 0xc7, + 0x86, 0x1f, 0x80, 0x47, 0x87, 0xee, 0x53, 0x66, 0x58, 0x81, 0x6b, 0x78, 0xc0, 0xbe, 0xf4, 0xc3, + 0x0b, 0x63, 0xda, 0x36, 0x1c, 0xf0, 0x20, 0xb4, 0x18, 0x0c, 0xf4, 0x20, 0xf4, 0x99, 0x8f, 0xef, + 0x27, 0x46, 0xfa, 0xd2, 0x48, 0xb7, 0x02, 0x57, 0x97, 0x46, 0xfa, 0xb4, 0xbd, 0xff, 0x66, 0xca, + 0xb3, 0xe3, 0x3b, 0xbe, 0x21, 0x6c, 0xcf, 0x27, 0x4f, 0xc5, 0x49, 0x1c, 0xc4, 0xbf, 0xc8, 0xe7, + 0xfe, 0xdb, 0x17, 0x87, 0x54, 0x77, 0x7d, 0x1e, 0x7a, 0x6c, 0xd9, 0x43, 0xd7, 0x83, 0x70, 0x66, + 0x04, 0x17, 0x0e, 0x17, 0x50, 0x63, 0x0c, 0xcc, 0xca, 0xc9, 0x64, 0xff, 0x9d, 0x9b, 0xac, 0xc2, + 0x89, 0xc7, 0xdc, 0x31, 0x18, 0xd4, 0x1e, 0xc2, 0xd8, 0xba, 0x6e, 0xa7, 0xfd, 0x50, 0x42, 0xb5, + 0x47, 0xa3, 0x09, 0x65, 0x10, 0x76, 0xa3, 0x94, 0xf1, 0xe7, 0xe8, 0x0e, 0x8f, 0x32, 0xb0, 0x98, + 0xa5, 0x2a, 0x4d, 0xa5, 0x55, 0x3d, 0x78, 0x4b, 0x8f, 0xbc, 0xeb, 0x69, 0xef, 0x7a, 0x70, 0xe1, + 0x70, 0x01, 0xd5, 0xb9, 0xb6, 0x3e, 0x6d, 0xeb, 0x1f, 0x9d, 0x7f, 0x01, 0x36, 0xfb, 0x10, 0x98, + 0x65, 0xe2, 0xcb, 0x79, 0xa3, 0xb0, 0x98, 0x37, 0x50, 0x22, 0x23, 0x4b, 0xaf, 0xf8, 0x0d, 0xb4, + 0x25, 0xef, 0x47, 0x2d, 0x36, 0x95, 0x56, 0xc5, 0xdc, 0x95, 0xea, 0x5b, 0x32, 0x07, 0x12, 0xe3, + 0xf8, 0x08, 0xed, 0x0d, 0x7d, 0xca, 0xe8, 0xe4, 0xdc, 0x03, 0x36, 0x02, 0xcf, 0x61, 0x43, 0x75, + 0xa3, 0xa9, 0xb4, 0x76, 0x4c, 0x55, 0xda, 0xec, 0x3d, 0xf6, 0x29, 0xeb, 0x0b, 0xfc, 0x44, 0xe0, + 0xe4, 0x05, 0x0b, 0xfc, 0x1e, 0xaa, 0x51, 0x08, 0xa7, 0xae, 0x0d, 0x32, 0x80, 0x5a, 0x12, 0x71, + 0x5f, 0x95, 0x3e, 0x6a, 0xfd, 0x0c, 0x4a, 0xae, 0x69, 0xe3, 0x03, 0x84, 0x82, 0xd1, 0xc4, 0x71, + 0xbd, 0xae, 0x35, 0x06, 0xb5, 0x2c, 0x6c, 0x97, 0x25, 0xf6, 0x96, 0x08, 0x49, 0x69, 0xe1, 0xaf, + 0xd1, 0xae, 0x9d, 0xb9, 0x58, 0xaa, 0x6e, 0x36, 0x37, 0x5a, 0xd5, 0x83, 0x43, 0x7d, 0x85, 0xae, + 0xd1, 0xb3, 0xa4, 0x1c, 0x7b, 0x2c, 0x9c, 0x99, 0xf7, 0x64, 0xc8, 0xdd, 0x2c, 0x48, 0xc9, 0xf5, + 0x48, 0xf8, 0x01, 0xaa, 0x4c, 0xbf, 0x1a, 0x59, 0x5e, 0xcf, 0x0f, 0x99, 0xba, 0x25, 0xee, 0x6b, + 0x67, 0x31, 0x6f, 0x54, 0x9e, 0x9c, 0x9d, 0x7c, 0xd0, 0xe5, 0x42, 0x92, 0xe0, 0xda, 0x37, 0xe8, + 0x6e, 0x4e, 0x34, 0xdc, 0x44, 0x25, 0xdb, 0x1d, 0x84, 0xa2, 0x07, 0x2a, 0xe6, 0xb6, 0x8c, 0x5d, + 0x7a, 0xd4, 0x39, 0x22, 0x44, 0x20, 0x31, 0x39, 0xe9, 0xcb, 0x17, 0x84, 0xfe, 0x27, 0x39, 0x69, + 0x89, 0xf6, 0xab, 0x82, 0x70, 0x36, 0xfe, 0x89, 0x4b, 0x19, 0xfe, 0xe4, 0x85, 0x36, 0xd4, 0x57, + 0x6b, 0x43, 0x6e, 0x2d, 0x9a, 0x70, 0x4f, 0x26, 0x71, 0x27, 0x96, 0xa4, 0x5a, 0xf0, 0x0c, 0x95, + 0x5d, 0x06, 0x63, 0xaa, 0x16, 0x05, 0x27, 0x0f, 0x6f, 0xc1, 0x89, 0xb9, 0x23, 0xfd, 0x97, 0x3b, + 0xdc, 0x13, 0x89, 0x1c, 0x6a, 0xbf, 0x2b, 0xe8, 0xee, 0xb1, 0x13, 0x02, 0xa5, 0x52, 0xaf, 0xe7, + 0x8f, 0x5c, 0x7b, 0xb6, 0x86, 0xb1, 0xfa, 0x0c, 0x95, 0x68, 0x00, 0xb6, 0xa0, 0xa0, 0x7a, 0xf0, + 0xee, 0x4a, 0x25, 0xe5, 0x64, 0xda, 0x0f, 0xc0, 0x4e, 0xe8, 0xe6, 0x27, 0x22, 0xfc, 0x6a, 0xbf, + 0x29, 0xe8, 0x5e, 0x8e, 0xfe, 0x1a, 0xd8, 0xfa, 0x34, 0xcb, 0xd6, 0xe1, 0x6d, 0x4b, 0xbb, 0x81, + 0xb2, 0x6f, 0x73, 0xeb, 0xea, 0x01, 0x84, 0xf8, 0x10, 0x6d, 0xf3, 0x56, 0xef, 0xc3, 0x08, 0x6c, + 0xe6, 0xc7, 0xc3, 0xf0, 0x8a, 0x74, 0xb3, 0xcd, 0x87, 0x21, 0xc6, 0x48, 0x46, 0x93, 0x2f, 0xb9, + 0x81, 0x47, 0xc5, 0xc2, 0xb8, 0xb6, 0xe4, 0x8e, 0xba, 0x7d, 0xb1, 0x2d, 0x62, 0x5c, 0xfb, 0x29, + 0xff, 0x62, 0xc9, 0x64, 0x04, 0xf8, 0x7d, 0x54, 0x62, 0xb3, 0x00, 0x64, 0xe0, 0x07, 0x31, 0x2d, + 0xa7, 0xb3, 0x00, 0xfe, 0x9e, 0x37, 0x5e, 0xbb, 0xc1, 0x8c, 0xc3, 0x44, 0x18, 0xe2, 0x33, 0x54, + 0x64, 0xfe, 0xff, 0xed, 0x09, 0x7e, 0x17, 0x26, 0x92, 0xc1, 0x8b, 0xa7, 0x3e, 0x29, 0x32, 0x5f, + 0xfb, 0x2e, 0x37, 0x6b, 0xde, 0x30, 0x78, 0x80, 0x36, 0x41, 0x40, 0xaa, 0x22, 0x18, 0xbb, 0x75, + 0x60, 0x5e, 0x8c, 0x59, 0x93, 0x81, 0x37, 0x23, 0x05, 0x22, 0x7d, 0x6b, 0x3f, 0x17, 0x11, 0x4a, + 0x16, 0xcc, 0x1a, 0x26, 0xac, 0x89, 0x4a, 0x7c, 0x7d, 0x49, 0x42, 0x97, 0x33, 0xc2, 0x73, 0x20, + 0x02, 0xc1, 0xaf, 0xa3, 0x4d, 0xfe, 0xdb, 0xe9, 0x89, 0x57, 0xaa, 0x92, 0xa4, 0xfe, 0x58, 0x48, + 0x89, 0x44, 0xb9, 0x5e, 0xf4, 0x42, 0xc9, 0x97, 0x68, 0xa9, 0x17, 0xd5, 0x42, 0x24, 0xca, 0x17, + 0x79, 0x54, 0x6c, 0xa7, 0x47, 0xd5, 0x72, 0x73, 0xa3, 0x55, 0x89, 0x16, 0xf9, 0x71, 0x2c, 0x24, + 0x09, 0x8e, 0xdb, 0xa8, 0x1a, 0x1d, 0x78, 0x5b, 0x46, 0xcf, 0x4d, 0xc5, 0xdc, 0x5d, 0xcc, 0x1b, + 0xd5, 0xe3, 0x44, 0x4c, 0xd2, 0x3a, 0xda, 0x2f, 0x0a, 0xaa, 0xa5, 0x76, 0xf4, 0xcb, 0x1f, 0xe5, + 0xd3, 0xec, 0x28, 0x1b, 0x2b, 0x35, 0x46, 0x92, 0xe1, 0x0d, 0x13, 0xfc, 0x97, 0x82, 0xb6, 0xbb, + 0xc0, 0xf8, 0x34, 0xd1, 0xc0, 0xb2, 0x61, 0x6d, 0x1f, 0x31, 0x5e, 0xce, 0x7c, 0xcb, 0x44, 0x48, + 0x8c, 0xe3, 0xfb, 0xa8, 0xec, 0x01, 0x73, 0x07, 0xf2, 0xcb, 0x65, 0x59, 0x42, 0x17, 0x58, 0xe7, + 0x88, 0x44, 0x58, 0x96, 0xe9, 0xd2, 0xbf, 0x33, 0xad, 0x5d, 0x2a, 0x68, 0x2f, 0x5d, 0xef, 0x1a, + 0x88, 0x7b, 0x92, 0x25, 0xae, 0xbd, 0x12, 0x71, 0xe9, 0x1c, 0xf3, 0xa9, 0x33, 0x5b, 0x97, 0x57, + 0xf5, 0xc2, 0xb3, 0xab, 0x7a, 0xe1, 0xf9, 0x55, 0xbd, 0xf0, 0xfd, 0xa2, 0xae, 0x5c, 0x2e, 0xea, + 0xca, 0xb3, 0x45, 0x5d, 0x79, 0xbe, 0xa8, 0x2b, 0x7f, 0x2c, 0xea, 0xca, 0x8f, 0x7f, 0xd6, 0x0b, + 0x1f, 0x17, 0xa7, 0xed, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x18, 0x07, 0x95, 0xa3, 0x0b, + 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/network/v1/generated.proto b/vendor/github.com/openshift/api/network/v1/generated.proto index cad2f165b1ab..c76b61ec8765 100644 --- a/vendor/github.com/openshift/api/network/v1/generated.proto +++ b/vendor/github.com/openshift/api/network/v1/generated.proto @@ -7,7 +7,6 @@ package github.com.openshift.api.network.v1; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/oauth/v1/generated.pb.go b/vendor/github.com/openshift/api/oauth/v1/generated.pb.go index 3f468b854d64..0964309c0809 100644 --- a/vendor/github.com/openshift/api/oauth/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/oauth/v1/generated.pb.go @@ -3328,84 +3328,82 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1250 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcf, 0x6f, 0x1b, 0x45, - 0x14, 0xce, 0x26, 0x71, 0x62, 0x8f, 0x9b, 0x5f, 0x93, 0xa6, 0x5d, 0xda, 0x62, 0x1b, 0x47, 0xa2, - 0x41, 0xc0, 0x9a, 0xa4, 0xa5, 0xaa, 0x54, 0xa9, 0x92, 0x1d, 0xaa, 0x12, 0x41, 0x5a, 0x69, 0xdc, - 0x40, 0x05, 0x3d, 0x74, 0xba, 0xfb, 0x62, 0x0f, 0x59, 0xef, 0x2e, 0x33, 0xe3, 0xd0, 0xa0, 0x1e, - 0xb8, 0x70, 0xe7, 0x1f, 0xe1, 0xc2, 0x9d, 0x03, 0x12, 0x87, 0x9e, 0x50, 0x0f, 0x1c, 0x7a, 0xb2, - 0x88, 0x11, 0xff, 0x04, 0x27, 0xb4, 0xb3, 0xeb, 0xfd, 0x61, 0x7b, 0xb1, 0x73, 0x89, 0x38, 0x70, - 0xdb, 0x7d, 0xdf, 0xf7, 0xbd, 0xf9, 0xf5, 0xbe, 0x37, 0xbb, 0x68, 0xbb, 0xc5, 0x64, 0xbb, 0xfb, - 0xcc, 0x30, 0xdd, 0x4e, 0xcd, 0xf5, 0xc0, 0x11, 0x6d, 0x76, 0x28, 0x6b, 0xd4, 0x63, 0x35, 0x97, - 0x76, 0x65, 0xbb, 0x76, 0xbc, 0x5d, 0x6b, 0x81, 0x03, 0x9c, 0x4a, 0xb0, 0x0c, 0x8f, 0xbb, 0xd2, - 0xc5, 0x6f, 0xc5, 0x12, 0x23, 0x92, 0x18, 0xd4, 0x63, 0x86, 0x92, 0x18, 0xc7, 0xdb, 0x57, 0xde, - 0x4f, 0x64, 0x6d, 0xb9, 0x2d, 0xb7, 0xa6, 0x94, 0xcf, 0xba, 0x87, 0xea, 0x4d, 0xbd, 0xa8, 0xa7, - 0x20, 0xe3, 0x95, 0xea, 0xd1, 0x6d, 0x61, 0x30, 0x57, 0x0d, 0x6b, 0xba, 0x1c, 0xc6, 0x8c, 0x7a, - 0xe5, 0x66, 0xcc, 0xe9, 0x50, 0xb3, 0xcd, 0x1c, 0xe0, 0x27, 0x35, 0xef, 0xa8, 0xe5, 0x07, 0x44, - 0xad, 0x03, 0x92, 0x8e, 0x53, 0xd5, 0xb2, 0x54, 0xbc, 0xeb, 0x48, 0xd6, 0x81, 0x11, 0xc1, 0xad, - 0x49, 0x02, 0x61, 0xb6, 0xa1, 0x43, 0x47, 0x74, 0x37, 0xb2, 0x74, 0x5d, 0xc9, 0xec, 0x1a, 0x73, - 0xa4, 0x90, 0x7c, 0x58, 0x54, 0xfd, 0x59, 0x43, 0x57, 0x77, 0xed, 0xae, 0x90, 0xc0, 0x89, 0x6b, - 0x43, 0xd3, 0x74, 0x3d, 0x20, 0x20, 0x24, 0x67, 0xa6, 0x64, 0xae, 0x83, 0xdf, 0x45, 0x05, 0xee, - 0xda, 0xf0, 0x80, 0x76, 0x40, 0xe8, 0x5a, 0x65, 0x6e, 0xab, 0xd0, 0x58, 0xea, 0xf7, 0xca, 0x05, - 0x32, 0x08, 0x92, 0x18, 0xc7, 0x06, 0x42, 0x8e, 0xff, 0xe0, 0x51, 0x13, 0x84, 0x3e, 0xab, 0xd8, - 0xcb, 0xfd, 0x5e, 0x19, 0x3d, 0x88, 0xa2, 0x24, 0xc1, 0xc0, 0x75, 0xb4, 0x42, 0x6d, 0xdb, 0xfd, - 0xe6, 0x9e, 0x30, 0xa9, 0x4d, 0xfd, 0xf1, 0xf4, 0xb9, 0x8a, 0xb6, 0x95, 0x6f, 0x5c, 0x7e, 0xd9, - 0x2b, 0xcf, 0xf4, 0x7b, 0xe5, 0x95, 0x7a, 0x1a, 0x26, 0xc3, 0xfc, 0xea, 0x5f, 0xf3, 0x68, 0xf5, - 0x61, 0xbd, 0x2b, 0xdb, 0x75, 0xd3, 0x04, 0x21, 0x1e, 0xb9, 0x47, 0xe0, 0xe0, 0xa7, 0x28, 0xef, - 0x9f, 0x86, 0x45, 0x25, 0xd5, 0xb5, 0x8a, 0xb6, 0x55, 0xdc, 0xf9, 0xc0, 0x08, 0x36, 0xc7, 0x48, - 0x6e, 0x8e, 0xe1, 0x1d, 0xb5, 0xfc, 0x80, 0x30, 0x7c, 0xb6, 0x71, 0xbc, 0x6d, 0x3c, 0x7c, 0xf6, - 0x15, 0x98, 0x72, 0x1f, 0x24, 0x6d, 0xe0, 0x70, 0x0a, 0x28, 0x8e, 0x91, 0x28, 0x2b, 0xde, 0x41, - 0xc8, 0xb4, 0x19, 0x38, 0xd2, 0x5f, 0x99, 0x3e, 0x5b, 0xd1, 0xb6, 0x0a, 0xb1, 0x62, 0x37, 0x42, - 0x48, 0x82, 0x85, 0x6b, 0xa8, 0x00, 0xcf, 0x3d, 0xc6, 0x41, 0xec, 0x05, 0xeb, 0x9c, 0x6b, 0xac, - 0x85, 0x92, 0xc2, 0xbd, 0x01, 0x40, 0x62, 0x0e, 0xae, 0xa2, 0x05, 0xe1, 0x9f, 0x87, 0xd0, 0xe7, - 0xd5, 0x56, 0xa2, 0x7e, 0xaf, 0xbc, 0xa0, 0x4e, 0x48, 0x90, 0x10, 0xc1, 0x1f, 0xa2, 0x22, 0x07, - 0x8b, 0x71, 0x30, 0xe5, 0x01, 0xd9, 0xd3, 0x73, 0x6a, 0x26, 0xeb, 0x61, 0xda, 0x22, 0x89, 0x21, - 0x92, 0xe4, 0xe1, 0xf7, 0x50, 0xbe, 0x2b, 0x80, 0xab, 0xd9, 0x2f, 0x28, 0xcd, 0x6a, 0xa8, 0xc9, - 0x1f, 0x84, 0x71, 0x12, 0x31, 0xf0, 0x3b, 0x68, 0xd1, 0x7f, 0x3e, 0xd8, 0xfb, 0x48, 0x5f, 0x54, - 0xe4, 0x95, 0x90, 0xbc, 0x78, 0x10, 0x84, 0xc9, 0x00, 0xc7, 0x77, 0xd1, 0xb2, 0xef, 0x40, 0x97, - 0xb3, 0x6f, 0x41, 0x1d, 0x86, 0x9e, 0x57, 0x8a, 0x4b, 0xa1, 0x62, 0xb9, 0x9e, 0x42, 0xc9, 0x10, - 0x1b, 0xdf, 0x46, 0x17, 0x38, 0x1c, 0x72, 0x10, 0xed, 0x40, 0x5d, 0x50, 0xea, 0x8b, 0xa1, 0xfa, - 0x02, 0x49, 0x60, 0x24, 0xc5, 0xc4, 0x4f, 0x90, 0xce, 0x1c, 0x6a, 0x4a, 0x76, 0xcc, 0xe4, 0xc9, - 0x23, 0xd6, 0x01, 0xb7, 0x2b, 0x9b, 0x60, 0xba, 0x8e, 0x25, 0x74, 0x54, 0xd1, 0xb6, 0x72, 0x8d, - 0x4a, 0x98, 0x45, 0xdf, 0xcb, 0xe0, 0x91, 0xcc, 0x0c, 0xd5, 0xdf, 0x34, 0x74, 0x71, 0xb8, 0xce, - 0x3e, 0x65, 0x42, 0xe2, 0x27, 0x23, 0xb5, 0x66, 0x4c, 0x57, 0x6b, 0xbe, 0x5a, 0x55, 0x5a, 0xb4, - 0xf3, 0x83, 0x48, 0xa2, 0xce, 0x1e, 0xa3, 0x1c, 0x93, 0xd0, 0x09, 0xcc, 0x54, 0xdc, 0xb9, 0x61, - 0x4c, 0x6c, 0x7c, 0xc6, 0xf0, 0x2c, 0x1b, 0x4b, 0x61, 0xfe, 0xdc, 0x9e, 0x9f, 0x89, 0x04, 0x09, - 0xab, 0xbf, 0xcc, 0xa3, 0xf5, 0x80, 0x9a, 0x3e, 0x80, 0xff, 0xbd, 0x33, 0xc9, 0x3b, 0x9b, 0x28, - 0x27, 0x24, 0x95, 0x03, 0xe3, 0x44, 0xdb, 0xdb, 0xf4, 0x83, 0x24, 0xc0, 0x52, 0x06, 0x5b, 0x3c, - 0x8b, 0xc1, 0xf2, 0x13, 0x0c, 0x76, 0x07, 0x2d, 0x99, 0xae, 0x05, 0xbb, 0x6d, 0x6a, 0xdb, 0xe0, - 0xb4, 0x20, 0x74, 0xc8, 0x46, 0x28, 0x58, 0xda, 0x4d, 0x82, 0x24, 0xcd, 0xc5, 0xfb, 0x68, 0x3d, - 0x15, 0xd8, 0x07, 0xd9, 0x76, 0x2d, 0x65, 0x8f, 0x42, 0xe3, 0x6a, 0x98, 0x62, 0x7d, 0x77, 0x94, - 0x42, 0xc6, 0xe9, 0xaa, 0xbf, 0x6b, 0xe8, 0xf2, 0x98, 0x1a, 0x3a, 0x07, 0x5f, 0x7c, 0x99, 0xf6, - 0xc5, 0xad, 0xa9, 0x7d, 0x91, 0x9a, 0x68, 0x86, 0x35, 0xbe, 0x5f, 0x40, 0x45, 0xc5, 0x0e, 0x8a, - 0xf1, 0x1c, 0x2c, 0xf1, 0x36, 0x5a, 0x10, 0x60, 0x72, 0x90, 0xa1, 0x1d, 0x96, 0x43, 0xf6, 0x42, - 0x53, 0x45, 0x49, 0x88, 0xe2, 0x5d, 0xb4, 0x46, 0x2d, 0x8b, 0xf9, 0x37, 0x1f, 0xb5, 0x03, 0x4c, - 0xe8, 0x73, 0xaa, 0xc0, 0x37, 0xfa, 0xbd, 0xf2, 0x5a, 0x7d, 0x18, 0x24, 0xa3, 0x7c, 0xdc, 0x44, - 0x1b, 0x1c, 0x84, 0xe7, 0x3a, 0xd6, 0xe7, 0x4c, 0xb6, 0xa3, 0x33, 0xf5, 0x9d, 0xe2, 0xdf, 0xbd, - 0x6f, 0x86, 0x63, 0x6f, 0x90, 0x71, 0x24, 0x32, 0x5e, 0x8b, 0x6f, 0xfa, 0x7d, 0x3b, 0xf2, 0x88, - 0xd0, 0x73, 0x6a, 0x52, 0xab, 0x41, 0xcf, 0x8e, 0xe3, 0x24, 0xc5, 0xc2, 0x7b, 0xa8, 0xd8, 0xe2, - 0xd4, 0x91, 0x61, 0x1d, 0x06, 0x86, 0xba, 0x3e, 0x70, 0xe0, 0xfd, 0x18, 0xfa, 0xbb, 0x57, 0x5e, - 0x55, 0xaf, 0x1f, 0x53, 0xc7, 0xb2, 0x81, 0x3f, 0x3a, 0xf1, 0x80, 0x24, 0xb5, 0xf8, 0x05, 0x5a, - 0x13, 0x43, 0x1f, 0x2f, 0x42, 0x5f, 0x9c, 0xba, 0x6b, 0x0e, 0x7f, 0xf8, 0x34, 0xde, 0x08, 0x67, - 0xb1, 0x36, 0x8c, 0x08, 0x32, 0x3a, 0x10, 0x7e, 0x8c, 0x74, 0x1a, 0xb7, 0xdc, 0x7d, 0xfa, 0xbc, - 0xde, 0x82, 0xc1, 0xe5, 0x93, 0x57, 0x97, 0xcf, 0x35, 0xff, 0xe2, 0xa9, 0x67, 0x70, 0x48, 0xa6, - 0x1a, 0x9f, 0xa0, 0xcd, 0x04, 0x96, 0x75, 0x73, 0xa9, 0x2e, 0x90, 0x6b, 0x5c, 0xef, 0xf7, 0xca, - 0x9b, 0xf5, 0xc9, 0x74, 0x32, 0x4d, 0xce, 0xea, 0x8f, 0xb3, 0x48, 0x4f, 0xf8, 0x60, 0xe0, 0x1d, - 0xf5, 0xe1, 0xf5, 0x1f, 0xbd, 0x27, 0x92, 0x6d, 0x77, 0xee, 0x2c, 0x6d, 0x77, 0x7e, 0x42, 0xdb, - 0x8d, 0xef, 0x93, 0x5c, 0xd6, 0x7d, 0x52, 0xed, 0x69, 0xe8, 0x5a, 0xd6, 0x7e, 0x9d, 0x43, 0x4f, - 0x7c, 0x9a, 0xee, 0x89, 0x77, 0xa6, 0xed, 0x89, 0x63, 0x66, 0x9b, 0xd1, 0x18, 0x7f, 0xd5, 0xd0, - 0x4a, 0x42, 0x72, 0x0e, 0x6b, 0x6a, 0xa6, 0xd7, 0x64, 0x9c, 0x6d, 0x4d, 0x19, 0xcb, 0x38, 0xd5, - 0xd0, 0x25, 0xc5, 0x1a, 0x74, 0x26, 0x02, 0x87, 0xc0, 0xc1, 0x31, 0xe1, 0x1c, 0xaa, 0x1a, 0x50, - 0x81, 0x0f, 0x86, 0x53, 0x45, 0x5d, 0xdc, 0xb9, 0x39, 0xc5, 0xaa, 0x46, 0xa6, 0x1a, 0x7f, 0xff, - 0x44, 0x21, 0x12, 0x67, 0xae, 0xbe, 0x40, 0x6b, 0xa3, 0xab, 0xdb, 0x44, 0xb9, 0x16, 0x77, 0xbb, - 0x9e, 0x5a, 0x5a, 0xe2, 0xcb, 0xe5, 0xbe, 0x1f, 0x24, 0x01, 0x86, 0x2b, 0x68, 0xfe, 0x88, 0x39, - 0x56, 0x68, 0xb8, 0x0b, 0x21, 0x67, 0xfe, 0x13, 0xe6, 0x58, 0x44, 0x21, 0x3e, 0xc3, 0x89, 0x0d, - 0x16, 0x31, 0x94, 0xb9, 0x14, 0x52, 0xfd, 0x49, 0x43, 0xab, 0x63, 0x7e, 0x25, 0xf3, 0x36, 0x93, - 0xc0, 0xa9, 0x3d, 0xf8, 0x93, 0x5c, 0xf1, 0xbb, 0xfc, 0xbd, 0xe7, 0xd4, 0x94, 0x9f, 0x51, 0xbb, - 0x0b, 0x82, 0x44, 0x04, 0xfc, 0x35, 0x2a, 0x9a, 0xf1, 0x6f, 0x69, 0xb8, 0x51, 0x77, 0xa7, 0xd8, - 0xa8, 0x7f, 0xf9, 0x99, 0x0d, 0xc6, 0x4b, 0x10, 0x48, 0x72, 0x8c, 0xc6, 0xd6, 0xcb, 0xd3, 0xd2, - 0xcc, 0xab, 0xd3, 0xd2, 0xcc, 0xeb, 0xd3, 0xd2, 0xcc, 0x77, 0xfd, 0x92, 0xf6, 0xb2, 0x5f, 0xd2, - 0x5e, 0xf5, 0x4b, 0xda, 0xeb, 0x7e, 0x49, 0xfb, 0xa3, 0x5f, 0xd2, 0x7e, 0xf8, 0xb3, 0x34, 0xf3, - 0xc5, 0xec, 0xf1, 0xf6, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x95, 0x4c, 0xaf, 0xb2, 0x10, - 0x00, 0x00, + // 1228 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x57, 0xcd, 0x6f, 0x1b, 0xc5, + 0x1b, 0xce, 0x26, 0xb6, 0x63, 0x8f, 0x9b, 0x0f, 0x4f, 0x9a, 0x76, 0x7f, 0x6d, 0x7f, 0xb6, 0x71, + 0x24, 0x6a, 0x04, 0xac, 0x49, 0x28, 0x55, 0xa5, 0x4a, 0x95, 0x6c, 0x53, 0x15, 0x0b, 0xd2, 0x4a, + 0xe3, 0x06, 0x2a, 0xe8, 0xa1, 0x93, 0xdd, 0x37, 0xf6, 0x90, 0xf5, 0xee, 0xb2, 0x33, 0x0e, 0x09, + 0xea, 0x81, 0x0b, 0x77, 0xfe, 0x11, 0x2e, 0xdc, 0x39, 0x20, 0x71, 0xc8, 0x09, 0xf5, 0xc0, 0xa1, + 0x27, 0x8b, 0x18, 0xf1, 0x4f, 0x70, 0x42, 0x3b, 0xbb, 0xde, 0x0f, 0x7f, 0x10, 0xe7, 0x12, 0x71, + 0xe0, 0xb6, 0xfb, 0x3e, 0xcf, 0xf3, 0xce, 0xc7, 0xbe, 0xcf, 0x3b, 0xb3, 0x68, 0xbb, 0xc3, 0x44, + 0xb7, 0xbf, 0xaf, 0xe9, 0x76, 0xaf, 0x66, 0x3b, 0x60, 0xf1, 0x2e, 0x3b, 0x10, 0x35, 0xea, 0xb0, + 0x9a, 0x4d, 0xfb, 0xa2, 0x5b, 0x3b, 0xda, 0xae, 0x75, 0xc0, 0x02, 0x97, 0x0a, 0x30, 0x34, 0xc7, + 0xb5, 0x85, 0x8d, 0xdf, 0x88, 0x24, 0x5a, 0x28, 0xd1, 0xa8, 0xc3, 0x34, 0x29, 0xd1, 0x8e, 0xb6, + 0x6f, 0xbc, 0x1b, 0xcb, 0xda, 0xb1, 0x3b, 0x76, 0x4d, 0x2a, 0xf7, 0xfb, 0x07, 0xf2, 0x4d, 0xbe, + 0xc8, 0x27, 0x3f, 0xe3, 0x8d, 0x3b, 0x87, 0xf7, 0xb8, 0xc6, 0x6c, 0x6f, 0xd8, 0x1e, 0xd5, 0xbb, + 0xcc, 0x02, 0xf7, 0xa4, 0xe6, 0x1c, 0x76, 0xbc, 0x00, 0xaf, 0xf5, 0x40, 0xd0, 0x29, 0xf3, 0xb8, + 0x71, 0x77, 0x96, 0xca, 0xed, 0x5b, 0x82, 0xf5, 0xa0, 0xc6, 0xf5, 0x2e, 0xf4, 0xe8, 0xb8, 0xae, + 0xf2, 0x93, 0x82, 0x6e, 0x36, 0xcd, 0x3e, 0x17, 0xe0, 0x12, 0xdb, 0x84, 0xb6, 0x6e, 0x3b, 0x40, + 0x80, 0x0b, 0x97, 0xe9, 0x82, 0xd9, 0x16, 0x7e, 0x1b, 0xe5, 0x5c, 0xdb, 0x84, 0xc7, 0xb4, 0x07, + 0x5c, 0x55, 0xca, 0x4b, 0xd5, 0x5c, 0x63, 0x65, 0x38, 0x28, 0xe5, 0xc8, 0x28, 0x48, 0x22, 0x1c, + 0x6b, 0x08, 0x59, 0xde, 0x83, 0x43, 0x75, 0xe0, 0xea, 0xa2, 0x64, 0xaf, 0x0e, 0x07, 0x25, 0xf4, + 0x38, 0x8c, 0x92, 0x18, 0x03, 0xd7, 0xd1, 0x1a, 0x35, 0x4d, 0xfb, 0xeb, 0x87, 0x5c, 0xa7, 0x26, + 0xf5, 0xc6, 0x53, 0x97, 0xca, 0x4a, 0x35, 0xdb, 0xb8, 0x7e, 0x3a, 0x28, 0x2d, 0x0c, 0x07, 0xa5, + 0xb5, 0x7a, 0x12, 0x26, 0xe3, 0xfc, 0xca, 0x9f, 0x29, 0xb4, 0xfe, 0xa4, 0xde, 0x17, 0xdd, 0xba, + 0xae, 0x03, 0xe7, 0x4f, 0xed, 0x43, 0xb0, 0xf0, 0x0b, 0x94, 0xf5, 0xf6, 0xc9, 0xa0, 0x82, 0xaa, + 0x4a, 0x59, 0xa9, 0xe6, 0x77, 0xde, 0xd3, 0xfc, 0xfd, 0xd1, 0xe2, 0xfb, 0xa3, 0x39, 0x87, 0x1d, + 0x2f, 0xc0, 0x35, 0x8f, 0xad, 0x1d, 0x6d, 0x6b, 0x4f, 0xf6, 0xbf, 0x04, 0x5d, 0xec, 0x82, 0xa0, + 0x0d, 0x1c, 0x4c, 0x01, 0x45, 0x31, 0x12, 0x66, 0xc5, 0x3b, 0x08, 0xe9, 0x26, 0x03, 0x4b, 0x78, + 0x2b, 0x53, 0x17, 0xcb, 0x4a, 0x35, 0x17, 0x29, 0x9a, 0x21, 0x42, 0x62, 0x2c, 0x5c, 0x43, 0x39, + 0x38, 0x76, 0x98, 0x0b, 0xbc, 0xe5, 0xaf, 0x73, 0xa9, 0x51, 0x08, 0x24, 0xb9, 0x87, 0x23, 0x80, + 0x44, 0x1c, 0x5c, 0x41, 0x19, 0xee, 0x7d, 0x0f, 0xae, 0xa6, 0xe4, 0x56, 0xa2, 0xe1, 0xa0, 0x94, + 0x91, 0x5f, 0x88, 0x93, 0x00, 0xc1, 0x1f, 0xa0, 0xbc, 0x0b, 0x06, 0x73, 0x41, 0x17, 0x7b, 0xa4, + 0xa5, 0xa6, 0xe5, 0x4c, 0x36, 0x82, 0xb4, 0x79, 0x12, 0x41, 0x24, 0xce, 0xc3, 0xef, 0xa0, 0x6c, + 0x9f, 0x83, 0x2b, 0x67, 0x9f, 0x91, 0x9a, 0xf5, 0x40, 0x93, 0xdd, 0x0b, 0xe2, 0x24, 0x64, 0xe0, + 0xb7, 0xd0, 0xb2, 0xf7, 0xbc, 0xd7, 0xfa, 0x50, 0x5d, 0x96, 0xe4, 0xb5, 0x80, 0xbc, 0xbc, 0xe7, + 0x87, 0xc9, 0x08, 0xc7, 0x0f, 0xd0, 0xaa, 0x57, 0xf7, 0xb6, 0xcb, 0xbe, 0x01, 0xf9, 0x31, 0xd4, + 0xac, 0x54, 0x5c, 0x0b, 0x14, 0xab, 0xf5, 0x04, 0x4a, 0xc6, 0xd8, 0xf8, 0x1e, 0xba, 0xe2, 0xc2, + 0x81, 0x0b, 0xbc, 0xeb, 0xab, 0x73, 0x52, 0x7d, 0x35, 0x50, 0x5f, 0x21, 0x31, 0x8c, 0x24, 0x98, + 0xf8, 0x39, 0x52, 0x99, 0x45, 0x75, 0xc1, 0x8e, 0x98, 0x38, 0x79, 0xca, 0x7a, 0x60, 0xf7, 0x45, + 0x1b, 0x74, 0xdb, 0x32, 0xb8, 0x8a, 0xca, 0x4a, 0x35, 0xdd, 0x28, 0x07, 0x59, 0xd4, 0xd6, 0x0c, + 0x1e, 0x99, 0x99, 0xa1, 0xf2, 0xab, 0x82, 0xae, 0x8e, 0xd7, 0xd9, 0x27, 0x8c, 0x0b, 0xfc, 0x7c, + 0xa2, 0xd6, 0xb4, 0xf9, 0x6a, 0xcd, 0x53, 0xcb, 0x4a, 0x0b, 0x77, 0x7e, 0x14, 0x89, 0xd5, 0xd9, + 0x33, 0x94, 0x66, 0x02, 0x7a, 0xbe, 0x99, 0xf2, 0x3b, 0xef, 0x6b, 0xe7, 0xb6, 0x1b, 0x6d, 0x7c, + 0x96, 0x8d, 0x95, 0x20, 0x7f, 0xba, 0xe5, 0x65, 0x22, 0x7e, 0xc2, 0xca, 0xcf, 0x29, 0xb4, 0xe1, + 0x53, 0x93, 0x1f, 0xe0, 0x3f, 0xef, 0x9c, 0xe7, 0x9d, 0x2d, 0x94, 0xe6, 0x82, 0x8a, 0x91, 0x71, + 0xc2, 0xed, 0x6d, 0x7b, 0x41, 0xe2, 0x63, 0x09, 0x83, 0x2d, 0x5f, 0xc4, 0x60, 0xd9, 0x73, 0x0c, + 0x76, 0x1f, 0xad, 0xe8, 0xb6, 0x01, 0xcd, 0x2e, 0x35, 0x4d, 0xb0, 0x3a, 0x10, 0x38, 0x64, 0x33, + 0x10, 0xac, 0x34, 0xe3, 0x20, 0x49, 0x72, 0xf1, 0x2e, 0xda, 0x48, 0x04, 0x76, 0x41, 0x74, 0x6d, + 0x43, 0xda, 0x23, 0xd7, 0xb8, 0x19, 0xa4, 0xd8, 0x68, 0x4e, 0x52, 0xc8, 0x34, 0x5d, 0xe5, 0x37, + 0x05, 0x5d, 0x9f, 0x52, 0x43, 0x97, 0xe0, 0x8b, 0x2f, 0x92, 0xbe, 0xb8, 0x3b, 0xb7, 0x2f, 0x12, + 0x13, 0x9d, 0x61, 0x8d, 0xef, 0x32, 0x28, 0x2f, 0xd9, 0x7e, 0x31, 0x5e, 0x82, 0x25, 0xde, 0x44, + 0x19, 0x0e, 0xba, 0x0b, 0x22, 0xb0, 0xc3, 0x6a, 0xc0, 0xce, 0xb4, 0x65, 0x94, 0x04, 0x28, 0x6e, + 0xa2, 0x02, 0x35, 0x0c, 0xe6, 0x9d, 0x7c, 0xd4, 0xf4, 0x31, 0xae, 0x2e, 0xc9, 0x02, 0xdf, 0x1c, + 0x0e, 0x4a, 0x85, 0xfa, 0x38, 0x48, 0x26, 0xf9, 0xb8, 0x8d, 0x36, 0x5d, 0xe0, 0x8e, 0x6d, 0x19, + 0x9f, 0x31, 0xd1, 0x0d, 0xbf, 0xa9, 0xe7, 0x14, 0xef, 0xec, 0xfd, 0x7f, 0x30, 0xf6, 0x26, 0x99, + 0x46, 0x22, 0xd3, 0xb5, 0xf8, 0x8e, 0xd7, 0xb7, 0x43, 0x8f, 0x70, 0x35, 0x2d, 0x27, 0xb5, 0xee, + 0xf7, 0xec, 0x28, 0x4e, 0x12, 0x2c, 0xdc, 0x42, 0xf9, 0x8e, 0x4b, 0x2d, 0x11, 0xd4, 0xa1, 0x6f, + 0xa8, 0xdb, 0x23, 0x07, 0x3e, 0x8a, 0xa0, 0xbf, 0x06, 0xa5, 0x75, 0xf9, 0xfa, 0x11, 0xb5, 0x0c, + 0x13, 0xdc, 0xa7, 0x27, 0x0e, 0x90, 0xb8, 0x16, 0xbf, 0x44, 0x05, 0x3e, 0x76, 0x79, 0xe1, 0xea, + 0xf2, 0xdc, 0x5d, 0x73, 0xfc, 0xe2, 0xd3, 0xf8, 0x5f, 0x30, 0x8b, 0xc2, 0x38, 0xc2, 0xc9, 0xe4, + 0x40, 0xf8, 0x19, 0x52, 0x69, 0xd4, 0x72, 0x77, 0xe9, 0x71, 0xbd, 0x03, 0xa3, 0xc3, 0x27, 0x2b, + 0x0f, 0x9f, 0x5b, 0xde, 0xc1, 0x53, 0x9f, 0xc1, 0x21, 0x33, 0xd5, 0xf8, 0x04, 0x6d, 0xc5, 0xb0, + 0x59, 0x27, 0x97, 0xec, 0x02, 0xe9, 0xc6, 0xed, 0xe1, 0xa0, 0xb4, 0x55, 0x3f, 0x9f, 0x4e, 0xe6, + 0xc9, 0x59, 0xf9, 0x61, 0x11, 0xa9, 0x31, 0x1f, 0x8c, 0xbc, 0x23, 0x2f, 0x5e, 0xff, 0xd2, 0x73, + 0x22, 0xde, 0x76, 0x97, 0x2e, 0xd2, 0x76, 0x53, 0xe7, 0xb4, 0xdd, 0xe8, 0x3c, 0x49, 0xcf, 0x3a, + 0x4f, 0x2a, 0x03, 0x05, 0xdd, 0x9a, 0xb5, 0x5f, 0x97, 0xd0, 0x13, 0x5f, 0x24, 0x7b, 0xe2, 0xfd, + 0x79, 0x7b, 0xe2, 0x94, 0xd9, 0xce, 0x68, 0x8c, 0xbf, 0x28, 0x68, 0x2d, 0x26, 0xb9, 0x84, 0x35, + 0xb5, 0x93, 0x6b, 0xd2, 0x2e, 0xb6, 0xa6, 0x19, 0xcb, 0x38, 0x53, 0xd0, 0x35, 0xc9, 0x1a, 0x75, + 0x26, 0x02, 0x07, 0xe0, 0x82, 0xa5, 0xc3, 0x25, 0x54, 0x35, 0xa0, 0x9c, 0x3b, 0x1a, 0x4e, 0x16, + 0x75, 0x7e, 0xe7, 0xce, 0x1c, 0xab, 0x9a, 0x98, 0x6a, 0x74, 0xff, 0x09, 0x43, 0x24, 0xca, 0x5c, + 0x79, 0x89, 0x0a, 0x93, 0xab, 0xdb, 0x42, 0xe9, 0x8e, 0x6b, 0xf7, 0x1d, 0xb9, 0xb4, 0xd8, 0xcd, + 0xe5, 0x91, 0x17, 0x24, 0x3e, 0x86, 0xcb, 0x28, 0x75, 0xc8, 0x2c, 0x23, 0x30, 0xdc, 0x95, 0x80, + 0x93, 0xfa, 0x98, 0x59, 0x06, 0x91, 0x88, 0xc7, 0xb0, 0x22, 0x83, 0x85, 0x0c, 0x69, 0x2e, 0x89, + 0x54, 0x7e, 0x54, 0xd0, 0xfa, 0x94, 0x5f, 0xc9, 0xac, 0xc9, 0x04, 0xb8, 0xd4, 0x1c, 0xfd, 0x49, + 0xae, 0x79, 0x5d, 0xfe, 0xe1, 0x31, 0xd5, 0xc5, 0xa7, 0xd4, 0xec, 0x03, 0x27, 0x21, 0x01, 0x7f, + 0x85, 0xf2, 0x7a, 0xf4, 0x5b, 0x1a, 0x6c, 0xd4, 0x83, 0x39, 0x36, 0xea, 0x1f, 0x7e, 0x66, 0xfd, + 0xf1, 0x62, 0x04, 0x12, 0x1f, 0xa3, 0x51, 0x3d, 0x3d, 0x2b, 0x2e, 0xbc, 0x3a, 0x2b, 0x2e, 0xbc, + 0x3e, 0x2b, 0x2e, 0x7c, 0x3b, 0x2c, 0x2a, 0xa7, 0xc3, 0xa2, 0xf2, 0x6a, 0x58, 0x54, 0x5e, 0x0f, + 0x8b, 0xca, 0xef, 0xc3, 0xa2, 0xf2, 0xfd, 0x1f, 0xc5, 0x85, 0xcf, 0x17, 0x8f, 0xb6, 0xff, 0x0e, + 0x00, 0x00, 0xff, 0xff, 0xd3, 0xf9, 0x68, 0xbb, 0x28, 0x10, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/oauth/v1/generated.proto b/vendor/github.com/openshift/api/oauth/v1/generated.proto index 57fed0eeb9ec..16a1b6cccd1c 100644 --- a/vendor/github.com/openshift/api/oauth/v1/generated.proto +++ b/vendor/github.com/openshift/api/oauth/v1/generated.proto @@ -5,11 +5,8 @@ syntax = 'proto2'; package github.com.openshift.api.oauth.v1; -import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/operator/v1/register.go b/vendor/github.com/openshift/api/operator/v1/register.go index 1b10b91eb737..c3888e800afd 100644 --- a/vendor/github.com/openshift/api/operator/v1/register.go +++ b/vendor/github.com/openshift/api/operator/v1/register.go @@ -38,6 +38,8 @@ func addKnownTypes(scheme *runtime.Scheme) error { &KubeControllerManagerList{}, &OpenShiftAPIServer{}, &OpenShiftAPIServerList{}, + &OpenShiftControllerManager{}, + &OpenShiftControllerManagerList{}, ) return nil diff --git a/vendor/github.com/openshift/api/operator/v1/types_kubeapiserver.go b/vendor/github.com/openshift/api/operator/v1/types_kubeapiserver.go index e60101c87a7e..9081e8261c1b 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_kubeapiserver.go +++ b/vendor/github.com/openshift/api/operator/v1/types_kubeapiserver.go @@ -18,7 +18,7 @@ type KubeAPIServer struct { } type KubeAPIServerSpec struct { - OperatorSpec `json:",inline"` + StaticPodOperatorSpec `json:",inline"` // forceRedeploymentReason can be used to force the redeployment of the kube-apiserver by providing a unique string. // This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work diff --git a/vendor/github.com/openshift/api/operator/v1/types_kubecontrollermanager.go b/vendor/github.com/openshift/api/operator/v1/types_kubecontrollermanager.go index 1bcc4bedeb07..30419a4f9813 100644 --- a/vendor/github.com/openshift/api/operator/v1/types_kubecontrollermanager.go +++ b/vendor/github.com/openshift/api/operator/v1/types_kubecontrollermanager.go @@ -18,7 +18,7 @@ type KubeControllerManager struct { } type KubeControllerManagerSpec struct { - OperatorSpec `json:",inline"` + StaticPodOperatorSpec `json:",inline"` // forceRedeploymentReason can be used to force the redeployment of the kube-controller-manager by providing a unique string. // This provides a mechanism to kick a previously failed deployment and provide a reason why you think it will work diff --git a/vendor/github.com/openshift/api/operator/v1/types_openshiftcontrollermanager.go b/vendor/github.com/openshift/api/operator/v1/types_openshiftcontrollermanager.go new file mode 100644 index 000000000000..43bb1698f438 --- /dev/null +++ b/vendor/github.com/openshift/api/operator/v1/types_openshiftcontrollermanager.go @@ -0,0 +1,37 @@ +package v1 + +import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" +) + +// +genclient +// +genclient:nonNamespaced +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// OpenShiftControllerManager provides information to configure an operator to manage openshift-controller-manager. +type OpenShiftControllerManager struct { + metav1.TypeMeta `json:",inline"` + metav1.ObjectMeta `json:"metadata"` + + Spec OpenShiftControllerManagerSpec `json:"spec"` + Status OpenShiftControllerManagerStatus `json:"status"` +} + +type OpenShiftControllerManagerSpec struct { + OperatorSpec `json:",inline"` +} + +type OpenShiftControllerManagerStatus struct { + OperatorStatus `json:",inline"` +} + +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object + +// OpenShiftControllerManagerList is a collection of items +type OpenShiftControllerManagerList struct { + metav1.TypeMeta `json:",inline"` + // Standard object's metadata. + metav1.ListMeta `json:"metadata,omitempty"` + // Items contains the items + Items []OpenShiftControllerManager `json:"items"` +} diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go index 1fbfd550dd1e..ae5cf1ce70eb 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.go @@ -89,7 +89,7 @@ func (in *KubeAPIServerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KubeAPIServerSpec) DeepCopyInto(out *KubeAPIServerSpec) { *out = *in - in.OperatorSpec.DeepCopyInto(&out.OperatorSpec) + in.StaticPodOperatorSpec.DeepCopyInto(&out.StaticPodOperatorSpec) return } @@ -184,7 +184,7 @@ func (in *KubeControllerManagerList) DeepCopyObject() runtime.Object { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *KubeControllerManagerSpec) DeepCopyInto(out *KubeControllerManagerSpec) { *out = *in - in.OperatorSpec.DeepCopyInto(&out.OperatorSpec) + in.StaticPodOperatorSpec.DeepCopyInto(&out.StaticPodOperatorSpec) return } @@ -385,6 +385,101 @@ func (in *OpenShiftAPIServerStatus) DeepCopy() *OpenShiftAPIServerStatus { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenShiftControllerManager) DeepCopyInto(out *OpenShiftControllerManager) { + *out = *in + out.TypeMeta = in.TypeMeta + in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) + in.Spec.DeepCopyInto(&out.Spec) + in.Status.DeepCopyInto(&out.Status) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenShiftControllerManager. +func (in *OpenShiftControllerManager) DeepCopy() *OpenShiftControllerManager { + if in == nil { + return nil + } + out := new(OpenShiftControllerManager) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *OpenShiftControllerManager) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenShiftControllerManagerList) DeepCopyInto(out *OpenShiftControllerManagerList) { + *out = *in + out.TypeMeta = in.TypeMeta + out.ListMeta = in.ListMeta + if in.Items != nil { + in, out := &in.Items, &out.Items + *out = make([]OpenShiftControllerManager, len(*in)) + for i := range *in { + (*in)[i].DeepCopyInto(&(*out)[i]) + } + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenShiftControllerManagerList. +func (in *OpenShiftControllerManagerList) DeepCopy() *OpenShiftControllerManagerList { + if in == nil { + return nil + } + out := new(OpenShiftControllerManagerList) + in.DeepCopyInto(out) + return out +} + +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *OpenShiftControllerManagerList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenShiftControllerManagerSpec) DeepCopyInto(out *OpenShiftControllerManagerSpec) { + *out = *in + in.OperatorSpec.DeepCopyInto(&out.OperatorSpec) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenShiftControllerManagerSpec. +func (in *OpenShiftControllerManagerSpec) DeepCopy() *OpenShiftControllerManagerSpec { + if in == nil { + return nil + } + out := new(OpenShiftControllerManagerSpec) + in.DeepCopyInto(out) + return out +} + +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *OpenShiftControllerManagerStatus) DeepCopyInto(out *OpenShiftControllerManagerStatus) { + *out = *in + in.OperatorStatus.DeepCopyInto(&out.OperatorStatus) + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new OpenShiftControllerManagerStatus. +func (in *OpenShiftControllerManagerStatus) DeepCopy() *OpenShiftControllerManagerStatus { + if in == nil { + return nil + } + out := new(OpenShiftControllerManagerStatus) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *OperandContainerSpec) DeepCopyInto(out *OperandContainerSpec) { *out = *in diff --git a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go index dde3cd83d55c..66b193377f46 100644 --- a/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go +++ b/vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.go @@ -199,4 +199,22 @@ func (OpenShiftAPIServerList) SwaggerDoc() map[string]string { return map_OpenShiftAPIServerList } +var map_OpenShiftControllerManager = map[string]string{ + "": "OpenShiftControllerManager provides information to configure an operator to manage openshift-controller-manager.", +} + +func (OpenShiftControllerManager) SwaggerDoc() map[string]string { + return map_OpenShiftControllerManager +} + +var map_OpenShiftControllerManagerList = map[string]string{ + "": "OpenShiftControllerManagerList is a collection of items", + "metadata": "Standard object's metadata.", + "items": "Items contains the items", +} + +func (OpenShiftControllerManagerList) SwaggerDoc() map[string]string { + return map_OpenShiftControllerManagerList +} + // AUTO-GENERATED FUNCTIONS END HERE diff --git a/vendor/github.com/openshift/api/osin/v1/stringsource_test.go b/vendor/github.com/openshift/api/osin/v1/stringsource_test.go new file mode 100644 index 000000000000..d4dae7cd4c4f --- /dev/null +++ b/vendor/github.com/openshift/api/osin/v1/stringsource_test.go @@ -0,0 +1,149 @@ +package v1 + +import ( + "fmt" + "reflect" + "strings" + "testing" + + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/runtime/serializer" + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + + configv1 "github.com/openshift/api/config/v1" +) + +var testScheme = runtime.NewScheme() + +func init() { + utilruntime.Must(Install(testScheme)) +} + +func TestStringSourceUnmarshaling(t *testing.T) { + codec := serializer.NewCodecFactory(testScheme).LegacyCodec(GroupVersion) + + testcases := map[string]struct { + JSON string + ExpectedObject configv1.StringSource + ExpectedError string + }{ + "bool": { + JSON: `true`, + ExpectedObject: configv1.StringSource{}, + ExpectedError: "cannot unmarshal", + }, + "number": { + JSON: `1`, + ExpectedObject: configv1.StringSource{}, + ExpectedError: "cannot unmarshal", + }, + + "empty string": { + JSON: `""`, + ExpectedObject: configv1.StringSource{}, + ExpectedError: "", + }, + "string": { + JSON: `"foo"`, + ExpectedObject: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{Value: "foo"}}, + ExpectedError: "", + }, + + "empty struct": { + JSON: `{}`, + ExpectedObject: configv1.StringSource{}, + ExpectedError: "", + }, + "struct value": { + JSON: `{"value":"foo"}`, + ExpectedObject: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{Value: "foo"}}, + ExpectedError: "", + }, + "struct env": { + JSON: `{"env":"foo"}`, + ExpectedObject: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{Env: "foo"}}, + ExpectedError: "", + }, + "struct file": { + JSON: `{"file":"foo"}`, + ExpectedObject: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{File: "foo"}}, + ExpectedError: "", + }, + "struct file+keyFile": { + JSON: `{"file":"foo","keyFile":"bar"}`, + ExpectedObject: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{File: "foo", KeyFile: "bar"}}, + ExpectedError: "", + }, + } + + for k, tc := range testcases { + t.Run(k, func(t *testing.T) { + // Wrap in a dummy object we can deserialize + input := fmt.Sprintf(`{"kind":"GitHubIdentityProvider","apiVersion":"osin.config.openshift.io/v1","clientSecret":%s}`, tc.JSON) + githubProvider := &GitHubIdentityProvider{} + err := runtime.DecodeInto(codec, []byte(input), githubProvider) + if len(tc.ExpectedError) > 0 && (err == nil || !strings.Contains(err.Error(), tc.ExpectedError)) { + t.Errorf("%s: expected error containing %q, got %q", k, tc.ExpectedError, err.Error()) + } + if len(tc.ExpectedError) == 0 && err != nil { + t.Errorf("%s: got unexpected error: %v", k, err) + } + if err != nil { + return + } + if !reflect.DeepEqual(tc.ExpectedObject, githubProvider.ClientSecret) { + t.Errorf("%s: expected\n%#v\ngot\n%#v", k, tc.ExpectedObject, githubProvider.ClientSecret) + } + }) + } +} + +func TestStringSourceMarshaling(t *testing.T) { + codec := serializer.NewCodecFactory(testScheme).LegacyCodec(GroupVersion) + + testcases := map[string]struct { + Object configv1.StringSource + ExpectedJSON string + }{ + "empty string": { + Object: configv1.StringSource{}, + ExpectedJSON: `""`, + }, + "string": { + Object: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{Value: "foo"}}, + ExpectedJSON: `"foo"`, + }, + "struct value+keyFile": { + Object: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{Value: "foo", KeyFile: "bar"}}, + ExpectedJSON: `{"value":"foo","env":"","file":"","keyFile":"bar"}`, + }, + "struct env": { + Object: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{Env: "foo"}}, + ExpectedJSON: `{"value":"","env":"foo","file":"","keyFile":""}`, + }, + "struct file": { + Object: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{File: "foo"}}, + ExpectedJSON: `{"value":"","env":"","file":"foo","keyFile":""}`, + }, + "struct file+keyFile": { + Object: configv1.StringSource{StringSourceSpec: configv1.StringSourceSpec{File: "foo", KeyFile: "bar"}}, + ExpectedJSON: `{"value":"","env":"","file":"foo","keyFile":"bar"}`, + }, + } + + for k, tc := range testcases { + provider := &GitHubIdentityProvider{ClientSecret: tc.Object} + + json, err := runtime.Encode(codec, provider) + if err != nil { + t.Errorf("%s: unexpected error: %v", k, err) + } + + // Wrap in a dummy JSON from the surrounding object + input := fmt.Sprintf(`{"kind":"GitHubIdentityProvider","apiVersion":"osin.config.openshift.io/v1","clientID":"","clientSecret":%s,"organizations":null,"teams":null,"hostname":"","ca":""}`, tc.ExpectedJSON) + if strings.TrimSpace(string(json)) != input { + t.Log(len(input), len(json)) + t.Errorf("%s: expected\n%s\ngot\n%s", k, input, string(json)) + } + } +} diff --git a/vendor/github.com/openshift/api/pkg/testing/deepcopy_test.go b/vendor/github.com/openshift/api/pkg/testing/deepcopy_test.go index 596d311cd0fb..0a9965bc9e28 100644 --- a/vendor/github.com/openshift/api/pkg/testing/deepcopy_test.go +++ b/vendor/github.com/openshift/api/pkg/testing/deepcopy_test.go @@ -4,8 +4,8 @@ import ( "math/rand" "testing" - "k8s.io/apimachinery/pkg/api/testing/fuzzer" - "k8s.io/apimachinery/pkg/api/testing/roundtrip" + "k8s.io/apimachinery/pkg/api/apitesting/fuzzer" + "k8s.io/apimachinery/pkg/api/apitesting/roundtrip" genericfuzzer "k8s.io/apimachinery/pkg/apis/meta/fuzzer" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" diff --git a/vendor/github.com/openshift/api/project/v1/generated.pb.go b/vendor/github.com/openshift/api/project/v1/generated.pb.go index 64c0a5ff83e2..126f0b1e0213 100644 --- a/vendor/github.com/openshift/api/project/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/project/v1/generated.pb.go @@ -1053,40 +1053,39 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 553 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0xbf, 0x6f, 0xd3, 0x40, - 0x14, 0xc7, 0xe3, 0xa4, 0x29, 0xcd, 0x85, 0x56, 0xc8, 0x2c, 0x51, 0x06, 0x27, 0x98, 0x25, 0x03, - 0x9c, 0x49, 0x0a, 0x88, 0xd9, 0x42, 0x08, 0x24, 0x7e, 0x14, 0x33, 0x51, 0x31, 0x70, 0x71, 0x5e, - 0x9c, 0x23, 0xb1, 0x7d, 0xf8, 0xce, 0x91, 0xca, 0xc4, 0x9f, 0xc0, 0xce, 0xff, 0xc2, 0x9c, 0xb1, - 0x63, 0xa7, 0xa8, 0x31, 0xff, 0x45, 0x27, 0x74, 0xe7, 0x6b, 0x6c, 0x48, 0x2a, 0xb5, 0x0b, 0x5b, - 0xee, 0xf9, 0xfb, 0xf9, 0xdc, 0xcb, 0x7b, 0x36, 0x3a, 0x0c, 0xa8, 0x98, 0xa4, 0x43, 0xec, 0xc7, - 0xa1, 0x13, 0x33, 0x88, 0xf8, 0x84, 0x8e, 0x85, 0x43, 0x18, 0x75, 0x58, 0x12, 0x7f, 0x01, 0x5f, - 0x38, 0xf3, 0xbe, 0x13, 0x40, 0x04, 0x09, 0x11, 0x30, 0xc2, 0x2c, 0x89, 0x45, 0x6c, 0xde, 0x2f, - 0x20, 0xbc, 0x86, 0x30, 0x61, 0x14, 0x6b, 0x08, 0xcf, 0xfb, 0xed, 0x87, 0x25, 0x73, 0x10, 0x07, - 0xb1, 0xa3, 0xd8, 0x61, 0x3a, 0x56, 0x27, 0x75, 0x50, 0xbf, 0x72, 0x67, 0xdb, 0x9e, 0x3e, 0xe3, - 0x98, 0xc6, 0xea, 0x6a, 0x3f, 0x4e, 0x60, 0xcb, 0xbd, 0xed, 0xc7, 0x45, 0x26, 0x24, 0xfe, 0x84, - 0x46, 0x90, 0x9c, 0x38, 0x6c, 0x1a, 0xc8, 0x02, 0x77, 0x42, 0x10, 0x64, 0x1b, 0xf5, 0xf4, 0x2a, - 0x2a, 0x49, 0x23, 0x41, 0x43, 0x70, 0xb8, 0x3f, 0x81, 0x90, 0x6c, 0x70, 0x87, 0x57, 0x71, 0xa9, - 0xa0, 0x33, 0x87, 0x46, 0x82, 0x8b, 0xe4, 0x5f, 0xc8, 0xfe, 0x59, 0x45, 0xb7, 0x8e, 0xf2, 0x21, - 0x98, 0x9f, 0xd1, 0x9e, 0xec, 0x69, 0x44, 0x04, 0x69, 0x19, 0x5d, 0xa3, 0xd7, 0x1c, 0x3c, 0xc2, - 0xb9, 0x13, 0x97, 0x9d, 0x98, 0x4d, 0x03, 0x59, 0xe0, 0x58, 0xa6, 0xf1, 0xbc, 0x8f, 0xdf, 0x0d, - 0x25, 0xff, 0x06, 0x04, 0x71, 0xcd, 0xc5, 0xb2, 0x53, 0xc9, 0x96, 0x1d, 0x54, 0xd4, 0xbc, 0xb5, - 0xd5, 0xf4, 0xd0, 0x0e, 0x67, 0xe0, 0xb7, 0xaa, 0xda, 0x7e, 0x8d, 0xbd, 0x60, 0xdd, 0xdd, 0x07, - 0x06, 0xbe, 0x7b, 0x5b, 0xdb, 0x77, 0xe4, 0xc9, 0x53, 0x2e, 0xf3, 0x18, 0xed, 0x72, 0x41, 0x44, - 0xca, 0x5b, 0x35, 0x65, 0x1d, 0xdc, 0xc8, 0xaa, 0x48, 0xf7, 0x40, 0x7b, 0x77, 0xf3, 0xb3, 0xa7, - 0x8d, 0xf6, 0x2f, 0x03, 0x35, 0x75, 0xf2, 0x35, 0xe5, 0xc2, 0xfc, 0xb4, 0x31, 0x21, 0x7c, 0xbd, - 0x09, 0x49, 0x5a, 0xcd, 0xe7, 0x8e, 0xbe, 0x69, 0xef, 0xb2, 0x52, 0x9a, 0xce, 0x7b, 0x54, 0xa7, - 0x02, 0x42, 0xde, 0xaa, 0x76, 0x6b, 0xbd, 0xe6, 0xe0, 0xc1, 0x4d, 0xfe, 0x88, 0xbb, 0xaf, 0xc5, - 0xf5, 0x57, 0x52, 0xe1, 0xe5, 0x26, 0xfb, 0xdc, 0x40, 0x07, 0x3a, 0xe1, 0xc1, 0xd7, 0x14, 0xf8, - 0xff, 0xd8, 0xf2, 0x13, 0xd4, 0x1c, 0x51, 0xce, 0x66, 0xe4, 0xe4, 0x2d, 0x09, 0x41, 0x2d, 0xbb, - 0xe1, 0xde, 0xd5, 0x48, 0xf3, 0x79, 0xf1, 0xc8, 0x2b, 0xe7, 0x14, 0x06, 0xdc, 0x4f, 0x28, 0x13, - 0x34, 0x8e, 0xd4, 0x36, 0xcb, 0x58, 0xf1, 0xc8, 0x2b, 0xe7, 0x6c, 0xb2, 0x5e, 0x91, 0x7c, 0x29, - 0x4c, 0x0f, 0xa1, 0x31, 0x8d, 0xc8, 0x8c, 0x7e, 0x83, 0x84, 0xb7, 0x8c, 0x6e, 0xad, 0xd7, 0x70, - 0x07, 0xb2, 0xd5, 0x17, 0xeb, 0xea, 0xc5, 0xb2, 0xd3, 0xdd, 0xfc, 0x7a, 0xf1, 0x3a, 0xa0, 0x5a, - 0x2b, 0x59, 0xec, 0x8f, 0x68, 0xff, 0xaf, 0xf7, 0xc5, 0x7c, 0x89, 0xea, 0x6c, 0x42, 0x38, 0xa8, - 0x01, 0x36, 0xdc, 0xc1, 0xe5, 0xec, 0x8f, 0x64, 0xf1, 0x62, 0xd9, 0xb9, 0xb7, 0x45, 0x2f, 0xad, - 0x9c, 0x11, 0x1f, 0x54, 0xc8, 0xcb, 0x05, 0x6e, 0x6f, 0xb1, 0xb2, 0x2a, 0xa7, 0x2b, 0xab, 0x72, - 0xb6, 0xb2, 0x2a, 0xdf, 0x33, 0xcb, 0x58, 0x64, 0x96, 0x71, 0x9a, 0x59, 0xc6, 0x59, 0x66, 0x19, - 0xe7, 0x99, 0x65, 0xfc, 0xf8, 0x6d, 0x55, 0x8e, 0xab, 0xf3, 0xfe, 0x9f, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xc8, 0xc6, 0x68, 0xd9, 0xfa, 0x04, 0x00, 0x00, + // 540 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x93, 0x3f, 0x73, 0xd3, 0x30, + 0x18, 0xc6, 0xe3, 0xb4, 0x29, 0x8d, 0x42, 0x7b, 0x9c, 0x59, 0x72, 0x19, 0x9c, 0x60, 0x96, 0x0c, + 0x20, 0x93, 0xf0, 0xe7, 0x98, 0x7d, 0x1c, 0x07, 0x77, 0xfc, 0x29, 0x62, 0xa2, 0xc7, 0x80, 0xe2, + 0xbc, 0x71, 0x44, 0x6a, 0x4b, 0x58, 0x4a, 0xee, 0xca, 0xc4, 0x47, 0x60, 0xe7, 0xbb, 0x30, 0x67, + 0xec, 0xd8, 0x29, 0xd7, 0x98, 0x6f, 0xd1, 0x89, 0x93, 0xac, 0x26, 0x86, 0x86, 0xbb, 0x76, 0x61, + 0xf3, 0xfb, 0xea, 0x79, 0x7e, 0x92, 0x9e, 0x57, 0x46, 0x0f, 0x63, 0xa6, 0xc6, 0xd3, 0x01, 0x8e, + 0x78, 0x12, 0x70, 0x01, 0xa9, 0x1c, 0xb3, 0x91, 0x0a, 0xa8, 0x60, 0x81, 0xc8, 0xf8, 0x67, 0x88, + 0x54, 0x30, 0xeb, 0x05, 0x31, 0xa4, 0x90, 0x51, 0x05, 0x43, 0x2c, 0x32, 0xae, 0xb8, 0x7b, 0x77, + 0x6d, 0xc2, 0x2b, 0x13, 0xa6, 0x82, 0x61, 0x6b, 0xc2, 0xb3, 0x5e, 0xeb, 0x7e, 0x89, 0x1c, 0xf3, + 0x98, 0x07, 0xc6, 0x3b, 0x98, 0x8e, 0x4c, 0x65, 0x0a, 0xf3, 0x55, 0x30, 0x5b, 0xfe, 0xe4, 0xa9, + 0xc4, 0x8c, 0x9b, 0xad, 0x23, 0x9e, 0xc1, 0x86, 0x7d, 0x5b, 0x8f, 0xd6, 0x9a, 0x84, 0x46, 0x63, + 0x96, 0x42, 0x76, 0x1c, 0x88, 0x49, 0xac, 0x1b, 0x32, 0x48, 0x40, 0xd1, 0x4d, 0xae, 0x27, 0xff, + 0x72, 0x65, 0xd3, 0x54, 0xb1, 0x04, 0x02, 0x19, 0x8d, 0x21, 0xa1, 0x7f, 0xfb, 0xfc, 0x1f, 0x55, + 0x74, 0xe3, 0xa0, 0xb8, 0x8f, 0xfb, 0x09, 0xed, 0x6a, 0xfc, 0x90, 0x2a, 0xda, 0x74, 0x3a, 0x4e, + 0xb7, 0xd1, 0x7f, 0x80, 0x0b, 0x2c, 0x2e, 0x63, 0xb1, 0x98, 0xc4, 0xba, 0x21, 0xb1, 0x56, 0xe3, + 0x59, 0x0f, 0xbf, 0x1d, 0x68, 0xff, 0x6b, 0x50, 0x34, 0x74, 0xe7, 0x8b, 0x76, 0x25, 0x5f, 0xb4, + 0xd1, 0xba, 0x47, 0x56, 0x54, 0x97, 0xa0, 0x6d, 0x29, 0x20, 0x6a, 0x56, 0x2d, 0xfd, 0x0a, 0x11, + 0x63, 0x7b, 0xba, 0xf7, 0x02, 0xa2, 0xf0, 0xa6, 0xa5, 0x6f, 0xeb, 0x8a, 0x18, 0x96, 0x7b, 0x88, + 0x76, 0xa4, 0xa2, 0x6a, 0x2a, 0x9b, 0x5b, 0x86, 0xda, 0xbf, 0x16, 0xd5, 0x38, 0xc3, 0x7d, 0xcb, + 0xdd, 0x29, 0x6a, 0x62, 0x89, 0xfe, 0x4f, 0x07, 0x35, 0xac, 0xf2, 0x15, 0x93, 0xca, 0xfd, 0x78, + 0x29, 0x21, 0x7c, 0xb5, 0x84, 0xb4, 0xdb, 0xe4, 0x73, 0xcb, 0xee, 0xb4, 0x7b, 0xd1, 0x29, 0xa5, + 0xf3, 0x0e, 0xd5, 0x98, 0x82, 0x44, 0x36, 0xab, 0x9d, 0xad, 0x6e, 0xa3, 0x7f, 0xef, 0x3a, 0x17, + 0x09, 0xf7, 0x2c, 0xb8, 0xf6, 0x52, 0x23, 0x48, 0x41, 0xf2, 0xcf, 0x1c, 0xb4, 0x6f, 0x15, 0x04, + 0xbe, 0x4c, 0x41, 0xfe, 0x8f, 0x29, 0x3f, 0x46, 0x8d, 0x21, 0x93, 0xe2, 0x88, 0x1e, 0xbf, 0xa1, + 0x09, 0x98, 0x61, 0xd7, 0xc3, 0xdb, 0xd6, 0xd2, 0x78, 0xb6, 0x5e, 0x22, 0x65, 0x9d, 0xb1, 0x81, + 0x8c, 0x32, 0x26, 0x14, 0xe3, 0xa9, 0x99, 0x66, 0xd9, 0xb6, 0x5e, 0x22, 0x65, 0x9d, 0x4f, 0x57, + 0x23, 0xd2, 0x8f, 0xc2, 0x25, 0x08, 0x8d, 0x58, 0x4a, 0x8f, 0xd8, 0x57, 0xc8, 0x64, 0xd3, 0xe9, + 0x6c, 0x75, 0xeb, 0x61, 0x5f, 0x1f, 0xf5, 0xf9, 0xaa, 0x7b, 0xbe, 0x68, 0x77, 0x2e, 0xff, 0x88, + 0x78, 0x25, 0x30, 0x47, 0x2b, 0x51, 0xfc, 0x0f, 0x68, 0xef, 0x8f, 0xf7, 0xe2, 0xbe, 0x40, 0x35, + 0x31, 0xa6, 0x12, 0x4c, 0x80, 0xf5, 0xb0, 0x7f, 0x91, 0xfd, 0x81, 0x6e, 0x9e, 0x2f, 0xda, 0x77, + 0x36, 0xe0, 0x35, 0x55, 0x0a, 0x1a, 0x81, 0x11, 0x91, 0x02, 0x10, 0x76, 0xe7, 0x4b, 0xaf, 0x72, + 0xb2, 0xf4, 0x2a, 0xa7, 0x4b, 0xaf, 0xf2, 0x2d, 0xf7, 0x9c, 0x79, 0xee, 0x39, 0x27, 0xb9, 0xe7, + 0x9c, 0xe6, 0x9e, 0x73, 0x96, 0x7b, 0xce, 0xf7, 0x5f, 0x5e, 0xe5, 0xb0, 0x3a, 0xeb, 0xfd, 0x0e, + 0x00, 0x00, 0xff, 0xff, 0x61, 0xd9, 0x68, 0xf7, 0xc5, 0x04, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/project/v1/generated.proto b/vendor/github.com/openshift/api/project/v1/generated.proto index fa59e77de28c..b80e6fadd6e4 100644 --- a/vendor/github.com/openshift/api/project/v1/generated.proto +++ b/vendor/github.com/openshift/api/project/v1/generated.proto @@ -8,7 +8,6 @@ package github.com.openshift.api.project.v1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/quota/v1/generated.pb.go b/vendor/github.com/openshift/api/quota/v1/generated.pb.go index e92bacc8376b..b1fd54bd3bda 100644 --- a/vendor/github.com/openshift/api/quota/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/quota/v1/generated.pb.go @@ -1805,51 +1805,50 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 725 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0x41, 0x6f, 0xd3, 0x30, - 0x18, 0x6d, 0xb2, 0x75, 0x5a, 0x3d, 0x86, 0x36, 0x6b, 0x87, 0xaa, 0xa0, 0x74, 0x54, 0x42, 0xec, - 0x82, 0x43, 0x37, 0x04, 0x13, 0x88, 0xa1, 0x05, 0x71, 0x00, 0x0d, 0x06, 0x81, 0x13, 0x1a, 0x08, - 0x37, 0xf3, 0xda, 0xd0, 0x24, 0x0e, 0xb1, 0x53, 0xa9, 0x37, 0x7e, 0x01, 0xe2, 0x37, 0xf0, 0x43, - 0xb8, 0x21, 0xed, 0xc6, 0x2e, 0xa0, 0x9d, 0x26, 0x1a, 0xf8, 0x21, 0xc8, 0x8e, 0x9b, 0x74, 0x5b, - 0xbb, 0x95, 0xed, 0xc0, 0x85, 0x5b, 0xfc, 0xd5, 0xef, 0xbd, 0xef, 0x7b, 0x7e, 0x76, 0x41, 0xbd, - 0xe9, 0xf2, 0x56, 0xdc, 0x40, 0x0e, 0xf5, 0x4d, 0x1a, 0x92, 0x80, 0xb5, 0xdc, 0x1d, 0x6e, 0xe2, - 0xd0, 0x35, 0xdf, 0xc7, 0x94, 0x63, 0xb3, 0x53, 0x37, 0x9b, 0x24, 0x20, 0x11, 0xe6, 0x64, 0x1b, - 0x85, 0x11, 0xe5, 0x14, 0x5e, 0xc9, 0x21, 0x28, 0x83, 0x20, 0x1c, 0xba, 0x48, 0x42, 0x50, 0xa7, - 0x5e, 0xb9, 0x3e, 0xc0, 0xda, 0xa4, 0x4d, 0x6a, 0x4a, 0x64, 0x23, 0xde, 0x91, 0x2b, 0xb9, 0x90, - 0x5f, 0x29, 0x63, 0xa5, 0xd6, 0x5e, 0x65, 0xc8, 0xa5, 0x52, 0xd6, 0xa1, 0x11, 0x19, 0xa2, 0x5a, - 0xb9, 0x99, 0xef, 0xf1, 0xb1, 0xd3, 0x72, 0x03, 0x12, 0x75, 0xcd, 0xb0, 0xdd, 0x14, 0x05, 0x66, - 0xfa, 0x64, 0x68, 0xaf, 0x95, 0x5b, 0xa3, 0x50, 0x51, 0x1c, 0x70, 0xd7, 0x27, 0x26, 0x73, 0x5a, - 0xc4, 0xc7, 0xc7, 0x70, 0x2b, 0xa3, 0x70, 0x31, 0x77, 0x3d, 0xd3, 0x0d, 0x38, 0xe3, 0xd1, 0x51, - 0x50, 0xed, 0xab, 0x0e, 0x2e, 0xad, 0x87, 0xa1, 0xe7, 0x92, 0xed, 0x07, 0x5e, 0xcc, 0x38, 0x89, - 0x6c, 0xc2, 0x68, 0x1c, 0x39, 0xe4, 0xb9, 0x30, 0x06, 0xbe, 0x05, 0xd3, 0xa2, 0xcf, 0x6d, 0xcc, - 0x71, 0x59, 0x5b, 0xd4, 0x96, 0x66, 0x96, 0x6f, 0xa0, 0x54, 0x07, 0x0d, 0xea, 0xa0, 0xb0, 0xdd, - 0x14, 0x05, 0x86, 0xc4, 0x6e, 0xd4, 0xa9, 0xa3, 0xcd, 0xc6, 0x3b, 0xe2, 0xf0, 0x27, 0x84, 0x63, - 0x0b, 0xee, 0x1e, 0x54, 0x0b, 0xc9, 0x41, 0x15, 0xe4, 0x35, 0x3b, 0x63, 0x85, 0xaf, 0xc1, 0x24, - 0x0b, 0x89, 0x53, 0xd6, 0x25, 0xfb, 0x5d, 0x74, 0xea, 0x49, 0xa1, 0x61, 0x8d, 0xbe, 0x08, 0x89, - 0x63, 0x5d, 0x50, 0x42, 0x93, 0x62, 0x65, 0x4b, 0x5a, 0x48, 0xc0, 0x14, 0xe3, 0x98, 0xc7, 0xac, - 0x3c, 0x21, 0x05, 0xee, 0x9d, 0x55, 0x40, 0x92, 0x58, 0x17, 0x95, 0xc4, 0x54, 0xba, 0xb6, 0x15, - 0x79, 0xed, 0xb7, 0x06, 0xaa, 0x27, 0xf8, 0xb8, 0xe1, 0x32, 0x0e, 0xb7, 0x8e, 0x79, 0x89, 0xc6, - 0xf3, 0x52, 0xa0, 0xa5, 0x93, 0x73, 0x4a, 0x7d, 0xba, 0x5f, 0x19, 0xf0, 0xd1, 0x01, 0x45, 0x97, - 0x13, 0x9f, 0x95, 0xf5, 0xc5, 0x89, 0xa5, 0x99, 0xe5, 0xb5, 0x31, 0xe6, 0x3c, 0xa1, 0x61, 0x6b, - 0x56, 0x49, 0x15, 0x1f, 0x09, 0x52, 0x3b, 0xe5, 0xae, 0x7d, 0xd1, 0xc1, 0xc2, 0xff, 0x9c, 0x9c, - 0x23, 0x27, 0x3f, 0x34, 0x50, 0xfe, 0x47, 0x01, 0xd9, 0x3a, 0x1c, 0x90, 0xdb, 0x67, 0x1c, 0x70, - 0x44, 0x32, 0xbe, 0xe9, 0xe0, 0xf2, 0x50, 0x3f, 0x88, 0x47, 0x1c, 0x4e, 0x23, 0xf8, 0x06, 0x4c, - 0x79, 0xb8, 0x41, 0x3c, 0xa6, 0x46, 0x5b, 0x19, 0x73, 0x34, 0x81, 0xe9, 0x93, 0x58, 0xf3, 0xc9, - 0x41, 0x75, 0xf6, 0x50, 0xc9, 0x56, 0xac, 0xf0, 0xa3, 0x06, 0x66, 0x70, 0x10, 0x50, 0x8e, 0xb9, - 0x4b, 0x83, 0xfe, 0x94, 0xcf, 0xce, 0x7a, 0x8c, 0x8a, 0x1e, 0xad, 0xe7, 0x94, 0x0f, 0x03, 0x1e, - 0x75, 0xad, 0x8a, 0x1a, 0x1f, 0xe6, 0xbf, 0x64, 0xbd, 0x0c, 0x36, 0x50, 0x59, 0x03, 0x73, 0x47, - 0xc1, 0x70, 0x0e, 0x4c, 0xb4, 0x49, 0x57, 0x3a, 0x50, 0xb2, 0xc5, 0x27, 0x5c, 0x00, 0xc5, 0x0e, - 0xf6, 0x62, 0x22, 0x73, 0x5d, 0xb2, 0xd3, 0xc5, 0x1d, 0x7d, 0x55, 0xab, 0x7d, 0x1f, 0x11, 0x15, - 0x11, 0x5a, 0xe8, 0x83, 0x69, 0xa6, 0x54, 0x95, 0x9f, 0xf7, 0xcf, 0x39, 0x69, 0x9e, 0x9d, 0x6c, - 0x9c, 0x4c, 0x02, 0x3e, 0x06, 0x45, 0x49, 0xa2, 0x6e, 0xdf, 0xd5, 0x81, 0xb3, 0x43, 0xe2, 0xdf, - 0x4f, 0x90, 0x1f, 0xbf, 0x67, 0x59, 0x52, 0x64, 0xc9, 0x4e, 0x29, 0x6a, 0x3d, 0x0d, 0x54, 0x46, - 0xdf, 0x1c, 0xb8, 0x01, 0x8a, 0x9c, 0x72, 0xec, 0xa9, 0xb1, 0xae, 0x9d, 0x2e, 0x95, 0xde, 0xb8, - 0x4c, 0xec, 0xa5, 0x40, 0xdb, 0x29, 0x09, 0x8c, 0x01, 0x08, 0xb0, 0x4f, 0x58, 0x88, 0x1d, 0xd2, - 0xcf, 0xc4, 0xfa, 0x18, 0x4e, 0x0d, 0x53, 0xe8, 0x3e, 0xed, 0x33, 0xe5, 0x4f, 0x55, 0x56, 0x62, - 0xf6, 0x80, 0x50, 0xed, 0xb3, 0x06, 0x8c, 0x93, 0x29, 0xa0, 0x09, 0x4a, 0x19, 0x20, 0x0d, 0x84, - 0x35, 0xaf, 0x58, 0x4b, 0xd9, 0x2e, 0x3b, 0xdf, 0x03, 0x37, 0xb3, 0x17, 0x4a, 0xff, 0x3b, 0x67, - 0x46, 0xbc, 0x45, 0xd6, 0xd2, 0x6e, 0xcf, 0x28, 0xec, 0xf5, 0x8c, 0xc2, 0x7e, 0xcf, 0x28, 0x7c, - 0x48, 0x0c, 0x6d, 0x37, 0x31, 0xb4, 0xbd, 0xc4, 0xd0, 0xf6, 0x13, 0x43, 0xfb, 0x99, 0x18, 0xda, - 0xa7, 0x5f, 0x46, 0xe1, 0x95, 0xde, 0xa9, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, 0x22, 0xac, 0xdd, - 0x82, 0x72, 0x09, 0x00, 0x00, + // 715 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0x41, 0x6f, 0xd3, 0x48, + 0x18, 0x8d, 0xdd, 0xa6, 0x6a, 0xa6, 0xdb, 0x55, 0x3b, 0xea, 0x21, 0xca, 0xae, 0x9c, 0xae, 0xa5, + 0x15, 0xbd, 0x30, 0x26, 0x05, 0x41, 0x05, 0xa2, 0xa8, 0x46, 0x1c, 0x40, 0x85, 0x82, 0xe1, 0x84, + 0x0a, 0x62, 0xe2, 0x4e, 0x13, 0x13, 0xdb, 0x63, 0x3c, 0xe3, 0x48, 0xb9, 0xf1, 0x0b, 0x10, 0xbf, + 0x81, 0x1f, 0xc2, 0x0d, 0xa9, 0x37, 0x7a, 0x01, 0xf5, 0x54, 0x11, 0xc3, 0x0f, 0x41, 0x33, 0x9e, + 0xd8, 0x69, 0x9b, 0xb4, 0xa1, 0x3d, 0x70, 0xe1, 0xe6, 0xf9, 0x32, 0xef, 0xbd, 0x79, 0xcf, 0x6f, + 0x1c, 0xd0, 0x68, 0x79, 0xbc, 0x9d, 0x34, 0x91, 0x4b, 0x03, 0x8b, 0x46, 0x24, 0x64, 0x6d, 0x6f, + 0x97, 0x5b, 0x38, 0xf2, 0xac, 0x37, 0x09, 0xe5, 0xd8, 0xea, 0x36, 0xac, 0x16, 0x09, 0x49, 0x8c, + 0x39, 0xd9, 0x41, 0x51, 0x4c, 0x39, 0x85, 0xff, 0x15, 0x10, 0x94, 0x43, 0x10, 0x8e, 0x3c, 0x24, + 0x21, 0xa8, 0xdb, 0xa8, 0x5d, 0x1e, 0x62, 0x6d, 0xd1, 0x16, 0xb5, 0x24, 0xb2, 0x99, 0xec, 0xca, + 0x95, 0x5c, 0xc8, 0xa7, 0x8c, 0xb1, 0x66, 0x76, 0xd6, 0x18, 0xf2, 0xa8, 0x94, 0x75, 0x69, 0x4c, + 0x46, 0xa8, 0xd6, 0xae, 0x15, 0x7b, 0x02, 0xec, 0xb6, 0xbd, 0x90, 0xc4, 0x3d, 0x2b, 0xea, 0xb4, + 0xc4, 0x80, 0x59, 0x01, 0x19, 0x79, 0xd6, 0xda, 0xf5, 0x71, 0xa8, 0x38, 0x09, 0xb9, 0x17, 0x10, + 0x8b, 0xb9, 0x6d, 0x12, 0xe0, 0xe3, 0x38, 0xf3, 0x93, 0x0e, 0xfe, 0xd9, 0x88, 0x22, 0xdf, 0x23, + 0x3b, 0x77, 0xfd, 0x84, 0x71, 0x12, 0x3b, 0x84, 0xd1, 0x24, 0x76, 0xc9, 0x13, 0xe1, 0x11, 0xbe, + 0x02, 0xb3, 0x42, 0x72, 0x07, 0x73, 0x5c, 0xd5, 0x96, 0xb5, 0x95, 0xb9, 0xd5, 0x2b, 0x28, 0x93, + 0x42, 0xc3, 0x52, 0x28, 0xea, 0xb4, 0xc4, 0x80, 0x21, 0xb1, 0x1b, 0x75, 0x1b, 0x68, 0xab, 0xf9, + 0x9a, 0xb8, 0xfc, 0x21, 0xe1, 0xd8, 0x86, 0x7b, 0x87, 0xf5, 0x52, 0x7a, 0x58, 0x07, 0xc5, 0xcc, + 0xc9, 0x59, 0xe1, 0x0b, 0x30, 0xcd, 0x22, 0xe2, 0x56, 0x75, 0xc9, 0x7e, 0x0b, 0x9d, 0x19, 0x3a, + 0x1a, 0x75, 0xd0, 0xa7, 0x11, 0x71, 0xed, 0xbf, 0x94, 0xd0, 0xb4, 0x58, 0x39, 0x92, 0x16, 0x12, + 0x30, 0xc3, 0x38, 0xe6, 0x09, 0xab, 0x4e, 0x49, 0x81, 0xdb, 0xe7, 0x15, 0x90, 0x24, 0xf6, 0xdf, + 0x4a, 0x62, 0x26, 0x5b, 0x3b, 0x8a, 0xdc, 0xfc, 0xa1, 0x81, 0xfa, 0x29, 0x39, 0x6e, 0x7a, 0x8c, + 0xc3, 0xed, 0x13, 0x59, 0xa2, 0xc9, 0xb2, 0x14, 0x68, 0x99, 0xe4, 0x82, 0x52, 0x9f, 0x1d, 0x4c, + 0x86, 0x72, 0x74, 0x41, 0xd9, 0xe3, 0x24, 0x60, 0x55, 0x7d, 0x79, 0x6a, 0x65, 0x6e, 0x75, 0x7d, + 0x02, 0x9f, 0xa7, 0x1c, 0xd8, 0x9e, 0x57, 0x52, 0xe5, 0xfb, 0x82, 0xd4, 0xc9, 0xb8, 0xcd, 0x8f, + 0x3a, 0x58, 0xfa, 0xd3, 0x93, 0x0b, 0xf4, 0xe4, 0xab, 0x06, 0xaa, 0xbf, 0xa9, 0x20, 0xdb, 0x47, + 0x0b, 0x72, 0xe3, 0x9c, 0x06, 0xc7, 0x34, 0xe3, 0xb3, 0x0e, 0xfe, 0x1d, 0x99, 0x07, 0xf1, 0x89, + 0xcb, 0x69, 0x0c, 0x5f, 0x82, 0x19, 0x1f, 0x37, 0x89, 0xcf, 0x94, 0xb5, 0xab, 0x13, 0x5a, 0x13, + 0x98, 0x01, 0x89, 0xbd, 0x98, 0x1e, 0xd6, 0xe7, 0x8f, 0x8c, 0x1c, 0xc5, 0x0a, 0xdf, 0x69, 0x60, + 0x0e, 0x87, 0x21, 0xe5, 0x98, 0x7b, 0x34, 0x1c, 0xb8, 0x7c, 0x7c, 0xde, 0xd7, 0xa8, 0xe8, 0xd1, + 0x46, 0x41, 0x79, 0x2f, 0xe4, 0x71, 0xcf, 0xae, 0x29, 0xfb, 0xb0, 0xf8, 0x25, 0x3f, 0xcb, 0xf0, + 0x01, 0x6a, 0xeb, 0x60, 0xe1, 0x38, 0x18, 0x2e, 0x80, 0xa9, 0x0e, 0xe9, 0xc9, 0x04, 0x2a, 0x8e, + 0x78, 0x84, 0x4b, 0xa0, 0xdc, 0xc5, 0x7e, 0x42, 0x64, 0xaf, 0x2b, 0x4e, 0xb6, 0xb8, 0xa9, 0xaf, + 0x69, 0xe6, 0x97, 0x31, 0x55, 0x11, 0xa5, 0x85, 0x01, 0x98, 0x65, 0x4a, 0x55, 0xe5, 0x79, 0xe7, + 0x82, 0x4e, 0x8b, 0xee, 0xe4, 0x76, 0x72, 0x09, 0xf8, 0x00, 0x94, 0x25, 0x89, 0xba, 0x7d, 0xff, + 0x0f, 0xbd, 0x3b, 0x24, 0xfe, 0xc8, 0x04, 0xf9, 0xc9, 0x7b, 0x96, 0x37, 0x45, 0x8e, 0x9c, 0x8c, + 0xc2, 0xec, 0x6b, 0xa0, 0x36, 0xfe, 0xe6, 0xc0, 0x4d, 0x50, 0xe6, 0x94, 0x63, 0x5f, 0xd9, 0xba, + 0x74, 0xb6, 0x54, 0x76, 0xe3, 0x72, 0xb1, 0x67, 0x02, 0xed, 0x64, 0x24, 0x30, 0x01, 0x20, 0xc4, + 0x01, 0x61, 0x11, 0x76, 0xc9, 0xa0, 0x13, 0x1b, 0x13, 0x24, 0x35, 0x4a, 0xa1, 0xf7, 0x68, 0xc0, + 0x54, 0x7c, 0xaa, 0xf2, 0x11, 0x73, 0x86, 0x84, 0xcc, 0x0f, 0x1a, 0x30, 0x4e, 0xa7, 0x80, 0x16, + 0xa8, 0xe4, 0x80, 0xac, 0x10, 0xf6, 0xa2, 0x62, 0xad, 0xe4, 0xbb, 0x9c, 0x62, 0x0f, 0xdc, 0xca, + 0xbf, 0x50, 0xfa, 0xaf, 0x25, 0x33, 0xe6, 0x5b, 0x64, 0xaf, 0xec, 0xf5, 0x8d, 0xd2, 0x7e, 0xdf, + 0x28, 0x1d, 0xf4, 0x8d, 0xd2, 0xdb, 0xd4, 0xd0, 0xf6, 0x52, 0x43, 0xdb, 0x4f, 0x0d, 0xed, 0x20, + 0x35, 0xb4, 0x6f, 0xa9, 0xa1, 0xbd, 0xff, 0x6e, 0x94, 0x9e, 0xeb, 0xdd, 0xc6, 0xcf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0xa7, 0x76, 0xc9, 0x6f, 0x3d, 0x09, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/quota/v1/generated.proto b/vendor/github.com/openshift/api/quota/v1/generated.proto index 15b0bbe8a980..272b8dd81f8f 100644 --- a/vendor/github.com/openshift/api/quota/v1/generated.proto +++ b/vendor/github.com/openshift/api/quota/v1/generated.proto @@ -8,7 +8,6 @@ package github.com.openshift.api.quota.v1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/security/v1/generated.pb.go b/vendor/github.com/openshift/api/security/v1/generated.pb.go index b8b67b9124ab..64228a4099ad 100644 --- a/vendor/github.com/openshift/api/security/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/security/v1/generated.pb.go @@ -4481,116 +4481,115 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1765 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x24, 0x47, - 0x15, 0x77, 0x7b, 0xfc, 0x35, 0x65, 0xaf, 0x3f, 0xca, 0x5e, 0x6f, 0xc7, 0xc4, 0x33, 0xa6, 0xbd, - 0x44, 0x16, 0x90, 0x19, 0xbc, 0x04, 0xb2, 0x28, 0x64, 0x95, 0x69, 0x4f, 0xbc, 0x31, 0xf2, 0xee, - 0x4e, 0x6a, 0xe2, 0x08, 0x45, 0x11, 0xa2, 0xdc, 0x53, 0x33, 0xae, 0x75, 0x7f, 0xd1, 0x55, 0x3d, - 0xeb, 0x11, 0x97, 0x48, 0x5c, 0x38, 0x22, 0x71, 0x45, 0x9c, 0xe1, 0x1f, 0xe0, 0x82, 0x80, 0xeb, - 0x4a, 0x20, 0x91, 0x13, 0xca, 0x69, 0xc4, 0x0e, 0xe2, 0xc4, 0x91, 0x5b, 0x4e, 0xa8, 0x6a, 0x6a, - 0x3e, 0xfa, 0x6b, 0x3c, 0x09, 0xbb, 0xab, 0xdc, 0x66, 0xde, 0x7b, 0xbf, 0xdf, 0xfb, 0xbd, 0xea, - 0xd7, 0x55, 0xaf, 0x1a, 0xbc, 0xd1, 0xa2, 0xfc, 0x22, 0x3c, 0x2f, 0x59, 0x9e, 0x53, 0xf6, 0x7c, - 0xe2, 0xb2, 0x0b, 0xda, 0xe4, 0x65, 0xec, 0xd3, 0x32, 0x23, 0x56, 0x18, 0x50, 0xde, 0x29, 0xb7, - 0x0f, 0xcb, 0x2d, 0xe2, 0x92, 0x00, 0x73, 0xd2, 0x28, 0xf9, 0x81, 0xc7, 0x3d, 0x78, 0x7b, 0x84, - 0x2a, 0x0d, 0x51, 0x25, 0xec, 0xd3, 0xd2, 0x00, 0x55, 0x6a, 0x1f, 0xee, 0xbc, 0x3e, 0xc6, 0xdd, - 0xf2, 0x5a, 0x5e, 0x59, 0x82, 0xcf, 0xc3, 0xa6, 0xfc, 0x27, 0xff, 0xc8, 0x5f, 0x7d, 0xd2, 0x1d, - 0xe3, 0xf2, 0x2e, 0x2b, 0x51, 0x4f, 0x26, 0xb7, 0xbc, 0x80, 0xa4, 0x24, 0xde, 0x79, 0x63, 0x14, - 0xe3, 0x60, 0xeb, 0x82, 0xba, 0x24, 0xe8, 0x94, 0xfd, 0xcb, 0x96, 0x30, 0xb0, 0xb2, 0x43, 0x38, - 0x4e, 0x43, 0x95, 0xb3, 0x50, 0x41, 0xe8, 0x72, 0xea, 0x90, 0x04, 0xe0, 0xfb, 0xd7, 0x01, 0x98, - 0x75, 0x41, 0x1c, 0x9c, 0xc0, 0x7d, 0x37, 0x0b, 0x17, 0x72, 0x6a, 0x97, 0xa9, 0xcb, 0x19, 0x0f, - 0xe2, 0x20, 0xe3, 0x2d, 0xb0, 0x51, 0xb1, 0x6d, 0xef, 0x09, 0x69, 0x1c, 0xdb, 0xe4, 0xea, 0x43, - 0xcf, 0x0e, 0x1d, 0x02, 0x5f, 0x03, 0x0b, 0x8d, 0x80, 0xb6, 0x49, 0xa0, 0x6b, 0x7b, 0xda, 0x41, - 0xde, 0x5c, 0x7d, 0xda, 0x2d, 0xce, 0xf4, 0xba, 0xc5, 0x85, 0xaa, 0xb4, 0x22, 0xe5, 0x35, 0x7e, - 0xa7, 0x81, 0xed, 0xe3, 0xfa, 0xfd, 0xc0, 0x0b, 0xfd, 0x3a, 0x17, 0xac, 0xad, 0xce, 0x23, 0x9f, - 0x53, 0xcf, 0x65, 0xf0, 0x4d, 0x30, 0xc7, 0x3b, 0x3e, 0x51, 0x04, 0xfb, 0x8a, 0x60, 0xee, 0x83, - 0x8e, 0x4f, 0x3e, 0xef, 0x16, 0x37, 0x63, 0x28, 0x61, 0x46, 0x12, 0x00, 0xcf, 0xc0, 0x42, 0x80, - 0xdd, 0x16, 0x61, 0xfa, 0xec, 0x5e, 0xee, 0x60, 0xf9, 0xce, 0xeb, 0xa5, 0x69, 0x1e, 0x77, 0xe9, - 0xa4, 0x8a, 0x04, 0x6a, 0x24, 0x55, 0xfe, 0x65, 0x48, 0x91, 0x19, 0xf7, 0xc1, 0xa2, 0x0a, 0x81, - 0xbb, 0x20, 0xe7, 0x50, 0x57, 0x2a, 0xcb, 0x99, 0xcb, 0x2a, 0x3e, 0xf7, 0x80, 0xba, 0x48, 0xd8, - 0xa5, 0x1b, 0x5f, 0xe9, 0xb3, 0x31, 0x37, 0xbe, 0x42, 0xc2, 0x6e, 0xfc, 0x47, 0x03, 0xb7, 0x6a, - 0x5e, 0xa3, 0xae, 0x72, 0xd7, 0x3c, 0x9b, 0x5a, 0x1d, 0x44, 0xda, 0x94, 0x3c, 0x81, 0x16, 0x98, - 0x63, 0x3e, 0xb1, 0x24, 0xf5, 0xf2, 0x9d, 0xca, 0x74, 0xca, 0x33, 0xc8, 0xea, 0x3e, 0xb1, 0xcc, - 0x95, 0xc1, 0xba, 0x89, 0x7f, 0x48, 0x92, 0xc3, 0x4b, 0xb0, 0xc0, 0x38, 0xe6, 0x21, 0x93, 0x12, - 0x97, 0xef, 0x1c, 0xfd, 0x7f, 0x69, 0x24, 0xd5, 0x68, 0xd9, 0xfa, 0xff, 0x91, 0x4a, 0x61, 0xfc, - 0x51, 0x03, 0x5f, 0x9b, 0x20, 0x10, 0xbe, 0x0f, 0x96, 0x38, 0x71, 0x7c, 0x1b, 0x73, 0xa2, 0xaa, - 0xde, 0x2f, 0xf5, 0xdb, 0x50, 0x0a, 0x10, 0x6f, 0x92, 0x4a, 0xfe, 0x81, 0x0a, 0x93, 0x75, 0xad, - 0xab, 0x74, 0x4b, 0x03, 0x2b, 0x1a, 0xd2, 0xc0, 0x13, 0xb0, 0xc9, 0x48, 0xd0, 0xa6, 0x16, 0xa9, - 0x58, 0x96, 0x17, 0xba, 0xfc, 0x21, 0x76, 0x54, 0x37, 0xe4, 0xcd, 0x5b, 0xbd, 0x6e, 0x71, 0xb3, - 0x9e, 0x74, 0xa3, 0x34, 0x8c, 0xf1, 0x57, 0x0d, 0xec, 0x4e, 0xac, 0x1b, 0xfe, 0x5e, 0x03, 0xdb, - 0xb8, 0xdf, 0xff, 0x51, 0x56, 0xa6, 0x6b, 0xb2, 0xfd, 0xde, 0x9f, 0x6e, 0x75, 0xa3, 0xe0, 0xc9, - 0x6b, 0x5d, 0x50, 0xc5, 0x6f, 0x57, 0x52, 0x13, 0xa3, 0x0c, 0x41, 0xc6, 0x2f, 0x67, 0x81, 0x91, - 0x60, 0xae, 0x13, 0xbb, 0x59, 0x0f, 0xcf, 0x1f, 0x13, 0x8b, 0xab, 0x26, 0x74, 0x23, 0x4d, 0x78, - 0xfa, 0x25, 0xbb, 0x23, 0xc1, 0x9b, 0xd9, 0x8f, 0x41, 0xac, 0x1f, 0x7f, 0xf4, 0x65, 0x33, 0x46, - 0xb2, 0x4d, 0x6e, 0xcb, 0x9f, 0x83, 0xd7, 0xa6, 0x53, 0xfc, 0x02, 0x1a, 0xd4, 0xf8, 0x64, 0x16, - 0x14, 0x26, 0xab, 0x87, 0x8f, 0x23, 0xcf, 0xe0, 0xbd, 0xe7, 0xb2, 0x22, 0x5f, 0xa5, 0xf5, 0xff, - 0x93, 0x96, 0xd6, 0x8a, 0x2f, 0x61, 0xf1, 0xe1, 0x1e, 0x98, 0x0b, 0x19, 0x09, 0x64, 0xad, 0xf9, - 0xd1, 0x7a, 0x9c, 0x31, 0x12, 0x20, 0xe9, 0x81, 0x06, 0x58, 0x68, 0x89, 0xb3, 0x85, 0xe9, 0x39, - 0xb9, 0x65, 0x00, 0xa1, 0x5f, 0x9e, 0x36, 0x0c, 0x29, 0x8f, 0xf1, 0x5f, 0x0d, 0xdc, 0x9e, 0x66, - 0x01, 0x60, 0x0d, 0xe4, 0xd5, 0xdb, 0x68, 0x76, 0x26, 0x95, 0xf0, 0x48, 0x41, 0x9b, 0x24, 0x20, - 0xae, 0x45, 0xcc, 0x1b, 0xbd, 0x6e, 0x31, 0x5f, 0x19, 0x20, 0xd1, 0x88, 0x44, 0x9c, 0xad, 0x01, - 0xc1, 0xcc, 0x73, 0x55, 0x09, 0xa3, 0x03, 0x4b, 0x5a, 0x91, 0xf2, 0x46, 0xd6, 0x2e, 0xf7, 0x7c, - 0x1a, 0xf7, 0x0f, 0x1a, 0x58, 0x93, 0x47, 0xa0, 0x10, 0x66, 0x61, 0x71, 0x50, 0xc3, 0x9f, 0x82, - 0x25, 0x31, 0xb8, 0x34, 0x30, 0xc7, 0xaa, 0xbe, 0xef, 0x8c, 0xa5, 0x19, 0xce, 0x11, 0x25, 0xff, - 0xb2, 0x25, 0x0c, 0xac, 0x24, 0xa2, 0x47, 0x15, 0x3f, 0x20, 0x1c, 0x9b, 0x50, 0xe5, 0x04, 0x23, - 0x1b, 0x1a, 0xb2, 0xc2, 0x7d, 0x30, 0x2f, 0xcf, 0x60, 0x55, 0xef, 0x0d, 0x15, 0x3c, 0x2f, 0x95, - 0xa0, 0xbe, 0x0f, 0xbe, 0x0a, 0xe6, 0xa4, 0x04, 0x51, 0xe9, 0x8a, 0xb9, 0x24, 0x1e, 0x69, 0x15, - 0x73, 0x8c, 0xa4, 0xd5, 0xf8, 0xbb, 0x06, 0x36, 0x63, 0xc2, 0x4f, 0x29, 0xe3, 0xf0, 0xe3, 0x84, - 0xf8, 0xd2, 0x74, 0xe2, 0x05, 0x5a, 0x4a, 0x1f, 0x2e, 0xd7, 0xc0, 0x32, 0x26, 0xfc, 0x23, 0x30, - 0x4f, 0x39, 0x71, 0x06, 0x83, 0xc8, 0xf7, 0xa6, 0x7b, 0xaf, 0x62, 0x3a, 0x47, 0xf5, 0x9e, 0x08, - 0x2e, 0xd4, 0xa7, 0x34, 0xfe, 0xa1, 0x01, 0x1d, 0x85, 0x6e, 0x85, 0x89, 0xc6, 0x8d, 0xcf, 0x4e, - 0x3f, 0x88, 0xcc, 0x4e, 0xdf, 0x88, 0xcd, 0x4e, 0x37, 0x13, 0xb8, 0xb1, 0xe9, 0xe9, 0x15, 0x90, - 0x0b, 0x69, 0x43, 0x0d, 0x2f, 0x8b, 0x62, 0x70, 0x39, 0x3b, 0xa9, 0x22, 0x61, 0x83, 0x87, 0x60, - 0x39, 0xa4, 0x0d, 0x29, 0xef, 0x01, 0x75, 0xe5, 0x4a, 0xe7, 0xcc, 0xb5, 0x5e, 0xb7, 0xb8, 0x7c, - 0xa6, 0x26, 0x23, 0x31, 0x02, 0x8d, 0xc7, 0x44, 0x20, 0xf8, 0x4a, 0x9f, 0x4b, 0x81, 0xe0, 0x2b, - 0x34, 0x1e, 0x63, 0xfc, 0x45, 0x03, 0xbb, 0xf5, 0x77, 0x4f, 0xa9, 0x1b, 0x5e, 0x1d, 0x79, 0x2e, - 0x27, 0x57, 0x3c, 0x5e, 0xdd, 0xbd, 0x48, 0x75, 0xdf, 0x8c, 0x55, 0xb7, 0x93, 0x0e, 0x1e, 0x2b, - 0xf1, 0x27, 0x60, 0x95, 0x11, 0x19, 0xa3, 0x18, 0xd5, 0xbe, 0x67, 0xa4, 0xbd, 0x1e, 0x8a, 0x4d, - 0x45, 0x9a, 0xb0, 0xd7, 0x2d, 0xae, 0x46, 0x6d, 0x28, 0xc6, 0x66, 0xfc, 0x66, 0x03, 0xec, 0x0c, - 0x36, 0x06, 0xa5, 0xe2, 0xc8, 0x73, 0x19, 0x0f, 0xb0, 0x18, 0xa1, 0x5f, 0xc2, 0x0b, 0x73, 0x00, - 0x96, 0xfc, 0x80, 0x7a, 0x22, 0xbf, 0x2c, 0x6d, 0xde, 0x5c, 0x11, 0x1d, 0x5a, 0x53, 0x36, 0x34, - 0xf4, 0xc2, 0x8f, 0x81, 0x2e, 0x37, 0x96, 0x5a, 0x40, 0xdb, 0xd4, 0x26, 0x2d, 0xd2, 0x10, 0x82, - 0xb1, 0x10, 0x20, 0x9f, 0xef, 0x92, 0xb9, 0xa7, 0x32, 0xe9, 0x95, 0x8c, 0x38, 0x94, 0xc9, 0x00, - 0x19, 0xd8, 0x6e, 0x90, 0x26, 0x0e, 0x6d, 0x5e, 0x69, 0x34, 0x8e, 0xb0, 0x8f, 0xcf, 0xa9, 0x4d, - 0x39, 0x25, 0x4c, 0x9f, 0x93, 0x1b, 0xeb, 0x5b, 0x62, 0x86, 0xa9, 0xa6, 0x46, 0x7c, 0xde, 0x2d, - 0xee, 0x26, 0x2f, 0x54, 0xa5, 0x61, 0x48, 0x07, 0x65, 0x50, 0xc3, 0x0e, 0xd0, 0x03, 0xf2, 0xb3, - 0x90, 0x06, 0xa4, 0x51, 0x0d, 0x3c, 0x3f, 0x92, 0x76, 0x5e, 0xa6, 0x7d, 0x5b, 0x94, 0x83, 0x32, - 0x62, 0xae, 0x4f, 0x9c, 0x49, 0x0f, 0x1f, 0x83, 0x4d, 0xb5, 0x4d, 0x47, 0xb2, 0x2e, 0xc8, 0xac, - 0x77, 0xc5, 0xe0, 0x59, 0x49, 0xba, 0xaf, 0x4f, 0x98, 0x46, 0x3a, 0x7c, 0x72, 0xef, 0x79, 0x8c, - 0x57, 0x69, 0xd0, 0xbf, 0x77, 0xd5, 0xec, 0xb0, 0x45, 0x5d, 0x7d, 0x31, 0xe5, 0xc9, 0xa5, 0xc4, - 0xa1, 0x4c, 0x06, 0x58, 0x06, 0x8b, 0x6d, 0xf9, 0x9f, 0xe9, 0x4b, 0x52, 0xfd, 0xcd, 0x5e, 0xb7, - 0xb8, 0xd8, 0x0f, 0x11, 0x8a, 0x17, 0x8e, 0xeb, 0xf2, 0x85, 0x1a, 0x44, 0xc1, 0x2a, 0x58, 0x1f, - 0x92, 0x3d, 0x24, 0xfc, 0x89, 0x17, 0x5c, 0xea, 0x79, 0x29, 0x43, 0x57, 0x32, 0xd6, 0x2b, 0x31, - 0x3f, 0x4a, 0x20, 0xe0, 0x3d, 0xb0, 0x3a, 0xb4, 0xd5, 0xbc, 0x80, 0x33, 0x1d, 0x48, 0x8e, 0x6d, - 0xc5, 0xb1, 0x5a, 0x89, 0x78, 0x51, 0x2c, 0x1a, 0xde, 0x05, 0x2b, 0x23, 0xcb, 0x49, 0x55, 0x5f, - 0x96, 0xe8, 0x2d, 0x85, 0x5e, 0xa9, 0x8c, 0xf9, 0x50, 0x24, 0x32, 0x82, 0x3c, 0xa9, 0x1d, 0xe9, - 0x2b, 0x19, 0xc8, 0x93, 0xda, 0x11, 0x8a, 0x44, 0xc2, 0x5f, 0x68, 0xc3, 0xed, 0x44, 0xbd, 0xec, - 0xfa, 0x8d, 0x2f, 0x72, 0xad, 0x9a, 0xb8, 0xd7, 0x8d, 0x2a, 0x8f, 0x86, 0xa1, 0x58, 0x4a, 0xe8, - 0x81, 0x7c, 0x30, 0xd8, 0xd5, 0xf5, 0x55, 0x99, 0xff, 0xde, 0x94, 0xc7, 0x4d, 0xc6, 0x21, 0x62, - 0x6e, 0xa8, 0xd4, 0xf9, 0x61, 0x04, 0x1a, 0xe5, 0x80, 0xbf, 0xd6, 0x00, 0x64, 0xa1, 0xef, 0xdb, - 0xc4, 0x21, 0x2e, 0xc7, 0x76, 0x7f, 0x3e, 0xd2, 0xd7, 0x64, 0xea, 0xfb, 0x53, 0x96, 0x9e, 0xc0, - 0xc7, 0x35, 0xec, 0x28, 0x0d, 0x30, 0x19, 0x8a, 0x52, 0xd2, 0xc3, 0x16, 0x58, 0x6c, 0x32, 0xf9, - 0x5b, 0x5f, 0x97, 0x4a, 0x7e, 0x38, 0x9d, 0x92, 0xf4, 0x6f, 0x10, 0xe6, 0x9a, 0x4a, 0xbf, 0xa8, - 0xfc, 0x68, 0xc0, 0x0e, 0x3f, 0x04, 0xdb, 0x01, 0xc1, 0x8d, 0x47, 0xae, 0xdd, 0x41, 0x9e, 0xc7, - 0x8f, 0xa9, 0x4d, 0x58, 0x87, 0x71, 0xe2, 0xe8, 0x1b, 0xb2, 0x73, 0x86, 0x57, 0x34, 0x94, 0x1a, - 0x85, 0x32, 0xd0, 0xb0, 0x08, 0xe6, 0xc5, 0x0c, 0xca, 0x74, 0x28, 0x5f, 0xbb, 0xbc, 0x38, 0xf7, - 0xc5, 0x7a, 0x33, 0xd4, 0xb7, 0x8f, 0x0d, 0xa7, 0x9b, 0x59, 0xc3, 0x29, 0x7c, 0x1b, 0xac, 0x31, - 0x62, 0x59, 0x9e, 0xe3, 0xd7, 0x02, 0xaf, 0x29, 0xc8, 0xf5, 0x2d, 0x19, 0xbc, 0xd9, 0xeb, 0x16, - 0xd7, 0xea, 0x51, 0x17, 0x8a, 0xc7, 0x8a, 0x8e, 0x86, 0x38, 0xfe, 0x49, 0x87, 0xe9, 0x37, 0xe5, - 0x10, 0xf3, 0xe6, 0x74, 0x0b, 0x9a, 0xf8, 0x24, 0x34, 0x7a, 0x94, 0x09, 0x17, 0x43, 0x29, 0xe9, - 0xa0, 0x03, 0x8a, 0x83, 0x1d, 0x3e, 0x72, 0xbe, 0xbc, 0xcb, 0x2c, 0x6c, 0xcb, 0xc9, 0x48, 0xdf, - 0x96, 0x4b, 0xbd, 0xdf, 0xeb, 0x16, 0x8b, 0xd5, 0xc9, 0xa1, 0xe8, 0x3a, 0x2e, 0xf8, 0xe3, 0xf8, - 0x49, 0x38, 0x96, 0xe7, 0x96, 0xcc, 0xf3, 0x6a, 0xf2, 0x14, 0x1c, 0x4b, 0x90, 0x89, 0x86, 0xa7, - 0x60, 0x4b, 0x95, 0x77, 0xe6, 0x32, 0xdc, 0x24, 0xf5, 0x0e, 0xb3, 0xb8, 0xcd, 0x74, 0x5d, 0x3e, - 0x12, 0xbd, 0xd7, 0x2d, 0x6e, 0x55, 0x52, 0xfc, 0x28, 0x15, 0x05, 0xdf, 0x01, 0xeb, 0x4d, 0x2f, - 0x38, 0xa7, 0x8d, 0x06, 0x71, 0x07, 0x4c, 0xaf, 0x48, 0xa6, 0x2d, 0xb1, 0xc9, 0x1e, 0xc7, 0x7c, - 0x28, 0x11, 0x6d, 0xfc, 0x5b, 0x03, 0x85, 0xec, 0xf1, 0xe4, 0x25, 0x8c, 0xc5, 0x24, 0x3a, 0x16, - 0xbf, 0x33, 0xed, 0x07, 0x92, 0x2c, 0xc9, 0x19, 0x13, 0xf2, 0x6f, 0x67, 0xc1, 0xb7, 0xbe, 0xc0, - 0x57, 0x15, 0xf8, 0x37, 0x0d, 0xdc, 0xf6, 0xa7, 0xb8, 0xd2, 0xa9, 0x15, 0x79, 0x9e, 0xb7, 0xe4, - 0x6f, 0xab, 0x02, 0xa6, 0xba, 0x52, 0xa2, 0xa9, 0x54, 0x8a, 0x7b, 0xae, 0x8b, 0x1d, 0x12, 0xbf, - 0xe7, 0x3e, 0xc4, 0x0e, 0x41, 0xd2, 0x63, 0xfc, 0x59, 0x03, 0x5f, 0xbf, 0x76, 0x0b, 0x86, 0x66, - 0x64, 0xda, 0x2e, 0xc5, 0xa6, 0xed, 0x42, 0x36, 0xc1, 0x0b, 0xff, 0x24, 0x6b, 0x1e, 0x3c, 0x7d, - 0x56, 0x98, 0xf9, 0xf4, 0x59, 0x61, 0xe6, 0xb3, 0x67, 0x85, 0x99, 0x4f, 0x7a, 0x05, 0xed, 0x69, - 0xaf, 0xa0, 0x7d, 0xda, 0x2b, 0x68, 0x9f, 0xf5, 0x0a, 0xda, 0x3f, 0x7b, 0x05, 0xed, 0x57, 0xff, - 0x2a, 0xcc, 0x7c, 0x34, 0xdb, 0x3e, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xed, 0x9b, 0x5c, - 0xac, 0x28, 0x18, 0x00, 0x00, + // 1747 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcd, 0x6f, 0x1c, 0x49, + 0x15, 0x77, 0x7b, 0xfc, 0x35, 0x65, 0xc7, 0x1f, 0x65, 0xc7, 0xe9, 0x35, 0xeb, 0x19, 0xd3, 0x0e, + 0x2b, 0x0b, 0xd8, 0x19, 0x1c, 0x2d, 0x6c, 0xd0, 0xb2, 0xd1, 0x4e, 0x7b, 0xd6, 0x59, 0x23, 0x27, + 0x99, 0xad, 0x59, 0x47, 0x28, 0x8a, 0x10, 0xe5, 0x9e, 0x9a, 0x71, 0xc5, 0xfd, 0x45, 0x57, 0xf5, + 0xc4, 0x23, 0x2e, 0x91, 0xb8, 0x70, 0x44, 0xe2, 0x8a, 0x38, 0xc3, 0x3f, 0xc0, 0x05, 0x01, 0xd7, + 0x48, 0x20, 0x91, 0x13, 0xca, 0x69, 0x44, 0x06, 0x71, 0xe2, 0xc8, 0x2d, 0x27, 0x54, 0x35, 0x35, + 0x1f, 0xdd, 0xd3, 0x3d, 0x9e, 0x84, 0x24, 0xe2, 0xd6, 0xfd, 0x3e, 0x7e, 0xef, 0xf7, 0x5e, 0xbd, + 0xae, 0x7a, 0xd5, 0xe0, 0xa3, 0x06, 0xe5, 0x67, 0xe1, 0x69, 0xc1, 0xf2, 0x9c, 0xa2, 0xe7, 0x13, + 0x97, 0x9d, 0xd1, 0x3a, 0x2f, 0x62, 0x9f, 0x16, 0x19, 0xb1, 0xc2, 0x80, 0xf2, 0x56, 0xb1, 0xb9, + 0x5f, 0x6c, 0x10, 0x97, 0x04, 0x98, 0x93, 0x5a, 0xc1, 0x0f, 0x3c, 0xee, 0xc1, 0xeb, 0x03, 0xaf, + 0x42, 0xdf, 0xab, 0x80, 0x7d, 0x5a, 0xe8, 0x79, 0x15, 0x9a, 0xfb, 0x5b, 0x1f, 0x0e, 0x61, 0x37, + 0xbc, 0x86, 0x57, 0x94, 0xce, 0xa7, 0x61, 0x5d, 0xbe, 0xc9, 0x17, 0xf9, 0xd4, 0x05, 0xdd, 0x32, + 0xce, 0x6f, 0xb2, 0x02, 0xf5, 0x64, 0x70, 0xcb, 0x0b, 0x48, 0x42, 0xe0, 0xad, 0x8f, 0x06, 0x36, + 0x0e, 0xb6, 0xce, 0xa8, 0x4b, 0x82, 0x56, 0xd1, 0x3f, 0x6f, 0x08, 0x01, 0x2b, 0x3a, 0x84, 0xe3, + 0x24, 0xaf, 0xef, 0xa5, 0x79, 0x05, 0xa1, 0xcb, 0xa9, 0x43, 0x8a, 0xcc, 0x3a, 0x23, 0x0e, 0x8e, + 0xfb, 0x19, 0x9f, 0x80, 0xb5, 0x92, 0x6d, 0x7b, 0x8f, 0x49, 0xed, 0xd0, 0x26, 0x17, 0xf7, 0x3d, + 0x3b, 0x74, 0x08, 0xfc, 0x00, 0xcc, 0xd5, 0x02, 0xda, 0x24, 0x81, 0xae, 0xed, 0x68, 0x7b, 0x59, + 0x73, 0xf9, 0x69, 0x3b, 0x3f, 0xd5, 0x69, 0xe7, 0xe7, 0xca, 0x52, 0x8a, 0x94, 0xd6, 0xf8, 0xad, + 0x06, 0x36, 0x0f, 0xab, 0xb7, 0x03, 0x2f, 0xf4, 0xab, 0x5c, 0xa0, 0x36, 0x5a, 0xf7, 0x7c, 0x4e, + 0x3d, 0x97, 0xc1, 0x8f, 0xc1, 0x0c, 0x6f, 0xf9, 0x44, 0x01, 0xec, 0x2a, 0x80, 0x99, 0xaf, 0x5a, + 0x3e, 0x79, 0xd9, 0xce, 0xaf, 0xc7, 0xbc, 0x84, 0x18, 0x49, 0x07, 0x78, 0x02, 0xe6, 0x02, 0xec, + 0x36, 0x08, 0xd3, 0xa7, 0x77, 0x32, 0x7b, 0x8b, 0x37, 0x3e, 0x2c, 0x4c, 0xb2, 0x10, 0x85, 0xa3, + 0x32, 0x12, 0x5e, 0x03, 0xaa, 0xf2, 0x95, 0x21, 0x05, 0x66, 0xdc, 0x06, 0xf3, 0xca, 0x04, 0x6e, + 0x83, 0x8c, 0x43, 0x5d, 0xc9, 0x2c, 0x63, 0x2e, 0x2a, 0xfb, 0xcc, 0x1d, 0xea, 0x22, 0x21, 0x97, + 0x6a, 0x7c, 0xa1, 0x4f, 0xc7, 0xd4, 0xf8, 0x02, 0x09, 0xb9, 0xf1, 0x6f, 0x0d, 0x5c, 0xab, 0x78, + 0xb5, 0xaa, 0x8a, 0x5d, 0xf1, 0x6c, 0x6a, 0xb5, 0x10, 0x69, 0x52, 0xf2, 0x18, 0x5a, 0x60, 0x86, + 0xf9, 0xc4, 0x92, 0xd0, 0x8b, 0x37, 0x4a, 0x93, 0x31, 0x4f, 0x01, 0xab, 0xfa, 0xc4, 0x32, 0x97, + 0x7a, 0x75, 0x13, 0x6f, 0x48, 0x82, 0xc3, 0x73, 0x30, 0xc7, 0x38, 0xe6, 0x21, 0x93, 0x14, 0x17, + 0x6f, 0x1c, 0xfc, 0x6f, 0x61, 0x24, 0xd4, 0xa0, 0x6c, 0xdd, 0x77, 0xa4, 0x42, 0x18, 0x7f, 0xd0, + 0xc0, 0xd7, 0xc6, 0x10, 0x84, 0x5f, 0x82, 0x05, 0x4e, 0x1c, 0xdf, 0xc6, 0x9c, 0xa8, 0xac, 0x77, + 0x0b, 0xdd, 0x4e, 0x94, 0x04, 0x44, 0x8f, 0xab, 0xe0, 0x5f, 0x29, 0x33, 0x99, 0xd7, 0xaa, 0x0a, + 0xb7, 0xd0, 0x93, 0xa2, 0x3e, 0x0c, 0x3c, 0x02, 0xeb, 0x8c, 0x04, 0x4d, 0x6a, 0x91, 0x92, 0x65, + 0x79, 0xa1, 0xcb, 0xef, 0x62, 0x47, 0x75, 0x43, 0xd6, 0xbc, 0xd6, 0x69, 0xe7, 0xd7, 0xab, 0xa3, + 0x6a, 0x94, 0xe4, 0x63, 0xfc, 0x45, 0x03, 0xdb, 0x63, 0xf3, 0x86, 0xbf, 0xd3, 0xc0, 0x26, 0xee, + 0xf6, 0x7f, 0x14, 0x95, 0xe9, 0x9a, 0x6c, 0xbf, 0x2f, 0x27, 0xab, 0x6e, 0xd4, 0x79, 0x7c, 0xad, + 0x73, 0x2a, 0xf9, 0xcd, 0x52, 0x62, 0x60, 0x94, 0x42, 0xc8, 0xf8, 0xc5, 0x34, 0x30, 0x46, 0x90, + 0xab, 0xc4, 0xae, 0x57, 0xc3, 0xd3, 0x47, 0xc4, 0xe2, 0xaa, 0x09, 0xdd, 0x48, 0x13, 0x1e, 0xbf, + 0x66, 0x77, 0x8c, 0xe0, 0xa6, 0xf6, 0x63, 0x10, 0xeb, 0xc7, 0x1f, 0xbe, 0x6e, 0xc4, 0x48, 0xb4, + 0xf1, 0x6d, 0xf9, 0x33, 0xf0, 0xc1, 0x64, 0x8c, 0xdf, 0x42, 0x83, 0x1a, 0x4f, 0xa6, 0x41, 0x6e, + 0x3c, 0x7b, 0xf8, 0x28, 0xb2, 0x06, 0x5f, 0xbc, 0x91, 0x8a, 0xfc, 0x3f, 0xd5, 0xff, 0x8f, 0x5a, + 0x52, 0x2b, 0xbe, 0x83, 0xe2, 0xc3, 0x1d, 0x30, 0x13, 0x32, 0x12, 0xc8, 0x5c, 0xb3, 0x83, 0x7a, + 0x9c, 0x30, 0x12, 0x20, 0xa9, 0x81, 0x06, 0x98, 0x6b, 0x88, 0xb3, 0x85, 0xe9, 0x19, 0xb9, 0x65, + 0x00, 0xc1, 0x5f, 0x9e, 0x36, 0x0c, 0x29, 0x8d, 0xf1, 0x1f, 0x0d, 0x5c, 0x9f, 0xa4, 0x00, 0xb0, + 0x02, 0xb2, 0xea, 0x6b, 0x34, 0x5b, 0xe3, 0x52, 0xb8, 0xa7, 0x5c, 0xeb, 0x24, 0x20, 0xae, 0x45, + 0xcc, 0x2b, 0x9d, 0x76, 0x3e, 0x5b, 0xea, 0x79, 0xa2, 0x01, 0x88, 0x38, 0x5b, 0x03, 0x82, 0x99, + 0xe7, 0xaa, 0x14, 0x06, 0x07, 0x96, 0x94, 0x22, 0xa5, 0x8d, 0xd4, 0x2e, 0xf3, 0x66, 0x1a, 0xf7, + 0xf7, 0x1a, 0x58, 0x91, 0x47, 0xa0, 0x20, 0x66, 0x61, 0x71, 0x50, 0xc3, 0x9f, 0x80, 0x05, 0x31, + 0x52, 0xd4, 0x30, 0xc7, 0x2a, 0xbf, 0xef, 0x0c, 0x85, 0xe9, 0x8f, 0x12, 0x05, 0xff, 0xbc, 0x21, + 0x04, 0xac, 0x20, 0xac, 0x07, 0x19, 0xdf, 0x21, 0x1c, 0x9b, 0x50, 0xc5, 0x04, 0x03, 0x19, 0xea, + 0xa3, 0xc2, 0x5d, 0x30, 0x2b, 0xcf, 0x60, 0x95, 0xef, 0x15, 0x65, 0x3c, 0x2b, 0x99, 0xa0, 0xae, + 0x0e, 0xbe, 0x0f, 0x66, 0x24, 0x05, 0x91, 0xe9, 0x92, 0xb9, 0x20, 0x96, 0xb4, 0x8c, 0x39, 0x46, + 0x52, 0x6a, 0xfc, 0x4d, 0x03, 0xeb, 0x31, 0xe2, 0xc7, 0x94, 0x71, 0xf8, 0x70, 0x84, 0x7c, 0x61, + 0x32, 0xf2, 0xc2, 0x5b, 0x52, 0xef, 0x97, 0xab, 0x27, 0x19, 0x22, 0xfe, 0x00, 0xcc, 0x52, 0x4e, + 0x9c, 0xde, 0x20, 0xf2, 0xdd, 0xc9, 0xbe, 0xab, 0x18, 0xcf, 0x41, 0xbe, 0x47, 0x02, 0x0b, 0x75, + 0x21, 0x8d, 0xbf, 0x6b, 0x40, 0x47, 0xa1, 0x5b, 0x62, 0xa2, 0x71, 0xe3, 0xb3, 0xd3, 0xf7, 0x23, + 0xb3, 0xd3, 0x37, 0x62, 0xb3, 0xd3, 0xd5, 0x11, 0xbf, 0xa1, 0xe9, 0xe9, 0x3d, 0x90, 0x09, 0x69, + 0x4d, 0x0d, 0x2f, 0xf3, 0x62, 0x70, 0x39, 0x39, 0x2a, 0x23, 0x21, 0x83, 0xfb, 0x60, 0x31, 0xa4, + 0x35, 0x49, 0xef, 0x0e, 0x75, 0x65, 0xa5, 0x33, 0xe6, 0x4a, 0xa7, 0x9d, 0x5f, 0x3c, 0x51, 0x93, + 0x91, 0x18, 0x81, 0x86, 0x6d, 0x22, 0x2e, 0xf8, 0x42, 0x9f, 0x49, 0x70, 0xc1, 0x17, 0x68, 0xd8, + 0xc6, 0xf8, 0xb3, 0x06, 0xb6, 0xab, 0x9f, 0x1f, 0x53, 0x37, 0xbc, 0x38, 0xf0, 0x5c, 0x4e, 0x2e, + 0x78, 0x3c, 0xbb, 0x5b, 0x91, 0xec, 0xbe, 0x19, 0xcb, 0x6e, 0x2b, 0xd9, 0x79, 0x28, 0xc5, 0x1f, + 0x83, 0x65, 0x46, 0xa4, 0x8d, 0x42, 0x54, 0xfb, 0x9e, 0x91, 0xf4, 0x79, 0x28, 0x34, 0x65, 0x69, + 0xc2, 0x4e, 0x3b, 0xbf, 0x1c, 0x95, 0xa1, 0x18, 0x9a, 0xf1, 0xeb, 0x35, 0xb0, 0xd5, 0xdb, 0x18, + 0x14, 0x8b, 0x03, 0xcf, 0x65, 0x3c, 0xc0, 0xd4, 0xe5, 0xec, 0x1d, 0x7c, 0x30, 0x7b, 0x60, 0xc1, + 0x0f, 0xa8, 0x27, 0xe2, 0xcb, 0xd4, 0x66, 0xcd, 0x25, 0xd1, 0xa1, 0x15, 0x25, 0x43, 0x7d, 0x2d, + 0x7c, 0x08, 0x74, 0xb9, 0xb1, 0x54, 0x02, 0xda, 0xa4, 0x36, 0x69, 0x90, 0x9a, 0x20, 0x8c, 0x05, + 0x01, 0xb9, 0xbe, 0x0b, 0xe6, 0x8e, 0x8a, 0xa4, 0x97, 0x52, 0xec, 0x50, 0x2a, 0x02, 0x64, 0x60, + 0xb3, 0x46, 0xea, 0x38, 0xb4, 0x79, 0xa9, 0x56, 0x3b, 0xc0, 0x3e, 0x3e, 0xa5, 0x36, 0xe5, 0x94, + 0x30, 0x7d, 0x46, 0x6e, 0xac, 0x9f, 0x88, 0x19, 0xa6, 0x9c, 0x68, 0xf1, 0xb2, 0x9d, 0xdf, 0x1e, + 0xbd, 0xea, 0x14, 0xfa, 0x26, 0x2d, 0x94, 0x02, 0x0d, 0x5b, 0x40, 0x0f, 0xc8, 0x4f, 0x43, 0x1a, + 0x90, 0x5a, 0x39, 0xf0, 0xfc, 0x48, 0xd8, 0x59, 0x19, 0xf6, 0x53, 0x91, 0x0e, 0x4a, 0xb1, 0xb9, + 0x3c, 0x70, 0x2a, 0x3c, 0x7c, 0x04, 0xd6, 0xd5, 0x36, 0x1d, 0x89, 0x3a, 0x27, 0xa3, 0xde, 0x14, + 0x83, 0x67, 0x69, 0x54, 0x7d, 0x79, 0xc0, 0x24, 0xd0, 0xfe, 0xca, 0x7d, 0xe1, 0x31, 0x5e, 0xa6, + 0x41, 0xf7, 0xde, 0x55, 0xb1, 0xc3, 0x06, 0x75, 0xf5, 0xf9, 0x84, 0x95, 0x4b, 0xb0, 0x43, 0xa9, + 0x08, 0xb0, 0x08, 0xe6, 0x9b, 0xf2, 0x9d, 0xe9, 0x0b, 0x92, 0xfd, 0xd5, 0x4e, 0x3b, 0x3f, 0xdf, + 0x35, 0x11, 0x8c, 0xe7, 0x0e, 0xab, 0xf2, 0x83, 0xea, 0x59, 0xc1, 0x32, 0x58, 0xed, 0x83, 0xdd, + 0x25, 0xfc, 0xb1, 0x17, 0x9c, 0xeb, 0x59, 0x49, 0x43, 0x57, 0x34, 0x56, 0x4b, 0x31, 0x3d, 0x1a, + 0xf1, 0x80, 0xb7, 0xc0, 0x72, 0x5f, 0x56, 0xf1, 0x02, 0xce, 0x74, 0x20, 0x31, 0x36, 0x15, 0xc6, + 0x72, 0x29, 0xa2, 0x45, 0x31, 0x6b, 0x78, 0x13, 0x2c, 0x0d, 0x24, 0x47, 0x65, 0x7d, 0x51, 0x7a, + 0x6f, 0x28, 0xef, 0xa5, 0xd2, 0x90, 0x0e, 0x45, 0x2c, 0x23, 0x9e, 0x47, 0x95, 0x03, 0x7d, 0x29, + 0xc5, 0xf3, 0xa8, 0x72, 0x80, 0x22, 0x96, 0xf0, 0xe7, 0x5a, 0x7f, 0x3b, 0x51, 0x1f, 0xbb, 0x7e, + 0xe5, 0x55, 0xae, 0x55, 0x63, 0xf7, 0xba, 0x41, 0xe6, 0x51, 0x33, 0x14, 0x0b, 0x09, 0x3d, 0x90, + 0x0d, 0x7a, 0xbb, 0xba, 0xbe, 0x2c, 0xe3, 0xdf, 0x9a, 0xf0, 0xb8, 0x49, 0x39, 0x44, 0xcc, 0x35, + 0x15, 0x3a, 0xdb, 0xb7, 0x40, 0x83, 0x18, 0xf0, 0x57, 0x1a, 0x80, 0x2c, 0xf4, 0x7d, 0x9b, 0x38, + 0xc4, 0xe5, 0xd8, 0xee, 0xce, 0x47, 0xfa, 0x8a, 0x0c, 0x7d, 0x7b, 0xc2, 0xd4, 0x47, 0xfc, 0xe3, + 0x1c, 0xb6, 0x14, 0x07, 0x38, 0x6a, 0x8a, 0x12, 0xc2, 0xc3, 0x06, 0x98, 0xaf, 0x33, 0xf9, 0xac, + 0xaf, 0x4a, 0x26, 0x3f, 0x98, 0x8c, 0x49, 0xf2, 0x3f, 0x08, 0x73, 0x45, 0x85, 0x9f, 0x57, 0x7a, + 0xd4, 0x43, 0x87, 0xf7, 0xc1, 0x66, 0x40, 0x70, 0xed, 0x9e, 0x6b, 0xb7, 0x90, 0xe7, 0xf1, 0x43, + 0x6a, 0x13, 0xd6, 0x62, 0x9c, 0x38, 0xfa, 0x9a, 0xec, 0x9c, 0xfe, 0x15, 0x0d, 0x25, 0x5a, 0xa1, + 0x14, 0x6f, 0x98, 0x07, 0xb3, 0x62, 0x06, 0x65, 0x3a, 0x94, 0x9f, 0x5d, 0x56, 0x9c, 0xfb, 0xa2, + 0xde, 0x0c, 0x75, 0xe5, 0x43, 0xc3, 0xe9, 0x7a, 0xda, 0x70, 0x0a, 0x3f, 0x05, 0x2b, 0x8c, 0x58, + 0x96, 0xe7, 0xf8, 0x95, 0xc0, 0xab, 0x0b, 0x70, 0x7d, 0x43, 0x1a, 0xaf, 0x77, 0xda, 0xf9, 0x95, + 0x6a, 0x54, 0x85, 0xe2, 0xb6, 0xa2, 0xa3, 0x21, 0x8e, 0xff, 0xd2, 0x61, 0xfa, 0x55, 0x39, 0xc4, + 0x7c, 0x3c, 0x59, 0x41, 0x47, 0x7e, 0x09, 0x0d, 0x96, 0x72, 0x44, 0xc5, 0x50, 0x42, 0x38, 0xe8, + 0x80, 0x7c, 0x6f, 0x87, 0x8f, 0x9c, 0x2f, 0x9f, 0x33, 0x0b, 0xdb, 0x72, 0x32, 0xd2, 0x37, 0x65, + 0xa9, 0x77, 0x3b, 0xed, 0x7c, 0xbe, 0x3c, 0xde, 0x14, 0x5d, 0x86, 0x05, 0x7f, 0x14, 0x3f, 0x09, + 0x87, 0xe2, 0x5c, 0x93, 0x71, 0xde, 0x1f, 0x3d, 0x05, 0x87, 0x02, 0xa4, 0x7a, 0xc3, 0x63, 0xb0, + 0xa1, 0xd2, 0x3b, 0x71, 0x19, 0xae, 0x93, 0x6a, 0x8b, 0x59, 0xdc, 0x66, 0xba, 0x2e, 0x97, 0x44, + 0xef, 0xb4, 0xf3, 0x1b, 0xa5, 0x04, 0x3d, 0x4a, 0xf4, 0x82, 0x9f, 0x81, 0xd5, 0xba, 0x17, 0x9c, + 0xd2, 0x5a, 0x8d, 0xb8, 0x3d, 0xa4, 0xf7, 0x24, 0xd2, 0x86, 0xd8, 0x64, 0x0f, 0x63, 0x3a, 0x34, + 0x62, 0x6d, 0xfc, 0x4b, 0x03, 0xb9, 0xf4, 0xf1, 0xe4, 0x1d, 0x8c, 0xc5, 0x24, 0x3a, 0x16, 0x7f, + 0x36, 0xe9, 0x0f, 0x92, 0x34, 0xca, 0x29, 0x13, 0xf2, 0x6f, 0xa6, 0xc1, 0xb7, 0x5e, 0xe1, 0xaf, + 0x0a, 0xfc, 0xab, 0x06, 0xae, 0xfb, 0x13, 0x5c, 0xe9, 0x54, 0x45, 0xde, 0xe4, 0x2d, 0xf9, 0xdb, + 0x2a, 0x81, 0x89, 0xae, 0x94, 0x68, 0x22, 0x96, 0xe2, 0x9e, 0xeb, 0x62, 0x87, 0xc4, 0xef, 0xb9, + 0x77, 0xb1, 0x43, 0x90, 0xd4, 0x18, 0x7f, 0xd2, 0xc0, 0xd7, 0x2f, 0xdd, 0x82, 0xa1, 0x19, 0x99, + 0xb6, 0x0b, 0xb1, 0x69, 0x3b, 0x97, 0x0e, 0xf0, 0xd6, 0x7f, 0xc9, 0x9a, 0x7b, 0x4f, 0x5f, 0xe4, + 0xa6, 0x9e, 0xbd, 0xc8, 0x4d, 0x3d, 0x7f, 0x91, 0x9b, 0x7a, 0xd2, 0xc9, 0x69, 0x4f, 0x3b, 0x39, + 0xed, 0x59, 0x27, 0xa7, 0x3d, 0xef, 0xe4, 0xb4, 0x7f, 0x74, 0x72, 0xda, 0x2f, 0xff, 0x99, 0x9b, + 0x7a, 0x30, 0xdd, 0xdc, 0xff, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0x01, 0xbb, 0xbb, 0xc2, + 0x17, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/security/v1/generated.proto b/vendor/github.com/openshift/api/security/v1/generated.proto index 2823b9fb3809..823ba67ebc67 100644 --- a/vendor/github.com/openshift/api/security/v1/generated.proto +++ b/vendor/github.com/openshift/api/security/v1/generated.proto @@ -7,9 +7,7 @@ package github.com.openshift.api.security.v1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; -import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/template/v1/generated.pb.go b/vendor/github.com/openshift/api/template/v1/generated.pb.go index 760cae929acb..03380d8b6aea 100644 --- a/vendor/github.com/openshift/api/template/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/template/v1/generated.pb.go @@ -3442,84 +3442,83 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 1254 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4b, 0x8f, 0x1b, 0x45, - 0x10, 0xf6, 0xf8, 0xb5, 0x76, 0x3b, 0x09, 0xab, 0x26, 0x8a, 0x06, 0x4b, 0xb1, 0xad, 0x09, 0x42, - 0x06, 0x25, 0x63, 0x36, 0x84, 0x10, 0x22, 0x24, 0x60, 0xd8, 0x4d, 0xb4, 0xb0, 0x01, 0xd4, 0xbb, - 0x41, 0x08, 0xf6, 0x40, 0x7b, 0xdc, 0xf6, 0x4e, 0xd6, 0xf3, 0xa0, 0xbb, 0x6d, 0xe2, 0x5b, 0x0e, - 0xfc, 0x00, 0x8e, 0x1c, 0xf9, 0x09, 0x1c, 0x39, 0x21, 0x71, 0xdb, 0x63, 0xb8, 0xe5, 0x00, 0x16, - 0x6b, 0x4e, 0xfc, 0x01, 0x90, 0xc2, 0x05, 0x75, 0x4f, 0xcf, 0xc3, 0x2f, 0xe2, 0xdd, 0x48, 0xc9, - 0x6d, 0xa6, 0xba, 0xbe, 0xaf, 0xba, 0xaa, 0xab, 0xbf, 0x2e, 0x70, 0xad, 0xe7, 0xf0, 0x83, 0x41, - 0xdb, 0xb4, 0x7d, 0xb7, 0xe5, 0x07, 0xc4, 0x63, 0x07, 0x4e, 0x97, 0xb7, 0x70, 0xe0, 0xb4, 0x38, - 0x71, 0x83, 0x3e, 0xe6, 0xa4, 0x35, 0xdc, 0x68, 0xf5, 0x88, 0x47, 0x28, 0xe6, 0xa4, 0x63, 0x06, - 0xd4, 0xe7, 0x3e, 0x7c, 0x39, 0x41, 0x99, 0x31, 0xca, 0xc4, 0x81, 0x63, 0x46, 0x28, 0x73, 0xb8, - 0x51, 0xbd, 0x92, 0xe2, 0xee, 0xf9, 0x3d, 0xbf, 0x25, 0xc1, 0xed, 0x41, 0x57, 0xfe, 0xc9, 0x1f, - 0xf9, 0x15, 0x92, 0x56, 0x8d, 0xc3, 0x1b, 0xcc, 0x74, 0x7c, 0x19, 0xdc, 0xf6, 0xe9, 0xa2, 0xc0, - 0xd5, 0x6b, 0x89, 0x8f, 0x8b, 0xed, 0x03, 0xc7, 0x23, 0x74, 0xd4, 0x0a, 0x0e, 0x7b, 0xc2, 0xc0, - 0x5a, 0x2e, 0xe1, 0x78, 0x11, 0xaa, 0xb5, 0x0c, 0x45, 0x07, 0x1e, 0x77, 0x5c, 0x32, 0x07, 0xb8, - 0xfe, 0x24, 0x00, 0xb3, 0x0f, 0x88, 0x8b, 0xe7, 0x70, 0x6f, 0x2c, 0xc3, 0x0d, 0xb8, 0xd3, 0x6f, - 0x39, 0x1e, 0x67, 0x9c, 0xce, 0x82, 0x8c, 0xb1, 0x06, 0x2e, 0x58, 0xd4, 0x3f, 0x24, 0x74, 0x4f, - 0x15, 0x6f, 0xdb, 0x63, 0x1c, 0x7b, 0x36, 0x81, 0x5f, 0x81, 0x92, 0xc8, 0xa9, 0x83, 0x39, 0xd6, - 0xb5, 0x86, 0xd6, 0xac, 0x5c, 0x7d, 0xdd, 0x0c, 0x43, 0x98, 0xe9, 0x10, 0x66, 0x70, 0xd8, 0x13, - 0x06, 0x66, 0x0a, 0x6f, 0x73, 0xb8, 0x61, 0x7e, 0xd2, 0xbe, 0x47, 0x6c, 0x7e, 0x87, 0x70, 0x6c, - 0xc1, 0xa3, 0x71, 0x3d, 0x33, 0x19, 0xd7, 0x41, 0x62, 0x43, 0x31, 0x2b, 0x6c, 0x83, 0x3c, 0x0b, - 0x88, 0xad, 0x67, 0x25, 0xfb, 0x7b, 0xe6, 0x2a, 0x07, 0x6b, 0x2e, 0xde, 0xed, 0x6e, 0x40, 0x6c, - 0xeb, 0x8c, 0x8a, 0x96, 0x17, 0x7f, 0x48, 0x72, 0x1b, 0xbf, 0x6b, 0xa0, 0xba, 0x18, 0xb2, 0xe3, - 0x30, 0x0e, 0xf7, 0xe7, 0x92, 0x34, 0x57, 0x4b, 0x52, 0xa0, 0x65, 0x8a, 0xeb, 0x2a, 0x68, 0x29, - 0xb2, 0xa4, 0x12, 0xc4, 0xa0, 0xe0, 0x70, 0xe2, 0x32, 0x3d, 0xdb, 0xc8, 0x35, 0x2b, 0x57, 0xdf, - 0x79, 0x9a, 0x0c, 0xad, 0xb3, 0x2a, 0x50, 0x61, 0x5b, 0x50, 0xa2, 0x90, 0xd9, 0xf8, 0x36, 0xbb, - 0x2c, 0x3f, 0x51, 0x04, 0xe8, 0x80, 0x75, 0x3e, 0x63, 0x57, 0x79, 0x5e, 0x4a, 0xe5, 0x69, 0x8a, - 0x96, 0x4f, 0x8e, 0x0e, 0x91, 0x2e, 0xa1, 0x44, 0xc4, 0xd4, 0x55, 0xcc, 0xf5, 0x59, 0x72, 0x34, - 0x47, 0x0b, 0x3f, 0x02, 0x45, 0x46, 0x6c, 0x4a, 0xb8, 0x3a, 0xcf, 0x95, 0x02, 0x9c, 0x53, 0x01, - 0x8a, 0xbb, 0x12, 0x8a, 0x14, 0x05, 0x34, 0x01, 0x68, 0x3b, 0x5e, 0xc7, 0xf1, 0x7a, 0xdb, 0x9b, - 0x4c, 0xcf, 0x35, 0x72, 0xcd, 0xb2, 0x75, 0x4e, 0x34, 0x92, 0x15, 0x5b, 0x51, 0xca, 0xc3, 0x78, - 0x0b, 0x80, 0xad, 0xfb, 0x9c, 0xe2, 0xcf, 0x70, 0x7f, 0x40, 0x60, 0x3d, 0xaa, 0xbb, 0x26, 0x81, - 0xe5, 0xd9, 0xaa, 0xdd, 0x2c, 0x7d, 0xff, 0x43, 0x3d, 0xf3, 0xe0, 0xb7, 0x46, 0xc6, 0xf8, 0x39, - 0x0b, 0xca, 0x9f, 0x62, 0x8a, 0x5d, 0xc2, 0x09, 0x85, 0x0d, 0x90, 0xf7, 0xb0, 0x1b, 0x96, 0xa8, - 0x9c, 0xf4, 0xd3, 0xc7, 0xd8, 0x25, 0x48, 0xae, 0xc0, 0x37, 0x41, 0xa5, 0xe3, 0xb0, 0xa0, 0x8f, - 0x47, 0xc2, 0x28, 0x53, 0x2d, 0x5b, 0x2f, 0x2a, 0xc7, 0xca, 0x66, 0xb2, 0x84, 0xd2, 0x7e, 0x12, - 0x46, 0x98, 0x4d, 0x9d, 0x80, 0x3b, 0xbe, 0xa7, 0xe7, 0x66, 0x60, 0xc9, 0x12, 0x4a, 0xfb, 0xc1, - 0x4b, 0xa0, 0x30, 0x14, 0x19, 0xe9, 0x79, 0x09, 0x88, 0x5b, 0x40, 0xa6, 0x89, 0xc2, 0x35, 0x78, - 0x19, 0x94, 0xa2, 0x6b, 0xad, 0x17, 0xa4, 0x5f, 0xdc, 0x93, 0xb7, 0x95, 0x1d, 0xc5, 0x1e, 0x22, - 0xc5, 0x2e, 0xf5, 0x5d, 0xbd, 0x38, 0x9d, 0xe2, 0x2d, 0xea, 0xbb, 0x48, 0xae, 0x08, 0x3e, 0x4a, - 0xbe, 0x1e, 0x38, 0x94, 0x74, 0xf4, 0xb5, 0x86, 0xd6, 0x2c, 0x25, 0x7c, 0x48, 0xd9, 0x51, 0xec, - 0x61, 0xfc, 0x9b, 0x03, 0xa5, 0xa8, 0x3b, 0x9e, 0x81, 0x66, 0xbc, 0x0a, 0xd6, 0x5c, 0xc2, 0x18, - 0xee, 0x45, 0xb5, 0x7f, 0x41, 0xb9, 0xaf, 0xdd, 0x09, 0xcd, 0x28, 0x5a, 0x87, 0x9f, 0x83, 0x35, - 0x5f, 0x52, 0x84, 0x0d, 0x54, 0xb9, 0x7a, 0x65, 0xe9, 0x5e, 0x94, 0xb4, 0x9a, 0x08, 0x7f, 0xb3, - 0x75, 0x9f, 0x13, 0x8f, 0x39, 0xbe, 0x97, 0x30, 0x87, 0x1b, 0x61, 0x28, 0xa2, 0x83, 0x36, 0x00, - 0x41, 0xd4, 0x33, 0x4c, 0xcf, 0x4b, 0xf2, 0xd6, 0x6a, 0x97, 0x3b, 0xee, 0xb5, 0x24, 0xcf, 0xd8, - 0xc4, 0x50, 0x8a, 0x16, 0x1e, 0x80, 0x62, 0x1f, 0xb7, 0x49, 0x9f, 0xe9, 0x05, 0x19, 0xe0, 0xe6, - 0x6a, 0x01, 0xa2, 0xb3, 0x30, 0x77, 0x24, 0x78, 0xcb, 0xe3, 0x74, 0x64, 0x9d, 0x57, 0xb1, 0xce, - 0x84, 0xa9, 0x84, 0x4b, 0x48, 0xf1, 0x57, 0xdf, 0x06, 0x95, 0x94, 0x33, 0x5c, 0x07, 0xb9, 0x43, - 0x32, 0x0a, 0xef, 0x00, 0x12, 0x9f, 0xf0, 0x7c, 0xd4, 0x86, 0xb2, 0xe4, 0xaa, 0xef, 0x6e, 0x66, - 0x6f, 0x68, 0xc6, 0x4f, 0x59, 0xb0, 0xfe, 0x1c, 0x5e, 0x8e, 0xfd, 0xa9, 0x97, 0xe3, 0x84, 0x95, - 0x79, 0xd2, 0x9b, 0x01, 0x3b, 0xa0, 0xc8, 0x38, 0xe6, 0x03, 0x26, 0xef, 0xe9, 0xca, 0xba, 0x3d, - 0xc7, 0x2f, 0x39, 0x52, 0x12, 0x27, 0xff, 0x91, 0xe2, 0x36, 0xfe, 0xc9, 0x82, 0x97, 0x66, 0x21, - 0x1f, 0xf8, 0x5e, 0xc7, 0x91, 0x37, 0xff, 0x7d, 0x90, 0xe7, 0xa3, 0x20, 0x52, 0xa2, 0x2b, 0xd1, - 0x2e, 0xf7, 0x46, 0x01, 0x79, 0x3c, 0xae, 0x5f, 0x5c, 0x0a, 0x14, 0x0e, 0x48, 0x42, 0xe1, 0x4e, - 0x9c, 0x46, 0x78, 0x53, 0xae, 0x4d, 0x6f, 0xe4, 0xf1, 0xb8, 0xbe, 0x60, 0xea, 0x31, 0x63, 0xa6, - 0xe9, 0xed, 0xc2, 0x21, 0x80, 0x7d, 0xcc, 0xf8, 0x1e, 0xc5, 0x1e, 0x0b, 0x23, 0x39, 0x2e, 0x51, - 0x05, 0x7a, 0x6d, 0xb5, 0xe3, 0x15, 0x08, 0xab, 0xaa, 0x76, 0x01, 0x77, 0xe6, 0xd8, 0xd0, 0x82, - 0x08, 0xf0, 0x15, 0x50, 0xa4, 0x04, 0x33, 0xdf, 0x53, 0x1a, 0x18, 0x97, 0x13, 0x49, 0x2b, 0x52, - 0xab, 0x69, 0x61, 0x28, 0xfc, 0xbf, 0x30, 0x18, 0xbf, 0x6a, 0xe0, 0xfc, 0x73, 0x98, 0x06, 0xbe, - 0x9c, 0x9e, 0x06, 0xae, 0x9f, 0xae, 0xab, 0x96, 0xcc, 0x01, 0xfb, 0xe0, 0xc2, 0xac, 0x67, 0x78, - 0x73, 0xa0, 0x05, 0x72, 0x94, 0x74, 0x4f, 0xf2, 0xea, 0x57, 0x54, 0x84, 0x1c, 0x22, 0x5d, 0x24, - 0xc0, 0xc6, 0x5f, 0x0b, 0x7a, 0x55, 0xbc, 0x05, 0x84, 0x89, 0x57, 0xf3, 0x32, 0x28, 0x0d, 0x18, - 0xa1, 0xa9, 0x97, 0x33, 0x2e, 0xc3, 0x5d, 0x65, 0x47, 0xb1, 0x07, 0xbc, 0x08, 0x72, 0x03, 0xa7, - 0xa3, 0x7a, 0x32, 0x0e, 0x75, 0x77, 0x7b, 0x13, 0x09, 0x3b, 0x34, 0x40, 0xb1, 0x47, 0xfd, 0x41, - 0x10, 0xbd, 0xfa, 0x40, 0x9c, 0xf5, 0x6d, 0x69, 0x41, 0x6a, 0x05, 0xfa, 0xa0, 0x40, 0xc4, 0x6b, - 0xaf, 0xa4, 0xf7, 0xc3, 0xd3, 0x55, 0x32, 0x4e, 0xc0, 0x94, 0xa3, 0x43, 0xa8, 0x94, 0x71, 0x75, - 0xa5, 0x0d, 0x85, 0x71, 0xaa, 0xf7, 0xd4, 0x78, 0xb1, 0x4c, 0x20, 0x6f, 0xa5, 0x05, 0x52, 0xc8, - 0xdd, 0x4a, 0x1b, 0x4a, 0x26, 0x96, 0xb4, 0xa4, 0xfe, 0x98, 0x9d, 0xef, 0x4e, 0x39, 0xcb, 0xed, - 0x83, 0x52, 0x84, 0x8e, 0xbb, 0xf3, 0x44, 0x89, 0x27, 0xc7, 0x12, 0x59, 0x50, 0xcc, 0x28, 0xd5, - 0x22, 0x3d, 0xbe, 0x35, 0x17, 0x75, 0xca, 0x8e, 0x6f, 0xe3, 0xfe, 0x6c, 0xbb, 0x80, 0x05, 0xf3, - 0x5b, 0x1f, 0x94, 0x69, 0x54, 0x5e, 0x25, 0x12, 0xef, 0x3e, 0xe5, 0x29, 0x59, 0x67, 0x27, 0xe3, - 0x7a, 0x39, 0xfe, 0x45, 0x49, 0x00, 0xe3, 0x6f, 0x6d, 0xbe, 0xfb, 0x43, 0xf9, 0x82, 0x0c, 0x00, - 0x3b, 0x52, 0xb4, 0x70, 0x1e, 0x3c, 0xf5, 0x4e, 0x62, 0x65, 0x4c, 0x1e, 0xa7, 0xd8, 0xc4, 0x50, - 0x2a, 0x0c, 0xec, 0x25, 0x93, 0xc7, 0x89, 0x26, 0xff, 0xc5, 0x37, 0x78, 0xf9, 0x20, 0x62, 0xfc, - 0xa2, 0x81, 0x33, 0x11, 0xe8, 0x19, 0x28, 0xd8, 0xee, 0xb4, 0x82, 0x9d, 0xb4, 0xfd, 0x16, 0x2a, - 0x97, 0xd5, 0x3c, 0x3a, 0xae, 0x65, 0x1e, 0x1e, 0xd7, 0x32, 0x8f, 0x8e, 0x6b, 0x99, 0x07, 0x93, - 0x9a, 0x76, 0x34, 0xa9, 0x69, 0x0f, 0x27, 0x35, 0xed, 0xd1, 0xa4, 0xa6, 0xfd, 0x31, 0xa9, 0x69, - 0xdf, 0xfd, 0x59, 0xcb, 0x7c, 0x91, 0x1d, 0x6e, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xb9, 0x6d, - 0xe1, 0x24, 0x30, 0x10, 0x00, 0x00, + // 1243 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4d, 0x8f, 0x1b, 0x45, + 0x13, 0xf6, 0xf8, 0x6b, 0xed, 0x76, 0x92, 0x77, 0xd5, 0x6f, 0x14, 0x0d, 0x96, 0x62, 0x5b, 0x13, + 0x84, 0x0c, 0x4a, 0xc6, 0x6c, 0x14, 0x42, 0x58, 0x21, 0x01, 0xc3, 0x6e, 0xa2, 0x85, 0x0d, 0xa0, + 0xde, 0x0d, 0x42, 0xb0, 0x07, 0xda, 0xe3, 0xb6, 0x77, 0xb2, 0x9e, 0x0f, 0xba, 0xdb, 0x26, 0xbe, + 0xe5, 0xc0, 0x0f, 0xe0, 0xc8, 0x91, 0x9f, 0xc0, 0x91, 0x13, 0x12, 0xb7, 0x3d, 0x86, 0x5b, 0x0e, + 0x60, 0xb1, 0xe6, 0xc4, 0x1f, 0x00, 0x29, 0x5c, 0x50, 0xf7, 0xf4, 0x7c, 0xf8, 0x8b, 0x78, 0x37, + 0x52, 0x72, 0x9b, 0xa9, 0xae, 0xe7, 0xa9, 0xae, 0xea, 0xea, 0xa7, 0x0b, 0xdc, 0xe8, 0x39, 0xfc, + 0x70, 0xd0, 0x36, 0x6d, 0xdf, 0x6d, 0xf9, 0x01, 0xf1, 0xd8, 0xa1, 0xd3, 0xe5, 0x2d, 0x1c, 0x38, + 0x2d, 0x4e, 0xdc, 0xa0, 0x8f, 0x39, 0x69, 0x0d, 0x37, 0x5a, 0x3d, 0xe2, 0x11, 0x8a, 0x39, 0xe9, + 0x98, 0x01, 0xf5, 0xb9, 0x0f, 0x5f, 0x4e, 0x50, 0x66, 0x8c, 0x32, 0x71, 0xe0, 0x98, 0x11, 0xca, + 0x1c, 0x6e, 0x54, 0xaf, 0xa5, 0xb8, 0x7b, 0x7e, 0xcf, 0x6f, 0x49, 0x70, 0x7b, 0xd0, 0x95, 0x7f, + 0xf2, 0x47, 0x7e, 0x85, 0xa4, 0x55, 0xe3, 0xe8, 0x16, 0x33, 0x1d, 0x5f, 0x06, 0xb7, 0x7d, 0xba, + 0x28, 0x70, 0xf5, 0x46, 0xe2, 0xe3, 0x62, 0xfb, 0xd0, 0xf1, 0x08, 0x1d, 0xb5, 0x82, 0xa3, 0x9e, + 0x30, 0xb0, 0x96, 0x4b, 0x38, 0x5e, 0x84, 0x6a, 0x2d, 0x43, 0xd1, 0x81, 0xc7, 0x1d, 0x97, 0xcc, + 0x01, 0x6e, 0x3e, 0x0d, 0xc0, 0xec, 0x43, 0xe2, 0xe2, 0x59, 0x9c, 0x31, 0xd6, 0xc0, 0x25, 0x8b, + 0xfa, 0x47, 0x84, 0xee, 0xab, 0x3a, 0xec, 0x78, 0x8c, 0x63, 0xcf, 0x26, 0xf0, 0x4b, 0x50, 0x12, + 0xdb, 0xeb, 0x60, 0x8e, 0x75, 0xad, 0xa1, 0x35, 0x2b, 0xd7, 0x5f, 0x37, 0xc3, 0x28, 0x66, 0x3a, + 0x8a, 0x19, 0x1c, 0xf5, 0x84, 0x81, 0x99, 0xc2, 0xdb, 0x1c, 0x6e, 0x98, 0x1f, 0xb7, 0xef, 0x13, + 0x9b, 0xdf, 0x25, 0x1c, 0x5b, 0xf0, 0x78, 0x5c, 0xcf, 0x4c, 0xc6, 0x75, 0x90, 0xd8, 0x50, 0xcc, + 0x0a, 0xdb, 0x20, 0xcf, 0x02, 0x62, 0xeb, 0x59, 0xc9, 0xfe, 0xae, 0xb9, 0xca, 0x19, 0x99, 0x8b, + 0x77, 0xbb, 0x17, 0x10, 0xdb, 0x3a, 0xa7, 0xa2, 0xe5, 0xc5, 0x1f, 0x92, 0xdc, 0xc6, 0x6f, 0x1a, + 0xa8, 0x2e, 0x86, 0xec, 0x3a, 0x8c, 0xc3, 0x83, 0xb9, 0x24, 0xcd, 0xd5, 0x92, 0x14, 0x68, 0x99, + 0xe2, 0xba, 0x0a, 0x5a, 0x8a, 0x2c, 0xa9, 0x04, 0x31, 0x28, 0x38, 0x9c, 0xb8, 0x4c, 0xcf, 0x36, + 0x72, 0xcd, 0xca, 0xf5, 0xb7, 0x9f, 0x25, 0x43, 0xeb, 0xbc, 0x0a, 0x54, 0xd8, 0x11, 0x94, 0x28, + 0x64, 0x36, 0xbe, 0xc9, 0x2e, 0xcb, 0x4f, 0x14, 0x01, 0x3a, 0x60, 0x9d, 0xcf, 0xd8, 0x55, 0x9e, + 0x57, 0x52, 0x79, 0x9a, 0xa2, 0x7b, 0x93, 0xa3, 0x43, 0xa4, 0x4b, 0x28, 0x11, 0x31, 0x75, 0x15, + 0x73, 0x7d, 0x96, 0x1c, 0xcd, 0xd1, 0xc2, 0x0f, 0x41, 0x91, 0x11, 0x9b, 0x12, 0xae, 0xce, 0x73, + 0xa5, 0x00, 0x17, 0x54, 0x80, 0xe2, 0x9e, 0x84, 0x22, 0x45, 0x01, 0x4d, 0x00, 0xda, 0x8e, 0xd7, + 0x71, 0xbc, 0xde, 0xce, 0x16, 0xd3, 0x73, 0x8d, 0x5c, 0xb3, 0x6c, 0x5d, 0x10, 0x8d, 0x64, 0xc5, + 0x56, 0x94, 0xf2, 0x30, 0xde, 0x04, 0x60, 0xfb, 0x01, 0xa7, 0xf8, 0x53, 0xdc, 0x1f, 0x10, 0x58, + 0x8f, 0xea, 0xae, 0x49, 0x60, 0x79, 0xb6, 0x6a, 0x9b, 0xa5, 0xef, 0xbe, 0xaf, 0x67, 0x1e, 0xfe, + 0xda, 0xc8, 0x18, 0x3f, 0x65, 0x41, 0xf9, 0x13, 0x4c, 0xb1, 0x4b, 0x38, 0xa1, 0xb0, 0x01, 0xf2, + 0x1e, 0x76, 0xc3, 0x12, 0x95, 0x93, 0x7e, 0xfa, 0x08, 0xbb, 0x04, 0xc9, 0x15, 0xf8, 0x06, 0xa8, + 0x74, 0x1c, 0x16, 0xf4, 0xf1, 0x48, 0x18, 0x65, 0xaa, 0x65, 0xeb, 0xff, 0xca, 0xb1, 0xb2, 0x95, + 0x2c, 0xa1, 0xb4, 0x9f, 0x84, 0x11, 0x66, 0x53, 0x27, 0xe0, 0x8e, 0xef, 0xe9, 0xb9, 0x19, 0x58, + 0xb2, 0x84, 0xd2, 0x7e, 0xf0, 0x0a, 0x28, 0x0c, 0x45, 0x46, 0x7a, 0x5e, 0x02, 0xe2, 0x16, 0x90, + 0x69, 0xa2, 0x70, 0x0d, 0x5e, 0x05, 0xa5, 0xe8, 0x5a, 0xeb, 0x05, 0xe9, 0x17, 0xf7, 0xe4, 0x1d, + 0x65, 0x47, 0xb1, 0x87, 0x48, 0xb1, 0x4b, 0x7d, 0x57, 0x2f, 0x4e, 0xa7, 0x78, 0x9b, 0xfa, 0x2e, + 0x92, 0x2b, 0x82, 0x8f, 0x92, 0xaf, 0x06, 0x0e, 0x25, 0x1d, 0x7d, 0xad, 0xa1, 0x35, 0x4b, 0x09, + 0x1f, 0x52, 0x76, 0x14, 0x7b, 0x18, 0xff, 0xe4, 0x40, 0x29, 0xea, 0x8e, 0xe7, 0xa0, 0x19, 0xaf, + 0x82, 0x35, 0x97, 0x30, 0x86, 0x7b, 0x51, 0xed, 0xff, 0xa7, 0xdc, 0xd7, 0xee, 0x86, 0x66, 0x14, + 0xad, 0xc3, 0xcf, 0xc0, 0x9a, 0x2f, 0x29, 0xc2, 0x06, 0xaa, 0x5c, 0xbf, 0xb6, 0x74, 0x2f, 0x4a, + 0x25, 0x4d, 0x84, 0xbf, 0xde, 0x7e, 0xc0, 0x89, 0xc7, 0x1c, 0xdf, 0x4b, 0x98, 0xc3, 0x8d, 0x30, + 0x14, 0xd1, 0x41, 0x1b, 0x80, 0x20, 0xea, 0x19, 0xa6, 0xe7, 0x25, 0x79, 0x6b, 0xb5, 0xcb, 0x1d, + 0xf7, 0x5a, 0x92, 0x67, 0x6c, 0x62, 0x28, 0x45, 0x0b, 0x0f, 0x41, 0xb1, 0x8f, 0xdb, 0xa4, 0xcf, + 0xf4, 0x82, 0x0c, 0xb0, 0xb9, 0x5a, 0x80, 0xe8, 0x2c, 0xcc, 0x5d, 0x09, 0xde, 0xf6, 0x38, 0x1d, + 0x59, 0x17, 0x55, 0xac, 0x73, 0x61, 0x2a, 0xe1, 0x12, 0x52, 0xfc, 0xd5, 0xb7, 0x40, 0x25, 0xe5, + 0x0c, 0xd7, 0x41, 0xee, 0x88, 0x8c, 0xc2, 0x3b, 0x80, 0xc4, 0x27, 0xbc, 0x18, 0xb5, 0xa1, 0x2c, + 0xb9, 0xea, 0xbb, 0xcd, 0xec, 0x2d, 0xcd, 0xf8, 0x31, 0x0b, 0xd6, 0x5f, 0xc0, 0xcb, 0x71, 0x30, + 0xf5, 0x72, 0x9c, 0xb2, 0x32, 0x4f, 0x7b, 0x33, 0x60, 0x07, 0x14, 0x19, 0xc7, 0x7c, 0xc0, 0xe4, + 0x3d, 0x5d, 0x59, 0xb7, 0xe7, 0xf8, 0x25, 0x47, 0x4a, 0xe2, 0xe4, 0x3f, 0x52, 0xdc, 0xc6, 0xdf, + 0x59, 0xf0, 0xd2, 0x2c, 0xe4, 0x7d, 0xdf, 0xeb, 0x38, 0xf2, 0xe6, 0xbf, 0x07, 0xf2, 0x7c, 0x14, + 0x44, 0x4a, 0x74, 0x2d, 0xda, 0xe5, 0xfe, 0x28, 0x20, 0x4f, 0xc6, 0xf5, 0xcb, 0x4b, 0x81, 0xc2, + 0x01, 0x49, 0x28, 0xdc, 0x8d, 0xd3, 0x08, 0x6f, 0xca, 0x8d, 0xe9, 0x8d, 0x3c, 0x19, 0xd7, 0x17, + 0x0c, 0x30, 0x66, 0xcc, 0x34, 0xbd, 0x5d, 0x38, 0x04, 0xb0, 0x8f, 0x19, 0xdf, 0xa7, 0xd8, 0x63, + 0x61, 0x24, 0xc7, 0x25, 0xaa, 0x40, 0xaf, 0xad, 0x76, 0xbc, 0x02, 0x61, 0x55, 0xd5, 0x2e, 0xe0, + 0xee, 0x1c, 0x1b, 0x5a, 0x10, 0x01, 0xbe, 0x02, 0x8a, 0x94, 0x60, 0xe6, 0x7b, 0x4a, 0x03, 0xe3, + 0x72, 0x22, 0x69, 0x45, 0x6a, 0x35, 0x2d, 0x0c, 0x85, 0xff, 0x16, 0x06, 0xe3, 0x17, 0x0d, 0x5c, + 0x7c, 0x01, 0xd3, 0xc0, 0x17, 0xd3, 0xd3, 0xc0, 0xcd, 0xb3, 0x75, 0xd5, 0x92, 0x39, 0xe0, 0x00, + 0x5c, 0x9a, 0xf5, 0x0c, 0x6f, 0x0e, 0xb4, 0x40, 0x8e, 0x92, 0xee, 0x69, 0x5e, 0xfd, 0x8a, 0x8a, + 0x90, 0x43, 0xa4, 0x8b, 0x04, 0xd8, 0xf8, 0x73, 0x41, 0xaf, 0x8a, 0xb7, 0x80, 0x30, 0xf1, 0x6a, + 0x5e, 0x05, 0xa5, 0x01, 0x23, 0x34, 0xf5, 0x72, 0xc6, 0x65, 0xb8, 0xa7, 0xec, 0x28, 0xf6, 0x80, + 0x97, 0x41, 0x6e, 0xe0, 0x74, 0x54, 0x4f, 0xc6, 0xa1, 0xee, 0xed, 0x6c, 0x21, 0x61, 0x87, 0x06, + 0x28, 0xf6, 0xa8, 0x3f, 0x08, 0xa2, 0x57, 0x1f, 0x88, 0xb3, 0xbe, 0x23, 0x2d, 0x48, 0xad, 0x40, + 0x1f, 0x14, 0x88, 0x78, 0xed, 0x95, 0xf4, 0x7e, 0x70, 0xb6, 0x4a, 0xc6, 0x09, 0x98, 0x72, 0x74, + 0x08, 0x95, 0x32, 0xae, 0xae, 0xb4, 0xa1, 0x30, 0x4e, 0xf5, 0xbe, 0x1a, 0x2f, 0x96, 0x09, 0xe4, + 0xed, 0xb4, 0x40, 0x0a, 0xb9, 0x5b, 0x69, 0x43, 0xc9, 0xc4, 0x92, 0x96, 0xd4, 0x1f, 0xb2, 0xf3, + 0xdd, 0x29, 0x67, 0xb9, 0x03, 0x50, 0x8a, 0xd0, 0x71, 0x77, 0x9e, 0x2a, 0xf1, 0xe4, 0x58, 0x22, + 0x0b, 0x8a, 0x19, 0xa5, 0x5a, 0xa4, 0xc7, 0xb7, 0xe6, 0xa2, 0x4e, 0xd9, 0xf5, 0x6d, 0xdc, 0x9f, + 0x6d, 0x17, 0xb0, 0x60, 0x7e, 0xeb, 0x83, 0x32, 0x8d, 0xca, 0xab, 0x44, 0xe2, 0x9d, 0x67, 0x3c, + 0x25, 0xeb, 0xfc, 0x64, 0x5c, 0x2f, 0xc7, 0xbf, 0x28, 0x09, 0x60, 0xfc, 0xa5, 0xcd, 0x77, 0x7f, + 0x28, 0x5f, 0x90, 0x01, 0x60, 0x47, 0x8a, 0x16, 0xce, 0x83, 0x67, 0xde, 0x49, 0xac, 0x8c, 0xc9, + 0xe3, 0x14, 0x9b, 0x18, 0x4a, 0x85, 0x81, 0xbd, 0x64, 0xf2, 0x38, 0xd5, 0xe4, 0xbf, 0xf8, 0x06, + 0x2f, 0x1f, 0x44, 0x8c, 0x9f, 0x35, 0x70, 0x2e, 0x02, 0x3d, 0x07, 0x05, 0xdb, 0x9b, 0x56, 0xb0, + 0xd3, 0xb6, 0xdf, 0x42, 0xe5, 0xb2, 0x9a, 0xc7, 0x27, 0xb5, 0xcc, 0xa3, 0x93, 0x5a, 0xe6, 0xf1, + 0x49, 0x2d, 0xf3, 0x70, 0x52, 0xd3, 0x8e, 0x27, 0x35, 0xed, 0xd1, 0xa4, 0xa6, 0x3d, 0x9e, 0xd4, + 0xb4, 0xdf, 0x27, 0x35, 0xed, 0xdb, 0x3f, 0x6a, 0x99, 0xcf, 0xb3, 0xc3, 0x8d, 0x7f, 0x03, 0x00, + 0x00, 0xff, 0xff, 0x33, 0xf4, 0x09, 0xac, 0xfb, 0x0f, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/template/v1/generated.proto b/vendor/github.com/openshift/api/template/v1/generated.proto index c059de479b61..998afdda56fa 100644 --- a/vendor/github.com/openshift/api/template/v1/generated.proto +++ b/vendor/github.com/openshift/api/template/v1/generated.proto @@ -9,7 +9,6 @@ import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/api/user/v1/generated.pb.go b/vendor/github.com/openshift/api/user/v1/generated.pb.go index c225e93bf39c..2c8d16e94d56 100644 --- a/vendor/github.com/openshift/api/user/v1/generated.pb.go +++ b/vendor/github.com/openshift/api/user/v1/generated.pb.go @@ -1922,51 +1922,51 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 734 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0x4d, 0x6f, 0xd3, 0x40, - 0x10, 0xcd, 0x26, 0x71, 0x95, 0x6c, 0x53, 0x14, 0x99, 0x1e, 0xa2, 0x1c, 0x9c, 0xc8, 0x48, 0x10, - 0x21, 0x58, 0x37, 0xe5, 0x43, 0x51, 0x8f, 0x11, 0x05, 0x55, 0xb4, 0xb4, 0xac, 0xc4, 0xa5, 0xe2, - 0xc0, 0x36, 0xd9, 0x38, 0x4b, 0x12, 0xdb, 0xb2, 0xd7, 0x11, 0xb9, 0xf5, 0x27, 0xc0, 0x8d, 0x23, - 0x7f, 0x02, 0x71, 0x40, 0xdc, 0xcb, 0xad, 0xc7, 0x1e, 0x50, 0x44, 0xcd, 0x8d, 0x5f, 0x81, 0x76, - 0xfd, 0x11, 0xa7, 0x1f, 0x4a, 0x25, 0xa4, 0xdc, 0xbc, 0xb3, 0xf3, 0xde, 0xbe, 0x79, 0x33, 0x63, - 0xb8, 0x61, 0x32, 0xde, 0xf7, 0x8f, 0x50, 0xc7, 0x1e, 0x19, 0xb6, 0x43, 0x2d, 0xaf, 0xcf, 0x7a, - 0xdc, 0x20, 0x0e, 0x33, 0x7c, 0x8f, 0xba, 0xc6, 0xb8, 0x69, 0x98, 0xd4, 0xa2, 0x2e, 0xe1, 0xb4, - 0x8b, 0x1c, 0xd7, 0xe6, 0xb6, 0x5a, 0x9f, 0x21, 0x50, 0x82, 0x40, 0xc4, 0x61, 0x48, 0x20, 0xd0, - 0xb8, 0x59, 0x7d, 0x98, 0xe2, 0x34, 0x6d, 0xd3, 0x36, 0x24, 0xf0, 0xc8, 0xef, 0xc9, 0x93, 0x3c, - 0xc8, 0xaf, 0x90, 0xb0, 0xaa, 0x0f, 0x5a, 0x1e, 0x62, 0xb6, 0x7c, 0xb4, 0x63, 0xbb, 0xf4, 0x8a, - 0x47, 0xab, 0x8f, 0x67, 0x39, 0x23, 0xd2, 0xe9, 0x33, 0x8b, 0xba, 0x13, 0xc3, 0x19, 0x98, 0x22, - 0xe0, 0x19, 0x23, 0xca, 0xc9, 0x55, 0xa8, 0xa7, 0xd7, 0xa1, 0x5c, 0xdf, 0xe2, 0x6c, 0x44, 0x0d, - 0xaf, 0xd3, 0xa7, 0x23, 0x72, 0x09, 0xf7, 0xe8, 0x3a, 0x9c, 0xcf, 0xd9, 0xd0, 0x60, 0x16, 0xf7, - 0xb8, 0x7b, 0x11, 0xa4, 0x7f, 0x07, 0x50, 0x79, 0xe1, 0xda, 0xbe, 0xa3, 0xbe, 0x83, 0x05, 0xa1, - 0xa8, 0x4b, 0x38, 0xa9, 0x80, 0x3a, 0x68, 0xac, 0x6e, 0x6e, 0xa0, 0x90, 0x11, 0xa5, 0x19, 0x91, - 0x33, 0x30, 0x45, 0xc0, 0x43, 0x22, 0x1b, 0x8d, 0x9b, 0x68, 0xff, 0xe8, 0x3d, 0xed, 0xf0, 0x3d, - 0xca, 0x49, 0x5b, 0x3d, 0x99, 0xd6, 0x32, 0xc1, 0xb4, 0x06, 0x67, 0x31, 0x9c, 0xb0, 0xaa, 0x07, - 0x50, 0x11, 0x66, 0x7b, 0x95, 0xac, 0xa4, 0x37, 0xd0, 0xa2, 0x9e, 0xa0, 0x7d, 0x87, 0x33, 0xdb, - 0x22, 0xc3, 0x57, 0x64, 0x44, 0xbd, 0x76, 0x31, 0x98, 0xd6, 0x94, 0x37, 0x82, 0x01, 0x87, 0x44, - 0xfa, 0x37, 0x00, 0x8b, 0x52, 0xfd, 0x2e, 0xf3, 0xb8, 0xfa, 0xf6, 0x52, 0x05, 0xe8, 0x66, 0x15, - 0x08, 0xb4, 0xd4, 0x5f, 0x8e, 0xf4, 0x17, 0xe2, 0x48, 0x4a, 0xfd, 0x2e, 0x54, 0x18, 0xa7, 0x23, - 0xa1, 0x3e, 0xd7, 0x58, 0xdd, 0xbc, 0xb7, 0x58, 0xbd, 0x54, 0xd6, 0x5e, 0x8b, 0x38, 0x95, 0x1d, - 0x81, 0xc6, 0x21, 0x89, 0xfe, 0x33, 0x07, 0x0b, 0x3b, 0x5d, 0x6a, 0x71, 0xc6, 0x27, 0x4b, 0xb0, - 0xbe, 0x05, 0x4b, 0x8e, 0x6b, 0x8f, 0x59, 0x97, 0xba, 0xc2, 0x4b, 0xd9, 0x81, 0x62, 0x7b, 0x3d, - 0xc2, 0x94, 0x0e, 0x52, 0x77, 0x78, 0x2e, 0x53, 0x7d, 0x06, 0xcb, 0xf1, 0x59, 0x58, 0x2f, 0xd1, - 0x39, 0x89, 0xae, 0x44, 0xe8, 0xf2, 0xc1, 0x85, 0x7b, 0x7c, 0x09, 0xa1, 0x6e, 0xc3, 0xbc, 0x70, - 0xa5, 0x92, 0x97, 0xd5, 0xdd, 0x49, 0x55, 0x87, 0xc4, 0xf2, 0xcc, 0x6a, 0xc1, 0xb4, 0x47, 0x5d, - 0x6a, 0x75, 0x68, 0xbb, 0x14, 0xd1, 0xe7, 0x05, 0x09, 0x96, 0x70, 0xf5, 0x10, 0x2a, 0xf4, 0x03, - 0x77, 0x49, 0x45, 0x91, 0x3d, 0x78, 0xb2, 0xb8, 0x07, 0xb1, 0xc7, 0x68, 0x5b, 0xe0, 0xb6, 0x2d, - 0xee, 0x4e, 0x66, 0x1d, 0x91, 0x31, 0x1c, 0x52, 0x56, 0x5b, 0x10, 0xce, 0x72, 0xd4, 0x32, 0xcc, - 0x0d, 0xe8, 0x44, 0x76, 0xa3, 0x88, 0xc5, 0xa7, 0xba, 0x0e, 0x95, 0x31, 0x19, 0xfa, 0x91, 0x77, - 0x38, 0x3c, 0x6c, 0x65, 0x5b, 0x40, 0xff, 0x01, 0x60, 0x29, 0x7e, 0x67, 0x09, 0x83, 0xb8, 0x3f, - 0x3f, 0x88, 0xf7, 0x6f, 0x6e, 0xc2, 0x35, 0xb3, 0xb8, 0x05, 0xd7, 0xe6, 0x16, 0x4d, 0xad, 0xc5, - 0x2f, 0x80, 0x7a, 0xae, 0x51, 0x0c, 0xf7, 0x2e, 0x8d, 0xd8, 0x2a, 0x7c, 0xfe, 0x52, 0xcb, 0x1c, - 0xff, 0xaa, 0x67, 0xf4, 0xbf, 0x00, 0xca, 0x06, 0x2d, 0x61, 0x86, 0x1f, 0xc0, 0x42, 0xcf, 0x1f, - 0x0e, 0x53, 0xf3, 0x9b, 0xb8, 0xf4, 0x3c, 0x8a, 0xe3, 0x24, 0x43, 0x45, 0x10, 0xb2, 0xb0, 0x6c, - 0x46, 0xbd, 0x4a, 0x4e, 0x16, 0x72, 0x4b, 0x70, 0xef, 0x24, 0x51, 0x9c, 0xca, 0x50, 0x75, 0xb8, - 0x62, 0x8a, 0x7d, 0xf5, 0x2a, 0x79, 0x99, 0x0b, 0x83, 0x69, 0x6d, 0x45, 0x6e, 0xb0, 0x87, 0xa3, - 0x1b, 0xfd, 0x53, 0x16, 0xde, 0x16, 0xc5, 0xc6, 0x7e, 0xee, 0x11, 0xc7, 0x61, 0x96, 0xb9, 0x84, - 0xda, 0x5f, 0xc3, 0x42, 0xa4, 0x75, 0x12, 0xfd, 0x3d, 0x6f, 0xb4, 0x43, 0x89, 0x41, 0xb1, 0x62, - 0x9c, 0xd0, 0x24, 0x2b, 0x99, 0xfb, 0xaf, 0x95, 0xd4, 0xbf, 0x02, 0x58, 0x10, 0xc7, 0x25, 0x0c, - 0xfe, 0xcb, 0xf9, 0xc1, 0xbf, 0xbb, 0x78, 0xf0, 0x85, 0xb0, 0xab, 0x87, 0xbe, 0xdd, 0x38, 0x39, - 0xd7, 0x32, 0xa7, 0xe7, 0x5a, 0xe6, 0xec, 0x5c, 0xcb, 0x1c, 0x07, 0x1a, 0x38, 0x09, 0x34, 0x70, - 0x1a, 0x68, 0xe0, 0x2c, 0xd0, 0xc0, 0xef, 0x40, 0x03, 0x1f, 0xff, 0x68, 0x99, 0xc3, 0xec, 0xb8, - 0xf9, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x57, 0xb1, 0x39, 0x38, 0x6d, 0x08, 0x00, 0x00, + // 724 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0x3d, 0x6f, 0x13, 0x4b, + 0x14, 0xf5, 0xd8, 0xde, 0xc8, 0x9e, 0x38, 0x4f, 0xd6, 0xbe, 0x14, 0x96, 0x8b, 0xb5, 0xb5, 0x4f, + 0x7a, 0xcf, 0x7a, 0x82, 0xd9, 0x38, 0x02, 0x64, 0xa5, 0xb4, 0x08, 0x28, 0x22, 0x21, 0x61, 0x24, + 0x9a, 0x88, 0x82, 0x89, 0x3d, 0x5e, 0x0f, 0xf6, 0x7e, 0x68, 0x77, 0xd6, 0xc2, 0x5d, 0x7e, 0x02, + 0x74, 0x94, 0xfc, 0x09, 0x44, 0x81, 0xe8, 0x43, 0x97, 0x32, 0x05, 0xb2, 0xc8, 0xd2, 0xf1, 0x2b, + 0xd0, 0xcc, 0x7e, 0x78, 0x9d, 0x0f, 0x39, 0x12, 0x92, 0xbb, 0x9d, 0x3b, 0xf7, 0x9c, 0x39, 0xf7, + 0xdc, 0x7b, 0x17, 0x6e, 0x99, 0x8c, 0x0f, 0x83, 0x13, 0xd4, 0x73, 0x2c, 0xc3, 0x71, 0xa9, 0xed, + 0x0f, 0xd9, 0x80, 0x1b, 0xc4, 0x65, 0x46, 0xe0, 0x53, 0xcf, 0x98, 0xb4, 0x0d, 0x93, 0xda, 0xd4, + 0x23, 0x9c, 0xf6, 0x91, 0xeb, 0x39, 0xdc, 0x51, 0x9b, 0x73, 0x04, 0x4a, 0x11, 0x88, 0xb8, 0x0c, + 0x09, 0x04, 0x9a, 0xb4, 0xeb, 0xf7, 0x33, 0x9c, 0xa6, 0x63, 0x3a, 0x86, 0x04, 0x9e, 0x04, 0x03, + 0x79, 0x92, 0x07, 0xf9, 0x15, 0x11, 0xd6, 0xf5, 0x51, 0xc7, 0x47, 0xcc, 0x91, 0x8f, 0xf6, 0x1c, + 0x8f, 0xde, 0xf0, 0x68, 0xfd, 0xc1, 0x3c, 0xc7, 0x22, 0xbd, 0x21, 0xb3, 0xa9, 0x37, 0x35, 0xdc, + 0x91, 0x29, 0x02, 0xbe, 0x61, 0x51, 0x4e, 0x6e, 0x42, 0x3d, 0xba, 0x0d, 0xe5, 0x05, 0x36, 0x67, + 0x16, 0x35, 0xfc, 0xde, 0x90, 0x5a, 0xe4, 0x2a, 0x4e, 0xff, 0x02, 0xa0, 0xf2, 0xd4, 0x73, 0x02, + 0x57, 0x7d, 0x0d, 0x4b, 0x82, 0xbc, 0x4f, 0x38, 0xa9, 0x81, 0x26, 0x68, 0xad, 0x6f, 0x6f, 0xa1, + 0x88, 0x14, 0x65, 0x49, 0x91, 0x3b, 0x32, 0x45, 0xc0, 0x47, 0x22, 0x1b, 0x4d, 0xda, 0xe8, 0xf0, + 0xe4, 0x0d, 0xed, 0xf1, 0x03, 0xca, 0x49, 0x57, 0x3d, 0x9b, 0x35, 0x72, 0xe1, 0xac, 0x01, 0xe7, + 0x31, 0x9c, 0xb2, 0xaa, 0x47, 0x50, 0x11, 0xbe, 0xf9, 0xb5, 0xbc, 0xa4, 0x37, 0xd0, 0x32, 0x7b, + 0xd1, 0xa1, 0xcb, 0x99, 0x63, 0x93, 0xf1, 0x73, 0x62, 0x51, 0xbf, 0x5b, 0x0e, 0x67, 0x0d, 0xe5, + 0xa5, 0x60, 0xc0, 0x11, 0x91, 0xfe, 0x19, 0xc0, 0xb2, 0x54, 0xbf, 0xcf, 0x7c, 0xae, 0xbe, 0xba, + 0x56, 0x01, 0xba, 0x5b, 0x05, 0x02, 0x2d, 0xf5, 0x57, 0x63, 0xfd, 0xa5, 0x24, 0x92, 0x51, 0xbf, + 0x0f, 0x15, 0xc6, 0xa9, 0x25, 0xd4, 0x17, 0x5a, 0xeb, 0xdb, 0xff, 0x2d, 0x57, 0x2f, 0x95, 0x75, + 0x37, 0x62, 0x4e, 0x65, 0x4f, 0xa0, 0x71, 0x44, 0xa2, 0x7f, 0x2b, 0xc0, 0xd2, 0x5e, 0x9f, 0xda, + 0x9c, 0xf1, 0xe9, 0x0a, 0xac, 0xef, 0xc0, 0x8a, 0xeb, 0x39, 0x13, 0xd6, 0xa7, 0x9e, 0xf0, 0x52, + 0x76, 0xa0, 0xdc, 0xdd, 0x8c, 0x31, 0x95, 0xa3, 0xcc, 0x1d, 0x5e, 0xc8, 0x54, 0x1f, 0xc3, 0x6a, + 0x72, 0x16, 0xd6, 0x4b, 0x74, 0x41, 0xa2, 0x6b, 0x31, 0xba, 0x7a, 0x74, 0xe5, 0x1e, 0x5f, 0x43, + 0xa8, 0xbb, 0xb0, 0x28, 0x5c, 0xa9, 0x15, 0x65, 0x75, 0xff, 0x64, 0xaa, 0x43, 0x62, 0x0f, 0xe6, + 0xb5, 0x60, 0x3a, 0xa0, 0x1e, 0xb5, 0x7b, 0xb4, 0x5b, 0x89, 0xe9, 0x8b, 0x82, 0x04, 0x4b, 0xb8, + 0x7a, 0x0c, 0x15, 0xfa, 0x96, 0x7b, 0xa4, 0xa6, 0xc8, 0x1e, 0x3c, 0x5c, 0xde, 0x83, 0xc4, 0x63, + 0xb4, 0x2b, 0x70, 0xbb, 0x36, 0xf7, 0xa6, 0xf3, 0x8e, 0xc8, 0x18, 0x8e, 0x28, 0xeb, 0x1d, 0x08, + 0xe7, 0x39, 0x6a, 0x15, 0x16, 0x46, 0x74, 0x2a, 0xbb, 0x51, 0xc6, 0xe2, 0x53, 0xdd, 0x84, 0xca, + 0x84, 0x8c, 0x83, 0xd8, 0x3b, 0x1c, 0x1d, 0x76, 0xf2, 0x1d, 0xa0, 0x7f, 0x05, 0xb0, 0x92, 0xbc, + 0xb3, 0x82, 0x41, 0x3c, 0x5c, 0x1c, 0xc4, 0xff, 0xef, 0x6e, 0xc2, 0x2d, 0xb3, 0xb8, 0x03, 0x37, + 0x16, 0x16, 0x4d, 0x6d, 0x24, 0x2f, 0x80, 0x66, 0xa1, 0x55, 0x8e, 0xf6, 0x2e, 0x8b, 0xd8, 0x29, + 0x7d, 0xf8, 0xd8, 0xc8, 0x9d, 0x7e, 0x6f, 0xe6, 0xf4, 0x5f, 0x00, 0xca, 0x06, 0xad, 0x60, 0x86, + 0xef, 0xc1, 0xd2, 0x20, 0x18, 0x8f, 0x33, 0xf3, 0x9b, 0xba, 0xf4, 0x24, 0x8e, 0xe3, 0x34, 0x43, + 0x45, 0x10, 0xb2, 0xa8, 0x6c, 0x46, 0xfd, 0x5a, 0x41, 0x16, 0xf2, 0x97, 0xe0, 0xde, 0x4b, 0xa3, + 0x38, 0x93, 0xa1, 0xea, 0x70, 0xcd, 0x14, 0xfb, 0xea, 0xd7, 0x8a, 0x32, 0x17, 0x86, 0xb3, 0xc6, + 0x9a, 0xdc, 0x60, 0x1f, 0xc7, 0x37, 0xfa, 0xfb, 0x3c, 0xfc, 0x5b, 0x14, 0x9b, 0xf8, 0x79, 0x40, + 0x5c, 0x97, 0xd9, 0xe6, 0x0a, 0x6a, 0x7f, 0x01, 0x4b, 0xb1, 0xd6, 0x69, 0xfc, 0xf7, 0xbc, 0xd3, + 0x0e, 0xa5, 0x06, 0x25, 0x8a, 0x71, 0x4a, 0x93, 0xae, 0x64, 0xe1, 0x8f, 0x56, 0x52, 0xff, 0x04, + 0x60, 0x49, 0x1c, 0x57, 0x30, 0xf8, 0xcf, 0x16, 0x07, 0xff, 0xdf, 0xe5, 0x83, 0x2f, 0x84, 0xdd, + 0x3c, 0xf4, 0xdd, 0xd6, 0xd9, 0xa5, 0x96, 0x3b, 0xbf, 0xd4, 0x72, 0x17, 0x97, 0x5a, 0xee, 0x34, + 0xd4, 0xc0, 0x59, 0xa8, 0x81, 0xf3, 0x50, 0x03, 0x17, 0xa1, 0x06, 0x7e, 0x84, 0x1a, 0x78, 0xf7, + 0x53, 0xcb, 0x1d, 0xe7, 0x27, 0xed, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0x3b, 0x61, 0x21, + 0x38, 0x08, 0x00, 0x00, } diff --git a/vendor/github.com/openshift/api/user/v1/generated.proto b/vendor/github.com/openshift/api/user/v1/generated.proto index e23ef3806590..042e02a53367 100644 --- a/vendor/github.com/openshift/api/user/v1/generated.proto +++ b/vendor/github.com/openshift/api/user/v1/generated.proto @@ -8,7 +8,6 @@ package github.com.openshift.api.user.v1; import "k8s.io/api/core/v1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; -import "k8s.io/apimachinery/pkg/util/intstr/generated.proto"; // Package-wide variables from generator "generated". option go_package = "v1"; diff --git a/vendor/github.com/openshift/client-go/.travis.yml b/vendor/github.com/openshift/client-go/.travis.yml index a4b98a3afde0..4766d57576da 100644 --- a/vendor/github.com/openshift/client-go/.travis.yml +++ b/vendor/github.com/openshift/client-go/.travis.yml @@ -1,7 +1,7 @@ language: go go: - - 1.9 + - "1.10" script: - make verify build build-examples diff --git a/vendor/github.com/openshift/client-go/apps/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/apps/clientset/versioned/fake/register.go index 3ab4f7d1bb94..6365f4481eea 100644 --- a/vendor/github.com/openshift/client-go/apps/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/apps/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + appsv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - appsv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/apps/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/apps/clientset/versioned/scheme/register.go index 3df3ed17e675..ec1f43e16261 100644 --- a/vendor/github.com/openshift/client-go/apps/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/apps/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + appsv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - appsv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/authorization/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/authorization/clientset/versioned/fake/register.go index abb48df09555..1270eefe8d02 100644 --- a/vendor/github.com/openshift/client-go/authorization/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/authorization/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + authorizationv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - authorizationv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/authorization/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/authorization/clientset/versioned/scheme/register.go index 6424b4834848..d781567a6cfa 100644 --- a/vendor/github.com/openshift/client-go/authorization/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/authorization/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + authorizationv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - authorizationv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/build/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/build/clientset/versioned/fake/register.go index 9c8695ef2bb0..ef63cfa37b38 100644 --- a/vendor/github.com/openshift/client-go/build/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/build/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + buildv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - buildv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/build/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/build/clientset/versioned/scheme/register.go index bfe6204a9c97..73b0247e0347 100644 --- a/vendor/github.com/openshift/client-go/build/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/build/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + buildv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - buildv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/fake/register.go index 65d7c8494c57..ae058a902cf6 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + configv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - configv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/scheme/register.go index f07ab02de579..e5b38b0ceb10 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + configv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - configv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/apiserver.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/apiserver.go new file mode 100644 index 000000000000..2ec9eb8c1685 --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/apiserver.go @@ -0,0 +1,147 @@ +// Code generated by client-gen. DO NOT EDIT. + +package v1 + +import ( + v1 "github.com/openshift/api/config/v1" + scheme "github.com/openshift/client-go/config/clientset/versioned/scheme" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" +) + +// APIServersGetter has a method to return a APIServerInterface. +// A group's client should implement this interface. +type APIServersGetter interface { + APIServers() APIServerInterface +} + +// APIServerInterface has methods to work with APIServer resources. +type APIServerInterface interface { + Create(*v1.APIServer) (*v1.APIServer, error) + Update(*v1.APIServer) (*v1.APIServer, error) + UpdateStatus(*v1.APIServer) (*v1.APIServer, error) + Delete(name string, options *meta_v1.DeleteOptions) error + DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error + Get(name string, options meta_v1.GetOptions) (*v1.APIServer, error) + List(opts meta_v1.ListOptions) (*v1.APIServerList, error) + Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.APIServer, err error) + APIServerExpansion +} + +// aPIServers implements APIServerInterface +type aPIServers struct { + client rest.Interface +} + +// newAPIServers returns a APIServers +func newAPIServers(c *ConfigV1Client) *aPIServers { + return &aPIServers{ + client: c.RESTClient(), + } +} + +// Get takes name of the aPIServer, and returns the corresponding aPIServer object, and an error if there is any. +func (c *aPIServers) Get(name string, options meta_v1.GetOptions) (result *v1.APIServer, err error) { + result = &v1.APIServer{} + err = c.client.Get(). + Resource("apiservers"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of APIServers that match those selectors. +func (c *aPIServers) List(opts meta_v1.ListOptions) (result *v1.APIServerList, err error) { + result = &v1.APIServerList{} + err = c.client.Get(). + Resource("apiservers"). + VersionedParams(&opts, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested aPIServers. +func (c *aPIServers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true + return c.client.Get(). + Resource("apiservers"). + VersionedParams(&opts, scheme.ParameterCodec). + Watch() +} + +// Create takes the representation of a aPIServer and creates it. Returns the server's representation of the aPIServer, and an error, if there is any. +func (c *aPIServers) Create(aPIServer *v1.APIServer) (result *v1.APIServer, err error) { + result = &v1.APIServer{} + err = c.client.Post(). + Resource("apiservers"). + Body(aPIServer). + Do(). + Into(result) + return +} + +// Update takes the representation of a aPIServer and updates it. Returns the server's representation of the aPIServer, and an error, if there is any. +func (c *aPIServers) Update(aPIServer *v1.APIServer) (result *v1.APIServer, err error) { + result = &v1.APIServer{} + err = c.client.Put(). + Resource("apiservers"). + Name(aPIServer.Name). + Body(aPIServer). + Do(). + Into(result) + return +} + +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). + +func (c *aPIServers) UpdateStatus(aPIServer *v1.APIServer) (result *v1.APIServer, err error) { + result = &v1.APIServer{} + err = c.client.Put(). + Resource("apiservers"). + Name(aPIServer.Name). + SubResource("status"). + Body(aPIServer). + Do(). + Into(result) + return +} + +// Delete takes name of the aPIServer and deletes it. Returns an error if one occurs. +func (c *aPIServers) Delete(name string, options *meta_v1.DeleteOptions) error { + return c.client.Delete(). + Resource("apiservers"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *aPIServers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { + return c.client.Delete(). + Resource("apiservers"). + VersionedParams(&listOptions, scheme.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Patch applies the patch and returns the patched aPIServer. +func (c *aPIServers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.APIServer, err error) { + result = &v1.APIServer{} + err = c.client.Patch(pt). + Resource("apiservers"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/config_client.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/config_client.go index e3df41408470..023ef7d55097 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/config_client.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/config_client.go @@ -11,6 +11,7 @@ import ( type ConfigV1Interface interface { RESTClient() rest.Interface + APIServersGetter AuthenticationsGetter BuildsGetter ClusterOperatorsGetter @@ -32,6 +33,10 @@ type ConfigV1Client struct { restClient rest.Interface } +func (c *ConfigV1Client) APIServers() APIServerInterface { + return newAPIServers(c) +} + func (c *ConfigV1Client) Authentications() AuthenticationInterface { return newAuthentications(c) } diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_apiserver.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_apiserver.go new file mode 100644 index 000000000000..984eb9a6966f --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_apiserver.go @@ -0,0 +1,115 @@ +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + config_v1 "github.com/openshift/api/config/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + labels "k8s.io/apimachinery/pkg/labels" + schema "k8s.io/apimachinery/pkg/runtime/schema" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" +) + +// FakeAPIServers implements APIServerInterface +type FakeAPIServers struct { + Fake *FakeConfigV1 +} + +var apiserversResource = schema.GroupVersionResource{Group: "config.openshift.io", Version: "v1", Resource: "apiservers"} + +var apiserversKind = schema.GroupVersionKind{Group: "config.openshift.io", Version: "v1", Kind: "APIServer"} + +// Get takes name of the aPIServer, and returns the corresponding aPIServer object, and an error if there is any. +func (c *FakeAPIServers) Get(name string, options v1.GetOptions) (result *config_v1.APIServer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootGetAction(apiserversResource, name), &config_v1.APIServer{}) + if obj == nil { + return nil, err + } + return obj.(*config_v1.APIServer), err +} + +// List takes label and field selectors, and returns the list of APIServers that match those selectors. +func (c *FakeAPIServers) List(opts v1.ListOptions) (result *config_v1.APIServerList, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootListAction(apiserversResource, apiserversKind, opts), &config_v1.APIServerList{}) + if obj == nil { + return nil, err + } + + label, _, _ := testing.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &config_v1.APIServerList{ListMeta: obj.(*config_v1.APIServerList).ListMeta} + for _, item := range obj.(*config_v1.APIServerList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested aPIServers. +func (c *FakeAPIServers) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(testing.NewRootWatchAction(apiserversResource, opts)) +} + +// Create takes the representation of a aPIServer and creates it. Returns the server's representation of the aPIServer, and an error, if there is any. +func (c *FakeAPIServers) Create(aPIServer *config_v1.APIServer) (result *config_v1.APIServer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootCreateAction(apiserversResource, aPIServer), &config_v1.APIServer{}) + if obj == nil { + return nil, err + } + return obj.(*config_v1.APIServer), err +} + +// Update takes the representation of a aPIServer and updates it. Returns the server's representation of the aPIServer, and an error, if there is any. +func (c *FakeAPIServers) Update(aPIServer *config_v1.APIServer) (result *config_v1.APIServer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateAction(apiserversResource, aPIServer), &config_v1.APIServer{}) + if obj == nil { + return nil, err + } + return obj.(*config_v1.APIServer), err +} + +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). +func (c *FakeAPIServers) UpdateStatus(aPIServer *config_v1.APIServer) (*config_v1.APIServer, error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateSubresourceAction(apiserversResource, "status", aPIServer), &config_v1.APIServer{}) + if obj == nil { + return nil, err + } + return obj.(*config_v1.APIServer), err +} + +// Delete takes name of the aPIServer and deletes it. Returns an error if one occurs. +func (c *FakeAPIServers) Delete(name string, options *v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(testing.NewRootDeleteAction(apiserversResource, name), &config_v1.APIServer{}) + return err +} + +// DeleteCollection deletes a collection of objects. +func (c *FakeAPIServers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + action := testing.NewRootDeleteCollectionAction(apiserversResource, listOptions) + + _, err := c.Fake.Invokes(action, &config_v1.APIServerList{}) + return err +} + +// Patch applies the patch and returns the patched aPIServer. +func (c *FakeAPIServers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *config_v1.APIServer, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootPatchSubresourceAction(apiserversResource, name, data, subresources...), &config_v1.APIServer{}) + if obj == nil { + return nil, err + } + return obj.(*config_v1.APIServer), err +} diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_config_client.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_config_client.go index 47f91b22ee34..3528c4a3937f 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_config_client.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/fake/fake_config_client.go @@ -12,6 +12,10 @@ type FakeConfigV1 struct { *testing.Fake } +func (c *FakeConfigV1) APIServers() v1.APIServerInterface { + return &FakeAPIServers{c} +} + func (c *FakeConfigV1) Authentications() v1.AuthenticationInterface { return &FakeAuthentications{c} } diff --git a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/generated_expansion.go b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/generated_expansion.go index 7d1943e60ce0..eb431398f8a7 100644 --- a/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/generated_expansion.go +++ b/vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1/generated_expansion.go @@ -2,6 +2,8 @@ package v1 +type APIServerExpansion interface{} + type AuthenticationExpansion interface{} type BuildExpansion interface{} diff --git a/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/apiserver.go b/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/apiserver.go new file mode 100644 index 000000000000..d79c40c186d4 --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/apiserver.go @@ -0,0 +1,72 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package v1 + +import ( + time "time" + + config_v1 "github.com/openshift/api/config/v1" + versioned "github.com/openshift/client-go/config/clientset/versioned" + internalinterfaces "github.com/openshift/client-go/config/informers/externalversions/internalinterfaces" + v1 "github.com/openshift/client-go/config/listers/config/v1" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" +) + +// APIServerInformer provides access to a shared informer and lister for +// APIServers. +type APIServerInformer interface { + Informer() cache.SharedIndexInformer + Lister() v1.APIServerLister +} + +type aPIServerInformer struct { + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc +} + +// NewAPIServerInformer constructs a new informer for APIServer type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewAPIServerInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredAPIServerInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredAPIServerInformer constructs a new informer for APIServer type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredAPIServerInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { + return cache.NewSharedIndexInformer( + &cache.ListWatch{ + ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.ConfigV1().APIServers().List(options) + }, + WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.ConfigV1().APIServers().Watch(options) + }, + }, + &config_v1.APIServer{}, + resyncPeriod, + indexers, + ) +} + +func (f *aPIServerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredAPIServerInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) +} + +func (f *aPIServerInformer) Informer() cache.SharedIndexInformer { + return f.factory.InformerFor(&config_v1.APIServer{}, f.defaultInformer) +} + +func (f *aPIServerInformer) Lister() v1.APIServerLister { + return v1.NewAPIServerLister(f.Informer().GetIndexer()) +} diff --git a/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/interface.go b/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/interface.go index 22b4d78fd04e..d5c7ac48f90c 100644 --- a/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/interface.go +++ b/vendor/github.com/openshift/client-go/config/informers/externalversions/config/v1/interface.go @@ -8,6 +8,8 @@ import ( // Interface provides access to all the informers in this group version. type Interface interface { + // APIServers returns a APIServerInformer. + APIServers() APIServerInformer // Authentications returns a AuthenticationInformer. Authentications() AuthenticationInformer // Builds returns a BuildInformer. @@ -49,6 +51,11 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList return &version{factory: f, namespace: namespace, tweakListOptions: tweakListOptions} } +// APIServers returns a APIServerInformer. +func (v *version) APIServers() APIServerInformer { + return &aPIServerInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} +} + // Authentications returns a AuthenticationInformer. func (v *version) Authentications() AuthenticationInformer { return &authenticationInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} diff --git a/vendor/github.com/openshift/client-go/config/informers/externalversions/generic.go b/vendor/github.com/openshift/client-go/config/informers/externalversions/generic.go index b0b32cbd110b..31124f632501 100644 --- a/vendor/github.com/openshift/client-go/config/informers/externalversions/generic.go +++ b/vendor/github.com/openshift/client-go/config/informers/externalversions/generic.go @@ -37,6 +37,8 @@ func (f *genericInformer) Lister() cache.GenericLister { func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource) (GenericInformer, error) { switch resource { // Group=config.openshift.io, Version=v1 + case v1.SchemeGroupVersion.WithResource("apiservers"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Config().V1().APIServers().Informer()}, nil case v1.SchemeGroupVersion.WithResource("authentications"): return &genericInformer{resource: resource.GroupResource(), informer: f.Config().V1().Authentications().Informer()}, nil case v1.SchemeGroupVersion.WithResource("builds"): diff --git a/vendor/github.com/openshift/client-go/config/listers/config/v1/apiserver.go b/vendor/github.com/openshift/client-go/config/listers/config/v1/apiserver.go new file mode 100644 index 000000000000..63bb7ecfdc40 --- /dev/null +++ b/vendor/github.com/openshift/client-go/config/listers/config/v1/apiserver.go @@ -0,0 +1,49 @@ +// Code generated by lister-gen. DO NOT EDIT. + +package v1 + +import ( + v1 "github.com/openshift/api/config/v1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" +) + +// APIServerLister helps list APIServers. +type APIServerLister interface { + // List lists all APIServers in the indexer. + List(selector labels.Selector) (ret []*v1.APIServer, err error) + // Get retrieves the APIServer from the index for a given name. + Get(name string) (*v1.APIServer, error) + APIServerListerExpansion +} + +// aPIServerLister implements the APIServerLister interface. +type aPIServerLister struct { + indexer cache.Indexer +} + +// NewAPIServerLister returns a new APIServerLister. +func NewAPIServerLister(indexer cache.Indexer) APIServerLister { + return &aPIServerLister{indexer: indexer} +} + +// List lists all APIServers in the indexer. +func (s *aPIServerLister) List(selector labels.Selector) (ret []*v1.APIServer, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1.APIServer)) + }) + return ret, err +} + +// Get retrieves the APIServer from the index for a given name. +func (s *aPIServerLister) Get(name string) (*v1.APIServer, error) { + obj, exists, err := s.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1.Resource("apiserver"), name) + } + return obj.(*v1.APIServer), nil +} diff --git a/vendor/github.com/openshift/client-go/config/listers/config/v1/expansion_generated.go b/vendor/github.com/openshift/client-go/config/listers/config/v1/expansion_generated.go index f4a8dbda3543..dcd4a714f3b2 100644 --- a/vendor/github.com/openshift/client-go/config/listers/config/v1/expansion_generated.go +++ b/vendor/github.com/openshift/client-go/config/listers/config/v1/expansion_generated.go @@ -2,6 +2,10 @@ package v1 +// APIServerListerExpansion allows custom methods to be added to +// APIServerLister. +type APIServerListerExpansion interface{} + // AuthenticationListerExpansion allows custom methods to be added to // AuthenticationLister. type AuthenticationListerExpansion interface{} diff --git a/vendor/github.com/openshift/client-go/glide.lock b/vendor/github.com/openshift/client-go/glide.lock index 3cc9207a1651..cb6fe0c63289 100644 --- a/vendor/github.com/openshift/client-go/glide.lock +++ b/vendor/github.com/openshift/client-go/glide.lock @@ -1,5 +1,5 @@ -hash: 63644647f862ec7482e1c18412fc08babd74694a38b4ca257e42a0656677f513 -updated: 2019-01-18T16:16:08.250964542-05:00 +hash: 2bc7f2365f88b3af5dd5bc4bc234144b18e67928f8169661cd2fa2b48c389650 +updated: 2019-01-29T18:21:30.37502444-05:00 imports: - name: github.com/davecgh/go-spew version: 782f4967f2dc4564575ca782fe2d04090b5faca8 @@ -41,7 +41,7 @@ imports: subpackages: - simplelru - name: github.com/imdario/mergo - version: 6633656539c1639d9d78127b7d47c622b5d7b6dc + version: 9316a62528ac99aaecb4e47eadd6dc8aa6533d58 - name: github.com/json-iterator/go version: f2b4162afba35581b6d4a50d3b8f34e33c144682 - name: github.com/modern-go/concurrent @@ -49,7 +49,7 @@ imports: - name: github.com/modern-go/reflect2 version: 05fbef0ca5da472bbf96c9322b84a53edc03c9fd - name: github.com/openshift/api - version: 4d49b5754a7067c0bf325b67ac6fc5e7d307aaad + version: 31ed61683850951801cddda5b075fcb24a500532 subpackages: - apps/v1 - authorization/v1 @@ -75,11 +75,11 @@ imports: - name: github.com/spf13/pflag version: 583c0c0531f06d5278b7d917446061adc344b5cd - name: golang.org/x/crypto - version: 49796115aa4b964c318aad4f3084fdb41e9aa067 + version: de0752318171da717af4ce24d0a2e8626afaeb11 subpackages: - ssh/terminal - name: golang.org/x/net - version: 1c05540f6879653db88113bc4a2b70aec4bd491f + version: 0ed95abb35c445290478a5348a7b38bb154135fd subpackages: - context - context/ctxhttp @@ -87,6 +87,13 @@ imports: - http2/hpack - idna - lex/httplex +- name: golang.org/x/oauth2 + version: a6bd8cefa1811bd24b86f8902872e4e8225f74c4 + subpackages: + - google + - internal + - jws + - jwt - name: golang.org/x/sys version: 95c6576299259db960f6c5b9b69ea52422860fce subpackages: @@ -107,12 +114,22 @@ imports: version: 2382e3994d48b1d22acc2c86bcad0a2aff028e32 subpackages: - imports +- name: google.golang.org/appengine + version: 12d5545dc1cfa6047a286d5e853841b6471f4c19 + subpackages: + - internal + - internal/base + - internal/datastore + - internal/log + - internal/remote_api + - internal/urlfetch + - urlfetch - name: gopkg.in/inf.v0 version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 - name: gopkg.in/yaml.v2 version: 670d4cfef0544295bc27a114dbac37980d83185a - name: k8s.io/api - version: 2d6f90ab1293a1fb871cf149423ebb72aa7423aa + version: 6db15a15d2d3874a6c3ddb2140ac9f3bc7058428 subpackages: - admissionregistration/v1alpha1 - admissionregistration/v1beta1 @@ -125,10 +142,12 @@ imports: - authorization/v1beta1 - autoscaling/v1 - autoscaling/v2beta1 + - autoscaling/v2beta2 - batch/v1 - batch/v1beta1 - batch/v2alpha1 - certificates/v1beta1 + - coordination/v1beta1 - core/v1 - events/v1beta1 - extensions/v1beta1 @@ -144,7 +163,7 @@ imports: - storage/v1alpha1 - storage/v1beta1 - name: k8s.io/apimachinery - version: 103fd098999dc9c0c88536f5c9ad2e5da39373ae + version: 49ce2735e5074ffc3f8190c8406cf51a96302dad subpackages: - pkg/api/errors - pkg/api/meta @@ -175,6 +194,7 @@ imports: - pkg/util/intstr - pkg/util/json - pkg/util/mergepatch + - pkg/util/naming - pkg/util/net - pkg/util/runtime - pkg/util/sets @@ -188,7 +208,7 @@ imports: - third_party/forked/golang/json - third_party/forked/golang/reflect - name: k8s.io/client-go - version: 59698c7d9724b0f95f9dc9e7f7dfdcc3dfeceb82 + version: 701b913670036511e3d752318272c97f1a2a2edd subpackages: - discovery - discovery/fake @@ -218,13 +238,13 @@ imports: - util/integer - util/retry - name: k8s.io/code-generator - version: f8b4a111163516cf26185a0530df90263c59bcc1 + version: aef8d122b95ddd821e3bd35d4013593b1e5eda16 repo: https://github.com/openshift/kubernetes-code-generator.git - name: k8s.io/gengo version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b repo: https://github.com/openshift/kubernetes-gengo.git - name: k8s.io/kube-openapi - version: 91cfa479c814065e420cee7ed227db0f63a5854e + version: 0cf8f7e6ed1d2e3d47d02e3b6e559369af24d803 subpackages: - pkg/util/proto testImports: [] diff --git a/vendor/github.com/openshift/client-go/glide.yaml b/vendor/github.com/openshift/client-go/glide.yaml index 5a86963bddd7..a09523a01459 100644 --- a/vendor/github.com/openshift/client-go/glide.yaml +++ b/vendor/github.com/openshift/client-go/glide.yaml @@ -5,13 +5,13 @@ import: version: origin-3.11-kubernetes-1.11.1 - package: k8s.io/code-generator repo: https://github.com/openshift/kubernetes-code-generator.git - version: origin-3.11-kubernetes-1.11.1 + version: origin-4.0-kubernetes-1.12.4 - package: k8s.io/apimachinery - version: kubernetes-1.11.1 + version: kubernetes-1.12.5 - package: k8s.io/api - version: kubernetes-1.11.1 + version: kubernetes-1.12.5 - package: k8s.io/client-go - version: kubernetes-1.11.1 + version: kubernetes-1.12.5 - package: github.com/openshift/api version: master - package: github.com/golang/glog diff --git a/vendor/github.com/openshift/client-go/image/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/image/clientset/versioned/fake/register.go index 6bd9cc826f7d..04aa18839035 100644 --- a/vendor/github.com/openshift/client-go/image/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/image/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + imagev1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - imagev1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/image/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/image/clientset/versioned/scheme/register.go index 2e62b7b5aa3a..78c980985434 100644 --- a/vendor/github.com/openshift/client-go/image/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/image/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + imagev1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - imagev1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/network/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/network/clientset/versioned/fake/register.go index e85b96e2fab3..149913bcbad4 100644 --- a/vendor/github.com/openshift/client-go/network/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/network/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + networkv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - networkv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/network/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/network/clientset/versioned/scheme/register.go index eff26c81cd60..73f40c5c5f31 100644 --- a/vendor/github.com/openshift/client-go/network/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/network/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + networkv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - networkv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/oauth/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/oauth/clientset/versioned/fake/register.go index a0611bcad8ea..8a0bf088f4b3 100644 --- a/vendor/github.com/openshift/client-go/oauth/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/oauth/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + oauthv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - oauthv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/oauth/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/oauth/clientset/versioned/scheme/register.go index 26c1d9eca716..73183b955c38 100644 --- a/vendor/github.com/openshift/client-go/oauth/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/oauth/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + oauthv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - oauthv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/fake/register.go index 16a558519e48..eaf6ac9ed564 100644 --- a/vendor/github.com/openshift/client-go/operator/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + operatorv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - operatorv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/scheme/register.go index 568943915d94..1be3f4a84ae1 100644 --- a/vendor/github.com/openshift/client-go/operator/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + operatorv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - operatorv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_openshiftcontrollermanager.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_openshiftcontrollermanager.go new file mode 100644 index 000000000000..851ddd278477 --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_openshiftcontrollermanager.go @@ -0,0 +1,115 @@ +// Code generated by client-gen. DO NOT EDIT. + +package fake + +import ( + operator_v1 "github.com/openshift/api/operator/v1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + labels "k8s.io/apimachinery/pkg/labels" + schema "k8s.io/apimachinery/pkg/runtime/schema" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + testing "k8s.io/client-go/testing" +) + +// FakeOpenShiftControllerManagers implements OpenShiftControllerManagerInterface +type FakeOpenShiftControllerManagers struct { + Fake *FakeOperatorV1 +} + +var openshiftcontrollermanagersResource = schema.GroupVersionResource{Group: "operator.openshift.io", Version: "v1", Resource: "openshiftcontrollermanagers"} + +var openshiftcontrollermanagersKind = schema.GroupVersionKind{Group: "operator.openshift.io", Version: "v1", Kind: "OpenShiftControllerManager"} + +// Get takes name of the openShiftControllerManager, and returns the corresponding openShiftControllerManager object, and an error if there is any. +func (c *FakeOpenShiftControllerManagers) Get(name string, options v1.GetOptions) (result *operator_v1.OpenShiftControllerManager, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootGetAction(openshiftcontrollermanagersResource, name), &operator_v1.OpenShiftControllerManager{}) + if obj == nil { + return nil, err + } + return obj.(*operator_v1.OpenShiftControllerManager), err +} + +// List takes label and field selectors, and returns the list of OpenShiftControllerManagers that match those selectors. +func (c *FakeOpenShiftControllerManagers) List(opts v1.ListOptions) (result *operator_v1.OpenShiftControllerManagerList, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootListAction(openshiftcontrollermanagersResource, openshiftcontrollermanagersKind, opts), &operator_v1.OpenShiftControllerManagerList{}) + if obj == nil { + return nil, err + } + + label, _, _ := testing.ExtractFromListOptions(opts) + if label == nil { + label = labels.Everything() + } + list := &operator_v1.OpenShiftControllerManagerList{ListMeta: obj.(*operator_v1.OpenShiftControllerManagerList).ListMeta} + for _, item := range obj.(*operator_v1.OpenShiftControllerManagerList).Items { + if label.Matches(labels.Set(item.Labels)) { + list.Items = append(list.Items, item) + } + } + return list, err +} + +// Watch returns a watch.Interface that watches the requested openShiftControllerManagers. +func (c *FakeOpenShiftControllerManagers) Watch(opts v1.ListOptions) (watch.Interface, error) { + return c.Fake. + InvokesWatch(testing.NewRootWatchAction(openshiftcontrollermanagersResource, opts)) +} + +// Create takes the representation of a openShiftControllerManager and creates it. Returns the server's representation of the openShiftControllerManager, and an error, if there is any. +func (c *FakeOpenShiftControllerManagers) Create(openShiftControllerManager *operator_v1.OpenShiftControllerManager) (result *operator_v1.OpenShiftControllerManager, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootCreateAction(openshiftcontrollermanagersResource, openShiftControllerManager), &operator_v1.OpenShiftControllerManager{}) + if obj == nil { + return nil, err + } + return obj.(*operator_v1.OpenShiftControllerManager), err +} + +// Update takes the representation of a openShiftControllerManager and updates it. Returns the server's representation of the openShiftControllerManager, and an error, if there is any. +func (c *FakeOpenShiftControllerManagers) Update(openShiftControllerManager *operator_v1.OpenShiftControllerManager) (result *operator_v1.OpenShiftControllerManager, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateAction(openshiftcontrollermanagersResource, openShiftControllerManager), &operator_v1.OpenShiftControllerManager{}) + if obj == nil { + return nil, err + } + return obj.(*operator_v1.OpenShiftControllerManager), err +} + +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). +func (c *FakeOpenShiftControllerManagers) UpdateStatus(openShiftControllerManager *operator_v1.OpenShiftControllerManager) (*operator_v1.OpenShiftControllerManager, error) { + obj, err := c.Fake. + Invokes(testing.NewRootUpdateSubresourceAction(openshiftcontrollermanagersResource, "status", openShiftControllerManager), &operator_v1.OpenShiftControllerManager{}) + if obj == nil { + return nil, err + } + return obj.(*operator_v1.OpenShiftControllerManager), err +} + +// Delete takes name of the openShiftControllerManager and deletes it. Returns an error if one occurs. +func (c *FakeOpenShiftControllerManagers) Delete(name string, options *v1.DeleteOptions) error { + _, err := c.Fake. + Invokes(testing.NewRootDeleteAction(openshiftcontrollermanagersResource, name), &operator_v1.OpenShiftControllerManager{}) + return err +} + +// DeleteCollection deletes a collection of objects. +func (c *FakeOpenShiftControllerManagers) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error { + action := testing.NewRootDeleteCollectionAction(openshiftcontrollermanagersResource, listOptions) + + _, err := c.Fake.Invokes(action, &operator_v1.OpenShiftControllerManagerList{}) + return err +} + +// Patch applies the patch and returns the patched openShiftControllerManager. +func (c *FakeOpenShiftControllerManagers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *operator_v1.OpenShiftControllerManager, err error) { + obj, err := c.Fake. + Invokes(testing.NewRootPatchSubresourceAction(openshiftcontrollermanagersResource, name, data, subresources...), &operator_v1.OpenShiftControllerManager{}) + if obj == nil { + return nil, err + } + return obj.(*operator_v1.OpenShiftControllerManager), err +} diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_operator_client.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_operator_client.go index ef88b268068a..e7e3167f9649 100644 --- a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_operator_client.go +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_operator_client.go @@ -24,6 +24,10 @@ func (c *FakeOperatorV1) OpenShiftAPIServers() v1.OpenShiftAPIServerInterface { return &FakeOpenShiftAPIServers{c} } +func (c *FakeOperatorV1) OpenShiftControllerManagers() v1.OpenShiftControllerManagerInterface { + return &FakeOpenShiftControllerManagers{c} +} + // RESTClient returns a RESTClient that is used to communicate // with API server by this client implementation. func (c *FakeOperatorV1) RESTClient() rest.Interface { diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/generated_expansion.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/generated_expansion.go index 44b9afa40226..4857d09bf2a1 100644 --- a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/generated_expansion.go +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/generated_expansion.go @@ -7,3 +7,5 @@ type KubeAPIServerExpansion interface{} type KubeControllerManagerExpansion interface{} type OpenShiftAPIServerExpansion interface{} + +type OpenShiftControllerManagerExpansion interface{} diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/openshiftcontrollermanager.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/openshiftcontrollermanager.go new file mode 100644 index 000000000000..1ca7c33bce82 --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/openshiftcontrollermanager.go @@ -0,0 +1,147 @@ +// Code generated by client-gen. DO NOT EDIT. + +package v1 + +import ( + v1 "github.com/openshift/api/operator/v1" + scheme "github.com/openshift/client-go/operator/clientset/versioned/scheme" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + types "k8s.io/apimachinery/pkg/types" + watch "k8s.io/apimachinery/pkg/watch" + rest "k8s.io/client-go/rest" +) + +// OpenShiftControllerManagersGetter has a method to return a OpenShiftControllerManagerInterface. +// A group's client should implement this interface. +type OpenShiftControllerManagersGetter interface { + OpenShiftControllerManagers() OpenShiftControllerManagerInterface +} + +// OpenShiftControllerManagerInterface has methods to work with OpenShiftControllerManager resources. +type OpenShiftControllerManagerInterface interface { + Create(*v1.OpenShiftControllerManager) (*v1.OpenShiftControllerManager, error) + Update(*v1.OpenShiftControllerManager) (*v1.OpenShiftControllerManager, error) + UpdateStatus(*v1.OpenShiftControllerManager) (*v1.OpenShiftControllerManager, error) + Delete(name string, options *meta_v1.DeleteOptions) error + DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error + Get(name string, options meta_v1.GetOptions) (*v1.OpenShiftControllerManager, error) + List(opts meta_v1.ListOptions) (*v1.OpenShiftControllerManagerList, error) + Watch(opts meta_v1.ListOptions) (watch.Interface, error) + Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.OpenShiftControllerManager, err error) + OpenShiftControllerManagerExpansion +} + +// openShiftControllerManagers implements OpenShiftControllerManagerInterface +type openShiftControllerManagers struct { + client rest.Interface +} + +// newOpenShiftControllerManagers returns a OpenShiftControllerManagers +func newOpenShiftControllerManagers(c *OperatorV1Client) *openShiftControllerManagers { + return &openShiftControllerManagers{ + client: c.RESTClient(), + } +} + +// Get takes name of the openShiftControllerManager, and returns the corresponding openShiftControllerManager object, and an error if there is any. +func (c *openShiftControllerManagers) Get(name string, options meta_v1.GetOptions) (result *v1.OpenShiftControllerManager, err error) { + result = &v1.OpenShiftControllerManager{} + err = c.client.Get(). + Resource("openshiftcontrollermanagers"). + Name(name). + VersionedParams(&options, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// List takes label and field selectors, and returns the list of OpenShiftControllerManagers that match those selectors. +func (c *openShiftControllerManagers) List(opts meta_v1.ListOptions) (result *v1.OpenShiftControllerManagerList, err error) { + result = &v1.OpenShiftControllerManagerList{} + err = c.client.Get(). + Resource("openshiftcontrollermanagers"). + VersionedParams(&opts, scheme.ParameterCodec). + Do(). + Into(result) + return +} + +// Watch returns a watch.Interface that watches the requested openShiftControllerManagers. +func (c *openShiftControllerManagers) Watch(opts meta_v1.ListOptions) (watch.Interface, error) { + opts.Watch = true + return c.client.Get(). + Resource("openshiftcontrollermanagers"). + VersionedParams(&opts, scheme.ParameterCodec). + Watch() +} + +// Create takes the representation of a openShiftControllerManager and creates it. Returns the server's representation of the openShiftControllerManager, and an error, if there is any. +func (c *openShiftControllerManagers) Create(openShiftControllerManager *v1.OpenShiftControllerManager) (result *v1.OpenShiftControllerManager, err error) { + result = &v1.OpenShiftControllerManager{} + err = c.client.Post(). + Resource("openshiftcontrollermanagers"). + Body(openShiftControllerManager). + Do(). + Into(result) + return +} + +// Update takes the representation of a openShiftControllerManager and updates it. Returns the server's representation of the openShiftControllerManager, and an error, if there is any. +func (c *openShiftControllerManagers) Update(openShiftControllerManager *v1.OpenShiftControllerManager) (result *v1.OpenShiftControllerManager, err error) { + result = &v1.OpenShiftControllerManager{} + err = c.client.Put(). + Resource("openshiftcontrollermanagers"). + Name(openShiftControllerManager.Name). + Body(openShiftControllerManager). + Do(). + Into(result) + return +} + +// UpdateStatus was generated because the type contains a Status member. +// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus(). + +func (c *openShiftControllerManagers) UpdateStatus(openShiftControllerManager *v1.OpenShiftControllerManager) (result *v1.OpenShiftControllerManager, err error) { + result = &v1.OpenShiftControllerManager{} + err = c.client.Put(). + Resource("openshiftcontrollermanagers"). + Name(openShiftControllerManager.Name). + SubResource("status"). + Body(openShiftControllerManager). + Do(). + Into(result) + return +} + +// Delete takes name of the openShiftControllerManager and deletes it. Returns an error if one occurs. +func (c *openShiftControllerManagers) Delete(name string, options *meta_v1.DeleteOptions) error { + return c.client.Delete(). + Resource("openshiftcontrollermanagers"). + Name(name). + Body(options). + Do(). + Error() +} + +// DeleteCollection deletes a collection of objects. +func (c *openShiftControllerManagers) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error { + return c.client.Delete(). + Resource("openshiftcontrollermanagers"). + VersionedParams(&listOptions, scheme.ParameterCodec). + Body(options). + Do(). + Error() +} + +// Patch applies the patch and returns the patched openShiftControllerManager. +func (c *openShiftControllerManagers) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.OpenShiftControllerManager, err error) { + result = &v1.OpenShiftControllerManager{} + err = c.client.Patch(pt). + Resource("openshiftcontrollermanagers"). + SubResource(subresources...). + Name(name). + Body(data). + Do(). + Into(result) + return +} diff --git a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/operator_client.go b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/operator_client.go index 7396fd29b939..10ef084fc026 100644 --- a/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/operator_client.go +++ b/vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/operator_client.go @@ -14,6 +14,7 @@ type OperatorV1Interface interface { KubeAPIServersGetter KubeControllerManagersGetter OpenShiftAPIServersGetter + OpenShiftControllerManagersGetter } // OperatorV1Client is used to interact with features provided by the operator.openshift.io group. @@ -33,6 +34,10 @@ func (c *OperatorV1Client) OpenShiftAPIServers() OpenShiftAPIServerInterface { return newOpenShiftAPIServers(c) } +func (c *OperatorV1Client) OpenShiftControllerManagers() OpenShiftControllerManagerInterface { + return newOpenShiftControllerManagers(c) +} + // NewForConfig creates a new OperatorV1Client for the given config. func NewForConfig(c *rest.Config) (*OperatorV1Client, error) { config := *c diff --git a/vendor/github.com/openshift/client-go/operator/informers/externalversions/generic.go b/vendor/github.com/openshift/client-go/operator/informers/externalversions/generic.go index f3b8a1472076..19b04e99e9cb 100644 --- a/vendor/github.com/openshift/client-go/operator/informers/externalversions/generic.go +++ b/vendor/github.com/openshift/client-go/operator/informers/externalversions/generic.go @@ -43,6 +43,8 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1().KubeControllerManagers().Informer()}, nil case v1.SchemeGroupVersion.WithResource("openshiftapiservers"): return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1().OpenShiftAPIServers().Informer()}, nil + case v1.SchemeGroupVersion.WithResource("openshiftcontrollermanagers"): + return &genericInformer{resource: resource.GroupResource(), informer: f.Operator().V1().OpenShiftControllerManagers().Informer()}, nil } diff --git a/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/interface.go b/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/interface.go index 03967fcc1d09..a3fd0019ffad 100644 --- a/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/interface.go +++ b/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/interface.go @@ -14,6 +14,8 @@ type Interface interface { KubeControllerManagers() KubeControllerManagerInformer // OpenShiftAPIServers returns a OpenShiftAPIServerInformer. OpenShiftAPIServers() OpenShiftAPIServerInformer + // OpenShiftControllerManagers returns a OpenShiftControllerManagerInformer. + OpenShiftControllerManagers() OpenShiftControllerManagerInformer } type version struct { @@ -41,3 +43,8 @@ func (v *version) KubeControllerManagers() KubeControllerManagerInformer { func (v *version) OpenShiftAPIServers() OpenShiftAPIServerInformer { return &openShiftAPIServerInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} } + +// OpenShiftControllerManagers returns a OpenShiftControllerManagerInformer. +func (v *version) OpenShiftControllerManagers() OpenShiftControllerManagerInformer { + return &openShiftControllerManagerInformer{factory: v.factory, tweakListOptions: v.tweakListOptions} +} diff --git a/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/openshiftcontrollermanager.go b/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/openshiftcontrollermanager.go new file mode 100644 index 000000000000..a205ba0ccfd1 --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/informers/externalversions/operator/v1/openshiftcontrollermanager.go @@ -0,0 +1,72 @@ +// Code generated by informer-gen. DO NOT EDIT. + +package v1 + +import ( + time "time" + + operator_v1 "github.com/openshift/api/operator/v1" + versioned "github.com/openshift/client-go/operator/clientset/versioned" + internalinterfaces "github.com/openshift/client-go/operator/informers/externalversions/internalinterfaces" + v1 "github.com/openshift/client-go/operator/listers/operator/v1" + meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" +) + +// OpenShiftControllerManagerInformer provides access to a shared informer and lister for +// OpenShiftControllerManagers. +type OpenShiftControllerManagerInformer interface { + Informer() cache.SharedIndexInformer + Lister() v1.OpenShiftControllerManagerLister +} + +type openShiftControllerManagerInformer struct { + factory internalinterfaces.SharedInformerFactory + tweakListOptions internalinterfaces.TweakListOptionsFunc +} + +// NewOpenShiftControllerManagerInformer constructs a new informer for OpenShiftControllerManager type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewOpenShiftControllerManagerInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer { + return NewFilteredOpenShiftControllerManagerInformer(client, resyncPeriod, indexers, nil) +} + +// NewFilteredOpenShiftControllerManagerInformer constructs a new informer for OpenShiftControllerManager type. +// Always prefer using an informer factory to get a shared informer instead of getting an independent +// one. This reduces memory footprint and number of connections to the server. +func NewFilteredOpenShiftControllerManagerInformer(client versioned.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer { + return cache.NewSharedIndexInformer( + &cache.ListWatch{ + ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.OperatorV1().OpenShiftControllerManagers().List(options) + }, + WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) { + if tweakListOptions != nil { + tweakListOptions(&options) + } + return client.OperatorV1().OpenShiftControllerManagers().Watch(options) + }, + }, + &operator_v1.OpenShiftControllerManager{}, + resyncPeriod, + indexers, + ) +} + +func (f *openShiftControllerManagerInformer) defaultInformer(client versioned.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer { + return NewFilteredOpenShiftControllerManagerInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions) +} + +func (f *openShiftControllerManagerInformer) Informer() cache.SharedIndexInformer { + return f.factory.InformerFor(&operator_v1.OpenShiftControllerManager{}, f.defaultInformer) +} + +func (f *openShiftControllerManagerInformer) Lister() v1.OpenShiftControllerManagerLister { + return v1.NewOpenShiftControllerManagerLister(f.Informer().GetIndexer()) +} diff --git a/vendor/github.com/openshift/client-go/operator/listers/operator/v1/expansion_generated.go b/vendor/github.com/openshift/client-go/operator/listers/operator/v1/expansion_generated.go index d03592b5638e..db349fe636b4 100644 --- a/vendor/github.com/openshift/client-go/operator/listers/operator/v1/expansion_generated.go +++ b/vendor/github.com/openshift/client-go/operator/listers/operator/v1/expansion_generated.go @@ -13,3 +13,7 @@ type KubeControllerManagerListerExpansion interface{} // OpenShiftAPIServerListerExpansion allows custom methods to be added to // OpenShiftAPIServerLister. type OpenShiftAPIServerListerExpansion interface{} + +// OpenShiftControllerManagerListerExpansion allows custom methods to be added to +// OpenShiftControllerManagerLister. +type OpenShiftControllerManagerListerExpansion interface{} diff --git a/vendor/github.com/openshift/client-go/operator/listers/operator/v1/openshiftcontrollermanager.go b/vendor/github.com/openshift/client-go/operator/listers/operator/v1/openshiftcontrollermanager.go new file mode 100644 index 000000000000..8672b72b57d7 --- /dev/null +++ b/vendor/github.com/openshift/client-go/operator/listers/operator/v1/openshiftcontrollermanager.go @@ -0,0 +1,49 @@ +// Code generated by lister-gen. DO NOT EDIT. + +package v1 + +import ( + v1 "github.com/openshift/api/operator/v1" + "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/labels" + "k8s.io/client-go/tools/cache" +) + +// OpenShiftControllerManagerLister helps list OpenShiftControllerManagers. +type OpenShiftControllerManagerLister interface { + // List lists all OpenShiftControllerManagers in the indexer. + List(selector labels.Selector) (ret []*v1.OpenShiftControllerManager, err error) + // Get retrieves the OpenShiftControllerManager from the index for a given name. + Get(name string) (*v1.OpenShiftControllerManager, error) + OpenShiftControllerManagerListerExpansion +} + +// openShiftControllerManagerLister implements the OpenShiftControllerManagerLister interface. +type openShiftControllerManagerLister struct { + indexer cache.Indexer +} + +// NewOpenShiftControllerManagerLister returns a new OpenShiftControllerManagerLister. +func NewOpenShiftControllerManagerLister(indexer cache.Indexer) OpenShiftControllerManagerLister { + return &openShiftControllerManagerLister{indexer: indexer} +} + +// List lists all OpenShiftControllerManagers in the indexer. +func (s *openShiftControllerManagerLister) List(selector labels.Selector) (ret []*v1.OpenShiftControllerManager, err error) { + err = cache.ListAll(s.indexer, selector, func(m interface{}) { + ret = append(ret, m.(*v1.OpenShiftControllerManager)) + }) + return ret, err +} + +// Get retrieves the OpenShiftControllerManager from the index for a given name. +func (s *openShiftControllerManagerLister) Get(name string) (*v1.OpenShiftControllerManager, error) { + obj, exists, err := s.indexer.GetByKey(name) + if err != nil { + return nil, err + } + if !exists { + return nil, errors.NewNotFound(v1.Resource("openshiftcontrollermanager"), name) + } + return obj.(*v1.OpenShiftControllerManager), nil +} diff --git a/vendor/github.com/openshift/client-go/project/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/project/clientset/versioned/fake/register.go index 9acfd470eee6..a5cbf77e4a58 100644 --- a/vendor/github.com/openshift/client-go/project/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/project/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + projectv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - projectv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/project/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/project/clientset/versioned/scheme/register.go index 6356d8fc0a02..7df8b81a57e0 100644 --- a/vendor/github.com/openshift/client-go/project/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/project/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + projectv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - projectv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/quota/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/quota/clientset/versioned/fake/register.go index f75ccd064465..8b8ac29cbffc 100644 --- a/vendor/github.com/openshift/client-go/quota/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/quota/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + quotav1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - quotav1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/quota/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/quota/clientset/versioned/scheme/register.go index 61720d3ba2af..3252ca3e72a1 100644 --- a/vendor/github.com/openshift/client-go/quota/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/quota/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + quotav1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - quotav1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/route/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/route/clientset/versioned/fake/register.go index 5d4e36b76af5..dc05c72a6583 100644 --- a/vendor/github.com/openshift/client-go/route/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/route/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + routev1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - routev1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/route/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/route/clientset/versioned/scheme/register.go index e49dd01ebd0b..43764772b085 100644 --- a/vendor/github.com/openshift/client-go/route/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/route/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + routev1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - routev1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/security/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/security/clientset/versioned/fake/register.go index 19683dc7614d..7f1f085b65c3 100644 --- a/vendor/github.com/openshift/client-go/security/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/security/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + securityv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - securityv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/security/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/security/clientset/versioned/scheme/register.go index 178b82812957..cc6293425025 100644 --- a/vendor/github.com/openshift/client-go/security/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/security/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + securityv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - securityv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/fake/register.go index d6bfb65bdc4a..0d27798cb6f5 100644 --- a/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + servicecertsignerv1alpha1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - servicecertsignerv1alpha1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/scheme/register.go index 0b270aa0f40e..4ab0d0776cd9 100644 --- a/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/servicecertsigner/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + servicecertsignerv1alpha1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - servicecertsignerv1alpha1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/template/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/template/clientset/versioned/fake/register.go index 9a872b142109..adbf2d46fa81 100644 --- a/vendor/github.com/openshift/client-go/template/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/template/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + templatev1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - templatev1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/template/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/template/clientset/versioned/scheme/register.go index 81597e8e9bf5..3abc2205a306 100644 --- a/vendor/github.com/openshift/client-go/template/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/template/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + templatev1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - templatev1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/client-go/user/clientset/versioned/fake/register.go b/vendor/github.com/openshift/client-go/user/clientset/versioned/fake/register.go index f6424b7e733c..a10b0ec10d35 100644 --- a/vendor/github.com/openshift/client-go/user/clientset/versioned/fake/register.go +++ b/vendor/github.com/openshift/client-go/user/clientset/versioned/fake/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var scheme = runtime.NewScheme() var codecs = serializer.NewCodecFactory(scheme) var parameterCodec = runtime.NewParameterCodec(scheme) - -func init() { - v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + userv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - userv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(scheme)) } diff --git a/vendor/github.com/openshift/client-go/user/clientset/versioned/scheme/register.go b/vendor/github.com/openshift/client-go/user/clientset/versioned/scheme/register.go index bf0ca1629566..afe1efc90edd 100644 --- a/vendor/github.com/openshift/client-go/user/clientset/versioned/scheme/register.go +++ b/vendor/github.com/openshift/client-go/user/clientset/versioned/scheme/register.go @@ -8,15 +8,14 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" + util_runtime "k8s.io/apimachinery/pkg/util/runtime" ) var Scheme = runtime.NewScheme() var Codecs = serializer.NewCodecFactory(Scheme) var ParameterCodec = runtime.NewParameterCodec(Scheme) - -func init() { - v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) - AddToScheme(Scheme) +var localSchemeBuilder = runtime.SchemeBuilder{ + userv1.AddToScheme, } // AddToScheme adds all types of this clientset into the given scheme. This allows composition @@ -29,10 +28,13 @@ func init() { // ) // // kclientset, _ := kubernetes.NewForConfig(c) -// aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) +// _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme) // // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types // correctly. -func AddToScheme(scheme *runtime.Scheme) { - userv1.AddToScheme(scheme) +var AddToScheme = localSchemeBuilder.AddToScheme + +func init() { + v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"}) + util_runtime.Must(AddToScheme(Scheme)) } diff --git a/vendor/github.com/openshift/library-go/glide.lock b/vendor/github.com/openshift/library-go/glide.lock index dee6ee5b0eaa..bdd0067d9373 100644 --- a/vendor/github.com/openshift/library-go/glide.lock +++ b/vendor/github.com/openshift/library-go/glide.lock @@ -1,5 +1,5 @@ -hash: 4706437668176d9e0adaaa2493e2642bf662086605f8cb4d1284810cbef429d3 -updated: 2019-01-22T09:54:06.750107296+01:00 +hash: c8161b3b35173fc68d50dcacf28ff2a5696159b2882ab6e47cbf28a65eaa214c +updated: 2019-01-28T11:14:07.854686283-05:00 imports: - name: bitbucket.org/ww/goautoneg version: 75cd24fc2f2c2a2088577d12123ddee5f54e0675 @@ -196,7 +196,7 @@ imports: - name: github.com/NYTimes/gziphandler version: 56545f4a5d46df9a6648819d1664c3a03a13ffdb - name: github.com/openshift/api - version: b4c87b238bcc4a218221986b8d6231b3ed9cdaa7 + version: 130a85ac529b6626098a97be326c244a6bf380b5 subpackages: - apps - apps/v1 @@ -242,7 +242,7 @@ imports: - webconsole - webconsole/v1 - name: github.com/openshift/client-go - version: 8fb54357b899c50a2c5b96408cb909818c3e25c8 + version: 1540772775fa910515f0ff094d83ef41735d470b subpackages: - config/clientset/versioned - config/clientset/versioned/fake @@ -416,7 +416,7 @@ imports: - storage/v1alpha1 - storage/v1beta1 - name: k8s.io/apiextensions-apiserver - version: 853f76028711219c2fc251fd5184f23fd44a7aa0 + version: a384d17938fe55d54a52d5668bf0ff40044daef0 subpackages: - pkg/apis/apiextensions - pkg/apis/apiextensions/v1beta1 @@ -475,7 +475,7 @@ imports: - third_party/forked/golang/json - third_party/forked/golang/reflect - name: k8s.io/apiserver - version: 9601a7bf41efece7e12a8f9f74d2c3b10cdd998e + version: a748535592ba957da14f6279ebd43cfb2fe44463 subpackages: - pkg/admission - pkg/admission/configuration @@ -571,7 +571,7 @@ imports: - plugin/pkg/authenticator/token/webhook - plugin/pkg/authorizer/webhook - name: k8s.io/client-go - version: 5e6a3d4e34f694e895b13ae728111e726a5b69df + version: 701b913670036511e3d752318272c97f1a2a2edd subpackages: - discovery - discovery/fake @@ -743,7 +743,7 @@ imports: - util/retry - util/workqueue - name: k8s.io/kube-aggregator - version: e95ebe3de8a24c3da1ad7606ca5a2444a64f4c82 + version: 4764f3a1991175f477682bbba516e97fab77b19f subpackages: - pkg/apis/apiregistration - pkg/apis/apiregistration/v1 diff --git a/vendor/github.com/openshift/library-go/glide.yaml b/vendor/github.com/openshift/library-go/glide.yaml index e6f306f5fd36..c2d8c3b121ad 100644 --- a/vendor/github.com/openshift/library-go/glide.yaml +++ b/vendor/github.com/openshift/library-go/glide.yaml @@ -1,17 +1,17 @@ package: github.com/openshift/library-go import: - package: k8s.io/apimachinery - version: kubernetes-1.12.4 + version: kubernetes-1.12.5 - package: k8s.io/api - version: kubernetes-1.12.4 + version: kubernetes-1.12.5 - package: k8s.io/apiserver - version: kubernetes-1.12.4 + version: kubernetes-1.12.5 - package: k8s.io/apiextensions-apiserver - version: kubernetes-1.12.4 + version: kubernetes-1.12.5 - package: k8s.io/kube-aggregator - version: kubernetes-1.12.4 + version: kubernetes-1.12.5 - package: k8s.io/client-go - version: kubernetes-1.12.4 + version: kubernetes-1.12.5 - package: github.com/openshift/api version: master - package: github.com/openshift/client-go diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller.go index 6d64d850d58e..3c969906ae9b 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller.go @@ -36,7 +36,7 @@ const ( // (templated with the config) if they differ. type BackingResourceController struct { targetNamespace string - operatorConfigClient v1helpers.StaticPodOperatorClient + operatorConfigClient v1helpers.OperatorClient saListerSynced cache.InformerSynced saLister corelisterv1.ServiceAccountLister @@ -54,7 +54,7 @@ type BackingResourceController struct { // NewBackingResourceController creates a new backing resource controller. func NewBackingResourceController( targetNamespace string, - operatorConfigClient v1helpers.StaticPodOperatorClient, + operatorConfigClient v1helpers.OperatorClient, kubeInformersForTargetNamespace informers.SharedInformerFactory, kubeClient kubernetes.Interface, eventRecorder events.Recorder, @@ -92,7 +92,7 @@ func (c BackingResourceController) mustTemplateAsset(name string) ([]byte, error } func (c BackingResourceController) sync() error { - operatorSpec, _, _, err := c.operatorConfigClient.GetStaticPodOperatorState() + operatorSpec, _, _, err := c.operatorConfigClient.GetOperatorState() if err != nil { return err } @@ -128,7 +128,7 @@ func (c BackingResourceController) sync() error { cond.Reason = "Error" cond.Message = err.Error() } - if _, _, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, v1helpers.UpdateStaticPodConditionFn(cond)); updateError != nil { + if _, _, updateError := v1helpers.UpdateStatus(c.operatorConfigClient, v1helpers.UpdateConditionFn(cond)); updateError != nil { if err == nil { return updateError } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller_test.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller_test.go index 9d8dd5853ab1..f539655a0796 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller_test.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource/backing_resource_controller_test.go @@ -39,22 +39,21 @@ type prependReactorSpec struct { func TestBackingResourceController(t *testing.T) { tests := []struct { - targetNamespace string - prependReactors []prependReactorSpec - startingObjects []runtime.Object - staticPodOperatorClient v1helpers.StaticPodOperatorClient - validateActions func(t *testing.T, actions []clienttesting.Action) - validateStatus func(t *testing.T, status *operatorv1.StaticPodOperatorStatus) - expectSyncError string + targetNamespace string + prependReactors []prependReactorSpec + startingObjects []runtime.Object + operatorClient v1helpers.OperatorClient + validateActions func(t *testing.T, actions []clienttesting.Action) + validateStatus func(t *testing.T, status *operatorv1.OperatorStatus) + expectSyncError string }{ { targetNamespace: "successful-create", - staticPodOperatorClient: v1helpers.NewFakeStaticPodOperatorClient( + operatorClient: v1helpers.NewFakeOperatorClient( &operatorv1.OperatorSpec{ ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, - &operatorv1.StaticPodOperatorStatus{}, nil, ), validateActions: func(t *testing.T, actions []clienttesting.Action) { @@ -91,12 +90,11 @@ func TestBackingResourceController(t *testing.T) { }, { targetNamespace: "operator-unmanaged", - staticPodOperatorClient: v1helpers.NewFakeStaticPodOperatorClient( + operatorClient: v1helpers.NewFakeOperatorClient( &operatorv1.OperatorSpec{ ManagementState: operatorv1.Unmanaged, }, &operatorv1.OperatorStatus{}, - &operatorv1.StaticPodOperatorStatus{}, nil, ), validateActions: func(t *testing.T, actions []clienttesting.Action) { @@ -111,12 +109,11 @@ func TestBackingResourceController(t *testing.T) { startingObjects: []runtime.Object{ &v1.ServiceAccount{ObjectMeta: metav1.ObjectMeta{Name: "installer-sa", Namespace: "service-account-exists"}}, }, - staticPodOperatorClient: v1helpers.NewFakeStaticPodOperatorClient( + operatorClient: v1helpers.NewFakeOperatorClient( &operatorv1.OperatorSpec{ ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, - &operatorv1.StaticPodOperatorStatus{}, nil, ), validateActions: func(t *testing.T, actions []clienttesting.Action) { @@ -148,16 +145,15 @@ func TestBackingResourceController(t *testing.T) { }, }, }, - staticPodOperatorClient: v1helpers.NewFakeStaticPodOperatorClient( + operatorClient: v1helpers.NewFakeOperatorClient( &operatorv1.OperatorSpec{ ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, - &operatorv1.StaticPodOperatorStatus{}, nil, ), expectSyncError: `test error`, - validateStatus: func(t *testing.T, status *operatorv1.StaticPodOperatorStatus) { + validateStatus: func(t *testing.T, status *operatorv1.OperatorStatus) { if status.Conditions[0].Type != operatorStatusBackingResourceControllerFailing { t.Errorf("expected status condition to be failing, got %v", status.Conditions[0].Type) } @@ -180,14 +176,14 @@ func TestBackingResourceController(t *testing.T) { eventRecorder := events.NewInMemoryRecorder("") c := NewBackingResourceController( tc.targetNamespace, - tc.staticPodOperatorClient, + tc.operatorClient, informers.NewSharedInformerFactoryWithOptions(kubeClient, 1*time.Minute, informers.WithNamespace(tc.targetNamespace)), kubeClient, eventRecorder, ) syncErr := c.sync() if tc.validateStatus != nil { - _, status, _, _ := tc.staticPodOperatorClient.GetStaticPodOperatorState() + _, status, _, _ := tc.operatorClient.GetOperatorState() tc.validateStatus(t, status) } if syncErr != nil { diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/bindata/bindata.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/bindata/bindata.go index 4cc6f17bd844..2600f619ff58 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/bindata/bindata.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/bindata/bindata.go @@ -74,6 +74,9 @@ spec: limits: memory: 100M restartPolicy: Never + priorityClassName: system-node-critical + tolerations: + - operator: "Exists" securityContext: runAsUser: 0 volumes: diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go index 2009bffe1c19..b4c4bfa1da31 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller.go @@ -33,6 +33,7 @@ import ( const ( operatorStatusInstallerControllerFailing = "InstallerControllerFailing" + nodeInstallerFailing = "NodeInstallerFailing" installerControllerWorkQueueKey = "key" manifestDir = "pkg/operator/staticpod/controller/installer" manifestInstallerPodPath = "manifests/installer-pod.yaml" @@ -184,7 +185,7 @@ func nodeToStartRevisionWith(getStaticPodState func(nodeName string) (state stat // manageInstallationPods takes care of creating content for the static pods to install. // returns whether or not requeue and if an error happened when updating status. Normally it updates status itself. -func (c *InstallerController) manageInstallationPods(operatorSpec *operatorv1.OperatorSpec, originalOperatorStatus *operatorv1.StaticPodOperatorStatus, resourceVersion string) (bool, error) { +func (c *InstallerController) manageInstallationPods(operatorSpec *operatorv1.StaticPodOperatorSpec, originalOperatorStatus *operatorv1.StaticPodOperatorStatus, resourceVersion string) (bool, error) { operatorStatus := originalOperatorStatus.DeepCopy() if len(operatorStatus.NodeStatuses) == 0 { @@ -226,7 +227,7 @@ func (c *InstallerController) manageInstallationPods(operatorSpec *operatorv1.Op // it's an extra write/read, but it makes the state debuggable from outside this process if !equality.Semantic.DeepEqual(newCurrNodeState, currNodeState) { glog.Infof("%q moving to %v", currNodeState.NodeName, spew.Sdump(*newCurrNodeState)) - newOperatorStatus, updated, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, setNodeStatusFn(newCurrNodeState), setAvailableProgressingConditions) + newOperatorStatus, updated, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, setNodeStatusFn(newCurrNodeState), setAvailableProgressingNodeInstallerFailingConditions) if updateError != nil { return false, updateError } else if updated && currNodeState.CurrentRevision != newCurrNodeState.CurrentRevision { @@ -259,7 +260,7 @@ func (c *InstallerController) manageInstallationPods(operatorSpec *operatorv1.Op // it's an extra write/read, but it makes the state debuggable from outside this process if !equality.Semantic.DeepEqual(newCurrNodeState, currNodeState) { glog.Infof("%q moving to %v", currNodeState.NodeName, spew.Sdump(*newCurrNodeState)) - if _, updated, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, setNodeStatusFn(newCurrNodeState), setAvailableProgressingConditions); updateError != nil { + if _, updated, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, setNodeStatusFn(newCurrNodeState), setAvailableProgressingNodeInstallerFailingConditions); updateError != nil { return false, updateError } else if updated && currNodeState.TargetRevision != newCurrNodeState.TargetRevision && newCurrNodeState.TargetRevision != 0 { c.eventRecorder.Eventf("NodeTargetRevisionChanged", "Updating node %q from revision %d to %d", currNodeState.NodeName, @@ -293,16 +294,17 @@ func (c *InstallerController) updateRevisionStatus(operatorStatus *operatorv1.St return c.updateConfigMapForRevision(failedRevisions, string(corev1.PodFailed)) } -func (c *InstallerController) updateConfigMapForRevision(currentRevisions map[int32]struct{}, phase string) error { +func (c *InstallerController) updateConfigMapForRevision(currentRevisions map[int32]struct{}, status string) error { for currentRevision := range currentRevisions { statusConfigMap, err := c.kubeClient.CoreV1().ConfigMaps(c.targetNamespace).Get(statusConfigMapNameForRevision(currentRevision), metav1.GetOptions{}) if apierrors.IsNotFound(err) { - return nil + glog.Infof("%s configmap not found, skipping update revision status", statusConfigMapNameForRevision(currentRevision)) + continue } if err != nil { return err } - statusConfigMap.Data["phase"] = phase + statusConfigMap.Data["status"] = status _, _, err = resourceapply.ApplyConfigMap(c.kubeClient.CoreV1(), c.eventRecorder, statusConfigMap) if err != nil { return err @@ -324,16 +326,26 @@ func setNodeStatusFn(status *operatorv1.NodeStatus) v1helpers.UpdateStaticPodSta } // setAvailableProgressingConditions sets the Available and Progressing conditions -func setAvailableProgressingConditions(newStatus *operatorv1.StaticPodOperatorStatus) error { +func setAvailableProgressingNodeInstallerFailingConditions(newStatus *operatorv1.StaticPodOperatorStatus) error { // Available means that we have at least one pod at the latest level numAvailable := 0 numAtLatestRevision := 0 numProgressing := 0 counts := map[int32]int{} + failingCount := map[int32]int{} + failing := map[int32][]string{} for _, currNodeStatus := range newStatus.NodeStatuses { if currNodeStatus.CurrentRevision != 0 { numAvailable++ } + + // keep track of failures so that we can report failing status + if currNodeStatus.LastFailedRevision != 0 { + existing := failingCount[currNodeStatus.CurrentRevision] + failingCount[currNodeStatus.CurrentRevision] = existing + 1 + failing[currNodeStatus.LastFailedRevision] = append(failing[currNodeStatus.LastFailedRevision], currNodeStatus.LastFailedRevisionErrors...) + } + existing := counts[currNodeStatus.CurrentRevision] counts[currNodeStatus.CurrentRevision] = existing + 1 @@ -381,6 +393,26 @@ func setAvailableProgressingConditions(newStatus *operatorv1.StaticPodOperatorSt }) } + if len(failing) > 0 { + failingStrings := []string{} + for failingRevision, errorStrings := range failing { + failingStrings = append(failingStrings, fmt.Sprintf("%d nodes are failing on revision %d:\n%v", failingCount[failingRevision], failingRevision, strings.Join(errorStrings, "\n"))) + } + failingDescription := strings.Join(failingStrings, "; ") + + v1helpers.SetOperatorCondition(&newStatus.Conditions, operatorv1.OperatorCondition{ + Type: nodeInstallerFailing, + Status: operatorv1.ConditionTrue, + Reason: "InstallerPodFailed", + Message: failingDescription, + }) + } else { + v1helpers.SetOperatorCondition(&newStatus.Conditions, operatorv1.OperatorCondition{ + Type: nodeInstallerFailing, + Status: operatorv1.ConditionFalse, + }) + } + return nil } @@ -486,7 +518,7 @@ func getInstallerPodName(revision int32, nodeName string) string { } // ensureInstallerPod creates the installer pod with the secrets required to if it does not exist already -func (c *InstallerController) ensureInstallerPod(nodeName string, operatorSpec *operatorv1.OperatorSpec, revision int32) error { +func (c *InstallerController) ensureInstallerPod(nodeName string, operatorSpec *operatorv1.StaticPodOperatorSpec, revision int32) error { pod := resourceread.ReadPodV1OrDie(bindata.MustAsset(filepath.Join(manifestDir, manifestInstallerPodPath))) pod.Namespace = c.targetNamespace @@ -495,6 +527,21 @@ func (c *InstallerController) ensureInstallerPod(nodeName string, operatorSpec * pod.Spec.Containers[0].Image = c.installerPodImageFn() pod.Spec.Containers[0].Command = c.command + statusConfigMap, err := c.kubeClient.CoreV1().ConfigMaps(c.targetNamespace).Get(fmt.Sprintf("revision-status-%d", revision), metav1.GetOptions{}) + if err != nil { + if !apierrors.IsNotFound(err) { + return err + } + glog.Infof("couldn't set revision status configmap as owner for installer pod revision %d: %v", revision, err) + } else { + pod.OwnerReferences = []metav1.OwnerReference{{ + APIVersion: "v1", + Kind: "ConfigMap", + Name: statusConfigMap.Name, + UID: statusConfigMap.UID, + }} + } + if c.configMaps[0].Optional { return fmt.Errorf("pod configmap %s is required, cannot be optional", c.configMaps[0].Name) } @@ -522,7 +569,7 @@ func (c *InstallerController) ensureInstallerPod(nodeName string, operatorSpec * } pod.Spec.Containers[0].Args = args - _, _, err := resourceapply.ApplyPod(c.kubeClient.CoreV1(), c.eventRecorder, pod) + _, _, err = resourceapply.ApplyPod(c.kubeClient.CoreV1(), c.eventRecorder, pod) return err } @@ -560,7 +607,7 @@ func (c InstallerController) sync() error { cond.Reason = "Error" cond.Message = err.Error() } - if _, _, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, v1helpers.UpdateStaticPodConditionFn(cond), setAvailableProgressingConditions); updateError != nil { + if _, _, updateError := v1helpers.UpdateStaticPodStatus(c.operatorConfigClient, v1helpers.UpdateStaticPodConditionFn(cond), setAvailableProgressingNodeInstallerFailingConditions); updateError != nil { if err == nil { return updateError } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller_test.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller_test.go index a3e6446bb9d8..f9a460df81db 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller_test.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/installer_controller_test.go @@ -45,6 +45,11 @@ func TestNewNodeStateForInstallInProgress(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -251,6 +256,11 @@ func TestCreateInstallerPod(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -411,6 +421,11 @@ func TestEnsureInstallerPod(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -670,6 +685,11 @@ func TestCreateInstallerPodMultiNode(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: test.latestAvailableRevision, NodeStatuses: test.nodeStatuses, @@ -737,7 +757,7 @@ func TestInstallerController_manageInstallationPods(t *testing.T) { installerPodImageFn func() string } type args struct { - operatorSpec *operatorv1.OperatorSpec + operatorSpec *operatorv1.StaticPodOperatorSpec originalOperatorStatus *operatorv1.StaticPodOperatorStatus resourceVersion string } @@ -948,29 +968,36 @@ func TestSetConditions(t *testing.T) { type TestCase struct { name string latestAvailableRevision int32 + lastFailedRevision int32 currentRevisions []int32 expectedAvailableStatus operatorv1.ConditionStatus expectedProgressingStatus operatorv1.ConditionStatus + expectedFailingStatus operatorv1.ConditionStatus } - testCase := func(name string, available, progressing bool, latest int32, current ...int32) TestCase { + testCase := func(name string, available, progressing, failed bool, lastFailedRevision, latest int32, current ...int32) TestCase { availableStatus := operatorv1.ConditionFalse pendingStatus := operatorv1.ConditionFalse + expectedFailingStatus := operatorv1.ConditionFalse if available { availableStatus = operatorv1.ConditionTrue } if progressing { pendingStatus = operatorv1.ConditionTrue } - return TestCase{name, latest, current, availableStatus, pendingStatus} + if failed { + expectedFailingStatus = operatorv1.ConditionTrue + } + return TestCase{name, latest, lastFailedRevision, current, availableStatus, pendingStatus, expectedFailingStatus} } testCases := []TestCase{ - testCase("AvailableProgressing", true, true, 2, 2, 1, 2, 1), - testCase("AvailableNotProgressing", true, false, 2, 2, 2, 2), - testCase("NotAvailableProgressing", false, true, 2, 0, 0), - testCase("NotAvailableAtOldLevelProgressing", true, true, 2, 1, 1), - testCase("NotAvailableNotProgressing", false, false, 2), + testCase("AvailableProgressingFailing", true, true, true, 1, 2, 2, 1, 2, 1), + testCase("AvailableProgressing", true, true, false, 0, 2, 2, 1, 2, 1), + testCase("AvailableNotProgressing", true, false, false, 0, 2, 2, 2, 2), + testCase("NotAvailableProgressing", false, true, false, 0, 2, 0, 0), + testCase("NotAvailableAtOldLevelProgressing", true, true, false, 0, 2, 1, 1), + testCase("NotAvailableNotProgressing", false, false, false, 0, 2), } for _, tc := range testCases { @@ -979,21 +1006,30 @@ func TestSetConditions(t *testing.T) { LatestAvailableRevision: tc.latestAvailableRevision, } for _, current := range tc.currentRevisions { - status.NodeStatuses = append(status.NodeStatuses, operatorv1.NodeStatus{CurrentRevision: current}) + status.NodeStatuses = append(status.NodeStatuses, operatorv1.NodeStatus{CurrentRevision: current, LastFailedRevision: tc.lastFailedRevision}) } - setAvailableProgressingConditions(status) + setAvailableProgressingNodeInstallerFailingConditions(status) + availableCondition := v1helpers.FindOperatorCondition(status.Conditions, operatorv1.OperatorStatusTypeAvailable) if availableCondition == nil { t.Error("Available condition: not found") } else if availableCondition.Status != tc.expectedAvailableStatus { t.Errorf("Available condition: expected status %v, actual status %v", tc.expectedAvailableStatus, availableCondition.Status) } + pendingCondition := v1helpers.FindOperatorCondition(status.Conditions, operatorv1.OperatorStatusTypeProgressing) if pendingCondition == nil { t.Error("Progressing condition: not found") } else if pendingCondition.Status != tc.expectedProgressingStatus { t.Errorf("Progressing condition: expected status %v, actual status %v", tc.expectedProgressingStatus, pendingCondition.Status) } + + failingCondition := v1helpers.FindOperatorCondition(status.Conditions, nodeInstallerFailing) + if failingCondition == nil { + t.Error("Failing condition: not found") + } else if failingCondition.Status != tc.expectedFailingStatus { + t.Errorf("Failing condition: expected status %v, actual status %v", tc.expectedFailingStatus, failingCondition.Status) + } }) } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/manifests/installer-pod.yaml b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/manifests/installer-pod.yaml index f1b2b5ed57f5..50d0c0cf8ae6 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/manifests/installer-pod.yaml +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/installer/manifests/installer-pod.yaml @@ -27,6 +27,9 @@ spec: limits: memory: 100M restartPolicy: Never + priorityClassName: system-node-critical + tolerations: + - operator: "Exists" securityContext: runAsUser: 0 volumes: diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/monitoring/monitoring_resource_controller_test.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/monitoring/monitoring_resource_controller_test.go index df29b2588ad2..cbef43f34b6f 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/monitoring/monitoring_resource_controller_test.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/monitoring/monitoring_resource_controller_test.go @@ -62,6 +62,11 @@ func TestNewMonitoringResourcesController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{}, nil, ), @@ -93,6 +98,11 @@ func TestNewMonitoringResourcesController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{}, nil, ), diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/node/node_controller_test.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/node/node_controller_test.go index e3cffaa3101a..4309e7951da7 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/node/node_controller_test.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/node/node_controller_test.go @@ -109,6 +109,11 @@ func TestNewNodeController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: test.startNodeStatus, diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/bindata/bindata.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/bindata/bindata.go index ca47815f7b67..8ebae4237d8c 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/bindata/bindata.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/bindata/bindata.go @@ -69,6 +69,9 @@ spec: - mountPath: /etc/kubernetes/ name: kubelet-dir restartPolicy: Never + priorityClassName: system-node-critical + tolerations: + - operator: "Exists" securityContext: runAsUser: 0 volumes: diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/manifests/pruner-pod.yaml b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/manifests/pruner-pod.yaml index 89d9a167f724..e7948d9917d3 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/manifests/pruner-pod.yaml +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/manifests/pruner-pod.yaml @@ -22,6 +22,9 @@ spec: - mountPath: /etc/kubernetes/ name: kubelet-dir restartPolicy: Never + priorityClassName: system-node-critical + tolerations: + - operator: "Exists" securityContext: runAsUser: 0 volumes: diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller.go index 1d332e92790d..46474d71312b 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller.go @@ -31,9 +31,7 @@ import ( // PruneController is a controller that watches static installer pod revision statuses and spawns // a pruner pod to delete old revision resources from disk type PruneController struct { - targetNamespace, podResourcePrefix string - failedRevisionLimit, succeededRevisionLimit int - + targetNamespace, podResourcePrefix string // command is the string to use for the pruning pod command command []string // queue only ever has one item, but it has nice error handling backoff/retry semantics @@ -53,6 +51,7 @@ type PruneController struct { const ( pruneControllerWorkQueueKey = "key" statusConfigMapName = "revision-status-" + defaultRevisionLimit = int32(5) ) // NewPruneController creates a new pruning controller @@ -67,11 +66,9 @@ func NewPruneController( eventRecorder events.Recorder, ) *PruneController { c := &PruneController{ - targetNamespace: targetNamespace, - podResourcePrefix: podResourcePrefix, - command: command, - failedRevisionLimit: 5, - succeededRevisionLimit: 5, + targetNamespace: targetNamespace, + podResourcePrefix: podResourcePrefix, + command: command, operatorConfigClient: operatorConfigClient, configMapGetter: configMapGetter, @@ -88,7 +85,19 @@ func NewPruneController( return c } -func (c *PruneController) excludedRevisionHistory(operatorStatus *operatorv1.StaticPodOperatorStatus) ([]int, error) { +func getRevisionLimits(operatorSpec *operatorv1.StaticPodOperatorSpec) (int32, int32) { + failedRevisionLimit := defaultRevisionLimit + succeededRevisionLimit := defaultRevisionLimit + if operatorSpec.FailedRevisionLimit != 0 { + failedRevisionLimit = operatorSpec.FailedRevisionLimit + } + if operatorSpec.SucceededRevisionLimit != 0 { + succeededRevisionLimit = operatorSpec.SucceededRevisionLimit + } + return failedRevisionLimit, succeededRevisionLimit +} + +func (c *PruneController) excludedRevisionHistory(operatorStatus *operatorv1.StaticPodOperatorStatus, failedRevisionLimit, succeededRevisionLimit int32) ([]int, error) { var succeededRevisionIDs, failedRevisionIDs, inProgressRevisionIDs, unknownStatusRevisionIDs []int configMaps, err := c.configMapGetter.ConfigMaps(c.targetNamespace).List(metav1.ListOptions{}) @@ -118,21 +127,21 @@ func (c *PruneController) excludedRevisionHistory(operatorStatus *operatorv1.Sta default: // protect things you don't understand unknownStatusRevisionIDs = append(unknownStatusRevisionIDs, revisionID) - c.eventRecorder.Event("UnknownRevisionStatus", fmt.Sprintf("unknown status for revision %d: %v", revisionID, configMap.Data["phase"])) + c.eventRecorder.Event("UnknownRevisionStatus", fmt.Sprintf("unknown status for revision %d: %v", revisionID, configMap.Data["status"])) } } } // Return early if nothing to prune if len(succeededRevisionIDs)+len(failedRevisionIDs) == 0 { - return []int{}, nil + return []int{}, fmt.Errorf("no revision IDs currently eligible to prune") } // Get list of protected IDs - protectedSucceededRevisionIDs := protectedIDs(succeededRevisionIDs, c.succeededRevisionLimit) - protectedFailedRevisionIDs := protectedIDs(failedRevisionIDs, c.failedRevisionLimit) + protectedSucceededRevisionIDs := protectedIDs(succeededRevisionIDs, int(succeededRevisionLimit)) + protectedFailedRevisionIDs := protectedIDs(failedRevisionIDs, int(failedRevisionLimit)) - excludedIDs := make([]int, 0, len(protectedSucceededRevisionIDs)+len(protectedFailedRevisionIDs)) + excludedIDs := make([]int, 0, len(protectedSucceededRevisionIDs)+len(protectedFailedRevisionIDs)+len(inProgressRevisionIDs)+len(unknownStatusRevisionIDs)) excludedIDs = append(excludedIDs, protectedSucceededRevisionIDs...) excludedIDs = append(excludedIDs, protectedFailedRevisionIDs...) excludedIDs = append(excludedIDs, inProgressRevisionIDs...) @@ -163,6 +172,10 @@ func (c *PruneController) pruneAPIResources(excludedIDs []int, maxEligibleRevisi return err } for _, cm := range statusConfigMaps.Items { + if !strings.HasPrefix(cm.Name, statusConfigMapName) { + continue + } + revision, err := strconv.Atoi(cm.Data["revision"]) if err != nil { return fmt.Errorf("unexpected error converting revision to int: %+v", err) @@ -187,6 +200,7 @@ func protectedIDs(revisionIDs []int, revisionLimit int) []int { return revisionIDs } startKey := 0 + // We use -1 = unlimited revisions, so protect all. Limit shouldn't ever be literally 0 either if revisionLimit > 0 && len(revisionIDs) > revisionLimit { startKey = len(revisionIDs) - revisionLimit } @@ -268,12 +282,13 @@ func (c *PruneController) processNextWorkItem() bool { } func (c *PruneController) sync() error { - _, operatorStatus, _, err := c.operatorConfigClient.GetStaticPodOperatorState() + operatorSpec, operatorStatus, _, err := c.operatorConfigClient.GetStaticPodOperatorState() if err != nil { return err } + failedLimit, succeededLimit := getRevisionLimits(operatorSpec) - excludedIDs, err := c.excludedRevisionHistory(operatorStatus) + excludedIDs, err := c.excludedRevisionHistory(operatorStatus, failedLimit, succeededLimit) if err != nil { return err } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller_test.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller_test.go index 0273ac367c1d..fe1be0cae8bd 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller_test.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/prune/prune_controller_test.go @@ -27,8 +27,8 @@ func TestPruneAPIResources(t *testing.T) { tests := []struct { name string targetNamespace string - failedLimit int - succeededLimit int + failedLimit int32 + succeededLimit int32 currentRevision int configMaps []configMapInfo testSecrets []string @@ -128,6 +128,52 @@ func TestPruneAPIResources(t *testing.T) { }, }, }, + { + name: "protects all with unlimited revisions", + targetNamespace: "prune-api", + startingObjects: []runtime.Object{ + &v1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "revision-status-1", Namespace: "prune-api"}, + Data: map[string]string{ + "status": string(v1.PodSucceeded), + "revision": "1", + }, + }, + &v1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "revision-status-2", Namespace: "prune-api"}, + Data: map[string]string{ + "status": string(v1.PodSucceeded), + "revision": "2", + }, + }, + &v1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "revision-status-3", Namespace: "prune-api"}, + Data: map[string]string{ + "status": string(v1.PodSucceeded), + "revision": "3", + }, + }, + }, + failedLimit: -1, + succeededLimit: -1, + expectedObjects: []runtime.Object{ + &v1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "revision-status-1", Namespace: "prune-api"}, + Data: map[string]string{ + "status": string(v1.PodSucceeded), + "revision": "1", + }, + }, + &v1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "revision-status-2", Namespace: "prune-api"}, + Data: map[string]string{ + "status": string(v1.PodSucceeded), + "revision": "2", + }, + }, + &v1.ConfigMap{ObjectMeta: metav1.ObjectMeta{Name: "revision-status-3", Namespace: "prune-api"}, + Data: map[string]string{ + "status": string(v1.PodSucceeded), + "revision": "3", + }, + }, + }, + }, } for _, tc := range tests { kubeClient := fake.NewSimpleClientset(tc.startingObjects...) @@ -136,6 +182,13 @@ func TestPruneAPIResources(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + FailedRevisionLimit: tc.failedLimit, + SucceededRevisionLimit: tc.succeededLimit, + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -162,20 +215,24 @@ func TestPruneAPIResources(t *testing.T) { } c := &PruneController{ - targetNamespace: tc.targetNamespace, - podResourcePrefix: "test-pod", - command: []string{"/bin/true"}, - configMapGetter: kubeClient.CoreV1(), - secretGetter: kubeClient.CoreV1(), - podGetter: kubeClient.CoreV1(), - eventRecorder: eventRecorder, - operatorConfigClient: fakeStaticPodOperatorClient, - failedRevisionLimit: tc.failedLimit, - succeededRevisionLimit: tc.succeededLimit, + targetNamespace: tc.targetNamespace, + podResourcePrefix: "test-pod", + command: []string{"/bin/true"}, + configMapGetter: kubeClient.CoreV1(), + secretGetter: kubeClient.CoreV1(), + podGetter: kubeClient.CoreV1(), + eventRecorder: eventRecorder, + operatorConfigClient: fakeStaticPodOperatorClient, } c.prunerPodImageFn = func() string { return "docker.io/foo/bar" } - excludedIDs, err := c.excludedRevisionHistory(operatorStatus) + operatorSpec, _, _, err := c.operatorConfigClient.GetStaticPodOperatorState() + if err != nil { + t.Fatalf("unexpected error %q", err) + } + failedLimit, succeededLimit := getRevisionLimits(operatorSpec) + + excludedIDs, err := c.excludedRevisionHistory(operatorStatus, failedLimit, succeededLimit) if err != nil { t.Fatalf("unexpected error %q", err) } @@ -196,8 +253,8 @@ func TestPruneAPIResources(t *testing.T) { func TestPruneDiskResources(t *testing.T) { tests := []struct { name string - failedLimit int - succeededLimit int + failedLimit int32 + succeededLimit int32 maxEligibleID int protectedIDs string configMaps []configMapInfo @@ -276,7 +333,6 @@ func TestPruneDiskResources(t *testing.T) { maxEligibleID: 2, protectedIDs: "1,2", }, - { name: "handles revisions of only one type of phase", configMaps: []configMapInfo{ @@ -298,6 +354,27 @@ func TestPruneDiskResources(t *testing.T) { failedLimit: 1, succeededLimit: 1, }, + { + name: "protects all with unlimited revisions", + configMaps: []configMapInfo{ + { + name: "revision-status-1", + namespace: "test", + revision: "1", + phase: string(v1.PodSucceeded), + }, + { + name: "revision-status-2", + namespace: "test", + revision: "2", + phase: string(v1.PodSucceeded), + }, + }, + maxEligibleID: 2, + protectedIDs: "2", + failedLimit: 1, + succeededLimit: 1, + }, } for _, test := range tests { @@ -318,6 +395,13 @@ func TestPruneDiskResources(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + FailedRevisionLimit: test.failedLimit, + SucceededRevisionLimit: test.succeededLimit, + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -344,20 +428,24 @@ func TestPruneDiskResources(t *testing.T) { } c := &PruneController{ - targetNamespace: "test", - podResourcePrefix: "test-pod", - command: []string{"/bin/true"}, - configMapGetter: kubeClient.CoreV1(), - secretGetter: kubeClient.CoreV1(), - podGetter: kubeClient.CoreV1(), - eventRecorder: eventRecorder, - operatorConfigClient: fakeStaticPodOperatorClient, - failedRevisionLimit: test.failedLimit, - succeededRevisionLimit: test.succeededLimit, + targetNamespace: "test", + podResourcePrefix: "test-pod", + command: []string{"/bin/true"}, + configMapGetter: kubeClient.CoreV1(), + secretGetter: kubeClient.CoreV1(), + podGetter: kubeClient.CoreV1(), + eventRecorder: eventRecorder, + operatorConfigClient: fakeStaticPodOperatorClient, } c.prunerPodImageFn = func() string { return "docker.io/foo/bar" } - excludedIDs, err := c.excludedRevisionHistory(operatorStatus) + operatorSpec, _, _, err := c.operatorConfigClient.GetStaticPodOperatorState() + if err != nil { + t.Fatalf("unexpected error %q", err) + } + failedLimit, succeededLimit := getRevisionLimits(operatorSpec) + + excludedIDs, err := c.excludedRevisionHistory(operatorStatus, failedLimit, succeededLimit) if err != nil { t.Fatalf("unexpected error %q", err) } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller.go index 4dfbaa45731b..05ade1259baf 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller.go @@ -85,7 +85,7 @@ func NewRevisionController( // createRevisionIfNeeded takes care of creating content for the static pods to use. // returns whether or not requeue and if an error happened when updating status. Normally it updates status itself. -func (c RevisionController) createRevisionIfNeeded(operatorSpec *operatorv1.OperatorSpec, operatorStatusOriginal *operatorv1.StaticPodOperatorStatus, resourceVersion string) (bool, error) { +func (c RevisionController) createRevisionIfNeeded(operatorSpec *operatorv1.StaticPodOperatorSpec, operatorStatusOriginal *operatorv1.StaticPodOperatorStatus, resourceVersion string) (bool, error) { operatorStatus := operatorStatusOriginal.DeepCopy() latestRevision := operatorStatus.LatestAvailableRevision @@ -153,7 +153,7 @@ func (c RevisionController) isLatestRevisionCurrent(revision int32) (bool, strin existingData = existing.Data } if !equality.Semantic.DeepEqual(existingData, requiredData) { - return false, fmt.Sprintf("configmap/%s has changed", required.Name) + return false, fmt.Sprintf("configmap/%s has changed", cm.Name) } } for _, s := range c.secrets { @@ -175,7 +175,7 @@ func (c RevisionController) isLatestRevisionCurrent(revision int32) (bool, strin existingData = existing.Data } if !equality.Semantic.DeepEqual(existingData, requiredData) { - return false, fmt.Sprintf("secret/%s has changed", required.Name) + return false, fmt.Sprintf("secret/%s has changed", s.Name) } } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller_test.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller_test.go index c44bc769a680..996dcaa349b9 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller_test.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controller/revision/revision_controller_test.go @@ -56,6 +56,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Unmanaged, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Unmanaged, + }, + }, &operatorv1.StaticPodOperatorStatus{}, nil, ), @@ -74,6 +79,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -109,6 +119,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 0, NodeStatuses: []operatorv1.NodeStatus{ @@ -174,6 +189,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 0, NodeStatuses: []operatorv1.NodeStatus{ @@ -251,6 +271,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 0, NodeStatuses: []operatorv1.NodeStatus{ @@ -310,6 +335,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ @@ -346,6 +376,11 @@ func TestRevisionController(t *testing.T) { ManagementState: operatorv1.Managed, }, &operatorv1.OperatorStatus{}, + &operatorv1.StaticPodOperatorSpec{ + OperatorSpec: operatorv1.OperatorSpec{ + ManagementState: operatorv1.Managed, + }, + }, &operatorv1.StaticPodOperatorStatus{ LatestAvailableRevision: 1, NodeStatuses: []operatorv1.NodeStatus{ diff --git a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controllers.go b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controllers.go index e1fbfce03027..12939436beba 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controllers.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/staticpod/controllers.go @@ -1,23 +1,25 @@ package staticpod import ( - "github.com/openshift/library-go/pkg/operator/events" - "github.com/openshift/library-go/pkg/operator/staticpod/controller/monitoring" - "github.com/openshift/library-go/pkg/operator/v1helpers" "k8s.io/client-go/dynamic" "k8s.io/client-go/informers" "k8s.io/client-go/kubernetes" corev1client "k8s.io/client-go/kubernetes/typed/core/v1" + "github.com/openshift/library-go/pkg/operator/events" "github.com/openshift/library-go/pkg/operator/staticpod/controller/backingresource" "github.com/openshift/library-go/pkg/operator/staticpod/controller/installer" + "github.com/openshift/library-go/pkg/operator/staticpod/controller/monitoring" "github.com/openshift/library-go/pkg/operator/staticpod/controller/node" + "github.com/openshift/library-go/pkg/operator/staticpod/controller/prune" "github.com/openshift/library-go/pkg/operator/staticpod/controller/revision" + "github.com/openshift/library-go/pkg/operator/v1helpers" ) type staticPodOperatorControllers struct { revisionController *revision.RevisionController installerController *installer.InstallerController + pruneController *prune.PruneController nodeController *node.NodeController backingResourceController *backingresource.BackingResourceController monitoringResourceController *monitoring.MonitoringResourceController @@ -34,10 +36,10 @@ type staticPodOperatorControllers struct { // 4. BackingResourceController - this creates the backing resources needed for the operand, such as cluster rolebindings and installer service // account. // 5. MonitoringResourceController - this creates the service monitor used by prometheus to scrape metrics. -func NewControllers(targetNamespaceName, staticPodName string, command []string, revisionConfigMaps, revisionSecrets []revision.RevisionResource, - staticPodOperatorClient v1helpers.StaticPodOperatorClient, configMapGetter corev1client.ConfigMapsGetter, secretGetter corev1client.SecretsGetter, - kubeClient kubernetes.Interface, dynamicClient dynamic.Interface, kubeInformersNamespaceScoped, kubeInformersClusterScoped informers.SharedInformerFactory, - eventRecorder events.Recorder) *staticPodOperatorControllers { +func NewControllers(targetNamespaceName, staticPodName, podResourcePrefix string, installerCommand, prunerCommand []string, revisionConfigMaps, revisionSecrets []revision.RevisionResource, + staticPodOperatorClient v1helpers.StaticPodOperatorClient, configMapGetter corev1client.ConfigMapsGetter, secretGetter corev1client.SecretsGetter, podsGetter corev1client.PodsGetter, + kubeClient kubernetes.Interface, dynamicClient dynamic.Interface, kubeInformersNamespaceScoped, + kubeInformersClusterScoped informers.SharedInformerFactory, eventRecorder events.Recorder) *staticPodOperatorControllers { controller := &staticPodOperatorControllers{} controller.revisionController = revision.NewRevisionController( @@ -56,13 +58,24 @@ func NewControllers(targetNamespaceName, staticPodName string, command []string, staticPodName, revisionConfigMaps, revisionSecrets, - command, + installerCommand, kubeInformersNamespaceScoped, staticPodOperatorClient, kubeClient, eventRecorder, ) + controller.pruneController = prune.NewPruneController( + targetNamespaceName, + podResourcePrefix, + prunerCommand, + configMapGetter, + secretGetter, + podsGetter, + staticPodOperatorClient, + eventRecorder, + ) + controller.nodeController = node.NewNodeController( staticPodOperatorClient, kubeInformersClusterScoped, @@ -93,6 +106,7 @@ func NewControllers(targetNamespaceName, staticPodName string, command []string, func (o *staticPodOperatorControllers) Run(stopCh <-chan struct{}) { go o.revisionController.Run(1, stopCh) go o.installerController.Run(1, stopCh) + go o.pruneController.Run(1, stopCh) go o.nodeController.Run(1, stopCh) go o.backingResourceController.Run(1, stopCh) go o.monitoringResourceController.Run(1, stopCh) diff --git a/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/interfaces.go b/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/interfaces.go index af2fee03d7a4..537a0832a68f 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/interfaces.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/interfaces.go @@ -14,6 +14,6 @@ type OperatorClient interface { type StaticPodOperatorClient interface { OperatorClient - GetStaticPodOperatorState() (*operatorv1.OperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) + GetStaticPodOperatorState() (*operatorv1.StaticPodOperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) UpdateStaticPodOperatorStatus(string, *operatorv1.StaticPodOperatorStatus) (*operatorv1.StaticPodOperatorStatus, error) } diff --git a/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go.go b/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go similarity index 92% rename from vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go.go rename to vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go index 16f6f0710462..06813999e7a8 100644 --- a/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go.go +++ b/vendor/github.com/openshift/library-go/pkg/operator/v1helpers/test_helpers.go @@ -60,10 +60,12 @@ func (fakeSharedIndexInformer) GetIndexer() cache.Indexer { // NewFakeStaticPodOperatorClient returns a fake operator client suitable to use in static pod controller unit tests. func NewFakeStaticPodOperatorClient(spec *operatorv1.OperatorSpec, status *operatorv1.OperatorStatus, - staticPodStatus *operatorv1.StaticPodOperatorStatus, triggerErr func(rv string, status *operatorv1.StaticPodOperatorStatus) error) StaticPodOperatorClient { + staticPodSpec *operatorv1.StaticPodOperatorSpec, staticPodStatus *operatorv1.StaticPodOperatorStatus, + triggerErr func(rv string, status *operatorv1.StaticPodOperatorStatus) error) StaticPodOperatorClient { return &fakeStaticPodOperatorClient{ fakeOperatorSpec: spec, fakeOperatorStatus: status, + fakeStaticPodOperatorSpec: staticPodSpec, fakeStaticPodOperatorStatus: staticPodStatus, resourceVersion: "0", triggerStatusUpdateError: triggerErr, @@ -73,6 +75,7 @@ func NewFakeStaticPodOperatorClient(spec *operatorv1.OperatorSpec, status *opera type fakeStaticPodOperatorClient struct { fakeOperatorSpec *operatorv1.OperatorSpec fakeOperatorStatus *operatorv1.OperatorStatus + fakeStaticPodOperatorSpec *operatorv1.StaticPodOperatorSpec fakeStaticPodOperatorStatus *operatorv1.StaticPodOperatorStatus resourceVersion string triggerStatusUpdateError func(rv string, status *operatorv1.StaticPodOperatorStatus) error @@ -82,8 +85,8 @@ func (c *fakeStaticPodOperatorClient) Informer() cache.SharedIndexInformer { return &fakeSharedIndexInformer{} } -func (c *fakeStaticPodOperatorClient) GetStaticPodOperatorState() (*operatorv1.OperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) { - return c.fakeOperatorSpec, c.fakeStaticPodOperatorStatus, c.resourceVersion, nil +func (c *fakeStaticPodOperatorClient) GetStaticPodOperatorState() (*operatorv1.StaticPodOperatorSpec, *operatorv1.StaticPodOperatorStatus, string, error) { + return c.fakeStaticPodOperatorSpec, c.fakeStaticPodOperatorStatus, c.resourceVersion, nil } func (c *fakeStaticPodOperatorClient) UpdateStaticPodOperatorStatus(resourceVersion string, status *operatorv1.StaticPodOperatorStatus) (*operatorv1.StaticPodOperatorStatus, error) { diff --git a/vendor/github.com/openshift/library-go/pkg/serviceability/serviceability.go b/vendor/github.com/openshift/library-go/pkg/serviceability/serviceability.go index d328e6a75372..5070e74d7f64 100644 --- a/vendor/github.com/openshift/library-go/pkg/serviceability/serviceability.go +++ b/vendor/github.com/openshift/library-go/pkg/serviceability/serviceability.go @@ -3,6 +3,7 @@ package serviceability import ( "os" "os/signal" + "strings" "syscall" "github.com/pkg/profile" @@ -18,15 +19,26 @@ type stopper struct{} func (stopper) Stop() {} // Profile returns an interface to defer for a profile: `defer serviceability.Profile(os.Getenv("OPENSHIFT_PROFILE")).Stop()` is common. +// Suffixing the mode with `-tmp` will have the profiler write the run to a temporary directory with a unique name, which +// is useful when running the same command multiple times. func Profile(mode string) Stop { + path := "." + if strings.HasSuffix(mode, "-tmp") { + mode = strings.TrimSuffix(mode, "-tmp") + path = "" + } var stop Stop switch mode { case "mem": - stop = profileOnExit(profile.Start(profile.MemProfile, profile.ProfilePath("."), profile.NoShutdownHook, profile.Quiet)) + stop = profileOnExit(profile.Start(profile.MemProfile, profile.ProfilePath(path), profile.NoShutdownHook, profile.Quiet)) case "cpu": - stop = profileOnExit(profile.Start(profile.CPUProfile, profile.ProfilePath("."), profile.NoShutdownHook, profile.Quiet)) + stop = profileOnExit(profile.Start(profile.CPUProfile, profile.ProfilePath(path), profile.NoShutdownHook, profile.Quiet)) case "block": - stop = profileOnExit(profile.Start(profile.BlockProfile, profile.ProfilePath("."), profile.NoShutdownHook, profile.Quiet)) + stop = profileOnExit(profile.Start(profile.BlockProfile, profile.ProfilePath(path), profile.NoShutdownHook, profile.Quiet)) + case "mutex": + stop = profileOnExit(profile.Start(profile.MutexProfile, profile.ProfilePath(path), profile.NoShutdownHook, profile.Quiet)) + case "trace": + stop = profileOnExit(profile.Start(profile.TraceProfile, profile.ProfilePath(path), profile.NoShutdownHook, profile.Quiet)) default: stop = stopper{} } diff --git a/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile.go b/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile.go index 77454ffa2aa5..37f56030786d 100644 --- a/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile.go +++ b/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile.go @@ -338,7 +338,23 @@ func (builder *Dockerfile) Prepare(config *api.Config) error { // Install scripts provided by user, overriding all others. // This _could_ be an image:// URL, which would override any scripts above. - builder.installScripts(config.ScriptsURL, config) + urlScripts := builder.installScripts(config.ScriptsURL, config) + // If a ScriptsURL was specified, but no scripts were downloaded from it, throw an error + if len(config.ScriptsURL) > 0 { + failedCount := 0 + for _, result := range urlScripts { + if util.Includes(result.FailedSources, scripts.ScriptURLHandler) { + failedCount++ + } + } + if failedCount == len(urlScripts) { + builder.result.BuildInfo.FailureReason = utilstatus.NewFailureReason( + utilstatus.ReasonScriptsFetchFailed, + utilstatus.ReasonMessageScriptsFetchFailed, + ) + return fmt.Errorf("could not download any scripts from URL %v", config.ScriptsURL) + } + } // Stage any injection(secrets) content into the working dir so the dockerfile can reference it. for i, injection := range config.Injections { diff --git a/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile_test.go b/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile_test.go index 006eb88f68de..aae0d4479315 100644 --- a/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile_test.go +++ b/vendor/github.com/openshift/source-to-image/pkg/build/strategies/dockerfile/dockerfile_test.go @@ -1,9 +1,15 @@ package dockerfile import ( + "fmt" + "io/ioutil" + "os" + "path/filepath" "testing" "github.com/openshift/source-to-image/pkg/api" + "github.com/openshift/source-to-image/pkg/api/constants" + "github.com/openshift/source-to-image/pkg/util/fs" ) func TestGetImageScriptsDir(t *testing.T) { @@ -69,3 +75,132 @@ func TestGetImageScriptsDir(t *testing.T) { } } } + +func TestInstallScripts(t *testing.T) { + allErrs := map[string]bool{ + constants.Assemble: true, + constants.Run: true, + constants.SaveArtifacts: true, + } + + tests := []struct { + name string + url string + createAssemble bool + createRun bool + createSaveArtifacts bool + scriptErrs map[string]bool + }{ + { + name: "empty", + scriptErrs: allErrs, + }, + { + name: "bad url", + url: "https://foobadbar.com", + scriptErrs: allErrs, + }, + { + // image:// URLs should always report success + name: "image url", + url: "image://path/to/scripts", + }, + { + name: "assemble script", + createAssemble: true, + scriptErrs: map[string]bool{ + constants.Assemble: false, + constants.Run: true, + constants.SaveArtifacts: true, + }, + }, + { + name: "run script", + createRun: true, + scriptErrs: map[string]bool{ + constants.Assemble: true, + constants.Run: false, + constants.SaveArtifacts: true, + }, + }, + { + name: "save-artifacts script", + createSaveArtifacts: true, + scriptErrs: map[string]bool{ + constants.Assemble: true, + constants.Run: true, + constants.SaveArtifacts: false, + }, + }, + { + name: "all scripts", + createAssemble: true, + createRun: true, + createSaveArtifacts: true, + }, + } + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + workDir, err := ioutil.TempDir("", "s2i-dockerfile-uploads") + if err != nil { + t.Fatalf("failed to create working dir: %v", err) + } + defer os.RemoveAll(workDir) + config := &api.Config{ + WorkingDir: workDir, + } + fileSystem := fs.NewFileSystem() + for _, v := range workingDirs { + err = fileSystem.MkdirAllWithPermissions(filepath.Join(workDir, v), 0755) + if err != nil { + t.Fatalf("failed to create working dir: %v", err) + } + } + + tempDir, err := ioutil.TempDir("", "s2i-dockerfile-scripts") + if err != nil { + t.Fatalf("could not create temp dir: %v", err) + } + defer os.RemoveAll(tempDir) + if tc.createAssemble { + err := createTestScript(tempDir, constants.Assemble) + if err != nil { + t.Fatalf("failed to write %s script: %v", constants.Assemble, err) + } + tc.url = fmt.Sprintf("file://%s", filepath.ToSlash(tempDir)) + } + if tc.createRun { + err := createTestScript(tempDir, constants.Run) + if err != nil { + t.Fatalf("failed to write %s script: %v", constants.Run, err) + } + tc.url = fmt.Sprintf("file://%s", filepath.ToSlash(tempDir)) + } + if tc.createSaveArtifacts { + err := createTestScript(tempDir, constants.SaveArtifacts) + if err != nil { + t.Fatalf("failed to write %s script: %v", constants.SaveArtifacts, err) + } + tc.url = fmt.Sprintf("file://%s", filepath.ToSlash(tempDir)) + } + builder, _ := New(config, fileSystem) + results := builder.installScripts(tc.url, config) + for _, script := range results { + expectErr := tc.scriptErrs[script.Script] + if expectErr && script.Error == nil { + t.Errorf("expected error for %s, got nil", script.Script) + } + if script.Error != nil && !expectErr { + t.Errorf("received unexpected error: %v", script.Error) + } + } + }) + } +} + +func createTestScript(dir string, name string) error { + script := "echo \"test script\"" + path := filepath.Join(dir, name) + err := ioutil.WriteFile(path, []byte(script), 0700) + return err +} diff --git a/vendor/github.com/openshift/source-to-image/test/integration/integration_test.go b/vendor/github.com/openshift/source-to-image/test/integration/integration_test.go index 53e1fc84d2cb..e54f064f2716 100644 --- a/vendor/github.com/openshift/source-to-image/test/integration/integration_test.go +++ b/vendor/github.com/openshift/source-to-image/test/integration/integration_test.go @@ -625,7 +625,7 @@ func TestDockerfileBuild(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "MyDockerfile"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildDefaultDockerfile(t *testing.T) { @@ -667,7 +667,7 @@ func TestDockerfileBuildDefaultDockerfile(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "Dockerfile"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildEnv(t *testing.T) { @@ -705,7 +705,7 @@ func TestDockerfileBuildEnv(t *testing.T) { "key1=\"value1\"", "key2=\"value2\"", } - runDockerfileTest(t, config, expected, nil, nil) + runDockerfileTest(t, config, expected, nil, nil, false) } func TestDockerfileBuildLabels(t *testing.T) { @@ -742,7 +742,7 @@ func TestDockerfileBuildLabels(t *testing.T) { "\"label1\"=\"value1\"", "\"label2\"=\"value2\"", } - runDockerfileTest(t, config, expected, nil, nil) + runDockerfileTest(t, config, expected, nil, nil, false) } func TestDockerfileBuildInjections(t *testing.T) { @@ -822,7 +822,7 @@ func TestDockerfileBuildInjections(t *testing.T) { filepath.Join(tempdir, "upload/injections"+trimmedInjection1), filepath.Join(tempdir, "upload/injections"+trimmedInjection2), } - runDockerfileTest(t, config, expected, notExpected, expectedFiles) + runDockerfileTest(t, config, expected, notExpected, expectedFiles, false) } func TestDockerfileBuildScriptsURLAssemble(t *testing.T) { @@ -862,7 +862,7 @@ func TestDockerfileBuildScriptsURLAssemble(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "upload/scripts/assemble"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildScriptsURLRun(t *testing.T) { @@ -902,7 +902,31 @@ func TestDockerfileBuildScriptsURLRun(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "upload/scripts/run"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) +} + +func TestDockerfileBuildScriptsURLNone(t *testing.T) { + tempdir, err := ioutil.TempDir("", "s2i-dockerfiletest-dir") + if err != nil { + t.Errorf("Unable to create temporary directory: %v", err) + } + defer os.RemoveAll(tempdir) + + config := &api.Config{ + BuilderImage: "docker.io/centos/nodejs-8-centos7", + AssembleUser: "", + ImageWorkDir: "", + Source: git.MustParse("https://github.com/sclorg/nodejs-ex"), + ScriptsURL: "file://" + filepath.ToSlash(tempdir), + Injections: api.VolumeList{}, + Destination: "/destination", + + Environment: api.EnvironmentList{}, + Labels: map[string]string{}, + + AsDockerfile: filepath.Join(tempdir, "Dockerfile"), + } + runDockerfileTest(t, config, nil, nil, nil, true) } func TestDockerfileBuildSourceScriptsAssemble(t *testing.T) { @@ -949,7 +973,7 @@ func TestDockerfileBuildSourceScriptsAssemble(t *testing.T) { expectedFiles := []string{ filepath.Join(tempdir, "upload/scripts/assemble"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildSourceScriptsRun(t *testing.T) { @@ -996,7 +1020,7 @@ func TestDockerfileBuildSourceScriptsRun(t *testing.T) { expectedFiles := []string{ filepath.Join(tempdir, "upload/scripts/run"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } // TestDockerfileBuildScriptsURLImage tests the behavior if the ScriptsURL @@ -1047,7 +1071,7 @@ func TestDockerfileBuildScriptsURLImage(t *testing.T) { "(?m)^RUN chown -R 1001:0.* /destination/scripts", "(?m)^RUN /destination/scripts/assemble", } - runDockerfileTest(t, config, expected, notExpected, nil) + runDockerfileTest(t, config, expected, notExpected, nil, false) } func TestDockerfileBuildImageScriptsURLAssemble(t *testing.T) { @@ -1087,7 +1111,7 @@ func TestDockerfileBuildImageScriptsURLAssemble(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "upload/scripts/assemble"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildImageScriptsURLRun(t *testing.T) { @@ -1127,7 +1151,7 @@ func TestDockerfileBuildImageScriptsURLRun(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "upload/scripts/run"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildImageScriptsURLImage(t *testing.T) { @@ -1174,7 +1198,7 @@ func TestDockerfileBuildImageScriptsURLImage(t *testing.T) { expectedFiles := []string{ filepath.Join(tempdir, "upload/scripts/assemble"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileBuildScriptsAndImageURL(t *testing.T) { @@ -1215,7 +1239,7 @@ func TestDockerfileBuildScriptsAndImageURL(t *testing.T) { filepath.Join(tempdir, "upload/src/server.js"), filepath.Join(tempdir, "upload/scripts/assemble"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } // TestDockerfileBuildScriptsAndImageURLConflicts tests if both @@ -1278,7 +1302,7 @@ func TestDockerfileBuildScriptsAndImageURLConflicts(t *testing.T) { filepath.Join(outputDir, "upload/src/server.js"), filepath.Join(outputDir, "upload/scripts/assemble"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) dockerfileAssemble, err := ioutil.ReadFile(filepath.Join(outputDir, "upload/scripts/assemble")) if err != nil { t.Errorf("Failed to read uploaded assemble script: %v", err) @@ -1326,7 +1350,7 @@ func TestDockerfileIncrementalBuild(t *testing.T) { "(?m)^CMD /usr/libexec/s2i/run", } - runDockerfileTest(t, config, expected, nil, nil) + runDockerfileTest(t, config, expected, nil, nil, false) } func TestDockerfileIncrementalSourceSave(t *testing.T) { @@ -1381,7 +1405,7 @@ func TestDockerfileIncrementalSourceSave(t *testing.T) { filepath.Join(tempdir, "upload/scripts/save-artifacts"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileIncrementalSaveURL(t *testing.T) { @@ -1429,7 +1453,7 @@ func TestDockerfileIncrementalSaveURL(t *testing.T) { filepath.Join(tempdir, "upload/scripts/save-artifacts"), } - runDockerfileTest(t, config, expected, nil, expectedFiles) + runDockerfileTest(t, config, expected, nil, expectedFiles, false) } func TestDockerfileIncrementalTag(t *testing.T) { @@ -1465,7 +1489,7 @@ func TestDockerfileIncrementalTag(t *testing.T) { "(?m)^CMD /usr/libexec/s2i/run", } - runDockerfileTest(t, config, expected, nil, nil) + runDockerfileTest(t, config, expected, nil, nil, false) } func TestDockerfileIncrementalAssembleUser(t *testing.T) { @@ -1501,20 +1525,27 @@ func TestDockerfileIncrementalAssembleUser(t *testing.T) { "(?m)^CMD /usr/libexec/s2i/run", } - runDockerfileTest(t, config, expected, nil, nil) + runDockerfileTest(t, config, expected, nil, nil, false) } -func runDockerfileTest(t *testing.T, config *api.Config, expected []string, notExpected []string, expectedFiles []string) { +func runDockerfileTest(t *testing.T, config *api.Config, expected []string, notExpected []string, expectedFiles []string, expectFailure bool) { b, _, err := strategies.GetStrategy(nil, config) if err != nil { t.Fatalf("Cannot create a new builder.") } resp, err := b.Build(config) + if expectFailure { + if err == nil || resp.Success { + t.Errorf("The build succeded when it should have failed. Success: %t, error: %v", resp.Success, err) + } + return + } if err != nil { t.Fatalf("An error occurred during the build: %v", err) - } else if !resp.Success { - t.Fatalf("The build failed.") + } + if !resp.Success { + t.Fatalf("The build failed when it should have succeeded.") } filebytes, err := ioutil.ReadFile(config.AsDockerfile) diff --git a/vendor/github.com/vmware/photon-controller-go-sdk/photon/client.go b/vendor/github.com/vmware/photon-controller-go-sdk/photon/client.go index fb48c59820b9..5e0faac7bd6c 100644 --- a/vendor/github.com/vmware/photon-controller-go-sdk/photon/client.go +++ b/vendor/github.com/vmware/photon-controller-go-sdk/photon/client.go @@ -142,8 +142,8 @@ func NewClient(endpoint string, options *ClientOptions, logger *log.Logger) (c * } restClient := &restClient{ - httpClient: &http.Client{Transport: tr}, - logger: logger, + httpClient: &http.Client{Transport: tr}, + logger: logger, UpdateAccessTokenCallback: tokenCallback, } diff --git a/vendor/github.com/vmware/photon-controller-go-sdk/photon/deployments_test.go b/vendor/github.com/vmware/photon-controller-go-sdk/photon/deployments_test.go index cbbd5f681089..dbfc8f85da86 100644 --- a/vendor/github.com/vmware/photon-controller-go-sdk/photon/deployments_test.go +++ b/vendor/github.com/vmware/photon-controller-go-sdk/photon/deployments_test.go @@ -32,7 +32,7 @@ var _ = Describe("Deployment", func() { deploymentSpec = &DeploymentCreateSpec{ ImageDatastores: []string{randomString(10, "go-sdk-deployment-")}, UseImageDatastoreForVms: true, - Auth: &AuthInfo{}, + Auth: &AuthInfo{}, } }) @@ -59,8 +59,8 @@ var _ = Describe("Deployment", func() { mockDeployment := Deployment{ ImageDatastores: deploymentSpec.ImageDatastores, UseImageDatastoreForVms: deploymentSpec.UseImageDatastoreForVms, - Auth: &AuthInfo{}, - NetworkConfiguration: &NetworkConfiguration{Enabled: false}, + Auth: &AuthInfo{}, + NetworkConfiguration: &NetworkConfiguration{Enabled: false}, } server.SetResponseJson(200, mockDeployment) deployment, err := client.Deployments.Get(task.Entity.ID) diff --git a/vendor/github.com/vmware/photon-controller-go-sdk/photon/lightwave/oidcclient_test.go b/vendor/github.com/vmware/photon-controller-go-sdk/photon/lightwave/oidcclient_test.go index 68bc89ad608f..976f6c7afb03 100644 --- a/vendor/github.com/vmware/photon-controller-go-sdk/photon/lightwave/oidcclient_test.go +++ b/vendor/github.com/vmware/photon-controller-go-sdk/photon/lightwave/oidcclient_test.go @@ -66,7 +66,7 @@ var _ = Describe("OIDCClient", func() { Context("when server responds with valid certificate", func() { BeforeEach(func() { template := &x509.Certificate{ - IsCA: true, + IsCA: true, BasicConstraintsValid: true, SubjectKeyId: []byte{1, 2, 3}, SerialNumber: big.NewInt(1234), diff --git a/vendor/k8s.io/component-base/Godeps/Godeps.json b/vendor/k8s.io/component-base/Godeps/Godeps.json index d4213da2351d..f48b0e85372d 100644 --- a/vendor/k8s.io/component-base/Godeps/Godeps.json +++ b/vendor/k8s.io/component-base/Godeps/Godeps.json @@ -18,6 +18,10 @@ "ImportPath": "github.com/google/gofuzz", "Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c" }, + { + "ImportPath": "github.com/spf13/pflag", + "Rev": "583c0c0531f06d5278b7d917446061adc344b5cd" + }, { "ImportPath": "golang.org/x/net/http2", "Rev": "0ed95abb35c445290478a5348a7b38bb154135fd" @@ -56,87 +60,91 @@ }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/naming", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" + }, + { + "ImportPath": "k8s.io/apimachinery/pkg/util/wait", + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "e086bfc51e5473a823963a7dd224934d6f3767e7" + "Rev": "0e6dcdd1b5ce54a78820c9bad24e2dd32b3b2e79" }, { "ImportPath": "k8s.io/klog", @@ -144,7 +152,7 @@ }, { "ImportPath": "k8s.io/utils/pointer", - "Rev": "8e7ff06bf0e2d3289061230af203e430a15b6dcc" + "Rev": "8a87304934321b4b0ad72a7cb3cbc715d67d38c7" } ] } diff --git a/vendor/k8s.io/component-base/logs/logs.go b/vendor/k8s.io/component-base/logs/logs.go new file mode 100644 index 000000000000..3ffe9eeb29b7 --- /dev/null +++ b/vendor/k8s.io/component-base/logs/logs.go @@ -0,0 +1,80 @@ +/* +Copyright 2014 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. +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 logs + +import ( + "flag" + "fmt" + "log" + "time" + + "github.com/spf13/pflag" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/klog" +) + +const logFlushFreqFlagName = "log-flush-frequency" + +var logFlushFreq = pflag.Duration(logFlushFreqFlagName, 5*time.Second, "Maximum number of seconds between log flushes") + +// TODO(thockin): This is temporary until we agree on log dirs and put those into each cmd. +func init() { + klog.InitFlags(flag.CommandLine) + flag.Set("logtostderr", "true") +} + +// AddFlags registers this package's flags on arbitrary FlagSets, such that they point to the +// same value as the global flags. +func AddFlags(fs *pflag.FlagSet) { + fs.AddFlag(pflag.Lookup(logFlushFreqFlagName)) +} + +// KlogWriter serves as a bridge between the standard log package and the glog package. +type KlogWriter struct{} + +// Write implements the io.Writer interface. +func (writer KlogWriter) Write(data []byte) (n int, err error) { + klog.InfoDepth(1, string(data)) + return len(data), nil +} + +// InitLogs initializes logs the way we want for kubernetes. +func InitLogs() { + log.SetOutput(KlogWriter{}) + log.SetFlags(0) + // The default glog flush interval is 5 seconds. + go wait.Forever(klog.Flush, *logFlushFreq) +} + +// FlushLogs flushes logs immediately. +func FlushLogs() { + klog.Flush() +} + +// NewLogger creates a new log.Logger which sends logs to klog.Info. +func NewLogger(prefix string) *log.Logger { + return log.New(KlogWriter{}, prefix, 0) +} + +// GlogSetter is a setter to set glog level. +func GlogSetter(val string) (string, error) { + var level klog.Level + if err := level.Set(val); err != nil { + return "", fmt.Errorf("failed set klog.logging.verbosity %s: %v", val, err) + } + return fmt.Sprintf("successfully set klog.logging.verbosity to %s", val), nil +} diff --git a/vendor/k8s.io/kubernetes/test/e2e/apps/statefulset.go b/vendor/k8s.io/kubernetes/test/e2e/apps/statefulset.go index cc5b58d974b1..e22c718f88bb 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/apps/statefulset.go +++ b/vendor/k8s.io/kubernetes/test/e2e/apps/statefulset.go @@ -113,7 +113,7 @@ var _ = SIGDescribe("StatefulSet", func() { By("Verifying statefulset set proper service name") framework.ExpectNoError(sst.CheckServiceName(ss, headlessSvcName)) - cmd := "echo $(hostname) > /data/hostname; sync;" + cmd := "echo $(hostname) | dd of=/data/hostname conv=fsync" By("Running " + cmd + " in all stateful pods") framework.ExpectNoError(sst.ExecInStatefulPods(ss, cmd)) diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/statefulset_utils.go b/vendor/k8s.io/kubernetes/test/e2e/framework/statefulset_utils.go index b2690b249073..b4f140e4b353 100644 --- a/vendor/k8s.io/kubernetes/test/e2e/framework/statefulset_utils.go +++ b/vendor/k8s.io/kubernetes/test/e2e/framework/statefulset_utils.go @@ -599,7 +599,7 @@ func (s *StatefulSetTester) ResumeNextPod(ss *apps.StatefulSet) { if resumedPod != "" { Failf("Found multiple paused stateful pods: %v and %v", pod.Name, resumedPod) } - _, err := RunHostCmdWithRetries(pod.Namespace, pod.Name, "touch /data/statefulset-continue; sync", StatefulSetPoll, StatefulPodTimeout) + _, err := RunHostCmdWithRetries(pod.Namespace, pod.Name, "dd if=/dev/zero of=/data/statefulset-continue bs=1 count=1 conv=fsync", StatefulSetPoll, StatefulPodTimeout) ExpectNoError(err) Logf("Resumed pod %v", pod.Name) resumedPod = pod.Name