From 37b562a35bfa1698f481b28fff68f3f169a67cd7 Mon Sep 17 00:00:00 2001
From: Taylor Fahlman
Date: Mon, 24 Feb 2025 06:51:14 -0800
Subject: [PATCH] Remove openshift and k8s pins
---
cmd/aro/operator.go | 2 -
go.mod | 372 +-
go.sum | 219 +-
hack/update-go-module-dependencies.sh | 43 -
pkg/cluster/delete.go | 8 +-
pkg/cluster/deploybaseresources.go | 5 +-
pkg/cluster/install.go | 8 +-
pkg/deploy/predeploy.go | 4 +-
pkg/deploy/predeploy_test.go | 2 +-
pkg/deploy/upgrade_gateway.go | 4 +-
pkg/deploy/upgrade_rp.go | 4 +-
pkg/frontend/adminactions/kubeactions.go | 8 +-
pkg/hive/manager_test.go | 4 +-
pkg/mimo/actuator/task.go | 8 +-
pkg/mimo/steps/cluster/operatorflags_test.go | 4 +
pkg/monitor/cluster/cluster.go | 14 +-
.../controllers/banner/banner_controller.go | 3 +-
.../controllers/base/aro_controller_test.go | 22 +-
.../checkers/clusterdnschecker/controller.go | 3 +-
.../clusterdnschecker/controller_test.go | 2 +-
.../ingresscertificatechecker/controller.go | 5 +-
.../controller_test.go | 2 +-
.../internetchecker/controller_test.go | 2 +-
.../serviceprincipalchecker/controller.go | 3 +-
.../controller_test.go | 2 +-
.../cloudproviderconfig_controller.go | 3 +-
.../clusteroperatoraro_controller_test.go | 44 +-
.../controllers/cpms/cpms_controller.go | 3 +-
.../controllers/dnsmasq/cluster_controller.go | 3 +-
.../dnsmasq/cluster_controller_test.go | 1 +
.../dnsmasq/machineconfig_controller_test.go | 61 +-
.../machineconfigpool_controller_test.go | 1 +
.../etchosts/cluster_controller.go | 5 +-
.../etchosts/cluster_controller_test.go | 2 +-
.../etchosts/machineconfig_controller.go | 5 +-
.../etchosts/machineconfig_controller_test.go | 2 +-
.../guardrails/guardrails_controller.go | 8 +-
.../guardrails/guardrails_controller_test.go | 2 +-
.../imageconfig/image_controller_test.go | 2 +-
.../ingress/ingress_controller_test.go | 2 +-
.../machine/machine_controller_test.go | 2 +-
.../machinehealthcheck_controller.go | 3 +-
.../machinehealthcheck_controller_test.go | 2 +-
.../machineset/machineset_controller_test.go | 1 +
.../monitoring/monitoring_controller.go | 3 +-
.../monitoring/monitoring_controller_test.go | 11 +-
.../controllers/muo/muo_controller.go | 7 +-
.../controllers/muo/muo_controller_test.go | 2 +-
.../controllers/node/node_controller_test.go | 2 +-
.../pullsecret/pullsecret_controller.go | 10 +-
.../pullsecret/pullsecret_controller_test.go | 2 +-
.../storageaccount_controller.go | 5 +-
.../controllers/subnets/subnets_controller.go | 5 +-
.../controllers/workaround/systemreserved.go | 8 +
.../workaround/systemreserved_test.go | 8 +
.../workaround/workaround_controller.go | 3 +-
pkg/operator/deploy/deploy.go | 2 +-
.../aro.openshift.io_clusters.yaml | 2 +
...view.aro.openshift.io_previewfeatures.yaml | 2 +
pkg/util/arm/deploy_test.go | 3 +-
.../azuresdk/azcertificates/helpers.go | 4 +-
.../mgmt/features/deployments_addons.go | 2 +-
pkg/util/clienthelper/clienthelper.go | 1 +
pkg/util/clienthelper/clienthelper_test.go | 4 +
pkg/util/cluster/aad.go | 6 +-
pkg/util/cluster/cluster.go | 8 +-
pkg/util/conditions/condition_test.go | 2 +-
.../cache_fallback_discovery_client_test.go | 6 +-
pkg/util/steps/condition.go | 10 +-
pkg/util/steps/refreshing.go | 4 +-
pkg/util/steps/runner_test.go | 18 +-
pkg/validate/dynamic/diskencryptionset.go | 20 +-
pkg/validate/dynamic/dynamic.go | 193 +-
.../platformworkloadidentityprofile_test.go | 4 +-
test/e2e/cluster.go | 2 +-
test/util/clienthelper/hookclient.go | 18 +-
test/util/kubeadminkubeconfig/kubeconfig.go | 4 +-
.../antlr4/runtime/Go/antlr/{ => v4}/LICENSE | 0
.../antlr4/runtime/Go/antlr/v4/antlrdoc.go | 68 +
.../antlr4/runtime/Go/antlr/{ => v4}/atn.go | 27 +-
.../runtime/Go/antlr/{ => v4}/atn_config.go | 54 +-
.../Go/antlr/{ => v4}/atn_config_set.go | 80 +-
.../{ => v4}/atn_deserialization_options.go | 2 +-
.../Go/antlr/{ => v4}/atn_deserializer.go | 2 +-
.../Go/antlr/{ => v4}/atn_simulator.go | 2 +-
.../runtime/Go/antlr/{ => v4}/atn_state.go | 9 +-
.../runtime/Go/antlr/{ => v4}/atn_type.go | 2 +-
.../runtime/Go/antlr/{ => v4}/char_stream.go | 2 +-
.../Go/antlr/{ => v4}/common_token_factory.go | 2 +-
.../Go/antlr/{ => v4}/common_token_stream.go | 6 +-
.../antlr4/runtime/Go/antlr/v4/comparators.go | 147 +
.../antlr4/runtime/Go/antlr/{ => v4}/dfa.go | 54 +-
.../Go/antlr/{ => v4}/dfa_serializer.go | 2 +-
.../runtime/Go/antlr/{ => v4}/dfa_state.go | 54 +-
.../{ => v4}/diagnostic_error_listener.go | 4 +-
.../Go/antlr/{ => v4}/error_listener.go | 6 +-
.../Go/antlr/{ => v4}/error_strategy.go | 38 +-
.../runtime/Go/antlr/{ => v4}/errors.go | 5 +-
.../runtime/Go/antlr/{ => v4}/file_stream.go | 2 +-
.../runtime/Go/antlr/{ => v4}/input_stream.go | 2 +-
.../runtime/Go/antlr/{ => v4}/int_stream.go | 2 +-
.../runtime/Go/antlr/{ => v4}/interval_set.go | 6 +-
.../antlr4/runtime/Go/antlr/v4/jcollect.go | 198 +
.../antlr4/runtime/Go/antlr/{ => v4}/lexer.go | 6 +-
.../runtime/Go/antlr/{ => v4}/lexer_action.go | 44 +-
.../antlr/{ => v4}/lexer_action_executor.go | 27 +-
.../Go/antlr/{ => v4}/lexer_atn_simulator.go | 17 +-
.../runtime/Go/antlr/{ => v4}/ll1_analyzer.go | 30 +-
.../runtime/Go/antlr/{ => v4}/parser.go | 14 +-
.../Go/antlr/{ => v4}/parser_atn_simulator.go | 153 +-
.../Go/antlr/{ => v4}/parser_rule_context.go | 4 +-
.../Go/antlr/{ => v4}/prediction_context.go | 161 +-
.../Go/antlr/{ => v4}/prediction_mode.go | 48 +-
.../runtime/Go/antlr/{ => v4}/recognizer.go | 19 +-
.../runtime/Go/antlr/{ => v4}/rule_context.go | 2 +-
.../Go/antlr/{ => v4}/semantic_context.go | 81 +-
.../antlr4/runtime/Go/antlr/{ => v4}/token.go | 3 +-
.../runtime/Go/antlr/{ => v4}/token_source.go | 2 +-
.../runtime/Go/antlr/{ => v4}/token_stream.go | 2 +-
.../Go/antlr/{ => v4}/tokenstream_rewriter.go | 420 +-
.../Go/antlr/{ => v4}/trace_listener.go | 2 +-
.../runtime/Go/antlr/{ => v4}/transition.go | 2 +-
.../antlr4/runtime/Go/antlr/{ => v4}/tree.go | 5 +-
.../antlr4/runtime/Go/antlr/{ => v4}/trees.go | 9 +-
.../antlr4/runtime/Go/antlr/{ => v4}/utils.go | 21 +-
.../runtime/Go/antlr/{ => v4}/utils_set.go | 34 +-
.../coreos/go-semver/semver/semver.go | 2 +-
.../emicklei/go-restful/v3/CHANGES.md | 23 +-
.../emicklei/go-restful/v3/README.md | 7 +-
.../emicklei/go-restful/v3/compress.go | 10 +
.../go-restful/v3/entity_accessors.go | 7 +
.../github.com/emicklei/go-restful/v3/json.go | 11 -
.../emicklei/go-restful/v3/jsoniter.go | 12 -
.../emicklei/go-restful/v3/jsr311.go | 2 +-
.../emicklei/go-restful/v3/route.go | 17 +-
.../emicklei/go-restful/v3/route_builder.go | 45 +-
.../github.com/evanphx/json-patch/README.md | 4 +-
vendor/github.com/evanphx/json-patch/patch.go | 46 +-
.../github.com/evanphx/json-patch/v5/LICENSE | 25 +
.../evanphx/json-patch/v5/errors.go | 38 +
.../json-patch/v5/internal/json/decode.go | 1385 +
.../json-patch/v5/internal/json/encode.go | 1473 +
.../json-patch/v5/internal/json/fold.go | 141 +
.../json-patch/v5/internal/json/fuzz.go | 42 +
.../json-patch/v5/internal/json/indent.go | 143 +
.../json-patch/v5/internal/json/scanner.go | 610 +
.../json-patch/v5/internal/json/stream.go | 515 +
.../json-patch/v5/internal/json/tables.go | 218 +
.../json-patch/v5/internal/json/tags.go | 38 +
.../github.com/evanphx/json-patch/v5/merge.go | 438 +
.../github.com/evanphx/json-patch/v5/patch.go | 1261 +
vendor/github.com/ghodss/yaml/.gitignore | 20 -
vendor/github.com/ghodss/yaml/.travis.yml | 8 -
vendor/github.com/ghodss/yaml/LICENSE | 50 -
vendor/github.com/ghodss/yaml/README.md | 121 -
vendor/github.com/ghodss/yaml/fields.go | 501 -
vendor/github.com/ghodss/yaml/yaml.go | 326 -
vendor/github.com/ghodss/yaml/yaml_go110.go | 14 -
.../github.com/google/cel-go/cel/BUILD.bazel | 13 +-
vendor/github.com/google/cel-go/cel/decls.go | 1102 +-
vendor/github.com/google/cel-go/cel/env.go | 490 +-
vendor/github.com/google/cel-go/cel/io.go | 50 +-
.../github.com/google/cel-go/cel/library.go | 484 +-
vendor/github.com/google/cel-go/cel/macro.go | 25 +-
.../github.com/google/cel-go/cel/options.go | 220 +-
.../github.com/google/cel-go/cel/program.go | 161 +-
.../github.com/google/cel-go/cel/validator.go | 388 +
.../google/cel-go/checker/BUILD.bazel | 10 +-
.../google/cel-go/checker/checker.go | 507 +-
.../github.com/google/cel-go/checker/cost.go | 171 +-
.../google/cel-go/checker/decls/BUILD.bazel | 3 +-
.../google/cel-go/checker/decls/decls.go | 8 +-
.../github.com/google/cel-go/checker/env.go | 239 +-
.../google/cel-go/checker/errors.go | 94 +-
.../google/cel-go/checker/format.go | 216 +
.../google/cel-go/checker/mapping.go | 14 +-
.../google/cel-go/checker/options.go | 13 +-
.../google/cel-go/checker/printer.go | 5 +-
.../cel-go/checker/{decls => }/scopes.go | 38 +-
.../google/cel-go/checker/standard.go | 479 +-
.../github.com/google/cel-go/checker/types.go | 391 +-
.../google/cel-go/common/BUILD.bazel | 2 +-
.../google/cel-go/common/ast/BUILD.bazel | 52 +
.../google/cel-go/common/ast/ast.go | 226 +
.../google/cel-go/common/ast/expr.go | 709 +
.../cel-go/common/containers/BUILD.bazel | 4 +-
.../google/cel-go/common/debug/BUILD.bazel | 2 +-
.../google/cel-go/common/debug/debug.go | 14 +-
.../google/cel-go/common/decls/BUILD.bazel | 39 +
.../google/cel-go/common/decls/decls.go | 844 +
.../github.com/google/cel-go/common/error.go | 8 +-
.../github.com/google/cel-go/common/errors.go | 18 +-
.../cel-go/common/functions/BUILD.bazel | 17 +
.../cel-go/common/functions/functions.go | 61 +
.../cel-go/common/operators/operators.go | 4 +
.../cel-go/common/overloads/overloads.go | 10 +
.../github.com/google/cel-go/common/source.go | 3 -
.../google/cel-go/common/stdlib/BUILD.bazel | 25 +
.../google/cel-go/common/stdlib/standard.go | 661 +
.../google/cel-go/common/types/BUILD.bazel | 15 +-
.../google/cel-go/common/types/bool.go | 15 +-
.../google/cel-go/common/types/bytes.go | 16 +-
.../google/cel-go/common/types/double.go | 23 +-
.../google/cel-go/common/types/duration.go | 85 +-
.../google/cel-go/common/types/err.go | 32 +-
.../google/cel-go/common/types/int.go | 34 +-
.../google/cel-go/common/types/iterator.go | 6 +-
.../google/cel-go/common/types/json_value.go | 1 +
.../google/cel-go/common/types/list.go | 166 +-
.../google/cel-go/common/types/map.go | 140 +-
.../google/cel-go/common/types/null.go | 28 +-
.../google/cel-go/common/types/object.go | 32 +-
.../google/cel-go/common/types/optional.go | 108 +
.../google/cel-go/common/types/pb/BUILD.bazel | 2 +-
.../google/cel-go/common/types/pb/enum.go | 4 +-
.../google/cel-go/common/types/pb/file.go | 83 +-
.../google/cel-go/common/types/pb/pb.go | 53 +-
.../google/cel-go/common/types/pb/type.go | 89 +-
.../google/cel-go/common/types/provider.go | 270 +-
.../cel-go/common/types/ref/BUILD.bazel | 2 +-
.../cel-go/common/types/ref/provider.go | 45 +-
.../cel-go/common/types/ref/reference.go | 15 +-
.../google/cel-go/common/types/string.go | 53 +-
.../google/cel-go/common/types/timestamp.go | 29 +-
.../cel-go/common/types/traits/BUILD.bazel | 1 +
.../types/traits/zeroer.go} | 26 +-
.../google/cel-go/common/types/type.go | 102 -
.../google/cel-go/common/types/types.go | 806 +
.../google/cel-go/common/types/uint.go | 31 +-
.../google/cel-go/common/types/unknown.go | 290 +-
.../google/cel-go/common/types/util.go | 2 +-
.../github.com/google/cel-go/ext/BUILD.bazel | 33 +
vendor/github.com/google/cel-go/ext/README.md | 222 +
.../github.com/google/cel-go/ext/bindings.go | 96 +
.../github.com/google/cel-go/ext/encoders.go | 23 +-
vendor/github.com/google/cel-go/ext/guards.go | 14 +
vendor/github.com/google/cel-go/ext/lists.go | 94 +
vendor/github.com/google/cel-go/ext/math.go | 373 +
vendor/github.com/google/cel-go/ext/native.go | 574 +
vendor/github.com/google/cel-go/ext/protos.go | 141 +
vendor/github.com/google/cel-go/ext/sets.go | 197 +
.../github.com/google/cel-go/ext/strings.go | 778 +-
.../google/cel-go/interpreter/BUILD.bazel | 15 +-
.../google/cel-go/interpreter/activation.go | 32 +-
.../cel-go/interpreter/attribute_patterns.go | 115 +-
.../google/cel-go/interpreter/attributes.go | 1100 +-
.../google/cel-go/interpreter/decorators.go | 21 +-
.../google/cel-go/interpreter/dispatcher.go | 2 +-
.../google/cel-go/interpreter/evalstate.go | 6 +-
.../google/cel-go/interpreter/formatting.go | 383 +
.../cel-go/interpreter/functions/BUILD.bazel | 9 +-
.../cel-go/interpreter/functions/functions.go | 35 +-
.../cel-go/interpreter/functions/standard.go | 270 -
.../cel-go/interpreter/interpretable.go | 768 +-
.../google/cel-go/interpreter/interpreter.go | 38 +-
.../google/cel-go/interpreter/planner.go | 241 +-
.../google/cel-go/interpreter/prune.go | 374 +-
.../google/cel-go/interpreter/runtimecost.go | 119 +-
.../google/cel-go/parser/BUILD.bazel | 8 +-
.../github.com/google/cel-go/parser/errors.go | 17 +-
.../google/cel-go/parser/gen/BUILD.bazel | 2 +-
.../google/cel-go/parser/gen/CEL.g4 | 38 +-
.../google/cel-go/parser/gen/CEL.interp | 5 +-
.../cel-go/parser/gen/cel_base_listener.go | 48 +-
.../cel-go/parser/gen/cel_base_visitor.go | 28 +-
.../google/cel-go/parser/gen/cel_lexer.go | 4 +-
.../google/cel-go/parser/gen/cel_listener.go | 48 +-
.../google/cel-go/parser/gen/cel_parser.go | 2108 +-
.../google/cel-go/parser/gen/cel_visitor.go | 26 +-
.../google/cel-go/parser/gen/generate.sh | 2 +-
.../github.com/google/cel-go/parser/helper.go | 290 +-
.../github.com/google/cel-go/parser/input.go | 3 +-
.../github.com/google/cel-go/parser/macro.go | 37 +-
.../google/cel-go/parser/options.go | 38 +-
.../github.com/google/cel-go/parser/parser.go | 520 +-
.../google/cel-go/parser/unparser.go | 63 +-
.../{gnostic => gnostic-models}/LICENSE | 0
.../compiler/README.md | 0
.../compiler/context.go | 0
.../compiler/error.go | 0
.../compiler/extensions.go | 2 +-
.../compiler/helpers.go | 2 +-
.../compiler/main.go | 0
.../compiler/reader.go | 0
.../extensions/README.md | 0
.../extensions/extension.pb.go | 4 +-
.../extensions/extension.proto | 0
.../extensions/extensions.go | 0
.../jsonschema/README.md | 0
.../jsonschema/base.go | 15 +-
.../jsonschema/display.go | 0
.../jsonschema/models.go | 0
.../jsonschema/operations.go | 0
.../jsonschema/reader.go | 0
.../jsonschema/schema.json | 0
.../jsonschema/writer.go | 0
.../openapiv2/OpenAPIv2.go | 2 +-
.../openapiv2/OpenAPIv2.pb.go | 4 +-
.../openapiv2/OpenAPIv2.proto | 0
.../openapiv2/README.md | 0
.../openapiv2/document.go | 2 +-
.../openapiv2/openapi-2.0.json | 0
.../openapiv3/OpenAPIv3.go | 2 +-
.../openapiv3/OpenAPIv3.pb.go | 4 +-
.../openapiv3/OpenAPIv3.proto | 0
.../openapiv3/README.md | 0
.../openapiv3/document.go | 2 +-
.../google/gnostic/openapiv3/openapi-3.0.json | 1251 -
.../google/gnostic/openapiv3/openapi-3.1.json | 1250 -
.../github.com/gorilla/websocket/.gitignore | 25 +
vendor/github.com/gorilla/websocket/AUTHORS | 9 +
vendor/github.com/gorilla/websocket/LICENSE | 22 +
vendor/github.com/gorilla/websocket/README.md | 39 +
vendor/github.com/gorilla/websocket/client.go | 422 +
.../gorilla/websocket/compression.go | 148 +
vendor/github.com/gorilla/websocket/conn.go | 1230 +
vendor/github.com/gorilla/websocket/doc.go | 227 +
vendor/github.com/gorilla/websocket/join.go | 42 +
vendor/github.com/gorilla/websocket/json.go | 60 +
vendor/github.com/gorilla/websocket/mask.go | 55 +
.../github.com/gorilla/websocket/mask_safe.go | 16 +
.../github.com/gorilla/websocket/prepared.go | 102 +
vendor/github.com/gorilla/websocket/proxy.go | 77 +
vendor/github.com/gorilla/websocket/server.go | 365 +
.../gorilla/websocket/tls_handshake.go | 21 +
.../gorilla/websocket/tls_handshake_116.go | 21 +
vendor/github.com/gorilla/websocket/util.go | 283 +
.../gorilla/websocket/x_net_proxy.go | 473 +
vendor/github.com/mxk/go-flowrate/LICENSE | 29 +
.../mxk/go-flowrate/flowrate/flowrate.go | 267 +
.../github.com/mxk/go-flowrate/flowrate/io.go | 133 +
.../mxk/go-flowrate/flowrate/util.go | 67 +
.../openshift/api/.ci-operator.yaml | 2 +-
vendor/github.com/openshift/api/.gitignore | 3 +-
.../github.com/openshift/api/Dockerfile.rhel8 | 23 +
vendor/github.com/openshift/api/Makefile | 99 +-
vendor/github.com/openshift/api/OWNERS | 10 -
vendor/github.com/openshift/api/README.md | 265 +-
.../openshift/api/apiserver/.codegen.yaml | 2 +
...piserver.openshift.io_apirequestcount.yaml | 254 -
.../v1/stable.apirequestcount.testsuite.yaml | 15 -
.../api/apiserver/v1/types_apirequestcount.go | 19 +-
..._generated.featuregated-crd-manifests.yaml | 34 +
.../v1/zz_generated.swagger_doc_generated.go | 10 +-
.../github.com/openshift/api/apps/v1/doc.go | 1 +
.../openshift/api/apps/v1/generated.proto | 5 +
.../github.com/openshift/api/apps/v1/types.go | 27 +-
.../v1/zz_generated.swagger_doc_generated.go | 12 +-
.../v1/zz_prerelease_lifecycle_generated.go | 114 +
...enshift_01_rolebindingrestriction.crd.yaml | 158 -
.../api/authorization/v1/generated.proto | 25 +
...able.rolebindingrestriction.testsuite.yaml | 14 -
.../openshift/api/authorization/v1/types.go | 45 +-
..._generated.featuregated-crd-manifests.yaml | 22 +
.../v1/zz_generated.swagger_doc_generated.go | 38 +-
vendor/github.com/openshift/api/build/OWNERS | 5 +-
.../openshift/api/build/v1/consts.go | 3 +-
.../openshift/api/build/v1/generated.proto | 12 +
.../openshift/api/build/v1/types.go | 26 +-
.../v1/zz_generated.swagger_doc_generated.go | 26 +-
.../openshift/api/cloudnetwork/.codegen.yaml | 0
.../v1/001-cloudprivateipconfig.crd.yaml | 151 -
.../001-cloudprivateipconfig.crd.yaml-patch | 10 -
.../api/cloudnetwork/v1/generated.proto | 6 +
.../openshift/api/cloudnetwork/v1/register.go | 13 +-
...stable.cloudprivateipconfig.testsuite.yaml | 18 -
.../openshift/api/cloudnetwork/v1/types.go | 10 +-
..._generated.featuregated-crd-manifests.yaml | 21 +
.../v1/zz_generated.swagger_doc_generated.go | 12 +-
.../openshift/api/config/.codegen.yaml | 2 +
.../openshift/api/config/install.go | 3 +-
...rsion-operator_01_clusteroperator.crd.yaml | 137 -
...ersion-operator_01_clusterversion.crd.yaml | 420 -
.../0000_03_config-operator_01_proxy.crd.yaml | 78 -
...rketplace-operator_01_operatorhub.crd.yaml | 84 -
...0_10_config-operator_01_apiserver.crd.yaml | 177 -
...config-operator_01_authentication.crd.yaml | 101 -
.../0000_10_config-operator_01_build.crd.yaml | 275 -
...000_10_config-operator_01_console.crd.yaml | 57 -
.../0000_10_config-operator_01_dns.crd.yaml | 112 -
...10_config-operator_01_featuregate.crd.yaml | 63 -
.../0000_10_config-operator_01_image.crd.yaml | 108 -
...ig-operator_01_imagecontentpolicy.crd.yaml | 68 -
...perator_01_infrastructure-Default.crd.yaml | 609 -
...frastructure-TechPreviewNoUpgrade.crd.yaml | 761 -
...ucture-TechPreviewNoUpgrade.crd.yaml-patch | 24 -
...000_10_config-operator_01_ingress.crd.yaml | 333 -
...000_10_config-operator_01_network.crd.yaml | 163 -
.../0000_10_config-operator_01_node.crd.yaml | 59 -
.../0000_10_config-operator_01_oauth.crd.yaml | 444 -
...000_10_config-operator_01_project.crd.yaml | 55 -
...0_10_config-operator_01_scheduler.crd.yaml | 68 -
.../github.com/openshift/api/config/v1/doc.go | 1 +
.../config/v1/stable.apiserver.testsuite.yaml | 16 -
.../v1/stable.authentication.testsuite.yaml | 14 -
.../api/config/v1/stable.build.testsuite.yaml | 14 -
.../v1/stable.clusteroperator.testsuite.yaml | 14 -
.../v1/stable.clusterversion.testsuite.yaml | 16 -
.../config/v1/stable.console.testsuite.yaml | 14 -
.../api/config/v1/stable.dns.testsuite.yaml | 105 -
.../v1/stable.featuregate.testsuite.yaml | 14 -
.../api/config/v1/stable.image.testsuite.yaml | 14 -
.../stable.imagecontentpolicy.testsuite.yaml | 14 -
.../v1/stable.infrastructure.testsuite.yaml | 14 -
.../config/v1/stable.ingress.testsuite.yaml | 14 -
.../config/v1/stable.network.testsuite.yaml | 14 -
.../api/config/v1/stable.node.testsuite.yaml | 14 -
.../api/config/v1/stable.oauth.testsuite.yaml | 14 -
.../v1/stable.operatorhub.testsuite.yaml | 14 -
.../config/v1/stable.project.testsuite.yaml | 14 -
.../api/config/v1/stable.proxy.testsuite.yaml | 14 -
.../config/v1/stable.scheduler.testsuite.yaml | 14 -
.../techpreview.infrastructure.testsuite.yaml | 14 -
.../openshift/api/config/v1/types.go | 30 +
.../api/config/v1/types_apiserver.go | 22 +-
.../api/config/v1/types_authentication.go | 340 +-
.../openshift/api/config/v1/types_build.go | 14 +-
.../api/config/v1/types_cluster_operator.go | 19 +-
.../api/config/v1/types_cluster_version.go | 311 +-
.../openshift/api/config/v1/types_console.go | 14 +-
.../openshift/api/config/v1/types_dns.go | 14 +-
.../openshift/api/config/v1/types_feature.go | 206 +-
.../openshift/api/config/v1/types_image.go | 18 +-
.../config/v1/types_image_content_policy.go | 14 +-
.../v1/types_image_digest_mirror_set.go | 14 +-
.../config/v1/types_image_tag_mirror_set.go | 14 +-
.../api/config/v1/types_infrastructure.go | 808 +-
.../openshift/api/config/v1/types_ingress.go | 42 +-
.../openshift/api/config/v1/types_network.go | 136 +-
.../openshift/api/config/v1/types_node.go | 12 +-
.../openshift/api/config/v1/types_oauth.go | 25 +-
.../api/config/v1/types_operatorhub.go | 13 +-
.../openshift/api/config/v1/types_project.go | 14 +-
.../openshift/api/config/v1/types_proxy.go | 14 +-
.../api/config/v1/types_scheduling.go | 42 +-
.../api/config/v1/types_testreporting.go | 46 +
.../api/config/v1/types_tlssecurityprofile.go | 63 +-
.../api/config/v1/zz_generated.deepcopy.go | 1028 +-
..._generated.featuregated-crd-manifests.yaml | 508 +
.../v1/zz_generated.swagger_doc_generated.go | 687 +-
...ig-operator_01_insightsdatagather.crd.yaml | 62 -
.../openshift/api/config/v1alpha1/register.go | 6 +
...hpreview.insightsdatagather.testsuite.yaml | 14 -
.../api/config/v1alpha1/types_backup.go | 174 +
.../v1alpha1/types_cluster_image_policy.go | 77 +
.../api/config/v1alpha1/types_image_policy.go | 236 +
.../api/config/v1alpha1/types_insights.go | 14 +-
.../config/v1alpha1/zz_generated.deepcopy.go | 553 +
..._generated.featuregated-crd-manifests.yaml | 92 +
.../zz_generated.swagger_doc_generated.go | 235 +-
.../openshift/api/console/.codegen.yaml | 2 +
.../v1/0000_10_consoleclidownload.crd.yaml | 77 -
.../0000_10_consoleexternalloglink.crd.yaml | 68 -
.../console/v1/0000_10_consolelink.crd.yaml | 125 -
.../v1/0000_10_consolenotification.crd.yaml | 84 -
.../v1/0000_10_consolequickstart.crd.yaml | 165 -
.../v1/0000_10_consoleyamlsample.crd.yaml | 74 -
.../console/v1/0000_51_consoleplugin.crd.yaml | 294 -
.../openshift/api/console/v1/register.go | 18 +-
.../stable.consoleclidownload.testsuite.yaml | 20 -
...able.consoleexternalloglink.testsuite.yaml | 18 -
.../v1/stable.consolelink.testsuite.yaml | 20 -
.../stable.consolenotification.testsuite.yaml | 16 -
.../v1/stable.consoleplugin.testsuite.yaml | 88 -
.../stable.consolequickstart.testsuite.yaml | 28 -
.../stable.consoleyamlsample.testsuite.yaml | 26 -
.../console/v1/types_console_cli_download.go | 18 +-
.../v1/types_console_external_log_links.go | 19 +-
.../api/console/v1/types_console_link.go | 20 +-
.../console/v1/types_console_notification.go | 19 +-
.../api/console/v1/types_console_plugin.go | 16 +-
.../console/v1/types_console_quick_start.go | 15 +-
.../api/console/v1/types_console_sample.go | 273 +
.../console/v1/types_console_yaml_sample.go | 15 +-
.../api/console/v1/zz_generated.deepcopy.go | 191 +
..._generated.featuregated-crd-manifests.yaml | 225 +
.../v1/zz_generated.swagger_doc_generated.go | 137 +-
.../v1alpha1/0000_51_consoleplugin.crd.yaml | 294 -
.../stable.consoleplugin.testsuite.yaml | 23 -
.../console/v1alpha1/types_console_plugin.go | 16 +-
..._generated.featuregated-crd-manifests.yaml | 24 +
.../zz_generated.swagger_doc_generated.go | 6 +-
vendor/github.com/openshift/api/features.md | 73 +
.../openshift/api/helm/.codegen.yaml | 2 +
.../0000_10-helm-chart-repository.crd.yaml | 130 -
..._10-project-helm-chart-repository.crd.yaml | 139 -
.../stable.helmchartrepository.testsuite.yaml | 14 -
....projecthelmchartrepository.testsuite.yaml | 14 -
.../v1beta1/types_helm_chart_repository.go | 13 +-
.../types_project_helm_chart_repository.go | 13 +-
..._generated.featuregated-crd-manifests.yaml | 42 +
.../zz_generated.swagger_doc_generated.go | 20 +-
.../openshift/api/image/.codegen.yaml | 2 +
.../openshift/api/image/docker10/register.go | 13 +-
.../api/image/dockerpre012/register.go | 13 +-
.../openshift/api/image/v1/generated.pb.go | 387 +-
.../openshift/api/image/v1/generated.proto | 33 +
.../openshift/api/image/v1/types.go | 63 +-
.../api/image/v1/zz_generated.deepcopy.go | 5 +
.../v1/zz_generated.swagger_doc_generated.go | 66 +-
.../openshift/api/imageregistry/.codegen.yaml | 2 +
.../v1/00_imageregistry.crd.yaml | 1968 -
.../v1/00_imageregistry.crd.yaml-patch | 13 -
.../imageregistry/v1/01_imagepruner.crd.yaml | 1034 -
.../api/imageregistry/v1/register.go | 11 +-
.../v1/stable.config.testsuite.yaml | 18 -
.../v1/stable.imagepruner.testsuite.yaml | 15 -
.../openshift/api/imageregistry/v1/types.go | 132 +-
.../api/imageregistry/v1/types_imagepruner.go | 13 +-
.../imageregistry/v1/zz_generated.deepcopy.go | 44 +-
..._generated.featuregated-crd-manifests.yaml | 43 +
.../v1/zz_generated.swagger_doc_generated.go | 45 +-
vendor/github.com/openshift/api/install.go | 2 -
.../api/kubecontrolplane/.codegen.yaml | 2 +
.../api/kubecontrolplane/v1/types.go | 6 +-
.../v1/zz_generated.swagger_doc_generated.go | 2 +-
.../openshift/api/legacyconfig/v1/register.go | 3 +-
.../openshift/api/legacyconfig/v1/types.go | 9 +-
.../v1/zz_generated.swagger_doc_generated.go | 6 +-
.../openshift/api/machine/.codegen.yaml | 3 +
.../0000_10_controlplanemachineset.crd.yaml | 526 -
....controlplanemachineset.aws.testsuite.yaml | 368 -
...ontrolplanemachineset.azure.testsuite.yaml | 74 -
....controlplanemachineset.gcp.testsuite.yaml | 74 -
...able.controlplanemachineset.testsuite.yaml | 488 -
.../api/machine/v1/types_alibabaprovider.go | 18 +-
.../v1/types_controlplanemachineset.go | 139 +-
.../api/machine/v1/types_nutanixprovider.go | 61 +-
.../api/machine/v1/types_powervsprovider.go | 37 +-
.../api/machine/v1/zz_generated.deepcopy.go | 140 +-
..._generated.featuregated-crd-manifests.yaml | 51 +
.../v1/zz_generated.swagger_doc_generated.go | 93 +-
.../api/machine/v1alpha1/types_openstack.go | 76 +-
.../machine/v1alpha1/zz_generated.deepcopy.go | 61 +
.../zz_generated.swagger_doc_generated.go | 75 +-
.../machine/v1beta1/0000_10_machine.crd.yaml | 327 -
.../v1beta1/0000_10_machinehealthcheck.yaml | 193 -
.../v1beta1/0000_10_machineset.crd.yaml | 347 -
.../v1beta1/stable.machine.testsuite.yaml | 14 -
.../stable.machinehealthcheck.testsuite.yaml | 16 -
.../v1beta1/stable.machineset.testsuite.yaml | 15 -
.../api/machine/v1beta1/types_awsprovider.go | 5 +
.../machine/v1beta1/types_azureprovider.go | 127 +-
.../api/machine/v1beta1/types_gcpprovider.go | 128 +-
.../api/machine/v1beta1/types_machine.go | 54 +-
.../v1beta1/types_machinehealthcheck.go | 19 +-
.../api/machine/v1beta1/types_machineset.go | 18 +-
.../api/machine/v1beta1/types_provider.go | 7 +
.../machine/v1beta1/types_vsphereprovider.go | 83 +-
.../machine/v1beta1/zz_generated.deepcopy.go | 178 +-
..._generated.featuregated-crd-manifests.yaml | 138 +
.../zz_generated.swagger_doc_generated.go | 219 +-
.../openshift/api/monitoring/.codegen.yaml | 8 +
.../openshift/api/monitoring/install.go | 4 +-
.../api/monitoring/{v1alpha1 => v1}/Makefile | 2 +-
.../api/monitoring/{v1alpha1 => v1}/doc.go | 2 +-
.../monitoring/{v1alpha1 => v1}/register.go | 4 +-
.../api/monitoring/{v1alpha1 => v1}/types.go | 143 +-
.../{v1alpha1 => v1}/zz_generated.deepcopy.go | 6 +-
..._generated.featuregated-crd-manifests.yaml | 44 +
.../zz_generated.swagger_doc_generated.go | 50 +-
...00_50_monitoring_01_alertingrules.crd.yaml | 122 -
...monitoring_02_alertrelabelconfigs.crd.yaml | 140 -
.../techpreview.alertingrule.testsuite.yaml | 24 -
...hpreview.alertrelabelconfig.testsuite.yaml | 20 -
.../openshift/api/network/.codegen.yaml | 1 +
.../openshift/api/network/install.go | 3 +-
.../network/v1/001-clusternetwork-crd.yaml | 102 -
.../api/network/v1/002-hostsubnet-crd.yaml | 88 -
.../api/network/v1/003-netnamespace-crd.yaml | 66 -
.../v1/004-egressnetworkpolicy-crd.yaml | 71 -
.../openshift/api/network/v1/generated.proto | 53 +-
.../v1/stable.clusternetwork.testsuite.yaml | 16 -
.../stable.egressnetworkpolicy.testsuite.yaml | 16 -
.../v1/stable.hostsubnet.testsuite.yaml | 18 -
.../v1/stable.netnamespace.testsuite.yaml | 16 -
.../openshift/api/network/v1/types.go | 69 +-
..._generated.featuregated-crd-manifests.yaml | 126 +
.../v1/zz_generated.swagger_doc_generated.go | 28 +-
.../openshift/api/network/v1alpha1/Makefile | 3 +
.../openshift/api/network/v1alpha1/doc.go | 6 +
.../api/network/v1alpha1/register.go | 40 +
.../network/v1alpha1/types_dnsnameresolver.go | 142 +
.../network/v1alpha1/zz_generated.deepcopy.go | 161 +
..._generated.featuregated-crd-manifests.yaml | 23 +
.../zz_generated.swagger_doc_generated.go | 76 +
.../api/networkoperator/.codegen.yaml | 2 +
.../v1/001-egressrouter.crd.yaml | 208 -
.../v1/001-egressrouter.crd.yaml-patch | 26 -
.../api/networkoperator/v1/generated.proto | 11 +-
.../v1/stable.egressrouter.testsuite.yaml | 23 -
.../networkoperator/v1/types_egressrouter.go | 15 +-
..._generated.featuregated-crd-manifests.yaml | 29 +
.../v1/zz_generated.swagger_doc_generated.go | 10 +-
.../openshift/api/oauth/.codegen.yaml | 2 +
.../openshift/api/oauth/v1/generated.proto | 22 +
.../openshift/api/oauth/v1/types.go | 40 +-
.../v1/zz_generated.swagger_doc_generated.go | 28 +-
.../api/openshiftcontrolplane/.codegen.yaml | 2 +
.../api/openshiftcontrolplane/v1/types.go | 69 +-
.../v1/zz_generated.deepcopy.go | 50 +
.../v1/zz_generated.swagger_doc_generated.go | 21 +-
.../openshift/api/operator/.codegen.yaml | 6 +
...0000_10_config-operator_01_config.crd.yaml | 136 -
.../0000_12_etcd-operator_01_config.crd.yaml | 192 -
...kube-apiserver-operator_01_config.crd.yaml | 205 -
...piserver-operator_01_config.crd.yaml-patch | 3 -
...roller-manager-operator_01_config.crd.yaml | 198 -
...-manager-operator_01_config.crd.yaml-patch | 3 -
...kube-scheduler-operator_01_config.crd.yaml | 194 -
...cheduler-operator_01_config.crd.yaml-patch | 3 -
...hift-apiserver-operator_01_config.crd.yaml | 141 -
...oud-credential-operator_00_config.crd.yaml | 142 -
...rsion-migrator-operator_00_config.crd.yaml | 133 -
...authentication-operator_01_config.crd.yaml | 140 -
...roller-manager-operator_02_config.crd.yaml | 134 -
...00_50_cluster_storage_operator_01_crd.yaml | 134 -
...ess-operator_00-ingresscontroller.crd.yaml | 983 -
...erator_00-ingresscontroller.crd.yaml-patch | 32 -
...ghts-operator_00-insightsoperator.crd.yaml | 256 -
.../0000_50_service-ca-operator_02_crd.yaml | 135 -
...00_70_cluster-network-operator_01.crd.yaml | 521 -
.../v1/0000_70_console-operator.crd.yaml | 397 -
.../v1/0000_70_dns-operator_00.crd.yaml | 305 -
.../v1/0000_70_dns-operator_00.crd.yaml-patch | 21 -
...i_snapshot_controller_operator_01_crd.yaml | 134 -
...0_90_cluster_csi_driver_01_config.crd.yaml | 182 -
...luster_csi_driver_01_config.crd.yaml-patch | 21 -
.../openshift/api/operator/v1/register.go | 2 +
.../v1/stable.authentication.testsuite.yaml | 16 -
.../v1/stable.cloudcredential.testsuite.yaml | 16 -
.../v1/stable.clustercsidriver.testsuite.yaml | 20 -
.../operator/v1/stable.config.testsuite.yaml | 16 -
.../operator/v1/stable.console.testsuite.yaml | 16 -
...table.csisnapshotcontroller.testsuite.yaml | 16 -
.../api/operator/v1/stable.dns.testsuite.yaml | 21 -
.../operator/v1/stable.etcd.testsuite.yaml | 16 -
.../stable.ingresscontroller.testsuite.yaml | 15 -
.../v1/stable.insightsoperator.testsuite.yaml | 16 -
.../v1/stable.kubeapiserver.testsuite.yaml | 16 -
...table.kubecontrollermanager.testsuite.yaml | 17 -
.../v1/stable.kubescheduler.testsuite.yaml | 16 -
....kubestorageversionmigrator.testsuite.yaml | 16 -
.../operator/v1/stable.network.testsuite.yaml | 17 -
.../stable.openshiftapiserver.testsuite.yaml | 16 -
....openshiftcontrollermanager.testsuite.yaml | 16 -
.../v1/stable.serviceca.testsuite.yaml | 16 -
.../operator/v1/stable.storage.testsuite.yaml | 16 -
.../openshift/api/operator/v1/types.go | 27 +-
.../api/operator/v1/types_authentication.go | 14 +-
.../api/operator/v1/types_cloudcredential.go | 14 +-
.../openshift/api/operator/v1/types_config.go | 13 +-
.../api/operator/v1/types_console.go | 109 +-
.../operator/v1/types_csi_cluster_driver.go | 195 +-
.../api/operator/v1/types_csi_snapshot.go | 17 +-
.../openshift/api/operator/v1/types_dns.go | 21 +-
.../openshift/api/operator/v1/types_etcd.go | 54 +-
.../api/operator/v1/types_ingress.go | 260 +-
.../api/operator/v1/types_insights.go | 21 +-
.../api/operator/v1/types_kubeapiserver.go | 13 +-
.../v1/types_kubecontrollermanager.go | 13 +-
.../v1/types_kubestorageversionmigrator.go | 13 +-
.../operator/v1/types_machineconfiguration.go | 509 +
.../api/operator/v1/types_network.go | 281 +-
.../operator/v1/types_openshiftapiserver.go | 13 +-
.../v1/types_openshiftcontrollermanager.go | 13 +-
.../api/operator/v1/types_scheduler.go | 13 +-
.../api/operator/v1/types_serviceca.go | 13 +-
.../v1/types_servicecatalogapiserver.go | 8 +-
.../types_servicecatalogcontrollermanager.go | 8 +-
.../api/operator/v1/types_storage.go | 36 +-
.../api/operator/v1/zz_generated.deepcopy.go | 907 +-
..._generated.featuregated-crd-manifests.yaml | 428 +
.../v1/zz_generated.swagger_doc_generated.go | 638 +-
...rator_01_imagecontentsourcepolicy.crd.yaml | 59 -
.../api/operator/v1alpha1/register.go | 4 +
...le.imagecontentsourcepolicy.testsuite.yaml | 14 -
.../openshift/api/operator/v1alpha1/types.go | 29 +-
.../api/operator/v1alpha1/types_etcdbackup.go | 106 +
.../types_image_content_source_policy.go | 14 +-
.../api/operator/v1alpha1/types_olm.go | 62 +
.../v1alpha1/zz_generated.deepcopy.go | 217 +
..._generated.featuregated-crd-manifests.yaml | 68 +
.../zz_generated.swagger_doc_generated.go | 90 +-
.../api/operatorcontrolplane/.codegen.yaml | 2 +
...10-pod-network-connectivity-check.crd.yaml | 227 -
...podnetworkconnectivitycheck.testsuite.yaml | 18 -
.../v1alpha1/types_conditioncheck.go | 13 +-
..._generated.featuregated-crd-manifests.yaml | 22 +
.../zz_generated.swagger_doc_generated.go | 12 +-
.../openshift/api/project/v1/generated.proto | 6 +
.../openshift/api/project/v1/types.go | 13 +-
.../v1/zz_generated.swagger_doc_generated.go | 13 +-
...openshift_01_clusterresourcequota.crd.yaml | 197 -
.../openshift/api/quota/v1/generated.proto | 14 +
...stable.clusterresourcequota.testsuite.yaml | 18 -
.../openshift/api/quota/v1/types.go | 22 +-
..._generated.featuregated-crd-manifests.yaml | 22 +
.../v1/zz_generated.swagger_doc_generated.go | 24 +-
.../openshift/api/route/.codegen.yaml | 3 +
.../openshift/api/route/v1/generated.pb.go | 1671 +-
.../openshift/api/route/v1/generated.proto | 196 +-
.../openshift/api/route/v1/route.crd.yaml | 298 -
.../api/route/v1/route.crd.yaml-patch | 86 -
.../api/route/v1/stable.route.testsuite.yaml | 22 -
.../openshift/api/route/v1/types.go | 219 +-
.../api/route/v1/zz_generated.deepcopy.go | 129 +-
..._generated.featuregated-crd-manifests.yaml | 34 +
.../v1/zz_generated.swagger_doc_generated.go | 77 +-
.../openshift/api/samples/.codegen.yaml | 2 +
.../samples/v1/0000_10_samplesconfig.crd.yaml | 180 -
.../openshift/api/samples/v1/generated.pb.go | 154 +-
.../openshift/api/samples/v1/generated.proto | 30 +
.../openshift/api/samples/v1/register.go | 11 +-
.../samples/v1/stable.config.testsuite.yaml | 14 -
.../openshift/api/samples/v1/types_config.go | 39 +-
.../api/samples/v1/zz_generated.deepcopy.go | 5 +
..._generated.featuregated-crd-manifests.yaml | 23 +
.../v1/zz_generated.swagger_doc_generated.go | 7 +-
...0000_03_security-openshift_01_scc.crd.yaml | 279 -
.../openshift/api/security/v1/consts.go | 3 +
.../openshift/api/security/v1/generated.proto | 31 +-
....securitycontextconstraints.testsuite.yaml | 36 -
.../openshift/api/security/v1/types.go | 39 +-
..._generated.featuregated-crd-manifests.yaml | 59 +
.../v1/zz_generated.swagger_doc_generated.go | 18 +-
.../api/servicecertsigner/.codegen.yaml | 2 +
.../api/servicecertsigner/v1alpha1/types.go | 8 +-
.../zz_generated.swagger_doc_generated.go | 8 +-
.../api/sharedresource/.codegen.yaml | 2 +
.../v1alpha1/0000_10_sharedconfigmap.crd.yaml | 155 -
.../v1alpha1/0000_10_sharedsecret.crd.yaml | 155 -
.../api/sharedresource/v1alpha1/register.go | 11 +-
.../stable.sharedconfigmap.testsuite.yaml | 20 -
.../stable.sharedsecret.testsuite.yaml | 20 -
.../v1alpha1/types_shared_configmap.go | 20 +-
.../v1alpha1/types_shared_secret.go | 17 +-
..._generated.featuregated-crd-manifests.yaml | 46 +
.../zz_generated.swagger_doc_generated.go | 20 +-
.../openshift/api/template/v1/generated.proto | 12 +
.../openshift/api/template/v1/types.go | 24 +-
.../v1/zz_generated.swagger_doc_generated.go | 28 +-
.../openshift/api/user/v1/generated.proto | 14 +
.../github.com/openshift/api/user/v1/types.go | 29 +-
.../v1/zz_generated.swagger_doc_generated.go | 23 +-
.../config/v1/authenticationspec.go | 14 +
.../config/v1/authenticationstatus.go | 14 +
.../config/v1/awsdnsspec.go | 23 +
.../config/v1/azureplatformstatus.go | 22 +-
.../config/v1/azureresourcetag.go | 32 +
.../v1/baremetalplatformloadbalancer.go | 27 +
.../config/v1/baremetalplatformspec.go | 51 +
.../config/v1/baremetalplatformstatus.go | 34 +-
.../config/v1/cloudcontrollermanagerstatus.go | 27 +
.../config/v1/cloudloadbalancerconfig.go | 36 +
.../config/v1/cloudloadbalancerips.go | 51 +
.../config/v1/clusterversionspec.go | 26 +-
.../config/v1/customfeaturegates.go | 12 +-
.../config/v1/dnsplatformspec.go | 36 +
.../applyconfigurations/config/v1/dnsspec.go | 15 +-
.../config/v1/externalplatformspec.go | 23 +
.../config/v1/externalplatformstatus.go | 23 +
.../config/v1/featuregate.go | 8 +-
.../config/v1/featuregateattributes.go | 27 +
.../config/v1/featuregatedetails.go | 51 +
.../config/v1/featuregatestatus.go | 43 +
.../config/v1/gcpplatformstatus.go | 41 +-
.../config/v1/gcpresourcelabel.go | 32 +
.../config/v1/gcpresourcetag.go | 41 +
.../config/v1/ibmcloudplatformstatus.go | 24 +-
.../config/v1/ibmcloudserviceendpoint.go | 36 +
.../config/v1/infrastructurestatus.go | 9 +
.../config/v1/networkdiagnostics.go | 45 +
.../v1/networkdiagnosticssourceplacement.go | 44 +
.../v1/networkdiagnosticstargetplacement.go | 44 +
.../config/v1/networkspec.go | 9 +
.../config/v1/networkstatus.go | 15 +
.../config/v1/nutanixfailuredomain.go | 46 +
.../config/v1/nutanixplatformloadbalancer.go | 27 +
.../config/v1/nutanixplatformspec.go | 18 +-
.../config/v1/nutanixplatformstatus.go | 17 +-
.../config/v1/nutanixresourceidentifier.go | 45 +
.../config/v1/oidcclientconfig.go | 61 +
.../config/v1/oidcclientreference.go | 41 +
.../config/v1/oidcclientstatus.go | 73 +
.../config/v1/oidcprovider.go | 69 +
.../v1/openstackplatformloadbalancer.go | 27 +
.../config/v1/openstackplatformspec.go | 51 +
.../config/v1/openstackplatformstatus.go | 36 +-
.../config/v1/ovirtplatformloadbalancer.go | 27 +
.../config/v1/ovirtplatformstatus.go | 19 +-
.../config/v1/platformspec.go | 45 +-
.../config/v1/platformstatus.go | 9 +
.../config/v1/powervsplatformstatus.go | 9 +
.../config/v1/prefixedclaimmapping.go | 32 +
.../config/v1/profilecustomizations.go | 27 +
.../config/v1/schedulerspec.go | 17 +-
.../config/v1/signaturestore.go | 32 +
.../config/v1/tokenclaimmapping.go | 23 +
.../config/v1/tokenclaimmappings.go | 32 +
.../config/v1/tokenclaimvalidationrule.go | 36 +
.../config/v1/tokenissuer.go | 47 +
.../config/v1/tokenrequiredclaim.go | 32 +
.../applyconfigurations/config/v1/update.go | 19 +-
.../config/v1/usernameclaimmapping.go | 45 +
.../config/v1/usernameprefix.go | 23 +
.../config/v1/vsphereplatformloadbalancer.go | 27 +
.../config/v1/vsphereplatformspec.go | 43 +-
.../config/v1/vsphereplatformstatus.go | 34 +-
.../config/v1/vsphereplatformtopology.go | 9 +
.../config/v1alpha1/backup.go | 240 +
.../config/v1alpha1/backupspec.go | 23 +
.../config/v1alpha1/clusterimagepolicy.go | 240 +
.../config/v1alpha1/clusterimagepolicyspec.go | 38 +
.../v1alpha1/clusterimagepolicystatus.go | 29 +
.../config/v1alpha1/etcdbackupspec.go | 50 +
.../config/v1alpha1/fulciocawithrekor.go | 45 +
.../config/v1alpha1/imagepolicy.go | 242 +
.../config/v1alpha1/imagepolicyspec.go | 38 +
.../config/v1alpha1/imagepolicystatus.go | 29 +
.../config/v1alpha1/policy.go | 32 +
.../config/v1alpha1/policyfulciosubject.go | 32 +
.../config/v1alpha1/policyidentity.go | 45 +
.../v1alpha1/policymatchexactrepository.go | 27 +
.../v1alpha1/policymatchremapidentity.go | 36 +
.../config/v1alpha1/policyrootoftrust.go | 45 +
.../config/v1alpha1/publickey.go | 36 +
.../config/v1alpha1/retentionnumberconfig.go | 23 +
.../config/v1alpha1/retentionpolicy.go | 45 +
.../config/v1alpha1/retentionsizeconfig.go | 23 +
.../applyconfigurations/internal/internal.go | 1081 +-
.../config/clientset/versioned/clientset.go | 3 +-
.../config/clientset/versioned/doc.go | 4 -
.../typed/config/v1/fake/fake_apiserver.go | 71 +-
.../config/v1/fake/fake_authentication.go | 71 +-
.../typed/config/v1/fake/fake_build.go | 59 +-
.../config/v1/fake/fake_clusteroperator.go | 71 +-
.../config/v1/fake/fake_clusterversion.go | 71 +-
.../typed/config/v1/fake/fake_console.go | 71 +-
.../typed/config/v1/fake/fake_dns.go | 71 +-
.../typed/config/v1/fake/fake_featuregate.go | 71 +-
.../typed/config/v1/fake/fake_image.go | 71 +-
.../config/v1/fake/fake_imagecontentpolicy.go | 59 +-
.../v1/fake/fake_imagedigestmirrorset.go | 71 +-
.../config/v1/fake/fake_imagetagmirrorset.go | 71 +-
.../config/v1/fake/fake_infrastructure.go | 71 +-
.../typed/config/v1/fake/fake_ingress.go | 71 +-
.../typed/config/v1/fake/fake_network.go | 71 +-
.../typed/config/v1/fake/fake_node.go | 71 +-
.../typed/config/v1/fake/fake_oauth.go | 71 +-
.../typed/config/v1/fake/fake_operatorhub.go | 71 +-
.../typed/config/v1/fake/fake_project.go | 71 +-
.../typed/config/v1/fake/fake_proxy.go | 71 +-
.../typed/config/v1/fake/fake_scheduler.go | 71 +-
.../versioned/typed/config/v1alpha1/backup.go | 227 +
.../config/v1alpha1/clusterimagepolicy.go | 227 +
.../typed/config/v1alpha1/config_client.go | 15 +
.../typed/config/v1alpha1/fake/fake_backup.go | 162 +
.../v1alpha1/fake/fake_clusterimagepolicy.go | 162 +
.../v1alpha1/fake/fake_config_client.go | 12 +
.../config/v1alpha1/fake/fake_imagepolicy.go | 173 +
.../v1alpha1/fake/fake_insightsdatagather.go | 5 +-
.../config/v1alpha1/generated_expansion.go | 6 +
.../typed/config/v1alpha1/imagepolicy.go | 240 +
.../console/v1/consolesample.go | 231 +
.../v1/consolesamplecontainerimportsource.go | 32 +
...nsolesamplecontainerimportsourceservice.go | 23 +
.../v1/consolesamplegitimportsource.go | 32 +
.../consolesamplegitimportsourcerepository.go | 41 +
.../v1/consolesamplegitimportsourceservice.go | 23 +
.../console/v1/consolesamplesource.go | 45 +
.../console/v1/consolesamplespec.go | 88 +
.../applyconfigurations/internal/internal.go | 123 +
.../console/clientset/versioned/clientset.go | 3 +-
.../console/clientset/versioned/doc.go | 4 -
.../typed/console/v1/console_client.go | 5 +
.../typed/console/v1/consolesample.go | 181 +
.../console/v1/fake/fake_console_client.go | 4 +
.../v1/fake/fake_consoleclidownload.go | 59 +-
.../v1/fake/fake_consoleexternalloglink.go | 59 +-
.../typed/console/v1/fake/fake_consolelink.go | 59 +-
.../v1/fake/fake_consolenotification.go | 59 +-
.../console/v1/fake/fake_consoleplugin.go | 59 +-
.../console/v1/fake/fake_consolequickstart.go | 59 +-
.../console/v1/fake/fake_consolesample.go | 129 +
.../console/v1/fake/fake_consoleyamlsample.go | 59 +-
.../typed/console/v1/generated_expansion.go | 2 +
.../v1alpha1/fake/fake_consoleplugin.go | 5 +-
.../imageregistry/v1/azurenetworkaccess.go | 36 +
.../v1/azurenetworkaccessinternal.go | 50 +
.../v1/imageregistryconfigstorageazure.go | 15 +-
.../v1/imageregistryconfigstorages3.go | 9 +
.../clientset/versioned/clientset.go | 3 +-
.../imageregistry/clientset/versioned/doc.go | 4 -
.../applyconfigurations/internal/internal.go | 65 +-
.../machine/v1/azurefailuredomain.go | 11 +-
.../machine/v1/failuredomains.go | 50 +-
.../v1/nutanixfailuredomainreference.go | 23 +
.../machine/v1/openstackfailuredomain.go | 11 +-
.../machine/v1/rootvolume.go | 32 +
.../machine/v1/vspherefailuredomain.go | 23 +
.../machine/clientset/versioned/clientset.go | 3 +-
.../machine/clientset/versioned/doc.go | 4 -
.../v1/fake/fake_controlplanemachineset.go | 71 +-
.../machine/v1beta1/fake/fake_machine.go | 5 +-
.../v1beta1/fake/fake_machinehealthcheck.go | 5 +-
.../machine/v1beta1/fake/fake_machineset.go | 5 +-
.../applyconfigurations/internal/internal.go | 879 +-
.../operator/v1/awscsidriverconfigspec.go | 23 +
.../operator/v1/azurecsidriverconfigspec.go | 23 +
.../operator/v1/azurediskencryptionset.go | 41 +
.../containerloggingdestinationparameters.go | 23 +
.../operator/v1/csidriverconfigspec.go | 40 +-
.../operator/v1/defaultnetworkdefinition.go | 9 -
.../operator/v1/etcdspec.go | 18 +
.../operator/v1/etcdstatus.go | 13 +
.../operator/v1/forwardplugin.go | 15 +-
.../operator/v1/gatewayconfig.go | 33 +-
.../operator/v1/gcpcsidriverconfigspec.go | 23 +
.../operator/v1/gcpkmskeyreference.go | 50 +
.../v1/ibmcloudcsidriverconfigspec.go | 23 +
.../operator/v1/ibmloadbalancerparameters.go | 27 +
.../v1/ingresscontrollerhttpheader.go | 32 +
.../v1/ingresscontrollerhttpheaderactions.go | 42 +
.../ingresscontrollerhttpheaderactionunion.go | 36 +
.../v1/ingresscontrollerhttpheaders.go | 9 +
.../v1/ingresscontrollersethttpheader.go | 23 +
.../v1/ingresscontrollertuningoptions.go | 9 +
.../operator/v1/insightsreport.go | 13 +
.../operator/v1/ipsecconfig.go | 27 +
.../operator/v1/ipv4gatewayconfig.go | 23 +
.../operator/v1/ipv4ovnkubernetesconfig.go | 32 +
.../operator/v1/ipv6gatewayconfig.go | 23 +
.../operator/v1/ipv6ovnkubernetesconfig.go | 32 +
.../operator/v1/kubeapiserverstatus.go | 14 +
.../operator/v1/kuryrconfig.go | 86 -
.../operator/v1/loggingdestination.go | 10 +-
.../operator/v1/machineconfiguration.go | 240 +
.../operator/v1/machineconfigurationspec.go | 102 +
.../operator/v1/machineconfigurationstatus.go | 47 +
.../operator/v1/machinemanager.go | 45 +
.../operator/v1/machinemanagerselector.go | 36 +
.../operator/v1/managedbootimages.go | 28 +
.../operator/v1/networkmigration.go | 13 +
.../v1/nodedisruptionpolicyclusterstatus.go | 51 +
.../operator/v1/nodedisruptionpolicyconfig.go | 51 +
.../v1/nodedisruptionpolicyspecaction.go | 45 +
.../v1/nodedisruptionpolicyspecfile.go | 37 +
.../v1/nodedisruptionpolicyspecsshkey.go | 28 +
.../v1/nodedisruptionpolicyspecunit.go | 41 +
.../operator/v1/nodedisruptionpolicystatus.go | 23 +
.../v1/nodedisruptionpolicystatusaction.go | 45 +
.../v1/nodedisruptionpolicystatusfile.go | 37 +
.../v1/nodedisruptionpolicystatussshkey.go | 28 +
.../v1/nodedisruptionpolicystatusunit.go | 41 +
.../operator/v1/ovnkubernetesconfig.go | 44 +-
.../operator/v1/partialselector.go | 27 +
.../operator/v1/perspective.go | 25 +-
.../operator/v1/pinnedresourcereference.go | 41 +
.../operator/v1/policyauditconfig.go | 9 +
.../v1/providerloadbalancerparameters.go | 9 +
.../operator/v1/reloadservice.go | 27 +
.../operator/v1/restartservice.go | 27 +
.../operator/v1/serviceaccountissuerstatus.go | 36 +
.../operator/v1/storagespec.go | 9 +
.../operator/v1/upstreamresolvers.go | 15 +-
.../operator/v1/vspherecsidriverconfigspec.go | 29 +-
.../operator/v1alpha1/backupjobreference.go | 32 +
.../operator/v1alpha1/etcdbackup.go | 240 +
.../operator/v1alpha1/etcdbackupspec.go | 23 +
.../operator/v1alpha1/etcdbackupstatus.go | 38 +
.../operator/v1alpha1/olm.go | 240 +
.../operator/v1alpha1/olmspec.go | 61 +
.../operator/v1alpha1/olmstatus.go | 69 +
.../operator/clientset/versioned/clientset.go | 3 +-
.../operator/clientset/versioned/doc.go | 4 -
.../operator/v1/fake/fake_authentication.go | 71 +-
.../operator/v1/fake/fake_cloudcredential.go | 71 +-
.../operator/v1/fake/fake_clustercsidriver.go | 71 +-
.../typed/operator/v1/fake/fake_config.go | 71 +-
.../typed/operator/v1/fake/fake_console.go | 71 +-
.../v1/fake/fake_csisnapshotcontroller.go | 71 +-
.../typed/operator/v1/fake/fake_dns.go | 71 +-
.../typed/operator/v1/fake/fake_etcd.go | 71 +-
.../v1/fake/fake_ingresscontroller.go | 71 +-
.../operator/v1/fake/fake_insightsoperator.go | 71 +-
.../operator/v1/fake/fake_kubeapiserver.go | 71 +-
.../v1/fake/fake_kubecontrollermanager.go | 71 +-
.../operator/v1/fake/fake_kubescheduler.go | 71 +-
.../fake/fake_kubestorageversionmigrator.go | 71 +-
.../v1/fake/fake_machineconfiguration.go | 162 +
.../typed/operator/v1/fake/fake_network.go | 71 +-
.../v1/fake/fake_openshiftapiserver.go | 71 +-
.../fake/fake_openshiftcontrollermanager.go | 71 +-
.../operator/v1/fake/fake_operator_client.go | 4 +
.../typed/operator/v1/fake/fake_serviceca.go | 71 +-
.../v1/fake/fake_servicecatalogapiserver.go | 71 +-
.../fake_servicecatalogcontrollermanager.go | 71 +-
.../typed/operator/v1/fake/fake_storage.go | 71 +-
.../typed/operator/v1/generated_expansion.go | 2 +
.../typed/operator/v1/machineconfiguration.go | 227 +
.../typed/operator/v1/operator_client.go | 5 +
.../typed/operator/v1alpha1/etcdbackup.go | 227 +
.../operator/v1alpha1/fake/fake_etcdbackup.go | 162 +
.../fake/fake_imagecontentsourcepolicy.go | 5 +-
.../typed/operator/v1alpha1/fake/fake_olm.go | 162 +
.../v1alpha1/fake/fake_operator_client.go | 8 +
.../operator/v1alpha1/generated_expansion.go | 4 +
.../versioned/typed/operator/v1alpha1/olm.go | 227 +
.../operator/v1alpha1/operator_client.go | 10 +
.../project/clientset/versioned/clientset.go | 3 +-
.../project/clientset/versioned/doc.go | 4 -
.../applyconfigurations/internal/internal.go | 72 +
.../route/v1/localobjectreference.go | 23 +
.../route/v1/routehttpheader.go | 32 +
.../route/v1/routehttpheaderactions.go | 42 +
.../route/v1/routehttpheaderactionunion.go | 36 +
.../route/v1/routehttpheaders.go | 23 +
.../route/v1/routesethttpheader.go | 23 +
.../applyconfigurations/route/v1/routespec.go | 9 +
.../applyconfigurations/route/v1/tlsconfig.go | 21 +-
.../route/clientset/versioned/clientset.go | 3 +-
.../route/clientset/versioned/doc.go | 4 -
.../applyconfigurations/internal/internal.go | 6 +
.../samples/v1/configspec.go | 22 +-
.../samples/clientset/versioned/clientset.go | 3 +-
.../samples/clientset/versioned/doc.go | 4 -
.../typed/samples/v1/fake/fake_config.go | 71 +-
.../security/clientset/versioned/clientset.go | 3 +-
.../security/clientset/versioned/doc.go | 4 -
.../v1/types_credentialsrequest.go | 2 +-
.../pkg/controller/factory/base_controller.go | 16 +-
.../controller/factory/controller_context.go | 2 +-
.../pkg/controller/factory/eventfilters.go | 2 +-
.../pkg/controller/factory/factory.go | 38 +-
.../resourceapply/admissionregistration.go | 136 +-
.../resource/resourceapply/apiextensions.go | 8 +-
.../resource/resourceapply/apiregistration.go | 8 +-
.../operator/resource/resourceapply/apps.go | 20 +-
.../operator/resource/resourceapply/core.go | 81 +-
.../resource/resourceapply/generic.go | 56 +-
.../resource/resourceapply/migration.go | 8 +-
.../resource/resourceapply/monitoring.go | 4 +-
.../operator/resource/resourceapply/policy.go | 8 +-
.../operator/resource/resourceapply/rbac.go | 55 +-
.../resource/resourceapply/storage.go | 80 +-
.../resourceapply/volumesnapshotclass.go | 2 +-
.../resource/resourcemerge/apiextensions.go | 4 +-
.../resource/resourcemerge/object_merger.go | 36 +-
.../resource/resourceread/admission.go | 55 +
.../resource/resourceread/apiextensions.go | 35 +
.../operator/resource/resourceread/apps.go | 34 +
.../operator/resource/resourceread/config.go | 58 +
.../operator/resource/resourceread/core.go | 78 +
.../operator/resource/resourceread/generic.go | 57 +
.../operator/resource/resourceread/images.go | 26 +
.../resource/resourceread/migration.go | 26 +
.../operator/resource/resourceread/policy.go | 25 +
.../operator/resource/resourceread/rbac.go | 50 +
.../operator/resource/resourceread/route.go | 26 +
.../operator/resource/resourceread/storage.go | 43 +
.../resource/resourceread/unstructured.go | 18 +
.../pkg/operator/status/condition.go | 4 +-
.../pkg/operator/status/status_controller.go | 76 +-
.../pkg/operator/v1helpers/helpers.go | 87 +-
.../pkg/operator/v1helpers/informers.go | 6 +-
.../pkg/operator/v1helpers/interfaces.go | 2 +
.../pkg/operator/v1helpers/test_helpers.go | 25 +-
.../pkg/apis/monitoring/register.go | 8 +-
.../pkg/apis/monitoring/resource.go | 60 +
.../apis/monitoring/v1/alertmanager_types.go | 464 +
.../apis/monitoring/v1/podmonitor_types.go | 312 +
.../pkg/apis/monitoring/v1/probe_types.go | 222 +
.../apis/monitoring/v1/prometheus_types.go | 1877 +
.../monitoring/v1/prometheusrule_types.go | 121 +
.../monitoring/v1/servicemonitor_types.go | 168 +
.../pkg/apis/monitoring/v1/thanos_types.go | 136 +-
.../pkg/apis/monitoring/v1/types.go | 1836 +-
.../monitoring/v1/zz_generated.deepcopy.go | 2244 +-
.../alertmanager_config_conversion.go | 18 +
.../v1alpha1/alertmanager_config_types.go | 541 +-
.../v1alpha1/prometheusagent_types.go | 95 +
.../pkg/apis/monitoring/v1alpha1/register.go | 4 +
.../monitoring/v1alpha1/scrapeconfig_types.go | 908 +
.../apis/monitoring/v1alpha1/validation.go | 350 +
.../v1alpha1/zz_generated.deepcopy.go | 2101 +-
.../v1beta1/alertmanager_config_types.go | 1210 +
.../monitoring/v1beta1/conversion_from.go | 601 +
.../apis/monitoring/v1beta1/conversion_to.go | 598 +
.../pkg/apis/monitoring/v1beta1/doc.go | 18 +
.../pkg/apis/monitoring/v1beta1/register.go | 55 +
.../pkg/apis/monitoring/v1beta1/validation.go | 348 +
.../v1beta1/zz_generated.deepcopy.go | 1104 +
.../monitoring/v1/alertingspec.go | 42 +
.../monitoring/v1/alertmanager.go | 217 +
.../v1/alertmanagerconfigmatcherstrategy.go | 37 +
.../v1/alertmanagerconfiguration.go | 60 +
.../monitoring/v1/alertmanagerendpoints.go | 178 +
.../monitoring/v1/alertmanagerglobalconfig.go | 96 +
.../monitoring/v1/alertmanagerspec.go | 508 +
.../monitoring/v1/alertmanagerstatus.go | 87 +
.../monitoring/v1/alertmanagerwebspec.go | 63 +
.../monitoring/v1/apiserverconfig.go | 82 +
.../v1/arbitraryfsaccessthroughsmsconfig.go | 37 +
.../monitoring/v1/argument.go | 46 +
.../monitoring/v1/attachmetadata.go | 37 +
.../monitoring/v1/authorization.go | 58 +
.../monitoring/v1/azuread.go | 64 +
.../monitoring/v1/azureoauth.go | 59 +
.../monitoring/v1/azuresdk.go | 37 +
.../monitoring/v1/basicauth.go | 50 +
.../monitoring/v1/commonprometheusfields.go | 828 +
.../monitoring/v1/condition.go | 87 +
.../v1/corev1topologyspreadconstraint.go | 107 +
.../monitoring/v1/embeddedobjectmetadata.go | 67 +
.../v1/embeddedpersistentvolumeclaim.go | 117 +
.../monitoring/v1/endpoint.go | 248 +
.../monitoring/v1/exemplars.go | 37 +
.../monitoring/v1/globalsmtpconfig.go | 104 +
.../monitoring/v1/hostalias.go | 48 +
.../monitoring/v1/hostport.go | 46 +
.../monitoring/v1/httpconfig.go | 95 +
.../monitoring/v1/managedidentity.go | 37 +
.../monitoring/v1/metadataconfig.go | 50 +
.../monitoring/v1/namespaceselector.go | 48 +
.../monitoring/v1/oauth2.go | 85 +
.../monitoring/v1/objectreference.go | 64 +
.../monitoring/v1/podmetricsendpoint.go | 239 +
.../monitoring/v1/podmonitor.go | 208 +
.../monitoring/v1/podmonitorspec.go | 177 +
.../applyconfiguration/monitoring/v1/probe.go | 208 +
.../monitoring/v1/proberspec.go | 64 +
.../monitoring/v1/probespec.go | 220 +
.../monitoring/v1/probetargetingress.go | 64 +
.../monitoring/v1/probetargets.go | 46 +
.../monitoring/v1/probetargetstaticconfig.go | 68 +
.../monitoring/v1/prometheus.go | 217 +
.../monitoring/v1/prometheusrule.go | 208 +
.../v1/prometheusruleexcludeconfig.go | 46 +
.../monitoring/v1/prometheusrulespec.go | 42 +
.../monitoring/v1/prometheusspec.go | 956 +
.../monitoring/v1/prometheusstatus.go | 119 +
.../monitoring/v1/prometheustracingconfig.go | 111 +
.../monitoring/v1/prometheuswebspec.go | 63 +
.../monitoring/v1/proxyconfig.go | 74 +
.../monitoring/v1/queryspec.go | 68 +
.../monitoring/v1/queueconfig.go | 122 +
.../monitoring/v1/relabelconfig.go | 97 +
.../monitoring/v1/remotereadspec.go | 179 +
.../monitoring/v1/remotewritespec.go | 214 +
.../applyconfiguration/monitoring/v1/rule.go | 108 +
.../monitoring/v1/rulegroup.go | 82 +
.../applyconfiguration/monitoring/v1/rules.go | 37 +
.../monitoring/v1/rulesalert.go | 55 +
.../monitoring/v1/safeauthorization.go | 50 +
.../monitoring/v1/safetlsconfig.go | 77 +
.../monitoring/v1/scrapeclass.go | 69 +
.../monitoring/v1/secretorconfigmap.go | 50 +
.../monitoring/v1/servicemonitor.go | 208 +
.../monitoring/v1/servicemonitorspec.go | 188 +
.../monitoring/v1/shardstatus.go | 73 +
.../applyconfiguration/monitoring/v1/sigv4.go | 77 +
.../monitoring/v1/storagespec.go | 68 +
.../monitoring/v1/thanosruler.go | 217 +
.../monitoring/v1/thanosrulerspec.go | 545 +
.../monitoring/v1/thanosrulerstatus.go | 87 +
.../monitoring/v1/thanosrulerwebspec.go | 45 +
.../monitoring/v1/thanosspec.go | 247 +
.../monitoring/v1/tlsconfig.go | 100 +
.../monitoring/v1/topologyspreadconstraint.go | 110 +
.../monitoring/v1/tsdbspec.go | 41 +
.../monitoring/v1/webconfigfilefields.go | 46 +
.../monitoring/v1/webhttpconfig.go | 46 +
.../monitoring/v1/webhttpheaders.go | 73 +
.../monitoring/v1/webtlsconfig.go | 117 +
.../monitoring/v1alpha1/alertmanagerconfig.go | 208 +
.../v1alpha1/alertmanagerconfigspec.go | 79 +
.../monitoring/v1alpha1/attachmetadata.go | 37 +
.../monitoring/v1alpha1/azuresdconfig.go | 114 +
.../monitoring/v1alpha1/consulsdconfig.go | 245 +
.../monitoring/v1alpha1/dayofmonthrange.go | 46 +
.../v1alpha1/digitaloceansdconfig.go | 136 +
.../monitoring/v1alpha1/discordconfig.go | 77 +
.../monitoring/v1alpha1/dnssdconfig.go | 70 +
.../monitoring/v1alpha1/dockerfilter.go | 48 +
.../monitoring/v1alpha1/dockersdconfig.go | 184 +
.../monitoring/v1alpha1/ec2filter.go | 48 +
.../monitoring/v1alpha1/ec2sdconfig.go | 102 +
.../monitoring/v1alpha1/emailconfig.go | 164 +
.../monitoring/v1alpha1/eurekasdconfig.go | 145 +
.../monitoring/v1alpha1/filesdconfig.go | 53 +
.../monitoring/v1alpha1/gcesdconfig.go | 86 +
.../monitoring/v1alpha1/hetznersdconfig.go | 154 +
.../monitoring/v1alpha1/httpconfig.go | 96 +
.../monitoring/v1alpha1/httpsdconfig.go | 118 +
.../monitoring/v1alpha1/inhibitrule.go | 67 +
.../monitoring/v1alpha1/k8sselectorconfig.go | 59 +
.../monitoring/v1alpha1/keyvalue.go | 46 +
.../monitoring/v1alpha1/kubernetessdconfig.go | 177 +
.../monitoring/v1alpha1/kumasdconfig.go | 163 +
.../monitoring/v1alpha1/matcher.go | 68 +
.../monitoring/v1alpha1/msteamsconfig.go | 86 +
.../monitoring/v1alpha1/mutetimeinterval.go | 51 +
.../monitoring/v1alpha1/namespacediscovery.go | 48 +
.../monitoring/v1alpha1/nomadsdconfig.go | 181 +
.../monitoring/v1alpha1/openstacksdconfig.go | 196 +
.../monitoring/v1alpha1/opsgenieconfig.go | 177 +
.../v1alpha1/opsgenieconfigresponder.go | 64 +
.../monitoring/v1alpha1/pagerdutyconfig.go | 182 +
.../v1alpha1/pagerdutyimageconfig.go | 55 +
.../v1alpha1/pagerdutylinkconfig.go | 46 +
.../monitoring/v1alpha1/prometheusagent.go | 218 +
.../v1alpha1/prometheusagentspec.go | 749 +
.../monitoring/v1alpha1/pushoverconfig.go | 176 +
.../monitoring/v1alpha1/receiver.go | 219 +
.../monitoring/v1alpha1/route.go | 135 +
.../monitoring/v1alpha1/scrapeconfig.go | 208 +
.../monitoring/v1alpha1/scrapeconfigspec.go | 513 +
.../monitoring/v1alpha1/slackaction.go | 91 +
.../monitoring/v1alpha1/slackconfig.go | 242 +
.../v1alpha1/slackconfirmationfield.go | 64 +
.../monitoring/v1alpha1/slackfield.go | 55 +
.../monitoring/v1alpha1/snsconfig.go | 128 +
.../monitoring/v1alpha1/staticconfig.go | 59 +
.../monitoring/v1alpha1/telegramconfig.go | 113 +
.../monitoring/v1alpha1/timeinterval.go | 93 +
.../monitoring/v1alpha1/timerange.go | 50 +
.../monitoring/v1alpha1/victoropsconfig.go | 127 +
.../monitoring/v1alpha1/webexconfig.go | 77 +
.../monitoring/v1alpha1/webhookconfig.go | 77 +
.../monitoring/v1alpha1/wechatconfig.go | 131 +
.../monitoring/v1beta1/alertmanagerconfig.go | 208 +
.../v1beta1/alertmanagerconfigspec.go | 79 +
.../monitoring/v1beta1/dayofmonthrange.go | 46 +
.../monitoring/v1beta1/discordconfig.go | 77 +
.../monitoring/v1beta1/emailconfig.go | 163 +
.../monitoring/v1beta1/httpconfig.go | 95 +
.../monitoring/v1beta1/inhibitrule.go | 67 +
.../monitoring/v1beta1/keyvalue.go | 46 +
.../monitoring/v1beta1/matcher.go | 59 +
.../monitoring/v1beta1/msteamsconfig.go | 86 +
.../monitoring/v1beta1/opsgenieconfig.go | 164 +
.../v1beta1/opsgenieconfigresponder.go | 64 +
.../monitoring/v1beta1/pagerdutyconfig.go | 178 +
.../v1beta1/pagerdutyimageconfig.go | 55 +
.../monitoring/v1beta1/pagerdutylinkconfig.go | 46 +
.../monitoring/v1beta1/pushoverconfig.go | 172 +
.../monitoring/v1beta1/receiver.go | 219 +
.../monitoring/v1beta1/route.go | 135 +
.../monitoring/v1beta1/secretkeyselector.go | 46 +
.../monitoring/v1beta1/slackaction.go | 91 +
.../monitoring/v1beta1/slackconfig.go | 238 +
.../v1beta1/slackconfirmationfield.go | 64 +
.../monitoring/v1beta1/slackfield.go | 55 +
.../monitoring/v1beta1/snsconfig.go | 128 +
.../monitoring/v1beta1/telegramconfig.go | 109 +
.../monitoring/v1beta1/timeinterval.go | 51 +
.../monitoring/v1beta1/timeperiod.go | 93 +
.../monitoring/v1beta1/timerange.go | 50 +
.../monitoring/v1beta1/victoropsconfig.go | 123 +
.../monitoring/v1beta1/webexconfig.go | 77 +
.../monitoring/v1beta1/webhookconfig.go | 73 +
.../monitoring/v1beta1/wechatconfig.go | 127 +
.../pkg/client/versioned/clientset.go | 57 +-
.../pkg/client/versioned/scheme/register.go | 16 +-
.../typed/monitoring/v1/alertmanager.go | 61 +
.../typed/monitoring/v1/monitoring_client.go | 20 +-
.../typed/monitoring/v1/podmonitor.go | 30 +
.../versioned/typed/monitoring/v1/probe.go | 30 +
.../typed/monitoring/v1/prometheus.go | 94 +
.../typed/monitoring/v1/prometheusrule.go | 30 +
.../typed/monitoring/v1/servicemonitor.go | 30 +
.../typed/monitoring/v1/thanosruler.go | 61 +
.../monitoring/v1alpha1/alertmanagerconfig.go | 30 +
.../v1alpha1/generated_expansion.go | 4 +
.../monitoring/v1alpha1/monitoring_client.go | 30 +-
.../monitoring/v1alpha1/prometheusagent.go | 287 +
.../typed/monitoring/v1alpha1/scrapeconfig.go | 206 +
.../monitoring/v1beta1/alertmanagerconfig.go | 206 +
.../versioned/typed/monitoring/v1beta1/doc.go | 18 +
.../v1beta1/generated_expansion.go} | 5 +-
.../monitoring/v1beta1/monitoring_client.go | 105 +
.../russross/blackfriday/LICENSE.txt | 28 -
.../github.com/russross/blackfriday/html.go | 945 -
.../github.com/russross/blackfriday/latex.go | 334 -
.../russross/blackfriday/{ => v2}/.gitignore | 0
.../russross/blackfriday/{ => v2}/.travis.yml | 3 +-
.../russross/blackfriday/v2/LICENSE.txt | 29 +
.../russross/blackfriday/{ => v2}/README.md | 49 +-
.../russross/blackfriday/{ => v2}/block.go | 834 +-
.../russross/blackfriday/{ => v2}/doc.go | 22 +-
.../russross/blackfriday/v2/entities.go | 2236 +
.../github.com/russross/blackfriday/v2/esc.go | 70 +
.../russross/blackfriday/v2/html.go | 952 +
.../russross/blackfriday/{ => v2}/inline.go | 566 +-
.../russross/blackfriday/{ => v2}/markdown.go | 695 +-
.../russross/blackfriday/v2/node.go | 360 +
.../blackfriday/{ => v2}/smartypants.go | 139 +-
vendor/github.com/xlab/treeprint/.gitignore | 3 +
vendor/github.com/xlab/treeprint/treeprint.go | 84 +-
.../internal/compile/compile.go | 40 +-
vendor/go.starlark.net/resolve/resolve.go | 2 +-
vendor/go.starlark.net/starlark/eval.go | 78 +-
vendor/go.starlark.net/starlark/hashtable.go | 77 +-
vendor/go.starlark.net/starlark/int.go | 22 +-
.../go.starlark.net/starlark/int_generic.go | 3 +-
.../go.starlark.net/starlark/int_posix64.go | 46 +-
vendor/go.starlark.net/starlark/interp.go | 58 +-
vendor/go.starlark.net/starlark/unpack.go | 4 +-
vendor/go.starlark.net/starlark/value.go | 166 +-
.../go.starlark.net/starlarkstruct/struct.go | 7 +-
vendor/go.starlark.net/syntax/walk.go | 4 +-
.../x/sync/singleflight/singleflight.go | 214 +
.../x/text/feature/plural/common.go | 70 +
.../x/text/feature/plural/message.go | 244 +
.../x/text/feature/plural/plural.go | 262 +
.../x/text/feature/plural/tables.go | 552 +
.../x/text/internal/catmsg/catmsg.go | 417 +
.../x/text/internal/catmsg/codec.go | 407 +
.../x/text/internal/catmsg/varint.go | 62 +
.../x/text/internal/format/format.go | 41 +
.../x/text/internal/format/parser.go | 358 +
.../x/text/internal/number/common.go | 55 +
.../x/text/internal/number/decimal.go | 500 +
.../x/text/internal/number/format.go | 535 +
.../x/text/internal/number/number.go | 152 +
.../x/text/internal/number/pattern.go | 485 +
.../internal/number/roundingmode_string.go | 30 +
.../x/text/internal/number/tables.go | 1219 +
.../x/text/internal/stringset/set.go | 86 +
vendor/golang.org/x/text/message/catalog.go | 36 +
.../x/text/message/catalog/catalog.go | 365 +
.../golang.org/x/text/message/catalog/dict.go | 129 +
.../golang.org/x/text/message/catalog/go19.go | 15 +
.../x/text/message/catalog/gopre19.go | 23 +
vendor/golang.org/x/text/message/doc.go | 99 +
vendor/golang.org/x/text/message/format.go | 510 +
vendor/golang.org/x/text/message/message.go | 192 +
vendor/golang.org/x/text/message/print.go | 984 +
.../gomodules.xyz/jsonpatch/v2/jsonpatch.go | 4 +
.../v1/types_swagger_doc_generated.go | 2 +-
.../v1beta1/types_swagger_doc_generated.go | 2 +-
.../admissionregistration/v1/generated.pb.go | 484 +-
.../admissionregistration/v1/generated.proto | 77 +
.../api/admissionregistration/v1/types.go | 77 +
.../v1/types_swagger_doc_generated.go | 14 +-
.../v1/zz_generated.deepcopy.go | 26 +
.../api/admissionregistration/v1alpha1/doc.go | 23 +
.../v1alpha1/generated.pb.go | 4634 +
.../v1alpha1/generated.proto | 609 +
.../v1alpha1/register.go | 56 +
.../admissionregistration/v1alpha1/types.go | 665 +
.../v1alpha1/types_swagger_doc_generated.go | 204 +
.../v1alpha1/zz_generated.deepcopy.go | 475 +
.../v1beta1/generated.pb.go | 6119 +-
.../v1beta1/generated.proto | 669 +-
.../admissionregistration/v1beta1/register.go | 4 +
.../admissionregistration/v1beta1/types.go | 737 +-
.../v1beta1/types_swagger_doc_generated.go | 193 +-
.../v1beta1/zz_generated.deepcopy.go | 463 +-
.../zz_generated.prerelease-lifecycle.go | 72 +
vendor/k8s.io/api/apidiscovery/v2beta1/doc.go | 24 +
.../api/apidiscovery/v2beta1/generated.pb.go | 1744 +
.../api/apidiscovery/v2beta1/generated.proto | 156 +
.../api/apidiscovery/v2beta1/register.go | 56 +
.../k8s.io/api/apidiscovery/v2beta1/types.go | 163 +
.../v2beta1/zz_generated.deepcopy.go | 190 +
.../zz_generated.prerelease-lifecycle.go | 58 +
.../v1alpha1/generated.pb.go | 148 +-
.../v1alpha1/generated.proto | 5 +
.../api/apiserverinternal/v1alpha1/types.go | 5 +
.../v1alpha1/types_swagger_doc_generated.go | 3 +-
.../v1alpha1/zz_generated.deepcopy.go | 5 +
vendor/k8s.io/api/apps/v1/generated.pb.go | 481 +-
vendor/k8s.io/api/apps/v1/generated.proto | 32 +-
vendor/k8s.io/api/apps/v1/types.go | 35 +-
.../apps/v1/types_swagger_doc_generated.go | 20 +-
.../api/apps/v1/zz_generated.deepcopy.go | 21 +
.../k8s.io/api/apps/v1beta1/generated.pb.go | 459 +-
.../k8s.io/api/apps/v1beta1/generated.proto | 82 +-
vendor/k8s.io/api/apps/v1beta1/types.go | 82 +-
.../v1beta1/types_swagger_doc_generated.go | 70 +-
.../api/apps/v1beta1/zz_generated.deepcopy.go | 21 +
.../k8s.io/api/apps/v1beta2/generated.pb.go | 498 +-
.../k8s.io/api/apps/v1beta2/generated.proto | 34 +-
vendor/k8s.io/api/apps/v1beta2/types.go | 34 +-
.../v1beta2/types_swagger_doc_generated.go | 22 +-
.../api/apps/v1beta2/zz_generated.deepcopy.go | 21 +
.../api/authentication/v1/generated.pb.go | 511 +-
.../api/authentication/v1/generated.proto | 20 +
.../k8s.io/api/authentication/v1/register.go | 1 +
vendor/k8s.io/api/authentication/v1/types.go | 25 +
.../v1/types_swagger_doc_generated.go | 21 +-
.../v1/zz_generated.deepcopy.go | 44 +
.../k8s.io/api/authentication/v1alpha1/doc.go | 23 +
.../authentication/v1alpha1/generated.pb.go | 567 +
.../authentication/v1alpha1/generated.proto | 51 +
.../api/authentication/v1alpha1/register.go | 51 +
.../api/authentication/v1alpha1/types.go | 48 +
.../v1alpha1/types_swagger_doc_generated.go | 49 +
.../v1alpha1/zz_generated.deepcopy.go | 70 +
.../zz_generated.prerelease-lifecycle.go | 40 +
.../authentication/v1beta1/generated.pb.go | 476 +-
.../authentication/v1beta1/generated.proto | 21 +
.../api/authentication/v1beta1/register.go | 1 +
.../api/authentication/v1beta1/types.go | 27 +
.../v1beta1/types_swagger_doc_generated.go | 21 +-
.../v1beta1/zz_generated.deepcopy.go | 44 +
.../zz_generated.prerelease-lifecycle.go | 18 +
.../v1/types_swagger_doc_generated.go | 2 +-
.../v1beta1/types_swagger_doc_generated.go | 2 +-
.../k8s.io/api/autoscaling/v1/generated.proto | 42 +-
vendor/k8s.io/api/autoscaling/v1/types.go | 79 +-
.../v1/types_swagger_doc_generated.go | 42 +-
.../k8s.io/api/autoscaling/v2/generated.proto | 20 +-
vendor/k8s.io/api/autoscaling/v2/types.go | 61 +-
.../v2/types_swagger_doc_generated.go | 22 +-
.../api/autoscaling/v2beta1/generated.proto | 4 +-
.../k8s.io/api/autoscaling/v2beta1/types.go | 4 +-
.../v2beta1/types_swagger_doc_generated.go | 6 +-
.../api/autoscaling/v2beta2/generated.proto | 24 +-
.../k8s.io/api/autoscaling/v2beta2/types.go | 62 +-
.../v2beta2/types_swagger_doc_generated.go | 26 +-
vendor/k8s.io/api/batch/v1/generated.pb.go | 398 +-
vendor/k8s.io/api/batch/v1/generated.proto | 101 +-
vendor/k8s.io/api/batch/v1/types.go | 185 +-
.../batch/v1/types_swagger_doc_generated.go | 37 +-
.../api/batch/v1/zz_generated.deepcopy.go | 25 +
.../k8s.io/api/batch/v1beta1/generated.pb.go | 317 +-
.../k8s.io/api/batch/v1beta1/generated.proto | 15 +-
vendor/k8s.io/api/batch/v1beta1/register.go | 1 -
vendor/k8s.io/api/batch/v1beta1/types.go | 20 +-
.../v1beta1/types_swagger_doc_generated.go | 16 +-
.../batch/v1beta1/zz_generated.deepcopy.go | 27 -
.../zz_generated.prerelease-lifecycle.go | 18 -
vendor/k8s.io/api/certificates/v1/types.go | 3 +-
.../v1/types_swagger_doc_generated.go | 2 +-
.../k8s.io/api/certificates/v1alpha1/doc.go | 24 +
.../api/certificates/v1alpha1/generated.pb.go | 831 +
.../api/certificates/v1alpha1/generated.proto | 103 +
.../api/certificates/v1alpha1/register.go | 61 +
.../k8s.io/api/certificates/v1alpha1/types.go | 106 +
.../v1alpha1/types_swagger_doc_generated.go | 60 +
.../v1alpha1/zz_generated.deepcopy.go | 102 +
.../zz_generated.prerelease-lifecycle.go | 58 +
.../api/certificates/v1beta1/generated.proto | 6 +-
.../k8s.io/api/certificates/v1beta1/types.go | 9 +-
.../v1beta1/types_swagger_doc_generated.go | 4 +-
.../api/coordination/v1/generated.proto | 6 +-
vendor/k8s.io/api/coordination/v1/types.go | 6 +-
.../v1/types_swagger_doc_generated.go | 8 +-
.../api/coordination/v1beta1/generated.proto | 6 +-
.../k8s.io/api/coordination/v1beta1/types.go | 6 +-
.../v1beta1/types_swagger_doc_generated.go | 8 +-
.../api/core/v1/annotation_key_constants.go | 27 +-
vendor/k8s.io/api/core/v1/generated.pb.go | 7651 +-
vendor/k8s.io/api/core/v1/generated.proto | 652 +-
vendor/k8s.io/api/core/v1/toleration.go | 14 +-
vendor/k8s.io/api/core/v1/types.go | 819 +-
.../core/v1/types_swagger_doc_generated.go | 258 +-
.../k8s.io/api/core/v1/well_known_labels.go | 4 +
.../api/core/v1/zz_generated.deepcopy.go | 376 +-
.../k8s.io/api/discovery/v1/generated.proto | 34 +-
vendor/k8s.io/api/discovery/v1/types.go | 50 +-
.../v1/types_swagger_doc_generated.go | 18 +-
.../api/discovery/v1beta1/generated.proto | 19 +-
vendor/k8s.io/api/discovery/v1beta1/types.go | 36 +-
.../v1beta1/types_swagger_doc_generated.go | 16 +-
.../events/v1/types_swagger_doc_generated.go | 2 +-
.../v1beta1/types_swagger_doc_generated.go | 2 +-
.../api/extensions/v1beta1/generated.pb.go | 11064 +-
.../api/extensions/v1beta1/generated.proto | 363 +-
.../k8s.io/api/extensions/v1beta1/register.go | 2 -
vendor/k8s.io/api/extensions/v1beta1/types.go | 492 +-
.../v1beta1/types_swagger_doc_generated.go | 213 +-
.../v1beta1/zz_generated.deepcopy.go | 457 +-
.../zz_generated.prerelease-lifecycle.go | 48 -
vendor/k8s.io/api/flowcontrol/v1/doc.go | 24 +
.../{v1alpha1 => v1}/generated.pb.go | 607 +-
.../k8s.io/api/flowcontrol/v1/generated.proto | 520 +
.../flowcontrol/{v1alpha1 => v1}/register.go | 6 +-
.../api/flowcontrol/{v1alpha1 => v1}/types.go | 181 +-
.../v1/types_swagger_doc_generated.go | 274 +
.../flowcontrol/v1/zz_generated.deepcopy.go | 588 +
.../api/flowcontrol/v1beta1/generated.pb.go | 530 +-
.../api/flowcontrol/v1beta1/generated.proto | 73 +-
.../k8s.io/api/flowcontrol/v1beta1/types.go | 88 +-
.../v1beta1/types_swagger_doc_generated.go | 17 +-
.../v1beta1/zz_generated.deepcopy.go | 41 +
.../zz_generated.prerelease-lifecycle.go | 8 +-
.../api/flowcontrol/v1beta2/generated.pb.go | 531 +-
.../api/flowcontrol/v1beta2/generated.proto | 73 +-
.../k8s.io/api/flowcontrol/v1beta2/types.go | 84 +-
.../v1beta2/types_swagger_doc_generated.go | 17 +-
.../v1beta2/zz_generated.deepcopy.go | 41 +
.../zz_generated.prerelease-lifecycle.go | 28 +
.../flowcontrol/{v1alpha1 => v1beta3}/doc.go | 6 +-
.../api/flowcontrol/v1beta3/generated.pb.go | 5663 +
.../{v1alpha1 => v1beta3}/generated.proto | 105 +-
.../api/flowcontrol/v1beta3/register.go | 58 +
.../k8s.io/api/flowcontrol/v1beta3/types.go | 677 +
.../types_swagger_doc_generated.go | 19 +-
.../zz_generated.deepcopy.go | 43 +-
.../zz_generated.prerelease-lifecycle.go | 34 +-
.../v1alpha1/types_swagger_doc_generated.go | 2 +-
.../k8s.io/api/networking/v1/generated.pb.go | 1316 +-
.../k8s.io/api/networking/v1/generated.proto | 228 +-
vendor/k8s.io/api/networking/v1/types.go | 273 +-
.../v1/types_swagger_doc_generated.go | 143 +-
.../networking/v1/zz_generated.deepcopy.go | 91 +-
.../api/networking/v1alpha1/generated.pb.go | 1451 +-
.../api/networking/v1alpha1/generated.proto | 122 +-
.../api/networking/v1alpha1/register.go | 16 +-
.../k8s.io/api/networking/v1alpha1/types.go | 143 +-
.../v1alpha1/types_swagger_doc_generated.go | 86 +-
.../networking/v1alpha1/well_known_labels.go | 33 +
.../v1alpha1/zz_generated.deepcopy.go | 161 +-
.../zz_generated.prerelease-lifecycle.go | 60 +-
.../api/networking/v1beta1/generated.pb.go | 830 +-
.../api/networking/v1beta1/generated.proto | 113 +-
vendor/k8s.io/api/networking/v1beta1/types.go | 122 +-
.../v1beta1/types_swagger_doc_generated.go | 89 +-
.../v1beta1/zz_generated.deepcopy.go | 67 +
vendor/k8s.io/api/node/v1/generated.proto | 10 +-
vendor/k8s.io/api/node/v1/types.go | 12 +-
.../node/v1/types_swagger_doc_generated.go | 12 +-
.../k8s.io/api/node/v1alpha1/generated.proto | 14 +-
vendor/k8s.io/api/node/v1alpha1/types.go | 16 +-
.../v1alpha1/types_swagger_doc_generated.go | 14 +-
.../k8s.io/api/node/v1beta1/generated.proto | 12 +-
vendor/k8s.io/api/node/v1beta1/types.go | 14 +-
.../v1beta1/types_swagger_doc_generated.go | 12 +-
vendor/k8s.io/api/policy/v1/doc.go | 2 +-
vendor/k8s.io/api/policy/v1/generated.pb.go | 150 +-
vendor/k8s.io/api/policy/v1/generated.proto | 28 +
vendor/k8s.io/api/policy/v1/types.go | 48 +
.../policy/v1/types_swagger_doc_generated.go | 11 +-
.../api/policy/v1/zz_generated.deepcopy.go | 5 +
vendor/k8s.io/api/policy/v1beta1/doc.go | 2 +-
.../k8s.io/api/policy/v1beta1/generated.pb.go | 4917 +-
.../k8s.io/api/policy/v1beta1/generated.proto | 305 +-
vendor/k8s.io/api/policy/v1beta1/register.go | 2 -
vendor/k8s.io/api/policy/v1beta1/types.go | 419 +-
.../v1beta1/types_swagger_doc_generated.go | 171 +-
.../policy/v1beta1/zz_generated.deepcopy.go | 372 +-
.../zz_generated.prerelease-lifecycle.go | 36 -
vendor/k8s.io/api/rbac/v1/generated.proto | 2 +
vendor/k8s.io/api/rbac/v1/types.go | 2 +
.../rbac/v1/types_swagger_doc_generated.go | 6 +-
.../v1alpha1/types_swagger_doc_generated.go | 2 +-
.../v1beta1/types_swagger_doc_generated.go | 2 +-
vendor/k8s.io/api/resource/v1alpha2/doc.go | 24 +
.../api/resource/v1alpha2/generated.pb.go | 4817 +
.../api/resource/v1alpha2/generated.proto | 400 +
.../k8s.io/api/resource/v1alpha2/register.go | 63 +
vendor/k8s.io/api/resource/v1alpha2/types.go | 462 +
.../v1alpha2/types_swagger_doc_generated.go | 232 +
.../v1alpha2/zz_generated.deepcopy.go | 498 +
.../k8s.io/api/scheduling/v1/generated.proto | 4 +-
vendor/k8s.io/api/scheduling/v1/types.go | 4 +-
.../v1/types_swagger_doc_generated.go | 6 +-
.../api/scheduling/v1alpha1/generated.proto | 4 +-
.../k8s.io/api/scheduling/v1alpha1/types.go | 4 +-
.../v1alpha1/types_swagger_doc_generated.go | 6 +-
.../api/scheduling/v1beta1/generated.proto | 4 +-
vendor/k8s.io/api/scheduling/v1beta1/types.go | 4 +-
.../v1beta1/types_swagger_doc_generated.go | 6 +-
vendor/k8s.io/api/storage/v1/generated.proto | 128 +-
vendor/k8s.io/api/storage/v1/types.go | 134 +-
.../storage/v1/types_swagger_doc_generated.go | 82 +-
.../api/storage/v1alpha1/generated.pb.go | 729 +-
.../api/storage/v1alpha1/generated.proto | 78 +-
.../k8s.io/api/storage/v1alpha1/register.go | 2 +
vendor/k8s.io/api/storage/v1alpha1/types.go | 93 +-
.../v1alpha1/types_swagger_doc_generated.go | 59 +-
.../storage/v1alpha1/zz_generated.deepcopy.go | 66 +
.../zz_generated.prerelease-lifecycle.go | 36 +
.../api/storage/v1beta1/generated.proto | 114 +-
vendor/k8s.io/api/storage/v1beta1/types.go | 121 +-
.../v1beta1/types_swagger_doc_generated.go | 78 +-
.../pkg/apis/apiextensions/deepcopy.go | 8 +-
.../apis/apiextensions/types_jsonschema.go | 81 +
.../pkg/apis/apiextensions/v1/deepcopy.go | 8 +-
.../pkg/apis/apiextensions/v1/generated.pb.go | 550 +-
.../pkg/apis/apiextensions/v1/generated.proto | 71 +-
.../pkg/apis/apiextensions/v1/types.go | 8 +-
.../apis/apiextensions/v1/types_jsonschema.go | 83 +-
.../v1/zz_generated.conversion.go | 8 +
.../apiextensions/v1/zz_generated.deepcopy.go | 14 +-
.../apis/apiextensions/v1beta1/deepcopy.go | 8 +-
.../apiextensions/v1beta1/generated.pb.go | 554 +-
.../apiextensions/v1beta1/generated.proto | 65 +-
.../pkg/apis/apiextensions/v1beta1/types.go | 2 +-
.../apiextensions/v1beta1/types_jsonschema.go | 83 +-
.../v1beta1/zz_generated.conversion.go | 8 +
.../v1beta1/zz_generated.deepcopy.go | 14 +-
.../apiextensions/zz_generated.deepcopy.go | 14 +-
.../pkg/apiserver/schema/cel/compilation.go | 285 +-
.../pkg/apiserver/schema/cel/maplist.go | 156 +-
.../pkg/apiserver/schema/cel/model/adaptor.go | 324 +
.../pkg/apiserver/schema/cel/model/schemas.go | 73 +
.../pkg/apiserver/schema/cel/validation.go | 467 +-
.../pkg/apiserver/schema/cel/values.go | 677 +-
.../apiserver/schema/defaulting/validation.go | 56 +-
.../apiserver/schema/zz_generated.deepcopy.go | 4 +-
.../pkg/apiserver/validation/metrics.go | 66 +
.../pkg/apiserver/validation/ratcheting.go | 212 +
.../pkg/apiserver/validation/validation.go | 124 +-
.../v1/customresourcecolumndefinition.go | 84 +
.../v1/customresourceconversion.go | 52 +
.../v1/customresourcedefinition.go | 218 +
.../v1/customresourcedefinitioncondition.go | 80 +
.../v1/customresourcedefinitionnames.go | 88 +
.../v1/customresourcedefinitionspec.go | 93 +
.../v1/customresourcedefinitionstatus.go | 64 +
.../v1/customresourcedefinitionversion.go | 107 +
.../v1/customresourcesubresources.go | 52 +
.../v1/customresourcesubresourcescale.go | 57 +
.../v1/customresourcevalidation.go | 39 +
.../apiextensions/v1/externaldocumentation.go | 48 +
.../apiextensions/v1/jsonschemaprops.go | 463 +
.../apiextensions/v1/servicereference.go | 66 +
.../apiextensions/v1/validationrule.go | 88 +
.../apiextensions/v1/webhookclientconfig.go | 59 +
.../apiextensions/v1/webhookconversion.go | 50 +
.../v1beta1/customresourcecolumndefinition.go | 84 +
.../v1beta1/customresourceconversion.go | 63 +
.../v1beta1/customresourcedefinition.go | 218 +
.../customresourcedefinitioncondition.go | 80 +
.../v1beta1/customresourcedefinitionnames.go | 88 +
.../v1beta1/customresourcedefinitionspec.go | 134 +
.../v1beta1/customresourcedefinitionstatus.go | 64 +
.../customresourcedefinitionversion.go | 107 +
.../v1beta1/customresourcesubresources.go | 52 +
.../v1beta1/customresourcesubresourcescale.go | 57 +
.../v1beta1/customresourcevalidation.go | 39 +
.../v1beta1/externaldocumentation.go | 48 +
.../apiextensions/v1beta1/jsonschemaprops.go | 463 +
.../apiextensions/v1beta1/servicereference.go | 66 +
.../apiextensions/v1beta1/validationrule.go | 88 +
.../v1beta1/webhookclientconfig.go | 59 +
.../client/clientset/clientset/clientset.go | 23 +-
.../clientset/clientset/scheme/register.go | 2 +-
.../v1/customresourcedefinition.go | 59 +
.../v1beta1/customresourcedefinition.go | 59 +
.../pkg/features/OWNERS | 4 +
.../pkg/features/kube_features.go | 48 +
.../third_party/forked/celopenapi/LICENSE | 202 -
.../forked/celopenapi/model/README.md | 4 -
.../forked/celopenapi/model/registry.go | 80 -
.../forked/celopenapi/model/schemas.go | 302 -
.../k8s.io/apimachinery/pkg/api/errors/OWNERS | 1 -
.../apimachinery/pkg/api/meta/conditions.go | 37 +-
.../apimachinery/pkg/api/meta/errors.go | 35 +-
.../k8s.io/apimachinery/pkg/api/meta/help.go | 86 +-
.../apimachinery/pkg/api/resource/OWNERS | 1 -
.../apimachinery/pkg/api/resource/amount.go | 38 +
.../apimachinery/pkg/api/resource/quantity.go | 10 +
.../pkg/api/validation/objectmeta.go | 9 +-
.../pkg/apis/meta/internalversion/defaults.go | 38 +
.../pkg/apis/meta/internalversion/types.go | 25 +
.../zz_generated.conversion.go | 2 +
.../internalversion/zz_generated.deepcopy.go | 5 +
.../pkg/apis/meta/v1/generated.pb.go | 385 +-
.../pkg/apis/meta/v1/generated.proto | 71 +-
.../apimachinery/pkg/apis/meta/v1/helpers.go | 2 +-
.../apimachinery/pkg/apis/meta/v1/types.go | 91 +-
.../meta/v1/types_swagger_doc_generated.go | 25 +-
.../pkg/apis/meta/v1/unstructured/helpers.go | 2 +-
.../apis/meta/v1/unstructured/unstructured.go | 5 +
.../meta/v1/unstructured/unstructured_list.go | 9 +
.../pkg/apis/meta/v1/validation/validation.go | 40 +-
.../apis/meta/v1/zz_generated.conversion.go | 7 +
.../pkg/apis/meta/v1/zz_generated.deepcopy.go | 5 +
.../v1beta1/types_swagger_doc_generated.go | 2 +-
.../k8s.io/apimachinery/pkg/labels/labels.go | 2 +
.../apimachinery/pkg/labels/selector.go | 141 +-
.../k8s.io/apimachinery/pkg/runtime/codec.go | 1 -
.../k8s.io/apimachinery/pkg/runtime/helper.go | 23 +
.../apimachinery/pkg/runtime/interfaces.go | 5 +
.../pkg/runtime/schema/group_version.go | 8 +-
.../k8s.io/apimachinery/pkg/runtime/scheme.go | 3 +-
.../pkg/runtime/serializer/codec_factory.go | 3 +-
.../runtime/serializer/streaming/streaming.go | 20 -
.../serializer/versioning/versioning.go | 2 +-
.../k8s.io/apimachinery/pkg/runtime/splice.go | 76 +
.../k8s.io/apimachinery/pkg/runtime/types.go | 2 +-
.../apimachinery/pkg/types/namespacedname.go | 11 +
.../apimachinery/pkg/util/cache/expiring.go | 12 +-
.../pkg/util/cache/lruexpirecache.go | 13 +
.../k8s.io/apimachinery/pkg/util/diff/diff.go | 37 +-
.../k8s.io/apimachinery/pkg/util/dump/dump.go | 54 +
.../pkg/util/duration/duration.go | 4 +-
.../apimachinery/pkg/util/errors/errors.go | 2 +-
.../apimachinery/pkg/util/framer/framer.go | 2 +-
.../pkg/util/httpstream/httpstream.go | 21 +
.../pkg/util/httpstream/spdy/roundtripper.go | 59 +-
.../apimachinery/pkg/util/intstr/intstr.go | 13 +-
.../pkg/util/managedfields/endpoints.yaml | 7018 +
.../pkg/util/managedfields/fieldmanager.go | 57 +
.../managedfields/internal/atmostevery.go | 60 +
.../internal/buildmanagerinfo.go | 74 +
.../managedfields/internal/capmanagers.go | 133 +
.../util/managedfields/internal/conflict.go | 89 +
.../managedfields/internal/fieldmanager.go | 209 +
.../pkg/util/managedfields/internal/fields.go | 47 +
.../managedfields/internal/lastapplied.go | 50 +
.../internal/lastappliedmanager.go | 171 +
.../internal/lastappliedupdater.go | 102 +
.../managedfields/internal/managedfields.go | 248 +
.../internal/managedfieldsupdater.go | 82 +
.../util/managedfields/internal/manager.go | 52 +
.../managedfields/internal/pathelement.go | 140 +
.../managedfields/internal/skipnonapplied.go | 89 +
.../util/managedfields/internal/stripmeta.go | 90 +
.../managedfields/internal/structuredmerge.go | 189 +
.../managedfields/internal/typeconverter.go | 193 +
.../managedfields/internal/versioncheck.go | 52 +
.../internal/versionconverter.go | 123 +
.../pkg/util/managedfields/node.yaml | 261 +
.../pkg/util/managedfields/pod.yaml | 121 +
.../pkg/util/managedfields/scalehandler.go | 174 +
.../pkg/util/managedfields/typeconverter.go | 47 +
.../apimachinery/pkg/util/mergepatch/util.go | 7 +-
.../k8s.io/apimachinery/pkg/util/net/util.go | 6 +
.../apimachinery/pkg/util/proxy/dial.go | 122 +
.../k8s.io/apimachinery/pkg/util/proxy/doc.go | 18 +
.../apimachinery/pkg/util/proxy/transport.go | 272 +
.../pkg/util/proxy/upgradeaware.go | 556 +
.../pkg/util/remotecommand/constants.go | 18 +-
.../k8s.io/apimachinery/pkg/util/sets/byte.go | 148 +-
.../k8s.io/apimachinery/pkg/util/sets/doc.go | 7 +-
.../apimachinery/pkg/util/sets/empty.go | 4 +-
.../k8s.io/apimachinery/pkg/util/sets/int.go | 148 +-
.../apimachinery/pkg/util/sets/int32.go | 148 +-
.../apimachinery/pkg/util/sets/int64.go | 148 +-
.../apimachinery/pkg/util/sets/ordered.go | 53 +
.../k8s.io/apimachinery/pkg/util/sets/set.go | 241 +
.../apimachinery/pkg/util/sets/string.go | 148 +-
.../pkg/util/strategicpatch/OWNERS | 1 +
.../pkg/util/strategicpatch/meta.go | 89 +
.../pkg/util/strategicpatch/patch.go | 65 +-
.../pkg/util/validation/field/errors.go | 4 +-
.../pkg/util/validation/validation.go | 8 +-
.../apimachinery/pkg/util/version/doc.go | 18 +
.../apimachinery/pkg/util/version/version.go | 372 +
.../apimachinery/pkg/util/wait/backoff.go | 502 +
.../apimachinery/pkg/util/wait/delay.go | 51 +
.../apimachinery/pkg/util/wait/error.go | 96 +
.../k8s.io/apimachinery/pkg/util/wait/loop.go | 95 +
.../k8s.io/apimachinery/pkg/util/wait/poll.go | 315 +
.../apimachinery/pkg/util/wait/timer.go | 121 +
.../k8s.io/apimachinery/pkg/util/wait/wait.go | 634 +-
.../k8s.io/apiserver/pkg/apis/cel/config.go | 45 +
.../pkg/authentication/serviceaccount/util.go | 222 +
.../apiserver/pkg/authentication/user/doc.go | 19 +
.../apiserver/pkg/authentication/user/user.go | 84 +
.../authorization/authorizer/interfaces.go | 159 +
.../pkg/authorization/authorizer/rule.go | 73 +
vendor/k8s.io/apiserver/pkg/cel/OWNERS | 11 +
.../apiserver/pkg/cel/common/adaptor.go | 106 +
.../apiserver/pkg/cel/common/equality.go | 334 +
.../apiserver/pkg/cel/common/maplist.go | 177 +
.../apiserver/pkg/cel/common/schemas.go | 274 +
.../k8s.io/apiserver/pkg/cel/common/values.go | 721 +
.../apiserver/pkg/cel/environment/base.go | 160 +
.../pkg/cel/environment/environment.go | 274 +
.../schema => apiserver/pkg}/cel/errors.go | 0
.../model => apiserver/pkg/cel}/escaping.go | 16 +-
.../k8s.io/apiserver/pkg/cel/library/authz.go | 626 +
.../pkg}/cel/library/cost.go | 80 +-
.../pkg}/cel/library/lists.go | 4 +
.../apiserver/pkg/cel/library/quantity.go | 380 +
.../pkg}/cel/library/regex.go | 8 +-
.../k8s.io/apiserver/pkg/cel/library/test.go | 83 +
.../pkg}/cel/library/urls.go | 27 +-
vendor/k8s.io/apiserver/pkg/cel/limits.go | 50 +
.../pkg}/cel/metrics/metrics.go | 2 +
.../apiserver/pkg/cel/openapi/adaptor.go | 229 +
.../apiserver/pkg/cel/openapi/extensions.go | 107 +
vendor/k8s.io/apiserver/pkg/cel/quantity.go | 76 +
.../model => apiserver/pkg/cel}/types.go | 274 +-
.../model => apiserver/pkg/cel}/url.go | 30 +-
.../model => apiserver/pkg/cel}/value.go | 34 +-
.../apiserver/pkg/features/kube_features.go | 184 +-
.../k8s.io/apiserver/pkg/warning/context.go | 60 +
.../pkg/genericclioptions/config_flags.go | 125 +-
.../genericclioptions/config_flags_fake.go | 2 +-
.../pkg/genericclioptions/io_options.go | 23 +-
.../pkg/genericclioptions/jsonpath_flags.go | 4 +-
.../pkg/genericclioptions/template_flags.go | 4 +-
.../pkg/genericiooptions/io_options.go | 56 +
.../k8s.io/cli-runtime/pkg/printers/json.go | 5 +-
.../cli-runtime/pkg/printers/jsonpath.go | 3 +-
.../k8s.io/cli-runtime/pkg/printers/name.go | 3 +-
.../cli-runtime/pkg/printers/tableprinter.go | 13 +-
.../cli-runtime/pkg/printers/template.go | 3 +-
.../cli-runtime/pkg/printers/terminal.go | 75 +
.../k8s.io/cli-runtime/pkg/printers/yaml.go | 5 +-
.../cli-runtime/pkg/resource/builder.go | 18 +-
.../resource/fallback_query_param_verifier.go | 59 +
.../pkg/resource/kustomizevisitor.go | 2 +-
.../pkg/resource/query_param_verifier.go | 32 +-
.../pkg/resource/query_param_verifier_v3.go | 145 +
.../k8s.io/cli-runtime/pkg/resource/scheme.go | 2 +-
.../cli-runtime/pkg/resource/visitor.go | 28 +
.../v1/matchcondition.go | 48 +
.../v1/mutatingwebhook.go | 14 +
.../v1/validatingwebhook.go | 14 +
.../v1alpha1/auditannotation.go | 48 +
.../v1alpha1/expressionwarning.go | 48 +
.../v1alpha1/matchcondition.go | 48 +
.../v1alpha1/matchresources.go | 90 +
.../v1alpha1/namedrulewithoperations.go | 95 +
.../v1alpha1/paramkind.go | 48 +
.../v1alpha1/paramref.go | 71 +
.../v1alpha1/typechecking.go | 44 +
.../v1alpha1/validatingadmissionpolicy.go | 256 +
.../validatingadmissionpolicybinding.go | 247 +
.../validatingadmissionpolicybindingspec.go | 72 +
.../v1alpha1/validatingadmissionpolicyspec.go | 117 +
.../validatingadmissionpolicystatus.go | 66 +
.../v1alpha1/validation.go | 70 +
.../v1alpha1/variable.go | 48 +
.../v1beta1/auditannotation.go | 48 +
.../v1beta1/expressionwarning.go | 48 +
.../v1beta1/matchcondition.go | 48 +
.../v1beta1/matchresources.go | 90 +
.../v1beta1/mutatingwebhook.go | 29 +-
...erations.go => namedrulewithoperations.go} | 37 +-
.../v1beta1/paramkind.go | 48 +
.../admissionregistration/v1beta1/paramref.go | 71 +
.../admissionregistration/v1beta1/rule.go | 76 -
.../v1beta1/typechecking.go | 44 +
.../v1beta1/validatingadmissionpolicy.go | 256 +
.../validatingadmissionpolicybinding.go | 247 +
.../validatingadmissionpolicybindingspec.go | 72 +
.../v1beta1/validatingadmissionpolicyspec.go | 117 +
.../validatingadmissionpolicystatus.go | 66 +
.../v1beta1/validatingwebhook.go | 29 +-
.../v1beta1/validation.go | 70 +
.../admissionregistration/v1beta1/variable.go | 48 +
.../v1alpha1/serverstorageversion.go | 11 +
.../apps/v1/statefulsetordinals.go | 39 +
.../apps/v1/statefulsetspec.go | 9 +
.../v1beta1/statefulsetordinals.go} | 20 +-
.../apps/v1beta1/statefulsetspec.go | 9 +
.../apps/v1beta2/statefulsetordinals.go | 39 +
.../apps/v1beta2/statefulsetspec.go | 9 +
.../applyconfigurations/batch/v1/jobspec.go | 27 +
.../applyconfigurations/batch/v1/jobstatus.go | 18 +
.../v1alpha1/clustertrustbundle.go | 247 +
.../v1alpha1/clustertrustbundlespec.go | 48 +
.../core/v1/claimsource.go | 48 +
.../core/v1/clustertrustbundleprojection.go | 79 +
.../applyconfigurations/core/v1/container.go | 67 +-
.../core/v1/containerresizepolicy.go | 52 +
.../core/v1/containerstatus.go | 40 +-
.../core/v1/ephemeralcontainer.go | 21 +
.../core/v1/ephemeralcontainercommon.go | 67 +-
.../applyconfigurations/core/v1/hostip.go | 39 +
.../core/v1/lifecyclehandler.go | 9 +
.../core/v1/loadbalanceringress.go | 13 +
.../core/v1/modifyvolumestatus.go | 52 +
.../core/v1/persistentvolumeclaimspec.go | 29 +-
.../core/v1/persistentvolumeclaimstatus.go | 44 +-
.../core/v1/persistentvolumespec.go | 9 +
.../core/v1/persistentvolumestatus.go | 16 +-
.../core/v1/podaffinityterm.go | 22 +
.../v1/podresourceclaim.go} | 30 +-
.../core/v1/podresourceclaimstatus.go | 48 +
.../core/v1/podschedulinggate.go | 39 +
.../applyconfigurations/core/v1/podspec.go | 28 +
.../applyconfigurations/core/v1/podstatus.go | 63 +-
.../v1/resourceclaim.go} | 14 +-
.../core/v1/resourcerequirements.go | 18 +-
.../core/v1/servicespec.go | 8 +-
.../core/v1/sleepaction.go | 39 +
.../core/v1/typedobjectreference.go | 66 +
.../core/v1/volumeprojection.go | 9 +
.../core/v1/volumeresourcerequirements.go | 52 +
.../extensions/v1beta1/allowedhostpath.go | 48 -
.../v1beta1/fsgroupstrategyoptions.go | 57 -
.../extensions/v1beta1/hostportrange.go | 48 -
.../extensions/v1beta1/idrange.go | 48 -
.../v1beta1/ingressloadbalanceringress.go | 62 +
.../v1beta1/ingressloadbalancerstatus.go | 44 +
.../extensions/v1beta1/ingressportstatus.go | 61 +
.../extensions/v1beta1/ingressstatus.go | 8 +-
.../extensions/v1beta1/networkpolicy.go | 11 +-
.../v1beta1/podsecuritypolicyspec.go | 285 -
.../v1beta1/runasgroupstrategyoptions.go | 57 -
.../v1beta1/runasuserstrategyoptions.go | 57 -
.../v1beta1/runtimeclassstrategyoptions.go | 50 -
.../v1beta1/selinuxstrategyoptions.go | 53 -
.../supplementalgroupsstrategyoptions.go | 57 -
.../v1/exemptprioritylevelconfiguration.go | 48 +
.../flowdistinguishermethod.go | 8 +-
.../{v1alpha1 => v1}/flowschema.go | 16 +-
.../flowcontrol/v1/flowschemacondition.go | 80 +
.../{v1alpha1 => v1}/flowschemaspec.go | 2 +-
.../{v1alpha1 => v1}/flowschemastatus.go | 2 +-
.../{v1alpha1 => v1}/groupsubject.go | 2 +-
.../limitedprioritylevelconfiguration.go | 30 +-
.../{v1alpha1 => v1}/limitresponse.go | 8 +-
.../{v1alpha1 => v1}/nonresourcepolicyrule.go | 2 +-
.../policyruleswithsubjects.go | 2 +-
.../prioritylevelconfiguration.go | 16 +-
.../v1/prioritylevelconfigurationcondition.go | 80 +
.../prioritylevelconfigurationreference.go | 2 +-
.../prioritylevelconfigurationspec.go | 17 +-
.../prioritylevelconfigurationstatus.go | 2 +-
.../{v1alpha1 => v1}/queuingconfiguration.go | 2 +-
.../{v1alpha1 => v1}/resourcepolicyrule.go | 2 +-
.../{v1alpha1 => v1}/serviceaccountsubject.go | 2 +-
.../flowcontrol/{v1alpha1 => v1}/subject.go | 8 +-
.../{v1alpha1 => v1}/usersubject.go | 2 +-
.../exemptprioritylevelconfiguration.go | 48 +
.../limitedprioritylevelconfiguration.go | 18 +
.../v1beta1/prioritylevelconfigurationspec.go | 9 +
.../exemptprioritylevelconfiguration.go | 48 +
.../limitedprioritylevelconfiguration.go | 18 +
.../v1beta2/prioritylevelconfigurationspec.go | 9 +
.../exemptprioritylevelconfiguration.go | 48 +
.../v1beta3/flowdistinguishermethod.go | 43 +
.../v1beta3/flowschema.go} | 95 +-
.../flowschemacondition.go | 18 +-
.../flowcontrol/v1beta3/flowschemaspec.go | 71 +
.../v1beta3/flowschemastatus.go} | 20 +-
.../v1beta3/groupsubject.go} | 14 +-
.../limitedprioritylevelconfiguration.go | 66 +
.../flowcontrol/v1beta3/limitresponse.go | 52 +
.../v1beta3/nonresourcepolicyrule.go | 52 +
.../v1beta3/policyruleswithsubjects.go | 72 +
.../v1beta3/prioritylevelconfiguration.go | 256 +
.../prioritylevelconfigurationcondition.go | 18 +-
.../prioritylevelconfigurationreference.go | 39 +
.../v1beta3/prioritylevelconfigurationspec.go | 61 +
.../prioritylevelconfigurationstatus.go | 44 +
.../v1beta3/queuingconfiguration.go | 57 +
.../flowcontrol/v1beta3/resourcepolicyrule.go | 83 +
.../v1beta3/serviceaccountsubject.go | 48 +
.../flowcontrol/v1beta3/subject.go | 70 +
.../flowcontrol/v1beta3/usersubject.go | 39 +
.../applyconfigurations/internal/internal.go | 2881 +-
.../applyconfigurations/meta/v1/listmeta.go | 66 -
.../meta/v1/unstructured.go | 2 +-
.../v1/ingressloadbalanceringress.go | 62 +
.../v1/ingressloadbalancerstatus.go | 44 +
.../networking/v1/ingressportstatus.go | 61 +
.../networking/v1/ingressstatus.go | 8 +-
.../networking/v1/networkpolicy.go | 11 +-
.../networking/v1alpha1/clustercidrspec.go | 70 -
.../v1alpha1/{clustercidr.go => ipaddress.go} | 78 +-
.../networking/v1alpha1/ipaddressspec.go | 39 +
.../networking/v1alpha1/parentreference.go | 66 +
.../v1alpha1/servicecidr.go} | 95 +-
.../networking/v1alpha1/servicecidrspec.go | 41 +
.../servicecidrstatus.go} | 14 +-
.../v1beta1/ingressloadbalanceringress.go | 62 +
.../v1beta1/ingressloadbalancerstatus.go | 44 +
.../networking/v1beta1/ingressportstatus.go | 61 +
.../networking/v1beta1/ingressstatus.go | 8 +-
.../policy/v1/poddisruptionbudgetspec.go | 16 +-
.../policy/v1beta1/allowedflexvolume.go | 39 -
.../policy/v1beta1/allowedhostpath.go | 48 -
.../policy/v1beta1/fsgroupstrategyoptions.go | 57 -
.../policy/v1beta1/hostportrange.go | 48 -
.../policy/v1beta1/idrange.go | 48 -
.../policy/v1beta1/poddisruptionbudgetspec.go | 16 +-
.../policy/v1beta1/podsecuritypolicyspec.go | 285 -
.../v1beta1/runasgroupstrategyoptions.go | 57 -
.../v1beta1/runasuserstrategyoptions.go | 57 -
.../v1beta1/runtimeclassstrategyoptions.go | 50 -
.../policy/v1beta1/selinuxstrategyoptions.go | 53 -
.../supplementalgroupsstrategyoptions.go | 57 -
.../resource/v1alpha2/allocationresult.go | 66 +
.../resource/v1alpha2/podschedulingcontext.go | 258 +
.../v1alpha2/podschedulingcontextspec.go | 50 +
.../v1alpha2/podschedulingcontextstatus.go | 44 +
.../resource/v1alpha2/resourceclaim.go | 258 +
.../resourceclaimconsumerreference.go | 70 +
.../resourceclaimparametersreference.go | 57 +
.../v1alpha2/resourceclaimschedulingstatus.go | 50 +
.../resource/v1alpha2/resourceclaimspec.go | 61 +
.../resource/v1alpha2/resourceclaimstatus.go | 71 +
.../v1alpha2/resourceclaimtemplate.go | 249 +
.../v1alpha2/resourceclaimtemplatespec.go | 188 +
.../resource/v1alpha2/resourceclass.go | 266 +
.../resourceclassparametersreference.go | 66 +
.../resource/v1alpha2/resourcehandle.go | 48 +
.../storage/v1alpha1/volumeattributesclass.go | 262 +
.../discovery/aggregated_discovery.go | 156 +
.../discovery/cached/disk/cached_discovery.go | 23 +-
.../discovery/cached/memory/memcache.go | 119 +-
.../client-go/discovery/discovery_client.go | 326 +-
.../client-go/discovery/fake/discovery.go | 12 +-
.../k8s.io/client-go/dynamic/fake/simple.go | 2 +
vendor/k8s.io/client-go/dynamic/simple.go | 71 +-
.../admissionregistration/interface.go | 8 +
.../v1alpha1/interface.go | 52 +
.../v1alpha1/validatingadmissionpolicy.go | 89 +
.../validatingadmissionpolicybinding.go | 89 +
.../v1beta1/interface.go | 14 +
.../v1beta1/validatingadmissionpolicy.go | 89 +
.../validatingadmissionpolicybinding.go | 89 +
.../informers/certificates/interface.go | 8 +
.../v1alpha1/clustertrustbundle.go | 89 +
.../certificates/v1alpha1/interface.go | 45 +
vendor/k8s.io/client-go/informers/doc.go | 18 +
.../informers/extensions/v1beta1/interface.go | 7 -
vendor/k8s.io/client-go/informers/factory.go | 97 +-
.../informers/flowcontrol/interface.go | 20 +-
.../informers/flowcontrol/v1/flowschema.go | 89 +
.../flowcontrol/{v1alpha1 => v1}/interface.go | 2 +-
.../v1/prioritylevelconfiguration.go | 89 +
.../{v1alpha1 => v1beta3}/flowschema.go | 20 +-
.../flowcontrol/v1beta3/interface.go | 52 +
.../prioritylevelconfiguration.go | 20 +-
vendor/k8s.io/client-go/informers/generic.go | 58 +-
.../networking/v1alpha1/interface.go | 17 +-
.../v1alpha1/ipaddress.go} | 44 +-
.../{clustercidr.go => servicecidr.go} | 38 +-
.../informers/policy/v1beta1/interface.go | 7 -
.../client-go/informers/resource/interface.go | 46 +
.../informers/resource/v1alpha2/interface.go | 66 +
.../resource/v1alpha2/podschedulingcontext.go | 90 +
.../resource/v1alpha2/resourceclaim.go | 90 +
.../v1alpha2/resourceclaimtemplate.go | 90 +
.../v1alpha2/resourceclass.go} | 44 +-
.../informers/storage/v1alpha1/interface.go | 7 +
.../storage/v1alpha1/volumeattributesclass.go | 89 +
.../k8s.io/client-go/kubernetes/clientset.go | 174 +-
vendor/k8s.io/client-go/kubernetes/doc.go | 7 +-
.../kubernetes/fake/clientset_generated.go | 45 +-
.../client-go/kubernetes/fake/register.go | 14 +-
.../client-go/kubernetes/scheme/register.go | 14 +-
.../fake/fake_mutatingwebhookconfiguration.go | 59 +-
.../fake_validatingwebhookconfiguration.go | 59 +-
.../v1alpha1/admissionregistration_client.go | 112 +
.../v1alpha1/doc.go | 0
.../v1alpha1/fake/doc.go | 0
.../fake/fake_admissionregistration_client.go | 44 +
.../fake/fake_validatingadmissionpolicy.go | 178 +
.../fake_validatingadmissionpolicybinding.go | 145 +
.../v1alpha1/generated_expansion.go | 23 +
.../v1alpha1/validatingadmissionpolicy.go | 243 +
.../validatingadmissionpolicybinding.go | 197 +
.../v1beta1/admissionregistration_client.go | 10 +
.../fake/fake_admissionregistration_client.go | 8 +
.../fake/fake_mutatingwebhookconfiguration.go | 5 +-
.../fake/fake_validatingadmissionpolicy.go | 178 +
.../fake_validatingadmissionpolicybinding.go | 145 +
.../fake_validatingwebhookconfiguration.go | 5 +-
.../v1beta1/generated_expansion.go | 4 +
.../v1beta1/validatingadmissionpolicy.go | 243 +
.../validatingadmissionpolicybinding.go | 197 +
.../v1alpha1/fake/fake_storageversion.go | 5 +-
.../apps/v1/fake/fake_controllerrevision.go | 59 +-
.../typed/apps/v1/fake/fake_daemonset.go | 71 +-
.../typed/apps/v1/fake/fake_deployment.go | 77 +-
.../typed/apps/v1/fake/fake_replicaset.go | 77 +-
.../typed/apps/v1/fake/fake_statefulset.go | 77 +-
.../v1beta1/fake/fake_controllerrevision.go | 5 +-
.../apps/v1beta1/fake/fake_deployment.go | 5 +-
.../apps/v1beta1/fake/fake_statefulset.go | 5 +-
.../v1beta2/fake/fake_controllerrevision.go | 5 +-
.../typed/apps/v1beta2/fake/fake_daemonset.go | 5 +-
.../apps/v1beta2/fake/fake_deployment.go | 5 +-
.../apps/v1beta2/fake/fake_replicaset.go | 5 +-
.../apps/v1beta2/fake/fake_statefulset.go | 5 +-
.../v1/authentication_client.go | 5 +
.../v1/fake/fake_authentication_client.go | 4 +
.../v1/fake/fake_selfsubjectreview.go | 46 +
.../v1/fake/fake_tokenreview.go | 5 +-
.../authentication/v1/generated_expansion.go | 2 +
.../authentication/v1/selfsubjectreview.go | 64 +
.../v1alpha1/authentication_client.go | 107 +
.../typed/authentication/v1alpha1/doc.go | 20 +
.../authentication/v1alpha1/fake}/doc.go | 4 +-
.../fake/fake_authentication_client.go | 40 +
.../v1alpha1/fake/fake_selfsubjectreview.go | 46 +
.../v1alpha1/generated_expansion.go | 21 +
.../v1alpha1/selfsubjectreview.go | 64 +
.../v1beta1/authentication_client.go | 5 +
.../fake/fake_authentication_client.go | 4 +
.../v1beta1/fake/fake_selfsubjectreview.go | 46 +
.../v1beta1/fake/fake_tokenreview.go | 5 +-
.../v1beta1/generated_expansion.go | 2 +
.../v1beta1/selfsubjectreview.go | 64 +
.../v1/fake/fake_localsubjectaccessreview.go | 5 +-
.../v1/fake/fake_selfsubjectaccessreview.go | 5 +-
.../v1/fake/fake_selfsubjectrulesreview.go | 5 +-
.../v1/fake/fake_subjectaccessreview.go | 5 +-
.../fake/fake_localsubjectaccessreview.go | 5 +-
.../fake/fake_selfsubjectaccessreview.go | 5 +-
.../fake/fake_selfsubjectrulesreview.go | 5 +-
.../v1beta1/fake/fake_subjectaccessreview.go | 5 +-
.../v1/fake/fake_horizontalpodautoscaler.go | 71 +-
.../v2/fake/fake_horizontalpodautoscaler.go | 5 +-
.../fake/fake_horizontalpodautoscaler.go | 5 +-
.../fake/fake_horizontalpodautoscaler.go | 5 +-
.../typed/batch/v1/fake/fake_cronjob.go | 71 +-
.../typed/batch/v1/fake/fake_job.go | 71 +-
.../typed/batch/v1beta1/fake/fake_cronjob.go | 5 +-
.../v1/fake/fake_certificatesigningrequest.go | 77 +-
.../v1alpha1/certificates_client.go | 107 +
.../v1alpha1/clustertrustbundle.go | 197 +
.../typed/certificates/v1alpha1/doc.go | 20 +
.../typed/certificates/v1alpha1/fake/doc.go | 20 +
.../v1alpha1/fake/fake_certificates_client.go | 40 +
.../v1alpha1/fake/fake_clustertrustbundle.go | 145 +
.../v1alpha1/generated_expansion.go | 21 +
.../fake/fake_certificatesigningrequest.go | 5 +-
.../typed/coordination/v1/fake/fake_lease.go | 59 +-
.../coordination/v1beta1/fake/fake_lease.go | 5 +-
.../core/v1/fake/fake_componentstatus.go | 59 +-
.../typed/core/v1/fake/fake_configmap.go | 59 +-
.../typed/core/v1/fake/fake_endpoints.go | 59 +-
.../typed/core/v1/fake/fake_event.go | 59 +-
.../typed/core/v1/fake/fake_limitrange.go | 59 +-
.../typed/core/v1/fake/fake_namespace.go | 67 +-
.../typed/core/v1/fake/fake_node.go | 71 +-
.../core/v1/fake/fake_persistentvolume.go | 71 +-
.../v1/fake/fake_persistentvolumeclaim.go | 71 +-
.../kubernetes/typed/core/v1/fake/fake_pod.go | 77 +-
.../typed/core/v1/fake/fake_pod_expansion.go | 4 +-
.../typed/core/v1/fake/fake_podtemplate.go | 59 +-
.../v1/fake/fake_replicationcontroller.go | 75 +-
.../typed/core/v1/fake/fake_resourcequota.go | 71 +-
.../typed/core/v1/fake/fake_secret.go | 59 +-
.../typed/core/v1/fake/fake_service.go | 67 +-
.../typed/core/v1/fake/fake_serviceaccount.go | 61 +-
.../discovery/v1/fake/fake_endpointslice.go | 59 +-
.../v1beta1/fake/fake_endpointslice.go | 5 +-
.../typed/events/v1/fake/fake_event.go | 59 +-
.../typed/events/v1beta1/event_expansion.go | 3 +-
.../typed/events/v1beta1/fake/fake_event.go | 5 +-
.../extensions/v1beta1/extensions_client.go | 5 -
.../extensions/v1beta1/fake/fake_daemonset.go | 5 +-
.../v1beta1/fake/fake_deployment.go | 5 +-
.../v1beta1/fake/fake_extensions_client.go | 4 -
.../extensions/v1beta1/fake/fake_ingress.go | 5 +-
.../v1beta1/fake/fake_networkpolicy.go | 40 +-
.../v1beta1/fake/fake_podsecuritypolicy.go | 146 -
.../v1beta1/fake/fake_replicaset.go | 5 +-
.../extensions/v1beta1/generated_expansion.go | 2 -
.../typed/extensions/v1beta1/networkpolicy.go | 48 -
.../extensions/v1beta1/podsecuritypolicy.go | 197 -
.../kubernetes/typed/flowcontrol/v1/doc.go | 20 +
.../typed/flowcontrol/v1/fake/doc.go | 20 +
.../fake/fake_flowcontrol_client.go | 10 +-
.../flowcontrol/v1/fake/fake_flowschema.go | 178 +
.../fake/fake_prioritylevelconfiguration.go | 178 +
.../{v1alpha1 => v1}/flowcontrol_client.go | 38 +-
.../typed/flowcontrol/v1/flowschema.go | 243 +
.../{v1alpha1 => v1}/generated_expansion.go | 2 +-
.../v1/prioritylevelconfiguration.go | 243 +
.../v1beta1/fake/fake_flowschema.go | 5 +-
.../fake/fake_prioritylevelconfiguration.go | 5 +-
.../v1beta2/fake/fake_flowschema.go | 5 +-
.../fake/fake_prioritylevelconfiguration.go | 5 +-
.../typed/flowcontrol/v1beta3/doc.go | 20 +
.../typed/flowcontrol/v1beta3/fake/doc.go | 20 +
.../v1beta3/fake/fake_flowcontrol_client.go | 44 +
.../fake/fake_flowschema.go | 65 +-
.../fake/fake_prioritylevelconfiguration.go | 65 +-
.../flowcontrol/v1beta3/flowcontrol_client.go | 112 +
.../{v1alpha1 => v1beta3}/flowschema.go | 56 +-
.../v1beta3/generated_expansion.go | 23 +
.../prioritylevelconfiguration.go | 56 +-
.../typed/networking/v1/fake/fake_ingress.go | 71 +-
.../networking/v1/fake/fake_ingressclass.go | 59 +-
.../networking/v1/fake/fake_networkpolicy.go | 94 +-
.../typed/networking/v1/networkpolicy.go | 48 -
.../typed/networking/v1alpha1/clustercidr.go | 197 -
.../v1alpha1/fake/fake_clustercidr.go | 146 -
.../v1alpha1/fake/fake_ipaddress.go | 145 +
.../v1alpha1/fake/fake_networking_client.go | 8 +-
.../v1alpha1/fake/fake_servicecidr.go | 178 +
.../v1alpha1/generated_expansion.go | 4 +-
.../typed/networking/v1alpha1/ipaddress.go | 197 +
.../networking/v1alpha1/networking_client.go | 11 +-
.../typed/networking/v1alpha1/servicecidr.go | 243 +
.../networking/v1beta1/fake/fake_ingress.go | 5 +-
.../v1beta1/fake/fake_ingressclass.go | 5 +-
.../typed/node/v1/fake/fake_runtimeclass.go | 59 +-
.../node/v1alpha1/fake/fake_runtimeclass.go | 5 +-
.../node/v1beta1/fake/fake_runtimeclass.go | 5 +-
.../v1/fake/fake_poddisruptionbudget.go | 71 +-
.../v1beta1/fake/fake_poddisruptionbudget.go | 5 +-
.../v1beta1/fake/fake_podsecuritypolicy.go | 146 -
.../policy/v1beta1/fake/fake_policy_client.go | 4 -
.../policy/v1beta1/generated_expansion.go | 2 -
.../typed/policy/v1beta1/podsecuritypolicy.go | 197 -
.../typed/policy/v1beta1/policy_client.go | 5 -
.../typed/rbac/v1/fake/fake_clusterrole.go | 59 +-
.../rbac/v1/fake/fake_clusterrolebinding.go | 59 +-
.../typed/rbac/v1/fake/fake_role.go | 59 +-
.../typed/rbac/v1/fake/fake_rolebinding.go | 59 +-
.../rbac/v1alpha1/fake/fake_clusterrole.go | 5 +-
.../v1alpha1/fake/fake_clusterrolebinding.go | 5 +-
.../typed/rbac/v1alpha1/fake/fake_role.go | 5 +-
.../rbac/v1alpha1/fake/fake_rolebinding.go | 5 +-
.../rbac/v1beta1/fake/fake_clusterrole.go | 5 +-
.../v1beta1/fake/fake_clusterrolebinding.go | 5 +-
.../typed/rbac/v1beta1/fake/fake_role.go | 5 +-
.../rbac/v1beta1/fake/fake_rolebinding.go | 5 +-
.../kubernetes/typed/resource/v1alpha2/doc.go | 20 +
.../typed/resource/v1alpha2/fake/doc.go | 20 +
.../fake/fake_podschedulingcontext.go | 189 +
.../v1alpha2/fake/fake_resource_client.go | 52 +
.../v1alpha2/fake/fake_resourceclaim.go | 189 +
.../fake/fake_resourceclaimtemplate.go | 154 +
.../v1alpha2/fake/fake_resourceclass.go | 145 +
.../resource/v1alpha2/generated_expansion.go | 27 +
.../resource/v1alpha2/podschedulingcontext.go | 256 +
.../resource/v1alpha2/resource_client.go | 122 +
.../typed/resource/v1alpha2/resourceclaim.go | 256 +
.../v1alpha2/resourceclaimtemplate.go | 208 +
.../typed/resource/v1alpha2/resourceclass.go | 197 +
.../scheduling/v1/fake/fake_priorityclass.go | 59 +-
.../v1alpha1/fake/fake_priorityclass.go | 5 +-
.../v1beta1/fake/fake_priorityclass.go | 5 +-
.../typed/storage/v1/fake/fake_csidriver.go | 59 +-
.../typed/storage/v1/fake/fake_csinode.go | 59 +-
.../v1/fake/fake_csistoragecapacity.go | 59 +-
.../storage/v1/fake/fake_storageclass.go | 59 +-
.../storage/v1/fake/fake_volumeattachment.go | 71 +-
.../v1alpha1/fake/fake_csistoragecapacity.go | 5 +-
.../v1alpha1/fake/fake_storage_client.go | 4 +
.../v1alpha1/fake/fake_volumeattachment.go | 5 +-
.../fake/fake_volumeattributesclass.go | 145 +
.../storage/v1alpha1/generated_expansion.go | 2 +
.../typed/storage/v1alpha1/storage_client.go | 5 +
.../storage/v1alpha1/volumeattributesclass.go | 197 +
.../storage/v1beta1/fake/fake_csidriver.go | 5 +-
.../storage/v1beta1/fake/fake_csinode.go | 5 +-
.../v1beta1/fake/fake_csistoragecapacity.go | 5 +-
.../storage/v1beta1/fake/fake_storageclass.go | 5 +-
.../v1beta1/fake/fake_volumeattachment.go | 5 +-
.../v1alpha1/expansion_generated.go} | 18 +-
.../v1alpha1/validatingadmissionpolicy.go | 68 +
.../validatingadmissionpolicybinding.go | 68 +
.../v1beta1/expansion_generated.go | 8 +
.../v1beta1/validatingadmissionpolicy.go | 68 +
.../validatingadmissionpolicybinding.go | 68 +
.../v1alpha1/clustertrustbundle.go | 68 +
.../v1alpha1/expansion_generated.go | 23 +
.../extensions/v1beta1/expansion_generated.go | 4 -
.../extensions/v1beta1/podsecuritypolicy.go | 68 -
.../{v1alpha1 => v1}/expansion_generated.go | 2 +-
.../{v1alpha1 => v1}/flowschema.go | 18 +-
.../prioritylevelconfiguration.go | 18 +-
.../v1beta3/expansion_generated.go | 27 +
.../listers/flowcontrol/v1beta3/flowschema.go | 68 +
.../v1beta3/prioritylevelconfiguration.go | 68 +
.../v1alpha1/expansion_generated.go | 10 +-
.../listers/networking/v1alpha1/ipaddress.go | 68 +
.../{clustercidr.go => servicecidr.go} | 38 +-
.../policy/v1beta1/expansion_generated.go | 4 -
.../policy/v1beta1/podsecuritypolicy.go | 68 -
.../resource/v1alpha2/expansion_generated.go | 47 +
.../resource/v1alpha2/podschedulingcontext.go | 99 +
.../resource/v1alpha2/resourceclaim.go | 99 +
.../v1alpha2/resourceclaimtemplate.go | 99 +
.../resource/v1alpha2/resourceclass.go | 68 +
.../storage/v1alpha1/expansion_generated.go | 4 +
.../storage/v1alpha1/volumeattributesclass.go | 68 +
vendor/k8s.io/client-go/openapi/OWNERS | 4 +
.../client-go/openapi/cached/groupversion.go | 31 +-
vendor/k8s.io/client-go/openapi/client.go | 7 +-
.../k8s.io/client-go/openapi/groupversion.go | 47 +-
.../k8s.io/client-go/openapi/typeconverter.go | 48 +
vendor/k8s.io/client-go/openapi3/root.go | 182 +
.../pkg/apis/clientauthentication/types.go | 5 +
.../pkg/apis/clientauthentication/v1/types.go | 5 +
.../v1/zz_generated.conversion.go | 2 +
.../clientauthentication/v1beta1/types.go | 5 +
.../v1beta1/zz_generated.conversion.go | 2 +
vendor/k8s.io/client-go/pkg/version/base.go | 3 +-
.../plugin/pkg/client/auth/exec/exec.go | 19 +-
vendor/k8s.io/client-go/rest/client.go | 3 +-
vendor/k8s.io/client-go/rest/config.go | 20 +-
vendor/k8s.io/client-go/rest/exec.go | 4 +-
vendor/k8s.io/client-go/rest/request.go | 92 +-
vendor/k8s.io/client-go/rest/transport.go | 5 +-
vendor/k8s.io/client-go/rest/url_utils.go | 4 +-
vendor/k8s.io/client-go/rest/with_retry.go | 21 +-
.../k8s.io/client-go/restmapper/shortcut.go | 34 +-
vendor/k8s.io/client-go/testing/fixture.go | 2 +-
.../k8s.io/client-go/tools/auth/clientauth.go | 5 +-
vendor/k8s.io/client-go/tools/cache/OWNERS | 4 +-
.../client-go/tools/cache/controller.go | 68 +-
.../client-go/tools/cache/delta_fifo.go | 7 +-
.../client-go/tools/cache/expiration_cache.go | 2 -
vendor/k8s.io/client-go/tools/cache/fifo.go | 14 +-
.../k8s.io/client-go/tools/cache/listers.go | 20 +-
.../client-go/tools/cache/object-names.go | 65 +
.../k8s.io/client-go/tools/cache/reflector.go | 501 +-
.../reflector_data_consistency_detector.go | 119 +
.../client-go/tools/cache/shared_informer.go | 323 +-
vendor/k8s.io/client-go/tools/cache/store.go | 31 +-
.../client-go/tools/cache/synctrack/lazy.go | 83 +
.../tools/cache/synctrack/synctrack.go | 120 +
.../tools/cache/thread_safe_store.go | 303 +-
.../client-go/tools/clientcmd/api/helpers.go | 91 +-
.../client-go/tools/clientcmd/api/types.go | 19 +-
.../client-go/tools/clientcmd/api/v1/types.go | 5 +
.../api/v1/zz_generated.conversion.go | 2 +
.../client-go/tools/clientcmd/auth_loaders.go | 3 +-
.../tools/clientcmd/client_config.go | 7 +-
.../client-go/tools/clientcmd/loader.go | 33 +-
.../tools/clientcmd/merged_client_builder.go | 4 +-
.../client-go/tools/clientcmd/overrides.go | 42 +-
.../tools/internal/events/interfaces.go | 59 +
.../tools/leaderelection/leaderelection.go | 20 +-
.../resourcelock/configmaplock.go | 126 -
.../resourcelock/endpointslock.go | 121 -
.../leaderelection/resourcelock/interface.go | 42 +-
.../leaderelection/resourcelock/leaselock.go | 12 +-
.../k8s.io/client-go/tools/metrics/metrics.go | 65 +
vendor/k8s.io/client-go/tools/pager/pager.go | 41 +-
.../tools/portforward/portforward.go | 9 +-
vendor/k8s.io/client-go/tools/record/event.go | 211 +-
vendor/k8s.io/client-go/tools/record/fake.go | 30 +-
.../k8s.io/client-go/tools/reference/ref.go | 2 +-
.../tools/remotecommand/errorstream.go | 3 +-
.../client-go/tools/remotecommand/fallback.go | 57 +
.../tools/remotecommand/remotecommand.go | 104 +-
.../client-go/tools/remotecommand/spdy.go | 171 +
.../client-go/tools/remotecommand/v1.go | 7 +-
.../client-go/tools/remotecommand/v2.go | 7 +-
.../client-go/tools/remotecommand/v4.go | 2 +-
.../client-go/tools/remotecommand/v5.go | 35 +
.../tools/remotecommand/websocket.go | 519 +
vendor/k8s.io/client-go/transport/cache.go | 20 +-
.../k8s.io/client-go/transport/cache_go118.go | 24 +
vendor/k8s.io/client-go/transport/config.go | 14 +-
.../k8s.io/client-go/transport/spdy/spdy.go | 12 +-
.../client-go/transport/token_source.go | 4 +-
.../k8s.io/client-go/transport/transport.go | 83 +-
.../transport/websocket/roundtripper.go | 163 +
vendor/k8s.io/client-go/util/cert/cert.go | 10 +-
vendor/k8s.io/client-go/util/cert/io.go | 7 +-
.../client-go/util/jsonpath/jsonpath.go | 3 +
vendor/k8s.io/client-go/util/keyutil/key.go | 9 +-
.../util/workqueue/delaying_queue.go | 61 +-
.../client-go/util/workqueue/metrics.go | 9 +-
.../k8s.io/client-go/util/workqueue/queue.go | 108 +-
.../util/workqueue/rate_limiting_queue.go | 61 +-
vendor/k8s.io/component-base/config/types.go | 2 +-
.../component-base/config/v1alpha1/types.go | 2 +-
.../featuregate/feature_gate.go | 10 +
.../k8s.io/component-base/metrics/buckets.go | 53 +
.../component-base/metrics/collector.go | 6 +-
.../k8s.io/component-base/metrics/counter.go | 4 +-
vendor/k8s.io/component-base/metrics/gauge.go | 4 +-
.../component-base/metrics/histogram.go | 17 +-
vendor/k8s.io/component-base/metrics/http.go | 18 +-
.../metrics/legacyregistry/registry.go | 19 +-
.../k8s.io/component-base/metrics/metric.go | 14 +-
.../k8s.io/component-base/metrics/options.go | 13 +-
vendor/k8s.io/component-base/metrics/opts.go | 30 +
.../metrics/prometheus/feature/metrics.go | 53 +
.../k8s.io/component-base/metrics/registry.go | 65 +-
.../k8s.io/component-base/metrics/summary.go | 4 +-
.../metrics/timing_histogram.go | 7 +-
vendor/k8s.io/component-base/metrics/value.go | 13 +-
.../k8s.io/component-base/metrics/wrappers.go | 6 +
.../k8s.io/component-base/version/dynamic.go | 77 +
.../k8s.io/component-base/version/version.go | 2 +-
.../pkg/apis/apiregistration/types.go | 2 +-
.../apis/apiregistration/v1/generated.proto | 4 +-
.../pkg/apis/apiregistration/v1/types.go | 4 +-
.../apiregistration/v1beta1/generated.proto | 4 +-
.../pkg/apis/apiregistration/v1beta1/types.go | 4 +-
.../clientset/scheme/register.go | 2 +-
.../kube-openapi/pkg/builder3/util/util.go | 51 -
.../k8s.io/kube-openapi/pkg/cached/cache.go | 330 +-
.../k8s.io/kube-openapi/pkg/common/common.go | 41 +-
.../kube-openapi/pkg/handler3/handler.go | 79 +-
.../k8s.io/kube-openapi/pkg/internal/flags.go | 1 +
.../kube-openapi/pkg/openapiconv/convert.go | 322 -
.../k8s.io/kube-openapi/pkg/schemaconv/smd.go | 3 -
.../kube-openapi/pkg/schemamutation/walker.go | 519 -
.../k8s.io/kube-openapi/pkg/spec3/encoding.go | 21 +
.../k8s.io/kube-openapi/pkg/spec3/example.go | 14 +
.../pkg/spec3/external_documentation.go | 13 +
vendor/k8s.io/kube-openapi/pkg/spec3/fuzz.go | 27 +
.../k8s.io/kube-openapi/pkg/spec3/header.go | 31 +
.../kube-openapi/pkg/spec3/media_type.go | 20 +
.../kube-openapi/pkg/spec3/operation.go | 27 +
.../kube-openapi/pkg/spec3/parameter.go | 31 +
vendor/k8s.io/kube-openapi/pkg/spec3/path.go | 47 +-
.../kube-openapi/pkg/spec3/request_body.go | 21 +
.../k8s.io/kube-openapi/pkg/spec3/response.go | 52 +
.../kube-openapi/pkg/spec3/security_scheme.go | 17 +
.../k8s.io/kube-openapi/pkg/spec3/server.go | 26 +
vendor/k8s.io/kube-openapi/pkg/spec3/spec.go | 25 +
.../kube-openapi/pkg/util/proto/document.go | 2 +-
.../pkg/util/proto/document_v3.go | 2 +-
.../kube-openapi/pkg/validation/spec/fuzz.go | 502 -
.../pkg/validation/spec/gnostic.go | 2 +-
.../pkg/validation/strfmt/format.go | 81 -
.../validation/validate/object_validator.go | 16 +-
.../pkg/validation/validate/schema.go | 36 +-
.../pkg/validation/validate/schema_option.go | 7 +
.../validation/validate/slice_validator.go | 7 +-
.../pkg/validation/validate/validator.go | 4 +-
vendor/k8s.io/kubectl/pkg/cmd/util/factory.go | 15 +-
.../pkg/cmd/util/factory_client_access.go | 50 +-
vendor/k8s.io/kubectl/pkg/cmd/util/helpers.go | 45 +-
vendor/k8s.io/kubectl/pkg/drain/drain.go | 39 +-
vendor/k8s.io/kubectl/pkg/scheme/install.go | 4 +-
vendor/k8s.io/kubectl/pkg/util/i18n/i18n.go | 67 +-
.../pkg/util/i18n/translations/extract.py | 2 +-
.../kubectl/default/LC_MESSAGES/k8s.po | 8 -
.../kubectl/en_US/LC_MESSAGES/k8s.po | 8 -
.../kubectl/it_IT/LC_MESSAGES/k8s.po | 2 +-
.../i18n/translations/kubectl/template.pot | 864 +-
.../kubectl/zh_CN/LC_MESSAGES/k8s.po | 2 +-
.../kubectl/pkg/util/openapi/openapi.go | 51 +-
.../pkg/util/openapi/openapi_getter.go | 2 +-
.../pkg/util/templates/help_flags_printer.go | 2 +-
.../kubectl/pkg/util/templates/markdown.go | 170 +-
.../kubectl/pkg/util/templates/normalizers.go | 4 +-
.../kubectl/pkg/util/templates/templater.go | 10 +
.../kubectl/pkg/util/templates/templates.go | 5 +-
vendor/k8s.io/kubectl/pkg/util/term/term.go | 40 +-
.../k8s.io/kubectl/pkg/validation/schema.go | 5 +-
.../openapi => }/validation/validation.go | 38 +-
.../kubernetes/pkg/api/v1/service/util.go | 99 +
.../k8s.io/kubernetes/pkg/apis/apps/types.go | 37 +-
.../kubernetes/pkg/apis/apps/v1/conversion.go | 4 +-
.../kubernetes/pkg/apis/apps/v1/defaults.go | 13 +-
.../apis/apps/v1/zz_generated.conversion.go | 32 +
.../pkg/apis/apps/zz_generated.deepcopy.go | 21 +
.../kubernetes/pkg/apis/autoscaling/OWNERS | 1 -
.../kubernetes/pkg/apis/autoscaling/types.go | 35 +-
.../pkg/apis/core/annotation_key_constants.go | 24 +-
.../k8s.io/kubernetes/pkg/apis/core/types.go | 705 +-
.../k8s.io/kubernetes/pkg/apis/core/v1/OWNERS | 1 -
.../kubernetes/pkg/apis/core/v1/conversion.go | 12 +
.../kubernetes/pkg/apis/core/v1/defaults.go | 75 +-
.../apis/core/v1/zz_generated.conversion.go | 454 +-
.../pkg/apis/core/v1/zz_generated.defaults.go | 52 +
.../pkg/apis/core/zz_generated.deepcopy.go | 376 +-
.../k8s.io/kubernetes/pkg/apis/rbac/types.go | 2 +
.../pkg/apis/rbac/v1/evaluation_helpers.go | 35 -
.../kubernetes/pkg/apis/rbac/v1/helpers.go | 16 -
.../kubernetes/pkg/features/kube_features.go | 1070 +-
.../kubernetes/pkg/kubelet/events/event.go | 1 +
.../kubernetes/pkg/util/parsers/parsers.go | 4 +-
vendor/modules.txt | 278 +-
.../sigs.k8s.io/controller-runtime/.gitignore | 3 +
.../controller-runtime/.golangci.yml | 222 +-
vendor/sigs.k8s.io/controller-runtime/FAQ.md | 12 +-
.../sigs.k8s.io/controller-runtime/Makefile | 17 +-
.../controller-runtime/OWNERS_ALIASES | 21 +-
.../sigs.k8s.io/controller-runtime/README.md | 10 +-
.../sigs.k8s.io/controller-runtime/RELEASE.md | 51 +
.../controller-runtime/SECURITY_CONTACTS | 5 +-
.../controller-runtime/TMP-LOGGING.md | 4 +-
.../controller-runtime/VERSIONING.md | 8 +-
.../sigs.k8s.io/controller-runtime/alias.go | 11 +-
vendor/sigs.k8s.io/controller-runtime/doc.go | 33 +-
.../pkg/builder/controller.go | 211 +-
.../controller-runtime/pkg/builder/options.go | 49 +-
.../controller-runtime/pkg/builder/webhook.go | 87 +-
.../controller-runtime/pkg/cache/cache.go | 498 +-
.../pkg/cache/delegating_by_gvk_cache.go | 135 +
.../pkg/cache/informer_cache.go | 163 +-
.../pkg/cache/internal/cache_reader.go | 91 +-
.../pkg/cache/internal/deleg_map.go | 125 -
.../pkg/cache/internal/disabledeepcopy.go | 35 -
.../pkg/cache/internal/informers.go | 587 +
.../pkg/cache/internal/informers_map.go | 468 -
.../pkg/cache/internal/selector.go | 15 -
.../pkg/cache/multi_namespace_cache.go | 261 +-
.../pkg/certwatcher/certwatcher.go | 57 +-
.../pkg/certwatcher/metrics/metrics.go | 45 +
.../pkg/client/apiutil/apimachinery.go | 105 +-
.../pkg/client/apiutil/dynamicrestmapper.go | 285 -
.../pkg/client/apiutil/errors.go | 54 +
.../pkg/client/apiutil/restmapper.go | 335 +
.../controller-runtime/pkg/client/client.go | 415 +-
...ient_cache.go => client_rest_resources.go} | 27 +-
.../pkg/client/config/config.go | 46 +-
.../controller-runtime/pkg/client/doc.go | 14 +-
.../controller-runtime/pkg/client/dryrun.go | 50 +-
.../pkg/client/fake/client.go | 710 +-
.../controller-runtime/pkg/client/fake/doc.go | 15 +-
.../pkg/client/interceptor/intercept.go | 166 +
.../pkg/client/interfaces.go | 92 +-
.../pkg/client/metadata_client.go | 27 +-
.../pkg/client/namespaced_client.go | 115 +-
.../controller-runtime/pkg/client/options.go | 159 +-
.../controller-runtime/pkg/client/patch.go | 2 +-
.../controller-runtime/pkg/client/split.go | 141 -
.../pkg/client/typed_client.go | 130 +-
.../pkg/client/unstructured_client.go | 194 +-
.../controller-runtime/pkg/client/watch.go | 36 +-
.../controller-runtime/pkg/cluster/cluster.go | 180 +-
.../pkg/cluster/internal.go | 41 +-
.../controller-runtime/pkg/config/config.go | 20 +-
.../pkg/config/controller.go | 49 +
.../controller-runtime/pkg/config/doc.go | 10 +-
.../pkg/config/v1alpha1/doc.go | 2 +
.../pkg/config/v1alpha1/register.go | 6 +
.../pkg/config/v1alpha1/types.go | 24 +-
.../config/v1alpha1/zz_generated.deepcopy.go | 6 +-
.../pkg/controller/controller.go | 75 +-
.../controllerutil/controllerutil.go | 127 +-
.../controller-runtime/pkg/controller/doc.go | 2 +-
.../controller-runtime/pkg/handler/doc.go | 2 +-
.../controller-runtime/pkg/handler/enqueue.go | 10 +-
.../pkg/handler/enqueue_mapped.go | 37 +-
.../pkg/handler/enqueue_owner.go | 86 +-
.../pkg/handler/eventhandler.go | 36 +-
.../controller-runtime/pkg/healthz/healthz.go | 12 +-
.../pkg/internal/controller/controller.go | 123 +-
.../internal/controller/metrics/metrics.go | 8 +
.../pkg/internal/field/selector/utils.go} | 31 +-
.../pkg/internal/objectutil/objectutil.go | 36 -
.../pkg/internal/recorder/recorder.go | 11 +-
.../source/event_handler.go} | 58 +-
.../pkg/internal/source/kind.go | 117 +
.../pkg/internal/syncs/syncs.go | 38 +
.../pkg/leaderelection/leader_election.go | 15 +-
.../controller-runtime/pkg/log/deleg.go | 60 +-
.../controller-runtime/pkg/log/log.go | 61 +-
.../pkg/log/warning_handler.go | 2 +-
.../pkg/manager/internal.go | 234 +-
.../controller-runtime/pkg/manager/manager.go | 399 +-
.../pkg/manager/runnable_group.go | 21 +-
.../controller-runtime/pkg/manager/server.go | 61 +
.../pkg/manager/signals/signal_posix.go | 1 +
.../pkg/metrics/client_go_adapter.go | 174 +-
.../pkg/metrics/leaderelection.go | 40 +
.../pkg/metrics/listener.go | 52 -
.../{runtime/inject => metrics/server}/doc.go | 14 +-
.../pkg/metrics/server/server.go | 312 +
.../pkg/metrics/workqueue.go | 8 +-
.../pkg/predicate/predicate.go | 37 +-
.../pkg/reconcile/reconcile.go | 88 +-
.../pkg/runtime/inject/inject.go | 164 -
.../controller-runtime/pkg/scheme/scheme.go | 45 +-
.../controller-runtime/pkg/source/source.go | 169 +-
.../pkg/webhook/admission/decode.go | 17 +-
.../pkg/webhook/admission/defaulter.go | 30 +-
.../pkg/webhook/admission/defaulter_custom.go | 29 +-
.../pkg/webhook/admission/doc.go | 6 -
.../pkg/webhook/admission/http.go | 81 +-
.../pkg/webhook/admission/inject.go | 31 -
.../pkg/webhook/admission/multi.go | 52 -
.../pkg/webhook/admission/response.go | 23 +-
.../pkg/webhook/admission/validator.go | 107 +-
.../pkg/webhook/admission/validator_custom.go | 54 +-
.../pkg/webhook/admission/webhook.go | 158 +-
.../controller-runtime/pkg/webhook/alias.go | 2 +
.../pkg/webhook/conversion/conversion.go | 40 +-
.../pkg/webhook/conversion/decoder.go | 7 +-
.../controller-runtime/pkg/webhook/server.go | 256 +-
.../pkg/apis/migration/v1alpha1/types.go | 1 -
.../v1alpha1/zz_generated.deepcopy.go | 1 +
.../pkg/clients/clientset/clientset.go | 41 +-
.../pkg/clients/clientset/scheme/register.go | 14 +-
.../migration/v1alpha1/migration_client.go | 20 +-
.../api/filters/fieldspec/fieldspec.go | 2 +-
.../api/filters/filtersutil/setters.go | 74 +-
.../api/filters/iampolicygenerator/doc.go | 3 +
.../iampolicygenerator/iampolicygenerator.go | 2 +-
.../kustomize/api/filters/imagetag/legacy.go | 5 +-
.../kustomize/api/filters/imagetag/updater.go | 31 +-
.../kustomize/api/filters/nameref/doc.go | 3 +
.../kustomize/api/filters/nameref/nameref.go | 51 +-
.../api/filters/nameref/seqfilter.go | 3 +
.../api/filters/namespace/namespace.go | 171 +-
.../kustomize/api/filters/refvar/doc.go | 3 +
.../kustomize/api/filters/refvar/refvar.go | 3 +
.../kustomize/api/filters/replacement/doc.go | 3 +
.../api/filters/replacement/replacement.go | 207 +-
.../api/filters/replicacount/replicacount.go | 5 +-
vendor/sigs.k8s.io/kustomize/api/ifc/ifc.go | 8 +
.../sigs.k8s.io/kustomize/api/image/image.go | 56 +-
.../accumulator/loadconfigfromcrds.go | 4 +-
.../accumulator/namereferencetransformer.go | 1 -
.../internal/accumulator/resaccumulator.go | 4 +-
.../builtins/AnnotationsTransformer.go | 2 +-
.../internal/builtins/ConfigMapGenerator.go | 2 +-
.../api/internal/builtins/HashTransformer.go | 2 +-
.../builtins/HelmChartInflationGenerator.go | 78 +-
.../internal/builtins/IAMPolicyGenerator.go | 2 +-
.../internal/builtins/ImageTagTransformer.go | 2 +-
.../api/internal/builtins/LabelTransformer.go | 2 +-
.../builtins/LegacyOrderTransformer.go | 46 -
.../internal/builtins/NamespaceTransformer.go | 31 +-
.../builtins/PatchJson6902Transformer.go | 6 +-
.../PatchStrategicMergeTransformer.go | 2 +-
.../api/internal/builtins/PatchTransformer.go | 2 +-
.../internal/builtins/PrefixTransformer.go | 2 +-
.../builtins/ReplacementTransformer.go | 27 +-
.../builtins/ReplicaCountTransformer.go | 2 +-
.../api/internal/builtins/SecretGenerator.go | 2 +-
.../internal/builtins/SortOrderTransformer.go | 244 +
.../internal/builtins/SuffixTransformer.go | 2 +-
.../internal/builtins/ValueAddTransformer.go | 2 +-
.../api/internal/generators/utils.go | 35 +-
.../kustomize/api/internal/git/cloner.go | 6 +-
.../kustomize/api/internal/git/gitrunner.go | 8 +-
.../kustomize/api/internal/git/repospec.go | 377 +-
.../api/internal/kusterr/yamlformaterror.go | 20 +
.../builtinconfig/namebackreferences.go | 2 +-
.../builtinconfig/transformerconfig.go | 26 +-
.../builtinplugintype_string.go | 29 +-
.../plugins/builtinhelpers/builtins.go | 7 +-
.../internal/plugins/execplugin/execplugin.go | 13 +-
.../api/internal/plugins/fnplugin/fnplugin.go | 15 +-
.../api/internal/plugins/loader/loader.go | 58 +-
.../target/errmissingkustomization.go | 10 +-
.../api/internal/target/kusttarget.go | 105 +-
.../target/kusttarget_configplugin.go | 8 +
.../api/internal/utils/annotations.go | 3 +
.../api/internal/utils/errtimeout.go | 13 +-
.../api/internal/utils/makeResIds.go | 16 +-
.../builtinpluginconsts/commonlabels.go | 48 +-
.../builtinpluginconsts/defaultconfig.go | 2 +
.../builtinpluginconsts/metadatalabels.go | 51 +
.../builtinpluginconsts/namereference.go | 24 +
.../konfig/builtinpluginconsts/namespace.go | 6 -
.../builtinpluginconsts/templatelabels.go | 8 +
.../kustomize/api/krusty/kustomizer.go | 59 +-
.../kustomize/api/krusty/options.go | 30 +-
vendor/sigs.k8s.io/kustomize/api/kv/kv.go | 52 +-
.../kustomize/api/loader/errors.go | 10 +-
.../kustomize/api/loader/fileloader.go | 106 +-
.../kustomize/api/loader/loader.go | 7 +-
.../kustomize/api/provenance/provenance.go | 58 +-
.../kustomize/api/resmap/factory.go | 14 +-
.../kustomize/api/resmap/idslice.go | 37 -
.../kustomize/api/resmap/reswrangler.go | 9 +-
.../kustomize/api/resource/origin.go | 4 +-
.../kustomize/api/resource/resource.go | 22 +-
.../api/types/erronlybuiltinpluginsallowed.go | 10 +-
.../kustomize/api/types/errunabletofind.go | 10 +-
vendor/sigs.k8s.io/kustomize/api/types/fix.go | 54 -
.../kustomize/api/types/helmchartargs.go | 71 +-
.../sigs.k8s.io/kustomize/api/types/image.go | 4 +
.../kustomize/api/types/inventory.go | 16 -
.../kustomize/api/types/kustomization.go | 117 +-
.../sigs.k8s.io/kustomize/api/types/labels.go | 7 +-
.../kustomize/api/types/replacementfield.go | 3 +
.../kustomize/api/types/sortoptions.go | 28 +
.../kustomize/kyaml/LICENSE_TEMPLATE | 2 -
.../kustomize/kyaml/errors/errors.go | 10 +
.../kustomize/kyaml/filesys/confirmeddir.go | 6 +-
.../kustomize/kyaml/filesys/filesystem.go | 33 +
.../kustomize/kyaml/filesys/fsnode.go | 7 +-
.../kustomize/kyaml/filesys/fsondisk.go | 14 +-
.../kustomize/kyaml/filesys/fsondisk_unix.go | 15 +
.../kyaml/filesys/fsondisk_windows.go | 18 +
.../kustomize/kyaml/filesys/util.go | 42 +-
.../kyaml/fn/runtime/container/container.go | 21 +-
.../kustomize/kyaml/fn/runtime/exec/exec.go | 2 +-
.../fn/runtime/runtimeutil/functiontypes.go | 53 +-
.../fn/runtime/runtimeutil/runtimeutil.go | 4 +-
.../kyaml/fn/runtime/starlark/starlark.go | 9 +-
.../forked/github.com/go-yaml/yaml/decode.go | 78 +-
.../forked/github.com/go-yaml/yaml/parserc.go | 11 +-
.../github.com/qri-io/starlib/util/util.go | 6 +-
.../kustomize/kyaml/kio/byteio_reader.go | 4 +-
.../kustomize/kyaml/kio/byteio_writer.go | 2 +-
vendor/sigs.k8s.io/kustomize/kyaml/kio/kio.go | 25 +-
.../kustomize/kyaml/kio/testing.go | 45 -
.../kustomize/kyaml/openapi/Makefile | 18 +-
.../kustomize/kyaml/openapi/README.md | 46 +-
.../openapi/kubernetesapi/openapiinfo.go | 6 +-
.../openapi/kubernetesapi/v1212/swagger.go | 249 -
.../openapi/kubernetesapi/v1212/swagger.json | 101036 ---------------
.../openapi/kubernetesapi/v1_21_2/swagger.go | 249 +
.../openapi/kubernetesapi/v1_21_2/swagger.pb | 44195 +++++++
.../kyaml/openapi/kustomizationapi/swagger.go | 3 +-
.../kustomize/kyaml/openapi/openapi.go | 158 +-
.../kustomize/kyaml/order/syncorder.go | 5 +-
.../sigs.k8s.io/kustomize/kyaml/resid/gvk.go | 33 +-
.../kustomize/kyaml/resid/resid.go | 19 -
.../kustomize/kyaml/runfn/runfn.go | 20 +-
.../kustomize/kyaml/sets/string.go | 2 +-
.../internal => kyaml}/utils/pathsplitter.go | 7 +
.../sigs.k8s.io/kustomize/kyaml/yaml/alias.go | 14 +
.../kustomize/kyaml/yaml/filters.go | 2 +-
.../sigs.k8s.io/kustomize/kyaml/yaml/fns.go | 189 +-
.../internal/k8sgen/pkg/labels/selector.go | 1 -
.../sigs.k8s.io/kustomize/kyaml/yaml/match.go | 143 +-
.../kustomize/kyaml/yaml/merge2/merge2.go | 10 +-
.../sigs.k8s.io/kustomize/kyaml/yaml/rnode.go | 319 +-
.../sigs.k8s.io/kustomize/kyaml/yaml/types.go | 61 +-
.../sigs.k8s.io/kustomize/kyaml/yaml/util.go | 1 -
.../kyaml/yaml/walk/associative_sequence.go | 2 +-
.../v4/merge/conflict.go | 121 +
.../structured-merge-diff/v4/merge/update.go | 358 +
2702 files changed, 275306 insertions(+), 182280 deletions(-)
delete mode 100755 hack/update-go-module-dependencies.sh
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/LICENSE (100%)
create mode 100644 vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/antlrdoc.go
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn.go (72%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_config.go (84%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_config_set.go (81%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_deserialization_options.go (96%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_deserializer.go (99%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_simulator.go (94%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_state.go (97%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/atn_type.go (79%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/char_stream.go (82%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/common_token_factory.go (96%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/common_token_stream.go (98%)
create mode 100644 vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/comparators.go
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/dfa.go (80%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/dfa_serializer.go (97%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/dfa_state.go (90%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/diagnostic_error_listener.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/error_listener.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/error_strategy.go (99%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/errors.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/file_stream.go (92%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/input_stream.go (96%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/int_stream.go (82%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/interval_set.go (98%)
create mode 100644 vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/jcollect.go
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/lexer.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/lexer_action.go (91%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/lexer_action_executor.go (88%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/lexer_atn_simulator.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/ll1_analyzer.go (87%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/parser.go (99%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/parser_atn_simulator.go (94%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/parser_rule_context.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/prediction_context.go (81%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/prediction_mode.go (95%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/recognizer.go (92%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/rule_context.go (97%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/semantic_context.go (85%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/token.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/token_source.go (85%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/token_stream.go (87%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/tokenstream_rewriter.go (58%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/trace_listener.go (93%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/transition.go (99%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/tree.go (98%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/trees.go (93%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/utils.go (94%)
rename vendor/github.com/antlr/antlr4/runtime/Go/antlr/{ => v4}/utils_set.go (80%)
delete mode 100644 vendor/github.com/emicklei/go-restful/v3/json.go
delete mode 100644 vendor/github.com/emicklei/go-restful/v3/jsoniter.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/LICENSE
create mode 100644 vendor/github.com/evanphx/json-patch/v5/errors.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/fold.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/fuzz.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/indent.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/scanner.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/stream.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/tables.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/internal/json/tags.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/merge.go
create mode 100644 vendor/github.com/evanphx/json-patch/v5/patch.go
delete mode 100644 vendor/github.com/ghodss/yaml/.gitignore
delete mode 100644 vendor/github.com/ghodss/yaml/.travis.yml
delete mode 100644 vendor/github.com/ghodss/yaml/LICENSE
delete mode 100644 vendor/github.com/ghodss/yaml/README.md
delete mode 100644 vendor/github.com/ghodss/yaml/fields.go
delete mode 100644 vendor/github.com/ghodss/yaml/yaml.go
delete mode 100644 vendor/github.com/ghodss/yaml/yaml_go110.go
create mode 100644 vendor/github.com/google/cel-go/cel/validator.go
create mode 100644 vendor/github.com/google/cel-go/checker/format.go
rename vendor/github.com/google/cel-go/checker/{decls => }/scopes.go (81%)
create mode 100644 vendor/github.com/google/cel-go/common/ast/BUILD.bazel
create mode 100644 vendor/github.com/google/cel-go/common/ast/ast.go
create mode 100644 vendor/github.com/google/cel-go/common/ast/expr.go
create mode 100644 vendor/github.com/google/cel-go/common/decls/BUILD.bazel
create mode 100644 vendor/github.com/google/cel-go/common/decls/decls.go
create mode 100644 vendor/github.com/google/cel-go/common/functions/BUILD.bazel
create mode 100644 vendor/github.com/google/cel-go/common/functions/functions.go
create mode 100644 vendor/github.com/google/cel-go/common/stdlib/BUILD.bazel
create mode 100644 vendor/github.com/google/cel-go/common/stdlib/standard.go
create mode 100644 vendor/github.com/google/cel-go/common/types/optional.go
rename vendor/github.com/google/cel-go/{interpreter/coster.go => common/types/traits/zeroer.go} (50%)
delete mode 100644 vendor/github.com/google/cel-go/common/types/type.go
create mode 100644 vendor/github.com/google/cel-go/common/types/types.go
create mode 100644 vendor/github.com/google/cel-go/ext/bindings.go
create mode 100644 vendor/github.com/google/cel-go/ext/lists.go
create mode 100644 vendor/github.com/google/cel-go/ext/math.go
create mode 100644 vendor/github.com/google/cel-go/ext/native.go
create mode 100644 vendor/github.com/google/cel-go/ext/protos.go
create mode 100644 vendor/github.com/google/cel-go/ext/sets.go
create mode 100644 vendor/github.com/google/cel-go/interpreter/formatting.go
delete mode 100644 vendor/github.com/google/cel-go/interpreter/functions/standard.go
rename vendor/github.com/google/{gnostic => gnostic-models}/LICENSE (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/README.md (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/context.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/error.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/extensions.go (97%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/helpers.go (99%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/main.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/compiler/reader.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/extensions/README.md (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/extensions/extension.pb.go (99%)
rename vendor/github.com/google/{gnostic => gnostic-models}/extensions/extension.proto (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/extensions/extensions.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/README.md (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/base.go (90%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/display.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/models.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/operations.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/reader.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/schema.json (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/writer.go (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/OpenAPIv2.go (99%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/OpenAPIv2.pb.go (99%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/OpenAPIv2.proto (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/README.md (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/document.go (96%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/openapi-2.0.json (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/OpenAPIv3.go (99%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/OpenAPIv3.pb.go (99%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/OpenAPIv3.proto (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/README.md (100%)
rename vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/document.go (96%)
delete mode 100644 vendor/github.com/google/gnostic/openapiv3/openapi-3.0.json
delete mode 100644 vendor/github.com/google/gnostic/openapiv3/openapi-3.1.json
create mode 100644 vendor/github.com/gorilla/websocket/.gitignore
create mode 100644 vendor/github.com/gorilla/websocket/AUTHORS
create mode 100644 vendor/github.com/gorilla/websocket/LICENSE
create mode 100644 vendor/github.com/gorilla/websocket/README.md
create mode 100644 vendor/github.com/gorilla/websocket/client.go
create mode 100644 vendor/github.com/gorilla/websocket/compression.go
create mode 100644 vendor/github.com/gorilla/websocket/conn.go
create mode 100644 vendor/github.com/gorilla/websocket/doc.go
create mode 100644 vendor/github.com/gorilla/websocket/join.go
create mode 100644 vendor/github.com/gorilla/websocket/json.go
create mode 100644 vendor/github.com/gorilla/websocket/mask.go
create mode 100644 vendor/github.com/gorilla/websocket/mask_safe.go
create mode 100644 vendor/github.com/gorilla/websocket/prepared.go
create mode 100644 vendor/github.com/gorilla/websocket/proxy.go
create mode 100644 vendor/github.com/gorilla/websocket/server.go
create mode 100644 vendor/github.com/gorilla/websocket/tls_handshake.go
create mode 100644 vendor/github.com/gorilla/websocket/tls_handshake_116.go
create mode 100644 vendor/github.com/gorilla/websocket/util.go
create mode 100644 vendor/github.com/gorilla/websocket/x_net_proxy.go
create mode 100644 vendor/github.com/mxk/go-flowrate/LICENSE
create mode 100644 vendor/github.com/mxk/go-flowrate/flowrate/flowrate.go
create mode 100644 vendor/github.com/mxk/go-flowrate/flowrate/io.go
create mode 100644 vendor/github.com/mxk/go-flowrate/flowrate/util.go
create mode 100644 vendor/github.com/openshift/api/Dockerfile.rhel8
create mode 100644 vendor/github.com/openshift/api/apiserver/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/apiserver/v1/apiserver.openshift.io_apirequestcount.yaml
delete mode 100644 vendor/github.com/openshift/api/apiserver/v1/stable.apirequestcount.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/apiserver/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/apps/v1/zz_prerelease_lifecycle_generated.go
delete mode 100644 vendor/github.com/openshift/api/authorization/v1/0000_03_authorization-openshift_01_rolebindingrestriction.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/authorization/v1/stable.rolebindingrestriction.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/authorization/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/cloudnetwork/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/cloudnetwork/v1/001-cloudprivateipconfig.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/cloudnetwork/v1/001-cloudprivateipconfig.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/cloudnetwork/v1/stable.cloudprivateipconfig.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/cloudnetwork/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/config/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusteroperator.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_03_config-operator_01_proxy.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_03_marketplace-operator_01_operatorhub.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_apiserver.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_authentication.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_console.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_dns.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_featuregate.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_image.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_imagecontentpolicy.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_ingress.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_network.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_node.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_oauth.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_project.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_scheduler.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.apiserver.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.authentication.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.build.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.clusteroperator.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.clusterversion.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.console.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.dns.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.featuregate.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.image.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.imagecontentpolicy.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.infrastructure.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.ingress.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.network.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.node.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.oauth.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.operatorhub.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.project.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.proxy.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/stable.scheduler.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1/techpreview.infrastructure.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/config/v1/types_testreporting.go
create mode 100644 vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1alpha1/0000_10_config-operator_01_insightsdatagather.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/config/v1alpha1/techpreview.insightsdatagather.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/config/v1alpha1/types_backup.go
create mode 100644 vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go
create mode 100644 vendor/github.com/openshift/api/config/v1alpha1/types_image_policy.go
create mode 100644 vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/console/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_10_consoleclidownload.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_10_consoleexternalloglink.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_10_consolelink.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_10_consolenotification.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_10_consolequickstart.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_10_consoleyamlsample.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/0000_51_consoleplugin.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consoleclidownload.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consoleexternalloglink.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consolelink.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consolenotification.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consoleplugin.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consolequickstart.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1/stable.consoleyamlsample.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/console/v1/types_console_sample.go
create mode 100644 vendor/github.com/openshift/api/console/v1/zz_generated.featuregated-crd-manifests.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1alpha1/0000_51_consoleplugin.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/console/v1alpha1/stable.consoleplugin.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/console/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/features.md
create mode 100644 vendor/github.com/openshift/api/helm/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/helm/v1beta1/0000_10-helm-chart-repository.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/helm/v1beta1/0000_10-project-helm-chart-repository.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/helm/v1beta1/stable.helmchartrepository.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/helm/v1beta1/stable.projecthelmchartrepository.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/helm/v1beta1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/image/.codegen.yaml
create mode 100644 vendor/github.com/openshift/api/imageregistry/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/imageregistry/v1/00_imageregistry.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/imageregistry/v1/00_imageregistry.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/imageregistry/v1/01_imagepruner.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/imageregistry/v1/stable.config.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/imageregistry/v1/stable.imagepruner.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/imageregistry/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/kubecontrolplane/.codegen.yaml
create mode 100644 vendor/github.com/openshift/api/machine/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1/0000_10_controlplanemachineset.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1/stable.controlplanemachineset.aws.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1/stable.controlplanemachineset.azure.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1/stable.controlplanemachineset.gcp.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1/stable.controlplanemachineset.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/machine/v1/zz_generated.featuregated-crd-manifests.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1beta1/0000_10_machine.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1beta1/0000_10_machinehealthcheck.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1beta1/0000_10_machineset.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1beta1/stable.machine.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1beta1/stable.machinehealthcheck.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/machine/v1beta1/stable.machineset.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/machine/v1beta1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/monitoring/.codegen.yaml
rename vendor/github.com/openshift/api/monitoring/{v1alpha1 => v1}/Makefile (78%)
rename vendor/github.com/openshift/api/monitoring/{v1alpha1 => v1}/doc.go (88%)
rename vendor/github.com/openshift/api/monitoring/{v1alpha1 => v1}/register.go (97%)
rename vendor/github.com/openshift/api/monitoring/{v1alpha1 => v1}/types.go (62%)
rename vendor/github.com/openshift/api/monitoring/{v1alpha1 => v1}/zz_generated.deepcopy.go (98%)
create mode 100644 vendor/github.com/openshift/api/monitoring/v1/zz_generated.featuregated-crd-manifests.yaml
rename vendor/github.com/openshift/api/monitoring/{v1alpha1 => v1}/zz_generated.swagger_doc_generated.go (61%)
delete mode 100644 vendor/github.com/openshift/api/monitoring/v1alpha1/0000_50_monitoring_01_alertingrules.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/monitoring/v1alpha1/0000_50_monitoring_02_alertrelabelconfigs.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/monitoring/v1alpha1/techpreview.alertingrule.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/monitoring/v1alpha1/techpreview.alertrelabelconfig.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/network/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/001-clusternetwork-crd.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/002-hostsubnet-crd.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/003-netnamespace-crd.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/004-egressnetworkpolicy-crd.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/stable.clusternetwork.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/stable.egressnetworkpolicy.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/stable.hostsubnet.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/network/v1/stable.netnamespace.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/network/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/Makefile
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/doc.go
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/register.go
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/types_dnsnameresolver.go
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/zz_generated.deepcopy.go
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/network/v1alpha1/zz_generated.swagger_doc_generated.go
create mode 100644 vendor/github.com/openshift/api/networkoperator/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/networkoperator/v1/001-egressrouter.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/networkoperator/v1/001-egressrouter.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/networkoperator/v1/stable.egressrouter.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/networkoperator/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/oauth/.codegen.yaml
create mode 100644 vendor/github.com/openshift/api/openshiftcontrolplane/.codegen.yaml
create mode 100644 vendor/github.com/openshift/api/operator/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_10_config-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_12_etcd-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_30_openshift-apiserver-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_40_cloud-credential-operator_00_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_40_kube-storage-version-migrator-operator_00_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_cluster-openshift-controller-manager-operator_02_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_cluster_storage_operator_01_crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_ingress-operator_00-ingresscontroller.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_insights-operator_00-insightsoperator.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_50_service-ca-operator_02_crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_70_cluster-network-operator_01.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_70_console-operator.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_70_dns-operator_00.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_80_csi_snapshot_controller_operator_01_crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.authentication.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.cloudcredential.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.clustercsidriver.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.config.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.console.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.csisnapshotcontroller.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.dns.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.etcd.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.ingresscontroller.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.insightsoperator.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.kubeapiserver.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.kubecontrollermanager.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.kubescheduler.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.kubestorageversionmigrator.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.network.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.openshiftapiserver.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.openshiftcontrollermanager.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.serviceca.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1/stable.storage.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/operator/v1/types_machineconfiguration.go
create mode 100644 vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1alpha1/0000_10_config-operator_01_imagecontentsourcepolicy.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operator/v1alpha1/stable.imagecontentsourcepolicy.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/operator/v1alpha1/types_etcdbackup.go
create mode 100644 vendor/github.com/openshift/api/operator/v1alpha1/types_olm.go
create mode 100644 vendor/github.com/openshift/api/operator/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/operatorcontrolplane/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/operatorcontrolplane/v1alpha1/0000_10-pod-network-connectivity-check.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/operatorcontrolplane/v1alpha1/stable.podnetworkconnectivitycheck.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/operatorcontrolplane/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
delete mode 100644 vendor/github.com/openshift/api/quota/v1/0000_03_quota-openshift_01_clusterresourcequota.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/quota/v1/stable.clusterresourcequota.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/quota/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/route/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/route/v1/route.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/route/v1/route.crd.yaml-patch
delete mode 100644 vendor/github.com/openshift/api/route/v1/stable.route.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/route/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/samples/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/samples/v1/0000_10_samplesconfig.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/samples/v1/stable.config.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/samples/v1/zz_generated.featuregated-crd-manifests.yaml
delete mode 100644 vendor/github.com/openshift/api/security/v1/0000_03_security-openshift_01_scc.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/security/v1/stable.securitycontextconstraints.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/security/v1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/api/servicecertsigner/.codegen.yaml
create mode 100644 vendor/github.com/openshift/api/sharedresource/.codegen.yaml
delete mode 100644 vendor/github.com/openshift/api/sharedresource/v1alpha1/0000_10_sharedconfigmap.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/sharedresource/v1alpha1/0000_10_sharedsecret.crd.yaml
delete mode 100644 vendor/github.com/openshift/api/sharedresource/v1alpha1/stable.sharedconfigmap.testsuite.yaml
delete mode 100644 vendor/github.com/openshift/api/sharedresource/v1alpha1/stable.sharedsecret.testsuite.yaml
create mode 100644 vendor/github.com/openshift/api/sharedresource/v1alpha1/zz_generated.featuregated-crd-manifests.yaml
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/awsdnsspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/azureresourcetag.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/baremetalplatformloadbalancer.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/baremetalplatformspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/cloudcontrollermanagerstatus.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/cloudloadbalancerconfig.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/cloudloadbalancerips.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/dnsplatformspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/externalplatformspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/externalplatformstatus.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/featuregateattributes.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/featuregatedetails.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/featuregatestatus.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/gcpresourcelabel.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/gcpresourcetag.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/ibmcloudserviceendpoint.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/networkdiagnostics.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/networkdiagnosticssourceplacement.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/networkdiagnosticstargetplacement.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/nutanixfailuredomain.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/nutanixplatformloadbalancer.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/nutanixresourceidentifier.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/oidcclientconfig.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/oidcclientreference.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/oidcclientstatus.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/oidcprovider.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/openstackplatformloadbalancer.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/openstackplatformspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/ovirtplatformloadbalancer.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/prefixedclaimmapping.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/profilecustomizations.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/signaturestore.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/tokenclaimmapping.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/tokenclaimmappings.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/tokenclaimvalidationrule.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/tokenissuer.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/tokenrequiredclaim.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/usernameclaimmapping.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/usernameprefix.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1/vsphereplatformloadbalancer.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/backup.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/backupspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/clusterimagepolicy.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/clusterimagepolicyspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/clusterimagepolicystatus.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/etcdbackupspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/fulciocawithrekor.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/imagepolicy.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/imagepolicyspec.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/imagepolicystatus.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/policy.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/policyfulciosubject.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/policyidentity.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/policymatchexactrepository.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/policymatchremapidentity.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/policyrootoftrust.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/publickey.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/retentionnumberconfig.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/retentionpolicy.go
create mode 100644 vendor/github.com/openshift/client-go/config/applyconfigurations/config/v1alpha1/retentionsizeconfig.go
delete mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/backup.go
create mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/clusterimagepolicy.go
create mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/fake/fake_backup.go
create mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/fake/fake_clusterimagepolicy.go
create mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/fake/fake_imagepolicy.go
create mode 100644 vendor/github.com/openshift/client-go/config/clientset/versioned/typed/config/v1alpha1/imagepolicy.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesample.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplecontainerimportsource.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplecontainerimportsourceservice.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplegitimportsource.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplegitimportsourcerepository.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplegitimportsourceservice.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplesource.go
create mode 100644 vendor/github.com/openshift/client-go/console/applyconfigurations/console/v1/consolesamplespec.go
delete mode 100644 vendor/github.com/openshift/client-go/console/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/client-go/console/clientset/versioned/typed/console/v1/consolesample.go
create mode 100644 vendor/github.com/openshift/client-go/console/clientset/versioned/typed/console/v1/fake/fake_consolesample.go
create mode 100644 vendor/github.com/openshift/client-go/imageregistry/applyconfigurations/imageregistry/v1/azurenetworkaccess.go
create mode 100644 vendor/github.com/openshift/client-go/imageregistry/applyconfigurations/imageregistry/v1/azurenetworkaccessinternal.go
delete mode 100644 vendor/github.com/openshift/client-go/imageregistry/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/client-go/machine/applyconfigurations/machine/v1/nutanixfailuredomainreference.go
create mode 100644 vendor/github.com/openshift/client-go/machine/applyconfigurations/machine/v1/rootvolume.go
create mode 100644 vendor/github.com/openshift/client-go/machine/applyconfigurations/machine/v1/vspherefailuredomain.go
delete mode 100644 vendor/github.com/openshift/client-go/machine/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/awscsidriverconfigspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/azurecsidriverconfigspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/azurediskencryptionset.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/containerloggingdestinationparameters.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/gcpcsidriverconfigspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/gcpkmskeyreference.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ibmcloudcsidriverconfigspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ibmloadbalancerparameters.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingresscontrollerhttpheader.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingresscontrollerhttpheaderactions.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingresscontrollerhttpheaderactionunion.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ingresscontrollersethttpheader.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ipsecconfig.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ipv4gatewayconfig.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ipv4ovnkubernetesconfig.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ipv6gatewayconfig.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/ipv6ovnkubernetesconfig.go
delete mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/kuryrconfig.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfiguration.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machineconfigurationstatus.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machinemanager.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/machinemanagerselector.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/managedbootimages.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicyclusterstatus.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicyconfig.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicyspecaction.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicyspecfile.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicyspecsshkey.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicyspecunit.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicystatus.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicystatusaction.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicystatusfile.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicystatussshkey.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/nodedisruptionpolicystatusunit.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/partialselector.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/pinnedresourcereference.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/reloadservice.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/restartservice.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1/serviceaccountissuerstatus.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/backupjobreference.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/etcdbackup.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/etcdbackupspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/etcdbackupstatus.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/olm.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/olmspec.go
create mode 100644 vendor/github.com/openshift/client-go/operator/applyconfigurations/operator/v1alpha1/olmstatus.go
delete mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/fake/fake_machineconfiguration.go
create mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1/machineconfiguration.go
create mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1alpha1/etcdbackup.go
create mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1alpha1/fake/fake_etcdbackup.go
create mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1alpha1/fake/fake_olm.go
create mode 100644 vendor/github.com/openshift/client-go/operator/clientset/versioned/typed/operator/v1alpha1/olm.go
delete mode 100644 vendor/github.com/openshift/client-go/project/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/client-go/route/applyconfigurations/route/v1/localobjectreference.go
create mode 100644 vendor/github.com/openshift/client-go/route/applyconfigurations/route/v1/routehttpheader.go
create mode 100644 vendor/github.com/openshift/client-go/route/applyconfigurations/route/v1/routehttpheaderactions.go
create mode 100644 vendor/github.com/openshift/client-go/route/applyconfigurations/route/v1/routehttpheaderactionunion.go
create mode 100644 vendor/github.com/openshift/client-go/route/applyconfigurations/route/v1/routehttpheaders.go
create mode 100644 vendor/github.com/openshift/client-go/route/applyconfigurations/route/v1/routesethttpheader.go
delete mode 100644 vendor/github.com/openshift/client-go/route/clientset/versioned/doc.go
delete mode 100644 vendor/github.com/openshift/client-go/samples/clientset/versioned/doc.go
delete mode 100644 vendor/github.com/openshift/client-go/security/clientset/versioned/doc.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/admission.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/apiextensions.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/apps.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/config.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/core.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/generic.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/images.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/migration.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/policy.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/rbac.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/route.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/storage.go
create mode 100644 vendor/github.com/openshift/library-go/pkg/operator/resource/resourceread/unstructured.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/resource.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/alertmanager_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/podmonitor_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/probe_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheus_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheusrule_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/servicemonitor_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1/alertmanager_config_conversion.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1/prometheusagent_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1/validation.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/alertmanager_config_types.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/conversion_from.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/conversion_to.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/doc.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/register.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/validation.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1beta1/zz_generated.deepcopy.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertingspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanager.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerconfigmatcherstrategy.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerconfiguration.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerendpoints.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerglobalconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerstatus.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/alertmanagerwebspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/apiserverconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/arbitraryfsaccessthroughsmsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/argument.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/attachmetadata.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/authorization.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/azuread.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/azureoauth.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/azuresdk.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/basicauth.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/commonprometheusfields.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/condition.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/corev1topologyspreadconstraint.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/embeddedobjectmetadata.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/embeddedpersistentvolumeclaim.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/endpoint.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/exemplars.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/globalsmtpconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/hostalias.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/hostport.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/httpconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/managedidentity.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/metadataconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/namespaceselector.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/oauth2.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/objectreference.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/podmetricsendpoint.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/podmonitor.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/podmonitorspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/probe.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/proberspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/probespec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/probetargetingress.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/probetargets.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/probetargetstaticconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheus.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheusrule.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheusruleexcludeconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheusrulespec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheusspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheusstatus.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheustracingconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/prometheuswebspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/proxyconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/queryspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/queueconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/relabelconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/remotereadspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/remotewritespec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/rule.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/rulegroup.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/rules.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/rulesalert.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/safeauthorization.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/safetlsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/scrapeclass.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/secretorconfigmap.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/servicemonitor.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/servicemonitorspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/shardstatus.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/sigv4.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/storagespec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/thanosruler.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/thanosrulerspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/thanosrulerstatus.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/thanosrulerwebspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/thanosspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/tlsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/topologyspreadconstraint.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/tsdbspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/webconfigfilefields.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/webhttpconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/webhttpheaders.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1/webtlsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/alertmanagerconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/alertmanagerconfigspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/attachmetadata.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/azuresdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/consulsdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/dayofmonthrange.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/digitaloceansdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/discordconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/dnssdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/dockerfilter.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/dockersdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/ec2filter.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/ec2sdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/emailconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/eurekasdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/filesdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/gcesdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/hetznersdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/httpconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/httpsdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/inhibitrule.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/k8sselectorconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/keyvalue.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/kubernetessdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/kumasdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/matcher.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/msteamsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/mutetimeinterval.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/namespacediscovery.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/nomadsdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/openstacksdconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/opsgenieconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/opsgenieconfigresponder.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/pagerdutyconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/pagerdutyimageconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/pagerdutylinkconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/prometheusagent.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/prometheusagentspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/pushoverconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/receiver.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/route.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/scrapeconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/scrapeconfigspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/slackaction.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/slackconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/slackconfirmationfield.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/slackfield.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/snsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/staticconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/telegramconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/timeinterval.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/timerange.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/victoropsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/webexconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/webhookconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1alpha1/wechatconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/alertmanagerconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/alertmanagerconfigspec.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/dayofmonthrange.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/discordconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/emailconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/httpconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/inhibitrule.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/keyvalue.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/matcher.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/msteamsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/opsgenieconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/opsgenieconfigresponder.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/pagerdutyconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/pagerdutyimageconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/pagerdutylinkconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/pushoverconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/receiver.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/route.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/secretkeyselector.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/slackaction.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/slackconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/slackconfirmationfield.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/slackfield.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/snsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/telegramconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/timeinterval.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/timeperiod.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/timerange.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/victoropsconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/webexconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/webhookconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1beta1/wechatconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1alpha1/prometheusagent.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1alpha1/scrapeconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1beta1/alertmanagerconfig.go
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1beta1/doc.go
rename vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/{doc.go => typed/monitoring/v1beta1/generated_expansion.go} (89%)
create mode 100644 vendor/github.com/prometheus-operator/prometheus-operator/pkg/client/versioned/typed/monitoring/v1beta1/monitoring_client.go
delete mode 100644 vendor/github.com/russross/blackfriday/LICENSE.txt
delete mode 100644 vendor/github.com/russross/blackfriday/html.go
delete mode 100644 vendor/github.com/russross/blackfriday/latex.go
rename vendor/github.com/russross/blackfriday/{ => v2}/.gitignore (100%)
rename vendor/github.com/russross/blackfriday/{ => v2}/.travis.yml (90%)
create mode 100644 vendor/github.com/russross/blackfriday/v2/LICENSE.txt
rename vendor/github.com/russross/blackfriday/{ => v2}/README.md (90%)
rename vendor/github.com/russross/blackfriday/{ => v2}/block.go (57%)
rename vendor/github.com/russross/blackfriday/{ => v2}/doc.go (59%)
create mode 100644 vendor/github.com/russross/blackfriday/v2/entities.go
create mode 100644 vendor/github.com/russross/blackfriday/v2/esc.go
create mode 100644 vendor/github.com/russross/blackfriday/v2/html.go
rename vendor/github.com/russross/blackfriday/{ => v2}/inline.go (63%)
rename vendor/github.com/russross/blackfriday/{ => v2}/markdown.go (50%)
create mode 100644 vendor/github.com/russross/blackfriday/v2/node.go
rename vendor/github.com/russross/blackfriday/{ => v2}/smartypants.go (66%)
create mode 100644 vendor/github.com/xlab/treeprint/.gitignore
create mode 100644 vendor/golang.org/x/sync/singleflight/singleflight.go
create mode 100644 vendor/golang.org/x/text/feature/plural/common.go
create mode 100644 vendor/golang.org/x/text/feature/plural/message.go
create mode 100644 vendor/golang.org/x/text/feature/plural/plural.go
create mode 100644 vendor/golang.org/x/text/feature/plural/tables.go
create mode 100644 vendor/golang.org/x/text/internal/catmsg/catmsg.go
create mode 100644 vendor/golang.org/x/text/internal/catmsg/codec.go
create mode 100644 vendor/golang.org/x/text/internal/catmsg/varint.go
create mode 100644 vendor/golang.org/x/text/internal/format/format.go
create mode 100644 vendor/golang.org/x/text/internal/format/parser.go
create mode 100644 vendor/golang.org/x/text/internal/number/common.go
create mode 100644 vendor/golang.org/x/text/internal/number/decimal.go
create mode 100644 vendor/golang.org/x/text/internal/number/format.go
create mode 100644 vendor/golang.org/x/text/internal/number/number.go
create mode 100644 vendor/golang.org/x/text/internal/number/pattern.go
create mode 100644 vendor/golang.org/x/text/internal/number/roundingmode_string.go
create mode 100644 vendor/golang.org/x/text/internal/number/tables.go
create mode 100644 vendor/golang.org/x/text/internal/stringset/set.go
create mode 100644 vendor/golang.org/x/text/message/catalog.go
create mode 100644 vendor/golang.org/x/text/message/catalog/catalog.go
create mode 100644 vendor/golang.org/x/text/message/catalog/dict.go
create mode 100644 vendor/golang.org/x/text/message/catalog/go19.go
create mode 100644 vendor/golang.org/x/text/message/catalog/gopre19.go
create mode 100644 vendor/golang.org/x/text/message/doc.go
create mode 100644 vendor/golang.org/x/text/message/format.go
create mode 100644 vendor/golang.org/x/text/message/message.go
create mode 100644 vendor/golang.org/x/text/message/print.go
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/doc.go
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/generated.pb.go
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/generated.proto
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/register.go
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/types.go
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/types_swagger_doc_generated.go
create mode 100644 vendor/k8s.io/api/admissionregistration/v1alpha1/zz_generated.deepcopy.go
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/doc.go
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/generated.pb.go
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/generated.proto
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/register.go
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/types.go
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/zz_generated.deepcopy.go
create mode 100644 vendor/k8s.io/api/apidiscovery/v2beta1/zz_generated.prerelease-lifecycle.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/doc.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/generated.pb.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/generated.proto
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/register.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/types.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/types_swagger_doc_generated.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/zz_generated.deepcopy.go
create mode 100644 vendor/k8s.io/api/authentication/v1alpha1/zz_generated.prerelease-lifecycle.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/doc.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/generated.pb.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/generated.proto
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/register.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/types.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/types_swagger_doc_generated.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/zz_generated.deepcopy.go
create mode 100644 vendor/k8s.io/api/certificates/v1alpha1/zz_generated.prerelease-lifecycle.go
create mode 100644 vendor/k8s.io/api/flowcontrol/v1/doc.go
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/generated.pb.go (86%)
create mode 100644 vendor/k8s.io/api/flowcontrol/v1/generated.proto
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/register.go (95%)
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/types.go (75%)
create mode 100644 vendor/k8s.io/api/flowcontrol/v1/types_swagger_doc_generated.go
create mode 100644 vendor/k8s.io/api/flowcontrol/v1/zz_generated.deepcopy.go
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1beta3}/doc.go (77%)
create mode 100644 vendor/k8s.io/api/flowcontrol/v1beta3/generated.pb.go
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1beta3}/generated.proto (79%)
create mode 100644 vendor/k8s.io/api/flowcontrol/v1beta3/register.go
create mode 100644 vendor/k8s.io/api/flowcontrol/v1beta3/types.go
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1beta3}/types_swagger_doc_generated.go (81%)
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1beta3}/zz_generated.deepcopy.go (92%)
rename vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1beta3}/zz_generated.prerelease-lifecycle.go (94%)
create mode 100644 vendor/k8s.io/api/networking/v1alpha1/well_known_labels.go
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/doc.go
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/generated.pb.go
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/generated.proto
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/register.go
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/types.go
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/types_swagger_doc_generated.go
create mode 100644 vendor/k8s.io/api/resource/v1alpha2/zz_generated.deepcopy.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/adaptor.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/model/schemas.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/metrics.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/apiserver/validation/ratcheting.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcecolumndefinition.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourceconversion.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinition.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitioncondition.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionnames.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionspec.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionstatus.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcedefinitionversion.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcesubresources.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcesubresourcescale.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/customresourcevalidation.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/externaldocumentation.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/jsonschemaprops.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/servicereference.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/validationrule.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/webhookclientconfig.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1/webhookconversion.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcecolumndefinition.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourceconversion.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinition.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitioncondition.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionnames.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionspec.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionstatus.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcedefinitionversion.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcesubresources.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcesubresourcescale.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/customresourcevalidation.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/externaldocumentation.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/jsonschemaprops.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/servicereference.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/validationrule.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/client/applyconfiguration/apiextensions/v1beta1/webhookclientconfig.go
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/features/OWNERS
create mode 100644 vendor/k8s.io/apiextensions-apiserver/pkg/features/kube_features.go
delete mode 100644 vendor/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/LICENSE
delete mode 100644 vendor/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/README.md
delete mode 100644 vendor/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/registry.go
delete mode 100644 vendor/k8s.io/apiextensions-apiserver/third_party/forked/celopenapi/model/schemas.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/defaults.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/runtime/splice.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/dump/dump.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/endpoints.yaml
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/fieldmanager.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/atmostevery.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/buildmanagerinfo.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/capmanagers.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/conflict.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/fieldmanager.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/fields.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/lastapplied.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/lastappliedmanager.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/lastappliedupdater.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/managedfields.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/managedfieldsupdater.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/manager.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/pathelement.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/skipnonapplied.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/stripmeta.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/structuredmerge.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/typeconverter.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/versioncheck.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/versionconverter.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/node.yaml
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/pod.yaml
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/scalehandler.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/managedfields/typeconverter.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/proxy/dial.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/proxy/doc.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/proxy/transport.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/proxy/upgradeaware.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/sets/ordered.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/sets/set.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/version/doc.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/version/version.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/wait/backoff.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/wait/delay.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/wait/error.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/wait/loop.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/wait/poll.go
create mode 100644 vendor/k8s.io/apimachinery/pkg/util/wait/timer.go
create mode 100644 vendor/k8s.io/apiserver/pkg/apis/cel/config.go
create mode 100644 vendor/k8s.io/apiserver/pkg/authentication/serviceaccount/util.go
create mode 100644 vendor/k8s.io/apiserver/pkg/authentication/user/doc.go
create mode 100644 vendor/k8s.io/apiserver/pkg/authentication/user/user.go
create mode 100644 vendor/k8s.io/apiserver/pkg/authorization/authorizer/interfaces.go
create mode 100644 vendor/k8s.io/apiserver/pkg/authorization/authorizer/rule.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/OWNERS
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/common/adaptor.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/common/equality.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/common/maplist.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/common/schemas.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/common/values.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/environment/base.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/environment/environment.go
rename vendor/k8s.io/{apiextensions-apiserver/pkg/apiserver/schema => apiserver/pkg}/cel/errors.go (100%)
rename vendor/k8s.io/{apiextensions-apiserver/third_party/forked/celopenapi/model => apiserver/pkg/cel}/escaping.go (91%)
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/library/authz.go
rename vendor/k8s.io/{apiextensions-apiserver/pkg/apiserver/schema => apiserver/pkg}/cel/library/cost.go (75%)
rename vendor/k8s.io/{apiextensions-apiserver/pkg/apiserver/schema => apiserver/pkg}/cel/library/lists.go (99%)
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/library/quantity.go
rename vendor/k8s.io/{apiextensions-apiserver/pkg/apiserver/schema => apiserver/pkg}/cel/library/regex.go (97%)
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/library/test.go
rename vendor/k8s.io/{apiextensions-apiserver/pkg/apiserver/schema => apiserver/pkg}/cel/library/urls.go (87%)
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/limits.go
rename vendor/k8s.io/{apiextensions-apiserver/pkg/apiserver/schema => apiserver/pkg}/cel/metrics/metrics.go (94%)
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/openapi/adaptor.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/openapi/extensions.go
create mode 100644 vendor/k8s.io/apiserver/pkg/cel/quantity.go
rename vendor/k8s.io/{apiextensions-apiserver/third_party/forked/celopenapi/model => apiserver/pkg/cel}/types.go (69%)
rename vendor/k8s.io/{apiextensions-apiserver/third_party/forked/celopenapi/model => apiserver/pkg/cel}/url.go (71%)
rename vendor/k8s.io/{apiextensions-apiserver/third_party/forked/celopenapi/model => apiserver/pkg/cel}/value.go (96%)
create mode 100644 vendor/k8s.io/apiserver/pkg/warning/context.go
create mode 100644 vendor/k8s.io/cli-runtime/pkg/genericiooptions/io_options.go
create mode 100644 vendor/k8s.io/cli-runtime/pkg/printers/terminal.go
create mode 100644 vendor/k8s.io/cli-runtime/pkg/resource/fallback_query_param_verifier.go
create mode 100644 vendor/k8s.io/cli-runtime/pkg/resource/query_param_verifier_v3.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/matchcondition.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/auditannotation.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/expressionwarning.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/matchcondition.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/matchresources.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/namedrulewithoperations.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/paramkind.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/paramref.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/typechecking.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicybindingspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicyspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicystatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validation.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/variable.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/auditannotation.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/expressionwarning.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/matchcondition.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/matchresources.go
rename vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/{rulewithoperations.go => namedrulewithoperations.go} (56%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/paramkind.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/paramref.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/rule.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/typechecking.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicybindingspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicyspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicystatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validation.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/variable.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/apps/v1/statefulsetordinals.go
rename vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/allowedflexvolume.go => apps/v1beta1/statefulsetordinals.go} (50%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/apps/v1beta2/statefulsetordinals.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/certificates/v1alpha1/clustertrustbundle.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/certificates/v1alpha1/clustertrustbundlespec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/claimsource.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/clustertrustbundleprojection.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/containerresizepolicy.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/hostip.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/modifyvolumestatus.go
rename vendor/k8s.io/client-go/applyconfigurations/{autoscaling/v2/podresourcemetricsource.go => core/v1/podresourceclaim.go} (51%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/podresourceclaimstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/podschedulinggate.go
rename vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/allowedcsidriver.go => core/v1/resourceclaim.go} (65%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/sleepaction.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/typedobjectreference.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/core/v1/volumeresourcerequirements.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/allowedhostpath.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/fsgroupstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/hostportrange.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/idrange.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressloadbalanceringress.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressloadbalancerstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/ingressportstatus.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/podsecuritypolicyspec.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/runasgroupstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/runasuserstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/runtimeclassstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/selinuxstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/supplementalgroupsstrategyoptions.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1/exemptprioritylevelconfiguration.go
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowdistinguishermethod.go (87%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschema.go (94%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1/flowschemacondition.go
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschemaspec.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschemastatus.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/groupsubject.go (98%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/limitedprioritylevelconfiguration.go (57%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/limitresponse.go (88%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/nonresourcepolicyrule.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/policyruleswithsubjects.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfiguration.go (94%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1/prioritylevelconfigurationcondition.go
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationreference.go (98%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationspec.go (73%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationstatus.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/queuingconfiguration.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/resourcepolicyrule.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/serviceaccountsubject.go (99%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/subject.go (92%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/usersubject.go (98%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta1/exemptprioritylevelconfiguration.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta2/exemptprioritylevelconfiguration.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/exemptprioritylevelconfiguration.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/flowdistinguishermethod.go
rename vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/podsecuritypolicy.go => flowcontrol/v1beta3/flowschema.go} (66%)
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1beta3}/flowschemacondition.go (83%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/flowschemaspec.go
rename vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/networkpolicystatus.go => flowcontrol/v1beta3/flowschemastatus.go} (60%)
rename vendor/k8s.io/client-go/applyconfigurations/{policy/v1beta1/allowedcsidriver.go => flowcontrol/v1beta3/groupsubject.go} (65%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/limitedprioritylevelconfiguration.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/limitresponse.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/nonresourcepolicyrule.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/policyruleswithsubjects.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/prioritylevelconfiguration.go
rename vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1beta3}/prioritylevelconfigurationcondition.go (86%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/prioritylevelconfigurationreference.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/prioritylevelconfigurationspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/prioritylevelconfigurationstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/queuingconfiguration.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/resourcepolicyrule.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/serviceaccountsubject.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/subject.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/usersubject.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/meta/v1/listmeta.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1/ingressloadbalanceringress.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1/ingressloadbalancerstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1/ingressportstatus.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/clustercidrspec.go
rename vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/{clustercidr.go => ipaddress.go} (69%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/ipaddressspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/parentreference.go
rename vendor/k8s.io/client-go/applyconfigurations/{policy/v1beta1/podsecuritypolicy.go => networking/v1alpha1/servicecidr.go} (65%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/servicecidrspec.go
rename vendor/k8s.io/client-go/applyconfigurations/networking/{v1/networkpolicystatus.go => v1alpha1/servicecidrstatus.go} (68%)
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressloadbalanceringress.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressloadbalancerstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/networking/v1beta1/ingressportstatus.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/allowedflexvolume.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/allowedhostpath.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/fsgroupstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/hostportrange.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/idrange.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicyspec.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runasgroupstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runasuserstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runtimeclassstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/selinuxstrategyoptions.go
delete mode 100644 vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/supplementalgroupsstrategyoptions.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/allocationresult.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/podschedulingcontext.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/podschedulingcontextspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/podschedulingcontextstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaim.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimconsumerreference.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimparametersreference.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimschedulingstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimspec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimstatus.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimtemplate.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimtemplatespec.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclass.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclassparametersreference.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcehandle.go
create mode 100644 vendor/k8s.io/client-go/applyconfigurations/storage/v1alpha1/volumeattributesclass.go
create mode 100644 vendor/k8s.io/client-go/discovery/aggregated_discovery.go
create mode 100644 vendor/k8s.io/client-go/informers/admissionregistration/v1alpha1/interface.go
create mode 100644 vendor/k8s.io/client-go/informers/admissionregistration/v1alpha1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/informers/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/informers/admissionregistration/v1beta1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/informers/admissionregistration/v1beta1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/informers/certificates/v1alpha1/clustertrustbundle.go
create mode 100644 vendor/k8s.io/client-go/informers/certificates/v1alpha1/interface.go
create mode 100644 vendor/k8s.io/client-go/informers/doc.go
create mode 100644 vendor/k8s.io/client-go/informers/flowcontrol/v1/flowschema.go
rename vendor/k8s.io/client-go/informers/flowcontrol/{v1alpha1 => v1}/interface.go (99%)
create mode 100644 vendor/k8s.io/client-go/informers/flowcontrol/v1/prioritylevelconfiguration.go
rename vendor/k8s.io/client-go/informers/flowcontrol/{v1alpha1 => v1beta3}/flowschema.go (83%)
create mode 100644 vendor/k8s.io/client-go/informers/flowcontrol/v1beta3/interface.go
rename vendor/k8s.io/client-go/informers/flowcontrol/{v1alpha1 => v1beta3}/prioritylevelconfiguration.go (81%)
rename vendor/k8s.io/client-go/informers/{extensions/v1beta1/podsecuritypolicy.go => networking/v1alpha1/ipaddress.go} (50%)
rename vendor/k8s.io/client-go/informers/networking/v1alpha1/{clustercidr.go => servicecidr.go} (69%)
create mode 100644 vendor/k8s.io/client-go/informers/resource/interface.go
create mode 100644 vendor/k8s.io/client-go/informers/resource/v1alpha2/interface.go
create mode 100644 vendor/k8s.io/client-go/informers/resource/v1alpha2/podschedulingcontext.go
create mode 100644 vendor/k8s.io/client-go/informers/resource/v1alpha2/resourceclaim.go
create mode 100644 vendor/k8s.io/client-go/informers/resource/v1alpha2/resourceclaimtemplate.go
rename vendor/k8s.io/client-go/informers/{policy/v1beta1/podsecuritypolicy.go => resource/v1alpha2/resourceclass.go} (51%)
create mode 100644 vendor/k8s.io/client-go/informers/storage/v1alpha1/volumeattributesclass.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/admissionregistration_client.go
rename vendor/k8s.io/client-go/kubernetes/typed/{flowcontrol => admissionregistration}/v1alpha1/doc.go (100%)
rename vendor/k8s.io/client-go/kubernetes/typed/{flowcontrol => admissionregistration}/v1alpha1/fake/doc.go (100%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_admissionregistration_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake/fake_validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/generated_expansion.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake/fake_validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake/fake_validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1/fake/fake_selfsubjectreview.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1/selfsubjectreview.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/authentication_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/doc.go
rename vendor/k8s.io/{apiextensions-apiserver/pkg/client/clientset/clientset => client-go/kubernetes/typed/authentication/v1alpha1/fake}/doc.go (88%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/fake/fake_authentication_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/fake/fake_selfsubjectreview.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/generated_expansion.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1alpha1/selfsubjectreview.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake/fake_selfsubjectreview.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/selfsubjectreview.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/certificates_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/clustertrustbundle.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/fake/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/fake/fake_certificates_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/fake/fake_clustertrustbundle.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/generated_expansion.go
delete mode 100644 vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake/fake_podsecuritypolicy.go
delete mode 100644 vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/fake/doc.go
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/fake/fake_flowcontrol_client.go (72%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/fake/fake_flowschema.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/fake/fake_prioritylevelconfiguration.go
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/flowcontrol_client.go (64%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/flowschema.go
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/generated_expansion.go (97%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/prioritylevelconfiguration.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/fake/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/fake/fake_flowcontrol_client.go
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1beta3}/fake/fake_flowschema.go (71%)
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1beta3}/fake/fake_prioritylevelconfiguration.go (66%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/flowcontrol_client.go
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1beta3}/flowschema.go (77%)
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3/generated_expansion.go
rename vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1beta3}/prioritylevelconfiguration.go (74%)
delete mode 100644 vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/clustercidr.go
delete mode 100644 vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/fake/fake_clustercidr.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/fake/fake_ipaddress.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/fake/fake_servicecidr.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/ipaddress.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/servicecidr.go
delete mode 100644 vendor/k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake/fake_podsecuritypolicy.go
delete mode 100644 vendor/k8s.io/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/fake/doc.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/fake/fake_podschedulingcontext.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/fake/fake_resource_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/fake/fake_resourceclaim.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/fake/fake_resourceclaimtemplate.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/fake/fake_resourceclass.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/generated_expansion.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/podschedulingcontext.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resource_client.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resourceclaim.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resourceclaimtemplate.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resourceclass.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake/fake_volumeattributesclass.go
create mode 100644 vendor/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattributesclass.go
rename vendor/k8s.io/{kubectl/pkg/util/openapi/extensions.go => client-go/listers/admissionregistration/v1alpha1/expansion_generated.go} (53%)
create mode 100644 vendor/k8s.io/client-go/listers/admissionregistration/v1alpha1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/listers/admissionregistration/v1alpha1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/listers/admissionregistration/v1beta1/validatingadmissionpolicy.go
create mode 100644 vendor/k8s.io/client-go/listers/admissionregistration/v1beta1/validatingadmissionpolicybinding.go
create mode 100644 vendor/k8s.io/client-go/listers/certificates/v1alpha1/clustertrustbundle.go
create mode 100644 vendor/k8s.io/client-go/listers/certificates/v1alpha1/expansion_generated.go
delete mode 100644 vendor/k8s.io/client-go/listers/extensions/v1beta1/podsecuritypolicy.go
rename vendor/k8s.io/client-go/listers/flowcontrol/{v1alpha1 => v1}/expansion_generated.go (98%)
rename vendor/k8s.io/client-go/listers/flowcontrol/{v1alpha1 => v1}/flowschema.go (79%)
rename vendor/k8s.io/client-go/listers/flowcontrol/{v1alpha1 => v1}/prioritylevelconfiguration.go (79%)
create mode 100644 vendor/k8s.io/client-go/listers/flowcontrol/v1beta3/expansion_generated.go
create mode 100644 vendor/k8s.io/client-go/listers/flowcontrol/v1beta3/flowschema.go
create mode 100644 vendor/k8s.io/client-go/listers/flowcontrol/v1beta3/prioritylevelconfiguration.go
create mode 100644 vendor/k8s.io/client-go/listers/networking/v1alpha1/ipaddress.go
rename vendor/k8s.io/client-go/listers/networking/v1alpha1/{clustercidr.go => servicecidr.go} (54%)
delete mode 100644 vendor/k8s.io/client-go/listers/policy/v1beta1/podsecuritypolicy.go
create mode 100644 vendor/k8s.io/client-go/listers/resource/v1alpha2/expansion_generated.go
create mode 100644 vendor/k8s.io/client-go/listers/resource/v1alpha2/podschedulingcontext.go
create mode 100644 vendor/k8s.io/client-go/listers/resource/v1alpha2/resourceclaim.go
create mode 100644 vendor/k8s.io/client-go/listers/resource/v1alpha2/resourceclaimtemplate.go
create mode 100644 vendor/k8s.io/client-go/listers/resource/v1alpha2/resourceclass.go
create mode 100644 vendor/k8s.io/client-go/listers/storage/v1alpha1/volumeattributesclass.go
create mode 100644 vendor/k8s.io/client-go/openapi/OWNERS
create mode 100644 vendor/k8s.io/client-go/openapi/typeconverter.go
create mode 100644 vendor/k8s.io/client-go/openapi3/root.go
create mode 100644 vendor/k8s.io/client-go/tools/cache/object-names.go
create mode 100644 vendor/k8s.io/client-go/tools/cache/reflector_data_consistency_detector.go
create mode 100644 vendor/k8s.io/client-go/tools/cache/synctrack/lazy.go
create mode 100644 vendor/k8s.io/client-go/tools/cache/synctrack/synctrack.go
create mode 100644 vendor/k8s.io/client-go/tools/internal/events/interfaces.go
delete mode 100644 vendor/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go
delete mode 100644 vendor/k8s.io/client-go/tools/leaderelection/resourcelock/endpointslock.go
create mode 100644 vendor/k8s.io/client-go/tools/remotecommand/fallback.go
create mode 100644 vendor/k8s.io/client-go/tools/remotecommand/spdy.go
create mode 100644 vendor/k8s.io/client-go/tools/remotecommand/v5.go
create mode 100644 vendor/k8s.io/client-go/tools/remotecommand/websocket.go
create mode 100644 vendor/k8s.io/client-go/transport/cache_go118.go
create mode 100644 vendor/k8s.io/client-go/transport/websocket/roundtripper.go
create mode 100644 vendor/k8s.io/component-base/metrics/buckets.go
create mode 100644 vendor/k8s.io/component-base/metrics/prometheus/feature/metrics.go
create mode 100644 vendor/k8s.io/component-base/version/dynamic.go
delete mode 100644 vendor/k8s.io/kube-openapi/pkg/builder3/util/util.go
delete mode 100644 vendor/k8s.io/kube-openapi/pkg/openapiconv/convert.go
delete mode 100644 vendor/k8s.io/kube-openapi/pkg/schemamutation/walker.go
delete mode 100644 vendor/k8s.io/kube-openapi/pkg/validation/spec/fuzz.go
rename vendor/k8s.io/kubectl/pkg/{util/openapi => }/validation/validation.go (76%)
create mode 100644 vendor/k8s.io/kubernetes/pkg/api/v1/service/util.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/RELEASE.md
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/cache/delegating_by_gvk_cache.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/deleg_map.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/disabledeepcopy.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/certwatcher/metrics/metrics.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/dynamicrestmapper.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/errors.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/restmapper.go
rename vendor/sigs.k8s.io/controller-runtime/pkg/client/{client_cache.go => client_rest_resources.go} (82%)
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/client/interceptor/intercept.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/config/controller.go
rename vendor/{k8s.io/apiextensions-apiserver/pkg/apiserver/schema/cel/library/libraries.go => sigs.k8s.io/controller-runtime/pkg/internal/field/selector/utils.go} (50%)
rename vendor/sigs.k8s.io/controller-runtime/pkg/{source/internal/eventsource.go => internal/source/event_handler.go} (67%)
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/internal/source/kind.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/internal/syncs/syncs.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/manager/server.go
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/metrics/leaderelection.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/metrics/listener.go
rename vendor/sigs.k8s.io/controller-runtime/pkg/{runtime/inject => metrics/server}/doc.go (62%)
create mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/metrics/server/server.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/runtime/inject/inject.go
delete mode 100644 vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/inject.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/api/internal/builtins/LegacyOrderTransformer.go
create mode 100644 vendor/sigs.k8s.io/kustomize/api/internal/builtins/SortOrderTransformer.go
create mode 100644 vendor/sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts/metadatalabels.go
create mode 100644 vendor/sigs.k8s.io/kustomize/api/konfig/builtinpluginconsts/templatelabels.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/api/resmap/idslice.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/api/types/fix.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/api/types/inventory.go
create mode 100644 vendor/sigs.k8s.io/kustomize/api/types/sortoptions.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/LICENSE_TEMPLATE
create mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_unix.go
create mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/filesys/fsondisk_windows.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/kio/testing.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/openapi/kubernetesapi/v1212/swagger.go
delete mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/openapi/kubernetesapi/v1212/swagger.json
create mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/openapi/kubernetesapi/v1_21_2/swagger.go
create mode 100644 vendor/sigs.k8s.io/kustomize/kyaml/openapi/kubernetesapi/v1_21_2/swagger.pb
rename vendor/sigs.k8s.io/kustomize/{api/internal => kyaml}/utils/pathsplitter.go (94%)
create mode 100644 vendor/sigs.k8s.io/structured-merge-diff/v4/merge/conflict.go
create mode 100644 vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go
diff --git a/cmd/aro/operator.go b/cmd/aro/operator.go
index 0481c5b6127..7cfa23f29b8 100644
--- a/cmd/aro/operator.go
+++ b/cmd/aro/operator.go
@@ -75,8 +75,6 @@ func operator(ctx context.Context, log *logrus.Entry) error {
mgr, err := ctrl.NewManager(restConfig, ctrl.Options{
HealthProbeBindAddress: ":8080",
- MetricsBindAddress: "0", // disabled
- Port: 8443,
})
if err != nil {
return err
diff --git a/go.mod b/go.mod
index b6c3827397e..5dd1478b93e 100644
--- a/go.mod
+++ b/go.mod
@@ -30,7 +30,7 @@ require (
github.com/containers/image/v5 v5.32.2
github.com/containers/podman/v5 v5.2.4
github.com/coreos/go-oidc/v3 v3.11.0
- github.com/coreos/go-semver v0.3.0
+ github.com/coreos/go-semver v0.3.1
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09
github.com/coreos/ignition/v2 v2.14.0
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
@@ -40,7 +40,7 @@ require (
github.com/go-test/deep v1.1.0
github.com/gofrs/uuid v4.4.0+incompatible
github.com/golang-jwt/jwt/v4 v4.5.1
- github.com/google/gnostic v0.5.7-v3refs
+ github.com/google/gnostic-models v0.6.8
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
github.com/gorilla/csrf v1.7.2
@@ -61,16 +61,16 @@ require (
github.com/onsi/gomega v1.34.1
github.com/open-policy-agent/frameworks/constraint v0.0.0-20221109005544-7de84dff5081
github.com/opencontainers/runtime-spec v1.2.0
- github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46
- github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
- github.com/openshift/cloud-credential-operator v0.0.0-20240910012137-a0245d57d1e6
+ github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094
+ github.com/openshift/client-go v0.0.0-20240510131258-f646d5f29250
+ github.com/openshift/cloud-credential-operator v0.0.0-20250107183716-87a85dc8e12e
github.com/openshift/hive/apis v0.0.0-20250212001559-5d3f4d77dc90
- github.com/openshift/library-go v0.0.0-20230620084201-504ca4bd5a83
+ github.com/openshift/library-go v0.0.0-20240711192904-190fec8c3f09
github.com/openshift/machine-config-operator v0.0.0-00010101000000-000000000000
github.com/pires/go-proxyproto v0.6.2
github.com/pkg/errors v0.9.1
- github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.50.0
- github.com/prometheus-operator/prometheus-operator/pkg/client v0.48.1
+ github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
+ github.com/prometheus-operator/prometheus-operator/pkg/client v0.74.0
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/common v0.51.1
github.com/serge1peshcoff/selenium-go-conditions v0.0.0-20170824121757-5afbdb74596b
@@ -88,15 +88,15 @@ require (
golang.org/x/sync v0.11.0
golang.org/x/text v0.22.0
golang.org/x/tools v0.24.0
- k8s.io/api v0.31.1
- k8s.io/apiextensions-apiserver v0.27.2
- k8s.io/apimachinery v0.31.1
- k8s.io/cli-runtime v0.25.16
- k8s.io/client-go v0.27.3
- k8s.io/kubectl v0.24.17
- k8s.io/kubernetes v1.28.4
+ k8s.io/api v0.29.14
+ k8s.io/apiextensions-apiserver v0.29.14
+ k8s.io/apimachinery v0.29.14
+ k8s.io/cli-runtime v0.29.14
+ k8s.io/client-go v0.29.14
+ k8s.io/kubectl v0.29.14
+ k8s.io/kubernetes v1.29.14
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
- sigs.k8s.io/controller-runtime v0.15.0
+ sigs.k8s.io/controller-runtime v0.17.2
sigs.k8s.io/yaml v1.4.0
)
@@ -116,7 +116,7 @@ require (
github.com/Microsoft/hcsshim v0.12.5 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
- github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
+ github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
@@ -148,13 +148,12 @@ require (
github.com/docker/docker-credential-helpers v0.8.2 // indirect
github.com/docker/go-connections v0.5.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
- github.com/elazarl/goproxy v1.7.2 // indirect
- github.com/emicklei/go-restful/v3 v3.10.1 // indirect
- github.com/evanphx/json-patch v5.6.0+incompatible // indirect
+ github.com/emicklei/go-restful/v3 v3.12.0 // indirect
+ github.com/evanphx/json-patch v5.9.0+incompatible // indirect
+ github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.8.0 // indirect
- github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
github.com/go-errors/errors v1.4.2 // indirect
github.com/go-json-experiment/json v0.0.0-20240418180308-af2d5061e6c2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
@@ -177,14 +176,14 @@ require (
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.0.1 // indirect
- github.com/google/cel-go v0.12.6 // indirect
+ github.com/google/cel-go v0.17.7 // indirect
github.com/google/go-containerregistry v0.20.0 // indirect
github.com/google/go-intervals v0.0.2 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
- github.com/googleapis/gnostic v0.6.8 // indirect
github.com/gorilla/schema v1.4.1 // indirect
+ github.com/gorilla/websocket v1.5.0 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/imdario/mergo v0.3.15 // indirect
@@ -220,6 +219,7 @@ require (
github.com/morikuni/aec v1.0.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
+ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/nxadm/tail v1.4.11 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -239,7 +239,7 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/robfig/cron v1.2.0 // indirect
- github.com/russross/blackfriday v1.6.0 // indirect
+ github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sanity-io/litter v1.5.5 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.8.0 // indirect
@@ -263,7 +263,7 @@ require (
github.com/vbauerster/mpb/v8 v8.7.5 // indirect
github.com/vmihailenco/msgpack/v4 v4.3.13 // indirect
github.com/vmihailenco/tagparser v0.1.1 // indirect
- github.com/xlab/treeprint v1.1.0 // indirect
+ github.com/xlab/treeprint v1.2.0 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
go.mongodb.org/mongo-driver v1.14.0 // indirect
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 // indirect
@@ -272,13 +272,13 @@ require (
go.opentelemetry.io/otel v1.24.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
go.opentelemetry.io/otel/trace v1.24.0 // indirect
- go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd // indirect
+ go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/mod v0.20.0 // indirect
golang.org/x/sys v0.30.0 // indirect
golang.org/x/term v0.29.0 // indirect
golang.org/x/time v0.5.0 // indirect
- gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
+ gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect
@@ -288,22 +288,24 @@ require (
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
- k8s.io/apiserver v0.26.2 // indirect
- k8s.io/component-base v0.27.2 // indirect
+ k8s.io/apiserver v0.29.14 // indirect
+ k8s.io/component-base v0.29.14 // indirect
k8s.io/klog/v2 v2.130.1 // indirect
- k8s.io/kube-aggregator v0.27.1 // indirect
- k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+ k8s.io/kube-aggregator v0.29.14 // indirect
+ k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30 // indirect
- sigs.k8s.io/kube-storage-version-migrator v0.0.4 // indirect
- sigs.k8s.io/kustomize/api v0.12.1 // indirect
- sigs.k8s.io/kustomize/kyaml v0.13.9 // indirect
+ sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 // indirect
+ sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
+ sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
tags.cncf.io/container-device-interface v0.8.0 // indirect
)
// strip cloud.google.com/go dependencies -- these are not required as dependencies
exclude (
+ cloud.google.com/go v0.34.0
cloud.google.com/go v0.37.4
+ cloud.google.com/go v0.38.0
cloud.google.com/go v0.41.0
cloud.google.com/go v0.44.1
cloud.google.com/go v0.44.2
@@ -311,12 +313,14 @@ exclude (
cloud.google.com/go v0.45.1
cloud.google.com/go v0.46.3
cloud.google.com/go v0.50.0
+ cloud.google.com/go v0.51.0
cloud.google.com/go v0.52.0
cloud.google.com/go v0.53.0
cloud.google.com/go v0.54.0
cloud.google.com/go v0.56.0
cloud.google.com/go v0.57.0
cloud.google.com/go v0.58.0
+ cloud.google.com/go v0.65.0
cloud.google.com/go v0.75.0
cloud.google.com/go v0.81.0
cloud.google.com/go v0.97.0
@@ -461,6 +465,7 @@ exclude (
cloud.google.com/go/compute v1.19.0
cloud.google.com/go/compute v1.19.1
cloud.google.com/go/compute/metadata v0.1.0
+ cloud.google.com/go/compute/metadata v0.2.0
cloud.google.com/go/compute/metadata v0.2.1
cloud.google.com/go/compute/metadata v0.2.3
cloud.google.com/go/contactcenterinsights v1.3.0
@@ -937,8 +942,23 @@ exclude (
google.golang.org/api v0.59.0
google.golang.org/api v0.61.0
google.golang.org/api v0.62.0
+ google.golang.org/appengine v0.0.0
+ google.golang.org/appengine v1.0.0
google.golang.org/appengine v1.1.0
+ google.golang.org/appengine v1.2.0
+ google.golang.org/appengine v1.3.0
+ google.golang.org/appengine v1.4.0
+ google.golang.org/appengine v1.5.0
+ google.golang.org/appengine v1.6.0
+ google.golang.org/appengine v1.6.1
+ google.golang.org/appengine v1.6.2
+ google.golang.org/appengine v1.6.3
+ google.golang.org/appengine v1.6.4
+ google.golang.org/appengine v1.6.5
+ google.golang.org/appengine v1.6.6
+ google.golang.org/appengine v1.6.7
google.golang.org/cloud v0.0.0-20151119220103-975617b05ea8
+ google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63
google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215
@@ -946,6 +966,10 @@ exclude (
google.golang.org/genproto v0.0.0-20200527145253-8367513e4ece
google.golang.org/genproto v0.0.0-20200610104632-a5b850bcf112
google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154
+ google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1
+ google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc
+ google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6
+ google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1
// trim dependency tree from old grpcs
google.golang.org/grpc v1.17.0
google.golang.org/grpc v1.19.0
@@ -982,6 +1006,9 @@ exclude (
google.golang.org/protobuf v1.30.0
)
+// exclude Azure SDKs that we are not compatible with
+exclude github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
+
exclude (
// exclude Azure SDKs that we are not compatible with
github.com/Azure/azure-sdk-for-go v48.0.0+incompatible
@@ -999,7 +1026,6 @@ exclude (
github.com/Azure/azure-sdk-for-go v67.2.0+incompatible
github.com/Azure/azure-sdk-for-go v67.3.0+incompatible
github.com/Azure/azure-sdk-for-go v67.4.0+incompatible
- github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78
github.com/Azure/go-ansiterm v0.0.0-20210608223527-2377c96fe795
github.com/Azure/go-autorest/autorest v0.9.0
@@ -1080,136 +1106,58 @@ exclude (
github.com/pkg/errors v0.8.1
github.com/pkg/sftp v1.10.1
github.com/pkg/sftp v1.13.1
- // remove old prometheus deps
- github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.44.1
- github.com/prometheus/client_golang v1.0.0
- github.com/prometheus/client_golang v1.11.0
- github.com/prometheus/client_golang v1.11.1
- github.com/prometheus/client_golang v1.12.1
- github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
- github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4
- github.com/prometheus/client_model v0.2.0
+ github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0
github.com/prometheus/client_model v0.3.0
- github.com/prometheus/common v0.4.1
- github.com/prometheus/common v0.10.0
- github.com/prometheus/common v0.15.0
- github.com/prometheus/common v0.26.0
- github.com/prometheus/common v0.28.0
- github.com/prometheus/common v0.32.1
- github.com/prometheus/procfs v0.0.2
- github.com/prometheus/procfs v0.6.0
- github.com/prometheus/procfs v0.7.3
- github.com/russross/blackfriday v1.5.2
- github.com/sirupsen/logrus v1.4.1
- github.com/sirupsen/logrus v1.6.0
- github.com/sirupsen/logrus v1.7.0
- github.com/sirupsen/logrus v1.8.1
- github.com/sirupsen/logrus v1.9.0
- // trip dependency tree from old cobra
- github.com/spf13/cobra v0.0.5
- github.com/spf13/cobra v1.0.0
- github.com/spf13/cobra v1.1.1
- github.com/spf13/cobra v1.1.3
- github.com/spf13/cobra v1.2.1
- github.com/spf13/cobra v1.4.0
- github.com/spf13/pflag v1.0.3
- github.com/spf13/pflag v1.0.5
- github.com/stretchr/objx v0.1.0
- github.com/stretchr/objx v0.1.1
- github.com/stretchr/objx v0.2.0
- github.com/stretchr/objx v0.4.0
- github.com/stretchr/testify v1.2.2
- github.com/stretchr/testify v1.3.0
- github.com/stretchr/testify v1.4.0
- github.com/stretchr/testify v1.5.1
- github.com/stretchr/testify v1.6.1
- github.com/stretchr/testify v1.7.0
- github.com/stretchr/testify v1.7.1
- github.com/stretchr/testify v1.8.0
- github.com/stretchr/testify v1.8.1
- github.com/stretchr/testify v1.8.2
- github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f
- go.mozilla.org/pkcs7 v0.0.0-20200128120323-432b2356ecb1
- // trim dependency tree from old opencensus
- go.opencensus.io v0.20.1
- go.opencensus.io v0.20.2
- go.opencensus.io v0.21.0
- go.opencensus.io v0.22.0
- go.opencensus.io v0.22.2
- go.opencensus.io v0.22.3
- go.opencensus.io v0.22.4
go.opencensus.io v0.22.5
- go.opencensus.io v0.23.0
- // old otel deps
- go.opentelemetry.io/contrib v0.20.0
- go.opentelemetry.io/otel v0.20.0
- go.opentelemetry.io/otel/metric v0.20.0
- go.opentelemetry.io/otel/sdk v0.20.0
- go.opentelemetry.io/otel/sdk/metric v0.20.0
- go.opentelemetry.io/otel/trace v0.20.0
- go.opentelemetry.io/proto/otlp v0.7.0
go.opentelemetry.io/proto/otlp v0.19.0
- go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5
- go.uber.org/atomic v1.4.0
- go.uber.org/atomic v1.7.0
- go.uber.org/goleak v1.1.10
- go.uber.org/goleak v1.1.11-0.20210813005559-691160354723
- go.uber.org/goleak v1.1.12
- go.uber.org/goleak v1.2.0
- go.uber.org/multierr v1.1.0
- go.uber.org/multierr v1.6.0
- go.uber.org/zap v1.10.0
- go.uber.org/zap v1.17.0
- go.uber.org/zap v1.19.0
- go.uber.org/zap v1.19.1
- gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405
- gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127
- gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15
- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f
+ golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
+ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
+ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
+ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
+ golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
gopkg.in/yaml.v2 v2.2.1
gopkg.in/yaml.v2 v2.2.2
gopkg.in/yaml.v2 v2.2.4
gopkg.in/yaml.v2 v2.2.8
gopkg.in/yaml.v2 v2.3.0
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c
- gopkg.in/yaml.v3 v3.0.0-20200605160147-a5ece683394c
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
- gopkg.in/yaml.v3 v3.0.0
)
-// trim old golang.org/x/ and github.com/golang/ items
+// exclude some old crypto/serialisation libs, even though we won't use them,
+// just to make sure they don't come up in our tree
exclude (
- github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e
- // exclude github.com/golang/protobuf < 1.3.2 https://nvd.nist.gov/vuln/detail/CVE-2021-3121
- github.com/golang/protobuf v1.0.0
- github.com/golang/protobuf v1.1.1
+ github.com/golang-jwt/jwt/v4 v4.0.0
+ github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/protobuf v1.2.0
- github.com/golang/protobuf v1.2.1
- github.com/golang/protobuf v1.3.0
- github.com/golang/protobuf v1.3.1
+ github.com/golang/protobuf v1.3.2
+ github.com/golang/protobuf v1.3.4
+ github.com/golang/protobuf v1.3.5
github.com/golang/protobuf v1.4.2
github.com/golang/protobuf v1.4.3
- github.com/golang/protobuf v1.5.0
github.com/golang/protobuf v1.5.2
- go.uber.org/mock v1.4.4
- golang.org/x/arch v0.0.0-20180920145803-b19384d3c130
+ github.com/golang/protobuf v1.5.3
+ github.com/google/uuid v1.3.0
+ github.com/gorilla/websocket v1.4.2
+ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63
+ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e
+ github.com/mailru/easyjson v0.7.6
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2
golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f
- golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
- golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa
- golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3
- golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838
+ golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
+ golang.org/x/crypto v0.1.0
golang.org/x/crypto v0.6.0
golang.org/x/crypto v0.14.0
golang.org/x/lint v0.0.0-20190409202823-959b441ac422
golang.org/x/lint v0.0.0-20190930215403-16217165b5de
- golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/mod v0.4.2
golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
@@ -1426,129 +1374,17 @@ exclude (
golang.org/x/tools v0.3.0
golang.org/x/tools v0.6.0
golang.org/x/tools v0.7.0
- golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7
- golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
- golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1
- golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2
)
-// exclude ancient k8s versions
+// exclude some old k8s deps that make weird branches
exclude (
- k8s.io/api v0.0.0
- k8s.io/api v0.18.0-beta.2
- k8s.io/api v0.18.3
- k8s.io/api v0.19.2
- k8s.io/api v0.19.3
- k8s.io/api v0.19.4
- k8s.io/api v0.20.0
- k8s.io/api v0.20.6
- k8s.io/api v0.21.0
- k8s.io/api v0.21.1
- k8s.io/api v0.22.1
- k8s.io/api v0.23.0
- k8s.io/api v0.23.1
- k8s.io/apiextensions-apiserver v0.0.0
- k8s.io/apiextensions-apiserver v0.18.0-beta.2
- k8s.io/apiextensions-apiserver v0.18.3
- k8s.io/apiextensions-apiserver v0.19.2
- k8s.io/apiextensions-apiserver v0.19.3
- k8s.io/apiextensions-apiserver v0.21.0
- k8s.io/apiextensions-apiserver v0.21.1
- k8s.io/apiextensions-apiserver v0.22.1
- k8s.io/apiextensions-apiserver v0.23.0
- k8s.io/apiextensions-apiserver v0.23.1
- k8s.io/apiextensions-apiserver v0.23.5
- k8s.io/apimachinery v0.0.0
- k8s.io/apimachinery v0.18.0-beta.2
- k8s.io/apimachinery v0.18.3
- k8s.io/apimachinery v0.19.2
- k8s.io/apimachinery v0.19.3
- k8s.io/apimachinery v0.19.4
- k8s.io/apimachinery v0.20.0
- k8s.io/apimachinery v0.20.2
- k8s.io/apimachinery v0.20.6
- k8s.io/apimachinery v0.21.0
- k8s.io/apimachinery v0.21.1
- k8s.io/apimachinery v0.22.1
- k8s.io/apimachinery v0.23.0
- k8s.io/apimachinery v0.23.1
- k8s.io/apimachinery v0.23.5
- k8s.io/apiserver v0.0.0
- k8s.io/apiserver v0.20.6
- k8s.io/apiserver v0.21.0
- k8s.io/apiserver v0.22.1
- k8s.io/apiserver v0.23.0
- k8s.io/apiserver v0.23.1
- k8s.io/apiserver v0.23.5
- k8s.io/cli-runtime v0.0.0
- k8s.io/cli-runtime v0.21.0
- k8s.io/cli-runtime v0.23.0
- k8s.io/cli-runtime v0.23.1
- k8s.io/client-go v0.0.0
- k8s.io/client-go v0.18.0-beta.2
- k8s.io/client-go v0.19.2
- k8s.io/client-go v0.19.3
- k8s.io/client-go v0.19.4
- k8s.io/client-go v0.20.0
- k8s.io/client-go v0.20.6
- k8s.io/client-go v0.21.0
- k8s.io/client-go v0.21.1
- k8s.io/client-go v0.22.1
- k8s.io/client-go v0.23.0
- k8s.io/client-go v0.23.1
- k8s.io/client-go v0.23.5
- k8s.io/code-generator v0.0.0
- k8s.io/code-generator v0.18.0-beta.2
- k8s.io/code-generator v0.19.7
- k8s.io/code-generator v0.20.0
- k8s.io/code-generator v0.21.0
- k8s.io/code-generator v0.23.0
- k8s.io/component-base v0.0.0
- k8s.io/component-base v0.19.2
- k8s.io/component-base v0.19.4
- k8s.io/component-base v0.20.6
- k8s.io/component-base v0.21.0
- k8s.io/component-base v0.21.1
- k8s.io/component-base v0.22.1
- k8s.io/component-base v0.23.0
- k8s.io/component-base v0.23.1
- k8s.io/component-base v0.23.5
- k8s.io/controller-manager v0.0.0
- k8s.io/cri-api v0.0.0
- k8s.io/cri-api v0.20.6
- k8s.io/gengo v0.0.0-20201113003025-83324d819ded
+ k8s.io/api v0.23.3
+ k8s.io/apimachinery v0.23.3
+ k8s.io/code-generator v0.23.3
k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c
- k8s.io/klog v1.0.0
- k8s.io/klog/v2 v2.0.0
- k8s.io/klog/v2 v2.2.0
- k8s.io/klog/v2 v2.4.0
- k8s.io/klog/v2 v2.8.0
- k8s.io/klog/v2 v2.9.0
- k8s.io/klog/v2 v2.30.0
+ k8s.io/gengo v0.0.0-20211129171323-c02415ce4185
k8s.io/klog/v2 v2.40.1
- k8s.io/klog/v2 v2.60.1
- k8s.io/klog/v2 v2.70.1
- k8s.io/kube-aggregator v0.0.0
- k8s.io/kube-aggregator v0.18.0-beta.2
- k8s.io/kube-aggregator v0.23.0
- k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
- k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65
k8s.io/kube-openapi v0.0.0-20220124234850-424119656bbf
- k8s.io/kube-scheduler v0.0.0
- k8s.io/kubectl v0.0.0
- k8s.io/kubectl v0.21.0
- k8s.io/kubectl v0.22.0
- k8s.io/kubectl v0.23.0
- k8s.io/kubectl v0.23.1
- k8s.io/kubelet v0.0.0
- k8s.io/legacy-cloud-providers v0.0.0
- k8s.io/metrics v0.0.0
- k8s.io/mount-utils v0.0.0
- k8s.io/pod-security-admission v0.0.0
- k8s.io/sample-apiserver v0.0.0
- k8s.io/system-validators v1.6.0
- k8s.io/utils v0.0.0-20201110183641-67b214c5f920
- k8s.io/utils v0.0.0-20210111153108-fddb29f9d009
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b
k8s.io/utils v0.0.0-20211116205334-6203023598ed
@@ -1577,40 +1413,12 @@ exclude (
sigs.k8s.io/structured-merge-diff/v4 v4.1.2
sigs.k8s.io/structured-merge-diff/v4 v4.2.0
sigs.k8s.io/structured-merge-diff/v4 v4.2.1
- sigs.k8s.io/yaml v1.2.0
-)
-
-// k8s.io and sigs.k8s.io pins
-replace (
- k8s.io/api => k8s.io/api v0.25.16
- k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.25.16
- k8s.io/apimachinery => k8s.io/apimachinery v0.25.16
- k8s.io/apiserver => k8s.io/apiserver v0.25.16
- k8s.io/client-go => k8s.io/client-go v0.25.16
- k8s.io/cloud-provider => k8s.io/cloud-provider v0.25.16 // required for k8s.io/kubernetes
- k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.25.16 // required for k8s.io/kubernetes
- k8s.io/code-generator => k8s.io/code-generator v0.25.16
- k8s.io/component-base => k8s.io/component-base v0.25.16
- k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.25.16 // required for k8s.io/kubernetes
- k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.25.16
- k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.25.16
- k8s.io/kube-proxy => k8s.io/kube-proxy v0.25.16
- k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.25.16
- k8s.io/kubectl => k8s.io/kubectl v0.25.16
- k8s.io/kubernetes => k8s.io/kubernetes v1.25.16
- sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.2
- sigs.k8s.io/kustomize/api => sigs.k8s.io/kustomize/api v0.11.2
- sigs.k8s.io/kustomize/kyaml => sigs.k8s.io/kustomize/kyaml v0.13.3
- sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
+ sigs.k8s.io/yaml v1.3.0
)
// OpenShift pins
replace (
- github.com/googleapis/gnostic => github.com/google/gnostic v0.5.5
- github.com/openshift/api => github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46
- github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
github.com/openshift/hive/apis => github.com/openshift/hive/apis v0.0.0-20231116161336-9dd47f8bfa1f
- github.com/openshift/library-go => github.com/openshift/library-go v0.0.0-20230222114049-eac44a078a6e
github.com/openshift/machine-config-operator => github.com/openshift/machine-config-operator v0.0.1-0.20230908201248-46b93e64dea6
go.mongodb.org/mongo-driver => go.mongodb.org/mongo-driver v1.9.4
google.golang.org/grpc => google.golang.org/grpc v1.56.3
diff --git a/go.sum b/go.sum
index 60eafb2dcce..971727d8025 100644
--- a/go.sum
+++ b/go.sum
@@ -88,7 +88,6 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo
github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
github.com/Microsoft/hcsshim v0.12.5 h1:bpTInLlDy/nDRWFVcefDZZ1+U8tS+rz3MxjKgu9boo0=
github.com/Microsoft/hcsshim v0.12.5/go.mod h1:tIUGego4G1EN5Hb6KC90aDYiUI2dqLSTTOCjVNpOgZ8=
-github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ=
github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
@@ -96,8 +95,8 @@ github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAU
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed h1:ue9pVfIcP+QMEjfgo/Ez4ZjNZfonGgR6NgjMaJMu1Cg=
-github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed/go.mod h1:F7bn7fEU90QkQ3tnmaTx3LTKLEDqnwWODIYppRQ5hnY=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df h1:7RFfzj4SSt6nnvCPbCqijJi1nWCd+TqAT3bYCStRC18=
+github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=
github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
github.com/apparentlymart/go-cidr v1.1.0 h1:2mAhrMoF+nhXqxTzSZMUzDHkLjmIHC+Zzn4tdgBZjnU=
@@ -169,8 +168,9 @@ github.com/containers/storage v1.55.1/go.mod h1:28cB81IDk+y7ok60Of6u52RbCeBRucbF
github.com/coreos/go-json v0.0.0-20211020211907-c63f628265de/go.mod h1:lryFBkhadOfv8Jue2Vr/f/Yviw8h1DQPQojbXqEChY0=
github.com/coreos/go-oidc/v3 v3.11.0 h1:Ia3MxdwpSw702YW0xgfmP1GVCMA9aEFWu12XUZ3/OtI=
github.com/coreos/go-oidc/v3 v3.11.0/go.mod h1:gE3LgjOgFoHi9a4ce4/tJczr0Ai2/BoDhf0r5lltWI0=
-github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM=
github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09 h1:OoRAFlvDGCUqDLampLQjk0yeeSGdF9zzst/3G9IkBbc=
github.com/coreos/go-systemd/v22 v22.5.1-0.20231103132048-7d375ecc2b09/go.mod h1:m2r/smMKsKwgMSAoFKHaa68ImdCSNuKE1MxvQ64xuCQ=
@@ -212,20 +212,16 @@ github.com/docker/go-metrics v0.0.1 h1:AgB/0SvBxihN0X8OR4SjsblXkbMvalQ8cjmtKQ2rQ
github.com/docker/go-metrics v0.0.1/go.mod h1:cG1hvH2utMXtqgqqYE9plW6lDxS3/5ayHzueweSI3Vw=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
-github.com/elazarl/goproxy v1.7.2 h1:Y2o6urb7Eule09PjlhQRGNsqRfPmYI3KKQLFpCAV3+o=
-github.com/elazarl/goproxy v1.7.2/go.mod h1:82vkLNir0ALaW14Rc399OTTjyNREgmdL2cVoIbS6XaE=
-github.com/emicklei/go-restful/v3 v3.8.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
-github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
+github.com/emicklei/go-restful/v3 v3.12.0 h1:y2DdzBAURM29NFF94q6RaY4vjIH1rtwDapwQtU84iWk=
+github.com/emicklei/go-restful/v3 v3.12.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
github.com/envoyproxy/protoc-gen-validate v0.9.1/go.mod h1:OKNgG7TCp5pF4d6XftA0++PMirau2/yoOwVac3AbF2w=
github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
-github.com/evanphx/json-patch v4.11.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
-github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
-github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
+github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
+github.com/evanphx/json-patch/v5 v5.8.0 h1:lRj6N9Nci7MvzrXuX6HFzU8XjmhPiXPlsKEy1u0KQro=
+github.com/evanphx/json-patch/v5 v5.8.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ=
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f h1:Wl78ApPPB2Wvf/TIe2xdyJxTlb6obmF18d8QdkxNDu4=
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f/go.mod h1:OSYXu++VVOHnXeitef/D8n/6y4QV8uLHSFXX4NeXMGc=
github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
@@ -237,13 +233,8 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw=
github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 h1:Mn26/9ZMNWSw9C9ERFA1PUxfmGpolnw2v0bKOREu5ew=
-github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I=
github.com/go-chi/chi/v5 v5.0.8 h1:lD+NLqFcAi1ovnVZpsnObHGW4xb4J8lNmoYVfECH1Y0=
github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
@@ -254,18 +245,15 @@ github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-logr/zapr v1.2.3 h1:a9vnzlIBPQBBkeaR9IuMUfmVOrQlkoC4YfPoFkX3T7A=
-github.com/go-logr/zapr v1.2.3/go.mod h1:eIauM6P8qSvTw5o2ez6UEAfGjQKrxQTl5EoK+Qa2oG4=
+github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ=
+github.com/go-logr/zapr v1.3.0/go.mod h1:YKepepNBd1u/oyhd/yQmtjVXmm9uML4IXUgMOwR8/Gg=
github.com/go-openapi/analysis v0.23.0 h1:aGday7OWupfMs+LbmLZG4k0MYXIANxcuBTYUC03zFCU=
github.com/go-openapi/analysis v0.23.0/go.mod h1:9mz9ZWaSlV8TvjQHLl2mUW2PbZtemkE8yA5v22ohupo=
github.com/go-openapi/errors v0.22.0 h1:c4xY/OLxUBSTiepAg3j/MHuAv5mJhnf53LLMWFB+u/w=
github.com/go-openapi/errors v0.22.0/go.mod h1:J3DmZScxCDufmIMsdOuDHxJbdOGC0xtUynjIx092vXE=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.21.0 h1:YgdVicSA9vH5RiHs9TZW5oyafXZFc6+2Vc1rr/O9oNQ=
github.com/go-openapi/jsonpointer v0.21.0/go.mod h1:IUyH9l/+uyhIYQ/PXVA41Rexl+kOkAPDdXEYns6fzUY=
-github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8=
-github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
github.com/go-openapi/jsonreference v0.21.0 h1:Rs+Y7hSXT83Jacb7kFyjn4ijOuVGSvOdF2+tg1TRrwQ=
github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDslNPMo06cago5JNLkm4=
@@ -278,7 +266,6 @@ github.com/go-openapi/spec v0.21.0/go.mod h1:78u6VdPw81XU44qEWGhtr982gJ5BWg2c0I5
github.com/go-openapi/strfmt v0.23.0 h1:nlUS6BCqcnAk0pyhi9Y+kdDVZdZMHfEKQiS4HaMgO/c=
github.com/go-openapi/strfmt v0.23.0/go.mod h1:NrtIpfKtWIygRkKVsxh7XQMDQW5HKQl6S5ik2elW+K4=
github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-openapi/swag v0.21.1/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
@@ -303,7 +290,6 @@ github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v4 v4.5.1 h1:JdqV9zKUdtaa9gdPlywC3aeoEsR681PlKC+4F5gQgeo=
github.com/golang-jwt/jwt/v4 v4.5.1/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
github.com/golang-jwt/jwt/v5 v5.2.1 h1:OuVbFODueb089Lh128TAcimifWaLhJwVflnrgM17wHk=
@@ -313,22 +299,18 @@ github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0L
github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ=
github.com/golang/glog v1.2.1 h1:OptwRhECazUx5ix5TTWC3EZhsZEHWcYWY4FQHTIubm4=
github.com/golang/glog v1.2.1/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l8iNU+DwB5epxmsaqB+rhGL0m5jtYqE=
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
-github.com/google/cel-go v0.12.6 h1:kjeKudqV0OygrAqA9fX6J55S8gj+Jre2tckIm5RoG4M=
-github.com/google/cel-go v0.12.6/go.mod h1:Jk7ljRzLBhkmiAwBoUxB1sZSCVBAzkqPF25olK/iRDw=
-github.com/google/gnostic v0.5.5 h1:xaJtlbPCF2oT4Aidl/Al5W6lRq7g5+biHTihznoaa7k=
-github.com/google/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA=
-github.com/google/gnostic v0.5.7-v3refs h1:FhTMOKj2VhjpouxvWJAV1TL304uMlb9zcDqkl6cEI54=
-github.com/google/gnostic v0.5.7-v3refs/go.mod h1:73MKFl6jIHelAJNaBGFzt3SPtZULs9dYrGFt8OiIsHQ=
+github.com/google/cel-go v0.17.7 h1:6ebJFzu1xO2n7TLtN+UBqShGBhlD85bhvglh5DpcfqQ=
+github.com/google/cel-go v0.17.7/go.mod h1:HXZKzB0LXqer5lHHgfWAnlYwJaQBDKMjxjulNQzhwhY=
+github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
+github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/google/go-containerregistry v0.20.0 h1:wRqHpOeVh3DnenOrPy9xDOLdnLatiGuuNRVelR2gSbg=
@@ -344,12 +326,10 @@ github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8/go.mod h1:K1liHPHnj73
github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/gorilla/csrf v1.7.2 h1:oTUjx0vyf2T+wkrx09Trsev1TE+/EbDAeHtSTbtC2eI=
github.com/gorilla/csrf v1.7.2/go.mod h1:F1Fj3KG23WYHE6gozCmBAezKookxbIvUJT+121wTuLk=
-github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
github.com/gorilla/schema v1.4.1 h1:jUg5hUjCSDZpNGLuXQOgIWGdlgrIdYvgQ0wZtdK1M3E=
@@ -358,9 +338,12 @@ github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kX
github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
github.com/gorilla/sessions v1.2.2 h1:lqzMYz6bOfvn2WriPUjNByzeXIlVzURcPmgMczkmTjY=
github.com/gorilla/sessions v1.2.2/go.mod h1:ePLdVu+jbEgHH+KWw8I1z2wqd0BAdAQh/8LRvBeoNcQ=
-github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 h1:JYghRBlGCZyCF2wNUJ8W0cwaQdtpcssJ4CgC406g+WU=
+github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc=
github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 h1:/c3QmbOGMGTOumP2iT/rCwB7b0QDGLKzqOmktBjT+Is=
@@ -372,8 +355,6 @@ github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+l
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
-github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
-github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
github.com/imdario/mergo v0.3.15 h1:M8XP7IuFNsqUx6VPK2P9OSmsYsI/YFaGil0uD21V3dM=
github.com/imdario/mergo v0.3.15/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@@ -407,7 +388,6 @@ github.com/klauspost/pgzip v1.2.6/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQ
github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
@@ -422,10 +402,6 @@ github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhn
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
github.com/lyft/protoc-gen-star v0.6.1/go.mod h1:TGAoBVkt8w7MPG72TrKIu85MIdXwDuzJYeZuUPFPNwA=
github.com/lyft/protoc-gen-star/v2 v2.0.1/go.mod h1:RcCdONR2ScXaYnQC5tUzxzlpA3WVYF7/opLeUgcQs/o=
-github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
-github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7ldAVICs=
-github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/manifoldco/promptui v0.9.0 h1:3V4HzJk1TtXW1MTZMP7mdlwbBpIinw3HztaIlYthEiA=
@@ -458,7 +434,6 @@ github.com/mistifyio/go-zfs/v3 v3.0.1 h1:YaoXgBePoMA12+S1u/ddkv+QqxcfiZK4prI6HPn
github.com/mistifyio/go-zfs/v3 v3.0.1/go.mod h1:CzVgeB0RvF2EGzQnytKVvVSDwmKJXxkOTUGbNrTja/k=
github.com/mitchellh/go-wordwrap v1.0.1 h1:TLuKupo69TCn6TQSyGxwI1EblZZEsQ0vMlAFQflz0v0=
github.com/mitchellh/go-wordwrap v1.0.1/go.mod h1:R62XHJLzvMFRBbcrT7m7WgmE1eOyTSsCt+hzestvNj0=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
@@ -485,6 +460,7 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f h1:KUppIJq7/+SVif2QVs3tOP0zanoHgBEVAwHxUSIzRqU=
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -494,23 +470,15 @@ github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JX
github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4=
github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
-github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
-github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/ginkgo/v2 v2.0.0/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
-github.com/onsi/ginkgo/v2 v2.1.4/go.mod h1:um6tUpWM/cxCK3/FK8BXqEiUMUwRgSM4JXG47RKZmLU=
-github.com/onsi/ginkgo/v2 v2.1.6/go.mod h1:MEH45j8TBi6u9BMogfbp0stKC5cdGjumZj5Y7AG4VIk=
github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw=
github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
-github.com/onsi/gomega v1.20.1/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo=
github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
github.com/open-policy-agent/frameworks/constraint v0.0.0-20221109005544-7de84dff5081 h1:LcxhUNtgAf1dvHIDfOI/sO0LQALSxQCBHxTZ/5CrBxo=
@@ -527,18 +495,18 @@ github.com/opencontainers/runtime-tools v0.9.1-0.20230914150019-408c51e934dc h1:
github.com/opencontainers/runtime-tools v0.9.1-0.20230914150019-408c51e934dc/go.mod h1:8tx1helyqhUC65McMm3x7HmOex8lO2/v9zPuxmKHurs=
github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU=
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
-github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46 h1:mnrBzHjjqYKw2uinOVXL9Eplj3+QaQwJ3SaWAs8l6cc=
-github.com/openshift/api v0.0.0-20240103200955-7ca3a4634e46/go.mod h1:aQ6LDasvHMvHZXqLHnX2GRmnfTWCF/iIwz8EMTTIE9A=
-github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c h1:CV76yFOTXmq9VciBR3Bve5ZWzSxdft7gaMVB3kS0rwg=
-github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c/go.mod h1:lFMO8mLHXWFzSdYvGNo8ivF9SfF6zInA8ZGw4phRnUE=
-github.com/openshift/cloud-credential-operator v0.0.0-20240910012137-a0245d57d1e6 h1:O6pXh1gieoLIpT7SJXS07evcY6a65ZizIedH3ltrdQE=
-github.com/openshift/cloud-credential-operator v0.0.0-20240910012137-a0245d57d1e6/go.mod h1:rkcI1Oo6VPN1A6WOcWOXIuVp8dMMahFnfgzYUt0X1aA=
+github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094 h1:J1wuGhVxpsHykZBa6Beb1gQ96Ptej9AE/BvwCBiRj1E=
+github.com/openshift/api v0.0.0-20240830023148-b7d0481c9094/go.mod h1:CxgbWAlvu2iQB0UmKTtRu1YfepRg1/vJ64n2DlIEVz4=
+github.com/openshift/client-go v0.0.0-20240510131258-f646d5f29250 h1:WQ0e89xebsNeChdYw8QrxggYkFtEQOaLBEKJDkMmcUk=
+github.com/openshift/client-go v0.0.0-20240510131258-f646d5f29250/go.mod h1:tjGjTE59N1+5W0YE4Wqf0zJpFLIY4d+EpMihDKOn1oA=
+github.com/openshift/cloud-credential-operator v0.0.0-20250107183716-87a85dc8e12e h1:MQvqTFHJ8/S19CDjc7espw8YKnBzRhjflJcQBIEo3jI=
+github.com/openshift/cloud-credential-operator v0.0.0-20250107183716-87a85dc8e12e/go.mod h1:b2+g5xlPxBO58w6SbwhBM6uWNeJUDzjWx/9I4nzzxrQ=
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87 h1:cHyxR+Y8rAMT6m1jQCaYGRwikqahI0OjjUDhFNf3ySQ=
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87/go.mod h1:DB/Mf2oTeiAmVVX1gN+NEqweonAPY0TKUwADizj8+ZA=
github.com/openshift/hive/apis v0.0.0-20231116161336-9dd47f8bfa1f h1:CedFPNwCSYbjo7rCr9YrJs/0OrBf3m8sLlUZw66VDwY=
github.com/openshift/hive/apis v0.0.0-20231116161336-9dd47f8bfa1f/go.mod h1:RRH8lt09SAiPECNdsbh7Gun0lkcRWi1nYKq6tDp5WxQ=
-github.com/openshift/library-go v0.0.0-20230222114049-eac44a078a6e h1:Q5Lcxl/4MdNqj0b2cEi0mzk/Ls9JXvGkCTw7qnVSjCo=
-github.com/openshift/library-go v0.0.0-20230222114049-eac44a078a6e/go.mod h1:AMZwYwSdbvALDl3QobEzcJ2IeDO7DYLsr42izKzh524=
+github.com/openshift/library-go v0.0.0-20240711192904-190fec8c3f09 h1:2Ed1mxJTRFpbHIynxkuIyADeWdtyQ6NEZkTaf0wG39M=
+github.com/openshift/library-go v0.0.0-20240711192904-190fec8c3f09/go.mod h1:lFwyRj0XjUf25Da3Q00y+KuaxCWTJ6YzYPDX1+96nco=
github.com/openshift/machine-config-operator v0.0.1-0.20230908201248-46b93e64dea6 h1:9aif5Z7d6VJOsvqpDrn5HHaK9aR463OJadLxE4YL/dg=
github.com/openshift/machine-config-operator v0.0.1-0.20230908201248-46b93e64dea6/go.mod h1:zXXyi68fZLTGiIamAIwETIJdts9FCdyi9OCpnxh0N84=
github.com/ostreedev/ostree-go v0.0.0-20210805093236-719684c64e4f h1:/UDgs8FGMqwnHagNDPGOlts35QkhAZ8by3DR7nMih7M=
@@ -556,16 +524,15 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/sftp v1.13.6 h1:JFZT4XbOU7l77xGSpOdW+pwIMqP044IyjXX6FGyEKFo=
github.com/pkg/sftp v1.13.6/go.mod h1:tz1ryNURKu77RL+GuCzmoJYxQczL3wLNNpPWagdg4Qk=
-github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/proglottis/gpgme v0.1.3 h1:Crxx0oz4LKB3QXc5Ea0J19K/3ICfy3ftr5exgUK1AU0=
github.com/proglottis/gpgme v0.1.3/go.mod h1:fPbW/EZ0LvwQtH8Hy7eixhp1eF3G39dtx7GUN+0Gmy0=
-github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.50.0 h1:eIYVhtUPLDah0nhcHaWItFM595UAGVFKECaWoW02FUA=
-github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.50.0/go.mod h1:3WYi4xqXxGGXWDdQIITnLNmuDzO5n6wYva9spVhR4fg=
-github.com/prometheus-operator/prometheus-operator/pkg/client v0.48.1 h1:i3bwALeHBJaLRw+z/8IPujQpAAVwqXpyLrftdhysFrk=
-github.com/prometheus-operator/prometheus-operator/pkg/client v0.48.1/go.mod h1:k4BrWlVQQsvBiTcDnKEMgyh/euRxyxgrHdur/ZX/sdA=
+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0 h1:AHzMWDxNiAVscJL6+4wkvFRTpMnJqiaZFEKA/osaBXE=
+github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0/go.mod h1:wAR5JopumPtAZnu0Cjv2PSqV4p4QB09LMhc6fZZTXuA=
+github.com/prometheus-operator/prometheus-operator/pkg/client v0.74.0 h1:SyBTzvFuVshDNjDVALs6+NgOy3qh8/xlAsyqB1SzHbI=
+github.com/prometheus-operator/prometheus-operator/pkg/client v0.74.0/go.mod h1:FlcnLo14zQxL6P1yPrV22kYBqyAT0ZRRytv98+B7lBQ=
github.com/prometheus/client_golang v1.19.0 h1:ygXvpU1AoN1MhdzckN+PyD9QJOSD4x7kmXYlnfbA6JU=
github.com/prometheus/client_golang v1.19.0/go.mod h1:ZRM9uEAypZakd+q/x7+gmsvXdURP+DABIEIjnmDdp+k=
github.com/prometheus/client_model v0.6.0 h1:k1v3CzpSRUTrKMppY35TLwPvxHqBu0bYgxZzqGIgaos=
@@ -584,8 +551,7 @@ github.com/robfig/cron v1.2.0/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfm
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
-github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sagikazarmark/locafero v0.6.0 h1:ON7AQg37yzcRPU69mt7gwhFEBwxI6P9T4Qu3N51bwOk=
github.com/sagikazarmark/locafero v0.6.0/go.mod h1:77OmuIc6VTraTXKXIs/uvUxKGUXjE1GbemJYHqdNjX0=
@@ -599,7 +565,6 @@ github.com/secure-systems-lab/go-securesystemslib v0.8.0 h1:mr5An6X45Kb2nddcFlbm
github.com/secure-systems-lab/go-securesystemslib v0.8.0/go.mod h1:UH2VZVuJfCYR8WgMlCU1uFsOUU+KeyrTWcSS73NBOzU=
github.com/serge1peshcoff/selenium-go-conditions v0.0.0-20170824121757-5afbdb74596b h1:jLwzNAxsHzKw5sHju7bUk0iQSynZxWAOtnXD5d37Vto=
github.com/serge1peshcoff/selenium-go-conditions v0.0.0-20170824121757-5afbdb74596b/go.mod h1:noHZFMVoy0oY+ICCojiGUgv+/ecK+1M6huoUVWAIJoU=
-github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM=
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
github.com/sigstore/fulcio v1.4.5 h1:WWNnrOknD0DbruuZWCbN+86WRROpEl3Xts+WT2Ek1yc=
@@ -620,6 +585,7 @@ github.com/spf13/cast v1.6.0 h1:GEiTHELF+vaR5dhz3VqZfFSzZjYbgeKDpBxQVS4GYJ0=
github.com/spf13/cast v1.6.0/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA=
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/spf13/viper v1.20.0-alpha.6 h1:f65Cr/+2qk4GfHC0xqT/isoupQppwN5+VLRztUGTDbY=
@@ -628,10 +594,20 @@ github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6 h1:pnnLy
github.com/stefanberger/go-pkcs11uri v0.0.0-20230803200340-78284954bff6/go.mod h1:39R/xuhNgVhi+K0/zst4TLrJrVmbm6LVgl4A0+ZFS5M=
github.com/stoewer/go-strcase v1.2.0 h1:Z2iHWqGXH00XYgqDmNgQbIBxf3wrNq0F3feEy0ainaU=
github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
github.com/stretchr/testify v0.0.0-20161117074351-18a02ba4a312/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
@@ -675,18 +651,26 @@ github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHo
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
github.com/xeipuuv/gojsonschema v1.2.0 h1:LhYJRs+L4fBtjZUfuSZIKGeVu0QRy8e5Xi7D17UxZ74=
github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y=
-github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca/go.mod h1:ce1O1j6UtZfjr22oyGxGLbauSBp2YVXpARAosm7dHBg=
-github.com/xlab/treeprint v1.1.0 h1:G/1DjNkPpfZCFt9CSh6b5/nY4VimlbHF3Rh4obvtzDk=
-github.com/xlab/treeprint v1.1.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
+github.com/xlab/treeprint v1.2.0 h1:HzHnuAF1plUN2zGlAFHbSQP2qJ0ZAD3XF5XD7OesXRQ=
+github.com/xlab/treeprint v1.2.0/go.mod h1:gj5Gd3gPdKtR1ikdDK6fnFLdmIS0X30kTTuNd/WEJu0=
github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zIM+UJPGz4=
github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA=
+go.etcd.io/etcd/api/v3 v3.5.10 h1:szRajuUUbLyppkhs9K6BRtjY37l66XQQmw7oZRANE4k=
+go.etcd.io/etcd/api/v3 v3.5.10/go.mod h1:TidfmT4Uycad3NM/o25fG3J07odo4GBB9hoxaodFCtI=
+go.etcd.io/etcd/client/pkg/v3 v3.5.10 h1:kfYIdQftBnbAq8pUWFXfpuuxFSKzlmM5cSn76JByiT0=
+go.etcd.io/etcd/client/pkg/v3 v3.5.10/go.mod h1:DYivfIviIuQ8+/lCq4vcxuseg2P2XbHygkKwFo9fc8U=
+go.etcd.io/etcd/client/v3 v3.5.10 h1:W9TXNZ+oB3MCd/8UjxHTWK5J9Nquw9fQBLJd5ne5/Ao=
+go.etcd.io/etcd/client/v3 v3.5.10/go.mod h1:RVeBnDz2PUEZqTpgqwAtUd8nAPf5kjyFyND7P1VkOKc=
go.mongodb.org/mongo-driver v1.9.4 h1:qXWlnK2WCOWSxJ/Hm3XyYOGKv3ujA2btBsCyuIFvQjc=
go.mongodb.org/mongo-driver v1.9.4/go.mod h1:0sQWfOeY63QTntERDJJ/0SuKK0T1uVSgKCuAROlKEPY=
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 h1:CCriYyAfq1Br1aIYettdHZTy8mBTIPo7We18TuO/bak=
go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352/go.mod h1:SNgMg+EgDFwmvSmLRTNKC5fegJjB7v23qTQ0XLGUNHk=
go.opencensus.io v0.24.0 h1:y73uSU6J157QMP2kn2r30vwW1A2W2WFwSCGnAVxeaD0=
go.opencensus.io v0.24.0/go.mod h1:vNK8G9p7aAivkbmorf4v+7Hgx+Zs0yY+0fOtgBfjQKo=
+go.opentelemetry.io/contrib v0.20.0 h1:ubFQUn0VCZ0gPwIoJfBJVpeBlyRMxu8Mm/huKWYd9p0=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 h1:4Pp6oUg3+e/6M4C0A/3kJ2VYa++dsWVTtGgLVj5xtHg=
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0/go.mod h1:Mjt1i1INqiaoZOMGR1RIUJN+i3ChKoFRqzrRQhlkbs0=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 h1:jq9TW8u3so/bN+JPT166wjOI6/vQPF6Xe7nMNIltagk=
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0/go.mod h1:p8pYQP+m5XfbZm9fxtSKAbM6oIllS7s2AfxrChvc7iw=
go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
@@ -694,6 +678,8 @@ go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi
go.opentelemetry.io/otel/exporters/otlp v0.20.0 h1:PTNgq9MRmQqqJY0REVbZFvwkYOA85vbdQU/nVfxDyqg=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0 h1:9M3+rhx7kZCIQQhQRYaZCdNu1V73tm4TvXs2ntl98C4=
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.22.0/go.mod h1:noq80iT8rrHP1SfybmPiRGc9dc5M8RPmGvtwo7Oo7tc=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 h1:tIqheXEFWAZ7O8A7m+J0aPTmpJN3YQ7qetUAdkkkKpk=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0/go.mod h1:nUeKExfxAQVbiVFn32YXpXZZHZ61Cc3s3Rn1pDBGAb0=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 h1:digkEZCJWobwBqMwC0cwCq8/wkkRy/OowZg5OArWZrM=
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0/go.mod h1:/OpE/y70qVkndM0TrxT4KBoN3RsFZP0QaofcfYrj76I=
go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
@@ -704,8 +690,8 @@ go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y
go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
go.opentelemetry.io/proto/otlp v1.0.0 h1:T0TX0tmXU8a3CbNXzEKGeU5mIVOdf0oykP+u2lIVU/I=
go.opentelemetry.io/proto/otlp v1.0.0/go.mod h1:Sy6pihPLfYHkr3NkUbEhGHFhINUSI/v80hjKIs5JXpM=
-go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd h1:Uo/x0Ir5vQJ+683GXB9Ug+4fcjsbp7z7Ul8UaZbhsRM=
-go.starlark.net v0.0.0-20220328144851-d1966c6b9fcd/go.mod h1:t3mmBBPzAVvK0L0n1drDmrQsJ8FoIx4INCqVMTr/Zo0=
+go.starlark.net v0.0.0-20230525235612-a134d8f9ddca h1:VdD38733bfYv5tUZwEIskMM93VanwNIi5bIKnDrJdEY=
+go.starlark.net v0.0.0-20230525235612-a134d8f9ddca/go.mod h1:jxU+3+j+71eXOW14274+SmmuW82qJzl6iZSeqEtTGds=
go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
@@ -714,7 +700,6 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
@@ -722,7 +707,6 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbR
golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA=
@@ -731,7 +715,7 @@ golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
golang.org/x/term v0.29.0/go.mod h1:6bl4lRlvVuDgSf3179VpIxBF0o10JUpXWOnI7nErv7s=
golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
@@ -740,15 +724,10 @@ golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
golang.org/x/tools v0.24.0 h1:J1shsA93PJUEVaUSaay7UXAyE8aimq3GW0pjlolpa24=
golang.org/x/tools v0.24.0/go.mod h1:YhNqVBIfWHdzvTLs0d8LCuMhkKUgSUKldakyV7W/WDQ=
-gomodules.xyz/jsonpatch/v2 v2.3.0 h1:8NFhfS6gzxNqjLIYnZxg319wZ5Qjnx4m/CcX+Klzazc=
-gomodules.xyz/jsonpatch/v2 v2.3.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
+gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
google.golang.org/appengine v1.6.8 h1:IhEN5q69dyKagZPYMSdIjS2HqprW324FRQZJcGqPAsM=
google.golang.org/appengine v1.6.8/go.mod h1:1jJ3jBArFh5pcgW8gCtRJnepW8FzD1V44FJffLiz/Ds=
-google.golang.org/genproto v0.0.0-20220822174746-9e6da59bd2fc/go.mod h1:dbqgFATTzChvnt+ujMdZwITVAJHFtfyN1qUhDqEiIlk=
-google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg=
-google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU=
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 h1:MuYw1wJzT+ZkybKfaOXKp5hJiZDn2iHaXRw0mRYdHSc=
google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4/go.mod h1:px9SlOOZBg1wM1zdnr8jEL4CNGUBZ+ZKYtNPApNQc4c=
google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d h1:k3zyW3BYYR30e8v3x0bTDdE9vpYFjZHK+HcyqkrppWk=
@@ -757,6 +736,9 @@ google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
@@ -772,49 +754,46 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
-k8s.io/api v0.25.16 h1:6VsSxn0vCdHuAVh82EZCKoM457LuUpQQb6YXfQunz7Q=
-k8s.io/api v0.25.16/go.mod h1:7pehrlB/DJ0qzxicMELX7IZlgL6J5lnSOBPey/cuGBs=
-k8s.io/apiextensions-apiserver v0.25.16 h1:M03IXtKn2dptWxGtqrh3ZK2xeIFTCKsZBSaUpRCFQV8=
-k8s.io/apiextensions-apiserver v0.25.16/go.mod h1:RJVnHbx5/rIU+xAfdgauaAI8hSC2Pmx3/olTc9Eq2Vs=
-k8s.io/apimachinery v0.25.16 h1:Mk5h4zbHVZh4ZkgRnciYdLRqOREt2dAGTJesDY0WO7U=
-k8s.io/apimachinery v0.25.16/go.mod h1:34oJjP2pnWhz64k0GETsMvDeAp2A2v+gKa/u3tV/+6k=
-k8s.io/apiserver v0.25.16 h1:RClMqIiPc0QsGy63cRbif3FwD0b+Bw1o4sRLMmWTufk=
-k8s.io/apiserver v0.25.16/go.mod h1:Hdo/mBliyyE7jN0LjToUNrRXq20Wc3nOVSXwC1Fxa5M=
-k8s.io/cli-runtime v0.25.16 h1:u6Uzd1ZHAa9N8y0nXvevTn7+h+KSBJ1M0NAxD+wPVy8=
-k8s.io/cli-runtime v0.25.16/go.mod h1:aGnXwnp70LXzW7lyK4pOdWMTeunz1JL42JxcoW4B40c=
-k8s.io/client-go v0.25.16 h1:Lf8gd4vP9hR2sDuSU+9id9Mj23u8X58nESZ5m1JcI24=
-k8s.io/client-go v0.25.16/go.mod h1:6y5hyLavOErqO5LWUzk5rwKpRqmwZsE3oe3RW0cgs9s=
-k8s.io/code-generator v0.25.16/go.mod h1:rv2rN7kkHpAMnEULzXSC380Tsj1rN7nkpzVqT59ptjk=
-k8s.io/component-base v0.25.16 h1:ywaMQRJoCCQwWSM6z9jC+RJWBY/CcJDVgnyyIhuNAkQ=
-k8s.io/component-base v0.25.16/go.mod h1:ZMFrcDjbpM12U5hvZ8bXgPf9U2Wrp0McSGMhoUkA9Mo=
-k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
+k8s.io/api v0.29.14 h1:JWFh5ufowH3Y6tCgEzY3URVJHb27f0tEDEej0nCjWDw=
+k8s.io/api v0.29.14/go.mod h1:IV8YqKxMm8JGLBLlHM13Npn5lCITH10XYipWEW+YEOQ=
+k8s.io/apiextensions-apiserver v0.29.14 h1:gw9WXrZJPu5kpI1UC+Wf8BVe9PWwRUB/UZXU8VzBsq4=
+k8s.io/apiextensions-apiserver v0.29.14/go.mod h1:TJ51W+HKW2XqTtAsEFOz1/OohsMtekbKaTXh8ldioL4=
+k8s.io/apimachinery v0.29.14 h1:IDhwnGNCp836SLOwW1SoEfFNV77wxIklhxeAHX9vmSo=
+k8s.io/apimachinery v0.29.14/go.mod h1:i3FJVwhvSp/6n8Fl4K97PJEP8C+MM+aoDq4+ZJBf70Y=
+k8s.io/apiserver v0.29.14 h1:XTo9lDDsG4NkywEuzG0SDLrBv6+AyVIpqVzZjg+pWRs=
+k8s.io/apiserver v0.29.14/go.mod h1:jC0HqUfqFKMp111xs97CXkf8XTQXtnbukRuuwDH74yE=
+k8s.io/cli-runtime v0.29.14 h1:CJis59afFwxzV4RBKR6rpS94C5onIypVsRqq4hyydPk=
+k8s.io/cli-runtime v0.29.14/go.mod h1:PBDI2lTaFj/qdNx5C6HGlCH+KMmtl1JVJcmCLMveTc4=
+k8s.io/client-go v0.29.14 h1:OSnzZ9DClaFRgl3zMAY2kGZhNjdGJkEb+RDz+MW2h6k=
+k8s.io/client-go v0.29.14/go.mod h1:XtZt5n5UxKfPJ+sCoTPcEavWgZbLFFxMnAFFRQGK1RY=
+k8s.io/component-base v0.29.14 h1:SF1DWN7bc2VloJ/ysegGoi/aHnopEo81aw9CslhqXIw=
+k8s.io/component-base v0.29.14/go.mod h1:FoK1PHhFTaEQVvQLw29/Uyfd8Ug0qUKHrUcXIXJ1VxI=
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
-k8s.io/kube-aggregator v0.25.16 h1:yvWWF2bHyuNQ/dMwgWcbh3MkYl1hwl2A7dMwvMMwMIg=
-k8s.io/kube-aggregator v0.25.16/go.mod h1:fmC08uLMNFUQj1pvtCYL0cTjhq+KDC9o31p51aH9dLE=
-k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1/go.mod h1:C/N6wCaBHeBHkHUesQOQy2/MZqGgMAFPqGsGQLdbZBU=
-k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f h1:2kWPakN3i/k81b0gvD5C5FJ2kxm1WrQFanWchyKuqGg=
-k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f/go.mod h1:byini6yhqGC14c3ebc/QwanvYwhuMWF6yz2F8uwW8eg=
-k8s.io/kubectl v0.25.16 h1:6TK2I58rj3Og6CZlkc6j2ARICag25ko9ALsr5w/Oe6A=
-k8s.io/kubectl v0.25.16/go.mod h1:mmyKlLfVqm6s6zcKNwK8f36Vf5MAmrmudRko9/wibNA=
-k8s.io/kubernetes v1.25.16 h1:pdtEdre7aInDvXas+mWzpTiK/7cpcaGRyYB+Bedr2+Q=
-k8s.io/kubernetes v1.25.16/go.mod h1:ZrRRMmY0nDNxlnPnJopZRhF2i0tzfB3+DnitJcDe8Vw=
+k8s.io/kube-aggregator v0.29.14 h1:RxT+HsddIHtbVmjqyLViMNPGQOM4RY3j87UwI8vMxKw=
+k8s.io/kube-aggregator v0.29.14/go.mod h1:Bq2rKUjiTWcQQRkCljvp24ZF+YFefs0CLIeJEbUj7fU=
+k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 h1:qVoMaQV5t62UUvHe16Q3eb2c5HPzLHYzsi0Tu/xLndo=
+k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
+k8s.io/kubectl v0.29.14 h1:aNsAv4S8s6ldP8pPejkgPdNBBTeL/9vnl6j72F3b1z4=
+k8s.io/kubectl v0.29.14/go.mod h1:/fKgBbMs87f5iWI2s2K4IFofr9tpYZ8kE9Q2m6zA4OY=
+k8s.io/kubernetes v1.29.14 h1:mbk5M/WaJr/AX7p3p2/7eJjrtI+I3AKu7IEjI8+Ny/U=
+k8s.io/kubernetes v1.29.14/go.mod h1:L6/pfKQZ6Tv2O8gyT4OxhGZp+nNsjV54xtNodRoup9k=
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6 h1:MDF6h2H/h4tbzmtIKTuctcwZmY0tY9mD9fNT47QO6HI=
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/controller-runtime v0.11.2 h1:H5GTxQl0Mc9UjRJhORusqfJCIjBO8UtUxGggCwL1rLA=
-sigs.k8s.io/controller-runtime v0.11.2/go.mod h1:P6QCzrEjLaZGqHsfd+os7JQ+WFZhvB8MRFsn4dWF7O4=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 h1:TgtAeesdhpm2SGwkQasmbeqDo8th5wOBA5h/AjTKA4I=
+sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0/go.mod h1:VHVDI/KrK4fjnV61bE2g3sA7tiETLn8sooImelsCx3Y=
+sigs.k8s.io/controller-runtime v0.17.2 h1:FwHwD1CTUemg0pW2otk7/U5/i5m2ymzvOXdbeGOUvw0=
+sigs.k8s.io/controller-runtime v0.17.2/go.mod h1:+MngTvIQQQhfXtwfdGw/UOQ/aIaqsYywfCINOtwMO/s=
sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30 h1:ObU1vgTtAle8WwCKgcDkPjLJYwlazQpIjzSA0asMhy4=
sigs.k8s.io/json v0.0.0-20241009153224-e386a8af8d30/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
-sigs.k8s.io/kube-storage-version-migrator v0.0.4 h1:qsCecgZHgdismlTt8xCmS/3numvpxrj58RWJeIg76wc=
-sigs.k8s.io/kube-storage-version-migrator v0.0.4/go.mod h1:mXfSLkx9xbJHQsgNDDUZK/iQTs2tMbx/hsJlWe6Fthw=
-sigs.k8s.io/kustomize/api v0.11.2 h1:6YvCJHFDwsLwAX7zNHBxMZi3k7dGIXI8G9l0saYQI0E=
-sigs.k8s.io/kustomize/api v0.11.2/go.mod h1:GZuhith5YcqxIDe0GnRJNx5xxPTjlwaLTt/e+ChUtJA=
-sigs.k8s.io/kustomize/kyaml v0.13.3 h1:tNNQIC+8cc+aXFTVg+RtQAOsjwUdYBZRAgYOVI3RBc4=
-sigs.k8s.io/kustomize/kyaml v0.13.3/go.mod h1:/ya3Gk4diiQzlE4mBh7wykyLRFZNvqlbh+JnwQ9Vhrc=
-sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E=
+sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96 h1:PFWFSkpArPNJxFX4ZKWAk9NSeRoZaXschn+ULa4xVek=
+sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96/go.mod h1:EOBQyBowOUsd7U4CJnMHNE0ri+zCXyouGdLwC/jZU+I=
+sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0=
+sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3/go.mod h1:9n16EZKMhXBNSiUC5kSdFQJkdH3zbxS/JoO619G1VAY=
+sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 h1:W6cLQc5pnqM7vh3b7HvGNfXrJ/xL6BDMS0v1V/HHg5U=
+sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3/go.mod h1:JWP1Fj0VWGHyw3YUPjXSQnRnrwezrZSrApfX5S0nIag=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
tags.cncf.io/container-device-interface v0.8.0 h1:8bCFo/g9WODjWx3m6EYl3GfUG31eKJbaggyBDxEldRc=
diff --git a/hack/update-go-module-dependencies.sh b/hack/update-go-module-dependencies.sh
deleted file mode 100755
index 819ef5fa695..00000000000
--- a/hack/update-go-module-dependencies.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash -ex
-
-# Background: https://groups.google.com/forum/#!topic/golang-nuts/51-D_YFC78k
-#
-# TLDR: OCP consists of many repos where for each release a new release branch gets created (release-X.Y).
-# When we update vendors we want to get latest changes from the release branch for all of the dependencies.
-# With Go modules we can't easily do it, but there is a workaround which consists of multiple steps:
-# 1. Get the latest commit from the branch using `go list -mod=mod -m MODULE@release-x.y`.
-# 2. Using `sed`, transform output of the above command into format accepted by `go mod edit -replace`.
-# 3. Modify `go.mod` by calling `go mod edit -replace`.
-#
-# This needs to happen for each module that uses this branching strategy: all these repos
-# live under github.com/openshift organisation.
-#
-# There are however, some exceptions:
-# * Some repos under github.com/openshift do not use this strategy.
-# We should skip them in this script and manage directly with `go mod`.
-# * Some dependencies pin their own dependencies to older commits.
-# For example, dependency Foo from release-4.7 branch requires
-# dependency Bar at older commit which is
-# not compatible with Bar@release-4.7.
-
-for x in vendor/github.com/openshift/*; do
- case $x in
- # Review the list of special cases on each release.
-
- # Do not update Hive: it is not part of OCP
- vendor/github.com/openshift/hive)
- ;;
-
- # This repo doesn't follow release-x.y branching strategy
- # We skip it and let go mod resolve it
- vendor/github.com/openshift/custom-resource-status)
- ;;
-
- *)
- go mod edit -replace ${x##vendor/}=$(go list -mod=mod -m ${x##vendor/}@release-4.10 | sed -e 's/ /@/')
- ;;
- esac
-done
-
-go get -u ./...
-
diff --git a/pkg/cluster/delete.go b/pkg/cluster/delete.go
index 538ac79db65..700d019044d 100644
--- a/pkg/cluster/delete.go
+++ b/pkg/cluster/delete.go
@@ -332,13 +332,13 @@ func (m *manager) deleteGatewayAndWait(ctx context.Context) error {
}
m.log.Info("waiting for gateway record deletion")
- return wait.PollImmediateUntil(15*time.Second, func() (bool, error) {
+ return wait.PollUntilContextCancel(timeoutCtx, 15*time.Second, true, func(ctx context.Context) (bool, error) {
_, err := m.dbGateway.Get(ctx, m.doc.OpenShiftCluster.Properties.NetworkProfile.GatewayPrivateLinkID)
- if err != nil && cosmosdb.IsErrorStatusCode(err, http.StatusNotFound) /* already gone */ {
- return true, nil
+ if err != nil && cosmosdb.IsErrorStatusCode(err, http.StatusNotFound) {
+ return true, err
}
return false, nil
- }, timeoutCtx.Done())
+ })
}
func (m *manager) deleteGateway(ctx context.Context) error {
diff --git a/pkg/cluster/deploybaseresources.go b/pkg/cluster/deploybaseresources.go
index b9a3427421e..11c2ecdf280 100644
--- a/pkg/cluster/deploybaseresources.go
+++ b/pkg/cluster/deploybaseresources.go
@@ -355,7 +355,7 @@ func (m *manager) _attachNSGs(ctx context.Context, timeout time.Duration, pollIn
// NSG since the inner loop is tolerant of that, and since we are attaching
// the same NSG the only allowed failure case is when the NSG cannot be
// attached to begin with, so it shouldn't happen in practice.
- _ = wait.PollImmediateUntil(pollInterval, func() (bool, error) {
+ _ = wait.PollUntilContextCancel(timeoutCtx, pollInterval, true, func(ctx context.Context) (bool, error) {
var c bool
c, innerErr = func() (bool, error) {
for _, subnetID := range []string{
@@ -412,9 +412,8 @@ func (m *manager) _attachNSGs(ctx context.Context, timeout time.Duration, pollIn
}
return true, nil
}()
-
return c, innerErr
- }, timeoutCtx.Done())
+ })
return innerErr
}
diff --git a/pkg/cluster/install.go b/pkg/cluster/install.go
index d5f2d29de24..c47fe385b9d 100644
--- a/pkg/cluster/install.go
+++ b/pkg/cluster/install.go
@@ -15,6 +15,7 @@ import (
kruntime "k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
+ "k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -632,7 +633,12 @@ func (m *manager) initializeKubernetesClients(ctx context.Context) error {
return err
}
- mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+ httpClient, err := rest.HTTPClientFor(restConfig)
+ if err != nil {
+ return err
+ }
+
+ mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
if err != nil {
return err
}
diff --git a/pkg/deploy/predeploy.go b/pkg/deploy/predeploy.go
index f3881e9f181..39c3d19aa0e 100644
--- a/pkg/deploy/predeploy.go
+++ b/pkg/deploy/predeploy.go
@@ -570,9 +570,9 @@ func (d *deployer) restartOldScaleset(ctx context.Context, vmssName string, lbHe
}
func (d *deployer) waitForReadiness(ctx context.Context, vmssName string, vmInstanceID string) error {
- return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+ return wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
return d.isVMInstanceHealthy(ctx, d.config.RPResourceGroupName, vmssName, vmInstanceID), nil
- }, ctx.Done())
+ })
}
func (d *deployer) isVMInstanceHealthy(ctx context.Context, resourceGroupName string, vmssName string, vmInstanceID string) bool {
diff --git a/pkg/deploy/predeploy_test.go b/pkg/deploy/predeploy_test.go
index d654489d453..86ea438ba07 100644
--- a/pkg/deploy/predeploy_test.go
+++ b/pkg/deploy/predeploy_test.go
@@ -1661,7 +1661,7 @@ func TestWaitForReadiness(t *testing.T) {
cancel: cancelFastTimeout,
},
mocks: []mock{getInstanceViewMock(unhealthyVMSS)},
- wantErr: "timed out waiting for the condition",
+ wantErr: "context deadline exceeded",
},
{
name: "run successfully after confirming healthy status",
diff --git a/pkg/deploy/upgrade_gateway.go b/pkg/deploy/upgrade_gateway.go
index c9cb28c4c35..9e6af4306b3 100644
--- a/pkg/deploy/upgrade_gateway.go
+++ b/pkg/deploy/upgrade_gateway.go
@@ -39,7 +39,7 @@ func (d *deployer) gatewayWaitForReadiness(ctx context.Context, vmssName string)
}
d.log.Printf("waiting for %s instances to be healthy", vmssName)
- return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+ return wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
for _, vm := range scalesetVMs {
if !d.isVMInstanceHealthy(ctx, d.config.GatewayResourceGroupName, vmssName, *vm.InstanceID) {
return false, nil
@@ -47,7 +47,7 @@ func (d *deployer) gatewayWaitForReadiness(ctx context.Context, vmssName string)
}
return true, nil
- }, ctx.Done())
+ })
}
func (d *deployer) gatewayRemoveOldScalesets(ctx context.Context) error {
diff --git a/pkg/deploy/upgrade_rp.go b/pkg/deploy/upgrade_rp.go
index cf9a845473b..46737445227 100644
--- a/pkg/deploy/upgrade_rp.go
+++ b/pkg/deploy/upgrade_rp.go
@@ -39,7 +39,7 @@ func (d *deployer) rpWaitForReadiness(ctx context.Context, vmssName string) erro
}
d.log.Printf("waiting for %s instances to be healthy", vmssName)
- return wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+ return wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
for _, vm := range scalesetVMs {
if !d.isVMInstanceHealthy(ctx, d.config.RPResourceGroupName, vmssName, *vm.InstanceID) {
return false, nil
@@ -47,7 +47,7 @@ func (d *deployer) rpWaitForReadiness(ctx context.Context, vmssName string) erro
}
return true, nil
- }, ctx.Done())
+ })
}
func (d *deployer) rpRemoveOldScalesets(ctx context.Context) error {
diff --git a/pkg/frontend/adminactions/kubeactions.go b/pkg/frontend/adminactions/kubeactions.go
index c9737510f7e..0d6c3f6f716 100644
--- a/pkg/frontend/adminactions/kubeactions.go
+++ b/pkg/frontend/adminactions/kubeactions.go
@@ -19,6 +19,7 @@ import (
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/kubernetes"
+ "k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
"github.com/Azure/ARO-RP/pkg/api"
@@ -59,7 +60,12 @@ func NewKubeActions(log *logrus.Entry, env env.Interface, oc *api.OpenShiftClust
return nil, err
}
- mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+ httpClient, err := rest.HTTPClientFor(restConfig)
+ if err != nil {
+ return nil, err
+ }
+
+ mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
if err != nil {
return nil, err
}
diff --git a/pkg/hive/manager_test.go b/pkg/hive/manager_test.go
index b2e21e7b4c4..4f775c2d264 100644
--- a/pkg/hive/manager_test.go
+++ b/pkg/hive/manager_test.go
@@ -661,7 +661,7 @@ func TestListSyncSet(t *testing.T) {
t.Fatal(err)
}
- if result != nil && reflect.DeepEqual(result, syncsetTest) {
+ if result != nil && !reflect.DeepEqual(result, syncsetTest) {
t.Fatal("Unexpected syncset list returned", result)
}
})
@@ -702,7 +702,7 @@ func TestGetSyncSet(t *testing.T) {
t.Fatal(err)
}
- if result != nil && reflect.DeepEqual(result, syncsetTest) {
+ if result != nil && !reflect.DeepEqual(result, syncsetTest) {
t.Fatal("Unexpected syncset is returned", result)
}
})
diff --git a/pkg/mimo/actuator/task.go b/pkg/mimo/actuator/task.go
index 493282d7c0b..f2643145afa 100644
--- a/pkg/mimo/actuator/task.go
+++ b/pkg/mimo/actuator/task.go
@@ -10,6 +10,7 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/sirupsen/logrus"
+ "k8s.io/client-go/rest"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/client/apiutil"
@@ -89,7 +90,12 @@ func (t *th) ClientHelper() (clienthelper.Interface, error) {
return nil, err
}
- mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+ httpClient, err := rest.HTTPClientFor(restConfig)
+ if err != nil {
+ return nil, err
+ }
+
+ mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
if err != nil {
return nil, err
}
diff --git a/pkg/mimo/steps/cluster/operatorflags_test.go b/pkg/mimo/steps/cluster/operatorflags_test.go
index d0801fcbad8..d7671b807c4 100644
--- a/pkg/mimo/steps/cluster/operatorflags_test.go
+++ b/pkg/mimo/steps/cluster/operatorflags_test.go
@@ -49,6 +49,10 @@ func TestOperatorFlags(t *testing.T) {
Name: arov1alpha1.SingletonClusterName,
ResourceVersion: "1000",
},
+ TypeMeta: metav1.TypeMeta{
+ Kind: "Cluster",
+ APIVersion: arov1alpha1.SchemeGroupVersion.String(),
+ },
Spec: arov1alpha1.ClusterSpec{
OperatorFlags: arov1alpha1.OperatorFlags{
"foo": "bar",
diff --git a/pkg/monitor/cluster/cluster.go b/pkg/monitor/cluster/cluster.go
index 9b7755c568f..e63a3f7f513 100644
--- a/pkg/monitor/cluster/cluster.go
+++ b/pkg/monitor/cluster/cluster.go
@@ -115,8 +115,13 @@ func NewMonitor(log *logrus.Entry, restConfig *rest.Config, oc *api.OpenShiftClu
return nil, err
}
+ httpClient, err := rest.HTTPClientFor(restConfig)
+ if err != nil {
+ return nil, err
+ }
+
// lazy discovery will not attempt to reach out to the apiserver immediately
- mapper, err := apiutil.NewDynamicRESTMapper(restConfig, apiutil.WithLazyDiscovery)
+ mapper, err := apiutil.NewDynamicRESTMapper(restConfig, httpClient)
if err != nil {
return nil, err
}
@@ -163,8 +168,13 @@ func getHiveClientSet(hiveRestConfig *rest.Config) (client.Client, error) {
return nil, nil
}
+ httpClient, err := rest.HTTPClientFor(hiveRestConfig)
+ if err != nil {
+ return nil, err
+ }
+
// lazy discovery will not attempt to reach out to the apiserver immediately
- mapper, err := apiutil.NewDynamicRESTMapper(hiveRestConfig, apiutil.WithLazyDiscovery)
+ mapper, err := apiutil.NewDynamicRESTMapper(hiveRestConfig, httpClient)
if err != nil {
return nil, err
}
diff --git a/pkg/operator/controllers/banner/banner_controller.go b/pkg/operator/controllers/banner/banner_controller.go
index 9d7662776e5..d8063cbeeeb 100644
--- a/pkg/operator/controllers/banner/banner_controller.go
+++ b/pkg/operator/controllers/banner/banner_controller.go
@@ -15,7 +15,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
consolev1 "github.com/openshift/api/console/v1"
@@ -69,7 +68,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
// watching ConsoleNotifications in case a user edits it
- Watches(&source.Kind{Type: &consolev1.ConsoleNotification{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(aroBannerPredicate)).
+ Watches(&consolev1.ConsoleNotification{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(aroBannerPredicate)).
Named(ControllerName).
Complete(r)
}
diff --git a/pkg/operator/controllers/base/aro_controller_test.go b/pkg/operator/controllers/base/aro_controller_test.go
index 28fe677686f..36403835b20 100644
--- a/pkg/operator/controllers/base/aro_controller_test.go
+++ b/pkg/operator/controllers/base/aro_controller_test.go
@@ -119,18 +119,16 @@ func TestConditions(t *testing.T) {
},
} {
t.Run(tt.name, func(t *testing.T) {
- client := ctrlfake.NewClientBuilder().
- WithObjects(
- &arov1alpha1.Cluster{
- ObjectMeta: metav1.ObjectMeta{
- Name: arov1alpha1.SingletonClusterName,
- },
- Status: arov1alpha1.ClusterStatus{
- Conditions: tt.start,
- OperatorVersion: "unknown",
- },
- },
- ).Build()
+ cluster := &arov1alpha1.Cluster{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: arov1alpha1.SingletonClusterName,
+ },
+ Status: arov1alpha1.ClusterStatus{
+ Conditions: tt.start,
+ OperatorVersion: "unknown",
+ },
+ }
+ client := ctrlfake.NewClientBuilder().WithObjects(cluster).WithStatusSubresource(cluster).Build()
controller := AROController{
Log: logrus.NewEntry(logrus.StandardLogger()),
diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/controller.go b/pkg/operator/controllers/checkers/clusterdnschecker/controller.go
index 502e3f7f49d..c097a798742 100644
--- a/pkg/operator/controllers/checkers/clusterdnschecker/controller.go
+++ b/pkg/operator/controllers/checkers/clusterdnschecker/controller.go
@@ -16,7 +16,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
operatorv1 "github.com/openshift/api/operator/v1"
@@ -127,7 +126,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
builder := ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
Watches(
- &source.Kind{Type: &operatorv1.DNS{}},
+ &operatorv1.DNS{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(defaultClusterDNSPredicate),
)
diff --git a/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go b/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go
index d2033b7a713..05c13055070 100644
--- a/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go
+++ b/pkg/operator/controllers/checkers/clusterdnschecker/controller_test.go
@@ -103,7 +103,7 @@ func TestReconcile(t *testing.T) {
instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
}
- clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+ clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
r := &Reconciler{
log: utillog.GetLogger(),
diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go
index ca95130b459..66d13b4e108 100644
--- a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go
+++ b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller.go
@@ -17,7 +17,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
configv1 "github.com/openshift/api/config/v1"
operatorv1 "github.com/openshift/api/operator/v1"
@@ -128,12 +127,12 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
builder := ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
Watches(
- &source.Kind{Type: &operatorv1.IngressController{}},
+ &operatorv1.IngressController{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(defaultIngressControllerPredicate),
).
Watches(
- &source.Kind{Type: &configv1.ClusterVersion{}},
+ &configv1.ClusterVersion{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicates.ClusterVersion),
)
diff --git a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go
index 84700f854e0..3b2c738f5f2 100644
--- a/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go
+++ b/pkg/operator/controllers/checkers/ingresscertificatechecker/controller_test.go
@@ -84,7 +84,7 @@ func TestReconcile(t *testing.T) {
instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
}
- clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+ clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
r := &Reconciler{
log: utillog.GetLogger(),
diff --git a/pkg/operator/controllers/checkers/internetchecker/controller_test.go b/pkg/operator/controllers/checkers/internetchecker/controller_test.go
index ce298be3c18..b1be6e623aa 100644
--- a/pkg/operator/controllers/checkers/internetchecker/controller_test.go
+++ b/pkg/operator/controllers/checkers/internetchecker/controller_test.go
@@ -90,7 +90,7 @@ func TestReconcile(t *testing.T) {
instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
}
- clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+ clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
r := &Reconciler{
log: utillog.GetLogger(),
diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go
index b1c3363451c..37eaf405974 100644
--- a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go
+++ b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller.go
@@ -17,7 +17,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
operatorv1 "github.com/openshift/api/operator/v1"
@@ -124,7 +123,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
builder := ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
Watches(
- &source.Kind{Type: &corev1.Secret{}},
+ &corev1.Secret{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(clusterSPPredicate),
)
diff --git a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go
index 98e91c06486..b60ad16935e 100644
--- a/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go
+++ b/pkg/operator/controllers/checkers/serviceprincipalchecker/controller_test.go
@@ -84,7 +84,7 @@ func TestReconcile(t *testing.T) {
instance.Spec.OperatorFlags[operator.CheckerEnabled] = operator.FlagFalse
}
- clientFake := fake.NewClientBuilder().WithObjects(instance).Build()
+ clientFake := fake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).Build()
r := &Reconciler{
log: utillog.GetLogger(),
diff --git a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go
index fd33afe31a0..a028f841644 100644
--- a/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go
+++ b/pkg/operator/controllers/cloudproviderconfig/cloudproviderconfig_controller.go
@@ -19,7 +19,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
"github.com/Azure/ARO-RP/pkg/operator"
arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1"
@@ -173,7 +172,7 @@ func (r *CloudProviderConfigReconciler) SetupWithManager(mgr ctrl.Manager) error
return ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
Watches(
- &source.Kind{Type: &corev1.ConfigMap{}},
+ &corev1.ConfigMap{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(cloudProviderConfigPredicate),
).
diff --git a/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go b/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go
index 140681a6fcf..602f55fb9dd 100644
--- a/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go
+++ b/pkg/operator/controllers/clusteroperatoraro/clusteroperatoraro_controller_test.go
@@ -231,8 +231,11 @@ func TestConditions(t *testing.T) {
Conditions: tt.controllerConditions,
},
}
+
+ co := defaultOperator()
clientFake := ctrlfake.NewClientBuilder().
- WithObjects(cluster).
+ WithObjects(cluster, co).
+ WithStatusSubresource(cluster, co).
Build()
r := NewReconciler(logrus.NewEntry(logrus.StandardLogger()), clientFake)
@@ -274,3 +277,42 @@ func TestConditions(t *testing.T) {
})
}
}
+
+func defaultOperator() *configv1.ClusterOperator {
+ currentTime := metav1.Now()
+ return &configv1.ClusterOperator{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: clusterOperatorName,
+ },
+ Status: configv1.ClusterOperatorStatus{
+ Versions: []configv1.OperandVersion{
+ {
+ Name: "operator",
+ Version: version.GitCommit,
+ },
+ },
+ Conditions: []configv1.ClusterOperatorStatusCondition{
+ {
+ Type: configv1.OperatorAvailable,
+ Status: configv1.ConditionFalse,
+ LastTransitionTime: currentTime,
+ Reason: reasonInitializing,
+ Message: "Operator is initializing",
+ },
+ {
+ Type: configv1.OperatorProgressing,
+ Status: configv1.ConditionTrue,
+ LastTransitionTime: currentTime,
+ Reason: reasonInitializing,
+ Message: "Operator is initializing",
+ },
+ {
+ Type: configv1.OperatorDegraded,
+ Status: configv1.ConditionFalse,
+ LastTransitionTime: currentTime,
+ Reason: reasonAsExpected,
+ },
+ },
+ },
+ }
+}
diff --git a/pkg/operator/controllers/cpms/cpms_controller.go b/pkg/operator/controllers/cpms/cpms_controller.go
index aebee30437c..58ecf1c0cd4 100644
--- a/pkg/operator/controllers/cpms/cpms_controller.go
+++ b/pkg/operator/controllers/cpms/cpms_controller.go
@@ -13,7 +13,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
machinev1 "github.com/openshift/api/machine/v1"
@@ -93,7 +92,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(aroClusterPredicate, predicate.GenerationChangedPredicate{}))).
Watches(
- &source.Kind{Type: &machinev1.ControlPlaneMachineSet{}},
+ &machinev1.ControlPlaneMachineSet{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicate.GenerationChangedPredicate{}), // only watch for spec changes
).
diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller.go b/pkg/operator/controllers/dnsmasq/cluster_controller.go
index ae96768e5fe..7dec48e04d1 100644
--- a/pkg/operator/controllers/dnsmasq/cluster_controller.go
+++ b/pkg/operator/controllers/dnsmasq/cluster_controller.go
@@ -17,7 +17,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
configv1 "github.com/openshift/api/config/v1"
mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
@@ -105,7 +104,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
Named(ClusterControllerName).
Watches(
- &source.Kind{Type: &configv1.ClusterVersion{}},
+ &configv1.ClusterVersion{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(clusterVersionPredicate),
).
diff --git a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
index b301e1881aa..0cba37e5885 100644
--- a/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
+++ b/pkg/operator/controllers/dnsmasq/cluster_controller_test.go
@@ -345,6 +345,7 @@ func TestClusterReconciler(t *testing.T) {
client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
WithObjects(tt.objects...).
+ WithStatusSubresource(tt.objects...).
Build()).WithPostCreateHook(testclienthelper.TallyCountsAndKey(createTally)).WithPostUpdateHook(testclienthelper.TallyCountsAndKey(updateTally))
log := logrus.NewEntry(logrus.StandardLogger())
diff --git a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
index 4419a43329d..dba03687cad 100644
--- a/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
+++ b/pkg/operator/controllers/dnsmasq/machineconfig_controller_test.go
@@ -107,6 +107,7 @@ func TestMachineConfigReconciler(t *testing.T) {
client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
WithObjects(tt.objects...).
+ WithStatusSubresource(tt.objects...).
Build())
client.WithPostCreateHook(testclienthelper.TallyCountsAndKey(createTally)).WithPostUpdateHook(testclienthelper.TallyCountsAndKey(updateTally))
@@ -272,21 +273,23 @@ func TestMachineConfigReconcilerNotUpgrading(t *testing.T) {
createTally := make(map[string]int)
updateTally := make(map[string]int)
- client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
- WithObjects(tt.objects...).
- WithObjects(&configv1.ClusterVersion{
- ObjectMeta: metav1.ObjectMeta{
- Name: "version",
- },
- Status: configv1.ClusterVersionStatus{
- History: []configv1.UpdateHistory{
- {
- State: configv1.CompletedUpdate,
- Version: "4.10.11",
- },
+ cluster := &configv1.ClusterVersion{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "version",
+ },
+ Status: configv1.ClusterVersionStatus{
+ History: []configv1.UpdateHistory{
+ {
+ State: configv1.CompletedUpdate,
+ Version: "4.10.11",
},
},
- }).
+ },
+ }
+ client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
+ WithObjects(tt.objects...).
+ WithStatusSubresource(tt.objects...).
+ WithObjects(cluster).
Build())
client.WithPostCreateHook(testclienthelper.TallyCountsAndKey(createTally)).WithPostUpdateHook(testclienthelper.TallyCountsAndKey(updateTally))
@@ -462,6 +465,7 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "custom",
DeletionTimestamp: &transitionTime,
+ Finalizers: []string{"test-finalizer"},
},
Status: mcv1.MachineConfigPoolStatus{},
Spec: mcv1.MachineConfigPoolSpec{},
@@ -485,22 +489,25 @@ func TestMachineConfigReconcilerClusterUpgrading(t *testing.T) {
createTally := make(map[string]int)
updateTally := make(map[string]int)
- client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
- WithObjects(tt.objects...).
- WithObjects(&configv1.ClusterVersion{
- ObjectMeta: metav1.ObjectMeta{
- Name: "version",
- },
- Spec: configv1.ClusterVersionSpec{},
- Status: configv1.ClusterVersionStatus{
- Conditions: []configv1.ClusterOperatorStatusCondition{
- {
- Type: configv1.OperatorProgressing,
- Status: configv1.ConditionTrue,
- },
+ clusterversion := &configv1.ClusterVersion{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "version",
+ },
+ Spec: configv1.ClusterVersionSpec{},
+ Status: configv1.ClusterVersionStatus{
+ Conditions: []configv1.ClusterOperatorStatusCondition{
+ {
+ Type: configv1.OperatorProgressing,
+ Status: configv1.ConditionTrue,
},
},
- }).
+ },
+ }
+
+ client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
+ WithObjects(tt.objects...).
+ WithStatusSubresource(tt.objects...).
+ WithObjects(clusterversion).
Build())
client.WithPostCreateHook(testclienthelper.TallyCountsAndKey(createTally)).WithPostUpdateHook(testclienthelper.TallyCountsAndKey(updateTally))
diff --git a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
index d831b58b8a6..45da2910c61 100644
--- a/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
+++ b/pkg/operator/controllers/dnsmasq/machineconfigpool_controller_test.go
@@ -113,6 +113,7 @@ func TestMachineConfigPoolReconciler(t *testing.T) {
client := testclienthelper.NewHookingClient(ctrlfake.NewClientBuilder().
WithObjects(tt.objects...).
+ WithStatusSubresource(tt.objects...).
Build())
client.WithPostCreateHook(testclienthelper.TallyCountsAndKey(createTally)).WithPostUpdateHook(testclienthelper.TallyCountsAndKey(updateTally))
diff --git a/pkg/operator/controllers/etchosts/cluster_controller.go b/pkg/operator/controllers/etchosts/cluster_controller.go
index 76039eb9dd3..bfe23425965 100644
--- a/pkg/operator/controllers/etchosts/cluster_controller.go
+++ b/pkg/operator/controllers/etchosts/cluster_controller.go
@@ -17,7 +17,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
@@ -199,10 +198,10 @@ func (r *EtcHostsClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
etcHostsBuilder := ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
- Watches(&source.Kind{Type: &mcv1.MachineConfigPool{}},
+ Watches(&mcv1.MachineConfigPool{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicate.GenerationChangedPredicate{})).
- Watches(&source.Kind{Type: &mcv1.MachineConfig{}},
+ Watches(&mcv1.MachineConfig{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicate.GenerationChangedPredicate{}))
diff --git a/pkg/operator/controllers/etchosts/cluster_controller_test.go b/pkg/operator/controllers/etchosts/cluster_controller_test.go
index 0c7692bbba1..20f03fc8765 100644
--- a/pkg/operator/controllers/etchosts/cluster_controller_test.go
+++ b/pkg/operator/controllers/etchosts/cluster_controller_test.go
@@ -351,7 +351,7 @@ func TestReconcileEtcHostsCluster(t *testing.T) {
}
var hook = logtest.NewLocal(logger)
- clientBuilder := ctrlfake.NewClientBuilder().WithObjects(tt.objects...)
+ clientBuilder := ctrlfake.NewClientBuilder().WithObjects(tt.objects...).WithStatusSubresource(tt.objects...)
r := &EtcHostsClusterReconciler{
AROController: base.AROController{
diff --git a/pkg/operator/controllers/etchosts/machineconfig_controller.go b/pkg/operator/controllers/etchosts/machineconfig_controller.go
index 147841579a4..51c83af528f 100644
--- a/pkg/operator/controllers/etchosts/machineconfig_controller.go
+++ b/pkg/operator/controllers/etchosts/machineconfig_controller.go
@@ -18,7 +18,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
mcv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
@@ -145,10 +144,10 @@ func (r *EtcHostsMachineConfigReconciler) SetupWithManager(mgr ctrl.Manager) err
etcHostsBuilder := ctrl.NewControllerManagedBy(mgr).
For(&mcv1.MachineConfig{}).
- Watches(&source.Kind{Type: &mcv1.MachineConfigPool{}},
+ Watches(&mcv1.MachineConfigPool{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicate.GenerationChangedPredicate{})).
- Watches(&source.Kind{Type: &arov1alpha1.Cluster{}},
+ Watches(&arov1alpha1.Cluster{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{})))
diff --git a/pkg/operator/controllers/etchosts/machineconfig_controller_test.go b/pkg/operator/controllers/etchosts/machineconfig_controller_test.go
index c0167829d95..bc77f54d1d8 100644
--- a/pkg/operator/controllers/etchosts/machineconfig_controller_test.go
+++ b/pkg/operator/controllers/etchosts/machineconfig_controller_test.go
@@ -171,7 +171,7 @@ func TestReconcileEtcHostsMachineConfig(t *testing.T) {
}
var hook = logtest.NewLocal(logger)
- clientBuilder := ctrlfake.NewClientBuilder().WithObjects(tt.objects...)
+ clientBuilder := ctrlfake.NewClientBuilder().WithObjects(tt.objects...).WithStatusSubresource(tt.objects...)
r := &EtcHostsMachineConfigReconciler{
AROController: base.AROController{
diff --git a/pkg/operator/controllers/guardrails/guardrails_controller.go b/pkg/operator/controllers/guardrails/guardrails_controller.go
index b4af07499be..72f2ac03a14 100644
--- a/pkg/operator/controllers/guardrails/guardrails_controller.go
+++ b/pkg/operator/controllers/guardrails/guardrails_controller.go
@@ -98,9 +98,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
timeoutCtx, cancel := context.WithTimeout(ctx, r.readinessTimeout)
defer cancel()
- err := wait.PollImmediateUntil(r.readinessPollTime, func() (bool, error) {
+ err := wait.PollUntilContextCancel(timeoutCtx, r.readinessPollTime, true, func(ctx context.Context) (bool, error) {
return r.gatekeeperDeploymentIsReady(ctx, deployConfig)
- }, timeoutCtx.Done())
+ })
if err != nil {
return reconcile.Result{}, fmt.Errorf("GateKeeper deployment timed out on Ready: %w", err)
}
@@ -113,9 +113,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
return reconcile.Result{}, err
}
- err := wait.PollImmediateUntil(r.readinessPollTime, func() (bool, error) {
+ err := wait.PollUntilContextCancel(timeoutCtx, r.readinessPollTime, true, func(ctx context.Context) (bool, error) {
return r.gkPolicyTemplate.IsConstraintTemplateReady(ctx, policyConfig)
- }, timeoutCtx.Done())
+ })
if err != nil {
return reconcile.Result{}, fmt.Errorf("GateKeeper ConstraintTemplates timed out on creation: %w", err)
}
diff --git a/pkg/operator/controllers/guardrails/guardrails_controller_test.go b/pkg/operator/controllers/guardrails/guardrails_controller_test.go
index f5f3191a8d8..71ff4c59144 100644
--- a/pkg/operator/controllers/guardrails/guardrails_controller_test.go
+++ b/pkg/operator/controllers/guardrails/guardrails_controller_test.go
@@ -135,7 +135,7 @@ func TestGuardRailsReconciler(t *testing.T) {
md.EXPECT().CreateOrUpdate(gomock.Any(), cluster, expectedConfig).Return(nil)
md.EXPECT().IsReady(gomock.Any(), gomock.Any(), gomock.Any()).Return(false, nil)
},
- wantErr: "GateKeeper deployment timed out on Ready: timed out waiting for the condition",
+ wantErr: "GateKeeper deployment timed out on Ready: context deadline exceeded",
},
{
name: "managed, CreateOrUpdate() fails",
diff --git a/pkg/operator/controllers/imageconfig/image_controller_test.go b/pkg/operator/controllers/imageconfig/image_controller_test.go
index aeac0677cdc..2267f2815aa 100644
--- a/pkg/operator/controllers/imageconfig/image_controller_test.go
+++ b/pkg/operator/controllers/imageconfig/image_controller_test.go
@@ -289,7 +289,7 @@ func TestImageConfigReconciler(t *testing.T) {
instance = tt.instance
}
- clientFake := ctrlfake.NewClientBuilder().WithObjects(instance, tt.image).Build()
+ clientFake := ctrlfake.NewClientBuilder().WithObjects(instance, tt.image).WithStatusSubresource(instance, tt.image).Build()
r := NewReconciler(logrus.NewEntry(logrus.StandardLogger()), clientFake)
request := ctrl.Request{}
diff --git a/pkg/operator/controllers/ingress/ingress_controller_test.go b/pkg/operator/controllers/ingress/ingress_controller_test.go
index 9466d56d87b..f6752e12ef1 100644
--- a/pkg/operator/controllers/ingress/ingress_controller_test.go
+++ b/pkg/operator/controllers/ingress/ingress_controller_test.go
@@ -167,7 +167,7 @@ func TestReconciler(t *testing.T) {
clusterMock.Status.Conditions = append(clusterMock.Status.Conditions, tt.startConditions...)
}
- clientBuilder := ctrlfake.NewClientBuilder().WithObjects(clusterMock)
+ clientBuilder := ctrlfake.NewClientBuilder().WithObjects(clusterMock).WithStatusSubresource(clusterMock)
if tt.ingressController != nil {
clientBuilder = clientBuilder.WithObjects(tt.ingressController)
}
diff --git a/pkg/operator/controllers/machine/machine_controller_test.go b/pkg/operator/controllers/machine/machine_controller_test.go
index 86e6548cb05..06556a2f427 100644
--- a/pkg/operator/controllers/machine/machine_controller_test.go
+++ b/pkg/operator/controllers/machine/machine_controller_test.go
@@ -162,7 +162,7 @@ func TestMachineReconciler(t *testing.T) {
},
}
- clientFake := fake.NewClientBuilder().WithObjects(&baseCluster).WithObjects(tt.objects...).Build()
+ clientFake := fake.NewClientBuilder().WithObjects(&baseCluster).WithStatusSubresource(&baseCluster).WithObjects(tt.objects...).Build()
r := &Reconciler{
log: logrus.NewEntry(logrus.StandardLogger()),
diff --git a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go
index 89af57b8051..c77282714ae 100644
--- a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go
+++ b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller.go
@@ -20,7 +20,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
configv1 "github.com/openshift/api/config/v1"
machinev1beta1 "github.com/openshift/api/machine/v1beta1"
@@ -174,7 +173,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
Owns(&machinev1beta1.MachineHealthCheck{}).
Owns(&monitoringv1.PrometheusRule{}).
Watches(
- &source.Kind{Type: &configv1.ClusterVersion{}},
+ &configv1.ClusterVersion{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicates.ClusterVersion),
).
diff --git a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
index 623b7637a10..1dc71e9ce85 100644
--- a/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
+++ b/pkg/operator/controllers/machinehealthcheck/machinehealthcheck_controller_test.go
@@ -266,7 +266,7 @@ func TestMachineHealthCheckReconciler(t *testing.T) {
clientBuilder := ctrlfake.NewClientBuilder()
if tt.instance != nil {
- clientBuilder = clientBuilder.WithObjects(tt.instance)
+ clientBuilder = clientBuilder.WithObjects(tt.instance).WithStatusSubresource(tt.instance)
}
if tt.clusterversion == nil {
clientBuilder = clientBuilder.WithObjects(clusterversionDefault)
diff --git a/pkg/operator/controllers/machineset/machineset_controller_test.go b/pkg/operator/controllers/machineset/machineset_controller_test.go
index a24cfee23ee..6ef3a7f19d4 100644
--- a/pkg/operator/controllers/machineset/machineset_controller_test.go
+++ b/pkg/operator/controllers/machineset/machineset_controller_test.go
@@ -215,6 +215,7 @@ func TestReconciler(t *testing.T) {
clientFake := ctrlfake.NewClientBuilder().
WithObjects(instance).
+ WithStatusSubresource(instance).
WithObjects(tt.machinesets...).
Build()
diff --git a/pkg/operator/controllers/monitoring/monitoring_controller.go b/pkg/operator/controllers/monitoring/monitoring_controller.go
index bb4297dd014..bf4dc7215bd 100644
--- a/pkg/operator/controllers/monitoring/monitoring_controller.go
+++ b/pkg/operator/controllers/monitoring/monitoring_controller.go
@@ -21,7 +21,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
"sigs.k8s.io/yaml"
"github.com/Azure/ARO-RP/pkg/api"
@@ -216,7 +215,7 @@ func (r *MonitoringReconciler) SetupWithManager(mgr ctrl.Manager) error {
// https://github.com/kubernetes-sigs/controller-runtime/issues/1173
// equivalent to For(&v1.ConfigMap{}, ...)., but can't call For multiple times on one builder
Watches(
- &source.Kind{Type: &corev1.ConfigMap{}},
+ &corev1.ConfigMap{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(monitoringConfigMapPredicate),
).
diff --git a/pkg/operator/controllers/monitoring/monitoring_controller_test.go b/pkg/operator/controllers/monitoring/monitoring_controller_test.go
index d5c7345cdad..716c633ab6e 100644
--- a/pkg/operator/controllers/monitoring/monitoring_controller_test.go
+++ b/pkg/operator/controllers/monitoring/monitoring_controller_test.go
@@ -166,7 +166,7 @@ somethingElse:
clientBuilder := ctrlfake.NewClientBuilder().WithObjects(instance)
if tt.configMap != nil {
- clientBuilder.WithObjects(tt.configMap)
+ clientBuilder.WithObjects(tt.configMap).WithStatusSubresource(tt.configMap)
}
r := &MonitoringReconciler{
@@ -203,7 +203,6 @@ func TestReconcilePVC(t *testing.T) {
defaultProgressing := utilconditions.ControllerDefaultProgressing(ControllerName)
defaultDegraded := utilconditions.ControllerDefaultDegraded(ControllerName)
defaultConditions := []operatorv1.OperatorCondition{defaultAvailable, defaultProgressing, defaultDegraded}
- volumeMode := corev1.PersistentVolumeFilesystem
tests := []struct {
name string
pvcs []client.Object
@@ -271,12 +270,6 @@ func TestReconcilePVC(t *testing.T) {
},
ResourceVersion: "1",
},
- Spec: corev1.PersistentVolumeClaimSpec{
- VolumeMode: &volumeMode,
- },
- Status: corev1.PersistentVolumeClaimStatus{
- Phase: corev1.ClaimPending,
- },
},
},
wantConditions: defaultConditions,
@@ -298,7 +291,7 @@ func TestReconcilePVC(t *testing.T) {
},
}
- clientFake := ctrlfake.NewClientBuilder().WithObjects(instance).WithObjects(tt.pvcs...).Build()
+ clientFake := ctrlfake.NewClientBuilder().WithObjects(instance).WithStatusSubresource(instance).WithObjects(tt.pvcs...).Build()
r := &MonitoringReconciler{
AROController: base.AROController{
diff --git a/pkg/operator/controllers/muo/muo_controller.go b/pkg/operator/controllers/muo/muo_controller.go
index 1bfb4504492..5cce390ad72 100644
--- a/pkg/operator/controllers/muo/muo_controller.go
+++ b/pkg/operator/controllers/muo/muo_controller.go
@@ -21,7 +21,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
"github.com/Azure/ARO-RP/pkg/operator"
arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1"
@@ -154,9 +153,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
timeoutCtx, cancel := context.WithTimeout(ctx, r.readinessTimeout)
defer cancel()
- err = wait.PollImmediateUntil(r.readinessPollTime, func() (bool, error) {
+ err = wait.PollUntilContextCancel(timeoutCtx, r.readinessPollTime, true, func(ctx context.Context) (bool, error) {
return r.deployer.IsReady(ctx, "openshift-managed-upgrade-operator", "managed-upgrade-operator")
- }, timeoutCtx.Done())
+ })
if err != nil {
return reconcile.Result{}, fmt.Errorf("managed Upgrade Operator deployment timed out on Ready: %w", err)
}
@@ -175,7 +174,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
muoBuilder := ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
Watches(
- &source.Kind{Type: &corev1.Secret{}},
+ &corev1.Secret{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicates.PullSecret),
)
diff --git a/pkg/operator/controllers/muo/muo_controller_test.go b/pkg/operator/controllers/muo/muo_controller_test.go
index 967a4e54906..5f390f060e9 100644
--- a/pkg/operator/controllers/muo/muo_controller_test.go
+++ b/pkg/operator/controllers/muo/muo_controller_test.go
@@ -212,7 +212,7 @@ func TestMUOReconciler(t *testing.T) {
md.EXPECT().CreateOrUpdate(gomock.Any(), cluster, expectedConfig).Return(nil)
md.EXPECT().IsReady(gomock.Any(), gomock.Any(), gomock.Any()).Return(false, nil)
},
- wantErr: "managed Upgrade Operator deployment timed out on Ready: timed out waiting for the condition",
+ wantErr: "managed Upgrade Operator deployment timed out on Ready: context deadline exceeded",
},
{
name: "managed, could not parse cluster version fails",
diff --git a/pkg/operator/controllers/node/node_controller_test.go b/pkg/operator/controllers/node/node_controller_test.go
index 231c980a5dc..6bbe5ddc04f 100644
--- a/pkg/operator/controllers/node/node_controller_test.go
+++ b/pkg/operator/controllers/node/node_controller_test.go
@@ -418,7 +418,7 @@ func TestReconciler(t *testing.T) {
if len(tt.startConditions) > 0 {
cluster.Status.Conditions = append(cluster.Status.Conditions, tt.startConditions...)
}
- clientBuilder = clientBuilder.WithObjects(cluster)
+ clientBuilder = clientBuilder.WithObjects(cluster).WithStatusSubresource(cluster)
}
if tt.nodeObject != nil {
diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller.go b/pkg/operator/controllers/pullsecret/pullsecret_controller.go
index 53008b5ecb6..4b3936d7d2e 100644
--- a/pkg/operator/controllers/pullsecret/pullsecret_controller.go
+++ b/pkg/operator/controllers/pullsecret/pullsecret_controller.go
@@ -27,7 +27,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
"github.com/Azure/ARO-RP/pkg/operator"
arov1alpha1 "github.com/Azure/ARO-RP/pkg/operator/apis/aro.openshift.io/v1alpha1"
@@ -114,12 +113,19 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
return reconcile.Result{}, err
}
+ err = r.Client.Status().Update(ctx, instance)
+ if err != nil {
+ r.Log.Error(err)
+ return reconcile.Result{}, err
+ }
+
err = r.Client.Update(ctx, instance)
if err == nil {
r.ClearConditions(ctx)
} else {
r.SetDegraded(ctx, err)
}
+
return reconcile.Result{}, err
}
@@ -130,7 +136,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
// https://github.com/kubernetes-sigs/controller-runtime/issues/1173
// equivalent to For(&v1.Secret{})., but can't call For multiple times on one builder
Watches(
- &source.Kind{Type: &corev1.Secret{}},
+ &corev1.Secret{},
&handler.EnqueueRequestForObject{},
builder.WithPredicates(predicate.Or(predicates.PullSecret, predicates.BackupPullSecret)),
).
diff --git a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go
index dbb23659bc4..40e50d511f4 100644
--- a/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go
+++ b/pkg/operator/controllers/pullsecret/pullsecret_controller_test.go
@@ -314,7 +314,7 @@ func TestPullSecretReconciler(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
ctx := context.Background()
- clientFake := ctrlfake.NewClientBuilder().WithObjects(tt.instance).WithObjects(tt.secrets...).Build()
+ clientFake := ctrlfake.NewClientBuilder().WithObjects(tt.instance).WithStatusSubresource(tt.instance).WithObjects(tt.secrets...).Build()
assert.NotNil(t, clientFake)
r := NewReconciler(logrus.NewEntry(logrus.StandardLogger()), clientFake)
diff --git a/pkg/operator/controllers/storageaccounts/storageaccount_controller.go b/pkg/operator/controllers/storageaccounts/storageaccount_controller.go
index 505ce5e390d..19410997ecb 100644
--- a/pkg/operator/controllers/storageaccounts/storageaccount_controller.go
+++ b/pkg/operator/controllers/storageaccounts/storageaccount_controller.go
@@ -16,7 +16,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
machinev1beta1 "github.com/openshift/api/machine/v1beta1"
@@ -116,8 +115,8 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
- Watches(&source.Kind{Type: &machinev1beta1.Machine{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleMaster)). // to reconcile on master machine replacement
- Watches(&source.Kind{Type: &machinev1beta1.MachineSet{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleWorker)). // to reconcile on worker machines
+ Watches(&machinev1beta1.Machine{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleMaster)). // to reconcile on master machine replacement
+ Watches(&machinev1beta1.MachineSet{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleWorker)). // to reconcile on worker machines
Named(ControllerName).
Complete(r)
}
diff --git a/pkg/operator/controllers/subnets/subnets_controller.go b/pkg/operator/controllers/subnets/subnets_controller.go
index 389cf51e77e..f37da1f6990 100644
--- a/pkg/operator/controllers/subnets/subnets_controller.go
+++ b/pkg/operator/controllers/subnets/subnets_controller.go
@@ -18,7 +18,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
machinev1beta1 "github.com/openshift/api/machine/v1beta1"
@@ -154,8 +153,8 @@ func (r *reconcileManager) reconcileSubnets(ctx context.Context) error {
func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
- Watches(&source.Kind{Type: &machinev1beta1.Machine{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleMaster)). // to reconcile on master machine replacement
- Watches(&source.Kind{Type: &machinev1beta1.MachineSet{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleWorker)). // to reconcile on worker machines
+ Watches(&machinev1beta1.Machine{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleMaster)). // to reconcile on master machine replacement
+ Watches(&machinev1beta1.MachineSet{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.MachineRoleWorker)). // to reconcile on worker machines
Named(ControllerName).
Complete(r)
}
diff --git a/pkg/operator/controllers/workaround/systemreserved.go b/pkg/operator/controllers/workaround/systemreserved.go
index 59ae2ceadc8..cac310bac57 100644
--- a/pkg/operator/controllers/workaround/systemreserved.go
+++ b/pkg/operator/controllers/workaround/systemreserved.go
@@ -80,6 +80,10 @@ func (sr *systemreserved) Ensure(ctx context.Context) error {
// Step 2. Create KubeletConfig CRD with appropriate limits.
kc := &mcv1.KubeletConfig{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "KubeletConfig",
+ APIVersion: "machineconfiguration.openshift.io/v1",
+ },
ObjectMeta: metav1.ObjectMeta{
Name: kubeletConfigName,
},
@@ -138,6 +142,10 @@ func (sr *systemreserved) Remove(ctx context.Context) error {
}
kc := &mcv1.KubeletConfig{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "KubeletConfig",
+ APIVersion: "machineconfiguration.openshift.io/v1",
+ },
ObjectMeta: metav1.ObjectMeta{
Name: kubeletConfigName,
},
diff --git a/pkg/operator/controllers/workaround/systemreserved_test.go b/pkg/operator/controllers/workaround/systemreserved_test.go
index 74a41e68f96..16dcbf1260a 100644
--- a/pkg/operator/controllers/workaround/systemreserved_test.go
+++ b/pkg/operator/controllers/workaround/systemreserved_test.go
@@ -83,6 +83,10 @@ func TestSystemreservedEnsure(t *testing.T) {
},
},
kc: &mcv1.KubeletConfig{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "KubeletConfig",
+ APIVersion: "machineconfiguration.openshift.io/v1",
+ },
ObjectMeta: metav1.ObjectMeta{
Name: kubeletConfigName,
ResourceVersion: "1",
@@ -99,6 +103,10 @@ func TestSystemreservedEnsure(t *testing.T) {
},
},
kc: &mcv1.KubeletConfig{
+ TypeMeta: metav1.TypeMeta{
+ Kind: "KubeletConfig",
+ APIVersion: "machineconfiguration.openshift.io/v1",
+ },
ObjectMeta: metav1.ObjectMeta{
Name: kubeletConfigName,
ResourceVersion: "1",
diff --git a/pkg/operator/controllers/workaround/workaround_controller.go b/pkg/operator/controllers/workaround/workaround_controller.go
index 4fed24e6b0e..8d484f676e8 100644
--- a/pkg/operator/controllers/workaround/workaround_controller.go
+++ b/pkg/operator/controllers/workaround/workaround_controller.go
@@ -16,7 +16,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/handler"
"sigs.k8s.io/controller-runtime/pkg/predicate"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
- "sigs.k8s.io/controller-runtime/pkg/source"
configv1 "github.com/openshift/api/config/v1"
@@ -94,7 +93,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request ctrl.Request) (ctrl.
func (r *Reconciler) SetupWithManager(mgr ctrl.Manager) error {
return ctrl.NewControllerManagedBy(mgr).
For(&arov1alpha1.Cluster{}, builder.WithPredicates(predicate.And(predicates.AROCluster, predicate.GenerationChangedPredicate{}))).
- Watches(&source.Kind{Type: &configv1.ClusterVersion{}}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.ClusterVersion)).
+ Watches(&configv1.ClusterVersion{}, &handler.EnqueueRequestForObject{}, builder.WithPredicates(predicates.ClusterVersion)).
Named(ControllerName).
Complete(r)
}
diff --git a/pkg/operator/deploy/deploy.go b/pkg/operator/deploy/deploy.go
index d4814a45439..3c39b5fa760 100644
--- a/pkg/operator/deploy/deploy.go
+++ b/pkg/operator/deploy/deploy.go
@@ -431,7 +431,7 @@ func (o *operator) applyDeployment(ctx context.Context, resources []kruntime.Obj
return err
}
- err = wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
+ err = wait.PollUntilContextTimeout(ctx, time.Second, time.Minute, true, func(ctx context.Context) (bool, error) {
crd, err := o.extensionscli.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, acc.GetName(), metav1.GetOptions{})
if err != nil {
return false, err
diff --git a/pkg/operator/deploy/staticresources/aro.openshift.io_clusters.yaml b/pkg/operator/deploy/staticresources/aro.openshift.io_clusters.yaml
index 600488399cb..da0963a44a7 100644
--- a/pkg/operator/deploy/staticresources/aro.openshift.io_clusters.yaml
+++ b/pkg/operator/deploy/staticresources/aro.openshift.io_clusters.yaml
@@ -135,6 +135,8 @@ spec:
type: string
type:
type: string
+ required:
+ - type
type: object
type: array
operatorVersion:
diff --git a/pkg/operator/deploy/staticresources/preview.aro.openshift.io_previewfeatures.yaml b/pkg/operator/deploy/staticresources/preview.aro.openshift.io_previewfeatures.yaml
index 126914adf53..2006e70372a 100644
--- a/pkg/operator/deploy/staticresources/preview.aro.openshift.io_previewfeatures.yaml
+++ b/pkg/operator/deploy/staticresources/preview.aro.openshift.io_previewfeatures.yaml
@@ -108,6 +108,8 @@ spec:
type: string
type:
type: string
+ required:
+ - type
type: object
type: array
operatorVersion:
diff --git a/pkg/util/arm/deploy_test.go b/pkg/util/arm/deploy_test.go
index 95e5b096f21..7bec5cc1e3f 100644
--- a/pkg/util/arm/deploy_test.go
+++ b/pkg/util/arm/deploy_test.go
@@ -5,6 +5,7 @@ package arm
import (
"context"
+ "errors"
"testing"
mgmtfeatures "github.com/Azure/azure-sdk-for-go/services/resources/mgmt/2019-07-01/features"
@@ -73,7 +74,7 @@ func TestDeployARMTemplate(t *testing.T) {
Return(activeErr)
dc.EXPECT().
Wait(ctx, resourceGroup, deploymentName).
- Return(wait.ErrWaitTimeout)
+ Return(wait.ErrorInterrupted(errors.New("timed out waiting for the condition")))
},
wantErr: "timed out waiting for the condition",
},
diff --git a/pkg/util/azureclient/azuresdk/azcertificates/helpers.go b/pkg/util/azureclient/azuresdk/azcertificates/helpers.go
index 1a855c7f97c..0438d0a96ec 100644
--- a/pkg/util/azureclient/azuresdk/azcertificates/helpers.go
+++ b/pkg/util/azureclient/azuresdk/azcertificates/helpers.go
@@ -106,14 +106,14 @@ func WaitForCertificateOperation(parent context.Context, operation func(ctx cont
ctx, cancel := context.WithTimeout(parent, 15*time.Minute)
defer cancel()
- err := wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+ err := wait.PollUntilContextCancel(ctx, 10*time.Second, true, func(context.Context) (bool, error) {
op, err := operation(ctx)
if err != nil {
return false, err
}
return checkOperation(op)
- }, ctx.Done())
+ })
return err
}
diff --git a/pkg/util/azureclient/mgmt/features/deployments_addons.go b/pkg/util/azureclient/mgmt/features/deployments_addons.go
index 8f8947bedf4..d438f8d8a55 100644
--- a/pkg/util/azureclient/mgmt/features/deployments_addons.go
+++ b/pkg/util/azureclient/mgmt/features/deployments_addons.go
@@ -48,7 +48,7 @@ func (c *deploymentsClient) DeleteAndWait(ctx context.Context, resourceGroupName
}
func (c *deploymentsClient) Wait(ctx context.Context, resourceGroupName string, deploymentName string) error {
- return wait.Poll(c.Client.PollingDelay, c.Client.PollingDuration, func() (bool, error) {
+ return wait.PollUntilContextTimeout(ctx, c.Client.PollingDelay, c.Client.PollingDuration, true, func(ctx context.Context) (bool, error) {
deployment, err := c.DeploymentsClient.Get(ctx, resourceGroupName, deploymentName)
if err != nil {
return false, err
diff --git a/pkg/util/clienthelper/clienthelper.go b/pkg/util/clienthelper/clienthelper.go
index eaf50a49ef3..4a7ce4b53ef 100644
--- a/pkg/util/clienthelper/clienthelper.go
+++ b/pkg/util/clienthelper/clienthelper.go
@@ -251,6 +251,7 @@ func Merge(old, new client.Object) (client.Object, bool, string, error) {
_, injectTrustBundle := new.ObjectMeta.Labels["config.openshift.io/inject-trusted-cabundle"]
if injectTrustBundle {
caBundle, ext := old.Data["ca-bundle.crt"]
+ new.Data = make(map[string]string)
if ext {
new.Data["ca-bundle.crt"] = caBundle
}
diff --git a/pkg/util/clienthelper/clienthelper_test.go b/pkg/util/clienthelper/clienthelper_test.go
index 43f6889d8da..c483a61edb2 100644
--- a/pkg/util/clienthelper/clienthelper_test.go
+++ b/pkg/util/clienthelper/clienthelper_test.go
@@ -1558,6 +1558,10 @@ func TestGetOne(t *testing.T) {
Namespace: "somewhere",
ResourceVersion: "1",
},
+ TypeMeta: metav1.TypeMeta{
+ Kind: "Secret",
+ APIVersion: "v1",
+ },
StringData: map[string]string{
"secret": "squirrels",
},
diff --git a/pkg/util/cluster/aad.go b/pkg/util/cluster/aad.go
index dcccbf81e15..3f8923b518a 100644
--- a/pkg/util/cluster/aad.go
+++ b/pkg/util/cluster/aad.go
@@ -51,9 +51,9 @@ func (c *Cluster) createServicePrincipal(ctx context.Context, appID string) (str
defer cancel()
// NOTE: Do not override err with the error returned by
- // wait.PollImmediateUntil. Doing this will not propagate the latest error
+ // wait.PollUntilContextCancel. Doing this will not propagate the latest error
// to the user in case when wait exceeds the timeout
- _ = wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+ _ = wait.PollUntilContextCancel(timeoutCtx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
requestBody := msgraph_models.NewServicePrincipal()
requestBody.SetAppId(&appID)
result, err = c.spGraphClient.ServicePrincipals().Post(ctx, requestBody, nil)
@@ -73,7 +73,7 @@ func (c *Cluster) createServicePrincipal(ctx context.Context, appID string) (str
return false, nil
}
return err == nil, err
- }, timeoutCtx.Done())
+ })
if err != nil {
return "", err
}
diff --git a/pkg/util/cluster/cluster.go b/pkg/util/cluster/cluster.go
index 0dcd5dac306..f9ff3a8f930 100644
--- a/pkg/util/cluster/cluster.go
+++ b/pkg/util/cluster/cluster.go
@@ -1053,11 +1053,11 @@ func (c *Cluster) fixupNSGs(ctx context.Context, vnetResourceGroup, clusterName
// very occasionally c.securitygroups.List returns an empty list in
// production. No idea why. Let's try retrying it...
var nsgs []*sdknetwork.SecurityGroup
- err := wait.PollImmediateUntil(10*time.Second, func() (bool, error) {
+ err := wait.PollUntilContextCancel(timeoutCtx, 10*time.Second, true, func(ctx context.Context) (bool, error) {
var err error
nsgs, err = c.securitygroups.List(ctx, "aro-"+clusterName, nil)
return len(nsgs) > 0, err
- }, timeoutCtx.Done())
+ })
if err != nil {
return err
}
@@ -1175,14 +1175,14 @@ func (c *Cluster) ensureResourceGroupDeleted(ctx context.Context, resourceGroupN
timeoutCtx, cancel := context.WithTimeout(ctx, 10*time.Minute)
defer cancel()
- return wait.PollImmediateUntil(5*time.Second, func() (bool, error) {
+ return wait.PollUntilContextCancel(timeoutCtx, 5*time.Second, true, func(ctx context.Context) (bool, error) {
_, err := c.groups.Get(ctx, resourceGroupName)
if azureerrors.ResourceGroupNotFound(err) {
c.log.Infof("finished deleting resource group %s", resourceGroupName)
return true, nil
}
return false, fmt.Errorf("failed to delete resource group %s with %s", resourceGroupName, err)
- }, timeoutCtx.Done())
+ })
}
func (c *Cluster) deleteResourceGroup(ctx context.Context, resourceGroup string) error {
diff --git a/pkg/util/conditions/condition_test.go b/pkg/util/conditions/condition_test.go
index 7490e57c5e9..df21062d40f 100644
--- a/pkg/util/conditions/condition_test.go
+++ b/pkg/util/conditions/condition_test.go
@@ -196,7 +196,7 @@ func TestSetCondition(t *testing.T) {
},
} {
t.Run(tt.name, func(t *testing.T) {
- clientFake := fake.NewClientBuilder().WithObjects(&tt.cluster).Build()
+ clientFake := fake.NewClientBuilder().WithObjects(&tt.cluster).WithStatusSubresource(&tt.cluster).Build()
err := SetCondition(ctx, clientFake, tt.input, role)
utilerror.AssertErrorMessage(t, err, tt.wantErr)
diff --git a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go
index 8678dbf2731..5303433ca8e 100644
--- a/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go
+++ b/pkg/util/dynamichelper/discovery/cache_fallback_discovery_client_test.go
@@ -11,7 +11,7 @@ import (
"strings"
"testing"
- openapi_v2 "github.com/google/gnostic/openapiv2"
+ openapi_v2 "github.com/google/gnostic-models/openapiv2"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
kversion "k8s.io/apimachinery/pkg/version"
@@ -215,3 +215,7 @@ func (c *fakeDiscoveryClient) OpenAPISchema() (*openapi_v2.Document, error) {
func (c *fakeDiscoveryClient) OpenAPIV3() openapi.Client {
panic("unimplemented")
}
+
+func (c *fakeDiscoveryClient) WithLegacy() discovery.DiscoveryInterface {
+ return nil
+}
diff --git a/pkg/util/steps/condition.go b/pkg/util/steps/condition.go
index 18d41078d44..c740ac09303 100644
--- a/pkg/util/steps/condition.go
+++ b/pkg/util/steps/condition.go
@@ -81,25 +81,25 @@ func (c conditionStep) run(ctx context.Context, log *logrus.Entry) error {
// runner.pollInterval, until the condition returns true or timeoutCtx's
// timeout fires. Errors from `f` are returned directly unless the error
// is ErrWaitTimeout. Internal ErrWaitTimeout errors are wrapped to avoid
- // confusion with wait.PollImmediateUntil's own behavior of returning
+ // confusion with wait.PollUntilContextCancel's own behavior of returning
// ErrWaitTimeout when the condition is not met.
- err := wait.PollImmediateUntil(pollInterval, func() (bool, error) {
+ err := wait.PollUntilContextCancel(timeoutCtx, pollInterval, true, func(ctx context.Context) (bool, error) {
// We use the outer context, not the timeout context, as we do not want
// to time out the condition function itself, only stop retrying once
// timeoutCtx's timeout has fired.
cnd, cndErr := c.f(ctx)
- if errors.Is(cndErr, wait.ErrWaitTimeout) {
+ if errors.Is(cndErr, wait.ErrorInterrupted(errors.New("timed out waiting for the condition"))) {
return cnd, fmt.Errorf("condition encountered internal timeout: %w", cndErr)
}
return cnd, cndErr
- }, timeoutCtx.Done())
+ })
if err != nil && !c.fail {
log.Warnf("step %s failed but has configured 'fail=%t'. Continuing. Error: %s", c, c.fail, err.Error())
return nil
}
- if errors.Is(err, wait.ErrWaitTimeout) {
+ if errors.Is(err, wait.ErrorInterrupted(errors.New("timed out waiting for the condition"))) {
return enrichConditionTimeoutError(c.f, err)
}
return err
diff --git a/pkg/util/steps/refreshing.go b/pkg/util/steps/refreshing.go
index c569ef6d4b4..7db94b5fb84 100644
--- a/pkg/util/steps/refreshing.go
+++ b/pkg/util/steps/refreshing.go
@@ -67,7 +67,7 @@ func (s *authorizationRefreshingActionStep) run(ctx context.Context, log *logrus
// Propagate the latest authorization error to the user,
// rather than timeout error from PollImmediateUntil.
- _ = wait.PollImmediateUntil(pollInterval, func() (bool, error) {
+ _ = wait.PollUntilContextCancel(timeoutCtx, pollInterval, true, func(ctx context.Context) (bool, error) {
// We use the outer context, not the timeout context, as we do not want
// to time out the condition function itself, only stop retrying once
// timeoutCtx's timeout has fired.
@@ -91,7 +91,7 @@ func (s *authorizationRefreshingActionStep) run(ctx context.Context, log *logrus
log.Printf("non-auth error, giving up: %v", err)
}
return true, err
- }, timeoutCtx.Done())
+ })
return CreateActionableError(err)
}
diff --git a/pkg/util/steps/runner_test.go b/pkg/util/steps/runner_test.go
index 1aa670ffce8..28a62f15085 100644
--- a/pkg/util/steps/runner_test.go
+++ b/pkg/util/steps/runner_test.go
@@ -14,8 +14,6 @@ import (
"github.com/sirupsen/logrus"
"go.uber.org/mock/gomock"
- "k8s.io/apimachinery/pkg/util/wait"
-
"github.com/Azure/ARO-RP/pkg/util/graph/graphsdk/models/odataerrors"
"github.com/Azure/ARO-RP/pkg/util/pointerutils"
utilerror "github.com/Azure/ARO-RP/test/util/error"
@@ -42,7 +40,7 @@ func timingOutCondition(ctx context.Context) (bool, error) {
return false, nil
}
func internalTimeoutCondition(ctx context.Context) (bool, error) {
- return false, wait.ErrWaitTimeout
+ return false, context.DeadlineExceeded
}
func currentTimeFunc() time.Time {
@@ -198,7 +196,7 @@ func TestStepRunner(t *testing.T) {
"level": gomega.Equal(logrus.InfoLevel),
},
{
- "msg": gomega.Equal("step [Condition pkg/util/steps.alwaysFalseCondition, timeout 50ms] failed but has configured 'fail=false'. Continuing. Error: timed out waiting for the condition"),
+ "msg": gomega.Equal("step [Condition pkg/util/steps.alwaysFalseCondition, timeout 50ms] failed but has configured 'fail=false'. Continuing. Error: context deadline exceeded"),
"level": gomega.Equal(logrus.WarnLevel),
},
{
@@ -231,11 +229,11 @@ func TestStepRunner(t *testing.T) {
"level": gomega.Equal(logrus.InfoLevel),
},
{
- "msg": gomega.Equal("step [Condition pkg/util/steps.timingOutCondition, timeout 50ms] encountered error: timed out waiting for the condition"),
+ "msg": gomega.Equal("step [Condition pkg/util/steps.timingOutCondition, timeout 50ms] encountered error: context deadline exceeded"),
"level": gomega.Equal(logrus.ErrorLevel),
},
},
- wantErr: "timed out waiting for the condition",
+ wantErr: "context deadline exceeded",
},
{
name: "A Condition that returns a timeout error causes a different failure from a timed out Condition",
@@ -261,11 +259,11 @@ func TestStepRunner(t *testing.T) {
"level": gomega.Equal(logrus.InfoLevel),
},
{
- "msg": gomega.Equal("step [Condition pkg/util/steps.internalTimeoutCondition, timeout 50ms] encountered error: condition encountered internal timeout: timed out waiting for the condition"),
+ "msg": gomega.Equal("step [Condition pkg/util/steps.internalTimeoutCondition, timeout 50ms] encountered error: context deadline exceeded"),
"level": gomega.Equal(logrus.ErrorLevel),
},
},
- wantErr: "condition encountered internal timeout: timed out waiting for the condition",
+ wantErr: "context deadline exceeded",
},
{
name: "A Condition that does not return true in the timeout time causes a failure",
@@ -286,11 +284,11 @@ func TestStepRunner(t *testing.T) {
"level": gomega.Equal(logrus.InfoLevel),
},
{
- "msg": gomega.Equal("step [Condition pkg/util/steps.alwaysFalseCondition, timeout 50ms] encountered error: timed out waiting for the condition"),
+ "msg": gomega.Equal("step [Condition pkg/util/steps.alwaysFalseCondition, timeout 50ms] encountered error: context deadline exceeded"),
"level": gomega.Equal(logrus.ErrorLevel),
},
},
- wantErr: "timed out waiting for the condition",
+ wantErr: "context deadline exceeded",
},
} {
t.Run(tt.name, func(t *testing.T) {
diff --git a/pkg/validate/dynamic/diskencryptionset.go b/pkg/validate/dynamic/diskencryptionset.go
index 72024aa7004..fc76df7379b 100644
--- a/pkg/validate/dynamic/diskencryptionset.go
+++ b/pkg/validate/dynamic/diskencryptionset.go
@@ -12,8 +12,6 @@ import (
"github.com/Azure/go-autorest/autorest"
"github.com/Azure/go-autorest/autorest/azure"
- "k8s.io/apimachinery/pkg/util/wait"
-
"github.com/Azure/ARO-RP/pkg/api"
)
@@ -79,15 +77,17 @@ func (dv *dynamic) validateDiskEncryptionSetPermissions(ctx context.Context, des
"Microsoft.Compute/diskEncryptionSets/read",
})
- if err == wait.ErrWaitTimeout {
- if dv.authorizerType == AuthorizerWorkloadIdentity {
- return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidWorkloadIdentityPermissions, path, fmt.Sprintf("The %s platform managed identity does not have required permissions on disk encryption set '%s'.", *operatorName, desr.String()))
+ if err != nil {
+ if err.Error() == context.Canceled.Error() {
+ if dv.authorizerType == AuthorizerWorkloadIdentity {
+ return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidWorkloadIdentityPermissions, path, fmt.Sprintf("The %s platform managed identity does not have required permissions on disk encryption set '%s'.", *operatorName, desr.String()))
+ }
+ return api.NewCloudError(http.StatusBadRequest, errCode, path, fmt.Sprintf("The %s service principal does not have Reader permission on disk encryption set '%s'.", dv.authorizerType, desr.String()))
+ }
+ if detailedErr, ok := err.(autorest.DetailedError); ok &&
+ detailedErr.StatusCode == http.StatusNotFound {
+ return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidLinkedDiskEncryptionSet, path, fmt.Sprintf("The disk encryption set '%s' could not be found.", desr.String()))
}
- return api.NewCloudError(http.StatusBadRequest, errCode, path, fmt.Sprintf("The %s service principal does not have Reader permission on disk encryption set '%s'.", dv.authorizerType, desr.String()))
- }
- if detailedErr, ok := err.(autorest.DetailedError); ok &&
- detailedErr.StatusCode == http.StatusNotFound {
- return api.NewCloudError(http.StatusBadRequest, api.CloudErrorCodeInvalidLinkedDiskEncryptionSet, path, fmt.Sprintf("The disk encryption set '%s' could not be found.", desr.String()))
}
return err
diff --git a/pkg/validate/dynamic/dynamic.go b/pkg/validate/dynamic/dynamic.go
index 02f2516fa0f..8c2128286f9 100644
--- a/pkg/validate/dynamic/dynamic.go
+++ b/pkg/validate/dynamic/dynamic.go
@@ -275,32 +275,32 @@ func (dv *dynamic) validateVnetPermissions(ctx context.Context, vnet azure.Resou
vnet.String(),
))
}
- }
-
- if err == wait.ErrWaitTimeout {
- return noPermissionsErr
- }
- if detailedErr, ok := err.(autorest.DetailedError); ok {
- dv.log.Error(detailedErr)
- switch detailedErr.StatusCode {
- case http.StatusNotFound:
- return api.NewCloudError(
- http.StatusBadRequest,
- api.CloudErrorCodeInvalidLinkedVNet,
- "",
- fmt.Sprintf(
- errMsgVnetNotFound,
- vnet.String(),
- ))
- case http.StatusForbidden:
- noPermissionsErr.Message = fmt.Sprintf(
- "%s\nOriginal error message: %s",
- noPermissionsErr.Message,
- detailedErr.Message,
- )
+ if err.Error() == context.Canceled.Error() {
return noPermissionsErr
}
+ if detailedErr, ok := err.(autorest.DetailedError); ok {
+ dv.log.Error(detailedErr)
+
+ switch detailedErr.StatusCode {
+ case http.StatusNotFound:
+ return api.NewCloudError(
+ http.StatusBadRequest,
+ api.CloudErrorCodeInvalidLinkedVNet,
+ "",
+ fmt.Sprintf(
+ errMsgVnetNotFound,
+ vnet.String(),
+ ))
+ case http.StatusForbidden:
+ noPermissionsErr.Message = fmt.Sprintf(
+ "%s\nOriginal error message: %s",
+ noPermissionsErr.Message,
+ detailedErr.Message,
+ )
+ return noPermissionsErr
+ }
+ }
}
return err
}
@@ -344,38 +344,40 @@ func (dv *dynamic) validateRouteTablePermissions(ctx context.Context, s Subnet)
"Microsoft.Network/routeTables/read",
"Microsoft.Network/routeTables/write",
})
- if err == wait.ErrWaitTimeout {
- if dv.authorizerType == AuthorizerWorkloadIdentity {
+ if err != nil {
+ if err.Error() == context.Canceled.Error() {
+ if dv.authorizerType == AuthorizerWorkloadIdentity {
+ return api.NewCloudError(
+ http.StatusBadRequest,
+ api.CloudErrorCodeInvalidWorkloadIdentityPermissions,
+ "",
+ fmt.Sprintf(
+ errMsgWIHasNoRequiredPermissionsOnRT,
+ *operatorName,
+ rtID,
+ ))
+ }
return api.NewCloudError(
http.StatusBadRequest,
- api.CloudErrorCodeInvalidWorkloadIdentityPermissions,
+ errCode,
"",
fmt.Sprintf(
- errMsgWIHasNoRequiredPermissionsOnRT,
- *operatorName,
+ errMsgSPHasNoRequiredPermissionsOnRT,
+ dv.authorizerType,
+ rtID,
+ ))
+ }
+ if detailedErr, ok := err.(autorest.DetailedError); ok &&
+ detailedErr.StatusCode == http.StatusNotFound {
+ return api.NewCloudError(
+ http.StatusBadRequest,
+ api.CloudErrorCodeInvalidLinkedRouteTable,
+ "",
+ fmt.Sprintf(
+ errMsgRTNotFound,
rtID,
))
}
- return api.NewCloudError(
- http.StatusBadRequest,
- errCode,
- "",
- fmt.Sprintf(
- errMsgSPHasNoRequiredPermissionsOnRT,
- dv.authorizerType,
- rtID,
- ))
- }
- if detailedErr, ok := err.(autorest.DetailedError); ok &&
- detailedErr.StatusCode == http.StatusNotFound {
- return api.NewCloudError(
- http.StatusBadRequest,
- api.CloudErrorCodeInvalidLinkedRouteTable,
- "",
- fmt.Sprintf(
- errMsgRTNotFound,
- rtID,
- ))
}
return err
}
@@ -423,38 +425,40 @@ func (dv *dynamic) validateNatGatewayPermissions(ctx context.Context, s Subnet)
"Microsoft.Network/natGateways/read",
"Microsoft.Network/natGateways/write",
})
- if err == wait.ErrWaitTimeout {
- if dv.authorizerType == AuthorizerWorkloadIdentity {
+ if err != nil {
+ if err.Error() == context.Canceled.Error() {
+ if dv.authorizerType == AuthorizerWorkloadIdentity {
+ return api.NewCloudError(
+ http.StatusBadRequest,
+ api.CloudErrorCodeInvalidWorkloadIdentityPermissions,
+ "",
+ fmt.Sprintf(
+ errMsgWIHasNoRequiredPermissionsOnNatGW,
+ *operatorName,
+ ngID,
+ ))
+ }
return api.NewCloudError(
http.StatusBadRequest,
- api.CloudErrorCodeInvalidWorkloadIdentityPermissions,
+ errCode,
"",
fmt.Sprintf(
- errMsgWIHasNoRequiredPermissionsOnNatGW,
- *operatorName,
+ errMsgSPHasNoRequiredPermissionsOnNatGW,
+ dv.authorizerType,
+ ngID,
+ ))
+ }
+ if detailedErr, ok := err.(autorest.DetailedError); ok &&
+ detailedErr.StatusCode == http.StatusNotFound {
+ return api.NewCloudError(
+ http.StatusBadRequest,
+ api.CloudErrorCodeInvalidLinkedNatGateway,
+ "",
+ fmt.Sprintf(
+ errMsgNatGWNotFound,
ngID,
))
}
- return api.NewCloudError(
- http.StatusBadRequest,
- errCode,
- "",
- fmt.Sprintf(
- errMsgSPHasNoRequiredPermissionsOnNatGW,
- dv.authorizerType,
- ngID,
- ))
- }
- if detailedErr, ok := err.(autorest.DetailedError); ok &&
- detailedErr.StatusCode == http.StatusNotFound {
- return api.NewCloudError(
- http.StatusBadRequest,
- api.CloudErrorCodeInvalidLinkedNatGateway,
- "",
- fmt.Sprintf(
- errMsgNatGWNotFound,
- ngID,
- ))
}
return err
}
@@ -469,7 +473,7 @@ func (dv *dynamic) validateActionsByOID(ctx context.Context, r *azure.Resource,
c := closure{dv: dv, ctx: ctx, resource: r, actions: actions, oid: oid}
- return wait.PollImmediateUntil(30*time.Second, c.usingCheckAccessV2, timeoutCtx.Done())
+ return wait.PollUntilContextCancel(timeoutCtx, 30*time.Second, true, c.usingCheckAccessV2)
}
// closure is the closure used in PollImmediateUntil's ConditionalFunc
@@ -501,7 +505,7 @@ func (c *closure) checkAccessAuthReqToken() error {
}
// usingCheckAccessV2 uses the new RBAC checkAccessV2 API
-func (c closure) usingCheckAccessV2() (result bool, err error) {
+func (c closure) usingCheckAccessV2(ctx context.Context) (result bool, err error) {
c.dv.log.Info("validateActions with CheckAccessV2")
var authReq *client.AuthorizationRequest
@@ -891,33 +895,34 @@ func (dv *dynamic) validateNSGPermissions(ctx context.Context, nsgID string) err
"Microsoft.Network/networkSecurityGroups/join/action",
})
- if err == wait.ErrWaitTimeout {
- errCode := api.CloudErrorCodeInvalidResourceProviderPermissions
- if dv.authorizerType == AuthorizerClusterServicePrincipal {
- errCode = api.CloudErrorCodeInvalidServicePrincipalPermissions
- } else if dv.authorizerType == AuthorizerWorkloadIdentity {
+ if err != nil {
+ if err.Error() == context.Canceled.Error() {
+ errCode := api.CloudErrorCodeInvalidResourceProviderPermissions
+ if dv.authorizerType == AuthorizerClusterServicePrincipal {
+ errCode = api.CloudErrorCodeInvalidServicePrincipalPermissions
+ } else if dv.authorizerType == AuthorizerWorkloadIdentity {
+ return api.NewCloudError(
+ http.StatusBadRequest,
+ api.CloudErrorCodeInvalidWorkloadIdentityPermissions,
+ "",
+ fmt.Sprintf(
+ errMsgWIHasNoRequiredPermissionsOnNSG,
+ *operatorName,
+ nsgID,
+ ))
+ }
return api.NewCloudError(
http.StatusBadRequest,
- api.CloudErrorCodeInvalidWorkloadIdentityPermissions,
+ errCode,
"",
fmt.Sprintf(
- errMsgWIHasNoRequiredPermissionsOnNSG,
- *operatorName,
+ errMsgSPHasNoRequiredPermissionsOnNSG,
+ dv.authorizerType,
+ *dv.appID,
nsgID,
))
}
- return api.NewCloudError(
- http.StatusBadRequest,
- errCode,
- "",
- fmt.Sprintf(
- errMsgSPHasNoRequiredPermissionsOnNSG,
- dv.authorizerType,
- *dv.appID,
- nsgID,
- ))
}
-
return err
}
diff --git a/pkg/validate/dynamic/platformworkloadidentityprofile_test.go b/pkg/validate/dynamic/platformworkloadidentityprofile_test.go
index 92d6c5c6f50..a52cd3d892f 100644
--- a/pkg/validate/dynamic/platformworkloadidentityprofile_test.go
+++ b/pkg/validate/dynamic/platformworkloadidentityprofile_test.go
@@ -201,7 +201,7 @@ func TestValidateClusterUserAssignedIdentity(t *testing.T) {
cancel()
}).Return(&msiNotAllowedActions, nil).AnyTimes()
},
- wantErr: "timed out waiting for the condition",
+ wantErr: "context canceled",
},
{
name: "Fail - An action is missing for a platform identity",
@@ -221,7 +221,7 @@ func TestValidateClusterUserAssignedIdentity(t *testing.T) {
cancel()
}).Return(&msiActionMissing, nil).AnyTimes()
},
- wantErr: "timed out waiting for the condition",
+ wantErr: "context canceled",
},
} {
t.Run(tt.name, func(t *testing.T) {
diff --git a/test/e2e/cluster.go b/test/e2e/cluster.go
index 85323810a46..b64b8358f20 100644
--- a/test/e2e/cluster.go
+++ b/test/e2e/cluster.go
@@ -331,7 +331,7 @@ func createStatefulSet(ctx context.Context, cli kubernetes.Interface, namespace,
corev1.ReadWriteOnce,
},
StorageClassName: to.StringPtr(storageClass),
- Resources: corev1.ResourceRequirements{
+ Resources: corev1.VolumeResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceStorage: pvcStorage,
},
diff --git a/test/util/clienthelper/hookclient.go b/test/util/clienthelper/hookclient.go
index 2cfceacfe7a..68a584768d7 100644
--- a/test/util/clienthelper/hookclient.go
+++ b/test/util/clienthelper/hookclient.go
@@ -8,6 +8,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
+ "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/watch"
"sigs.k8s.io/controller-runtime/pkg/client"
)
@@ -31,6 +32,9 @@ type HookingClient struct {
postPatchHook []hookFunc
}
+type HookingSubResourceClient struct {
+}
+
var _ client.Client = &HookingClient{}
// NewHookingClient creates a client which allows hooks to be added before and
@@ -105,7 +109,7 @@ func (c *HookingClient) WithPrePatchHook(f hookFunc) *HookingClient {
}
// See [sigs.k8s.io/controller-runtime/pkg/client.Reader.Get]
-func (c *HookingClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object) error {
+func (c *HookingClient) Get(ctx context.Context, key client.ObjectKey, obj client.Object, opts ...client.GetOption) error {
for _, h := range c.preGetHook {
err := h(key, obj)
if err != nil {
@@ -160,6 +164,18 @@ func (c *HookingClient) Create(ctx context.Context, obj client.Object, opts ...c
return nil
}
+func (c *HookingClient) GroupVersionKindFor(obj runtime.Object) (schema.GroupVersionKind, error) {
+ return c.f.GroupVersionKindFor(obj)
+}
+
+func (c *HookingClient) IsObjectNamespaced(obj runtime.Object) (bool, error) {
+ return c.f.IsObjectNamespaced(obj)
+}
+
+func (c *HookingClient) SubResource(input string) client.SubResourceClient {
+ return c.f.SubResource(input)
+}
+
// See [sigs.k8s.io/controller-runtime/pkg/client.Writer.Delete]
func (c *HookingClient) Delete(ctx context.Context, obj client.Object, opts ...client.DeleteOption) error {
for _, h := range c.preDeleteHook {
diff --git a/test/util/kubeadminkubeconfig/kubeconfig.go b/test/util/kubeadminkubeconfig/kubeconfig.go
index 54d46d98013..94908dc0227 100644
--- a/test/util/kubeadminkubeconfig/kubeconfig.go
+++ b/test/util/kubeadminkubeconfig/kubeconfig.go
@@ -48,7 +48,7 @@ func Get(ctx context.Context, log *logrus.Entry, env env.Core, authorizer autore
timeoutCtx, cancel := context.WithTimeout(ctx, 5*time.Minute)
defer cancel()
- err = wait.PollImmediateUntil(time.Second, func() (bool, error) {
+ err = wait.PollUntilContextCancel(timeoutCtx, time.Second, true, func(ctx context.Context) (bool, error) {
token, err = getAuthorizedToken(ctx, tokenURL, *creds.KubeadminUsername, *creds.KubeadminPassword)
if err != nil {
log.Print(err)
@@ -56,7 +56,7 @@ func Get(ctx context.Context, log *logrus.Entry, env env.Core, authorizer autore
}
return true, nil
- }, timeoutCtx.Done())
+ })
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/LICENSE b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/LICENSE
similarity index 100%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/LICENSE
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/LICENSE
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/antlrdoc.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/antlrdoc.go
new file mode 100644
index 00000000000..ab51212676f
--- /dev/null
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/antlrdoc.go
@@ -0,0 +1,68 @@
+/*
+Package antlr implements the Go version of the ANTLR 4 runtime.
+
+# The ANTLR Tool
+
+ANTLR (ANother Tool for Language Recognition) is a powerful parser generator for reading, processing, executing,
+or translating structured text or binary files. It's widely used to build languages, tools, and frameworks.
+From a grammar, ANTLR generates a parser that can build parse trees and also generates a listener interface
+(or visitor) that makes it easy to respond to the recognition of phrases of interest.
+
+# Code Generation
+
+ANTLR supports the generation of code in a number of [target languages], and the generated code is supported by a
+runtime library, written specifically to support the generated code in the target language. This library is the
+runtime for the Go target.
+
+To generate code for the go target, it is generally recommended to place the source grammar files in a package of
+their own, and use the `.sh` script method of generating code, using the go generate directive. In that same directory
+it is usual, though not required, to place the antlr tool that should be used to generate the code. That does mean
+that the antlr tool JAR file will be checked in to your source code control though, so you are free to use any other
+way of specifying the version of the ANTLR tool to use, such as aliasing in `.zshrc` or equivalent, or a profile in
+your IDE, or configuration in your CI system.
+
+Here is a general template for an ANTLR based recognizer in Go:
+
+ .
+ ├── myproject
+ ├── parser
+ │ ├── mygrammar.g4
+ │ ├── antlr-4.12.0-complete.jar
+ │ ├── error_listeners.go
+ │ ├── generate.go
+ │ ├── generate.sh
+ ├── go.mod
+ ├── go.sum
+ ├── main.go
+ └── main_test.go
+
+Make sure that the package statement in your grammar file(s) reflects the go package they exist in.
+The generate.go file then looks like this:
+
+ package parser
+
+ //go:generate ./generate.sh
+
+And the generate.sh file will look similar to this:
+
+ #!/bin/sh
+
+ alias antlr4='java -Xmx500M -cp "./antlr4-4.12.0-complete.jar:$CLASSPATH" org.antlr.v4.Tool'
+ antlr4 -Dlanguage=Go -no-visitor -package parser *.g4
+
+depending on whether you want visitors or listeners or any other ANTLR options.
+
+From the command line at the root of your package “myproject” you can then simply issue the command:
+
+ go generate ./...
+
+# Copyright Notice
+
+Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
+
+Use of this file is governed by the BSD 3-clause license, which can be found in the [LICENSE.txt] file in the project root.
+
+[target languages]: https://github.com/antlr/antlr4/tree/master/runtime
+[LICENSE.txt]: https://github.com/antlr/antlr4/blob/master/LICENSE.txt
+*/
+package antlr
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn.go
similarity index 72%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn.go
index a4e2079e656..98010d2e6e6 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -6,11 +6,24 @@ package antlr
import "sync"
+// ATNInvalidAltNumber is used to represent an ALT number that has yet to be calculated or
+// which is invalid for a particular struct such as [*antlr.BaseRuleContext]
var ATNInvalidAltNumber int
+// ATN represents an “[Augmented Transition Network]”, though general in ANTLR the term
+// “Augmented Recursive Transition Network” though there are some descriptions of “[Recursive Transition Network]”
+// in existence.
+//
+// ATNs represent the main networks in the system and are serialized by the code generator and support [ALL(*)].
+//
+// [Augmented Transition Network]: https://en.wikipedia.org/wiki/Augmented_transition_network
+// [ALL(*)]: https://www.antlr.org/papers/allstar-techreport.pdf
+// [Recursive Transition Network]: https://en.wikipedia.org/wiki/Recursive_transition_network
type ATN struct {
// DecisionToState is the decision points for all rules, subrules, optional
- // blocks, ()+, ()*, etc. Used to build DFA predictors for them.
+ // blocks, ()+, ()*, etc. Each subrule/rule is a decision point, and we must track them so we
+ // can go back later and build DFA predictors for them. This includes
+ // all the rules, subrules, optional blocks, ()+, ()* etc...
DecisionToState []DecisionState
// grammarType is the ATN type and is used for deserializing ATNs from strings.
@@ -45,6 +58,8 @@ type ATN struct {
edgeMu sync.RWMutex
}
+// NewATN returns a new ATN struct representing the given grammarType and is used
+// for runtime deserialization of ATNs from the code generated by the ANTLR tool
func NewATN(grammarType int, maxTokenType int) *ATN {
return &ATN{
grammarType: grammarType,
@@ -53,7 +68,7 @@ func NewATN(grammarType int, maxTokenType int) *ATN {
}
}
-// NextTokensInContext computes the set of valid tokens that can occur starting
+// NextTokensInContext computes and returns the set of valid tokens that can occur starting
// in state s. If ctx is nil, the set of tokens will not include what can follow
// the rule surrounding s. In other words, the set will be restricted to tokens
// reachable staying within the rule of s.
@@ -61,8 +76,8 @@ func (a *ATN) NextTokensInContext(s ATNState, ctx RuleContext) *IntervalSet {
return NewLL1Analyzer(a).Look(s, nil, ctx)
}
-// NextTokensNoContext computes the set of valid tokens that can occur starting
-// in s and staying in same rule. Token.EPSILON is in set if we reach end of
+// NextTokensNoContext computes and returns the set of valid tokens that can occur starting
+// in state s and staying in same rule. [antlr.Token.EPSILON] is in set if we reach end of
// rule.
func (a *ATN) NextTokensNoContext(s ATNState) *IntervalSet {
a.mu.Lock()
@@ -76,6 +91,8 @@ func (a *ATN) NextTokensNoContext(s ATNState) *IntervalSet {
return iset
}
+// NextTokens computes and returns the set of valid tokens starting in state s, by
+// calling either [NextTokensNoContext] (ctx == nil) or [NextTokensInContext] (ctx != nil).
func (a *ATN) NextTokens(s ATNState, ctx RuleContext) *IntervalSet {
if ctx == nil {
return a.NextTokensNoContext(s)
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_config.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_config.go
similarity index 84%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_config.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_config.go
index 97ba417f74f..7619fa172ed 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_config.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_config.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -8,19 +8,14 @@ import (
"fmt"
)
-type comparable interface {
- equals(other interface{}) bool
-}
-
// ATNConfig is a tuple: (ATN state, predicted alt, syntactic, semantic
// context). The syntactic context is a graph-structured stack node whose
// path(s) to the root is the rule invocation(s) chain used to arrive at the
// state. The semantic context is the tree of semantic predicates encountered
// before reaching an ATN state.
type ATNConfig interface {
- comparable
-
- hash() int
+ Equals(o Collectable[ATNConfig]) bool
+ Hash() int
GetState() ATNState
GetAlt() int
@@ -47,7 +42,7 @@ type BaseATNConfig struct {
reachesIntoOuterContext int
}
-func NewBaseATNConfig7(old *BaseATNConfig) *BaseATNConfig { // TODO: Dup
+func NewBaseATNConfig7(old *BaseATNConfig) ATNConfig { // TODO: Dup
return &BaseATNConfig{
state: old.state,
alt: old.alt,
@@ -135,11 +130,16 @@ func (b *BaseATNConfig) SetReachesIntoOuterContext(v int) {
b.reachesIntoOuterContext = v
}
+// Equals is the default comparison function for an ATNConfig when no specialist implementation is required
+// for a collection.
+//
// An ATN configuration is equal to another if both have the same state, they
// predict the same alternative, and syntactic/semantic contexts are the same.
-func (b *BaseATNConfig) equals(o interface{}) bool {
+func (b *BaseATNConfig) Equals(o Collectable[ATNConfig]) bool {
if b == o {
return true
+ } else if o == nil {
+ return false
}
var other, ok = o.(*BaseATNConfig)
@@ -153,30 +153,32 @@ func (b *BaseATNConfig) equals(o interface{}) bool {
if b.context == nil {
equal = other.context == nil
} else {
- equal = b.context.equals(other.context)
+ equal = b.context.Equals(other.context)
}
var (
nums = b.state.GetStateNumber() == other.state.GetStateNumber()
alts = b.alt == other.alt
- cons = b.semanticContext.equals(other.semanticContext)
+ cons = b.semanticContext.Equals(other.semanticContext)
sups = b.precedenceFilterSuppressed == other.precedenceFilterSuppressed
)
return nums && alts && cons && sups && equal
}
-func (b *BaseATNConfig) hash() int {
+// Hash is the default hash function for BaseATNConfig, when no specialist hash function
+// is required for a collection
+func (b *BaseATNConfig) Hash() int {
var c int
if b.context != nil {
- c = b.context.hash()
+ c = b.context.Hash()
}
h := murmurInit(7)
h = murmurUpdate(h, b.state.GetStateNumber())
h = murmurUpdate(h, b.alt)
h = murmurUpdate(h, c)
- h = murmurUpdate(h, b.semanticContext.hash())
+ h = murmurUpdate(h, b.semanticContext.Hash())
return murmurFinish(h, 4)
}
@@ -243,7 +245,9 @@ func NewLexerATNConfig1(state ATNState, alt int, context PredictionContext) *Lex
return &LexerATNConfig{BaseATNConfig: NewBaseATNConfig5(state, alt, context, SemanticContextNone)}
}
-func (l *LexerATNConfig) hash() int {
+// Hash is the default hash function for LexerATNConfig objects, it can be used directly or via
+// the default comparator [ObjEqComparator].
+func (l *LexerATNConfig) Hash() int {
var f int
if l.passedThroughNonGreedyDecision {
f = 1
@@ -253,15 +257,20 @@ func (l *LexerATNConfig) hash() int {
h := murmurInit(7)
h = murmurUpdate(h, l.state.GetStateNumber())
h = murmurUpdate(h, l.alt)
- h = murmurUpdate(h, l.context.hash())
- h = murmurUpdate(h, l.semanticContext.hash())
+ h = murmurUpdate(h, l.context.Hash())
+ h = murmurUpdate(h, l.semanticContext.Hash())
h = murmurUpdate(h, f)
- h = murmurUpdate(h, l.lexerActionExecutor.hash())
+ h = murmurUpdate(h, l.lexerActionExecutor.Hash())
h = murmurFinish(h, 6)
return h
}
-func (l *LexerATNConfig) equals(other interface{}) bool {
+// Equals is the default comparison function for LexerATNConfig objects, it can be used directly or via
+// the default comparator [ObjEqComparator].
+func (l *LexerATNConfig) Equals(other Collectable[ATNConfig]) bool {
+ if l == other {
+ return true
+ }
var othert, ok = other.(*LexerATNConfig)
if l == other {
@@ -275,7 +284,7 @@ func (l *LexerATNConfig) equals(other interface{}) bool {
var b bool
if l.lexerActionExecutor != nil {
- b = !l.lexerActionExecutor.equals(othert.lexerActionExecutor)
+ b = !l.lexerActionExecutor.Equals(othert.lexerActionExecutor)
} else {
b = othert.lexerActionExecutor != nil
}
@@ -284,10 +293,9 @@ func (l *LexerATNConfig) equals(other interface{}) bool {
return false
}
- return l.BaseATNConfig.equals(othert.BaseATNConfig)
+ return l.BaseATNConfig.Equals(othert.BaseATNConfig)
}
-
func checkNonGreedyDecision(source *LexerATNConfig, target ATNState) bool {
var ds, ok = target.(DecisionState)
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_config_set.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_config_set.go
similarity index 81%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_config_set.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_config_set.go
index 49ad4a7197a..43e9b33f3bd 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_config_set.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_config_set.go
@@ -1,24 +1,25 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
package antlr
-import "fmt"
+import (
+ "fmt"
+)
type ATNConfigSet interface {
- hash() int
+ Hash() int
+ Equals(o Collectable[ATNConfig]) bool
Add(ATNConfig, *DoubleDict) bool
AddAll([]ATNConfig) bool
- GetStates() Set
+ GetStates() *JStore[ATNState, Comparator[ATNState]]
GetPredicates() []SemanticContext
GetItems() []ATNConfig
OptimizeConfigs(interpreter *BaseATNSimulator)
- Equals(other interface{}) bool
-
Length() int
IsEmpty() bool
Contains(ATNConfig) bool
@@ -57,7 +58,7 @@ type BaseATNConfigSet struct {
// effectively doubles the number of objects associated with ATNConfigs. All
// keys are hashed by (s, i, _, pi), not including the context. Wiped out when
// read-only because a set becomes a DFA state.
- configLookup Set
+ configLookup *JStore[ATNConfig, Comparator[ATNConfig]]
// configs is the added elements.
configs []ATNConfig
@@ -83,7 +84,7 @@ type BaseATNConfigSet struct {
// readOnly is whether it is read-only. Do not
// allow any code to manipulate the set if true because DFA states will point at
- // sets and those must not change. It not protect other fields; conflictingAlts
+ // sets and those must not change. It not, protect other fields; conflictingAlts
// in particular, which is assigned after readOnly.
readOnly bool
@@ -104,7 +105,7 @@ func (b *BaseATNConfigSet) Alts() *BitSet {
func NewBaseATNConfigSet(fullCtx bool) *BaseATNConfigSet {
return &BaseATNConfigSet{
cachedHash: -1,
- configLookup: newArray2DHashSetWithCap(hashATNConfig, equalATNConfigs, 16, 2),
+ configLookup: NewJStore[ATNConfig, Comparator[ATNConfig]](aConfCompInst),
fullCtx: fullCtx,
}
}
@@ -126,9 +127,11 @@ func (b *BaseATNConfigSet) Add(config ATNConfig, mergeCache *DoubleDict) bool {
b.dipsIntoOuterContext = true
}
- existing := b.configLookup.Add(config).(ATNConfig)
+ existing, present := b.configLookup.Put(config)
- if existing == config {
+ // The config was not already in the set
+ //
+ if !present {
b.cachedHash = -1
b.configs = append(b.configs, config) // Track order here
return true
@@ -154,11 +157,14 @@ func (b *BaseATNConfigSet) Add(config ATNConfig, mergeCache *DoubleDict) bool {
return true
}
-func (b *BaseATNConfigSet) GetStates() Set {
- states := newArray2DHashSet(nil, nil)
+func (b *BaseATNConfigSet) GetStates() *JStore[ATNState, Comparator[ATNState]] {
+
+ // states uses the standard comparator provided by the ATNState instance
+ //
+ states := NewJStore[ATNState, Comparator[ATNState]](aStateEqInst)
for i := 0; i < len(b.configs); i++ {
- states.Add(b.configs[i].GetState())
+ states.Put(b.configs[i].GetState())
}
return states
@@ -214,7 +220,34 @@ func (b *BaseATNConfigSet) AddAll(coll []ATNConfig) bool {
return false
}
-func (b *BaseATNConfigSet) Equals(other interface{}) bool {
+// Compare is a hack function just to verify that adding DFAstares to the known
+// set works, so long as comparison of ATNConfigSet s works. For that to work, we
+// need to make sure that the set of ATNConfigs in two sets are equivalent. We can't
+// know the order, so we do this inefficient hack. If this proves the point, then
+// we can change the config set to a better structure.
+func (b *BaseATNConfigSet) Compare(bs *BaseATNConfigSet) bool {
+ if len(b.configs) != len(bs.configs) {
+ return false
+ }
+
+ for _, c := range b.configs {
+ found := false
+ for _, c2 := range bs.configs {
+ if c.Equals(c2) {
+ found = true
+ break
+ }
+ }
+
+ if !found {
+ return false
+ }
+
+ }
+ return true
+}
+
+func (b *BaseATNConfigSet) Equals(other Collectable[ATNConfig]) bool {
if b == other {
return true
} else if _, ok := other.(*BaseATNConfigSet); !ok {
@@ -224,15 +257,15 @@ func (b *BaseATNConfigSet) Equals(other interface{}) bool {
other2 := other.(*BaseATNConfigSet)
return b.configs != nil &&
- // TODO: b.configs.equals(other2.configs) && // TODO: Is b necessary?
b.fullCtx == other2.fullCtx &&
b.uniqueAlt == other2.uniqueAlt &&
b.conflictingAlts == other2.conflictingAlts &&
b.hasSemanticContext == other2.hasSemanticContext &&
- b.dipsIntoOuterContext == other2.dipsIntoOuterContext
+ b.dipsIntoOuterContext == other2.dipsIntoOuterContext &&
+ b.Compare(other2)
}
-func (b *BaseATNConfigSet) hash() int {
+func (b *BaseATNConfigSet) Hash() int {
if b.readOnly {
if b.cachedHash == -1 {
b.cachedHash = b.hashCodeConfigs()
@@ -247,7 +280,7 @@ func (b *BaseATNConfigSet) hash() int {
func (b *BaseATNConfigSet) hashCodeConfigs() int {
h := 1
for _, config := range b.configs {
- h = 31*h + config.hash()
+ h = 31*h + config.Hash()
}
return h
}
@@ -283,7 +316,7 @@ func (b *BaseATNConfigSet) Clear() {
b.configs = make([]ATNConfig, 0)
b.cachedHash = -1
- b.configLookup = newArray2DHashSet(nil, equalATNConfigs)
+ b.configLookup = NewJStore[ATNConfig, Comparator[ATNConfig]](atnConfCompInst)
}
func (b *BaseATNConfigSet) FullContext() bool {
@@ -365,7 +398,8 @@ type OrderedATNConfigSet struct {
func NewOrderedATNConfigSet() *OrderedATNConfigSet {
b := NewBaseATNConfigSet(false)
- b.configLookup = newArray2DHashSet(nil, nil)
+ // This set uses the standard Hash() and Equals() from ATNConfig
+ b.configLookup = NewJStore[ATNConfig, Comparator[ATNConfig]](aConfEqInst)
return &OrderedATNConfigSet{BaseATNConfigSet: b}
}
@@ -375,7 +409,7 @@ func hashATNConfig(i interface{}) int {
hash := 7
hash = 31*hash + o.GetState().GetStateNumber()
hash = 31*hash + o.GetAlt()
- hash = 31*hash + o.GetSemanticContext().hash()
+ hash = 31*hash + o.GetSemanticContext().Hash()
return hash
}
@@ -403,5 +437,5 @@ func equalATNConfigs(a, b interface{}) bool {
return false
}
- return ai.GetSemanticContext().equals(bi.GetSemanticContext())
+ return ai.GetSemanticContext().Equals(bi.GetSemanticContext())
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_deserialization_options.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_deserialization_options.go
similarity index 96%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_deserialization_options.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_deserialization_options.go
index cb8eafb0b2a..3c975ec7bfd 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_deserialization_options.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_deserialization_options.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_deserializer.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_deserializer.go
similarity index 99%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_deserializer.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_deserializer.go
index aea9bbfa936..3888856b4b6 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_deserializer.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_deserializer.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_simulator.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_simulator.go
similarity index 94%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_simulator.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_simulator.go
index d5454d6d5dd..41529115fa6 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_simulator.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_simulator.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_state.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_state.go
similarity index 97%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_state.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_state.go
index 3835bb2e931..1f2a56bc311 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_state.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_state.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -49,7 +49,8 @@ type ATNState interface {
AddTransition(Transition, int)
String() string
- hash() int
+ Hash() int
+ Equals(Collectable[ATNState]) bool
}
type BaseATNState struct {
@@ -123,7 +124,7 @@ func (as *BaseATNState) SetNextTokenWithinRule(v *IntervalSet) {
as.NextTokenWithinRule = v
}
-func (as *BaseATNState) hash() int {
+func (as *BaseATNState) Hash() int {
return as.stateNumber
}
@@ -131,7 +132,7 @@ func (as *BaseATNState) String() string {
return strconv.Itoa(as.stateNumber)
}
-func (as *BaseATNState) equals(other interface{}) bool {
+func (as *BaseATNState) Equals(other Collectable[ATNState]) bool {
if ot, ok := other.(ATNState); ok {
return as.stateNumber == ot.GetStateNumber()
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_type.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_type.go
similarity index 79%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_type.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_type.go
index a7b48976b31..3a515a145f4 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/atn_type.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn_type.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/char_stream.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/char_stream.go
similarity index 82%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/char_stream.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/char_stream.go
index 70c1207f7ff..c33f0adb5e1 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/char_stream.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/char_stream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/common_token_factory.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/common_token_factory.go
similarity index 96%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/common_token_factory.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/common_token_factory.go
index 330ff8f31f8..1bb0314ea09 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/common_token_factory.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/common_token_factory.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/common_token_stream.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/common_token_stream.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/common_token_stream.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/common_token_stream.go
index c90e9b8904c..c6c9485a20a 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/common_token_stream.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/common_token_stream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -331,10 +331,12 @@ func (c *CommonTokenStream) GetTextFromRuleContext(interval RuleContext) string
func (c *CommonTokenStream) GetTextFromInterval(interval *Interval) string {
c.lazyInit()
- c.Fill()
if interval == nil {
+ c.Fill()
interval = NewInterval(0, len(c.tokens)-1)
+ } else {
+ c.Sync(interval.Stop)
}
start := interval.Start
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/comparators.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/comparators.go
new file mode 100644
index 00000000000..9ea3200536a
--- /dev/null
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/comparators.go
@@ -0,0 +1,147 @@
+package antlr
+
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
+// Use of this file is governed by the BSD 3-clause license that
+// can be found in the LICENSE.txt file in the project root.
+
+// This file contains all the implementations of custom comparators used for generic collections when the
+// Hash() and Equals() funcs supplied by the struct objects themselves need to be overridden. Normally, we would
+// put the comparators in the source file for the struct themselves, but given the organization of this code is
+// sorta kinda based upon the Java code, I found it confusing trying to find out which comparator was where and used by
+// which instantiation of a collection. For instance, an Array2DHashSet in the Java source, when used with ATNConfig
+// collections requires three different comparators depending on what the collection is being used for. Collecting - pun intended -
+// all the comparators here, makes it much easier to see which implementation of hash and equals is used by which collection.
+// It also makes it easy to verify that the Hash() and Equals() functions marry up with the Java implementations.
+
+// ObjEqComparator is the equivalent of the Java ObjectEqualityComparator, which is the default instance of
+// Equality comparator. We do not have inheritance in Go, only interfaces, so we use generics to enforce some
+// type safety and avoid having to implement this for every type that we want to perform comparison on.
+//
+// This comparator works by using the standard Hash() and Equals() methods of the type T that is being compared. Which
+// allows us to use it in any collection instance that does nto require a special hash or equals implementation.
+type ObjEqComparator[T Collectable[T]] struct{}
+
+var (
+ aStateEqInst = &ObjEqComparator[ATNState]{}
+ aConfEqInst = &ObjEqComparator[ATNConfig]{}
+ aConfCompInst = &ATNConfigComparator[ATNConfig]{}
+ atnConfCompInst = &BaseATNConfigComparator[ATNConfig]{}
+ dfaStateEqInst = &ObjEqComparator[*DFAState]{}
+ semctxEqInst = &ObjEqComparator[SemanticContext]{}
+ atnAltCfgEqInst = &ATNAltConfigComparator[ATNConfig]{}
+)
+
+// Equals2 delegates to the Equals() method of type T
+func (c *ObjEqComparator[T]) Equals2(o1, o2 T) bool {
+ return o1.Equals(o2)
+}
+
+// Hash1 delegates to the Hash() method of type T
+func (c *ObjEqComparator[T]) Hash1(o T) int {
+
+ return o.Hash()
+}
+
+type SemCComparator[T Collectable[T]] struct{}
+
+// ATNConfigComparator is used as the compartor for the configLookup field of an ATNConfigSet
+// and has a custom Equals() and Hash() implementation, because equality is not based on the
+// standard Hash() and Equals() methods of the ATNConfig type.
+type ATNConfigComparator[T Collectable[T]] struct {
+}
+
+// Equals2 is a custom comparator for ATNConfigs specifically for configLookup
+func (c *ATNConfigComparator[T]) Equals2(o1, o2 ATNConfig) bool {
+
+ // Same pointer, must be equal, even if both nil
+ //
+ if o1 == o2 {
+ return true
+
+ }
+
+ // If either are nil, but not both, then the result is false
+ //
+ if o1 == nil || o2 == nil {
+ return false
+ }
+
+ return o1.GetState().GetStateNumber() == o2.GetState().GetStateNumber() &&
+ o1.GetAlt() == o2.GetAlt() &&
+ o1.GetSemanticContext().Equals(o2.GetSemanticContext())
+}
+
+// Hash1 is custom hash implementation for ATNConfigs specifically for configLookup
+func (c *ATNConfigComparator[T]) Hash1(o ATNConfig) int {
+ hash := 7
+ hash = 31*hash + o.GetState().GetStateNumber()
+ hash = 31*hash + o.GetAlt()
+ hash = 31*hash + o.GetSemanticContext().Hash()
+ return hash
+}
+
+// ATNAltConfigComparator is used as the comparator for mapping configs to Alt Bitsets
+type ATNAltConfigComparator[T Collectable[T]] struct {
+}
+
+// Equals2 is a custom comparator for ATNConfigs specifically for configLookup
+func (c *ATNAltConfigComparator[T]) Equals2(o1, o2 ATNConfig) bool {
+
+ // Same pointer, must be equal, even if both nil
+ //
+ if o1 == o2 {
+ return true
+
+ }
+
+ // If either are nil, but not both, then the result is false
+ //
+ if o1 == nil || o2 == nil {
+ return false
+ }
+
+ return o1.GetState().GetStateNumber() == o2.GetState().GetStateNumber() &&
+ o1.GetContext().Equals(o2.GetContext())
+}
+
+// Hash1 is custom hash implementation for ATNConfigs specifically for configLookup
+func (c *ATNAltConfigComparator[T]) Hash1(o ATNConfig) int {
+ h := murmurInit(7)
+ h = murmurUpdate(h, o.GetState().GetStateNumber())
+ h = murmurUpdate(h, o.GetContext().Hash())
+ return murmurFinish(h, 2)
+}
+
+// BaseATNConfigComparator is used as the comparator for the configLookup field of a BaseATNConfigSet
+// and has a custom Equals() and Hash() implementation, because equality is not based on the
+// standard Hash() and Equals() methods of the ATNConfig type.
+type BaseATNConfigComparator[T Collectable[T]] struct {
+}
+
+// Equals2 is a custom comparator for ATNConfigs specifically for baseATNConfigSet
+func (c *BaseATNConfigComparator[T]) Equals2(o1, o2 ATNConfig) bool {
+
+ // Same pointer, must be equal, even if both nil
+ //
+ if o1 == o2 {
+ return true
+
+ }
+
+ // If either are nil, but not both, then the result is false
+ //
+ if o1 == nil || o2 == nil {
+ return false
+ }
+
+ return o1.GetState().GetStateNumber() == o2.GetState().GetStateNumber() &&
+ o1.GetAlt() == o2.GetAlt() &&
+ o1.GetSemanticContext().Equals(o2.GetSemanticContext())
+}
+
+// Hash1 is custom hash implementation for ATNConfigs specifically for configLookup, but in fact just
+// delegates to the standard Hash() method of the ATNConfig type.
+func (c *BaseATNConfigComparator[T]) Hash1(o ATNConfig) int {
+
+ return o.Hash()
+}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa.go
similarity index 80%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa.go
index d55a2a87d5d..bfd43e1f731 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa.go
@@ -1,13 +1,9 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
package antlr
-import (
- "sort"
-)
-
type DFA struct {
// atnStartState is the ATN state in which this was created
atnStartState DecisionState
@@ -15,8 +11,15 @@ type DFA struct {
decision int
// states is all the DFA states. Use Map to get the old state back; Set can only
- // indicate whether it is there.
- states map[int]*DFAState
+ // indicate whether it is there. Go maps implement key hash collisions and so on and are very
+ // good, but the DFAState is an object and can't be used directly as the key as it can in say JAva
+ // amd C#, whereby if the hashcode is the same for two objects, then Equals() is called against them
+ // to see if they really are the same object.
+ //
+ //
+ states *JStore[*DFAState, *ObjEqComparator[*DFAState]]
+
+ numstates int
s0 *DFAState
@@ -29,7 +32,7 @@ func NewDFA(atnStartState DecisionState, decision int) *DFA {
dfa := &DFA{
atnStartState: atnStartState,
decision: decision,
- states: make(map[int]*DFAState),
+ states: NewJStore[*DFAState, *ObjEqComparator[*DFAState]](dfaStateEqInst),
}
if s, ok := atnStartState.(*StarLoopEntryState); ok && s.precedenceRuleDecision {
dfa.precedenceDfa = true
@@ -92,7 +95,8 @@ func (d *DFA) getPrecedenceDfa() bool {
// true or nil otherwise, and d.precedenceDfa is updated.
func (d *DFA) setPrecedenceDfa(precedenceDfa bool) {
if d.getPrecedenceDfa() != precedenceDfa {
- d.setStates(make(map[int]*DFAState))
+ d.states = NewJStore[*DFAState, *ObjEqComparator[*DFAState]](dfaStateEqInst)
+ d.numstates = 0
if precedenceDfa {
precedenceState := NewDFAState(-1, NewBaseATNConfigSet(false))
@@ -117,38 +121,12 @@ func (d *DFA) setS0(s *DFAState) {
d.s0 = s
}
-func (d *DFA) getState(hash int) (*DFAState, bool) {
- s, ok := d.states[hash]
- return s, ok
-}
-
-func (d *DFA) setStates(states map[int]*DFAState) {
- d.states = states
-}
-
-func (d *DFA) setState(hash int, state *DFAState) {
- d.states[hash] = state
-}
-
-func (d *DFA) numStates() int {
- return len(d.states)
-}
-
-type dfaStateList []*DFAState
-
-func (d dfaStateList) Len() int { return len(d) }
-func (d dfaStateList) Less(i, j int) bool { return d[i].stateNumber < d[j].stateNumber }
-func (d dfaStateList) Swap(i, j int) { d[i], d[j] = d[j], d[i] }
-
// sortedStates returns the states in d sorted by their state number.
func (d *DFA) sortedStates() []*DFAState {
- vs := make([]*DFAState, 0, len(d.states))
-
- for _, v := range d.states {
- vs = append(vs, v)
- }
- sort.Sort(dfaStateList(vs))
+ vs := d.states.SortedSlice(func(i, j *DFAState) bool {
+ return i.stateNumber < j.stateNumber
+ })
return vs
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa_serializer.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa_serializer.go
similarity index 97%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa_serializer.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa_serializer.go
index bf2ccc06cd1..84d0a31e536 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa_serializer.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa_serializer.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa_state.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa_state.go
similarity index 90%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa_state.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa_state.go
index 970ed19865a..c90dec55c86 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/dfa_state.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/dfa_state.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -90,16 +90,16 @@ func NewDFAState(stateNumber int, configs ATNConfigSet) *DFAState {
}
// GetAltSet gets the set of all alts mentioned by all ATN configurations in d.
-func (d *DFAState) GetAltSet() Set {
- alts := newArray2DHashSet(nil, nil)
+func (d *DFAState) GetAltSet() []int {
+ var alts []int
if d.configs != nil {
for _, c := range d.configs.GetItems() {
- alts.Add(c.GetAlt())
+ alts = append(alts, c.GetAlt())
}
}
- if alts.Len() == 0 {
+ if len(alts) == 0 {
return nil
}
@@ -130,27 +130,6 @@ func (d *DFAState) setPrediction(v int) {
d.prediction = v
}
-// equals returns whether d equals other. Two DFAStates are equal if their ATN
-// configuration sets are the same. This method is used to see if a state
-// already exists.
-//
-// Because the number of alternatives and number of ATN configurations are
-// finite, there is a finite number of DFA states that can be processed. This is
-// necessary to show that the algorithm terminates.
-//
-// Cannot test the DFA state numbers here because in
-// ParserATNSimulator.addDFAState we need to know if any other state exists that
-// has d exact set of ATN configurations. The stateNumber is irrelevant.
-func (d *DFAState) equals(other interface{}) bool {
- if d == other {
- return true
- } else if _, ok := other.(*DFAState); !ok {
- return false
- }
-
- return d.configs.Equals(other.(*DFAState).configs)
-}
-
func (d *DFAState) String() string {
var s string
if d.isAcceptState {
@@ -164,8 +143,27 @@ func (d *DFAState) String() string {
return fmt.Sprintf("%d:%s%s", d.stateNumber, fmt.Sprint(d.configs), s)
}
-func (d *DFAState) hash() int {
+func (d *DFAState) Hash() int {
h := murmurInit(7)
- h = murmurUpdate(h, d.configs.hash())
+ h = murmurUpdate(h, d.configs.Hash())
return murmurFinish(h, 1)
}
+
+// Equals returns whether d equals other. Two DFAStates are equal if their ATN
+// configuration sets are the same. This method is used to see if a state
+// already exists.
+//
+// Because the number of alternatives and number of ATN configurations are
+// finite, there is a finite number of DFA states that can be processed. This is
+// necessary to show that the algorithm terminates.
+//
+// Cannot test the DFA state numbers here because in
+// ParserATNSimulator.addDFAState we need to know if any other state exists that
+// has d exact set of ATN configurations. The stateNumber is irrelevant.
+func (d *DFAState) Equals(o Collectable[*DFAState]) bool {
+ if d == o {
+ return true
+ }
+
+ return d.configs.Equals(o.(*DFAState).configs)
+}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/diagnostic_error_listener.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/diagnostic_error_listener.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/diagnostic_error_listener.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/diagnostic_error_listener.go
index 1fec43d9dca..c55bcc19b2c 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/diagnostic_error_listener.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/diagnostic_error_listener.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -87,7 +87,6 @@ func (d *DiagnosticErrorListener) getDecisionDescription(recognizer Parser, dfa
return strconv.Itoa(decision) + " (" + ruleName + ")"
}
-//
// Computes the set of conflicting or ambiguous alternatives from a
// configuration set, if that information was not already provided by the
// parser.
@@ -97,7 +96,6 @@ func (d *DiagnosticErrorListener) getDecisionDescription(recognizer Parser, dfa
// @param configs The conflicting or ambiguous configuration set.
// @return Returns {@code ReportedAlts} if it is not {@code nil}, otherwise
// returns the set of alternatives represented in {@code configs}.
-//
func (d *DiagnosticErrorListener) getConflictingAlts(ReportedAlts *BitSet, set ATNConfigSet) *BitSet {
if ReportedAlts != nil {
return ReportedAlts
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/error_listener.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/error_listener.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/error_listener.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/error_listener.go
index 028e1a9d7f0..f679f0dcd5e 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/error_listener.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/error_listener.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -48,12 +48,9 @@ func NewConsoleErrorListener() *ConsoleErrorListener {
return new(ConsoleErrorListener)
}
-//
// Provides a default instance of {@link ConsoleErrorListener}.
-//
var ConsoleErrorListenerINSTANCE = NewConsoleErrorListener()
-//
// {@inheritDoc}
//
//
@@ -64,7 +61,6 @@ var ConsoleErrorListenerINSTANCE = NewConsoleErrorListener()
//
// line line:charPositionInLine msg
//
-//
func (c *ConsoleErrorListener) SyntaxError(recognizer Recognizer, offendingSymbol interface{}, line, column int, msg string, e RecognitionException) {
fmt.Fprintln(os.Stderr, "line "+strconv.Itoa(line)+":"+strconv.Itoa(column)+" "+msg)
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/error_strategy.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/error_strategy.go
similarity index 99%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/error_strategy.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/error_strategy.go
index c4080dbfd18..5c0a637ba4a 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/error_strategy.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/error_strategy.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -23,7 +23,6 @@ type ErrorStrategy interface {
// This is the default implementation of {@link ANTLRErrorStrategy} used for
// error Reporting and recovery in ANTLR parsers.
-//
type DefaultErrorStrategy struct {
errorRecoveryMode bool
lastErrorIndex int
@@ -61,12 +60,10 @@ func (d *DefaultErrorStrategy) reset(recognizer Parser) {
d.endErrorCondition(recognizer)
}
-//
// This method is called to enter error recovery mode when a recognition
// exception is Reported.
//
// @param recognizer the parser instance
-//
func (d *DefaultErrorStrategy) beginErrorCondition(recognizer Parser) {
d.errorRecoveryMode = true
}
@@ -75,28 +72,23 @@ func (d *DefaultErrorStrategy) InErrorRecoveryMode(recognizer Parser) bool {
return d.errorRecoveryMode
}
-//
// This method is called to leave error recovery mode after recovering from
// a recognition exception.
//
// @param recognizer
-//
func (d *DefaultErrorStrategy) endErrorCondition(recognizer Parser) {
d.errorRecoveryMode = false
d.lastErrorStates = nil
d.lastErrorIndex = -1
}
-//
// {@inheritDoc}
//
// The default implementation simply calls {@link //endErrorCondition}.
-//
func (d *DefaultErrorStrategy) ReportMatch(recognizer Parser) {
d.endErrorCondition(recognizer)
}
-//
// {@inheritDoc}
//
// The default implementation returns immediately if the handler is already
@@ -114,7 +106,6 @@ func (d *DefaultErrorStrategy) ReportMatch(recognizer Parser) {
//
All other types: calls {@link Parser//NotifyErrorListeners} to Report
// the exception
//
-//
func (d *DefaultErrorStrategy) ReportError(recognizer Parser, e RecognitionException) {
// if we've already Reported an error and have not Matched a token
// yet successfully, don't Report any errors.
@@ -142,7 +133,6 @@ func (d *DefaultErrorStrategy) ReportError(recognizer Parser, e RecognitionExcep
// The default implementation reSynchronizes the parser by consuming tokens
// until we find one in the reSynchronization set--loosely the set of tokens
// that can follow the current rule.
-//
func (d *DefaultErrorStrategy) Recover(recognizer Parser, e RecognitionException) {
if d.lastErrorIndex == recognizer.GetInputStream().Index() &&
@@ -206,7 +196,6 @@ func (d *DefaultErrorStrategy) Recover(recognizer Parser, e RecognitionException
// compare token set at the start of the loop and at each iteration. If for
// some reason speed is suffering for you, you can turn off d
// functionality by simply overriding d method as a blank { }.
-//
func (d *DefaultErrorStrategy) Sync(recognizer Parser) {
// If already recovering, don't try to Sync
if d.InErrorRecoveryMode(recognizer) {
@@ -247,7 +236,6 @@ func (d *DefaultErrorStrategy) Sync(recognizer Parser) {
//
// @param recognizer the parser instance
// @param e the recognition exception
-//
func (d *DefaultErrorStrategy) ReportNoViableAlternative(recognizer Parser, e *NoViableAltException) {
tokens := recognizer.GetTokenStream()
var input string
@@ -264,7 +252,6 @@ func (d *DefaultErrorStrategy) ReportNoViableAlternative(recognizer Parser, e *N
recognizer.NotifyErrorListeners(msg, e.offendingToken, e)
}
-//
// This is called by {@link //ReportError} when the exception is an
// {@link InputMisMatchException}.
//
@@ -272,14 +259,12 @@ func (d *DefaultErrorStrategy) ReportNoViableAlternative(recognizer Parser, e *N
//
// @param recognizer the parser instance
// @param e the recognition exception
-//
func (this *DefaultErrorStrategy) ReportInputMisMatch(recognizer Parser, e *InputMisMatchException) {
msg := "mismatched input " + this.GetTokenErrorDisplay(e.offendingToken) +
" expecting " + e.getExpectedTokens().StringVerbose(recognizer.GetLiteralNames(), recognizer.GetSymbolicNames(), false)
recognizer.NotifyErrorListeners(msg, e.offendingToken, e)
}
-//
// This is called by {@link //ReportError} when the exception is a
// {@link FailedPredicateException}.
//
@@ -287,7 +272,6 @@ func (this *DefaultErrorStrategy) ReportInputMisMatch(recognizer Parser, e *Inpu
//
// @param recognizer the parser instance
// @param e the recognition exception
-//
func (d *DefaultErrorStrategy) ReportFailedPredicate(recognizer Parser, e *FailedPredicateException) {
ruleName := recognizer.GetRuleNames()[recognizer.GetParserRuleContext().GetRuleIndex()]
msg := "rule " + ruleName + " " + e.message
@@ -310,7 +294,6 @@ func (d *DefaultErrorStrategy) ReportFailedPredicate(recognizer Parser, e *Faile
// {@link Parser//NotifyErrorListeners}.
//
// @param recognizer the parser instance
-//
func (d *DefaultErrorStrategy) ReportUnwantedToken(recognizer Parser) {
if d.InErrorRecoveryMode(recognizer) {
return
@@ -339,7 +322,6 @@ func (d *DefaultErrorStrategy) ReportUnwantedToken(recognizer Parser) {
// {@link Parser//NotifyErrorListeners}.
//
// @param recognizer the parser instance
-//
func (d *DefaultErrorStrategy) ReportMissingToken(recognizer Parser) {
if d.InErrorRecoveryMode(recognizer) {
return
@@ -392,15 +374,14 @@ func (d *DefaultErrorStrategy) ReportMissingToken(recognizer Parser) {
// derivation:
//
//
-// => ID '=' '(' INT ')' ('+' atom)* ''
+// => ID '=' '(' INT ')' ('+' atom)* ”
// ^
//
//
-// The attempt to Match {@code ')'} will fail when it sees {@code ''} and
-// call {@link //recoverInline}. To recover, it sees that {@code LA(1)==''}
+// The attempt to Match {@code ')'} will fail when it sees {@code ”} and
+// call {@link //recoverInline}. To recover, it sees that {@code LA(1)==”}
// is in the set of tokens that can follow the {@code ')'} token reference
// in rule {@code atom}. It can assume that you forgot the {@code ')'}.
-//
func (d *DefaultErrorStrategy) RecoverInline(recognizer Parser) Token {
// SINGLE TOKEN DELETION
MatchedSymbol := d.SingleTokenDeletion(recognizer)
@@ -418,7 +399,6 @@ func (d *DefaultErrorStrategy) RecoverInline(recognizer Parser) Token {
panic(NewInputMisMatchException(recognizer))
}
-//
// This method implements the single-token insertion inline error recovery
// strategy. It is called by {@link //recoverInline} if the single-token
// deletion strategy fails to recover from the mismatched input. If this
@@ -434,7 +414,6 @@ func (d *DefaultErrorStrategy) RecoverInline(recognizer Parser) Token {
// @param recognizer the parser instance
// @return {@code true} if single-token insertion is a viable recovery
// strategy for the current mismatched input, otherwise {@code false}
-//
func (d *DefaultErrorStrategy) SingleTokenInsertion(recognizer Parser) bool {
currentSymbolType := recognizer.GetTokenStream().LA(1)
// if current token is consistent with what could come after current
@@ -469,7 +448,6 @@ func (d *DefaultErrorStrategy) SingleTokenInsertion(recognizer Parser) bool {
// @return the successfully Matched {@link Token} instance if single-token
// deletion successfully recovers from the mismatched input, otherwise
// {@code nil}
-//
func (d *DefaultErrorStrategy) SingleTokenDeletion(recognizer Parser) Token {
NextTokenType := recognizer.GetTokenStream().LA(2)
expecting := d.GetExpectedTokens(recognizer)
@@ -507,7 +485,6 @@ func (d *DefaultErrorStrategy) SingleTokenDeletion(recognizer Parser) Token {
// a CommonToken of the appropriate type. The text will be the token.
// If you change what tokens must be created by the lexer,
// override d method to create the appropriate tokens.
-//
func (d *DefaultErrorStrategy) GetMissingSymbol(recognizer Parser) Token {
currentSymbol := recognizer.GetCurrentToken()
expecting := d.GetExpectedTokens(recognizer)
@@ -546,7 +523,6 @@ func (d *DefaultErrorStrategy) GetExpectedTokens(recognizer Parser) *IntervalSet
// the token). This is better than forcing you to override a method in
// your token objects because you don't have to go modify your lexer
// so that it creates a NewJava type.
-//
func (d *DefaultErrorStrategy) GetTokenErrorDisplay(t Token) string {
if t == nil {
return ""
@@ -578,7 +554,7 @@ func (d *DefaultErrorStrategy) escapeWSAndQuote(s string) string {
// from within the rule i.e., the FIRST computation done by
// ANTLR stops at the end of a rule.
//
-// EXAMPLE
+// # EXAMPLE
//
// When you find a "no viable alt exception", the input is not
// consistent with any of the alternatives for rule r. The best
@@ -597,7 +573,6 @@ func (d *DefaultErrorStrategy) escapeWSAndQuote(s string) string {
// c : ID
// | INT
//
-//
// At each rule invocation, the set of tokens that could follow
// that rule is pushed on a stack. Here are the various
// context-sensitive follow sets:
@@ -660,7 +635,6 @@ func (d *DefaultErrorStrategy) escapeWSAndQuote(s string) string {
//
// Like Grosch I implement context-sensitive FOLLOW sets that are combined
// at run-time upon error to avoid overhead during parsing.
-//
func (d *DefaultErrorStrategy) getErrorRecoverySet(recognizer Parser) *IntervalSet {
atn := recognizer.GetInterpreter().atn
ctx := recognizer.GetParserRuleContext()
@@ -733,7 +707,6 @@ func NewBailErrorStrategy() *BailErrorStrategy {
// in a {@link ParseCancellationException} so it is not caught by the
// rule func catches. Use {@link Exception//getCause()} to get the
// original {@link RecognitionException}.
-//
func (b *BailErrorStrategy) Recover(recognizer Parser, e RecognitionException) {
context := recognizer.GetParserRuleContext()
for context != nil {
@@ -749,7 +722,6 @@ func (b *BailErrorStrategy) Recover(recognizer Parser, e RecognitionException) {
// Make sure we don't attempt to recover inline if the parser
// successfully recovers, it won't panic an exception.
-//
func (b *BailErrorStrategy) RecoverInline(recognizer Parser) Token {
b.Recover(recognizer, NewInputMisMatchException(recognizer))
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/errors.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/errors.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/errors.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/errors.go
index 2ef74926ecb..3954c137829 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/errors.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/errors.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -74,7 +74,6 @@ func (b *BaseRecognitionException) GetInputStream() IntStream {
// If the state number is not known, b method returns -1.
-//
// Gets the set of input symbols which could potentially follow the
// previously Matched symbol at the time b exception was panicn.
//
@@ -136,7 +135,6 @@ type NoViableAltException struct {
// to take based upon the remaining input. It tracks the starting token
// of the offending input and also knows where the parser was
// in the various paths when the error. Reported by ReportNoViableAlternative()
-//
func NewNoViableAltException(recognizer Parser, input TokenStream, startToken Token, offendingToken Token, deadEndConfigs ATNConfigSet, ctx ParserRuleContext) *NoViableAltException {
if ctx == nil {
@@ -177,7 +175,6 @@ type InputMisMatchException struct {
// This signifies any kind of mismatched input exceptions such as
// when the current input does not Match the expected token.
-//
func NewInputMisMatchException(recognizer Parser) *InputMisMatchException {
i := new(InputMisMatchException)
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/file_stream.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/file_stream.go
similarity index 92%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/file_stream.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/file_stream.go
index 842170c086c..bd6ad5efe3d 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/file_stream.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/file_stream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/input_stream.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/input_stream.go
similarity index 96%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/input_stream.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/input_stream.go
index 5ff270f5368..a8b889cedb9 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/input_stream.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/input_stream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/int_stream.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/int_stream.go
similarity index 82%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/int_stream.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/int_stream.go
index 438e0ea6e75..4778878bd0d 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/int_stream.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/int_stream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/interval_set.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/interval_set.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/interval_set.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/interval_set.go
index 1e9393adb60..c1e155e8180 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/interval_set.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/interval_set.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -223,6 +223,10 @@ func (i *IntervalSet) StringVerbose(literalNames []string, symbolicNames []strin
return i.toIndexString()
}
+func (i *IntervalSet) GetIntervals() []*Interval {
+ return i.intervals
+}
+
func (i *IntervalSet) toCharString() string {
names := make([]string, len(i.intervals))
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/jcollect.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/jcollect.go
new file mode 100644
index 00000000000..e5a74f0c6c4
--- /dev/null
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/jcollect.go
@@ -0,0 +1,198 @@
+package antlr
+
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
+// Use of this file is governed by the BSD 3-clause license that
+// can be found in the LICENSE.txt file in the project root.
+
+import (
+ "sort"
+)
+
+// Collectable is an interface that a struct should implement if it is to be
+// usable as a key in these collections.
+type Collectable[T any] interface {
+ Hash() int
+ Equals(other Collectable[T]) bool
+}
+
+type Comparator[T any] interface {
+ Hash1(o T) int
+ Equals2(T, T) bool
+}
+
+// JStore implements a container that allows the use of a struct to calculate the key
+// for a collection of values akin to map. This is not meant to be a full-blown HashMap but just
+// serve the needs of the ANTLR Go runtime.
+//
+// For ease of porting the logic of the runtime from the master target (Java), this collection
+// operates in a similar way to Java, in that it can use any struct that supplies a Hash() and Equals()
+// function as the key. The values are stored in a standard go map which internally is a form of hashmap
+// itself, the key for the go map is the hash supplied by the key object. The collection is able to deal with
+// hash conflicts by using a simple slice of values associated with the hash code indexed bucket. That isn't
+// particularly efficient, but it is simple, and it works. As this is specifically for the ANTLR runtime, and
+// we understand the requirements, then this is fine - this is not a general purpose collection.
+type JStore[T any, C Comparator[T]] struct {
+ store map[int][]T
+ len int
+ comparator Comparator[T]
+}
+
+func NewJStore[T any, C Comparator[T]](comparator Comparator[T]) *JStore[T, C] {
+
+ if comparator == nil {
+ panic("comparator cannot be nil")
+ }
+
+ s := &JStore[T, C]{
+ store: make(map[int][]T, 1),
+ comparator: comparator,
+ }
+ return s
+}
+
+// Put will store given value in the collection. Note that the key for storage is generated from
+// the value itself - this is specifically because that is what ANTLR needs - this would not be useful
+// as any kind of general collection.
+//
+// If the key has a hash conflict, then the value will be added to the slice of values associated with the
+// hash, unless the value is already in the slice, in which case the existing value is returned. Value equivalence is
+// tested by calling the equals() method on the key.
+//
+// # If the given value is already present in the store, then the existing value is returned as v and exists is set to true
+//
+// If the given value is not present in the store, then the value is added to the store and returned as v and exists is set to false.
+func (s *JStore[T, C]) Put(value T) (v T, exists bool) { //nolint:ireturn
+
+ kh := s.comparator.Hash1(value)
+
+ for _, v1 := range s.store[kh] {
+ if s.comparator.Equals2(value, v1) {
+ return v1, true
+ }
+ }
+ s.store[kh] = append(s.store[kh], value)
+ s.len++
+ return value, false
+}
+
+// Get will return the value associated with the key - the type of the key is the same type as the value
+// which would not generally be useful, but this is a specific thing for ANTLR where the key is
+// generated using the object we are going to store.
+func (s *JStore[T, C]) Get(key T) (T, bool) { //nolint:ireturn
+
+ kh := s.comparator.Hash1(key)
+
+ for _, v := range s.store[kh] {
+ if s.comparator.Equals2(key, v) {
+ return v, true
+ }
+ }
+ return key, false
+}
+
+// Contains returns true if the given key is present in the store
+func (s *JStore[T, C]) Contains(key T) bool { //nolint:ireturn
+
+ _, present := s.Get(key)
+ return present
+}
+
+func (s *JStore[T, C]) SortedSlice(less func(i, j T) bool) []T {
+ vs := make([]T, 0, len(s.store))
+ for _, v := range s.store {
+ vs = append(vs, v...)
+ }
+ sort.Slice(vs, func(i, j int) bool {
+ return less(vs[i], vs[j])
+ })
+
+ return vs
+}
+
+func (s *JStore[T, C]) Each(f func(T) bool) {
+ for _, e := range s.store {
+ for _, v := range e {
+ f(v)
+ }
+ }
+}
+
+func (s *JStore[T, C]) Len() int {
+ return s.len
+}
+
+func (s *JStore[T, C]) Values() []T {
+ vs := make([]T, 0, len(s.store))
+ for _, e := range s.store {
+ for _, v := range e {
+ vs = append(vs, v)
+ }
+ }
+ return vs
+}
+
+type entry[K, V any] struct {
+ key K
+ val V
+}
+
+type JMap[K, V any, C Comparator[K]] struct {
+ store map[int][]*entry[K, V]
+ len int
+ comparator Comparator[K]
+}
+
+func NewJMap[K, V any, C Comparator[K]](comparator Comparator[K]) *JMap[K, V, C] {
+ return &JMap[K, V, C]{
+ store: make(map[int][]*entry[K, V], 1),
+ comparator: comparator,
+ }
+}
+
+func (m *JMap[K, V, C]) Put(key K, val V) {
+ kh := m.comparator.Hash1(key)
+
+ m.store[kh] = append(m.store[kh], &entry[K, V]{key, val})
+ m.len++
+}
+
+func (m *JMap[K, V, C]) Values() []V {
+ vs := make([]V, 0, len(m.store))
+ for _, e := range m.store {
+ for _, v := range e {
+ vs = append(vs, v.val)
+ }
+ }
+ return vs
+}
+
+func (m *JMap[K, V, C]) Get(key K) (V, bool) {
+
+ var none V
+ kh := m.comparator.Hash1(key)
+ for _, e := range m.store[kh] {
+ if m.comparator.Equals2(e.key, key) {
+ return e.val, true
+ }
+ }
+ return none, false
+}
+
+func (m *JMap[K, V, C]) Len() int {
+ return len(m.store)
+}
+
+func (m *JMap[K, V, C]) Delete(key K) {
+ kh := m.comparator.Hash1(key)
+ for i, e := range m.store[kh] {
+ if m.comparator.Equals2(e.key, key) {
+ m.store[kh] = append(m.store[kh][:i], m.store[kh][i+1:]...)
+ m.len--
+ return
+ }
+ }
+}
+
+func (m *JMap[K, V, C]) Clear() {
+ m.store = make(map[int][]*entry[K, V])
+}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
index b04f04572f1..6533f051645 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -232,8 +232,6 @@ func (b *BaseLexer) NextToken() Token {
}
return b.token
}
-
- return nil
}
// Instruct the lexer to Skip creating a token for current lexer rule
@@ -342,7 +340,7 @@ func (b *BaseLexer) GetCharIndex() int {
}
// Return the text Matched so far for the current token or any text override.
-//Set the complete text of l token it wipes any previous changes to the text.
+// Set the complete text of l token it wipes any previous changes to the text.
func (b *BaseLexer) GetText() string {
if b.text != "" {
return b.text
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_action.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_action.go
similarity index 91%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_action.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_action.go
index 5a325be1372..111656c2952 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_action.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_action.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -21,8 +21,8 @@ type LexerAction interface {
getActionType() int
getIsPositionDependent() bool
execute(lexer Lexer)
- hash() int
- equals(other LexerAction) bool
+ Hash() int
+ Equals(other LexerAction) bool
}
type BaseLexerAction struct {
@@ -51,15 +51,14 @@ func (b *BaseLexerAction) getIsPositionDependent() bool {
return b.isPositionDependent
}
-func (b *BaseLexerAction) hash() int {
+func (b *BaseLexerAction) Hash() int {
return b.actionType
}
-func (b *BaseLexerAction) equals(other LexerAction) bool {
+func (b *BaseLexerAction) Equals(other LexerAction) bool {
return b == other
}
-//
// Implements the {@code Skip} lexer action by calling {@link Lexer//Skip}.
//
// The {@code Skip} command does not have any parameters, so l action is
@@ -85,7 +84,8 @@ func (l *LexerSkipAction) String() string {
return "skip"
}
-// Implements the {@code type} lexer action by calling {@link Lexer//setType}
+// Implements the {@code type} lexer action by calling {@link Lexer//setType}
+//
// with the assigned type.
type LexerTypeAction struct {
*BaseLexerAction
@@ -104,14 +104,14 @@ func (l *LexerTypeAction) execute(lexer Lexer) {
lexer.SetType(l.thetype)
}
-func (l *LexerTypeAction) hash() int {
+func (l *LexerTypeAction) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, l.actionType)
h = murmurUpdate(h, l.thetype)
return murmurFinish(h, 2)
}
-func (l *LexerTypeAction) equals(other LexerAction) bool {
+func (l *LexerTypeAction) Equals(other LexerAction) bool {
if l == other {
return true
} else if _, ok := other.(*LexerTypeAction); !ok {
@@ -148,14 +148,14 @@ func (l *LexerPushModeAction) execute(lexer Lexer) {
lexer.PushMode(l.mode)
}
-func (l *LexerPushModeAction) hash() int {
+func (l *LexerPushModeAction) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, l.actionType)
h = murmurUpdate(h, l.mode)
return murmurFinish(h, 2)
}
-func (l *LexerPushModeAction) equals(other LexerAction) bool {
+func (l *LexerPushModeAction) Equals(other LexerAction) bool {
if l == other {
return true
} else if _, ok := other.(*LexerPushModeAction); !ok {
@@ -245,14 +245,14 @@ func (l *LexerModeAction) execute(lexer Lexer) {
lexer.SetMode(l.mode)
}
-func (l *LexerModeAction) hash() int {
+func (l *LexerModeAction) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, l.actionType)
h = murmurUpdate(h, l.mode)
return murmurFinish(h, 2)
}
-func (l *LexerModeAction) equals(other LexerAction) bool {
+func (l *LexerModeAction) Equals(other LexerAction) bool {
if l == other {
return true
} else if _, ok := other.(*LexerModeAction); !ok {
@@ -303,7 +303,7 @@ func (l *LexerCustomAction) execute(lexer Lexer) {
lexer.Action(nil, l.ruleIndex, l.actionIndex)
}
-func (l *LexerCustomAction) hash() int {
+func (l *LexerCustomAction) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, l.actionType)
h = murmurUpdate(h, l.ruleIndex)
@@ -311,13 +311,14 @@ func (l *LexerCustomAction) hash() int {
return murmurFinish(h, 3)
}
-func (l *LexerCustomAction) equals(other LexerAction) bool {
+func (l *LexerCustomAction) Equals(other LexerAction) bool {
if l == other {
return true
} else if _, ok := other.(*LexerCustomAction); !ok {
return false
} else {
- return l.ruleIndex == other.(*LexerCustomAction).ruleIndex && l.actionIndex == other.(*LexerCustomAction).actionIndex
+ return l.ruleIndex == other.(*LexerCustomAction).ruleIndex &&
+ l.actionIndex == other.(*LexerCustomAction).actionIndex
}
}
@@ -344,14 +345,14 @@ func (l *LexerChannelAction) execute(lexer Lexer) {
lexer.SetChannel(l.channel)
}
-func (l *LexerChannelAction) hash() int {
+func (l *LexerChannelAction) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, l.actionType)
h = murmurUpdate(h, l.channel)
return murmurFinish(h, 2)
}
-func (l *LexerChannelAction) equals(other LexerAction) bool {
+func (l *LexerChannelAction) Equals(other LexerAction) bool {
if l == other {
return true
} else if _, ok := other.(*LexerChannelAction); !ok {
@@ -412,10 +413,10 @@ func (l *LexerIndexedCustomAction) execute(lexer Lexer) {
l.lexerAction.execute(lexer)
}
-func (l *LexerIndexedCustomAction) hash() int {
+func (l *LexerIndexedCustomAction) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, l.offset)
- h = murmurUpdate(h, l.lexerAction.hash())
+ h = murmurUpdate(h, l.lexerAction.Hash())
return murmurFinish(h, 2)
}
@@ -425,6 +426,7 @@ func (l *LexerIndexedCustomAction) equals(other LexerAction) bool {
} else if _, ok := other.(*LexerIndexedCustomAction); !ok {
return false
} else {
- return l.offset == other.(*LexerIndexedCustomAction).offset && l.lexerAction == other.(*LexerIndexedCustomAction).lexerAction
+ return l.offset == other.(*LexerIndexedCustomAction).offset &&
+ l.lexerAction.Equals(other.(*LexerIndexedCustomAction).lexerAction)
}
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_action_executor.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_action_executor.go
similarity index 88%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_action_executor.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_action_executor.go
index 056941dd6e7..be1ba7a7e30 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_action_executor.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_action_executor.go
@@ -1,9 +1,11 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
package antlr
+import "golang.org/x/exp/slices"
+
// Represents an executor for a sequence of lexer actions which traversed during
// the Matching operation of a lexer rule (token).
//
@@ -12,8 +14,8 @@ package antlr
// not cause bloating of the {@link DFA} created for the lexer.
type LexerActionExecutor struct {
- lexerActions []LexerAction
- cachedHash int
+ lexerActions []LexerAction
+ cachedHash int
}
func NewLexerActionExecutor(lexerActions []LexerAction) *LexerActionExecutor {
@@ -30,7 +32,7 @@ func NewLexerActionExecutor(lexerActions []LexerAction) *LexerActionExecutor {
// of the performance-critical {@link LexerATNConfig//hashCode} operation.
l.cachedHash = murmurInit(57)
for _, a := range lexerActions {
- l.cachedHash = murmurUpdate(l.cachedHash, a.hash())
+ l.cachedHash = murmurUpdate(l.cachedHash, a.Hash())
}
return l
@@ -151,14 +153,17 @@ func (l *LexerActionExecutor) execute(lexer Lexer, input CharStream, startIndex
}
}
-func (l *LexerActionExecutor) hash() int {
+func (l *LexerActionExecutor) Hash() int {
if l == nil {
+ // TODO: Why is this here? l should not be nil
return 61
}
+
+ // TODO: This is created from the action itself when the struct is created - will this be an issue at some point? Java uses the runtime assign hashcode
return l.cachedHash
}
-func (l *LexerActionExecutor) equals(other interface{}) bool {
+func (l *LexerActionExecutor) Equals(other interface{}) bool {
if l == other {
return true
}
@@ -169,5 +174,13 @@ func (l *LexerActionExecutor) equals(other interface{}) bool {
if othert == nil {
return false
}
- return l.cachedHash == othert.cachedHash && &l.lexerActions == &othert.lexerActions
+ if l.cachedHash != othert.cachedHash {
+ return false
+ }
+ if len(l.lexerActions) != len(othert.lexerActions) {
+ return false
+ }
+ return slices.EqualFunc(l.lexerActions, othert.lexerActions, func(i, j LexerAction) bool {
+ return i.Equals(j)
+ })
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_atn_simulator.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_atn_simulator.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_atn_simulator.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_atn_simulator.go
index dc05153ea44..c573b752100 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/lexer_atn_simulator.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer_atn_simulator.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -591,19 +591,24 @@ func (l *LexerATNSimulator) addDFAState(configs ATNConfigSet, suppressEdge bool)
proposed.lexerActionExecutor = firstConfigWithRuleStopState.(*LexerATNConfig).lexerActionExecutor
proposed.setPrediction(l.atn.ruleToTokenType[firstConfigWithRuleStopState.GetState().GetRuleIndex()])
}
- hash := proposed.hash()
dfa := l.decisionToDFA[l.mode]
l.atn.stateMu.Lock()
defer l.atn.stateMu.Unlock()
- existing, ok := dfa.getState(hash)
- if ok {
+ existing, present := dfa.states.Get(proposed)
+ if present {
+
+ // This state was already present, so just return it.
+ //
proposed = existing
} else {
- proposed.stateNumber = dfa.numStates()
+
+ // We need to add the new state
+ //
+ proposed.stateNumber = dfa.states.Len()
configs.SetReadOnly(true)
proposed.configs = configs
- dfa.setState(hash, proposed)
+ dfa.states.Put(proposed)
}
if !suppressEdge {
dfa.setS0(proposed)
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/ll1_analyzer.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
similarity index 87%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/ll1_analyzer.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
index 6ffb37de694..76689615a6d 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/ll1_analyzer.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -14,14 +14,15 @@ func NewLL1Analyzer(atn *ATN) *LL1Analyzer {
return la
}
-//* Special value added to the lookahead sets to indicate that we hit
-// a predicate during analysis if {@code seeThruPreds==false}.
-///
+// - Special value added to the lookahead sets to indicate that we hit
+// a predicate during analysis if {@code seeThruPreds==false}.
+//
+// /
const (
LL1AnalyzerHitPred = TokenInvalidType
)
-//*
+// *
// Calculates the SLL(1) expected lookahead set for each outgoing transition
// of an {@link ATNState}. The returned array has one element for each
// outgoing transition in {@code s}. If the closure from transition
@@ -38,7 +39,7 @@ func (la *LL1Analyzer) getDecisionLookahead(s ATNState) []*IntervalSet {
look := make([]*IntervalSet, count)
for alt := 0; alt < count; alt++ {
look[alt] = NewIntervalSet()
- lookBusy := newArray2DHashSet(nil, nil)
+ lookBusy := NewJStore[ATNConfig, Comparator[ATNConfig]](aConfEqInst)
seeThruPreds := false // fail to get lookahead upon pred
la.look1(s.GetTransitions()[alt].getTarget(), nil, BasePredictionContextEMPTY, look[alt], lookBusy, NewBitSet(), seeThruPreds, false)
// Wipe out lookahead for la alternative if we found nothing
@@ -50,7 +51,7 @@ func (la *LL1Analyzer) getDecisionLookahead(s ATNState) []*IntervalSet {
return look
}
-//*
+// *
// Compute set of tokens that can follow {@code s} in the ATN in the
// specified {@code ctx}.
//
@@ -67,7 +68,7 @@ func (la *LL1Analyzer) getDecisionLookahead(s ATNState) []*IntervalSet {
//
// @return The set of tokens that can follow {@code s} in the ATN in the
// specified {@code ctx}.
-///
+// /
func (la *LL1Analyzer) Look(s, stopState ATNState, ctx RuleContext) *IntervalSet {
r := NewIntervalSet()
seeThruPreds := true // ignore preds get all lookahead
@@ -75,7 +76,7 @@ func (la *LL1Analyzer) Look(s, stopState ATNState, ctx RuleContext) *IntervalSet
if ctx != nil {
lookContext = predictionContextFromRuleContext(s.GetATN(), ctx)
}
- la.look1(s, stopState, lookContext, r, newArray2DHashSet(nil, nil), NewBitSet(), seeThruPreds, true)
+ la.look1(s, stopState, lookContext, r, NewJStore[ATNConfig, Comparator[ATNConfig]](aConfEqInst), NewBitSet(), seeThruPreds, true)
return r
}
@@ -109,14 +110,14 @@ func (la *LL1Analyzer) Look(s, stopState ATNState, ctx RuleContext) *IntervalSet
// outermost context is reached. This parameter has no effect if {@code ctx}
// is {@code nil}.
-func (la *LL1Analyzer) look2(s, stopState ATNState, ctx PredictionContext, look *IntervalSet, lookBusy Set, calledRuleStack *BitSet, seeThruPreds, addEOF bool, i int) {
+func (la *LL1Analyzer) look2(s, stopState ATNState, ctx PredictionContext, look *IntervalSet, lookBusy *JStore[ATNConfig, Comparator[ATNConfig]], calledRuleStack *BitSet, seeThruPreds, addEOF bool, i int) {
returnState := la.atn.states[ctx.getReturnState(i)]
la.look1(returnState, stopState, ctx.GetParent(i), look, lookBusy, calledRuleStack, seeThruPreds, addEOF)
}
-func (la *LL1Analyzer) look1(s, stopState ATNState, ctx PredictionContext, look *IntervalSet, lookBusy Set, calledRuleStack *BitSet, seeThruPreds, addEOF bool) {
+func (la *LL1Analyzer) look1(s, stopState ATNState, ctx PredictionContext, look *IntervalSet, lookBusy *JStore[ATNConfig, Comparator[ATNConfig]], calledRuleStack *BitSet, seeThruPreds, addEOF bool) {
c := NewBaseATNConfig6(s, 0, ctx)
@@ -124,8 +125,11 @@ func (la *LL1Analyzer) look1(s, stopState ATNState, ctx PredictionContext, look
return
}
- lookBusy.Add(c)
+ _, present := lookBusy.Put(c)
+ if present {
+ return
+ }
if s == stopState {
if ctx == nil {
look.addOne(TokenEpsilon)
@@ -198,7 +202,7 @@ func (la *LL1Analyzer) look1(s, stopState ATNState, ctx PredictionContext, look
}
}
-func (la *LL1Analyzer) look3(stopState ATNState, ctx PredictionContext, look *IntervalSet, lookBusy Set, calledRuleStack *BitSet, seeThruPreds, addEOF bool, t1 *RuleTransition) {
+func (la *LL1Analyzer) look3(stopState ATNState, ctx PredictionContext, look *IntervalSet, lookBusy *JStore[ATNConfig, Comparator[ATNConfig]], calledRuleStack *BitSet, seeThruPreds, addEOF bool, t1 *RuleTransition) {
newContext := SingletonBasePredictionContextCreate(ctx, t1.followState.GetStateNumber())
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser.go
similarity index 99%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser.go
index 2ab2f560521..d26bf063920 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -91,7 +91,6 @@ func NewBaseParser(input TokenStream) *BaseParser {
// bypass alternatives.
//
// @see ATNDeserializationOptions//isGenerateRuleBypassTransitions()
-//
var bypassAltsAtnCache = make(map[string]int)
// reset the parser's state//
@@ -230,7 +229,6 @@ func (p *BaseParser) GetParseListeners() []ParseTreeListener {
// @param listener the listener to add
//
// @panics nilPointerException if {@code} listener is {@code nil}
-//
func (p *BaseParser) AddParseListener(listener ParseTreeListener) {
if listener == nil {
panic("listener")
@@ -241,13 +239,11 @@ func (p *BaseParser) AddParseListener(listener ParseTreeListener) {
p.parseListeners = append(p.parseListeners, listener)
}
-//
// Remove {@code listener} from the list of parse listeners.
//
// If {@code listener} is {@code nil} or has not been added as a parse
// listener, p.method does nothing.
// @param listener the listener to remove
-//
func (p *BaseParser) RemoveParseListener(listener ParseTreeListener) {
if p.parseListeners != nil {
@@ -289,11 +285,9 @@ func (p *BaseParser) TriggerEnterRuleEvent() {
}
}
-//
// Notify any parse listeners of an exit rule event.
//
// @see //addParseListener
-//
func (p *BaseParser) TriggerExitRuleEvent() {
if p.parseListeners != nil {
// reverse order walk of listeners
@@ -330,7 +324,6 @@ func (p *BaseParser) setTokenFactory(factory TokenFactory) {
//
// @panics UnsupportedOperationException if the current parser does not
// implement the {@link //getSerializedATN()} method.
-//
func (p *BaseParser) GetATNWithBypassAlts() {
// TODO
@@ -402,7 +395,6 @@ func (p *BaseParser) SetTokenStream(input TokenStream) {
// Match needs to return the current input symbol, which gets put
// into the label for the associated token ref e.g., x=ID.
-//
func (p *BaseParser) GetCurrentToken() Token {
return p.input.LT(1)
}
@@ -624,7 +616,6 @@ func (p *BaseParser) IsExpectedToken(symbol int) bool {
// respectively.
//
// @see ATN//getExpectedTokens(int, RuleContext)
-//
func (p *BaseParser) GetExpectedTokens() *IntervalSet {
return p.Interpreter.atn.getExpectedTokens(p.state, p.ctx)
}
@@ -686,7 +677,7 @@ func (p *BaseParser) GetDFAStrings() string {
func (p *BaseParser) DumpDFA() {
seenOne := false
for _, dfa := range p.Interpreter.decisionToDFA {
- if dfa.numStates() > 0 {
+ if dfa.states.Len() > 0 {
if seenOne {
fmt.Println()
}
@@ -703,7 +694,6 @@ func (p *BaseParser) GetSourceName() string {
// During a parse is sometimes useful to listen in on the rule entry and exit
// events as well as token Matches. p.is for quick and dirty debugging.
-//
func (p *BaseParser) SetTrace(trace *TraceListener) {
if trace == nil {
p.RemoveParseListener(p.tracer)
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser_atn_simulator.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
similarity index 94%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser_atn_simulator.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
index 888d512975a..8bcc46a0d99 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser_atn_simulator.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -11,11 +11,11 @@ import (
)
var (
- ParserATNSimulatorDebug = false
- ParserATNSimulatorListATNDecisions = false
- ParserATNSimulatorDFADebug = false
- ParserATNSimulatorRetryDebug = false
- TurnOffLRLoopEntryBranchOpt = false
+ ParserATNSimulatorDebug = false
+ ParserATNSimulatorTraceATNSim = false
+ ParserATNSimulatorDFADebug = false
+ ParserATNSimulatorRetryDebug = false
+ TurnOffLRLoopEntryBranchOpt = false
)
type ParserATNSimulator struct {
@@ -70,8 +70,8 @@ func (p *ParserATNSimulator) reset() {
}
func (p *ParserATNSimulator) AdaptivePredict(input TokenStream, decision int, outerContext ParserRuleContext) int {
- if ParserATNSimulatorDebug || ParserATNSimulatorListATNDecisions {
- fmt.Println("AdaptivePredict decision " + strconv.Itoa(decision) +
+ if ParserATNSimulatorDebug || ParserATNSimulatorTraceATNSim {
+ fmt.Println("adaptivePredict decision " + strconv.Itoa(decision) +
" exec LA(1)==" + p.getLookaheadName(input) +
" line " + strconv.Itoa(input.LT(1).GetLine()) + ":" +
strconv.Itoa(input.LT(1).GetColumn()))
@@ -111,15 +111,15 @@ func (p *ParserATNSimulator) AdaptivePredict(input TokenStream, decision int, ou
if s0 == nil {
if outerContext == nil {
- outerContext = RuleContextEmpty
+ outerContext = ParserRuleContextEmpty
}
- if ParserATNSimulatorDebug || ParserATNSimulatorListATNDecisions {
+ if ParserATNSimulatorDebug {
fmt.Println("predictATN decision " + strconv.Itoa(dfa.decision) +
" exec LA(1)==" + p.getLookaheadName(input) +
", outerContext=" + outerContext.String(p.parser.GetRuleNames(), nil))
}
fullCtx := false
- s0Closure := p.computeStartState(dfa.atnStartState, RuleContextEmpty, fullCtx)
+ s0Closure := p.computeStartState(dfa.atnStartState, ParserRuleContextEmpty, fullCtx)
p.atn.stateMu.Lock()
if dfa.getPrecedenceDfa() {
@@ -174,17 +174,18 @@ func (p *ParserATNSimulator) AdaptivePredict(input TokenStream, decision int, ou
// Reporting insufficient predicates
// cover these cases:
-// dead end
-// single alt
-// single alt + preds
-// conflict
-// conflict + preds
//
+// dead end
+// single alt
+// single alt + preds
+// conflict
+// conflict + preds
func (p *ParserATNSimulator) execATN(dfa *DFA, s0 *DFAState, input TokenStream, startIndex int, outerContext ParserRuleContext) int {
- if ParserATNSimulatorDebug || ParserATNSimulatorListATNDecisions {
+ if ParserATNSimulatorDebug || ParserATNSimulatorTraceATNSim {
fmt.Println("execATN decision " + strconv.Itoa(dfa.decision) +
- " exec LA(1)==" + p.getLookaheadName(input) +
+ ", DFA state " + s0.String() +
+ ", LA(1)==" + p.getLookaheadName(input) +
" line " + strconv.Itoa(input.LT(1).GetLine()) + ":" + strconv.Itoa(input.LT(1).GetColumn()))
}
@@ -277,8 +278,6 @@ func (p *ParserATNSimulator) execATN(dfa *DFA, s0 *DFAState, input TokenStream,
t = input.LA(1)
}
}
-
- panic("Should not have reached p state")
}
// Get an existing target state for an edge in the DFA. If the target state
@@ -384,7 +383,7 @@ func (p *ParserATNSimulator) predicateDFAState(dfaState *DFAState, decisionState
// comes back with reach.uniqueAlt set to a valid alt
func (p *ParserATNSimulator) execATNWithFullContext(dfa *DFA, D *DFAState, s0 ATNConfigSet, input TokenStream, startIndex int, outerContext ParserRuleContext) int {
- if ParserATNSimulatorDebug || ParserATNSimulatorListATNDecisions {
+ if ParserATNSimulatorDebug || ParserATNSimulatorTraceATNSim {
fmt.Println("execATNWithFullContext " + s0.String())
}
@@ -492,9 +491,6 @@ func (p *ParserATNSimulator) execATNWithFullContext(dfa *DFA, D *DFAState, s0 AT
}
func (p *ParserATNSimulator) computeReachSet(closure ATNConfigSet, t int, fullCtx bool) ATNConfigSet {
- if ParserATNSimulatorDebug {
- fmt.Println("in computeReachSet, starting closure: " + closure.String())
- }
if p.mergeCache == nil {
p.mergeCache = NewDoubleDict()
}
@@ -570,7 +566,7 @@ func (p *ParserATNSimulator) computeReachSet(closure ATNConfigSet, t int, fullCt
//
if reach == nil {
reach = NewBaseATNConfigSet(fullCtx)
- closureBusy := newArray2DHashSet(nil, nil)
+ closureBusy := NewJStore[ATNConfig, Comparator[ATNConfig]](aConfEqInst)
treatEOFAsEpsilon := t == TokenEOF
amount := len(intermediate.configs)
for k := 0; k < amount; k++ {
@@ -610,6 +606,11 @@ func (p *ParserATNSimulator) computeReachSet(closure ATNConfigSet, t int, fullCt
reach.Add(skippedStopStates[l], p.mergeCache)
}
}
+
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("computeReachSet " + closure.String() + " -> " + reach.String())
+ }
+
if len(reach.GetItems()) == 0 {
return nil
}
@@ -617,7 +618,6 @@ func (p *ParserATNSimulator) computeReachSet(closure ATNConfigSet, t int, fullCt
return reach
}
-//
// Return a configuration set containing only the configurations from
// {@code configs} which are in a {@link RuleStopState}. If all
// configurations in {@code configs} are already in a rule stop state, p
@@ -636,7 +636,6 @@ func (p *ParserATNSimulator) computeReachSet(closure ATNConfigSet, t int, fullCt
// @return {@code configs} if all configurations in {@code configs} are in a
// rule stop state, otherwise return a Newconfiguration set containing only
// the configurations from {@code configs} which are in a rule stop state
-//
func (p *ParserATNSimulator) removeAllConfigsNotInRuleStopState(configs ATNConfigSet, lookToEndOfRule bool) ATNConfigSet {
if PredictionModeallConfigsInRuleStopStates(configs) {
return configs
@@ -662,16 +661,20 @@ func (p *ParserATNSimulator) computeStartState(a ATNState, ctx RuleContext, full
// always at least the implicit call to start rule
initialContext := predictionContextFromRuleContext(p.atn, ctx)
configs := NewBaseATNConfigSet(fullCtx)
+ if ParserATNSimulatorDebug || ParserATNSimulatorTraceATNSim {
+ fmt.Println("computeStartState from ATN state " + a.String() +
+ " initialContext=" + initialContext.String())
+ }
+
for i := 0; i < len(a.GetTransitions()); i++ {
target := a.GetTransitions()[i].getTarget()
c := NewBaseATNConfig6(target, i+1, initialContext)
- closureBusy := newArray2DHashSet(nil, nil)
+ closureBusy := NewJStore[ATNConfig, Comparator[ATNConfig]](atnConfCompInst)
p.closure(c, configs, closureBusy, true, fullCtx, false)
}
return configs
}
-//
// This method transforms the start state computed by
// {@link //computeStartState} to the special start state used by a
// precedence DFA for a particular precedence value. The transformation
@@ -726,7 +729,6 @@ func (p *ParserATNSimulator) computeStartState(a ATNState, ctx RuleContext, full
// @return The transformed configuration set representing the start state
// for a precedence DFA at a particular precedence level (determined by
// calling {@link Parser//getPrecedence}).
-//
func (p *ParserATNSimulator) applyPrecedenceFilter(configs ATNConfigSet) ATNConfigSet {
statesFromAlt1 := make(map[int]PredictionContext)
@@ -760,7 +762,7 @@ func (p *ParserATNSimulator) applyPrecedenceFilter(configs ATNConfigSet) ATNConf
// (basically a graph subtraction algorithm).
if !config.getPrecedenceFilterSuppressed() {
context := statesFromAlt1[config.GetState().GetStateNumber()]
- if context != nil && context.equals(config.GetContext()) {
+ if context != nil && context.Equals(config.GetContext()) {
// eliminated
continue
}
@@ -824,7 +826,6 @@ func (p *ParserATNSimulator) getPredicatePredictions(ambigAlts *BitSet, altToPre
return pairs
}
-//
// This method is used to improve the localization of error messages by
// choosing an alternative rather than panicing a
// {@link NoViableAltException} in particular prediction scenarios where the
@@ -869,7 +870,6 @@ func (p *ParserATNSimulator) getPredicatePredictions(ambigAlts *BitSet, altToPre
// @return The value to return from {@link //AdaptivePredict}, or
// {@link ATN//INVALID_ALT_NUMBER} if a suitable alternative was not
// identified and {@link //AdaptivePredict} should Report an error instead.
-//
func (p *ParserATNSimulator) getSynValidOrSemInvalidAltThatFinishedDecisionEntryRule(configs ATNConfigSet, outerContext ParserRuleContext) int {
cfgs := p.splitAccordingToSemanticValidity(configs, outerContext)
semValidConfigs := cfgs[0]
@@ -938,11 +938,11 @@ func (p *ParserATNSimulator) splitAccordingToSemanticValidity(configs ATNConfigS
}
// Look through a list of predicate/alt pairs, returning alts for the
-// pairs that win. A {@code NONE} predicate indicates an alt containing an
-// unpredicated config which behaves as "always true." If !complete
-// then we stop at the first predicate that evaluates to true. This
-// includes pairs with nil predicates.
//
+// pairs that win. A {@code NONE} predicate indicates an alt containing an
+// unpredicated config which behaves as "always true." If !complete
+// then we stop at the first predicate that evaluates to true. This
+// includes pairs with nil predicates.
func (p *ParserATNSimulator) evalSemanticContext(predPredictions []*PredPrediction, outerContext ParserRuleContext, complete bool) *BitSet {
predictions := NewBitSet()
for i := 0; i < len(predPredictions); i++ {
@@ -972,16 +972,16 @@ func (p *ParserATNSimulator) evalSemanticContext(predPredictions []*PredPredicti
return predictions
}
-func (p *ParserATNSimulator) closure(config ATNConfig, configs ATNConfigSet, closureBusy Set, collectPredicates, fullCtx, treatEOFAsEpsilon bool) {
+func (p *ParserATNSimulator) closure(config ATNConfig, configs ATNConfigSet, closureBusy *JStore[ATNConfig, Comparator[ATNConfig]], collectPredicates, fullCtx, treatEOFAsEpsilon bool) {
initialDepth := 0
p.closureCheckingStopState(config, configs, closureBusy, collectPredicates,
fullCtx, initialDepth, treatEOFAsEpsilon)
}
-func (p *ParserATNSimulator) closureCheckingStopState(config ATNConfig, configs ATNConfigSet, closureBusy Set, collectPredicates, fullCtx bool, depth int, treatEOFAsEpsilon bool) {
- if ParserATNSimulatorDebug {
+func (p *ParserATNSimulator) closureCheckingStopState(config ATNConfig, configs ATNConfigSet, closureBusy *JStore[ATNConfig, Comparator[ATNConfig]], collectPredicates, fullCtx bool, depth int, treatEOFAsEpsilon bool) {
+ if ParserATNSimulatorTraceATNSim {
fmt.Println("closure(" + config.String() + ")")
- fmt.Println("configs(" + configs.String() + ")")
+ //fmt.Println("configs(" + configs.String() + ")")
if config.GetReachesIntoOuterContext() > 50 {
panic("problem")
}
@@ -1031,7 +1031,7 @@ func (p *ParserATNSimulator) closureCheckingStopState(config ATNConfig, configs
}
// Do the actual work of walking epsilon edges//
-func (p *ParserATNSimulator) closureWork(config ATNConfig, configs ATNConfigSet, closureBusy Set, collectPredicates, fullCtx bool, depth int, treatEOFAsEpsilon bool) {
+func (p *ParserATNSimulator) closureWork(config ATNConfig, configs ATNConfigSet, closureBusy *JStore[ATNConfig, Comparator[ATNConfig]], collectPredicates, fullCtx bool, depth int, treatEOFAsEpsilon bool) {
state := config.GetState()
// optimization
if !state.GetEpsilonOnlyTransitions() {
@@ -1066,7 +1066,8 @@ func (p *ParserATNSimulator) closureWork(config ATNConfig, configs ATNConfigSet,
c.SetReachesIntoOuterContext(c.GetReachesIntoOuterContext() + 1)
- if closureBusy.Add(c) != c {
+ _, present := closureBusy.Put(c)
+ if present {
// avoid infinite recursion for right-recursive rules
continue
}
@@ -1077,9 +1078,13 @@ func (p *ParserATNSimulator) closureWork(config ATNConfig, configs ATNConfigSet,
fmt.Println("dips into outer ctx: " + c.String())
}
} else {
- if !t.getIsEpsilon() && closureBusy.Add(c) != c {
- // avoid infinite recursion for EOF* and EOF+
- continue
+
+ if !t.getIsEpsilon() {
+ _, present := closureBusy.Put(c)
+ if present {
+ // avoid infinite recursion for EOF* and EOF+
+ continue
+ }
}
if _, ok := t.(*RuleTransition); ok {
// latch when newDepth goes negative - once we step out of the entry context we can't return
@@ -1104,7 +1109,16 @@ func (p *ParserATNSimulator) canDropLoopEntryEdgeInLeftRecursiveRule(config ATNC
// left-recursion elimination. For efficiency, also check if
// the context has an empty stack case. If so, it would mean
// global FOLLOW so we can't perform optimization
- if startLoop, ok := _p.(StarLoopEntryState); !ok || !startLoop.precedenceRuleDecision || config.GetContext().isEmpty() || config.GetContext().hasEmptyPath() {
+ if _p.GetStateType() != ATNStateStarLoopEntry {
+ return false
+ }
+ startLoop, ok := _p.(*StarLoopEntryState)
+ if !ok {
+ return false
+ }
+ if !startLoop.precedenceRuleDecision ||
+ config.GetContext().isEmpty() ||
+ config.GetContext().hasEmptyPath() {
return false
}
@@ -1117,8 +1131,8 @@ func (p *ParserATNSimulator) canDropLoopEntryEdgeInLeftRecursiveRule(config ATNC
return false
}
}
-
- decisionStartState := _p.(BlockStartState).GetTransitions()[0].getTarget().(BlockStartState)
+ x := _p.GetTransitions()[0].getTarget()
+ decisionStartState := x.(BlockStartState)
blockEndStateNum := decisionStartState.getEndState().stateNumber
blockEndState := p.atn.states[blockEndStateNum].(*BlockEndState)
@@ -1355,13 +1369,12 @@ func (p *ParserATNSimulator) GetTokenName(t int) string {
return "EOF"
}
- if p.parser != nil && p.parser.GetLiteralNames() != nil {
- if t >= len(p.parser.GetLiteralNames()) {
- fmt.Println(strconv.Itoa(t) + " ttype out of range: " + strings.Join(p.parser.GetLiteralNames(), ","))
- // fmt.Println(p.parser.GetInputStream().(TokenStream).GetAllText()) // p seems incorrect
- } else {
- return p.parser.GetLiteralNames()[t] + "<" + strconv.Itoa(t) + ">"
- }
+ if p.parser != nil && p.parser.GetLiteralNames() != nil && t < len(p.parser.GetLiteralNames()) {
+ return p.parser.GetLiteralNames()[t] + "<" + strconv.Itoa(t) + ">"
+ }
+
+ if p.parser != nil && p.parser.GetLiteralNames() != nil && t < len(p.parser.GetSymbolicNames()) {
+ return p.parser.GetSymbolicNames()[t] + "<" + strconv.Itoa(t) + ">"
}
return strconv.Itoa(t)
@@ -1372,9 +1385,9 @@ func (p *ParserATNSimulator) getLookaheadName(input TokenStream) string {
}
// Used for debugging in AdaptivePredict around execATN but I cut
-// it out for clarity now that alg. works well. We can leave p
-// "dead" code for a bit.
//
+// it out for clarity now that alg. works well. We can leave p
+// "dead" code for a bit.
func (p *ParserATNSimulator) dumpDeadEndConfigs(nvae *NoViableAltException) {
panic("Not implemented")
@@ -1421,7 +1434,6 @@ func (p *ParserATNSimulator) getUniqueAlt(configs ATNConfigSet) int {
return alt
}
-//
// Add an edge to the DFA, if possible. This method calls
// {@link //addDFAState} to ensure the {@code to} state is present in the
// DFA. If {@code from} is {@code nil}, or if {@code t} is outside the
@@ -1440,7 +1452,6 @@ func (p *ParserATNSimulator) getUniqueAlt(configs ATNConfigSet) int {
// @return If {@code to} is {@code nil}, p method returns {@code nil}
// otherwise p method returns the result of calling {@link //addDFAState}
// on {@code to}
-//
func (p *ParserATNSimulator) addDFAEdge(dfa *DFA, from *DFAState, t int, to *DFAState) *DFAState {
if ParserATNSimulatorDebug {
fmt.Println("EDGE " + from.String() + " -> " + to.String() + " upon " + p.GetTokenName(t))
@@ -1472,7 +1483,6 @@ func (p *ParserATNSimulator) addDFAEdge(dfa *DFA, from *DFAState, t int, to *DFA
return to
}
-//
// Add state {@code D} to the DFA if it is not already present, and return
// the actual instance stored in the DFA. If a state equivalent to {@code D}
// is already in the DFA, the existing state is returned. Otherwise p
@@ -1486,25 +1496,30 @@ func (p *ParserATNSimulator) addDFAEdge(dfa *DFA, from *DFAState, t int, to *DFA
// @return The state stored in the DFA. This will be either the existing
// state if {@code D} is already in the DFA, or {@code D} itself if the
// state was not already present.
-//
func (p *ParserATNSimulator) addDFAState(dfa *DFA, d *DFAState) *DFAState {
if d == ATNSimulatorError {
return d
}
- hash := d.hash()
- existing, ok := dfa.getState(hash)
- if ok {
+ existing, present := dfa.states.Get(d)
+ if present {
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Print("addDFAState " + d.String() + " exists")
+ }
return existing
}
- d.stateNumber = dfa.numStates()
+
+ // The state was not present, so update it with configs
+ //
+ d.stateNumber = dfa.states.Len()
if !d.configs.ReadOnly() {
d.configs.OptimizeConfigs(p.BaseATNSimulator)
d.configs.SetReadOnly(true)
}
- dfa.setState(hash, d)
- if ParserATNSimulatorDebug {
- fmt.Println("adding NewDFA state: " + d.String())
+ dfa.states.Put(d)
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("addDFAState new " + d.String())
}
+
return d
}
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser_rule_context.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_rule_context.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser_rule_context.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_rule_context.go
index 49cd10c5ffc..1c8cee74795 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/parser_rule_context.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_rule_context.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -340,7 +340,7 @@ func (prc *BaseParserRuleContext) String(ruleNames []string, stop RuleContext) s
return s
}
-var RuleContextEmpty = NewBaseParserRuleContext(nil, -1)
+var ParserRuleContextEmpty = NewBaseParserRuleContext(nil, -1)
type InterpreterRuleContext interface {
ParserRuleContext
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/prediction_context.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/prediction_context.go
similarity index 81%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/prediction_context.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/prediction_context.go
index 9fdfd52b26c..ba62af36108 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/prediction_context.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/prediction_context.go
@@ -1,10 +1,12 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
package antlr
import (
+ "fmt"
+ "golang.org/x/exp/slices"
"strconv"
)
@@ -26,10 +28,10 @@ var (
)
type PredictionContext interface {
- hash() int
+ Hash() int
+ Equals(interface{}) bool
GetParent(int) PredictionContext
getReturnState(int) int
- equals(PredictionContext) bool
length() int
isEmpty() bool
hasEmptyPath() bool
@@ -53,7 +55,7 @@ func (b *BasePredictionContext) isEmpty() bool {
func calculateHash(parent PredictionContext, returnState int) int {
h := murmurInit(1)
- h = murmurUpdate(h, parent.hash())
+ h = murmurUpdate(h, parent.Hash())
h = murmurUpdate(h, returnState)
return murmurFinish(h, 2)
}
@@ -86,7 +88,6 @@ func NewPredictionContextCache() *PredictionContextCache {
// Add a context to the cache and return it. If the context already exists,
// return that one instead and do not add a Newcontext to the cache.
// Protect shared cache from unsafe thread access.
-//
func (p *PredictionContextCache) add(ctx PredictionContext) PredictionContext {
if ctx == BasePredictionContextEMPTY {
return BasePredictionContextEMPTY
@@ -160,28 +161,28 @@ func (b *BaseSingletonPredictionContext) hasEmptyPath() bool {
return b.returnState == BasePredictionContextEmptyReturnState
}
-func (b *BaseSingletonPredictionContext) equals(other PredictionContext) bool {
+func (b *BaseSingletonPredictionContext) Hash() int {
+ return b.cachedHash
+}
+
+func (b *BaseSingletonPredictionContext) Equals(other interface{}) bool {
if b == other {
return true
- } else if _, ok := other.(*BaseSingletonPredictionContext); !ok {
+ }
+ if _, ok := other.(*BaseSingletonPredictionContext); !ok {
return false
- } else if b.hash() != other.hash() {
- return false // can't be same if hash is different
}
otherP := other.(*BaseSingletonPredictionContext)
- if b.returnState != other.getReturnState(0) {
+ if b.returnState != otherP.getReturnState(0) {
return false
- } else if b.parentCtx == nil {
+ }
+ if b.parentCtx == nil {
return otherP.parentCtx == nil
}
- return b.parentCtx.equals(otherP.parentCtx)
-}
-
-func (b *BaseSingletonPredictionContext) hash() int {
- return b.cachedHash
+ return b.parentCtx.Equals(otherP.parentCtx)
}
func (b *BaseSingletonPredictionContext) String() string {
@@ -215,7 +216,7 @@ func NewEmptyPredictionContext() *EmptyPredictionContext {
p := new(EmptyPredictionContext)
p.BaseSingletonPredictionContext = NewBaseSingletonPredictionContext(nil, BasePredictionContextEmptyReturnState)
-
+ p.cachedHash = calculateEmptyHash()
return p
}
@@ -231,7 +232,11 @@ func (e *EmptyPredictionContext) getReturnState(index int) int {
return e.returnState
}
-func (e *EmptyPredictionContext) equals(other PredictionContext) bool {
+func (e *EmptyPredictionContext) Hash() int {
+ return e.cachedHash
+}
+
+func (e *EmptyPredictionContext) Equals(other interface{}) bool {
return e == other
}
@@ -254,7 +259,7 @@ func NewArrayPredictionContext(parents []PredictionContext, returnStates []int)
hash := murmurInit(1)
for _, parent := range parents {
- hash = murmurUpdate(hash, parent.hash())
+ hash = murmurUpdate(hash, parent.Hash())
}
for _, returnState := range returnStates {
@@ -298,18 +303,31 @@ func (a *ArrayPredictionContext) getReturnState(index int) int {
return a.returnStates[index]
}
-func (a *ArrayPredictionContext) equals(other PredictionContext) bool {
- if _, ok := other.(*ArrayPredictionContext); !ok {
+// Equals is the default comparison function for ArrayPredictionContext when no specialized
+// implementation is needed for a collection
+func (a *ArrayPredictionContext) Equals(o interface{}) bool {
+ if a == o {
+ return true
+ }
+ other, ok := o.(*ArrayPredictionContext)
+ if !ok {
return false
- } else if a.cachedHash != other.hash() {
+ }
+ if a.cachedHash != other.Hash() {
return false // can't be same if hash is different
- } else {
- otherP := other.(*ArrayPredictionContext)
- return &a.returnStates == &otherP.returnStates && &a.parents == &otherP.parents
}
+
+ // Must compare the actual array elements and not just the array address
+ //
+ return slices.Equal(a.returnStates, other.returnStates) &&
+ slices.EqualFunc(a.parents, other.parents, func(x, y PredictionContext) bool {
+ return x.Equals(y)
+ })
}
-func (a *ArrayPredictionContext) hash() int {
+// Hash is the default hash function for ArrayPredictionContext when no specialized
+// implementation is needed for a collection
+func (a *ArrayPredictionContext) Hash() int {
return a.BasePredictionContext.cachedHash
}
@@ -343,11 +361,11 @@ func (a *ArrayPredictionContext) String() string {
// /
func predictionContextFromRuleContext(a *ATN, outerContext RuleContext) PredictionContext {
if outerContext == nil {
- outerContext = RuleContextEmpty
+ outerContext = ParserRuleContextEmpty
}
// if we are in RuleContext of start rule, s, then BasePredictionContext
// is EMPTY. Nobody called us. (if we are empty, return empty)
- if outerContext.GetParent() == nil || outerContext == RuleContextEmpty {
+ if outerContext.GetParent() == nil || outerContext == ParserRuleContextEmpty {
return BasePredictionContextEMPTY
}
// If we have a parent, convert it to a BasePredictionContext graph
@@ -359,11 +377,20 @@ func predictionContextFromRuleContext(a *ATN, outerContext RuleContext) Predicti
}
func merge(a, b PredictionContext, rootIsWildcard bool, mergeCache *DoubleDict) PredictionContext {
- // share same graph if both same
- if a == b {
+
+ // Share same graph if both same
+ //
+ if a == b || a.Equals(b) {
return a
}
+ // In Java, EmptyPredictionContext inherits from SingletonPredictionContext, and so the test
+ // in java for SingletonPredictionContext will succeed and a new ArrayPredictionContext will be created
+ // from it.
+ // In go, EmptyPredictionContext does not equate to SingletonPredictionContext and so that conversion
+ // will fail. We need to test for both Empty and Singleton and create an ArrayPredictionContext from
+ // either of them.
+
ac, ok1 := a.(*BaseSingletonPredictionContext)
bc, ok2 := b.(*BaseSingletonPredictionContext)
@@ -380,17 +407,32 @@ func merge(a, b PredictionContext, rootIsWildcard bool, mergeCache *DoubleDict)
return b
}
}
- // convert singleton so both are arrays to normalize
- if _, ok := a.(*BaseSingletonPredictionContext); ok {
- a = NewArrayPredictionContext([]PredictionContext{a.GetParent(0)}, []int{a.getReturnState(0)})
+
+ // Convert Singleton or Empty so both are arrays to normalize - We should not use the existing parameters
+ // here.
+ //
+ // TODO: I think that maybe the Prediction Context structs should be redone as there is a chance we will see this mess again - maybe redo the logic here
+
+ var arp, arb *ArrayPredictionContext
+ var ok bool
+ if arp, ok = a.(*ArrayPredictionContext); ok {
+ } else if _, ok = a.(*BaseSingletonPredictionContext); ok {
+ arp = NewArrayPredictionContext([]PredictionContext{a.GetParent(0)}, []int{a.getReturnState(0)})
+ } else if _, ok = a.(*EmptyPredictionContext); ok {
+ arp = NewArrayPredictionContext([]PredictionContext{}, []int{})
}
- if _, ok := b.(*BaseSingletonPredictionContext); ok {
- b = NewArrayPredictionContext([]PredictionContext{b.GetParent(0)}, []int{b.getReturnState(0)})
+
+ if arb, ok = b.(*ArrayPredictionContext); ok {
+ } else if _, ok = b.(*BaseSingletonPredictionContext); ok {
+ arb = NewArrayPredictionContext([]PredictionContext{b.GetParent(0)}, []int{b.getReturnState(0)})
+ } else if _, ok = b.(*EmptyPredictionContext); ok {
+ arb = NewArrayPredictionContext([]PredictionContext{}, []int{})
}
- return mergeArrays(a.(*ArrayPredictionContext), b.(*ArrayPredictionContext), rootIsWildcard, mergeCache)
+
+ // Both arp and arb
+ return mergeArrays(arp, arb, rootIsWildcard, mergeCache)
}
-//
// Merge two {@link SingletonBasePredictionContext} instances.
//
// Stack tops equal, parents merge is same return left graph.
@@ -423,11 +465,11 @@ func merge(a, b PredictionContext, rootIsWildcard bool, mergeCache *DoubleDict)
// /
func mergeSingletons(a, b *BaseSingletonPredictionContext, rootIsWildcard bool, mergeCache *DoubleDict) PredictionContext {
if mergeCache != nil {
- previous := mergeCache.Get(a.hash(), b.hash())
+ previous := mergeCache.Get(a.Hash(), b.Hash())
if previous != nil {
return previous.(PredictionContext)
}
- previous = mergeCache.Get(b.hash(), a.hash())
+ previous = mergeCache.Get(b.Hash(), a.Hash())
if previous != nil {
return previous.(PredictionContext)
}
@@ -436,7 +478,7 @@ func mergeSingletons(a, b *BaseSingletonPredictionContext, rootIsWildcard bool,
rootMerge := mergeRoot(a, b, rootIsWildcard)
if rootMerge != nil {
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), rootMerge)
+ mergeCache.set(a.Hash(), b.Hash(), rootMerge)
}
return rootMerge
}
@@ -456,7 +498,7 @@ func mergeSingletons(a, b *BaseSingletonPredictionContext, rootIsWildcard bool,
// Newjoined parent so create Newsingleton pointing to it, a'
spc := SingletonBasePredictionContextCreate(parent, a.returnState)
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), spc)
+ mergeCache.set(a.Hash(), b.Hash(), spc)
}
return spc
}
@@ -478,7 +520,7 @@ func mergeSingletons(a, b *BaseSingletonPredictionContext, rootIsWildcard bool,
parents := []PredictionContext{singleParent, singleParent}
apc := NewArrayPredictionContext(parents, payloads)
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), apc)
+ mergeCache.set(a.Hash(), b.Hash(), apc)
}
return apc
}
@@ -494,12 +536,11 @@ func mergeSingletons(a, b *BaseSingletonPredictionContext, rootIsWildcard bool,
}
apc := NewArrayPredictionContext(parents, payloads)
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), apc)
+ mergeCache.set(a.Hash(), b.Hash(), apc)
}
return apc
}
-//
// Handle case where at least one of {@code a} or {@code b} is
// {@link //EMPTY}. In the following diagrams, the symbol {@code $} is used
// to represent {@link //EMPTY}.
@@ -561,7 +602,6 @@ func mergeRoot(a, b SingletonPredictionContext, rootIsWildcard bool) PredictionC
return nil
}
-//
// Merge two {@link ArrayBasePredictionContext} instances.
//
//
Different tops, different parents.
@@ -583,12 +623,18 @@ func mergeRoot(a, b SingletonPredictionContext, rootIsWildcard bool) PredictionC
// /
func mergeArrays(a, b *ArrayPredictionContext, rootIsWildcard bool, mergeCache *DoubleDict) PredictionContext {
if mergeCache != nil {
- previous := mergeCache.Get(a.hash(), b.hash())
+ previous := mergeCache.Get(a.Hash(), b.Hash())
if previous != nil {
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("mergeArrays a=" + a.String() + ",b=" + b.String() + " -> previous")
+ }
return previous.(PredictionContext)
}
- previous = mergeCache.Get(b.hash(), a.hash())
+ previous = mergeCache.Get(b.Hash(), a.Hash())
if previous != nil {
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("mergeArrays a=" + a.String() + ",b=" + b.String() + " -> previous")
+ }
return previous.(PredictionContext)
}
}
@@ -608,7 +654,7 @@ func mergeArrays(a, b *ArrayPredictionContext, rootIsWildcard bool, mergeCache *
payload := a.returnStates[i]
// $+$ = $
bothDollars := payload == BasePredictionContextEmptyReturnState && aParent == nil && bParent == nil
- axAX := (aParent != nil && bParent != nil && aParent == bParent) // ax+ax
+ axAX := aParent != nil && bParent != nil && aParent == bParent // ax+ax
// ->
// ax
if bothDollars || axAX {
@@ -651,7 +697,7 @@ func mergeArrays(a, b *ArrayPredictionContext, rootIsWildcard bool, mergeCache *
if k == 1 { // for just one merged element, return singleton top
pc := SingletonBasePredictionContextCreate(mergedParents[0], mergedReturnStates[0])
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), pc)
+ mergeCache.set(a.Hash(), b.Hash(), pc)
}
return pc
}
@@ -663,27 +709,36 @@ func mergeArrays(a, b *ArrayPredictionContext, rootIsWildcard bool, mergeCache *
// if we created same array as a or b, return that instead
// TODO: track whether this is possible above during merge sort for speed
+ // TODO: In go, I do not think we can just do M == xx as M is a brand new allocation. This could be causing allocation problems
if M == a {
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), a)
+ mergeCache.set(a.Hash(), b.Hash(), a)
+ }
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("mergeArrays a=" + a.String() + ",b=" + b.String() + " -> a")
}
return a
}
if M == b {
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), b)
+ mergeCache.set(a.Hash(), b.Hash(), b)
+ }
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("mergeArrays a=" + a.String() + ",b=" + b.String() + " -> b")
}
return b
}
combineCommonParents(mergedParents)
if mergeCache != nil {
- mergeCache.set(a.hash(), b.hash(), M)
+ mergeCache.set(a.Hash(), b.Hash(), M)
+ }
+ if ParserATNSimulatorTraceATNSim {
+ fmt.Println("mergeArrays a=" + a.String() + ",b=" + b.String() + " -> " + M.String())
}
return M
}
-//
// Make pass over all M {@code parents} merge any {@code equals()}
// ones.
// /
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/prediction_mode.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/prediction_mode.go
similarity index 95%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/prediction_mode.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/prediction_mode.go
index 15718f912bc..7b9b72fab1e 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/prediction_mode.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/prediction_mode.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -70,7 +70,6 @@ const (
PredictionModeLLExactAmbigDetection = 2
)
-//
// Computes the SLL prediction termination condition.
//
//
@@ -108,9 +107,9 @@ const (
// The single-alt-state thing lets prediction continue upon rules like
// (otherwise, it would admit defeat too soon):
//
-// {@code [12|1|[], 6|2|[], 12|2|[]]. s : (ID | ID ID?) '' }
+// {@code [12|1|[], 6|2|[], 12|2|[]]. s : (ID | ID ID?) ” }
//
-// When the ATN simulation reaches the state before {@code ''}, it has a
+//
When the ATN simulation reaches the state before {@code ”}, it has a
// DFA state that looks like: {@code [12|1|[], 6|2|[], 12|2|[]]}. Naturally
// {@code 12|1|[]} and {@code 12|2|[]} conflict, but we cannot stop
// processing this node because alternative to has another way to continue,
@@ -152,16 +151,15 @@ const (
//
//
Before testing these configurations against others, we have to merge
// {@code x} and {@code x'} (without modifying the existing configurations).
-// For example, we test {@code (x+x')==x''} when looking for conflicts in
+// For example, we test {@code (x+x')==x”} when looking for conflicts in
// the following configurations.
//
-// {@code (s, 1, x, {}), (s, 1, x', {p}), (s, 2, x'', {})}
+// {@code (s, 1, x, {}), (s, 1, x', {p}), (s, 2, x”, {})}
//
// If the configuration set has predicates (as indicated by
// {@link ATNConfigSet//hasSemanticContext}), this algorithm makes a copy of
// the configurations to strip out all of the predicates so that a standard
// {@link ATNConfigSet} will merge everything ignoring predicates.
-//
func PredictionModehasSLLConflictTerminatingPrediction(mode int, configs ATNConfigSet) bool {
// Configs in rule stop states indicate reaching the end of the decision
// rule (local context) or end of start rule (full context). If all
@@ -229,7 +227,6 @@ func PredictionModeallConfigsInRuleStopStates(configs ATNConfigSet) bool {
return true
}
-//
// Full LL prediction termination.
//
// Can we stop looking ahead during ATN simulation or is there some
@@ -334,7 +331,7 @@ func PredictionModeallConfigsInRuleStopStates(configs ATNConfigSet) bool {
//
//
//
{@code (s, 1, x)}, {@code (s, 2, x)}, {@code (s', 1, y)},
-// {@code (s', 2, y)}, {@code (s'', 1, z)} yields non-conflicting set
+// {@code (s', 2, y)}, {@code (s”, 1, z)} yields non-conflicting set
// {@code {1}} U conflicting sets {@code min({1,2})} U {@code min({1,2})} =
// {@code {1}} => stop and predict 1
//
@@ -369,31 +366,26 @@ func PredictionModeallConfigsInRuleStopStates(configs ATNConfigSet) bool {
// two or one and three so we keep going. We can only stop prediction when
// we need exact ambiguity detection when the sets look like
// {@code A={{1,2}}} or {@code {{1,2},{1,2}}}, etc...
-//
func PredictionModeresolvesToJustOneViableAlt(altsets []*BitSet) int {
return PredictionModegetSingleViableAlt(altsets)
}
-//
// Determines if every alternative subset in {@code altsets} contains more
// than one alternative.
//
// @param altsets a collection of alternative subsets
// @return {@code true} if every {@link BitSet} in {@code altsets} has
// {@link BitSet//cardinality cardinality} > 1, otherwise {@code false}
-//
func PredictionModeallSubsetsConflict(altsets []*BitSet) bool {
return !PredictionModehasNonConflictingAltSet(altsets)
}
-//
// Determines if any single alternative subset in {@code altsets} contains
// exactly one alternative.
//
// @param altsets a collection of alternative subsets
// @return {@code true} if {@code altsets} contains a {@link BitSet} with
// {@link BitSet//cardinality cardinality} 1, otherwise {@code false}
-//
func PredictionModehasNonConflictingAltSet(altsets []*BitSet) bool {
for i := 0; i < len(altsets); i++ {
alts := altsets[i]
@@ -404,14 +396,12 @@ func PredictionModehasNonConflictingAltSet(altsets []*BitSet) bool {
return false
}
-//
// Determines if any single alternative subset in {@code altsets} contains
// more than one alternative.
//
// @param altsets a collection of alternative subsets
// @return {@code true} if {@code altsets} contains a {@link BitSet} with
// {@link BitSet//cardinality cardinality} > 1, otherwise {@code false}
-//
func PredictionModehasConflictingAltSet(altsets []*BitSet) bool {
for i := 0; i < len(altsets); i++ {
alts := altsets[i]
@@ -422,13 +412,11 @@ func PredictionModehasConflictingAltSet(altsets []*BitSet) bool {
return false
}
-//
// Determines if every alternative subset in {@code altsets} is equivalent.
//
// @param altsets a collection of alternative subsets
// @return {@code true} if every member of {@code altsets} is equal to the
// others, otherwise {@code false}
-//
func PredictionModeallSubsetsEqual(altsets []*BitSet) bool {
var first *BitSet
@@ -444,13 +432,11 @@ func PredictionModeallSubsetsEqual(altsets []*BitSet) bool {
return true
}
-//
// Returns the unique alternative predicted by all alternative subsets in
// {@code altsets}. If no such alternative exists, this method returns
// {@link ATN//INVALID_ALT_NUMBER}.
//
// @param altsets a collection of alternative subsets
-//
func PredictionModegetUniqueAlt(altsets []*BitSet) int {
all := PredictionModeGetAlts(altsets)
if all.length() == 1 {
@@ -466,7 +452,6 @@ func PredictionModegetUniqueAlt(altsets []*BitSet) int {
//
// @param altsets a collection of alternative subsets
// @return the set of represented alternatives in {@code altsets}
-//
func PredictionModeGetAlts(altsets []*BitSet) *BitSet {
all := NewBitSet()
for _, alts := range altsets {
@@ -475,44 +460,35 @@ func PredictionModeGetAlts(altsets []*BitSet) *BitSet {
return all
}
-//
-// This func gets the conflicting alt subsets from a configuration set.
+// PredictionModegetConflictingAltSubsets gets the conflicting alt subsets from a configuration set.
// For each configuration {@code c} in {@code configs}:
//
//
// map[c] U= c.{@link ATNConfig//alt alt} // map hash/equals uses s and x, not
// alt and not pred
//
-//
func PredictionModegetConflictingAltSubsets(configs ATNConfigSet) []*BitSet {
- configToAlts := make(map[int]*BitSet)
+ configToAlts := NewJMap[ATNConfig, *BitSet, *ATNAltConfigComparator[ATNConfig]](atnAltCfgEqInst)
for _, c := range configs.GetItems() {
- key := 31 * c.GetState().GetStateNumber() + c.GetContext().hash()
- alts, ok := configToAlts[key]
+ alts, ok := configToAlts.Get(c)
if !ok {
alts = NewBitSet()
- configToAlts[key] = alts
+ configToAlts.Put(c, alts)
}
alts.add(c.GetAlt())
}
- values := make([]*BitSet, 0, 10)
- for _, v := range configToAlts {
- values = append(values, v)
- }
- return values
+ return configToAlts.Values()
}
-//
-// Get a map from state to alt subset from a configuration set. For each
+// PredictionModeGetStateToAltMap gets a map from state to alt subset from a configuration set. For each
// configuration {@code c} in {@code configs}:
//
//
// map[c.{@link ATNConfig//state state}] U= c.{@link ATNConfig//alt alt}
//
-//
func PredictionModeGetStateToAltMap(configs ATNConfigSet) *AltDict {
m := NewAltDict()
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/recognizer.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/recognizer.go
similarity index 92%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/recognizer.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/recognizer.go
index 93efcf355d8..bfe542d0914 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/recognizer.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/recognizer.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -49,7 +49,7 @@ var tokenTypeMapCache = make(map[string]int)
var ruleIndexMapCache = make(map[string]int)
func (b *BaseRecognizer) checkVersion(toolVersion string) {
- runtimeVersion := "4.10.1"
+ runtimeVersion := "4.12.0"
if runtimeVersion != toolVersion {
fmt.Println("ANTLR runtime and generated code versions disagree: " + runtimeVersion + "!=" + toolVersion)
}
@@ -108,7 +108,6 @@ func (b *BaseRecognizer) SetState(v int) {
// Get a map from rule names to rule indexes.
//
// Used for XPath and tree pattern compilation.
-//
func (b *BaseRecognizer) GetRuleIndexMap() map[string]int {
panic("Method not defined!")
@@ -171,18 +170,18 @@ func (b *BaseRecognizer) GetErrorHeader(e RecognitionException) string {
}
// How should a token be displayed in an error message? The default
-// is to display just the text, but during development you might
-// want to have a lot of information spit out. Override in that case
-// to use t.String() (which, for CommonToken, dumps everything about
-// the token). This is better than forcing you to override a method in
-// your token objects because you don't have to go modify your lexer
-// so that it creates a NewJava type.
+//
+// is to display just the text, but during development you might
+// want to have a lot of information spit out. Override in that case
+// to use t.String() (which, for CommonToken, dumps everything about
+// the token). This is better than forcing you to override a method in
+// your token objects because you don't have to go modify your lexer
+// so that it creates a NewJava type.
//
// @deprecated This method is not called by the ANTLR 4 Runtime. Specific
// implementations of {@link ANTLRErrorStrategy} may provide a similar
// feature when necessary. For example, see
// {@link DefaultErrorStrategy//GetTokenErrorDisplay}.
-//
func (b *BaseRecognizer) GetTokenErrorDisplay(t Token) string {
if t == nil {
return ""
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/rule_context.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/rule_context.go
similarity index 97%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/rule_context.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/rule_context.go
index 600cf8c0625..210699ba234 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/rule_context.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/rule_context.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/semantic_context.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/semantic_context.go
similarity index 85%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/semantic_context.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/semantic_context.go
index 9ada430779c..a702e99def7 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/semantic_context.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/semantic_context.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -18,12 +18,12 @@ import (
//
type SemanticContext interface {
- comparable
+ Equals(other Collectable[SemanticContext]) bool
+ Hash() int
evaluate(parser Recognizer, outerContext RuleContext) bool
evalPrecedence(parser Recognizer, outerContext RuleContext) SemanticContext
- hash() int
String() string
}
@@ -78,7 +78,7 @@ func NewPredicate(ruleIndex, predIndex int, isCtxDependent bool) *Predicate {
//The default {@link SemanticContext}, which is semantically equivalent to
//a predicate of the form {@code {true}?}.
-var SemanticContextNone SemanticContext = NewPredicate(-1, -1, false)
+var SemanticContextNone = NewPredicate(-1, -1, false)
func (p *Predicate) evalPrecedence(parser Recognizer, outerContext RuleContext) SemanticContext {
return p
@@ -95,7 +95,7 @@ func (p *Predicate) evaluate(parser Recognizer, outerContext RuleContext) bool {
return parser.Sempred(localctx, p.ruleIndex, p.predIndex)
}
-func (p *Predicate) equals(other interface{}) bool {
+func (p *Predicate) Equals(other Collectable[SemanticContext]) bool {
if p == other {
return true
} else if _, ok := other.(*Predicate); !ok {
@@ -107,7 +107,7 @@ func (p *Predicate) equals(other interface{}) bool {
}
}
-func (p *Predicate) hash() int {
+func (p *Predicate) Hash() int {
h := murmurInit(0)
h = murmurUpdate(h, p.ruleIndex)
h = murmurUpdate(h, p.predIndex)
@@ -151,17 +151,22 @@ func (p *PrecedencePredicate) compareTo(other *PrecedencePredicate) int {
return p.precedence - other.precedence
}
-func (p *PrecedencePredicate) equals(other interface{}) bool {
- if p == other {
- return true
- } else if _, ok := other.(*PrecedencePredicate); !ok {
+func (p *PrecedencePredicate) Equals(other Collectable[SemanticContext]) bool {
+
+ var op *PrecedencePredicate
+ var ok bool
+ if op, ok = other.(*PrecedencePredicate); !ok {
return false
- } else {
- return p.precedence == other.(*PrecedencePredicate).precedence
}
+
+ if p == op {
+ return true
+ }
+
+ return p.precedence == other.(*PrecedencePredicate).precedence
}
-func (p *PrecedencePredicate) hash() int {
+func (p *PrecedencePredicate) Hash() int {
h := uint32(1)
h = 31*h + uint32(p.precedence)
return int(h)
@@ -171,10 +176,10 @@ func (p *PrecedencePredicate) String() string {
return "{" + strconv.Itoa(p.precedence) + ">=prec}?"
}
-func PrecedencePredicatefilterPrecedencePredicates(set Set) []*PrecedencePredicate {
+func PrecedencePredicatefilterPrecedencePredicates(set *JStore[SemanticContext, Comparator[SemanticContext]]) []*PrecedencePredicate {
result := make([]*PrecedencePredicate, 0)
- set.Each(func(v interface{}) bool {
+ set.Each(func(v SemanticContext) bool {
if c2, ok := v.(*PrecedencePredicate); ok {
result = append(result, c2)
}
@@ -193,21 +198,21 @@ type AND struct {
func NewAND(a, b SemanticContext) *AND {
- operands := newArray2DHashSet(nil, nil)
+ operands := NewJStore[SemanticContext, Comparator[SemanticContext]](semctxEqInst)
if aa, ok := a.(*AND); ok {
for _, o := range aa.opnds {
- operands.Add(o)
+ operands.Put(o)
}
} else {
- operands.Add(a)
+ operands.Put(a)
}
if ba, ok := b.(*AND); ok {
for _, o := range ba.opnds {
- operands.Add(o)
+ operands.Put(o)
}
} else {
- operands.Add(b)
+ operands.Put(b)
}
precedencePredicates := PrecedencePredicatefilterPrecedencePredicates(operands)
if len(precedencePredicates) > 0 {
@@ -220,7 +225,7 @@ func NewAND(a, b SemanticContext) *AND {
}
}
- operands.Add(reduced)
+ operands.Put(reduced)
}
vs := operands.Values()
@@ -235,14 +240,15 @@ func NewAND(a, b SemanticContext) *AND {
return and
}
-func (a *AND) equals(other interface{}) bool {
+func (a *AND) Equals(other Collectable[SemanticContext]) bool {
if a == other {
return true
- } else if _, ok := other.(*AND); !ok {
+ }
+ if _, ok := other.(*AND); !ok {
return false
} else {
for i, v := range other.(*AND).opnds {
- if !a.opnds[i].equals(v) {
+ if !a.opnds[i].Equals(v) {
return false
}
}
@@ -250,13 +256,11 @@ func (a *AND) equals(other interface{}) bool {
}
}
-//
// {@inheritDoc}
//
//
// The evaluation of predicates by a context is short-circuiting, but
// unordered.
-//
func (a *AND) evaluate(parser Recognizer, outerContext RuleContext) bool {
for i := 0; i < len(a.opnds); i++ {
if !a.opnds[i].evaluate(parser, outerContext) {
@@ -304,18 +308,18 @@ func (a *AND) evalPrecedence(parser Recognizer, outerContext RuleContext) Semant
return result
}
-func (a *AND) hash() int {
+func (a *AND) Hash() int {
h := murmurInit(37) // Init with a value different from OR
for _, op := range a.opnds {
- h = murmurUpdate(h, op.hash())
+ h = murmurUpdate(h, op.Hash())
}
return murmurFinish(h, len(a.opnds))
}
-func (a *OR) hash() int {
+func (a *OR) Hash() int {
h := murmurInit(41) // Init with a value different from AND
for _, op := range a.opnds {
- h = murmurUpdate(h, op.hash())
+ h = murmurUpdate(h, op.Hash())
}
return murmurFinish(h, len(a.opnds))
}
@@ -345,21 +349,21 @@ type OR struct {
func NewOR(a, b SemanticContext) *OR {
- operands := newArray2DHashSet(nil, nil)
+ operands := NewJStore[SemanticContext, Comparator[SemanticContext]](semctxEqInst)
if aa, ok := a.(*OR); ok {
for _, o := range aa.opnds {
- operands.Add(o)
+ operands.Put(o)
}
} else {
- operands.Add(a)
+ operands.Put(a)
}
if ba, ok := b.(*OR); ok {
for _, o := range ba.opnds {
- operands.Add(o)
+ operands.Put(o)
}
} else {
- operands.Add(b)
+ operands.Put(b)
}
precedencePredicates := PrecedencePredicatefilterPrecedencePredicates(operands)
if len(precedencePredicates) > 0 {
@@ -372,7 +376,7 @@ func NewOR(a, b SemanticContext) *OR {
}
}
- operands.Add(reduced)
+ operands.Put(reduced)
}
vs := operands.Values()
@@ -388,14 +392,14 @@ func NewOR(a, b SemanticContext) *OR {
return o
}
-func (o *OR) equals(other interface{}) bool {
+func (o *OR) Equals(other Collectable[SemanticContext]) bool {
if o == other {
return true
} else if _, ok := other.(*OR); !ok {
return false
} else {
for i, v := range other.(*OR).opnds {
- if !o.opnds[i].equals(v) {
+ if !o.opnds[i].Equals(v) {
return false
}
}
@@ -406,7 +410,6 @@ func (o *OR) equals(other interface{}) bool {
//
// The evaluation of predicates by o context is short-circuiting, but
// unordered.
-//
func (o *OR) evaluate(parser Recognizer, outerContext RuleContext) bool {
for i := 0; i < len(o.opnds); i++ {
if o.opnds[i].evaluate(parser, outerContext) {
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/token.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token.go
similarity index 98%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/token.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token.go
index 2d8e99095d3..f73b06bc6a0 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/token.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
@@ -158,7 +158,6 @@ func NewCommonToken(source *TokenSourceCharStreamPair, tokenType, channel, start
// {@link Token//GetInputStream}.
//
// @param oldToken The token to copy.
-//
func (c *CommonToken) clone() *CommonToken {
t := NewCommonToken(c.source, c.tokenType, c.channel, c.start, c.stop)
t.tokenIndex = c.GetTokenIndex()
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/token_source.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token_source.go
similarity index 85%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/token_source.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token_source.go
index e023978fef4..a3f36eaa67f 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/token_source.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token_source.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/token_stream.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token_stream.go
similarity index 87%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/token_stream.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token_stream.go
index df92c814789..1527d43f608 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/token_stream.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token_stream.go
@@ -1,4 +1,4 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
diff --git a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/tokenstream_rewriter.go b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/tokenstream_rewriter.go
similarity index 58%
rename from vendor/github.com/antlr/antlr4/runtime/Go/antlr/tokenstream_rewriter.go
rename to vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/tokenstream_rewriter.go
index 96a03f02aa6..b3e38af3445 100644
--- a/vendor/github.com/antlr/antlr4/runtime/Go/antlr/tokenstream_rewriter.go
+++ b/vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/tokenstream_rewriter.go
@@ -1,15 +1,15 @@
-// Copyright (c) 2012-2017 The ANTLR Project. All rights reserved.
+// Copyright (c) 2012-2022 The ANTLR Project. All rights reserved.
// Use of this file is governed by the BSD 3-clause license that
// can be found in the LICENSE.txt file in the project root.
+
package antlr
import (
-"bytes"
-"fmt"
+ "bytes"
+ "fmt"
)
-
-//
+//
// Useful for rewriting out a buffered input token stream after doing some
// augmentation or other manipulations on it.
@@ -85,12 +85,10 @@ import (
// If you don't use named rewrite streams, a "default" stream is used as the
// first example shows.
-
-
-const(
+const (
Default_Program_Name = "default"
- Program_Init_Size = 100
- Min_Token_Index = 0
+ Program_Init_Size = 100
+ Min_Token_Index = 0
)
// Define the rewrite operation hierarchy
@@ -98,13 +96,13 @@ const(
type RewriteOperation interface {
// Execute the rewrite operation by possibly adding to the buffer.
// Return the index of the next token to operate on.
- Execute(buffer *bytes.Buffer) int
- String() string
- GetInstructionIndex() int
- GetIndex() int
- GetText() string
- GetOpName() string
- GetTokens() TokenStream
+ Execute(buffer *bytes.Buffer) int
+ String() string
+ GetInstructionIndex() int
+ GetIndex() int
+ GetText() string
+ GetOpName() string
+ GetTokens() TokenStream
SetInstructionIndex(val int)
SetIndex(int)
SetText(string)
@@ -114,63 +112,62 @@ type RewriteOperation interface {
type BaseRewriteOperation struct {
//Current index of rewrites list
- instruction_index int
+ instruction_index int
//Token buffer index
- index int
+ index int
//Substitution text
- text string
+ text string
//Actual operation name
- op_name string
+ op_name string
//Pointer to token steam
- tokens TokenStream
+ tokens TokenStream
}
-func (op *BaseRewriteOperation)GetInstructionIndex() int{
+func (op *BaseRewriteOperation) GetInstructionIndex() int {
return op.instruction_index
}
-func (op *BaseRewriteOperation)GetIndex() int{
+func (op *BaseRewriteOperation) GetIndex() int {
return op.index
}
-func (op *BaseRewriteOperation)GetText() string{
+func (op *BaseRewriteOperation) GetText() string {
return op.text
}
-func (op *BaseRewriteOperation)GetOpName() string{
+func (op *BaseRewriteOperation) GetOpName() string {
return op.op_name
}
-func (op *BaseRewriteOperation)GetTokens() TokenStream{
+func (op *BaseRewriteOperation) GetTokens() TokenStream {
return op.tokens
}
-func (op *BaseRewriteOperation)SetInstructionIndex(val int){
+func (op *BaseRewriteOperation) SetInstructionIndex(val int) {
op.instruction_index = val
}
-func (op *BaseRewriteOperation)SetIndex(val int) {
+func (op *BaseRewriteOperation) SetIndex(val int) {
op.index = val
}
-func (op *BaseRewriteOperation)SetText(val string){
+func (op *BaseRewriteOperation) SetText(val string) {
op.text = val
}
-func (op *BaseRewriteOperation)SetOpName(val string){
+func (op *BaseRewriteOperation) SetOpName(val string) {
op.op_name = val
}
-func (op *BaseRewriteOperation)SetTokens(val TokenStream) {
+func (op *BaseRewriteOperation) SetTokens(val TokenStream) {
op.tokens = val
}
-
-func (op *BaseRewriteOperation) Execute(buffer *bytes.Buffer) int{
+func (op *BaseRewriteOperation) Execute(buffer *bytes.Buffer) int {
return op.index
}
-func (op *BaseRewriteOperation) String() string {
+func (op *BaseRewriteOperation) String() string {
return fmt.Sprintf("<%s@%d:\"%s\">",
op.op_name,
op.tokens.Get(op.GetIndex()),
@@ -179,26 +176,25 @@ func (op *BaseRewriteOperation) String() string {
}
-
type InsertBeforeOp struct {
BaseRewriteOperation
}
-func NewInsertBeforeOp(index int, text string, stream TokenStream) *InsertBeforeOp{
- return &InsertBeforeOp{BaseRewriteOperation:BaseRewriteOperation{
- index:index,
- text:text,
- op_name:"InsertBeforeOp",
- tokens:stream,
+func NewInsertBeforeOp(index int, text string, stream TokenStream) *InsertBeforeOp {
+ return &InsertBeforeOp{BaseRewriteOperation: BaseRewriteOperation{
+ index: index,
+ text: text,
+ op_name: "InsertBeforeOp",
+ tokens: stream,
}}
}
-func (op *InsertBeforeOp) Execute(buffer *bytes.Buffer) int{
+func (op *InsertBeforeOp) Execute(buffer *bytes.Buffer) int {
buffer.WriteString(op.text)
- if op.tokens.Get(op.index).GetTokenType() != TokenEOF{
+ if op.tokens.Get(op.index).GetTokenType() != TokenEOF {
buffer.WriteString(op.tokens.Get(op.index).GetText())
}
- return op.index+1
+ return op.index + 1
}
func (op *InsertBeforeOp) String() string {
@@ -213,20 +209,20 @@ type InsertAfterOp struct {
BaseRewriteOperation
}
-func NewInsertAfterOp(index int, text string, stream TokenStream) *InsertAfterOp{
- return &InsertAfterOp{BaseRewriteOperation:BaseRewriteOperation{
- index:index+1,
- text:text,
- tokens:stream,
+func NewInsertAfterOp(index int, text string, stream TokenStream) *InsertAfterOp {
+ return &InsertAfterOp{BaseRewriteOperation: BaseRewriteOperation{
+ index: index + 1,
+ text: text,
+ tokens: stream,
}}
}
func (op *InsertAfterOp) Execute(buffer *bytes.Buffer) int {
buffer.WriteString(op.text)
- if op.tokens.Get(op.index).GetTokenType() != TokenEOF{
+ if op.tokens.Get(op.index).GetTokenType() != TokenEOF {
buffer.WriteString(op.tokens.Get(op.index).GetText())
}
- return op.index+1
+ return op.index + 1
}
func (op *InsertAfterOp) String() string {
@@ -235,28 +231,28 @@ func (op *InsertAfterOp) String() string {
// I'm going to try replacing range from x..y with (y-x)+1 ReplaceOp
// instructions.
-type ReplaceOp struct{
+type ReplaceOp struct {
BaseRewriteOperation
LastIndex int
}
-func NewReplaceOp(from, to int, text string, stream TokenStream)*ReplaceOp {
+func NewReplaceOp(from, to int, text string, stream TokenStream) *ReplaceOp {
return &ReplaceOp{
- BaseRewriteOperation:BaseRewriteOperation{
- index:from,
- text:text,
- op_name:"ReplaceOp",
- tokens:stream,
+ BaseRewriteOperation: BaseRewriteOperation{
+ index: from,
+ text: text,
+ op_name: "ReplaceOp",
+ tokens: stream,
},
- LastIndex:to,
+ LastIndex: to,
}
}
-func (op *ReplaceOp)Execute(buffer *bytes.Buffer) int{
- if op.text != ""{
+func (op *ReplaceOp) Execute(buffer *bytes.Buffer) int {
+ if op.text != "" {
buffer.WriteString(op.text)
}
- return op.LastIndex +1
+ return op.LastIndex + 1
}
func (op *ReplaceOp) String() string {
@@ -268,54 +264,54 @@ func (op *ReplaceOp) String() string {
op.tokens.Get(op.index), op.tokens.Get(op.LastIndex), op.text)
}
-
type TokenStreamRewriter struct {
//Our source stream
- tokens TokenStream
+ tokens TokenStream
// You may have multiple, named streams of rewrite operations.
// I'm calling these things "programs."
// Maps String (name) → rewrite (List)
- programs map[string][]RewriteOperation
- last_rewrite_token_indexes map[string]int
+ programs map[string][]RewriteOperation
+ last_rewrite_token_indexes map[string]int
}
-func NewTokenStreamRewriter(tokens TokenStream) *TokenStreamRewriter{
+func NewTokenStreamRewriter(tokens TokenStream) *TokenStreamRewriter {
return &TokenStreamRewriter{
- tokens: tokens,
- programs: map[string][]RewriteOperation{
- Default_Program_Name:make([]RewriteOperation,0, Program_Init_Size),
+ tokens: tokens,
+ programs: map[string][]RewriteOperation{
+ Default_Program_Name: make([]RewriteOperation, 0, Program_Init_Size),
},
- last_rewrite_token_indexes: map[string]int{},
+ last_rewrite_token_indexes: map[string]int{},
}
}
-func (tsr *TokenStreamRewriter) GetTokenStream() TokenStream{
+func (tsr *TokenStreamRewriter) GetTokenStream() TokenStream {
return tsr.tokens
}
-// Rollback the instruction stream for a program so that
-// the indicated instruction (via instructionIndex) is no
-// longer in the stream. UNTESTED!
-func (tsr *TokenStreamRewriter) Rollback(program_name string, instruction_index int){
- is, ok := tsr.programs[program_name]
- if ok{
+// Rollback the instruction stream for a program so that
+// the indicated instruction (via instructionIndex) is no
+// longer in the stream. UNTESTED!
+func (tsr *TokenStreamRewriter) Rollback(program_name string, instruction_index int) {
+ is, ok := tsr.programs[program_name]
+ if ok {
tsr.programs[program_name] = is[Min_Token_Index:instruction_index]
}
}
-func (tsr *TokenStreamRewriter) RollbackDefault(instruction_index int){
+func (tsr *TokenStreamRewriter) RollbackDefault(instruction_index int) {
tsr.Rollback(Default_Program_Name, instruction_index)
}
-//Reset the program so that no instructions exist
-func (tsr *TokenStreamRewriter) DeleteProgram(program_name string){
+
+// Reset the program so that no instructions exist
+func (tsr *TokenStreamRewriter) DeleteProgram(program_name string) {
tsr.Rollback(program_name, Min_Token_Index) //TODO: double test on that cause lower bound is not included
}
-func (tsr *TokenStreamRewriter) DeleteProgramDefault(){
+func (tsr *TokenStreamRewriter) DeleteProgramDefault() {
tsr.DeleteProgram(Default_Program_Name)
}
-func (tsr *TokenStreamRewriter) InsertAfter(program_name string, index int, text string){
+func (tsr *TokenStreamRewriter) InsertAfter(program_name string, index int, text string) {
// to insert after, just insert before next index (even if past end)
var op RewriteOperation = NewInsertAfterOp(index, text, tsr.tokens)
rewrites := tsr.GetProgram(program_name)
@@ -323,31 +319,31 @@ func (tsr *TokenStreamRewriter) InsertAfter(program_name string, index int, text
tsr.AddToProgram(program_name, op)
}
-func (tsr *TokenStreamRewriter) InsertAfterDefault(index int, text string){
+func (tsr *TokenStreamRewriter) InsertAfterDefault(index int, text string) {
tsr.InsertAfter(Default_Program_Name, index, text)
}
-func (tsr *TokenStreamRewriter) InsertAfterToken(program_name string, token Token, text string){
+func (tsr *TokenStreamRewriter) InsertAfterToken(program_name string, token Token, text string) {
tsr.InsertAfter(program_name, token.GetTokenIndex(), text)
}
-func (tsr* TokenStreamRewriter) InsertBefore(program_name string, index int, text string){
+func (tsr *TokenStreamRewriter) InsertBefore(program_name string, index int, text string) {
var op RewriteOperation = NewInsertBeforeOp(index, text, tsr.tokens)
rewrites := tsr.GetProgram(program_name)
op.SetInstructionIndex(len(rewrites))
tsr.AddToProgram(program_name, op)
}
-func (tsr *TokenStreamRewriter) InsertBeforeDefault(index int, text string){
+func (tsr *TokenStreamRewriter) InsertBeforeDefault(index int, text string) {
tsr.InsertBefore(Default_Program_Name, index, text)
}
-func (tsr *TokenStreamRewriter) InsertBeforeToken(program_name string,token Token, text string){
+func (tsr *TokenStreamRewriter) InsertBeforeToken(program_name string, token Token, text string) {
tsr.InsertBefore(program_name, token.GetTokenIndex(), text)
}
-func (tsr *TokenStreamRewriter) Replace(program_name string, from, to int, text string){
- if from > to || from < 0 || to < 0 || to >= tsr.tokens.Size(){
+func (tsr *TokenStreamRewriter) Replace(program_name string, from, to int, text string) {
+ if from > to || from < 0 || to < 0 || to >= tsr.tokens.Size() {
panic(fmt.Sprintf("replace: range invalid: %d..%d(size=%d)",
from, to, tsr.tokens.Size()))
}
@@ -357,207 +353,216 @@ func (tsr *TokenStreamRewriter) Replace(program_name string, from, to int, text
tsr.AddToProgram(program_name, op)
}
-func (tsr *TokenStreamRewriter)ReplaceDefault(from, to int, text string) {
+func (tsr *TokenStreamRewriter) ReplaceDefault(from, to int, text string) {
tsr.Replace(Default_Program_Name, from, to, text)
}
-func (tsr *TokenStreamRewriter)ReplaceDefaultPos(index int, text string){
+func (tsr *TokenStreamRewriter) ReplaceDefaultPos(index int, text string) {
tsr.ReplaceDefault(index, index, text)
}
-func (tsr *TokenStreamRewriter)ReplaceToken(program_name string, from, to Token, text string){
+func (tsr *TokenStreamRewriter) ReplaceToken(program_name string, from, to Token, text string) {
tsr.Replace(program_name, from.GetTokenIndex(), to.GetTokenIndex(), text)
}
-func (tsr *TokenStreamRewriter)ReplaceTokenDefault(from, to Token, text string){
+func (tsr *TokenStreamRewriter) ReplaceTokenDefault(from, to Token, text string) {
tsr.ReplaceToken(Default_Program_Name, from, to, text)
}
-func (tsr *TokenStreamRewriter)ReplaceTokenDefaultPos(index Token, text string){
+func (tsr *TokenStreamRewriter) ReplaceTokenDefaultPos(index Token, text string) {
tsr.ReplaceTokenDefault(index, index, text)
}
-func (tsr *TokenStreamRewriter)Delete(program_name string, from, to int){
- tsr.Replace(program_name, from, to, "" )
+func (tsr *TokenStreamRewriter) Delete(program_name string, from, to int) {
+ tsr.Replace(program_name, from, to, "")
}
-func (tsr *TokenStreamRewriter)DeleteDefault(from, to int){
+func (tsr *TokenStreamRewriter) DeleteDefault(from, to int) {
tsr.Delete(Default_Program_Name, from, to)
}
-func (tsr *TokenStreamRewriter)DeleteDefaultPos(index int){
- tsr.DeleteDefault(index,index)
+func (tsr *TokenStreamRewriter) DeleteDefaultPos(index int) {
+ tsr.DeleteDefault(index, index)
}
-func (tsr *TokenStreamRewriter)DeleteToken(program_name string, from, to Token) {
+func (tsr *TokenStreamRewriter) DeleteToken(program_name string, from, to Token) {
tsr.ReplaceToken(program_name, from, to, "")
}
-func (tsr *TokenStreamRewriter)DeleteTokenDefault(from,to Token){
+func (tsr *TokenStreamRewriter) DeleteTokenDefault(from, to Token) {
tsr.DeleteToken(Default_Program_Name, from, to)
}
-func (tsr *TokenStreamRewriter)GetLastRewriteTokenIndex(program_name string)int {
+func (tsr *TokenStreamRewriter) GetLastRewriteTokenIndex(program_name string) int {
i, ok := tsr.last_rewrite_token_indexes[program_name]
- if !ok{
+ if !ok {
return -1
}
return i
}
-func (tsr *TokenStreamRewriter)GetLastRewriteTokenIndexDefault()int{
+func (tsr *TokenStreamRewriter) GetLastRewriteTokenIndexDefault() int {
return tsr.GetLastRewriteTokenIndex(Default_Program_Name)
}
-func (tsr *TokenStreamRewriter)SetLastRewriteTokenIndex(program_name string, i int){
+func (tsr *TokenStreamRewriter) SetLastRewriteTokenIndex(program_name string, i int) {
tsr.last_rewrite_token_indexes[program_name] = i
}
-func (tsr *TokenStreamRewriter)InitializeProgram(name string)[]RewriteOperation{
+func (tsr *TokenStreamRewriter) InitializeProgram(name string) []RewriteOperation {
is := make([]RewriteOperation, 0, Program_Init_Size)
tsr.programs[name] = is
return is
}
-func (tsr *TokenStreamRewriter)AddToProgram(name string, op RewriteOperation){
+func (tsr *TokenStreamRewriter) AddToProgram(name string, op RewriteOperation) {
is := tsr.GetProgram(name)
is = append(is, op)
tsr.programs[name] = is
}
-func (tsr *TokenStreamRewriter)GetProgram(name string) []RewriteOperation {
+func (tsr *TokenStreamRewriter) GetProgram(name string) []RewriteOperation {
is, ok := tsr.programs[name]
- if !ok{
+ if !ok {
is = tsr.InitializeProgram(name)
}
return is
}
-// Return the text from the original tokens altered per the
-// instructions given to this rewriter.
-func (tsr *TokenStreamRewriter)GetTextDefault() string{
+
+// Return the text from the original tokens altered per the
+// instructions given to this rewriter.
+func (tsr *TokenStreamRewriter) GetTextDefault() string {
return tsr.GetText(
Default_Program_Name,
NewInterval(0, tsr.tokens.Size()-1))
}
-// Return the text from the original tokens altered per the
-// instructions given to this rewriter.
-func (tsr *TokenStreamRewriter)GetText(program_name string, interval *Interval) string {
+
+// Return the text from the original tokens altered per the
+// instructions given to this rewriter.
+func (tsr *TokenStreamRewriter) GetText(program_name string, interval *Interval) string {
rewrites := tsr.programs[program_name]
start := interval.Start
- stop := interval.Stop
+ stop := interval.Stop
// ensure start/end are in range
stop = min(stop, tsr.tokens.Size()-1)
- start = max(start,0)
- if rewrites == nil || len(rewrites) == 0{
+ start = max(start, 0)
+ if rewrites == nil || len(rewrites) == 0 {
return tsr.tokens.GetTextFromInterval(interval) // no instructions to execute
}
buf := bytes.Buffer{}
// First, optimize instruction stream
indexToOp := reduceToSingleOperationPerIndex(rewrites)
// Walk buffer, executing instructions and emitting tokens
- for i:=start; i<=stop && i= tsr.tokens.Size()-1 {buf.WriteString(op.GetText())}
+ for _, op := range indexToOp {
+ if op.GetIndex() >= tsr.tokens.Size()-1 {
+ buf.WriteString(op.GetText())
+ }
}
}
return buf.String()
}
-// We need to combine operations and report invalid operations (like
-// overlapping replaces that are not completed nested). Inserts to
-// same index need to be combined etc... Here are the cases:
+// We need to combine operations and report invalid operations (like
+// overlapping replaces that are not completed nested). Inserts to
+// same index need to be combined etc... Here are the cases:
//
-// I.i.u I.j.v leave alone, nonoverlapping
-// I.i.u I.i.v combine: Iivu
+// I.i.u I.j.v leave alone, nonoverlapping
+// I.i.u I.i.v combine: Iivu
//
-// R.i-j.u R.x-y.v | i-j in x-y delete first R
-// R.i-j.u R.i-j.v delete first R
-// R.i-j.u R.x-y.v | x-y in i-j ERROR
-// R.i-j.u R.x-y.v | boundaries overlap ERROR
+// R.i-j.u R.x-y.v | i-j in x-y delete first R
+// R.i-j.u R.i-j.v delete first R
+// R.i-j.u R.x-y.v | x-y in i-j ERROR
+// R.i-j.u R.x-y.v | boundaries overlap ERROR
//
-// Delete special case of replace (text==null):
-// D.i-j.u D.x-y.v | boundaries overlap combine to max(min)..max(right)
+// Delete special case of replace (text==null):
+// D.i-j.u D.x-y.v | boundaries overlap combine to max(min)..max(right)
//
-// I.i.u R.x-y.v | i in (x+1)-y delete I (since insert before
-// we're not deleting i)
-// I.i.u R.x-y.v | i not in (x+1)-y leave alone, nonoverlapping
-// R.x-y.v I.i.u | i in x-y ERROR
-// R.x-y.v I.x.u R.x-y.uv (combine, delete I)
-// R.x-y.v I.i.u | i not in x-y leave alone, nonoverlapping
+// I.i.u R.x-y.v | i in (x+1)-y delete I (since insert before
+// we're not deleting i)
+// I.i.u R.x-y.v | i not in (x+1)-y leave alone, nonoverlapping
+// R.x-y.v I.i.u | i in x-y ERROR
+// R.x-y.v I.x.u R.x-y.uv (combine, delete I)
+// R.x-y.v I.i.u | i not in x-y leave alone, nonoverlapping
//
-// I.i.u = insert u before op @ index i
-// R.x-y.u = replace x-y indexed tokens with u
+// I.i.u = insert u before op @ index i
+// R.x-y.u = replace x-y indexed tokens with u
//
-// First we need to examine replaces. For any replace op:
+// First we need to examine replaces. For any replace op:
//
-// 1. wipe out any insertions before op within that range.
-// 2. Drop any replace op before that is contained completely within
-// that range.
-// 3. Throw exception upon boundary overlap with any previous replace.
+// 1. wipe out any insertions before op within that range.
+// 2. Drop any replace op before that is contained completely within
+// that range.
+// 3. Throw exception upon boundary overlap with any previous replace.
//
-// Then we can deal with inserts:
+// Then we can deal with inserts:
//
-// 1. for any inserts to same index, combine even if not adjacent.
-// 2. for any prior replace with same left boundary, combine this
-// insert with replace and delete this replace.
-// 3. throw exception if index in same range as previous replace
+// 1. for any inserts to same index, combine even if not adjacent.
+// 2. for any prior replace with same left boundary, combine this
+// insert with replace and delete this replace.
+// 3. throw exception if index in same range as previous replace
//
-// Don't actually delete; make op null in list. Easier to walk list.
-// Later we can throw as we add to index → op map.
+// Don't actually delete; make op null in list. Easier to walk list.
+// Later we can throw as we add to index → op map.
//
-// Note that I.2 R.2-2 will wipe out I.2 even though, technically, the
-// inserted stuff would be before the replace range. But, if you
-// add tokens in front of a method body '{' and then delete the method
-// body, I think the stuff before the '{' you added should disappear too.
+// Note that I.2 R.2-2 will wipe out I.2 even though, technically, the
+// inserted stuff would be before the replace range. But, if you
+// add tokens in front of a method body '{' and then delete the method
+// body, I think the stuff before the '{' you added should disappear too.
//
-// Return a map from token index to operation.
-//
-func reduceToSingleOperationPerIndex(rewrites []RewriteOperation) map[int]RewriteOperation{
+// Return a map from token index to operation.
+func reduceToSingleOperationPerIndex(rewrites []RewriteOperation) map[int]RewriteOperation {
// WALK REPLACES
- for i:=0; i < len(rewrites); i++{
+ for i := 0; i < len(rewrites); i++ {
op := rewrites[i]
- if op == nil{continue}
+ if op == nil {
+ continue
+ }
rop, ok := op.(*ReplaceOp)
- if !ok{continue}
+ if !ok {
+ continue
+ }
// Wipe prior inserts within range
- for j:=0; j rop.index && iop.index <=rop.LastIndex{
+ } else if iop.index > rop.index && iop.index <= rop.LastIndex {
// delete insert as it's a no-op.
rewrites[iop.instruction_index] = nil
}
}
}
// Drop any prior replaces contained within
- for j:=0; j=rop.index && prevop.LastIndex <= rop.LastIndex{
+ for j := 0; j < i && j < len(rewrites); j++ {
+ if prevop, ok := rewrites[j].(*ReplaceOp); ok {
+ if prevop.index >= rop.index && prevop.LastIndex <= rop.LastIndex {
// delete replace as it's a no-op.
rewrites[prevop.instruction_index] = nil
continue
@@ -566,61 +571,67 @@ func reduceToSingleOperationPerIndex(rewrites []RewriteOperation) map[int]Rewrit
disjoint := prevop.LastIndex < rop.index || prevop.index > rop.LastIndex
// Delete special case of replace (text==null):
// D.i-j.u D.x-y.v | boundaries overlap combine to max(min)..max(right)
- if prevop.text == "" && rop.text == "" && !disjoint{
+ if prevop.text == "" && rop.text == "" && !disjoint {
rewrites[prevop.instruction_index] = nil
rop.index = min(prevop.index, rop.index)
rop.LastIndex = max(prevop.LastIndex, rop.LastIndex)
println("new rop" + rop.String()) //TODO: remove console write, taken from Java version
- }else if !disjoint{
+ } else if !disjoint {
panic("replace op boundaries of " + rop.String() + " overlap with previous " + prevop.String())
}
}
}
}
// WALK INSERTS
- for i:=0; i < len(rewrites); i++ {
+ for i := 0; i < len(rewrites); i++ {
op := rewrites[i]
- if op == nil{continue}
+ if op == nil {
+ continue
+ }
//hack to replicate inheritance in composition
_, iok := rewrites[i].(*InsertBeforeOp)
_, aok := rewrites[i].(*InsertAfterOp)
- if !iok && !aok{continue}
+ if !iok && !aok {
+ continue
+ }
iop := rewrites[i]
// combine current insert with prior if any at same index
// deviating a bit from TokenStreamRewriter.java - hard to incorporate inheritance logic
- for j:=0; j= rop.index && iop.GetIndex() <= rop.LastIndex{
- panic("insert op "+iop.String()+" within boundaries of previous "+rop.String())
+ if iop.GetIndex() >= rop.index && iop.GetIndex() <= rop.LastIndex {
+ panic("insert op " + iop.String() + " within boundaries of previous " + rop.String())
}
}
}
}
m := map[int]RewriteOperation{}
- for i:=0; i < len(rewrites); i++{
+ for i := 0; i < len(rewrites); i++ {
op := rewrites[i]
- if op == nil {continue}
- if _, ok := m[op.GetIndex()]; ok{
+ if op == nil {
+ continue
+ }
+ if _, ok := m[op.GetIndex()]; ok {
panic("should only be one op per index")
}
m[op.GetIndex()] = op
@@ -628,22 +639,21 @@ func reduceToSingleOperationPerIndex(rewrites []RewriteOperation) map[int]Rewrit
return m
}
-
/*
Quick fixing Go lack of overloads
- */
+*/
-func max(a,b int)int{
- if a>b{
+func max(a, b int) int {
+ if a > b {
return a
- }else {
+ } else {
return b
}
}
-func min(a,b int)int{
- if a as.threshold {
as.expand()
}
@@ -98,7 +96,7 @@ func (as *array2DHashSet) expand() {
b := as.getBuckets(o)
bucketLength := newBucketLengths[b]
- var newBucket []interface{}
+ var newBucket []Collectable[any]
if bucketLength == 0 {
// new bucket
newBucket = as.createBucket(as.initialBucketCapacity)
@@ -107,7 +105,7 @@ func (as *array2DHashSet) expand() {
newBucket = newTable[b]
if bucketLength == len(newBucket) {
// expand
- newBucketCopy := make([]interface{}, len(newBucket)<<1)
+ newBucketCopy := make([]Collectable[any], len(newBucket)<<1)
copy(newBucketCopy[:bucketLength], newBucket)
newBucket = newBucketCopy
newTable[b] = newBucket
@@ -124,7 +122,7 @@ func (as *array2DHashSet) Len() int {
return as.n
}
-func (as *array2DHashSet) Get(o interface{}) interface{} {
+func (as *array2DHashSet) Get(o Collectable[any]) interface{} {
if o == nil {
return nil
}
@@ -147,7 +145,7 @@ func (as *array2DHashSet) Get(o interface{}) interface{} {
return nil
}
-func (as *array2DHashSet) innerAdd(o interface{}) interface{} {
+func (as *array2DHashSet) innerAdd(o Collectable[any]) interface{} {
b := as.getBuckets(o)
bucket := as.buckets[b]
@@ -178,7 +176,7 @@ func (as *array2DHashSet) innerAdd(o interface{}) interface{} {
// full bucket, expand and add to end
oldLength := len(bucket)
- bucketCopy := make([]interface{}, oldLength<<1)
+ bucketCopy := make([]Collectable[any], oldLength<<1)
copy(bucketCopy[:oldLength], bucket)
bucket = bucketCopy
as.buckets[b] = bucket
@@ -187,22 +185,22 @@ func (as *array2DHashSet) innerAdd(o interface{}) interface{} {
return o
}
-func (as *array2DHashSet) getBuckets(value interface{}) int {
+func (as *array2DHashSet) getBuckets(value Collectable[any]) int {
hash := as.hashcodeFunction(value)
return hash & (len(as.buckets) - 1)
}
-func (as *array2DHashSet) createBuckets(cap int) [][]interface{} {
- return make([][]interface{}, cap)
+func (as *array2DHashSet) createBuckets(cap int) [][]Collectable[any] {
+ return make([][]Collectable[any], cap)
}
-func (as *array2DHashSet) createBucket(cap int) []interface{} {
- return make([]interface{}, cap)
+func (as *array2DHashSet) createBucket(cap int) []Collectable[any] {
+ return make([]Collectable[any], cap)
}
func newArray2DHashSetWithCap(
hashcodeFunction func(interface{}) int,
- equalsFunction func(interface{}, interface{}) bool,
+ equalsFunction func(Collectable[any], Collectable[any]) bool,
initCap int,
initBucketCap int,
) *array2DHashSet {
@@ -231,7 +229,7 @@ func newArray2DHashSetWithCap(
func newArray2DHashSet(
hashcodeFunction func(interface{}) int,
- equalsFunction func(interface{}, interface{}) bool,
+ equalsFunction func(Collectable[any], Collectable[any]) bool,
) *array2DHashSet {
return newArray2DHashSetWithCap(hashcodeFunction, equalsFunction, _initalCapacity, _initalBucketCapacity)
}
diff --git a/vendor/github.com/coreos/go-semver/semver/semver.go b/vendor/github.com/coreos/go-semver/semver/semver.go
index 76cf4852c76..eb9fb7ff2d8 100644
--- a/vendor/github.com/coreos/go-semver/semver/semver.go
+++ b/vendor/github.com/coreos/go-semver/semver/semver.go
@@ -85,7 +85,7 @@ func (v *Version) Set(version string) error {
return fmt.Errorf("failed to validate metadata: %v", err)
}
- parsed := make([]int64, 3, 3)
+ parsed := make([]int64, 3)
for i, v := range dotParts[:3] {
val, err := strconv.ParseInt(v, 10, 64)
diff --git a/vendor/github.com/emicklei/go-restful/v3/CHANGES.md b/vendor/github.com/emicklei/go-restful/v3/CHANGES.md
index 02a73ccfd1a..9e790390b62 100644
--- a/vendor/github.com/emicklei/go-restful/v3/CHANGES.md
+++ b/vendor/github.com/emicklei/go-restful/v3/CHANGES.md
@@ -1,6 +1,27 @@
# Change history of go-restful
-## [v3.10.1] - 2022-11-19
+
+## [v3.12.0] - 2024-03-11
+- add Flush method #529 (#538)
+- fix: Improper handling of empty POST requests (#543)
+
+## [v3.11.3] - 2024-01-09
+- better not have 2 tags on one commit
+
+## [v3.11.1, v3.11.2] - 2024-01-09
+
+- fix by restoring custom JSON handler functions (Mike Beaumont #540)
+
+## [v3.11.0] - 2023-08-19
+
+- restored behavior as <= v3.9.0 with option to change path strategy using TrimRightSlashEnabled.
+
+## [v3.10.2] - 2023-03-09 - DO NOT USE
+
+- introduced MergePathStrategy to be able to revert behaviour of path concatenation to 3.9.0
+ see comment in Readme how to customize this behaviour.
+
+## [v3.10.1] - 2022-11-19 - DO NOT USE
- fix broken 3.10.0 by using path package for joining paths
diff --git a/vendor/github.com/emicklei/go-restful/v3/README.md b/vendor/github.com/emicklei/go-restful/v3/README.md
index 0625359dc40..7234604e47b 100644
--- a/vendor/github.com/emicklei/go-restful/v3/README.md
+++ b/vendor/github.com/emicklei/go-restful/v3/README.md
@@ -2,7 +2,6 @@ go-restful
==========
package for building REST-style Web Services using Google Go
-[](https://travis-ci.org/emicklei/go-restful)
[](https://goreportcard.com/report/github.com/emicklei/go-restful)
[](https://pkg.go.dev/github.com/emicklei/go-restful)
[](https://codecov.io/gh/emicklei/go-restful)
@@ -79,7 +78,7 @@ func (u UserResource) findUser(request *restful.Request, response *restful.Respo
- Content encoding (gzip,deflate) of request and response payloads
- Automatic responses on OPTIONS (using a filter)
- Automatic CORS request handling (using a filter)
-- API declaration for Swagger UI ([go-restful-openapi](https://github.com/emicklei/go-restful-openapi), see [go-restful-swagger12](https://github.com/emicklei/go-restful-swagger12))
+- API declaration for Swagger UI ([go-restful-openapi](https://github.com/emicklei/go-restful-openapi))
- Panic recovery to produce HTTP 500, customizable using RecoverHandler(...)
- Route errors produce HTTP 404/405/406/415 errors, customizable using ServiceErrorHandler(...)
- Configurable (trace) logging
@@ -95,7 +94,7 @@ There are several hooks to customize the behavior of the go-restful package.
- Trace logging
- Compression
- Encoders for other serializers
-- Use [jsoniter](https://github.com/json-iterator/go) by building this package using a build tag, e.g. `go build -tags=jsoniter .`
+- Use the package variable `TrimRightSlashEnabled` (default true) to control the behavior of matching routes that end with a slash `/`
## Resources
@@ -108,4 +107,4 @@ There are several hooks to customize the behavior of the go-restful package.
Type ```git shortlog -s``` for a full list of contributors.
-© 2012 - 2022, http://ernestmicklei.com. MIT License. Contributions are welcome.
+© 2012 - 2023, http://ernestmicklei.com. MIT License. Contributions are welcome.
diff --git a/vendor/github.com/emicklei/go-restful/v3/compress.go b/vendor/github.com/emicklei/go-restful/v3/compress.go
index 1ff239f99fe..80adf55fdfe 100644
--- a/vendor/github.com/emicklei/go-restful/v3/compress.go
+++ b/vendor/github.com/emicklei/go-restful/v3/compress.go
@@ -49,6 +49,16 @@ func (c *CompressingResponseWriter) CloseNotify() <-chan bool {
return c.writer.(http.CloseNotifier).CloseNotify()
}
+// Flush is part of http.Flusher interface. Noop if the underlying writer doesn't support it.
+func (c *CompressingResponseWriter) Flush() {
+ flusher, ok := c.writer.(http.Flusher)
+ if !ok {
+ // writer doesn't support http.Flusher interface
+ return
+ }
+ flusher.Flush()
+}
+
// Close the underlying compressor
func (c *CompressingResponseWriter) Close() error {
if c.isCompressorClosed() {
diff --git a/vendor/github.com/emicklei/go-restful/v3/entity_accessors.go b/vendor/github.com/emicklei/go-restful/v3/entity_accessors.go
index 66dfc824f55..9808752acdf 100644
--- a/vendor/github.com/emicklei/go-restful/v3/entity_accessors.go
+++ b/vendor/github.com/emicklei/go-restful/v3/entity_accessors.go
@@ -5,11 +5,18 @@ package restful
// that can be found in the LICENSE file.
import (
+ "encoding/json"
"encoding/xml"
"strings"
"sync"
)
+var (
+ MarshalIndent = json.MarshalIndent
+ NewDecoder = json.NewDecoder
+ NewEncoder = json.NewEncoder
+)
+
// EntityReaderWriter can read and write values using an encoding such as JSON,XML.
type EntityReaderWriter interface {
// Read a serialized version of the value from the request.
diff --git a/vendor/github.com/emicklei/go-restful/v3/json.go b/vendor/github.com/emicklei/go-restful/v3/json.go
deleted file mode 100644
index 871165166a1..00000000000
--- a/vendor/github.com/emicklei/go-restful/v3/json.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !jsoniter
-
-package restful
-
-import "encoding/json"
-
-var (
- MarshalIndent = json.MarshalIndent
- NewDecoder = json.NewDecoder
- NewEncoder = json.NewEncoder
-)
diff --git a/vendor/github.com/emicklei/go-restful/v3/jsoniter.go b/vendor/github.com/emicklei/go-restful/v3/jsoniter.go
deleted file mode 100644
index 11b8f8ae7f1..00000000000
--- a/vendor/github.com/emicklei/go-restful/v3/jsoniter.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build jsoniter
-
-package restful
-
-import "github.com/json-iterator/go"
-
-var (
- json = jsoniter.ConfigCompatibleWithStandardLibrary
- MarshalIndent = json.MarshalIndent
- NewDecoder = json.NewDecoder
- NewEncoder = json.NewEncoder
-)
diff --git a/vendor/github.com/emicklei/go-restful/v3/jsr311.go b/vendor/github.com/emicklei/go-restful/v3/jsr311.go
index 07a0c91e942..a9b3faaa81f 100644
--- a/vendor/github.com/emicklei/go-restful/v3/jsr311.go
+++ b/vendor/github.com/emicklei/go-restful/v3/jsr311.go
@@ -155,7 +155,7 @@ func (r RouterJSR311) detectRoute(routes []Route, httpRequest *http.Request) (*R
method, length := httpRequest.Method, httpRequest.Header.Get("Content-Length")
if (method == http.MethodPost ||
method == http.MethodPut ||
- method == http.MethodPatch) && length == "" {
+ method == http.MethodPatch) && (length == "" || length == "0") {
return nil, NewError(
http.StatusUnsupportedMediaType,
fmt.Sprintf("415: Unsupported Media Type\n\nAvailable representations: %s", strings.Join(available, ", ")),
diff --git a/vendor/github.com/emicklei/go-restful/v3/route.go b/vendor/github.com/emicklei/go-restful/v3/route.go
index ea05b3da887..306c44be779 100644
--- a/vendor/github.com/emicklei/go-restful/v3/route.go
+++ b/vendor/github.com/emicklei/go-restful/v3/route.go
@@ -40,7 +40,8 @@ type Route struct {
ParameterDocs []*Parameter
ResponseErrors map[int]ResponseError
DefaultResponse *ResponseError
- ReadSample, WriteSample interface{} // structs that model an example request or response payload
+ ReadSample, WriteSample interface{} // structs that model an example request or response payload
+ WriteSamples []interface{} // if more than one return types is possible (oneof) then this will contain multiple values
// Extra information used to store custom information about the route.
Metadata map[string]interface{}
@@ -164,7 +165,13 @@ func tokenizePath(path string) []string {
if "/" == path {
return nil
}
- return strings.Split(strings.TrimLeft(path, "/"), "/")
+ if TrimRightSlashEnabled {
+ // 3.9.0
+ return strings.Split(strings.Trim(path, "/"), "/")
+ } else {
+ // 3.10.2
+ return strings.Split(strings.TrimLeft(path, "/"), "/")
+ }
}
// for debugging
@@ -177,4 +184,8 @@ func (r *Route) EnableContentEncoding(enabled bool) {
r.contentEncodingEnabled = &enabled
}
-var TrimRightSlashEnabled = false
+// TrimRightSlashEnabled controls whether
+// - path on route building is using path.Join
+// - the path of the incoming request is trimmed of its slash suffux.
+// Value of true matches the behavior of <= 3.9.0
+var TrimRightSlashEnabled = true
diff --git a/vendor/github.com/emicklei/go-restful/v3/route_builder.go b/vendor/github.com/emicklei/go-restful/v3/route_builder.go
index 830ebf148ed..75168c12e1a 100644
--- a/vendor/github.com/emicklei/go-restful/v3/route_builder.go
+++ b/vendor/github.com/emicklei/go-restful/v3/route_builder.go
@@ -31,17 +31,18 @@ type RouteBuilder struct {
typeNameHandleFunc TypeNameHandleFunction // required
// documentation
- doc string
- notes string
- operation string
- readSample, writeSample interface{}
- parameters []*Parameter
- errorMap map[int]ResponseError
- defaultResponse *ResponseError
- metadata map[string]interface{}
- extensions map[string]interface{}
- deprecated bool
- contentEncodingEnabled *bool
+ doc string
+ notes string
+ operation string
+ readSample interface{}
+ writeSamples []interface{}
+ parameters []*Parameter
+ errorMap map[int]ResponseError
+ defaultResponse *ResponseError
+ metadata map[string]interface{}
+ extensions map[string]interface{}
+ deprecated bool
+ contentEncodingEnabled *bool
}
// Do evaluates each argument with the RouteBuilder itself.
@@ -135,9 +136,9 @@ func (b RouteBuilder) ParameterNamed(name string) (p *Parameter) {
return p
}
-// Writes tells what resource type will be written as the response payload. Optional.
-func (b *RouteBuilder) Writes(sample interface{}) *RouteBuilder {
- b.writeSample = sample
+// Writes tells which one of the resource types will be written as the response payload. Optional.
+func (b *RouteBuilder) Writes(samples ...interface{}) *RouteBuilder {
+ b.writeSamples = samples // oneof
return b
}
@@ -342,19 +343,29 @@ func (b *RouteBuilder) Build() Route {
ResponseErrors: b.errorMap,
DefaultResponse: b.defaultResponse,
ReadSample: b.readSample,
- WriteSample: b.writeSample,
+ WriteSamples: b.writeSamples,
Metadata: b.metadata,
Deprecated: b.deprecated,
contentEncodingEnabled: b.contentEncodingEnabled,
allowedMethodsWithoutContentType: b.allowedMethodsWithoutContentType,
}
+ // set WriteSample if one specified
+ if len(b.writeSamples) == 1 {
+ route.WriteSample = b.writeSamples[0]
+ }
route.Extensions = b.extensions
route.postBuild()
return route
}
-func concatPath(path1, path2 string) string {
- return path.Join(path1, path2)
+// merge two paths using the current (package global) merge path strategy.
+func concatPath(rootPath, routePath string) string {
+
+ if TrimRightSlashEnabled {
+ return strings.TrimRight(rootPath, "/") + "/" + strings.TrimLeft(routePath, "/")
+ } else {
+ return path.Join(rootPath, routePath)
+ }
}
var anonymousFuncCount int32
diff --git a/vendor/github.com/evanphx/json-patch/README.md b/vendor/github.com/evanphx/json-patch/README.md
index 28e35169375..97e319b21bf 100644
--- a/vendor/github.com/evanphx/json-patch/README.md
+++ b/vendor/github.com/evanphx/json-patch/README.md
@@ -4,7 +4,7 @@
well as for calculating & applying [RFC7396 JSON merge patches](https://tools.ietf.org/html/rfc7396).
[](http://godoc.org/github.com/evanphx/json-patch)
-[](https://travis-ci.org/evanphx/json-patch)
+[](https://github.com/evanphx/json-patch/actions/workflows/go.yml)
[](https://goreportcard.com/report/github.com/evanphx/json-patch)
# Get It!
@@ -314,4 +314,4 @@ go test -cover ./...
```
Builds for pull requests are tested automatically
-using [TravisCI](https://travis-ci.org/evanphx/json-patch).
+using [GitHub Actions](https://github.com/evanphx/json-patch/actions/workflows/go.yml).
diff --git a/vendor/github.com/evanphx/json-patch/patch.go b/vendor/github.com/evanphx/json-patch/patch.go
index 4bce5936d50..cd0274e1e4a 100644
--- a/vendor/github.com/evanphx/json-patch/patch.go
+++ b/vendor/github.com/evanphx/json-patch/patch.go
@@ -359,7 +359,7 @@ func findObject(pd *container, path string) (container, string) {
next, ok := doc.get(decodePatchKey(part))
- if next == nil || ok != nil {
+ if next == nil || ok != nil || next.raw == nil {
return nil, ""
}
@@ -568,6 +568,29 @@ func (p Patch) replace(doc *container, op Operation) error {
return errors.Wrapf(err, "replace operation failed to decode path")
}
+ if path == "" {
+ val := op.value()
+
+ if val.which == eRaw {
+ if !val.tryDoc() {
+ if !val.tryAry() {
+ return errors.Wrapf(err, "replace operation value must be object or array")
+ }
+ }
+ }
+
+ switch val.which {
+ case eAry:
+ *doc = &val.ary
+ case eDoc:
+ *doc = &val.doc
+ case eRaw:
+ return errors.Wrapf(err, "replace operation hit impossible case")
+ }
+
+ return nil
+ }
+
con, key := findObject(doc, path)
if con == nil {
@@ -634,6 +657,25 @@ func (p Patch) test(doc *container, op Operation) error {
return errors.Wrapf(err, "test operation failed to decode path")
}
+ if path == "" {
+ var self lazyNode
+
+ switch sv := (*doc).(type) {
+ case *partialDoc:
+ self.doc = *sv
+ self.which = eDoc
+ case *partialArray:
+ self.ary = *sv
+ self.which = eAry
+ }
+
+ if self.equal(op.value()) {
+ return nil
+ }
+
+ return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
+ }
+
con, key := findObject(doc, path)
if con == nil {
@@ -646,7 +688,7 @@ func (p Patch) test(doc *container, op Operation) error {
}
if val == nil {
- if op.value().raw == nil {
+ if op.value() == nil || op.value().raw == nil {
return nil
}
return errors.Wrapf(ErrTestFailed, "testing value %s failed", path)
diff --git a/vendor/github.com/evanphx/json-patch/v5/LICENSE b/vendor/github.com/evanphx/json-patch/v5/LICENSE
new file mode 100644
index 00000000000..df76d7d7716
--- /dev/null
+++ b/vendor/github.com/evanphx/json-patch/v5/LICENSE
@@ -0,0 +1,25 @@
+Copyright (c) 2014, Evan Phoenix
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+* Neither the name of the Evan Phoenix nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/vendor/github.com/evanphx/json-patch/v5/errors.go b/vendor/github.com/evanphx/json-patch/v5/errors.go
new file mode 100644
index 00000000000..75304b4437c
--- /dev/null
+++ b/vendor/github.com/evanphx/json-patch/v5/errors.go
@@ -0,0 +1,38 @@
+package jsonpatch
+
+import "fmt"
+
+// AccumulatedCopySizeError is an error type returned when the accumulated size
+// increase caused by copy operations in a patch operation has exceeded the
+// limit.
+type AccumulatedCopySizeError struct {
+ limit int64
+ accumulated int64
+}
+
+// NewAccumulatedCopySizeError returns an AccumulatedCopySizeError.
+func NewAccumulatedCopySizeError(l, a int64) *AccumulatedCopySizeError {
+ return &AccumulatedCopySizeError{limit: l, accumulated: a}
+}
+
+// Error implements the error interface.
+func (a *AccumulatedCopySizeError) Error() string {
+ return fmt.Sprintf("Unable to complete the copy, the accumulated size increase of copy is %d, exceeding the limit %d", a.accumulated, a.limit)
+}
+
+// ArraySizeError is an error type returned when the array size has exceeded
+// the limit.
+type ArraySizeError struct {
+ limit int
+ size int
+}
+
+// NewArraySizeError returns an ArraySizeError.
+func NewArraySizeError(l, s int) *ArraySizeError {
+ return &ArraySizeError{limit: l, size: s}
+}
+
+// Error implements the error interface.
+func (a *ArraySizeError) Error() string {
+ return fmt.Sprintf("Unable to create array of size %d, limit is %d", a.size, a.limit)
+}
diff --git a/vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go b/vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go
new file mode 100644
index 00000000000..e9bb0efe77d
--- /dev/null
+++ b/vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go
@@ -0,0 +1,1385 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Represents JSON data structure using native Go types: booleans, floats,
+// strings, arrays, and maps.
+
+package json
+
+import (
+ "encoding"
+ "encoding/base64"
+ "fmt"
+ "reflect"
+ "strconv"
+ "strings"
+ "sync"
+ "unicode"
+ "unicode/utf16"
+ "unicode/utf8"
+)
+
+// Unmarshal parses the JSON-encoded data and stores the result
+// in the value pointed to by v. If v is nil or not a pointer,
+// Unmarshal returns an InvalidUnmarshalError.
+//
+// Unmarshal uses the inverse of the encodings that
+// Marshal uses, allocating maps, slices, and pointers as necessary,
+// with the following additional rules:
+//
+// To unmarshal JSON into a pointer, Unmarshal first handles the case of
+// the JSON being the JSON literal null. In that case, Unmarshal sets
+// the pointer to nil. Otherwise, Unmarshal unmarshals the JSON into
+// the value pointed at by the pointer. If the pointer is nil, Unmarshal
+// allocates a new value for it to point to.
+//
+// To unmarshal JSON into a value implementing the Unmarshaler interface,
+// Unmarshal calls that value's UnmarshalJSON method, including
+// when the input is a JSON null.
+// Otherwise, if the value implements encoding.TextUnmarshaler
+// and the input is a JSON quoted string, Unmarshal calls that value's
+// UnmarshalText method with the unquoted form of the string.
+//
+// To unmarshal JSON into a struct, Unmarshal matches incoming object
+// keys to the keys used by Marshal (either the struct field name or its tag),
+// preferring an exact match but also accepting a case-insensitive match. By
+// default, object keys which don't have a corresponding struct field are
+// ignored (see Decoder.DisallowUnknownFields for an alternative).
+//
+// To unmarshal JSON into an interface value,
+// Unmarshal stores one of these in the interface value:
+//
+// bool, for JSON booleans
+// float64, for JSON numbers
+// string, for JSON strings
+// []interface{}, for JSON arrays
+// map[string]interface{}, for JSON objects
+// nil for JSON null
+//
+// To unmarshal a JSON array into a slice, Unmarshal resets the slice length
+// to zero and then appends each element to the slice.
+// As a special case, to unmarshal an empty JSON array into a slice,
+// Unmarshal replaces the slice with a new empty slice.
+//
+// To unmarshal a JSON array into a Go array, Unmarshal decodes
+// JSON array elements into corresponding Go array elements.
+// If the Go array is smaller than the JSON array,
+// the additional JSON array elements are discarded.
+// If the JSON array is smaller than the Go array,
+// the additional Go array elements are set to zero values.
+//
+// To unmarshal a JSON object into a map, Unmarshal first establishes a map to
+// use. If the map is nil, Unmarshal allocates a new map. Otherwise Unmarshal
+// reuses the existing map, keeping existing entries. Unmarshal then stores
+// key-value pairs from the JSON object into the map. The map's key type must
+// either be any string type, an integer, implement json.Unmarshaler, or
+// implement encoding.TextUnmarshaler.
+//
+// If the JSON-encoded data contain a syntax error, Unmarshal returns a SyntaxError.
+//
+// If a JSON value is not appropriate for a given target type,
+// or if a JSON number overflows the target type, Unmarshal
+// skips that field and completes the unmarshaling as best it can.
+// If no more serious errors are encountered, Unmarshal returns
+// an UnmarshalTypeError describing the earliest such error. In any
+// case, it's not guaranteed that all the remaining fields following
+// the problematic one will be unmarshaled into the target object.
+//
+// The JSON null value unmarshals into an interface, map, pointer, or slice
+// by setting that Go value to nil. Because null is often used in JSON to mean
+// “not present,” unmarshaling a JSON null into any other Go type has no effect
+// on the value and produces no error.
+//
+// When unmarshaling quoted strings, invalid UTF-8 or
+// invalid UTF-16 surrogate pairs are not treated as an error.
+// Instead, they are replaced by the Unicode replacement
+// character U+FFFD.
+func Unmarshal(data []byte, v any) error {
+ // Check for well-formedness.
+ // Avoids filling out half a data structure
+ // before discovering a JSON syntax error.
+ d := ds.Get().(*decodeState)
+ defer ds.Put(d)
+ //var d decodeState
+ d.useNumber = true
+ err := checkValid(data, &d.scan)
+ if err != nil {
+ return err
+ }
+
+ d.init(data)
+ return d.unmarshal(v)
+}
+
+var ds = sync.Pool{
+ New: func() any {
+ return new(decodeState)
+ },
+}
+
+func UnmarshalWithKeys(data []byte, v any) ([]string, error) {
+ // Check for well-formedness.
+ // Avoids filling out half a data structure
+ // before discovering a JSON syntax error.
+
+ d := ds.Get().(*decodeState)
+ defer ds.Put(d)
+ //var d decodeState
+ d.useNumber = true
+ err := checkValid(data, &d.scan)
+ if err != nil {
+ return nil, err
+ }
+
+ d.init(data)
+ err = d.unmarshal(v)
+ if err != nil {
+ return nil, err
+ }
+
+ return d.lastKeys, nil
+}
+
+func UnmarshalValid(data []byte, v any) error {
+ // Check for well-formedness.
+ // Avoids filling out half a data structure
+ // before discovering a JSON syntax error.
+ d := ds.Get().(*decodeState)
+ defer ds.Put(d)
+ //var d decodeState
+ d.useNumber = true
+
+ d.init(data)
+ return d.unmarshal(v)
+}
+
+func UnmarshalValidWithKeys(data []byte, v any) ([]string, error) {
+ // Check for well-formedness.
+ // Avoids filling out half a data structure
+ // before discovering a JSON syntax error.
+
+ d := ds.Get().(*decodeState)
+ defer ds.Put(d)
+ //var d decodeState
+ d.useNumber = true
+
+ d.init(data)
+ err := d.unmarshal(v)
+ if err != nil {
+ return nil, err
+ }
+
+ return d.lastKeys, nil
+}
+
+// Unmarshaler is the interface implemented by types
+// that can unmarshal a JSON description of themselves.
+// The input can be assumed to be a valid encoding of
+// a JSON value. UnmarshalJSON must copy the JSON data
+// if it wishes to retain the data after returning.
+//
+// By convention, to approximate the behavior of Unmarshal itself,
+// Unmarshalers implement UnmarshalJSON([]byte("null")) as a no-op.
+type Unmarshaler interface {
+ UnmarshalJSON([]byte) error
+}
+
+// An UnmarshalTypeError describes a JSON value that was
+// not appropriate for a value of a specific Go type.
+type UnmarshalTypeError struct {
+ Value string // description of JSON value - "bool", "array", "number -5"
+ Type reflect.Type // type of Go value it could not be assigned to
+ Offset int64 // error occurred after reading Offset bytes
+ Struct string // name of the struct type containing the field
+ Field string // the full path from root node to the field
+}
+
+func (e *UnmarshalTypeError) Error() string {
+ if e.Struct != "" || e.Field != "" {
+ return "json: cannot unmarshal " + e.Value + " into Go struct field " + e.Struct + "." + e.Field + " of type " + e.Type.String()
+ }
+ return "json: cannot unmarshal " + e.Value + " into Go value of type " + e.Type.String()
+}
+
+// An UnmarshalFieldError describes a JSON object key that
+// led to an unexported (and therefore unwritable) struct field.
+//
+// Deprecated: No longer used; kept for compatibility.
+type UnmarshalFieldError struct {
+ Key string
+ Type reflect.Type
+ Field reflect.StructField
+}
+
+func (e *UnmarshalFieldError) Error() string {
+ return "json: cannot unmarshal object key " + strconv.Quote(e.Key) + " into unexported field " + e.Field.Name + " of type " + e.Type.String()
+}
+
+// An InvalidUnmarshalError describes an invalid argument passed to Unmarshal.
+// (The argument to Unmarshal must be a non-nil pointer.)
+type InvalidUnmarshalError struct {
+ Type reflect.Type
+}
+
+func (e *InvalidUnmarshalError) Error() string {
+ if e.Type == nil {
+ return "json: Unmarshal(nil)"
+ }
+
+ if e.Type.Kind() != reflect.Pointer {
+ return "json: Unmarshal(non-pointer " + e.Type.String() + ")"
+ }
+ return "json: Unmarshal(nil " + e.Type.String() + ")"
+}
+
+func (d *decodeState) unmarshal(v any) error {
+ rv := reflect.ValueOf(v)
+ if rv.Kind() != reflect.Pointer || rv.IsNil() {
+ return &InvalidUnmarshalError{reflect.TypeOf(v)}
+ }
+
+ d.scan.reset()
+ d.scanWhile(scanSkipSpace)
+ // We decode rv not rv.Elem because the Unmarshaler interface
+ // test must be applied at the top level of the value.
+ err := d.value(rv)
+ if err != nil {
+ return d.addErrorContext(err)
+ }
+ return d.savedError
+}
+
+// A Number represents a JSON number literal.
+type Number string
+
+// String returns the literal text of the number.
+func (n Number) String() string { return string(n) }
+
+// Float64 returns the number as a float64.
+func (n Number) Float64() (float64, error) {
+ return strconv.ParseFloat(string(n), 64)
+}
+
+// Int64 returns the number as an int64.
+func (n Number) Int64() (int64, error) {
+ return strconv.ParseInt(string(n), 10, 64)
+}
+
+// An errorContext provides context for type errors during decoding.
+type errorContext struct {
+ Struct reflect.Type
+ FieldStack []string
+}
+
+// decodeState represents the state while decoding a JSON value.
+type decodeState struct {
+ data []byte
+ off int // next read offset in data
+ opcode int // last read result
+ scan scanner
+ errorContext *errorContext
+ savedError error
+ useNumber bool
+ disallowUnknownFields bool
+ lastKeys []string
+}
+
+// readIndex returns the position of the last byte read.
+func (d *decodeState) readIndex() int {
+ return d.off - 1
+}
+
+// phasePanicMsg is used as a panic message when we end up with something that
+// shouldn't happen. It can indicate a bug in the JSON decoder, or that
+// something is editing the data slice while the decoder executes.
+const phasePanicMsg = "JSON decoder out of sync - data changing underfoot?"
+
+func (d *decodeState) init(data []byte) *decodeState {
+ d.data = data
+ d.off = 0
+ d.savedError = nil
+ if d.errorContext != nil {
+ d.errorContext.Struct = nil
+ // Reuse the allocated space for the FieldStack slice.
+ d.errorContext.FieldStack = d.errorContext.FieldStack[:0]
+ }
+ return d
+}
+
+// saveError saves the first err it is called with,
+// for reporting at the end of the unmarshal.
+func (d *decodeState) saveError(err error) {
+ if d.savedError == nil {
+ d.savedError = d.addErrorContext(err)
+ }
+}
+
+// addErrorContext returns a new error enhanced with information from d.errorContext
+func (d *decodeState) addErrorContext(err error) error {
+ if d.errorContext != nil && (d.errorContext.Struct != nil || len(d.errorContext.FieldStack) > 0) {
+ switch err := err.(type) {
+ case *UnmarshalTypeError:
+ err.Struct = d.errorContext.Struct.Name()
+ err.Field = strings.Join(d.errorContext.FieldStack, ".")
+ }
+ }
+ return err
+}
+
+// skip scans to the end of what was started.
+func (d *decodeState) skip() {
+ s, data, i := &d.scan, d.data, d.off
+ depth := len(s.parseState)
+ for {
+ op := s.step(s, data[i])
+ i++
+ if len(s.parseState) < depth {
+ d.off = i
+ d.opcode = op
+ return
+ }
+ }
+}
+
+// scanNext processes the byte at d.data[d.off].
+func (d *decodeState) scanNext() {
+ if d.off < len(d.data) {
+ d.opcode = d.scan.step(&d.scan, d.data[d.off])
+ d.off++
+ } else {
+ d.opcode = d.scan.eof()
+ d.off = len(d.data) + 1 // mark processed EOF with len+1
+ }
+}
+
+// scanWhile processes bytes in d.data[d.off:] until it
+// receives a scan code not equal to op.
+func (d *decodeState) scanWhile(op int) {
+ s, data, i := &d.scan, d.data, d.off
+ for i < len(data) {
+ newOp := s.step(s, data[i])
+ i++
+ if newOp != op {
+ d.opcode = newOp
+ d.off = i
+ return
+ }
+ }
+
+ d.off = len(data) + 1 // mark processed EOF with len+1
+ d.opcode = d.scan.eof()
+}
+
+// rescanLiteral is similar to scanWhile(scanContinue), but it specialises the
+// common case where we're decoding a literal. The decoder scans the input
+// twice, once for syntax errors and to check the length of the value, and the
+// second to perform the decoding.
+//
+// Only in the second step do we use decodeState to tokenize literals, so we
+// know there aren't any syntax errors. We can take advantage of that knowledge,
+// and scan a literal's bytes much more quickly.
+func (d *decodeState) rescanLiteral() {
+ data, i := d.data, d.off
+Switch:
+ switch data[i-1] {
+ case '"': // string
+ for ; i < len(data); i++ {
+ switch data[i] {
+ case '\\':
+ i++ // escaped char
+ case '"':
+ i++ // tokenize the closing quote too
+ break Switch
+ }
+ }
+ case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-': // number
+ for ; i < len(data); i++ {
+ switch data[i] {
+ case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+ '.', 'e', 'E', '+', '-':
+ default:
+ break Switch
+ }
+ }
+ case 't': // true
+ i += len("rue")
+ case 'f': // false
+ i += len("alse")
+ case 'n': // null
+ i += len("ull")
+ }
+ if i < len(data) {
+ d.opcode = stateEndValue(&d.scan, data[i])
+ } else {
+ d.opcode = scanEnd
+ }
+ d.off = i + 1
+}
+
+// value consumes a JSON value from d.data[d.off-1:], decoding into v, and
+// reads the following byte ahead. If v is invalid, the value is discarded.
+// The first byte of the value has been read already.
+func (d *decodeState) value(v reflect.Value) error {
+ switch d.opcode {
+ default:
+ panic(phasePanicMsg)
+
+ case scanBeginArray:
+ if v.IsValid() {
+ if err := d.array(v); err != nil {
+ return err
+ }
+ } else {
+ d.skip()
+ }
+ d.scanNext()
+
+ case scanBeginObject:
+ if v.IsValid() {
+ if err := d.object(v); err != nil {
+ return err
+ }
+ } else {
+ d.skip()
+ }
+ d.scanNext()
+
+ case scanBeginLiteral:
+ // All bytes inside literal return scanContinue op code.
+ start := d.readIndex()
+ d.rescanLiteral()
+
+ if v.IsValid() {
+ if err := d.literalStore(d.data[start:d.readIndex()], v, false); err != nil {
+ return err
+ }
+ }
+ }
+ return nil
+}
+
+type unquotedValue struct{}
+
+// valueQuoted is like value but decodes a
+// quoted string literal or literal null into an interface value.
+// If it finds anything other than a quoted string literal or null,
+// valueQuoted returns unquotedValue{}.
+func (d *decodeState) valueQuoted() any {
+ switch d.opcode {
+ default:
+ panic(phasePanicMsg)
+
+ case scanBeginArray, scanBeginObject:
+ d.skip()
+ d.scanNext()
+
+ case scanBeginLiteral:
+ v := d.literalInterface()
+ switch v.(type) {
+ case nil, string:
+ return v
+ }
+ }
+ return unquotedValue{}
+}
+
+// indirect walks down v allocating pointers as needed,
+// until it gets to a non-pointer.
+// If it encounters an Unmarshaler, indirect stops and returns that.
+// If decodingNull is true, indirect stops at the first settable pointer so it
+// can be set to nil.
+func indirect(v reflect.Value, decodingNull bool) (Unmarshaler, encoding.TextUnmarshaler, reflect.Value) {
+ // Issue #24153 indicates that it is generally not a guaranteed property
+ // that you may round-trip a reflect.Value by calling Value.Addr().Elem()
+ // and expect the value to still be settable for values derived from
+ // unexported embedded struct fields.
+ //
+ // The logic below effectively does this when it first addresses the value
+ // (to satisfy possible pointer methods) and continues to dereference
+ // subsequent pointers as necessary.
+ //
+ // After the first round-trip, we set v back to the original value to
+ // preserve the original RW flags contained in reflect.Value.
+ v0 := v
+ haveAddr := false
+
+ // If v is a named type and is addressable,
+ // start with its address, so that if the type has pointer methods,
+ // we find them.
+ if v.Kind() != reflect.Pointer && v.Type().Name() != "" && v.CanAddr() {
+ haveAddr = true
+ v = v.Addr()
+ }
+ for {
+ // Load value from interface, but only if the result will be
+ // usefully addressable.
+ if v.Kind() == reflect.Interface && !v.IsNil() {
+ e := v.Elem()
+ if e.Kind() == reflect.Pointer && !e.IsNil() && (!decodingNull || e.Elem().Kind() == reflect.Pointer) {
+ haveAddr = false
+ v = e
+ continue
+ }
+ }
+
+ if v.Kind() != reflect.Pointer {
+ break
+ }
+
+ if decodingNull && v.CanSet() {
+ break
+ }
+
+ // Prevent infinite loop if v is an interface pointing to its own address:
+ // var v interface{}
+ // v = &v
+ if v.Elem().Kind() == reflect.Interface && v.Elem().Elem() == v {
+ v = v.Elem()
+ break
+ }
+ if v.IsNil() {
+ v.Set(reflect.New(v.Type().Elem()))
+ }
+ if v.Type().NumMethod() > 0 && v.CanInterface() {
+ if u, ok := v.Interface().(Unmarshaler); ok {
+ return u, nil, reflect.Value{}
+ }
+ if !decodingNull {
+ if u, ok := v.Interface().(encoding.TextUnmarshaler); ok {
+ return nil, u, reflect.Value{}
+ }
+ }
+ }
+
+ if haveAddr {
+ v = v0 // restore original value after round-trip Value.Addr().Elem()
+ haveAddr = false
+ } else {
+ v = v.Elem()
+ }
+ }
+ return nil, nil, v
+}
+
+// array consumes an array from d.data[d.off-1:], decoding into v.
+// The first byte of the array ('[') has been read already.
+func (d *decodeState) array(v reflect.Value) error {
+ // Check for unmarshaler.
+ u, ut, pv := indirect(v, false)
+ if u != nil {
+ start := d.readIndex()
+ d.skip()
+ return u.UnmarshalJSON(d.data[start:d.off])
+ }
+ if ut != nil {
+ d.saveError(&UnmarshalTypeError{Value: "array", Type: v.Type(), Offset: int64(d.off)})
+ d.skip()
+ return nil
+ }
+ v = pv
+
+ // Check type of target.
+ switch v.Kind() {
+ case reflect.Interface:
+ if v.NumMethod() == 0 {
+ // Decoding into nil interface? Switch to non-reflect code.
+ ai := d.arrayInterface()
+ v.Set(reflect.ValueOf(ai))
+ return nil
+ }
+ // Otherwise it's invalid.
+ fallthrough
+ default:
+ d.saveError(&UnmarshalTypeError{Value: "array", Type: v.Type(), Offset: int64(d.off)})
+ d.skip()
+ return nil
+ case reflect.Array, reflect.Slice:
+ break
+ }
+
+ i := 0
+ for {
+ // Look ahead for ] - can only happen on first iteration.
+ d.scanWhile(scanSkipSpace)
+ if d.opcode == scanEndArray {
+ break
+ }
+
+ // Get element of array, growing if necessary.
+ if v.Kind() == reflect.Slice {
+ // Grow slice if necessary
+ if i >= v.Cap() {
+ newcap := v.Cap() + v.Cap()/2
+ if newcap < 4 {
+ newcap = 4
+ }
+ newv := reflect.MakeSlice(v.Type(), v.Len(), newcap)
+ reflect.Copy(newv, v)
+ v.Set(newv)
+ }
+ if i >= v.Len() {
+ v.SetLen(i + 1)
+ }
+ }
+
+ if i < v.Len() {
+ // Decode into element.
+ if err := d.value(v.Index(i)); err != nil {
+ return err
+ }
+ } else {
+ // Ran out of fixed array: skip.
+ if err := d.value(reflect.Value{}); err != nil {
+ return err
+ }
+ }
+ i++
+
+ // Next token must be , or ].
+ if d.opcode == scanSkipSpace {
+ d.scanWhile(scanSkipSpace)
+ }
+ if d.opcode == scanEndArray {
+ break
+ }
+ if d.opcode != scanArrayValue {
+ panic(phasePanicMsg)
+ }
+ }
+
+ if i < v.Len() {
+ if v.Kind() == reflect.Array {
+ // Array. Zero the rest.
+ z := reflect.Zero(v.Type().Elem())
+ for ; i < v.Len(); i++ {
+ v.Index(i).Set(z)
+ }
+ } else {
+ v.SetLen(i)
+ }
+ }
+ if i == 0 && v.Kind() == reflect.Slice {
+ v.Set(reflect.MakeSlice(v.Type(), 0, 0))
+ }
+ return nil
+}
+
+var nullLiteral = []byte("null")
+var textUnmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
+
+// object consumes an object from d.data[d.off-1:], decoding into v.
+// The first byte ('{') of the object has been read already.
+func (d *decodeState) object(v reflect.Value) error {
+ // Check for unmarshaler.
+ u, ut, pv := indirect(v, false)
+ if u != nil {
+ start := d.readIndex()
+ d.skip()
+ return u.UnmarshalJSON(d.data[start:d.off])
+ }
+ if ut != nil {
+ d.saveError(&UnmarshalTypeError{Value: "object", Type: v.Type(), Offset: int64(d.off)})
+ d.skip()
+ return nil
+ }
+ v = pv
+ t := v.Type()
+
+ // Decoding into nil interface? Switch to non-reflect code.
+ if v.Kind() == reflect.Interface && v.NumMethod() == 0 {
+ oi := d.objectInterface()
+ v.Set(reflect.ValueOf(oi))
+ return nil
+ }
+
+ var fields structFields
+
+ // Check type of target:
+ // struct or
+ // map[T1]T2 where T1 is string, an integer type,
+ // or an encoding.TextUnmarshaler
+ switch v.Kind() {
+ case reflect.Map:
+ // Map key must either have string kind, have an integer kind,
+ // or be an encoding.TextUnmarshaler.
+ switch t.Key().Kind() {
+ case reflect.String,
+ reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
+ reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+ default:
+ if !reflect.PointerTo(t.Key()).Implements(textUnmarshalerType) {
+ d.saveError(&UnmarshalTypeError{Value: "object", Type: t, Offset: int64(d.off)})
+ d.skip()
+ return nil
+ }
+ }
+ if v.IsNil() {
+ v.Set(reflect.MakeMap(t))
+ }
+ case reflect.Struct:
+ fields = cachedTypeFields(t)
+ // ok
+ default:
+ d.saveError(&UnmarshalTypeError{Value: "object", Type: t, Offset: int64(d.off)})
+ d.skip()
+ return nil
+ }
+
+ var mapElem reflect.Value
+ var origErrorContext errorContext
+ if d.errorContext != nil {
+ origErrorContext = *d.errorContext
+ }
+
+ var keys []string
+
+ for {
+ // Read opening " of string key or closing }.
+ d.scanWhile(scanSkipSpace)
+ if d.opcode == scanEndObject {
+ // closing } - can only happen on first iteration.
+ break
+ }
+ if d.opcode != scanBeginLiteral {
+ panic(phasePanicMsg)
+ }
+
+ // Read key.
+ start := d.readIndex()
+ d.rescanLiteral()
+ item := d.data[start:d.readIndex()]
+ key, ok := unquoteBytes(item)
+ if !ok {
+ panic(phasePanicMsg)
+ }
+
+ keys = append(keys, string(key))
+
+ // Figure out field corresponding to key.
+ var subv reflect.Value
+ destring := false // whether the value is wrapped in a string to be decoded first
+
+ if v.Kind() == reflect.Map {
+ elemType := t.Elem()
+ if !mapElem.IsValid() {
+ mapElem = reflect.New(elemType).Elem()
+ } else {
+ mapElem.Set(reflect.Zero(elemType))
+ }
+ subv = mapElem
+ } else {
+ var f *field
+ if i, ok := fields.nameIndex[string(key)]; ok {
+ // Found an exact name match.
+ f = &fields.list[i]
+ } else {
+ // Fall back to the expensive case-insensitive
+ // linear search.
+ for i := range fields.list {
+ ff := &fields.list[i]
+ if ff.equalFold(ff.nameBytes, key) {
+ f = ff
+ break
+ }
+ }
+ }
+ if f != nil {
+ subv = v
+ destring = f.quoted
+ for _, i := range f.index {
+ if subv.Kind() == reflect.Pointer {
+ if subv.IsNil() {
+ // If a struct embeds a pointer to an unexported type,
+ // it is not possible to set a newly allocated value
+ // since the field is unexported.
+ //
+ // See https://golang.org/issue/21357
+ if !subv.CanSet() {
+ d.saveError(fmt.Errorf("json: cannot set embedded pointer to unexported struct: %v", subv.Type().Elem()))
+ // Invalidate subv to ensure d.value(subv) skips over
+ // the JSON value without assigning it to subv.
+ subv = reflect.Value{}
+ destring = false
+ break
+ }
+ subv.Set(reflect.New(subv.Type().Elem()))
+ }
+ subv = subv.Elem()
+ }
+ subv = subv.Field(i)
+ }
+ if d.errorContext == nil {
+ d.errorContext = new(errorContext)
+ }
+ d.errorContext.FieldStack = append(d.errorContext.FieldStack, f.name)
+ d.errorContext.Struct = t
+ } else if d.disallowUnknownFields {
+ d.saveError(fmt.Errorf("json: unknown field %q", key))
+ }
+ }
+
+ // Read : before value.
+ if d.opcode == scanSkipSpace {
+ d.scanWhile(scanSkipSpace)
+ }
+ if d.opcode != scanObjectKey {
+ panic(phasePanicMsg)
+ }
+ d.scanWhile(scanSkipSpace)
+
+ if destring {
+ switch qv := d.valueQuoted().(type) {
+ case nil:
+ if err := d.literalStore(nullLiteral, subv, false); err != nil {
+ return err
+ }
+ case string:
+ if err := d.literalStore([]byte(qv), subv, true); err != nil {
+ return err
+ }
+ default:
+ d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal unquoted value into %v", subv.Type()))
+ }
+ } else {
+ if err := d.value(subv); err != nil {
+ return err
+ }
+ }
+
+ // Write value back to map;
+ // if using struct, subv points into struct already.
+ if v.Kind() == reflect.Map {
+ kt := t.Key()
+ var kv reflect.Value
+ switch {
+ case reflect.PointerTo(kt).Implements(textUnmarshalerType):
+ kv = reflect.New(kt)
+ if err := d.literalStore(item, kv, true); err != nil {
+ return err
+ }
+ kv = kv.Elem()
+ case kt.Kind() == reflect.String:
+ kv = reflect.ValueOf(key).Convert(kt)
+ default:
+ switch kt.Kind() {
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ s := string(key)
+ n, err := strconv.ParseInt(s, 10, 64)
+ if err != nil || reflect.Zero(kt).OverflowInt(n) {
+ d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: kt, Offset: int64(start + 1)})
+ break
+ }
+ kv = reflect.ValueOf(n).Convert(kt)
+ case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+ s := string(key)
+ n, err := strconv.ParseUint(s, 10, 64)
+ if err != nil || reflect.Zero(kt).OverflowUint(n) {
+ d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: kt, Offset: int64(start + 1)})
+ break
+ }
+ kv = reflect.ValueOf(n).Convert(kt)
+ default:
+ panic("json: Unexpected key type") // should never occur
+ }
+ }
+ if kv.IsValid() {
+ v.SetMapIndex(kv, subv)
+ }
+ }
+
+ // Next token must be , or }.
+ if d.opcode == scanSkipSpace {
+ d.scanWhile(scanSkipSpace)
+ }
+ if d.errorContext != nil {
+ // Reset errorContext to its original state.
+ // Keep the same underlying array for FieldStack, to reuse the
+ // space and avoid unnecessary allocs.
+ d.errorContext.FieldStack = d.errorContext.FieldStack[:len(origErrorContext.FieldStack)]
+ d.errorContext.Struct = origErrorContext.Struct
+ }
+ if d.opcode == scanEndObject {
+ break
+ }
+ if d.opcode != scanObjectValue {
+ panic(phasePanicMsg)
+ }
+ }
+
+ if v.Kind() == reflect.Map {
+ d.lastKeys = keys
+ }
+ return nil
+}
+
+// convertNumber converts the number literal s to a float64 or a Number
+// depending on the setting of d.useNumber.
+func (d *decodeState) convertNumber(s string) (any, error) {
+ if d.useNumber {
+ return Number(s), nil
+ }
+ f, err := strconv.ParseFloat(s, 64)
+ if err != nil {
+ return nil, &UnmarshalTypeError{Value: "number " + s, Type: reflect.TypeOf(0.0), Offset: int64(d.off)}
+ }
+ return f, nil
+}
+
+var numberType = reflect.TypeOf(Number(""))
+
+// literalStore decodes a literal stored in item into v.
+//
+// fromQuoted indicates whether this literal came from unwrapping a
+// string from the ",string" struct tag option. this is used only to
+// produce more helpful error messages.
+func (d *decodeState) literalStore(item []byte, v reflect.Value, fromQuoted bool) error {
+ // Check for unmarshaler.
+ if len(item) == 0 {
+ //Empty string given
+ d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()))
+ return nil
+ }
+ isNull := item[0] == 'n' // null
+ u, ut, pv := indirect(v, isNull)
+ if u != nil {
+ return u.UnmarshalJSON(item)
+ }
+ if ut != nil {
+ if item[0] != '"' {
+ if fromQuoted {
+ d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()))
+ return nil
+ }
+ val := "number"
+ switch item[0] {
+ case 'n':
+ val = "null"
+ case 't', 'f':
+ val = "bool"
+ }
+ d.saveError(&UnmarshalTypeError{Value: val, Type: v.Type(), Offset: int64(d.readIndex())})
+ return nil
+ }
+ s, ok := unquoteBytes(item)
+ if !ok {
+ if fromQuoted {
+ return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())
+ }
+ panic(phasePanicMsg)
+ }
+ return ut.UnmarshalText(s)
+ }
+
+ v = pv
+
+ switch c := item[0]; c {
+ case 'n': // null
+ // The main parser checks that only true and false can reach here,
+ // but if this was a quoted string input, it could be anything.
+ if fromQuoted && string(item) != "null" {
+ d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()))
+ break
+ }
+ switch v.Kind() {
+ case reflect.Interface, reflect.Pointer, reflect.Map, reflect.Slice:
+ v.Set(reflect.Zero(v.Type()))
+ // otherwise, ignore null for primitives/string
+ }
+ case 't', 'f': // true, false
+ value := item[0] == 't'
+ // The main parser checks that only true and false can reach here,
+ // but if this was a quoted string input, it could be anything.
+ if fromQuoted && string(item) != "true" && string(item) != "false" {
+ d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()))
+ break
+ }
+ switch v.Kind() {
+ default:
+ if fromQuoted {
+ d.saveError(fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type()))
+ } else {
+ d.saveError(&UnmarshalTypeError{Value: "bool", Type: v.Type(), Offset: int64(d.readIndex())})
+ }
+ case reflect.Bool:
+ v.SetBool(value)
+ case reflect.Interface:
+ if v.NumMethod() == 0 {
+ v.Set(reflect.ValueOf(value))
+ } else {
+ d.saveError(&UnmarshalTypeError{Value: "bool", Type: v.Type(), Offset: int64(d.readIndex())})
+ }
+ }
+
+ case '"': // string
+ s, ok := unquoteBytes(item)
+ if !ok {
+ if fromQuoted {
+ return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())
+ }
+ panic(phasePanicMsg)
+ }
+ switch v.Kind() {
+ default:
+ d.saveError(&UnmarshalTypeError{Value: "string", Type: v.Type(), Offset: int64(d.readIndex())})
+ case reflect.Slice:
+ if v.Type().Elem().Kind() != reflect.Uint8 {
+ d.saveError(&UnmarshalTypeError{Value: "string", Type: v.Type(), Offset: int64(d.readIndex())})
+ break
+ }
+ b := make([]byte, base64.StdEncoding.DecodedLen(len(s)))
+ n, err := base64.StdEncoding.Decode(b, s)
+ if err != nil {
+ d.saveError(err)
+ break
+ }
+ v.SetBytes(b[:n])
+ case reflect.String:
+ if v.Type() == numberType && !isValidNumber(string(s)) {
+ return fmt.Errorf("json: invalid number literal, trying to unmarshal %q into Number", item)
+ }
+ v.SetString(string(s))
+ case reflect.Interface:
+ if v.NumMethod() == 0 {
+ v.Set(reflect.ValueOf(string(s)))
+ } else {
+ d.saveError(&UnmarshalTypeError{Value: "string", Type: v.Type(), Offset: int64(d.readIndex())})
+ }
+ }
+
+ default: // number
+ if c != '-' && (c < '0' || c > '9') {
+ if fromQuoted {
+ return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())
+ }
+ panic(phasePanicMsg)
+ }
+ s := string(item)
+ switch v.Kind() {
+ default:
+ if v.Kind() == reflect.String && v.Type() == numberType {
+ // s must be a valid number, because it's
+ // already been tokenized.
+ v.SetString(s)
+ break
+ }
+ if fromQuoted {
+ return fmt.Errorf("json: invalid use of ,string struct tag, trying to unmarshal %q into %v", item, v.Type())
+ }
+ d.saveError(&UnmarshalTypeError{Value: "number", Type: v.Type(), Offset: int64(d.readIndex())})
+ case reflect.Interface:
+ n, err := d.convertNumber(s)
+ if err != nil {
+ d.saveError(err)
+ break
+ }
+ if v.NumMethod() != 0 {
+ d.saveError(&UnmarshalTypeError{Value: "number", Type: v.Type(), Offset: int64(d.readIndex())})
+ break
+ }
+ v.Set(reflect.ValueOf(n))
+
+ case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+ n, err := strconv.ParseInt(s, 10, 64)
+ if err != nil || v.OverflowInt(n) {
+ d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: v.Type(), Offset: int64(d.readIndex())})
+ break
+ }
+ v.SetInt(n)
+
+ case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+ n, err := strconv.ParseUint(s, 10, 64)
+ if err != nil || v.OverflowUint(n) {
+ d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: v.Type(), Offset: int64(d.readIndex())})
+ break
+ }
+ v.SetUint(n)
+
+ case reflect.Float32, reflect.Float64:
+ n, err := strconv.ParseFloat(s, v.Type().Bits())
+ if err != nil || v.OverflowFloat(n) {
+ d.saveError(&UnmarshalTypeError{Value: "number " + s, Type: v.Type(), Offset: int64(d.readIndex())})
+ break
+ }
+ v.SetFloat(n)
+ }
+ }
+ return nil
+}
+
+// The xxxInterface routines build up a value to be stored
+// in an empty interface. They are not strictly necessary,
+// but they avoid the weight of reflection in this common case.
+
+// valueInterface is like value but returns interface{}
+func (d *decodeState) valueInterface() (val any) {
+ switch d.opcode {
+ default:
+ panic(phasePanicMsg)
+ case scanBeginArray:
+ val = d.arrayInterface()
+ d.scanNext()
+ case scanBeginObject:
+ val = d.objectInterface()
+ d.scanNext()
+ case scanBeginLiteral:
+ val = d.literalInterface()
+ }
+ return
+}
+
+// arrayInterface is like array but returns []interface{}.
+func (d *decodeState) arrayInterface() []any {
+ var v = make([]any, 0)
+ for {
+ // Look ahead for ] - can only happen on first iteration.
+ d.scanWhile(scanSkipSpace)
+ if d.opcode == scanEndArray {
+ break
+ }
+
+ v = append(v, d.valueInterface())
+
+ // Next token must be , or ].
+ if d.opcode == scanSkipSpace {
+ d.scanWhile(scanSkipSpace)
+ }
+ if d.opcode == scanEndArray {
+ break
+ }
+ if d.opcode != scanArrayValue {
+ panic(phasePanicMsg)
+ }
+ }
+ return v
+}
+
+// objectInterface is like object but returns map[string]interface{}.
+func (d *decodeState) objectInterface() map[string]any {
+ m := make(map[string]any)
+ for {
+ // Read opening " of string key or closing }.
+ d.scanWhile(scanSkipSpace)
+ if d.opcode == scanEndObject {
+ // closing } - can only happen on first iteration.
+ break
+ }
+ if d.opcode != scanBeginLiteral {
+ panic(phasePanicMsg)
+ }
+
+ // Read string key.
+ start := d.readIndex()
+ d.rescanLiteral()
+ item := d.data[start:d.readIndex()]
+ key, ok := unquote(item)
+ if !ok {
+ panic(phasePanicMsg)
+ }
+
+ // Read : before value.
+ if d.opcode == scanSkipSpace {
+ d.scanWhile(scanSkipSpace)
+ }
+ if d.opcode != scanObjectKey {
+ panic(phasePanicMsg)
+ }
+ d.scanWhile(scanSkipSpace)
+
+ // Read value.
+ m[key] = d.valueInterface()
+
+ // Next token must be , or }.
+ if d.opcode == scanSkipSpace {
+ d.scanWhile(scanSkipSpace)
+ }
+ if d.opcode == scanEndObject {
+ break
+ }
+ if d.opcode != scanObjectValue {
+ panic(phasePanicMsg)
+ }
+ }
+ return m
+}
+
+// literalInterface consumes and returns a literal from d.data[d.off-1:] and
+// it reads the following byte ahead. The first byte of the literal has been
+// read already (that's how the caller knows it's a literal).
+func (d *decodeState) literalInterface() any {
+ // All bytes inside literal return scanContinue op code.
+ start := d.readIndex()
+ d.rescanLiteral()
+
+ item := d.data[start:d.readIndex()]
+
+ switch c := item[0]; c {
+ case 'n': // null
+ return nil
+
+ case 't', 'f': // true, false
+ return c == 't'
+
+ case '"': // string
+ s, ok := unquote(item)
+ if !ok {
+ panic(phasePanicMsg)
+ }
+ return s
+
+ default: // number
+ if c != '-' && (c < '0' || c > '9') {
+ panic(phasePanicMsg)
+ }
+ n, err := d.convertNumber(string(item))
+ if err != nil {
+ d.saveError(err)
+ }
+ return n
+ }
+}
+
+// getu4 decodes \uXXXX from the beginning of s, returning the hex value,
+// or it returns -1.
+func getu4(s []byte) rune {
+ if len(s) < 6 || s[0] != '\\' || s[1] != 'u' {
+ return -1
+ }
+ var r rune
+ for _, c := range s[2:6] {
+ switch {
+ case '0' <= c && c <= '9':
+ c = c - '0'
+ case 'a' <= c && c <= 'f':
+ c = c - 'a' + 10
+ case 'A' <= c && c <= 'F':
+ c = c - 'A' + 10
+ default:
+ return -1
+ }
+ r = r*16 + rune(c)
+ }
+ return r
+}
+
+// unquote converts a quoted JSON string literal s into an actual string t.
+// The rules are different than for Go, so cannot use strconv.Unquote.
+func unquote(s []byte) (t string, ok bool) {
+ s, ok = unquoteBytes(s)
+ t = string(s)
+ return
+}
+
+func unquoteBytes(s []byte) (t []byte, ok bool) {
+ if len(s) < 2 || s[0] != '"' || s[len(s)-1] != '"' {
+ return
+ }
+ s = s[1 : len(s)-1]
+
+ // Check for unusual characters. If there are none,
+ // then no unquoting is needed, so return a slice of the
+ // original bytes.
+ r := 0
+ for r < len(s) {
+ c := s[r]
+ if c == '\\' || c == '"' || c < ' ' {
+ break
+ }
+ if c < utf8.RuneSelf {
+ r++
+ continue
+ }
+ rr, size := utf8.DecodeRune(s[r:])
+ if rr == utf8.RuneError && size == 1 {
+ break
+ }
+ r += size
+ }
+ if r == len(s) {
+ return s, true
+ }
+
+ b := make([]byte, len(s)+2*utf8.UTFMax)
+ w := copy(b, s[0:r])
+ for r < len(s) {
+ // Out of room? Can only happen if s is full of
+ // malformed UTF-8 and we're replacing each
+ // byte with RuneError.
+ if w >= len(b)-2*utf8.UTFMax {
+ nb := make([]byte, (len(b)+utf8.UTFMax)*2)
+ copy(nb, b[0:w])
+ b = nb
+ }
+ switch c := s[r]; {
+ case c == '\\':
+ r++
+ if r >= len(s) {
+ return
+ }
+ switch s[r] {
+ default:
+ return
+ case '"', '\\', '/', '\'':
+ b[w] = s[r]
+ r++
+ w++
+ case 'b':
+ b[w] = '\b'
+ r++
+ w++
+ case 'f':
+ b[w] = '\f'
+ r++
+ w++
+ case 'n':
+ b[w] = '\n'
+ r++
+ w++
+ case 'r':
+ b[w] = '\r'
+ r++
+ w++
+ case 't':
+ b[w] = '\t'
+ r++
+ w++
+ case 'u':
+ r--
+ rr := getu4(s[r:])
+ if rr < 0 {
+ return
+ }
+ r += 6
+ if utf16.IsSurrogate(rr) {
+ rr1 := getu4(s[r:])
+ if dec := utf16.DecodeRune(rr, rr1); dec != unicode.ReplacementChar {
+ // A valid pair; consume.
+ r += 6
+ w += utf8.EncodeRune(b[w:], dec)
+ break
+ }
+ // Invalid surrogate; fall back to replacement rune.
+ rr = unicode.ReplacementChar
+ }
+ w += utf8.EncodeRune(b[w:], rr)
+ }
+
+ // Quote, control characters are invalid.
+ case c == '"', c < ' ':
+ return
+
+ // ASCII
+ case c < utf8.RuneSelf:
+ b[w] = c
+ r++
+ w++
+
+ // Coerce to well-formed UTF-8.
+ default:
+ rr, size := utf8.DecodeRune(s[r:])
+ r += size
+ w += utf8.EncodeRune(b[w:], rr)
+ }
+ }
+ return b[0:w], true
+}
diff --git a/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go b/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go
new file mode 100644
index 00000000000..a1819b16ace
--- /dev/null
+++ b/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go
@@ -0,0 +1,1473 @@
+// Copyright 2010 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Package json implements encoding and decoding of JSON as defined in
+// RFC 7159. The mapping between JSON and Go values is described
+// in the documentation for the Marshal and Unmarshal functions.
+//
+// See "JSON and Go" for an introduction to this package:
+// https://golang.org/doc/articles/json_and_go.html
+package json
+
+import (
+ "bytes"
+ "encoding"
+ "encoding/base64"
+ "fmt"
+ "math"
+ "reflect"
+ "sort"
+ "strconv"
+ "strings"
+ "sync"
+ "unicode"
+ "unicode/utf8"
+)
+
+// Marshal returns the JSON encoding of v.
+//
+// Marshal traverses the value v recursively.
+// If an encountered value implements the Marshaler interface
+// and is not a nil pointer, Marshal calls its MarshalJSON method
+// to produce JSON. If no MarshalJSON method is present but the
+// value implements encoding.TextMarshaler instead, Marshal calls
+// its MarshalText method and encodes the result as a JSON string.
+// The nil pointer exception is not strictly necessary
+// but mimics a similar, necessary exception in the behavior of
+// UnmarshalJSON.
+//
+// Otherwise, Marshal uses the following type-dependent default encodings:
+//
+// Boolean values encode as JSON booleans.
+//
+// Floating point, integer, and Number values encode as JSON numbers.
+//
+// String values encode as JSON strings coerced to valid UTF-8,
+// replacing invalid bytes with the Unicode replacement rune.
+// So that the JSON will be safe to embed inside HTML