From 58970737f904b26310efdcded44165827f815378 Mon Sep 17 00:00:00 2001 From: Grigoriy Tchiflidjanov <53291139+gtchiflidjanov@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:41:44 +0200 Subject: [PATCH] Sync kctrl CLI module dependencies with main module. (#1687) * Sync kctrl CLI module dependencies with main module. Signed-off-by: Grigoriy Tchiflidjanov * Change CLI module name to follow main module. Bumping Go version to 1.23.6 Signed-off-by: Grigoriy Tchiflidjanov --------- Signed-off-by: Grigoriy Tchiflidjanov Co-authored-by: Grigoriy Tchiflidjanov --- cli/cmd/kctrl/kctrl.go | 2 +- cli/go.mod | 110 +- cli/go.sum | 751 +- cli/pkg/kctrl/cmd/app/app.go | 6 +- cli/pkg/kctrl/cmd/app/app_tailer.go | 8 +- cli/pkg/kctrl/cmd/app/app_tailer_test.go | 8 +- cli/pkg/kctrl/cmd/app/delete.go | 6 +- cli/pkg/kctrl/cmd/app/get.go | 6 +- cli/pkg/kctrl/cmd/app/init.go | 10 +- cli/pkg/kctrl/cmd/app/kick.go | 6 +- cli/pkg/kctrl/cmd/app/list.go | 4 +- cli/pkg/kctrl/cmd/app/pause.go | 6 +- .../kctrl/cmd/app/release/app_spec_builder.go | 12 +- .../kctrl/cmd/app/release/imgpkg_runner.go | 2 +- cli/pkg/kctrl/cmd/app/release/release.go | 6 +- .../cmd/app/release/release_cmd_runner.go | 4 +- cli/pkg/kctrl/cmd/app/status.go | 4 +- cli/pkg/kctrl/cmd/core/deps_factory.go | 4 +- cli/pkg/kctrl/cmd/core/semver_value.go | 2 +- cli/pkg/kctrl/cmd/dev/cmd.go | 12 +- cli/pkg/kctrl/cmd/kctrl.go | 22 +- cli/pkg/kctrl/cmd/logger_flags.go | 4 +- cli/pkg/kctrl/cmd/package/available/cmd.go | 2 +- cli/pkg/kctrl/cmd/package/available/get.go | 8 +- cli/pkg/kctrl/cmd/package/available/list.go | 4 +- .../cmd/package/available/values_schema.go | 2 +- cli/pkg/kctrl/cmd/package/init.go | 20 +- cli/pkg/kctrl/cmd/package/installed/cmd.go | 2 +- .../cmd/package/installed/create_or_update.go | 16 +- cli/pkg/kctrl/cmd/package/installed/delete.go | 12 +- cli/pkg/kctrl/cmd/package/installed/get.go | 8 +- cli/pkg/kctrl/cmd/package/installed/list.go | 6 +- .../installed/package_install_dry_run.go | 6 +- .../cmd/package/installed/pause_or_kick.go | 10 +- cli/pkg/kctrl/cmd/package/installed/status.go | 6 +- .../cmd/package/installed/ytt_overlays.go | 2 +- cli/pkg/kctrl/cmd/package/pkg.go | 2 +- .../cmd/package/release/artefact_writer.go | 6 +- cli/pkg/kctrl/cmd/package/release/release.go | 18 +- .../helm_openapi_schema_gen.go | 3 +- .../helm_openapi_schema_gen_test.go | 3 +- .../schemagenerator/openapi_schema_gen.go | 2 +- .../cmd/package/repository/add_or_update.go | 14 +- cli/pkg/kctrl/cmd/package/repository/cmd.go | 2 +- .../kctrl/cmd/package/repository/delete.go | 10 +- cli/pkg/kctrl/cmd/package/repository/get.go | 4 +- cli/pkg/kctrl/cmd/package/repository/kick.go | 8 +- cli/pkg/kctrl/cmd/package/repository/list.go | 8 +- .../repository/release/artifact_writer.go | 4 +- .../cmd/package/repository/release/imgpkg.go | 4 +- .../cmd/package/repository/release/release.go | 8 +- .../repository/release/release_cmd_runner.go | 4 +- .../cmd/package/repository/repo_tailer.go | 12 +- cli/pkg/kctrl/cmd/ui_flags.go | 3 +- cli/pkg/kctrl/cmd/version.go | 4 +- cli/pkg/kctrl/local/buildconfigs/app_build.go | 4 +- cli/pkg/kctrl/local/buildconfigs/pkg_build.go | 4 +- cli/pkg/kctrl/local/config.go | 6 +- cli/pkg/kctrl/local/detailed_cmd_runner.go | 2 +- cli/pkg/kctrl/local/local_vendir.go | 2 +- cli/pkg/kctrl/local/min_core_client.go | 28 +- cli/pkg/kctrl/local/reconciler.go | 38 +- cli/pkg/kctrl/local/sources/git.go | 4 +- cli/pkg/kctrl/local/sources/github_release.go | 4 +- cli/pkg/kctrl/local/sources/helm.go | 4 +- cli/pkg/kctrl/local/sources/source.go | 4 +- cli/pkg/kctrl/local/sources/template.go | 6 +- cli/pkg/kctrl/local/sources/vendir_config.go | 2 +- cli/pkg/kctrl/local/sources/vendir_runner.go | 2 +- cli/test/e2e/package_repository_test.go | 2 +- .../kapp-controller}/LICENSE | 0 .../kapp-controller}/NOTICE | 0 .../internalpackaging}/install/install.go | 4 +- .../apis/internalpackaging/v1alpha1/doc.go | 2 +- .../internalpackaging/v1alpha1/register.go | 2 +- .../apis/internalpackaging/v1alpha1/types.go | 4 +- .../v1alpha1/zz_generated.deepcopy.go | 0 .../pkg/apis/kappctrl}/install/install.go | 4 +- .../pkg/apis/kappctrl/v1alpha1/doc.go | 2 +- .../apis/kappctrl/v1alpha1/generated.pb.go | 583 +- .../apis/kappctrl/v1alpha1/generated.proto | 25 +- .../pkg/apis/kappctrl/v1alpha1/register.go | 2 +- .../pkg/apis/kappctrl/v1alpha1/status.go | 2 +- .../pkg/apis/kappctrl/v1alpha1/types.go | 6 +- .../apis/kappctrl/v1alpha1/types_deploy.go | 2 +- .../pkg/apis/kappctrl/v1alpha1/types_fetch.go | 10 +- .../apis/kappctrl/v1alpha1/types_template.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 7 +- .../pkg/apis/packaging}/install/install.go | 4 +- .../pkg/apis/packaging/v1alpha1/doc.go | 2 +- .../packaging/v1alpha1/package_install.go | 10 +- .../packaging/v1alpha1/package_repository.go | 4 +- .../pkg/apis/packaging/v1alpha1/register.go | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 4 +- .../pkg/apiserver/apis/datapackaging/doc.go | 2 +- .../apis/datapackaging/install/install.go | 6 +- .../apiserver/apis/datapackaging/register.go | 2 +- .../pkg/apiserver/apis/datapackaging/types.go | 4 +- .../apis/datapackaging/v1alpha1/conversion.go | 2 +- .../apis/datapackaging/v1alpha1/doc.go | 4 +- .../datapackaging/v1alpha1/generated.pb.go | 203 +- .../datapackaging/v1alpha1/generated.proto | 8 +- .../apis/datapackaging/v1alpha1/register.go | 2 +- .../apis/datapackaging/v1alpha1/types.go | 4 +- .../v1alpha1/zz_generated.conversion.go | 4 +- .../v1alpha1/zz_generated.deepcopy.go | 2 +- .../datapackaging/zz_generated.deepcopy.go | 2 +- .../client/clientset/versioned/clientset.go | 5 +- .../versioned/fake/clientset_generated.go | 6 +- .../client/clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 2 +- .../client/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 2 +- .../v1alpha1/datapackaging_client.go | 4 +- .../typed/datapackaging/v1alpha1/doc.go | 0 .../typed/datapackaging/v1alpha1/fake/doc.go | 0 .../fake/fake_datapackaging_client.go | 2 +- .../v1alpha1/fake/fake_foo_package.go | 7 +- .../v1alpha1/fake/fake_foo_packagemetadata.go | 7 +- .../datapackaging/v1alpha1/foo_package.go | 4 +- .../v1alpha1/foo_packagemetadata.go | 4 +- .../v1alpha1/generated_expansion.go | 0 .../kapp-controller}/pkg/app/app.go | 62 +- .../kapp-controller}/pkg/app/app_deploy.go | 24 +- .../kapp-controller}/pkg/app/app_factory.go | 26 +- .../kapp-controller}/pkg/app/app_fetch.go | 19 +- .../kapp-controller}/pkg/app/app_reconcile.go | 60 +- .../kapp-controller}/pkg/app/app_template.go | 8 +- .../kapp-controller}/pkg/app/crd_app.go | 30 +- .../pkg/app/crd_app_watcher.go | 6 +- .../kapp-controller}/pkg/app/finalizer.go | 2 +- .../pkg/app/reconcile_timer.go | 4 +- .../kapp-controller}/pkg/app/reconciler.go | 21 +- .../client/clientset/versioned/clientset.go | 9 +- .../versioned/fake/clientset_generated.go | 14 +- .../client/clientset/versioned/fake/doc.go | 0 .../clientset/versioned/fake/register.go | 6 +- .../client/clientset/versioned/scheme/doc.go | 0 .../clientset/versioned/scheme/register.go | 6 +- .../typed/internalpackaging/v1alpha1/doc.go | 0 .../internalpackaging/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_internalpackage.go | 7 +- .../fake/fake_internalpackagemetadata.go | 7 +- .../fake/fake_internalpackaging_client.go | 2 +- .../v1alpha1/generated_expansion.go | 0 .../v1alpha1/internalpackage.go | 4 +- .../v1alpha1/internalpackagemetadata.go | 4 +- .../v1alpha1/internalpackaging_client.go | 4 +- .../versioned/typed/kappctrl/v1alpha1/app.go | 4 +- .../versioned/typed/kappctrl/v1alpha1/doc.go | 0 .../typed/kappctrl/v1alpha1/fake/doc.go | 0 .../typed/kappctrl/v1alpha1/fake/fake_app.go | 7 +- .../v1alpha1/fake/fake_kappctrl_client.go | 2 +- .../kappctrl/v1alpha1/generated_expansion.go | 0 .../kappctrl/v1alpha1/kappctrl_client.go | 4 +- .../versioned/typed/packaging/v1alpha1/doc.go | 0 .../typed/packaging/v1alpha1/fake/doc.go | 0 .../v1alpha1/fake/fake_packageinstall.go | 7 +- .../v1alpha1/fake/fake_packagerepository.go | 7 +- .../v1alpha1/fake/fake_packaging_client.go | 2 +- .../packaging/v1alpha1/generated_expansion.go | 0 .../packaging/v1alpha1/packageinstall.go | 4 +- .../packaging/v1alpha1/packagerepository.go | 4 +- .../packaging/v1alpha1/packaging_client.go | 4 +- .../informers/externalversions/factory.go | 101 +- .../informers/externalversions/generic.go | 6 +- .../internalinterfaces/factory_interfaces.go | 2 +- .../internalpackaging/interface.go | 4 +- .../internalpackaging/v1alpha1/interface.go | 2 +- .../v1alpha1/internalpackage.go | 8 +- .../v1alpha1/internalpackagemetadata.go | 8 +- .../externalversions/kappctrl/interface.go | 4 +- .../externalversions/kappctrl/v1alpha1/app.go | 8 +- .../kappctrl/v1alpha1/interface.go | 2 +- .../externalversions/packaging/interface.go | 4 +- .../packaging/v1alpha1/interface.go | 2 +- .../packaging/v1alpha1/packageinstall.go | 8 +- .../packaging/v1alpha1/packagerepository.go | 8 +- .../v1alpha1/expansion_generated.go | 0 .../v1alpha1/internalpackage.go | 2 +- .../v1alpha1/internalpackagemetadata.go | 2 +- .../client/listers/kappctrl/v1alpha1/app.go | 2 +- .../kappctrl/v1alpha1/expansion_generated.go | 0 .../packaging/v1alpha1/expansion_generated.go | 0 .../packaging/v1alpha1/packageinstall.go | 2 +- .../packaging/v1alpha1/packagerepository.go | 2 +- .../pkg/componentinfo/component_info.go | 8 +- .../kapp-controller}/pkg/config/config.go | 37 +- .../kapp-controller}/pkg/config/os_config.go | 2 +- .../kapp-controller}/pkg/config/reconciler.go | 26 +- .../kapp-controller/pkg/config/scheme.go | 23 + .../pkg/deploy/cmd_run_result_buf.go | 4 +- .../kapp-controller}/pkg/deploy/factory.go | 19 +- .../kapp-controller}/pkg/deploy/interfaces.go | 4 +- .../kapp-controller}/pkg/deploy/kapp.go | 19 +- .../pkg/deploy/kapp_restrict.go | 5 +- .../pkg/exec/cmd_run_result.go | 2 +- .../kapp-controller}/pkg/exec/cmd_runner.go | 2 +- .../kapp-controller}/pkg/exec/doc.go | 2 +- .../kapp-controller}/pkg/exec/flag.go | 2 +- .../kapp-controller}/pkg/fetch/doc.go | 2 +- .../kapp-controller}/pkg/fetch/factory.go | 6 +- .../kapp-controller}/pkg/fetch/inline.go | 6 +- .../kapp-controller}/pkg/fetch/vendir.go | 75 +- .../pkg/kubeconfig/kubeconfig.go | 18 +- .../pkg/kubeconfig/kubeconfig_restricted.go | 10 +- .../pkg/kubeconfig/kubeconfig_secrets.go | 10 +- .../pkg/kubeconfig/service_accounts.go | 11 +- .../kapp-controller}/pkg/memdir/doc.go | 2 +- .../kapp-controller}/pkg/memdir/scoped.go | 2 +- .../kapp-controller}/pkg/memdir/subpath.go | 2 +- .../kapp-controller}/pkg/memdir/tmp_dir.go | 2 +- .../kapp-controller/pkg/metrics/metrics.go | 20 + .../pkg/metrics/reconcile_count_metrics.go | 144 + .../pkg/metrics/reconcile_time_metrics.go | 103 + .../pkg/packageinstall/app.go | 20 +- .../pkg/packageinstall/finalizer.go | 2 +- .../pkg/packageinstall/packageinstall.go | 59 +- .../packageinstall_version_handler.go | 27 +- .../pkg/packageinstall/reconciler.go | 39 +- .../pkg/reconciler/configmap_handler.go | 23 +- .../pkg/reconciler/secret_handler.go | 23 +- .../kapp-controller}/pkg/reconciler/status.go | 4 +- .../pkg/reftracker/app_update_status.go | 2 +- .../kapp-controller}/pkg/reftracker/doc.go | 2 +- .../pkg/reftracker/ref_key.go | 2 +- .../pkg/reftracker/ref_tracker.go | 2 +- .../pkg/satoken/token_manager.go | 2 +- .../kapp-controller}/pkg/template/cue.go | 8 +- .../pkg/template/downward_api_values.go | 16 +- .../kapp-controller}/pkg/template/factory.go | 8 +- .../pkg/template/helm_template.go | 8 +- .../pkg/template/interfaces.go | 4 +- .../kapp-controller}/pkg/template/kbld.go | 8 +- .../kapp-controller}/pkg/template/sops.go | 8 +- .../kapp-controller}/pkg/template/values.go | 6 +- .../kapp-controller}/pkg/template/ytt.go | 10 +- .../vendir}/LICENSE | 0 .../vendir}/NOTICE | 0 .../vendir}/pkg/vendir/config/config.go | 85 +- .../vendir}/pkg/vendir/config/data.go | 2 +- .../vendir}/pkg/vendir/config/directory.go | 22 +- .../vendir}/pkg/vendir/config/doc.go | 2 +- .../pkg/vendir/config/dockerconfigjson.go | 2 +- .../vendir}/pkg/vendir/config/lock_config.go | 57 +- .../pkg/vendir/config/lock_directory.go | 17 +- .../vendir}/pkg/vendir/config/resources.go | 2 +- .../vendir/pkg/vendir/version/version.go | 41 + .../vendir}/pkg/vendir/versions/selector.go | 4 +- .../vendir}/pkg/vendir/versions/semvers.go | 4 +- .../pkg/vendir/versions/v1alpha1/config.go | 2 +- .../vendir/versions/v1alpha1/generated.pb.go | 143 +- .../vendir/versions/v1alpha1/generated.proto | 2 +- .../v1alpha1/zz_generated.deepcopy.go | 0 .../github.com/carvel-dev/semver/v4/range.go | 30 +- .../github.com/cespare/xxhash/v2/README.md | 31 +- .../github.com/cespare/xxhash/v2/testall.sh | 10 + .../github.com/cespare/xxhash/v2/xxhash.go | 47 +- .../cespare/xxhash/v2/xxhash_amd64.s | 336 +- .../cespare/xxhash/v2/xxhash_arm64.s | 183 + .../v2/{xxhash_amd64.go => xxhash_asm.go} | 2 + .../cespare/xxhash/v2/xxhash_other.go | 22 +- .../cespare/xxhash/v2/xxhash_safe.go | 1 + .../cespare/xxhash/v2/xxhash_unsafe.go | 3 +- .../emicklei/go-restful/v3/CHANGES.md | 11 +- .../emicklei/go-restful/v3/README.md | 5 +- .../emicklei/go-restful/v3/route.go | 17 +- .../emicklei/go-restful/v3/route_builder.go | 45 +- .../github.com/evanphx/json-patch/patch.go | 42 - .../json-patch/v5/internal/json/decode.go | 1385 ++ .../json-patch/v5/internal/json/encode.go | 1486 +++ .../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 | 495 + .../json-patch/v5/internal/json/tables.go | 218 + .../json-patch/v5/internal/json/tags.go | 38 + .../github.com/evanphx/json-patch/v5/merge.go | 110 +- .../github.com/evanphx/json-patch/v5/patch.go | 436 +- .../github.com/fsnotify/fsnotify/.cirrus.yml | 13 + .../github.com/fsnotify/fsnotify/.gitignore | 1 + .../github.com/fsnotify/fsnotify/CHANGELOG.md | 83 +- .../github.com/fsnotify/fsnotify/README.md | 81 +- .../fsnotify/fsnotify/backend_fen.go | 552 +- .../fsnotify/fsnotify/backend_inotify.go | 377 +- .../fsnotify/fsnotify/backend_kqueue.go | 295 +- .../fsnotify/fsnotify/backend_other.go | 205 +- .../fsnotify/fsnotify/backend_windows.go | 247 +- .../github.com/fsnotify/fsnotify/fsnotify.go | 91 +- .../github.com/fsnotify/fsnotify/mkdoc.zsh | 125 +- .../github.com/go-logr/logr/.golangci.yaml | 3 - cli/vendor/github.com/go-logr/logr/README.md | 126 +- .../github.com/go-logr/logr/SECURITY.md | 18 + cli/vendor/github.com/go-logr/logr/context.go | 33 + .../github.com/go-logr/logr/context_noslog.go | 49 + .../github.com/go-logr/logr/context_slog.go | 83 + cli/vendor/github.com/go-logr/logr/discard.go | 32 +- cli/vendor/github.com/go-logr/logr/logr.go | 240 +- .../github.com/go-logr/logr/sloghandler.go | 192 + cli/vendor/github.com/go-logr/logr/slogr.go | 100 + .../github.com/go-logr/logr/slogr/slogr.go | 61 + .../github.com/go-logr/logr/slogsink.go | 120 + .../github.com/go-logr/zapr/.golangci.yaml | 20 + cli/vendor/github.com/go-logr/zapr/README.md | 39 +- .../github.com/go-logr/zapr/slogzapr.go | 183 + cli/vendor/github.com/go-logr/zapr/zapr.go | 15 +- .../github.com/go-logr/zapr/zapr_noslog.go | 34 + .../github.com/go-logr/zapr/zapr_slog.go | 48 + .../go-openapi/jsonpointer/.travis.yml | 15 - .../go-openapi/jsonreference/.golangci.yml | 13 +- .../go-openapi/jsonreference/.travis.yml | 24 - .../jsonreference/internal/normalize_url.go | 22 +- .../github.com/go-openapi/swag/.gitattributes | 2 + .../github.com/go-openapi/swag/.golangci.yml | 13 + .../github.com/go-openapi/swag/.travis.yml | 37 - cli/vendor/github.com/go-openapi/swag/doc.go | 15 +- cli/vendor/github.com/go-openapi/swag/file.go | 33 + .../github.com/go-openapi/swag/loading.go | 11 +- .../github.com/go-openapi/swag/post_go18.go | 1 + .../github.com/go-openapi/swag/post_go19.go | 1 + .../github.com/go-openapi/swag/pre_go18.go | 1 + .../github.com/go-openapi/swag/pre_go19.go | 1 + cli/vendor/github.com/go-openapi/swag/util.go | 17 +- cli/vendor/github.com/go-openapi/swag/yaml.go | 252 +- .../github.com/golang/protobuf/ptypes/any.go | 7 +- .../{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/google/go-cmp/cmp/compare.go | 38 +- .../cmp/{export_unsafe.go => export.go} | 5 - .../google/go-cmp/cmp/export_panic.go | 16 - .../value/{pointer_unsafe.go => pointer.go} | 3 - .../cmp/internal/value/pointer_purego.go | 34 - .../github.com/google/go-cmp/cmp/options.go | 84 +- .../github.com/google/go-cmp/cmp/path.go | 46 +- .../google/go-cmp/cmp/report_reflect.go | 2 +- .../go-containerregistry/pkg/name/digest.go | 21 + .../go-containerregistry/pkg/name/registry.go | 6 + cli/vendor/github.com/google/uuid/null.go | 118 + cli/vendor/github.com/google/uuid/uuid.go | 45 +- cli/vendor/github.com/google/uuid/version4.go | 27 +- .../hashicorp/go-version/CHANGELOG.md | 25 - .../hashicorp/go-version/version.go | 8 - .../inconshreveable/mousetrap/trap_others.go | 1 + .../inconshreveable/mousetrap/trap_windows.go | 88 +- .../mousetrap/trap_windows_1.4.go | 46 - .../mailru/easyjson/jlexer/lexer.go | 14 + .../github.com/mattn/go-isatty/isatty_bsd.go | 3 +- .../mattn/go-isatty/isatty_others.go | 5 +- .../mattn/go-isatty/isatty_tcgets.go | 3 +- .../{ => v2}/LICENSE | 0 .../{ => v2}/NOTICE | 0 .../{ => v2}/pbutil/.gitignore | 0 .../{ => v2}/pbutil/Makefile | 0 .../{ => v2}/pbutil/decode.go | 16 +- .../{ => v2}/pbutil/doc.go | 0 .../{ => v2}/pbutil/encode.go | 5 +- .../prometheus/collectors/expvar_collector.go | 2 +- .../collectors/go_collector_latest.go | 11 +- .../client_golang/prometheus/counter.go | 48 +- .../client_golang/prometheus/desc.go | 58 +- .../client_golang/prometheus/doc.go | 44 +- .../prometheus/expvar_collector.go | 2 +- .../client_golang/prometheus/gauge.go | 30 +- .../prometheus/go_collector_latest.go | 7 +- .../client_golang/prometheus/histogram.go | 221 +- .../prometheus/internal/difflib.go | 2 +- .../client_golang/prometheus/labels.go | 100 + .../client_golang/prometheus/metric.go | 9 +- .../prometheus/process_collector_other.go | 4 +- .../prometheus/process_collector_wasip1.go | 26 + .../client_golang/prometheus/promhttp/http.go | 19 +- .../prometheus/promhttp/instrument_client.go | 26 +- .../prometheus/promhttp/instrument_server.go | 110 +- .../prometheus/promhttp/option.go | 38 +- .../client_golang/prometheus/registry.go | 19 +- .../client_golang/prometheus/summary.go | 72 +- .../client_golang/prometheus/timer.go | 28 +- .../client_golang/prometheus/value.go | 61 +- .../client_golang/prometheus/vec.go | 95 +- .../client_golang/prometheus/vnext.go | 23 + .../client_golang/prometheus/wrap.go | 8 +- .../prometheus/client_model/go/metrics.pb.go | 1576 ++- .../prometheus/common/expfmt/decode.go | 41 +- .../prometheus/common/expfmt/encode.go | 15 +- .../prometheus/common/expfmt/expfmt.go | 26 +- .../prometheus/common/expfmt/fuzz.go | 4 +- .../common/expfmt/openmetrics_create.go | 22 +- .../prometheus/common/expfmt/text_create.go | 3 +- .../prometheus/common/expfmt/text_parse.go | 12 +- .../bitbucket.org/ww/goautoneg/autoneg.go | 22 +- .../prometheus/common/model/time.go | 89 +- .../prometheus/common/model/value.go | 246 +- .../prometheus/common/model/value_float.go | 100 + .../common/model/value_histogram.go | 178 + .../prometheus/common/model/value_type.go | 83 + .../prometheus/procfs/.golangci.yml | 3 + .../prometheus/procfs/Makefile.common | 27 +- .../github.com/prometheus/procfs/README.md | 4 +- .../github.com/prometheus/procfs/arp.go | 6 +- .../github.com/prometheus/procfs/buddyinfo.go | 6 +- .../github.com/prometheus/procfs/cpuinfo.go | 53 +- .../prometheus/procfs/cpuinfo_loong64.go | 19 + .../prometheus/procfs/cpuinfo_others.go | 4 +- .../github.com/prometheus/procfs/crypto.go | 7 +- .../github.com/prometheus/procfs/doc.go | 51 +- cli/vendor/github.com/prometheus/procfs/fs.go | 11 +- .../prometheus/procfs/fs_statfs_notype.go | 23 + .../prometheus/procfs/fs_statfs_type.go | 33 + .../github.com/prometheus/procfs/fscache.go | 6 +- .../prometheus/procfs/internal/util/parse.go | 15 + .../github.com/prometheus/procfs/ipvs.go | 7 +- .../github.com/prometheus/procfs/loadavg.go | 4 +- .../github.com/prometheus/procfs/mdstat.go | 36 +- .../github.com/prometheus/procfs/meminfo.go | 4 +- .../github.com/prometheus/procfs/mountinfo.go | 10 +- .../prometheus/procfs/mountstats.go | 120 +- .../prometheus/procfs/net_conntrackstat.go | 91 +- .../prometheus/procfs/net_ip_socket.go | 32 +- .../prometheus/procfs/net_protocols.go | 4 +- .../github.com/prometheus/procfs/net_route.go | 143 + .../prometheus/procfs/net_sockstat.go | 9 +- .../prometheus/procfs/net_softnet.go | 79 +- .../github.com/prometheus/procfs/net_unix.go | 16 +- .../prometheus/procfs/net_wireless.go | 182 + .../github.com/prometheus/procfs/net_xfrm.go | 2 +- .../github.com/prometheus/procfs/netstat.go | 54 +- .../github.com/prometheus/procfs/proc.go | 37 +- .../prometheus/procfs/proc_cgroup.go | 6 +- .../prometheus/procfs/proc_cgroups.go | 8 +- .../prometheus/procfs/proc_fdinfo.go | 10 +- .../prometheus/procfs/proc_interrupts.go | 98 + .../prometheus/procfs/proc_limits.go | 4 +- .../github.com/prometheus/procfs/proc_maps.go | 24 +- .../prometheus/procfs/proc_netstat.go | 495 +- .../github.com/prometheus/procfs/proc_ns.go | 6 +- .../github.com/prometheus/procfs/proc_psi.go | 6 +- .../prometheus/procfs/proc_smaps.go | 4 +- .../github.com/prometheus/procfs/proc_snmp.go | 322 +- .../prometheus/procfs/proc_snmp6.go | 364 +- .../github.com/prometheus/procfs/proc_stat.go | 12 +- .../prometheus/procfs/proc_status.go | 59 +- .../github.com/prometheus/procfs/proc_sys.go | 2 +- .../github.com/prometheus/procfs/slab.go | 2 +- .../github.com/prometheus/procfs/softirqs.go | 24 +- .../github.com/prometheus/procfs/stat.go | 50 +- .../github.com/prometheus/procfs/swaps.go | 8 +- .../github.com/prometheus/procfs/thread.go | 80 + cli/vendor/github.com/prometheus/procfs/vm.go | 6 +- .../github.com/prometheus/procfs/zoneinfo.go | 4 +- .../github.com/spf13/cobra/.golangci.yml | 57 + cli/vendor/github.com/spf13/cobra/.travis.yml | 29 - .../github.com/spf13/cobra/CHANGELOG.md | 22 - cli/vendor/github.com/spf13/cobra/CONDUCT.md | 37 + cli/vendor/github.com/spf13/cobra/MAINTAINERS | 13 + cli/vendor/github.com/spf13/cobra/Makefile | 27 +- cli/vendor/github.com/spf13/cobra/README.md | 708 +- .../github.com/spf13/cobra/active_help.go | 60 + cli/vendor/github.com/spf13/cobra/args.go | 54 +- .../spf13/cobra/bash_completions.go | 241 +- .../spf13/cobra/bash_completions.md | 91 - .../spf13/cobra/bash_completionsV2.go | 396 + cli/vendor/github.com/spf13/cobra/cobra.go | 53 +- cli/vendor/github.com/spf13/cobra/command.go | 462 +- .../github.com/spf13/cobra/command_notwin.go | 15 + .../github.com/spf13/cobra/command_win.go | 15 + .../github.com/spf13/cobra/completions.go | 939 ++ .../spf13/cobra/custom_completions.go | 557 - .../spf13/cobra/fish_completions.go | 273 +- .../spf13/cobra/fish_completions.md | 4 - .../github.com/spf13/cobra/flag_groups.go | 290 + .../spf13/cobra/powershell_completions.go | 357 +- .../spf13/cobra/powershell_completions.md | 16 - .../spf13/cobra/projects_using_cobra.md | 35 - .../spf13/cobra/shell_completions.go | 14 + .../spf13/cobra/shell_completions.md | 434 - .../github.com/spf13/cobra/zsh_completions.go | 112 +- .../github.com/spf13/cobra/zsh_completions.md | 48 - .../testify/assert/assertion_compare.go | 99 +- .../assert/assertion_compare_can_convert.go | 16 - .../assert/assertion_compare_legacy.go | 16 - .../testify/assert/assertion_format.go | 274 +- .../testify/assert/assertion_forward.go | 543 +- .../testify/assert/assertion_order.go | 34 +- .../stretchr/testify/assert/assertions.go | 646 +- .../github.com/stretchr/testify/assert/doc.go | 43 +- .../testify/assert/http_assertions.go | 39 +- .../testify/assert/yaml/yaml_custom.go | 25 + .../testify/assert/yaml/yaml_default.go | 37 + .../stretchr/testify/assert/yaml/yaml_fail.go | 18 + .../stretchr/testify/require/doc.go | 23 +- .../stretchr/testify/require/require.go | 577 +- .../stretchr/testify/require/require.go.tmpl | 2 +- .../testify/require/require_forward.go | 543 +- .../stretchr/testify/require/requirements.go | 2 +- .../client/clientset/versioned/doc.go | 4 - .../pkg/client/clientset/versioned/doc.go | 4 - .../pkg/config/scheme.go | 23 - .../pkg/metrics/app_metrics.go | 133 - .../pkg/vendir/version/version.go | 6 - cli/vendor/go.uber.org/atomic/.codecov.yml | 19 - cli/vendor/go.uber.org/atomic/.gitignore | 12 - cli/vendor/go.uber.org/atomic/.travis.yml | 27 - cli/vendor/go.uber.org/atomic/CHANGELOG.md | 76 - cli/vendor/go.uber.org/atomic/LICENSE.txt | 19 - cli/vendor/go.uber.org/atomic/Makefile | 78 - cli/vendor/go.uber.org/atomic/README.md | 63 - cli/vendor/go.uber.org/atomic/bool.go | 81 - cli/vendor/go.uber.org/atomic/doc.go | 23 - cli/vendor/go.uber.org/atomic/duration.go | 82 - cli/vendor/go.uber.org/atomic/duration_ext.go | 40 - cli/vendor/go.uber.org/atomic/float64.go | 76 - cli/vendor/go.uber.org/atomic/float64_ext.go | 47 - cli/vendor/go.uber.org/atomic/gen.go | 26 - cli/vendor/go.uber.org/atomic/int32.go | 102 - cli/vendor/go.uber.org/atomic/int64.go | 102 - cli/vendor/go.uber.org/atomic/nocmp.go | 35 - cli/vendor/go.uber.org/atomic/string.go | 54 - cli/vendor/go.uber.org/atomic/string_ext.go | 43 - cli/vendor/go.uber.org/atomic/uint32.go | 102 - cli/vendor/go.uber.org/atomic/uint64.go | 102 - cli/vendor/go.uber.org/atomic/value.go | 31 - cli/vendor/go.uber.org/multierr/.travis.yml | 23 - cli/vendor/go.uber.org/multierr/CHANGELOG.md | 35 + cli/vendor/go.uber.org/multierr/LICENSE.txt | 2 +- cli/vendor/go.uber.org/multierr/Makefile | 6 +- cli/vendor/go.uber.org/multierr/README.md | 30 +- cli/vendor/go.uber.org/multierr/error.go | 415 +- .../error_post_go120.go} | 35 +- .../multierr/{go113.go => error_pre_go120.go} | 31 +- cli/vendor/go.uber.org/multierr/glide.yaml | 8 - cli/vendor/go.uber.org/zap/.golangci.yml | 77 + cli/vendor/go.uber.org/zap/CHANGELOG.md | 242 +- cli/vendor/go.uber.org/zap/Makefile | 87 +- cli/vendor/go.uber.org/zap/README.md | 62 +- cli/vendor/go.uber.org/zap/array.go | 127 + cli/vendor/go.uber.org/zap/array_go118.go | 156 - cli/vendor/go.uber.org/zap/buffer/buffer.go | 5 + cli/vendor/go.uber.org/zap/buffer/pool.go | 20 +- cli/vendor/go.uber.org/zap/config.go | 84 +- cli/vendor/go.uber.org/zap/error.go | 14 +- cli/vendor/go.uber.org/zap/field.go | 194 +- cli/vendor/go.uber.org/zap/http_handler.go | 19 +- .../go.uber.org/zap/internal/level_enabler.go | 2 + .../bool_ext.go => zap/internal/pool/pool.go} | 49 +- .../stacktrace/stack.go} | 81 +- cli/vendor/go.uber.org/zap/level.go | 9 +- cli/vendor/go.uber.org/zap/logger.go | 48 +- cli/vendor/go.uber.org/zap/sink.go | 5 +- cli/vendor/go.uber.org/zap/sugar.go | 69 +- cli/vendor/go.uber.org/zap/writer.go | 12 +- .../zap/zapcore/console_encoder.go | 14 +- cli/vendor/go.uber.org/zap/zapcore/core.go | 6 +- cli/vendor/go.uber.org/zap/zapcore/entry.go | 22 +- cli/vendor/go.uber.org/zap/zapcore/error.go | 14 +- .../go.uber.org/zap/zapcore/json_encoder.go | 155 +- .../error.go => zap/zapcore/lazy_with.go} | 47 +- cli/vendor/go.uber.org/zap/zapcore/sampler.go | 9 +- cli/vendor/golang.org/x/crypto/LICENSE | 4 +- cli/vendor/golang.org/x/crypto/cast5/cast5.go | 2 +- .../x/crypto/openpgp/armor/armor.go | 5 +- .../x/crypto/openpgp/elgamal/elgamal.go | 2 +- .../x/crypto/openpgp/errors/errors.go | 2 +- .../x/crypto/openpgp/packet/packet.go | 2 +- .../golang.org/x/crypto/openpgp/read.go | 2 +- .../golang.org/x/crypto/openpgp/s2k/s2k.go | 2 +- cli/vendor/golang.org/x/exp/LICENSE | 27 + cli/vendor/golang.org/x/exp/PATENTS | 22 + cli/vendor/golang.org/x/exp/maps/maps.go | 94 + cli/vendor/golang.org/x/net/LICENSE | 4 +- .../x/net/context/ctxhttp/ctxhttp.go | 71 - .../golang.org/x/net/http/httpguts/httplex.go | 13 +- cli/vendor/golang.org/x/net/http2/config.go | 122 + .../golang.org/x/net/http2/config_go124.go | 61 + .../x/net/http2/config_pre_go124.go | 16 + cli/vendor/golang.org/x/net/http2/frame.go | 13 +- cli/vendor/golang.org/x/net/http2/http2.go | 72 +- cli/vendor/golang.org/x/net/http2/server.go | 260 +- cli/vendor/golang.org/x/net/http2/testsync.go | 331 - cli/vendor/golang.org/x/net/http2/timer.go | 20 + .../golang.org/x/net/http2/transport.go | 468 +- cli/vendor/golang.org/x/net/http2/write.go | 10 + .../x/net/http2/writesched_priority.go | 4 +- cli/vendor/golang.org/x/oauth2/README.md | 12 +- .../x/oauth2/internal/client_appengine.go | 1 - .../golang.org/x/oauth2/internal/oauth2.go | 2 +- .../golang.org/x/oauth2/internal/token.go | 134 +- cli/vendor/golang.org/x/oauth2/oauth2.go | 37 +- cli/vendor/golang.org/x/oauth2/token.go | 35 +- cli/vendor/golang.org/x/sys/LICENSE | 4 +- cli/vendor/golang.org/x/sys/unix/README.md | 2 +- .../golang.org/x/sys/unix/asm_zos_s390x.s | 665 +- .../golang.org/x/sys/unix/bpxsvc_zos.go | 657 + cli/vendor/golang.org/x/sys/unix/bpxsvc_zos.s | 192 + cli/vendor/golang.org/x/sys/unix/epoll_zos.go | 220 - .../golang.org/x/sys/unix/fstatfs_zos.go | 163 - .../golang.org/x/sys/unix/ioctl_linux.go | 96 + cli/vendor/golang.org/x/sys/unix/mkerrors.sh | 20 +- .../golang.org/x/sys/unix/mmap_nomremap.go | 2 +- cli/vendor/golang.org/x/sys/unix/mremap.go | 5 + .../golang.org/x/sys/unix/pagesize_unix.go | 2 +- .../x/sys/unix/readdirent_getdirentries.go | 2 +- .../golang.org/x/sys/unix/sockcmsg_zos.go | 58 + .../golang.org/x/sys/unix/symaddr_zos_s390x.s | 75 + .../golang.org/x/sys/unix/syscall_aix.go | 2 +- .../golang.org/x/sys/unix/syscall_darwin.go | 61 + .../golang.org/x/sys/unix/syscall_hurd.go | 1 + .../golang.org/x/sys/unix/syscall_linux.go | 65 +- .../x/sys/unix/syscall_linux_arm64.go | 2 + .../x/sys/unix/syscall_linux_loong64.go | 2 + .../x/sys/unix/syscall_linux_riscv64.go | 2 + .../golang.org/x/sys/unix/syscall_openbsd.go | 1 + .../golang.org/x/sys/unix/syscall_unix.go | 9 + .../x/sys/unix/syscall_zos_s390x.go | 1587 ++- .../golang.org/x/sys/unix/sysvshm_unix.go | 2 +- .../x/sys/unix/sysvshm_unix_other.go | 2 +- .../golang.org/x/sys/unix/vgetrandom_linux.go | 13 + .../x/sys/unix/vgetrandom_unsupported.go | 11 + .../x/sys/unix/zerrors_darwin_amd64.go | 12 + .../x/sys/unix/zerrors_darwin_arm64.go | 12 + .../golang.org/x/sys/unix/zerrors_linux.go | 100 +- .../x/sys/unix/zerrors_linux_386.go | 22 + .../x/sys/unix/zerrors_linux_amd64.go | 22 + .../x/sys/unix/zerrors_linux_arm.go | 21 + .../x/sys/unix/zerrors_linux_arm64.go | 22 + .../x/sys/unix/zerrors_linux_loong64.go | 21 + .../x/sys/unix/zerrors_linux_mips.go | 21 + .../x/sys/unix/zerrors_linux_mips64.go | 21 + .../x/sys/unix/zerrors_linux_mips64le.go | 21 + .../x/sys/unix/zerrors_linux_mipsle.go | 21 + .../x/sys/unix/zerrors_linux_ppc.go | 21 + .../x/sys/unix/zerrors_linux_ppc64.go | 21 + .../x/sys/unix/zerrors_linux_ppc64le.go | 21 + .../x/sys/unix/zerrors_linux_riscv64.go | 21 + .../x/sys/unix/zerrors_linux_s390x.go | 21 + .../x/sys/unix/zerrors_linux_sparc64.go | 21 + .../x/sys/unix/zerrors_zos_s390x.go | 235 +- .../x/sys/unix/zsymaddr_zos_s390x.s | 364 + .../x/sys/unix/zsyscall_darwin_amd64.go | 101 + .../x/sys/unix/zsyscall_darwin_amd64.s | 25 + .../x/sys/unix/zsyscall_darwin_arm64.go | 101 + .../x/sys/unix/zsyscall_darwin_arm64.s | 25 + .../golang.org/x/sys/unix/zsyscall_linux.go | 43 +- .../x/sys/unix/zsyscall_openbsd_386.go | 24 + .../x/sys/unix/zsyscall_openbsd_386.s | 5 + .../x/sys/unix/zsyscall_openbsd_amd64.go | 24 + .../x/sys/unix/zsyscall_openbsd_amd64.s | 5 + .../x/sys/unix/zsyscall_openbsd_arm.go | 24 + .../x/sys/unix/zsyscall_openbsd_arm.s | 5 + .../x/sys/unix/zsyscall_openbsd_arm64.go | 24 + .../x/sys/unix/zsyscall_openbsd_arm64.s | 5 + .../x/sys/unix/zsyscall_openbsd_mips64.go | 24 + .../x/sys/unix/zsyscall_openbsd_mips64.s | 5 + .../x/sys/unix/zsyscall_openbsd_ppc64.go | 24 + .../x/sys/unix/zsyscall_openbsd_ppc64.s | 6 + .../x/sys/unix/zsyscall_openbsd_riscv64.go | 24 + .../x/sys/unix/zsyscall_openbsd_riscv64.s | 5 + .../x/sys/unix/zsyscall_zos_s390x.go | 3113 ++++- .../x/sys/unix/zsysnum_linux_386.go | 6 + .../x/sys/unix/zsysnum_linux_amd64.go | 7 + .../x/sys/unix/zsysnum_linux_arm.go | 6 + .../x/sys/unix/zsysnum_linux_arm64.go | 8 +- .../x/sys/unix/zsysnum_linux_loong64.go | 8 + .../x/sys/unix/zsysnum_linux_mips.go | 6 + .../x/sys/unix/zsysnum_linux_mips64.go | 6 + .../x/sys/unix/zsysnum_linux_mips64le.go | 6 + .../x/sys/unix/zsysnum_linux_mipsle.go | 6 + .../x/sys/unix/zsysnum_linux_ppc.go | 6 + .../x/sys/unix/zsysnum_linux_ppc64.go | 6 + .../x/sys/unix/zsysnum_linux_ppc64le.go | 6 + .../x/sys/unix/zsysnum_linux_riscv64.go | 8 +- .../x/sys/unix/zsysnum_linux_s390x.go | 6 + .../x/sys/unix/zsysnum_linux_sparc64.go | 6 + .../x/sys/unix/zsysnum_zos_s390x.go | 5507 ++++---- .../x/sys/unix/ztypes_darwin_amd64.go | 13 + .../x/sys/unix/ztypes_darwin_arm64.go | 13 + .../x/sys/unix/ztypes_freebsd_386.go | 1 + .../x/sys/unix/ztypes_freebsd_amd64.go | 1 + .../x/sys/unix/ztypes_freebsd_arm.go | 1 + .../x/sys/unix/ztypes_freebsd_arm64.go | 1 + .../x/sys/unix/ztypes_freebsd_riscv64.go | 1 + .../golang.org/x/sys/unix/ztypes_linux.go | 269 +- .../golang.org/x/sys/unix/ztypes_linux_386.go | 8 - .../x/sys/unix/ztypes_linux_amd64.go | 9 - .../golang.org/x/sys/unix/ztypes_linux_arm.go | 9 - .../x/sys/unix/ztypes_linux_arm64.go | 9 - .../x/sys/unix/ztypes_linux_loong64.go | 9 - .../x/sys/unix/ztypes_linux_mips.go | 9 - .../x/sys/unix/ztypes_linux_mips64.go | 9 - .../x/sys/unix/ztypes_linux_mips64le.go | 9 - .../x/sys/unix/ztypes_linux_mipsle.go | 9 - .../golang.org/x/sys/unix/ztypes_linux_ppc.go | 9 - .../x/sys/unix/ztypes_linux_ppc64.go | 9 - .../x/sys/unix/ztypes_linux_ppc64le.go | 9 - .../x/sys/unix/ztypes_linux_riscv64.go | 42 +- .../x/sys/unix/ztypes_linux_s390x.go | 9 - .../x/sys/unix/ztypes_linux_sparc64.go | 9 - .../golang.org/x/sys/unix/ztypes_zos_s390x.go | 152 +- .../golang.org/x/sys/windows/aliases.go | 2 +- .../golang.org/x/sys/windows/dll_windows.go | 2 +- cli/vendor/golang.org/x/sys/windows/empty.s | 8 - .../x/sys/windows/security_windows.go | 25 +- .../x/sys/windows/syscall_windows.go | 132 +- .../golang.org/x/sys/windows/types_windows.go | 222 +- .../x/sys/windows/zsyscall_windows.go | 268 +- cli/vendor/golang.org/x/term/LICENSE | 4 +- cli/vendor/golang.org/x/term/term_windows.go | 1 + cli/vendor/golang.org/x/text/LICENSE | 4 +- .../gomodules.xyz/jsonpatch/v2/jsonpatch.go | 162 +- .../k8s.io/api/admission/v1/generated.pb.go | 127 +- .../v1/types_swagger_doc_generated.go | 2 +- .../api/admission/v1beta1/generated.pb.go | 129 +- .../v1beta1/types_swagger_doc_generated.go | 2 +- .../admissionregistration/v1/generated.pb.go | 6593 ++++++++-- .../admissionregistration/v1/generated.proto | 635 + .../api/admissionregistration/v1/register.go | 4 + .../api/admissionregistration/v1/types.go | 665 + .../v1/types_swagger_doc_generated.go | 188 +- .../v1/zz_generated.deepcopy.go | 458 + .../v1alpha1/generated.pb.go | 2487 +++- .../v1alpha1/generated.proto | 320 +- .../admissionregistration/v1alpha1/types.go | 322 +- .../v1alpha1/types_swagger_doc_generated.go | 88 +- .../v1alpha1/zz_generated.deepcopy.go | 146 +- .../v1beta1/generated.pb.go | 6269 +++++++-- .../v1beta1/generated.proto | 636 + .../admissionregistration/v1beta1/register.go | 4 + .../admissionregistration/v1beta1/types.go | 666 + .../v1beta1/types_swagger_doc_generated.go | 188 +- .../v1beta1/zz_generated.deepcopy.go | 474 +- .../zz_generated.prerelease-lifecycle.go | 72 + .../v1alpha1 => api/apidiscovery/v2}/doc.go | 9 +- .../api/apidiscovery/v2/generated.pb.go | 1742 +++ .../api/apidiscovery/v2/generated.proto | 156 + .../k8s.io/api/apidiscovery/v2/register.go | 56 + .../k8s.io/api/apidiscovery/v2/types.go | 155 + .../apidiscovery/v2/zz_generated.deepcopy.go | 190 + .../api/apidiscovery/v2beta1/generated.pb.go | 113 +- .../api/apidiscovery/v2beta1/generated.proto | 4 +- .../k8s.io/api/apidiscovery/v2beta1/types.go | 4 +- .../v1alpha1/generated.pb.go | 165 +- .../v1alpha1/generated.proto | 6 +- .../api/apiserverinternal/v1alpha1/types.go | 6 +- .../v1alpha1/types_swagger_doc_generated.go | 3 +- .../v1alpha1/zz_generated.deepcopy.go | 5 + cli/vendor/k8s.io/api/apps/v1/generated.pb.go | 341 +- cli/vendor/k8s.io/api/apps/v1/generated.proto | 14 +- cli/vendor/k8s.io/api/apps/v1/types.go | 17 +- .../apps/v1/types_swagger_doc_generated.go | 10 +- .../k8s.io/api/apps/v1beta1/generated.pb.go | 299 +- .../k8s.io/api/apps/v1beta1/generated.proto | 62 +- cli/vendor/k8s.io/api/apps/v1beta1/types.go | 62 +- .../v1beta1/types_swagger_doc_generated.go | 60 +- .../k8s.io/api/apps/v1beta2/generated.pb.go | 365 +- .../k8s.io/api/apps/v1beta2/generated.proto | 16 +- cli/vendor/k8s.io/api/apps/v1beta2/types.go | 16 +- .../v1beta2/types_swagger_doc_generated.go | 12 +- .../api/authentication/v1/generated.pb.go | 525 +- .../api/authentication/v1/generated.proto | 24 + .../k8s.io/api/authentication/v1/register.go | 1 + .../k8s.io/api/authentication/v1/types.go | 29 + .../v1/types_swagger_doc_generated.go | 21 +- .../v1/zz_generated.deepcopy.go | 44 + .../authentication/v1alpha1/generated.pb.go | 59 +- .../authentication/v1alpha1/generated.proto | 3 +- .../api/authentication/v1alpha1/types.go | 5 +- .../v1alpha1/types_swagger_doc_generated.go | 4 +- .../zz_generated.prerelease-lifecycle.go | 6 +- .../authentication/v1beta1/generated.pb.go | 487 +- .../authentication/v1beta1/generated.proto | 24 + .../api/authentication/v1beta1/register.go | 1 + .../api/authentication/v1beta1/types.go | 30 + .../v1beta1/types_swagger_doc_generated.go | 21 +- .../v1beta1/zz_generated.deepcopy.go | 44 + .../zz_generated.prerelease-lifecycle.go | 18 + .../api/authorization/v1/generated.pb.go | 177 +- .../api/authorization/v1/generated.proto | 9 + .../k8s.io/api/authorization/v1/types.go | 9 + .../v1/types_swagger_doc_generated.go | 2 +- .../api/authorization/v1beta1/generated.pb.go | 183 +- .../api/authorization/v1beta1/generated.proto | 9 + .../k8s.io/api/authorization/v1beta1/types.go | 9 + .../v1beta1/types_swagger_doc_generated.go | 2 +- .../k8s.io/api/autoscaling/v1/generated.pb.go | 255 +- .../k8s.io/api/autoscaling/v1/generated.proto | 42 +- cli/vendor/k8s.io/api/autoscaling/v1/types.go | 79 +- .../v1/types_swagger_doc_generated.go | 42 +- .../k8s.io/api/autoscaling/v2/generated.pb.go | 243 +- .../k8s.io/api/autoscaling/v2/generated.proto | 20 +- cli/vendor/k8s.io/api/autoscaling/v2/types.go | 61 +- .../v2/types_swagger_doc_generated.go | 22 +- .../api/autoscaling/v2beta1/generated.pb.go | 243 +- .../api/autoscaling/v2beta1/generated.proto | 5 +- .../k8s.io/api/autoscaling/v2beta1/types.go | 5 +- .../v2beta1/types_swagger_doc_generated.go | 4 +- .../api/autoscaling/v2beta2/generated.pb.go | 255 +- .../api/autoscaling/v2beta2/generated.proto | 28 +- .../k8s.io/api/autoscaling/v2beta2/types.go | 66 +- .../v2beta2/types_swagger_doc_generated.go | 26 +- .../k8s.io/api/batch/v1/generated.pb.go | 1077 +- .../k8s.io/api/batch/v1/generated.proto | 193 +- cli/vendor/k8s.io/api/batch/v1/types.go | 267 +- .../batch/v1/types_swagger_doc_generated.go | 70 +- .../api/batch/v1/zz_generated.deepcopy.go | 84 + .../k8s.io/api/batch/v1beta1/generated.pb.go | 330 +- .../k8s.io/api/batch/v1beta1/generated.proto | 15 +- .../k8s.io/api/batch/v1beta1/register.go | 1 - cli/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 - .../api/certificates/v1/generated.pb.go | 133 +- .../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.pb.go | 135 +- .../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.pb.go | 85 +- .../api/coordination/v1/generated.proto | 6 +- .../k8s.io/api/coordination/v1/types.go | 6 +- .../v1/types_swagger_doc_generated.go | 8 +- .../api/coordination/v1beta1/generated.pb.go | 85 +- .../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 | 44 +- cli/vendor/k8s.io/api/core/v1/generated.pb.go | 7580 ++++++++--- cli/vendor/k8s.io/api/core/v1/generated.proto | 774 +- cli/vendor/k8s.io/api/core/v1/toleration.go | 14 +- cli/vendor/k8s.io/api/core/v1/types.go | 969 +- .../core/v1/types_swagger_doc_generated.go | 278 +- .../k8s.io/api/core/v1/well_known_labels.go | 4 + .../api/core/v1/zz_generated.deepcopy.go | 371 +- .../k8s.io/api/discovery/v1/generated.pb.go | 137 +- .../k8s.io/api/discovery/v1/generated.proto | 28 +- cli/vendor/k8s.io/api/discovery/v1/types.go | 44 +- .../v1/types_swagger_doc_generated.go | 14 +- .../api/discovery/v1beta1/generated.pb.go | 135 +- .../api/discovery/v1beta1/generated.proto | 13 +- .../k8s.io/api/discovery/v1beta1/types.go | 30 +- .../v1beta1/types_swagger_doc_generated.go | 12 +- .../k8s.io/api/events/v1/generated.pb.go | 111 +- .../events/v1/types_swagger_doc_generated.go | 2 +- .../k8s.io/api/events/v1beta1/generated.pb.go | 111 +- .../v1beta1/types_swagger_doc_generated.go | 2 +- .../api/extensions/v1beta1/generated.pb.go | 10647 +++++----------- .../api/extensions/v1beta1/generated.proto | 325 +- .../k8s.io/api/extensions/v1beta1/register.go | 2 - .../k8s.io/api/extensions/v1beta1/types.go | 454 +- .../v1beta1/types_swagger_doc_generated.go | 174 +- .../v1beta1/zz_generated.deepcopy.go | 390 - .../zz_generated.prerelease-lifecycle.go | 48 - .../api/flowcontrol/{v1alpha1 => v1}/doc.go | 7 +- .../{v1alpha1 => v1}/generated.pb.go | 551 +- .../{v1alpha1 => v1}/generated.proto | 83 +- .../flowcontrol/{v1alpha1 => v1}/register.go | 6 +- .../api/flowcontrol/{v1alpha1 => v1}/types.go | 152 +- .../types_swagger_doc_generated.go | 17 +- .../{v1alpha1 => v1}/zz_generated.deepcopy.go | 38 +- .../zz_generated.prerelease-lifecycle.go | 122 - .../api/flowcontrol/v1beta1/generated.pb.go | 485 +- .../api/flowcontrol/v1beta1/generated.proto | 44 +- .../k8s.io/api/flowcontrol/v1beta1/types.go | 51 +- .../v1beta1/types_swagger_doc_generated.go | 15 +- .../v1beta1/zz_generated.deepcopy.go | 31 + .../api/flowcontrol/v1beta2/generated.pb.go | 484 +- .../api/flowcontrol/v1beta2/generated.proto | 44 +- .../k8s.io/api/flowcontrol/v1beta2/types.go | 51 +- .../v1beta2/types_swagger_doc_generated.go | 15 +- .../v1beta2/zz_generated.deepcopy.go | 31 + .../api/flowcontrol/v1beta3/generated.pb.go | 484 +- .../api/flowcontrol/v1beta3/generated.proto | 46 +- .../k8s.io/api/flowcontrol/v1beta3/types.go | 71 +- .../v1beta3/types_swagger_doc_generated.go | 15 +- .../v1beta3/zz_generated.deepcopy.go | 31 + .../zz_generated.prerelease-lifecycle.go | 28 + .../k8s.io/api/networking/v1/generated.pb.go | 504 +- .../k8s.io/api/networking/v1/generated.proto | 196 +- cli/vendor/k8s.io/api/networking/v1/types.go | 241 +- .../v1/types_swagger_doc_generated.go | 124 +- .../networking/v1/zz_generated.deepcopy.go | 24 - .../api/networking/v1alpha1/generated.pb.go | 1462 ++- .../api/networking/v1alpha1/generated.proto | 123 +- .../api/networking/v1alpha1/register.go | 16 +- .../k8s.io/api/networking/v1alpha1/types.go | 144 +- .../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 | 202 +- .../api/networking/v1beta1/generated.proto | 83 +- .../k8s.io/api/networking/v1beta1/types.go | 92 +- .../v1beta1/types_swagger_doc_generated.go | 72 +- cli/vendor/k8s.io/api/node/v1/generated.pb.go | 99 +- cli/vendor/k8s.io/api/node/v1/generated.proto | 10 +- cli/vendor/k8s.io/api/node/v1/types.go | 12 +- .../node/v1/types_swagger_doc_generated.go | 12 +- .../k8s.io/api/node/v1alpha1/generated.pb.go | 103 +- .../k8s.io/api/node/v1alpha1/generated.proto | 14 +- cli/vendor/k8s.io/api/node/v1alpha1/types.go | 16 +- .../v1alpha1/types_swagger_doc_generated.go | 14 +- .../k8s.io/api/node/v1beta1/generated.pb.go | 99 +- .../k8s.io/api/node/v1beta1/generated.proto | 12 +- cli/vendor/k8s.io/api/node/v1beta1/types.go | 14 +- .../v1beta1/types_swagger_doc_generated.go | 12 +- cli/vendor/k8s.io/api/policy/v1/doc.go | 2 +- .../k8s.io/api/policy/v1/generated.pb.go | 125 +- .../k8s.io/api/policy/v1/generated.proto | 4 +- cli/vendor/k8s.io/api/policy/v1/types.go | 4 +- .../policy/v1/types_swagger_doc_generated.go | 4 +- cli/vendor/k8s.io/api/policy/v1beta1/doc.go | 2 +- .../k8s.io/api/policy/v1beta1/generated.pb.go | 5003 +------- .../k8s.io/api/policy/v1beta1/generated.proto | 281 +- .../k8s.io/api/policy/v1beta1/register.go | 2 - cli/vendor/k8s.io/api/policy/v1beta1/types.go | 375 +- .../v1beta1/types_swagger_doc_generated.go | 164 +- .../policy/v1beta1/zz_generated.deepcopy.go | 367 - .../zz_generated.prerelease-lifecycle.go | 36 - cli/vendor/k8s.io/api/rbac/v1/generated.pb.go | 137 +- cli/vendor/k8s.io/api/rbac/v1/generated.proto | 12 + cli/vendor/k8s.io/api/rbac/v1/types.go | 12 + .../rbac/v1/types_swagger_doc_generated.go | 6 +- .../k8s.io/api/rbac/v1alpha1/generated.pb.go | 141 +- .../k8s.io/api/rbac/v1alpha1/generated.proto | 10 + cli/vendor/k8s.io/api/rbac/v1alpha1/types.go | 10 + .../v1alpha1/types_swagger_doc_generated.go | 2 +- .../k8s.io/api/rbac/v1beta1/generated.pb.go | 137 +- .../k8s.io/api/rbac/v1beta1/generated.proto | 10 + cli/vendor/k8s.io/api/rbac/v1beta1/types.go | 10 + .../v1beta1/types_swagger_doc_generated.go | 2 +- .../api/resource/v1alpha1/generated.pb.go | 4593 ------- .../api/resource/v1alpha1/generated.proto | 371 - .../v1alpha1/types_swagger_doc_generated.go | 222 - .../v1alpha1/zz_generated.deepcopy.go | 477 - .../resource/{v1alpha1 => v1alpha2}/doc.go | 4 +- .../api/resource/v1alpha2/generated.pb.go | 10589 +++++++++++++++ .../api/resource/v1alpha2/generated.proto | 749 ++ .../api/resource/v1alpha2/namedresources.go | 127 + .../{v1alpha1 => v1alpha2}/register.go | 14 +- .../resource/{v1alpha1 => v1alpha2}/types.go | 376 +- .../v1alpha2/types_swagger_doc_generated.go | 395 + .../v1alpha2/zz_generated.deepcopy.go | 1126 ++ .../k8s.io/api/scheduling/v1/generated.pb.go | 73 +- .../k8s.io/api/scheduling/v1/generated.proto | 4 +- cli/vendor/k8s.io/api/scheduling/v1/types.go | 4 +- .../v1/types_swagger_doc_generated.go | 6 +- .../api/scheduling/v1alpha1/generated.pb.go | 71 +- .../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.pb.go | 73 +- .../api/scheduling/v1beta1/generated.proto | 4 +- .../k8s.io/api/scheduling/v1beta1/types.go | 4 +- .../v1beta1/types_swagger_doc_generated.go | 6 +- .../k8s.io/api/storage/v1/generated.pb.go | 259 +- .../k8s.io/api/storage/v1/generated.proto | 138 +- cli/vendor/k8s.io/api/storage/v1/types.go | 144 +- .../storage/v1/types_swagger_doc_generated.go | 82 +- .../api/storage/v1alpha1/generated.pb.go | 753 +- .../api/storage/v1alpha1/generated.proto | 80 +- .../k8s.io/api/storage/v1alpha1/register.go | 2 + .../k8s.io/api/storage/v1alpha1/types.go | 95 +- .../v1alpha1/types_swagger_doc_generated.go | 59 +- .../storage/v1alpha1/zz_generated.deepcopy.go | 66 + .../zz_generated.prerelease-lifecycle.go | 36 + .../api/storage/v1beta1/generated.pb.go | 259 +- .../api/storage/v1beta1/generated.proto | 121 +- .../k8s.io/api/storage/v1beta1/types.go | 128 +- .../v1beta1/types_swagger_doc_generated.go | 78 +- .../api/storagemigration/v1alpha1/doc.go | 23 + .../storagemigration/v1alpha1/generated.pb.go | 1688 +++ .../storagemigration/v1alpha1/generated.proto | 127 + .../api/storagemigration/v1alpha1/register.go | 58 + .../api/storagemigration/v1alpha1/types.go | 131 + .../v1alpha1/types_swagger_doc_generated.go | 95 + .../v1alpha1/zz_generated.deepcopy.go | 160 + .../zz_generated.prerelease-lifecycle.go | 58 + .../pkg/apis/apiextensions/deepcopy.go | 8 +- .../pkg/apis/apiextensions/types.go | 25 + .../apis/apiextensions/types_jsonschema.go | 81 + .../pkg/apis/apiextensions/v1/conversion.go | 26 +- .../pkg/apis/apiextensions/v1/deepcopy.go | 8 +- .../pkg/apis/apiextensions/v1/generated.pb.go | 833 +- .../pkg/apis/apiextensions/v1/generated.proto | 107 +- .../pkg/apis/apiextensions/v1/types.go | 36 +- .../apis/apiextensions/v1/types_jsonschema.go | 135 +- .../v1/zz_generated.conversion.go | 41 + .../apiextensions/v1/zz_generated.deepcopy.go | 35 +- .../apiextensions/zz_generated.deepcopy.go | 40 +- .../apiserver/schema/zz_generated.deepcopy.go | 4 +- .../k8s.io/apimachinery/pkg/api/errors/OWNERS | 1 - .../apimachinery/pkg/api/meta/conditions.go | 37 +- .../k8s.io/apimachinery/pkg/api/meta/help.go | 86 +- .../apimachinery/pkg/api/resource/OWNERS | 1 - .../apimachinery/pkg/api/resource/amount.go | 38 + .../pkg/api/resource/generated.pb.go | 43 +- .../apimachinery/pkg/api/resource/quantity.go | 10 + .../pkg/api/validation}/OWNERS | 2 - .../apimachinery/pkg/api/validation/doc.go | 18 + .../pkg/api/validation/generic.go | 88 + .../pkg/api/validation/objectmeta.go | 265 + .../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 | 478 +- .../pkg/apis/meta/v1/generated.proto | 93 +- .../apimachinery/pkg/apis/meta/v1/types.go | 126 +- .../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 | 320 + .../apis/meta/v1/zz_generated.conversion.go | 7 + .../pkg/apis/meta/v1/zz_generated.deepcopy.go | 5 + .../pkg/apis/meta/v1beta1/generated.pb.go | 45 +- .../v1beta1/types_swagger_doc_generated.go | 2 +- .../k8s.io/apimachinery/pkg/labels/labels.go | 2 + .../apimachinery/pkg/labels/selector.go | 131 +- .../k8s.io/apimachinery/pkg/runtime/codec.go | 1 - .../apimachinery/pkg/runtime/converter.go | 4 +- .../apimachinery/pkg/runtime/generated.pb.go | 65 +- .../k8s.io/apimachinery/pkg/runtime/helper.go | 35 +- .../apimachinery/pkg/runtime/interfaces.go | 5 + .../pkg/runtime/schema/generated.pb.go | 31 +- .../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/intstr/generated.pb.go | 47 +- .../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/runtime/runtime.go | 15 +- .../k8s.io/apimachinery/pkg/util/sets/doc.go | 2 +- .../apimachinery/pkg/util/sets/ordered.go | 53 - .../k8s.io/apimachinery/pkg/util/sets/set.go | 23 +- .../pkg/util/strategicpatch/OWNERS | 1 + .../pkg/util/strategicpatch/meta.go | 89 + .../pkg/util/strategicpatch/patch.go | 65 +- .../apimachinery/pkg/util/validation/OWNERS | 11 + .../pkg/util/validation/field/errors.go | 4 +- .../pkg/util/validation/validation.go | 64 +- .../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 +- .../v1/auditannotation.go | 48 + .../v1/expressionwarning.go | 48 + .../v1/matchcondition.go | 48 + .../v1/matchresources.go | 90 + .../v1/mutatingwebhook.go | 14 + .../namedrulewithoperations.go} | 39 +- .../paramsource.go => v1/paramkind.go} | 16 +- .../admissionregistration/v1/paramref.go | 71 + .../admissionregistration/v1/typechecking.go | 44 + .../v1/validatingadmissionpolicy.go | 256 + .../v1/validatingadmissionpolicybinding.go} | 86 +- .../validatingadmissionpolicybindingspec.go | 72 + .../v1/validatingadmissionpolicyspec.go | 117 + .../v1/validatingadmissionpolicystatus.go | 66 + .../v1/validatingwebhook.go | 14 + .../admissionregistration/v1/validation.go | 70 + .../admissionregistration/v1/variable.go | 48 + .../v1alpha1/admissionpolicyspec.go | 75 - .../v1alpha1/auditannotation.go | 48 + .../v1alpha1/expressionwarning.go | 48 + .../v1alpha1/matchcondition.go | 48 + .../v1alpha1/paramref.go | 27 +- .../admissionregistration/v1alpha1/rule.go | 76 - .../v1alpha1/typechecking.go | 44 + .../v1alpha1/validatingadmissionpolicy.go | 11 +- .../validatingadmissionpolicybindingspec.go | 21 +- .../v1alpha1/validatingadmissionpolicyspec.go | 42 + .../validatingadmissionpolicystatus.go | 66 + .../v1alpha1/validation.go | 15 +- .../v1alpha1/variable.go | 48 + .../v1beta1/auditannotation.go | 48 + .../v1beta1/expressionwarning.go | 48 + .../v1beta1/matchcondition.go | 48 + .../v1beta1/matchresources.go | 90 + .../v1beta1/mutatingwebhook.go | 14 + ...erations.go => namedrulewithoperations.go} | 38 +- .../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 | 14 + .../v1beta1/validation.go | 70 + .../admissionregistration/v1beta1/variable.go | 48 + .../v1alpha1/serverstorageversion.go | 11 + .../autoscaling/v2/podresourcemetricsource.go | 52 - .../applyconfigurations/batch/v1/jobspec.go | 45 + .../applyconfigurations/batch/v1/jobstatus.go | 18 + .../batch/v1/successpolicy.go | 44 + .../batch/v1/successpolicyrule.go | 48 + .../v1alpha1/clustertrustbundle.go} | 86 +- .../v1alpha1/clustertrustbundlespec.go | 48 + .../core/v1/apparmorprofile.go | 52 + .../core/v1/clustertrustbundleprojection.go | 79 + .../applyconfigurations/core/v1/container.go | 67 +- .../core/v1/containerresizepolicy.go | 52 + .../core/v1/containerstatus.go | 54 +- .../core/v1/ephemeralcontainer.go | 21 + .../core/v1/ephemeralcontainercommon.go | 67 +- .../allowedcsidriver.go => core/v1/hostip.go} | 22 +- .../core/v1/lifecyclehandler.go | 9 + .../core/v1/loadbalanceringress.go | 13 + .../core/v1/modifyvolumestatus.go | 52 + .../core/v1/noderuntimehandler.go | 48 + .../core/v1/noderuntimehandlerfeatures.go | 39 + .../applyconfigurations/core/v1/nodestatus.go | 14 + .../core/v1/persistentvolumeclaimspec.go | 27 +- .../core/v1/persistentvolumeclaimstatus.go | 44 +- .../core/v1/persistentvolumespec.go | 9 + .../core/v1/persistentvolumestatus.go | 16 +- .../core/v1/podaffinityterm.go | 22 + .../core/v1/podresourceclaimstatus.go | 48 + .../core/v1/podsecuritycontext.go | 9 + .../applyconfigurations/core/v1/podstatus.go | 63 +- .../core/v1/securitycontext.go | 9 + .../core/v1/servicespec.go | 17 +- .../v1/sleepaction.go} | 22 +- .../core/v1/volumemount.go | 21 +- .../core/v1/volumemountstatus.go | 70 + .../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 - .../extensions/v1beta1/networkpolicy.go | 11 +- .../extensions/v1beta1/networkpolicystatus.go | 48 - .../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 +- .../{v1alpha1 => v1}/flowschemacondition.go | 22 +- .../{v1alpha1 => v1}/flowschemaspec.go | 2 +- .../{v1alpha1 => v1}/flowschemastatus.go | 2 +- .../{v1alpha1 => v1}/groupsubject.go | 2 +- .../limitedprioritylevelconfiguration.go | 12 +- .../{v1alpha1 => v1}/limitresponse.go | 8 +- .../{v1alpha1 => v1}/nonresourcepolicyrule.go | 2 +- .../policyruleswithsubjects.go | 2 +- .../prioritylevelconfiguration.go | 16 +- .../prioritylevelconfigurationcondition.go | 22 +- .../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 + .../v1beta1/prioritylevelconfigurationspec.go | 9 + .../exemptprioritylevelconfiguration.go | 48 + .../v1beta2/prioritylevelconfigurationspec.go | 9 + .../exemptprioritylevelconfiguration.go | 48 + .../v1beta3/prioritylevelconfigurationspec.go | 9 + .../applyconfigurations/internal/internal.go | 2661 ++-- .../applyconfigurations/meta/v1/listmeta.go | 66 - .../applyconfigurations/meta/v1/status.go | 142 - .../meta/v1/statuscause.go | 61 - .../meta/v1/statusdetails.go | 93 - .../meta/v1/unstructured.go | 2 +- .../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} | 90 +- .../networking/v1alpha1/servicecidrspec.go | 41 + .../servicecidrstatus.go} | 14 +- .../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/podsecuritypolicyspec.go | 285 - .../v1beta1/runasgroupstrategyoptions.go | 57 - .../v1beta1/runasuserstrategyoptions.go | 57 - .../v1beta1/runtimeclassstrategyoptions.go | 50 - .../policy/v1beta1/selinuxstrategyoptions.go | 53 - .../supplementalgroupsstrategyoptions.go | 57 - .../allocationresult.go | 19 +- .../v1alpha2/allocationresultmodel.go | 39 + .../v1alpha2/driverallocationresult.go | 52 + .../resource/v1alpha2/driverrequests.go | 66 + .../namedresourcesallocationresult.go} | 14 +- .../v1alpha2/namedresourcesattribute.go | 100 + .../v1alpha2/namedresourcesattributevalue.go | 97 + .../resource/v1alpha2/namedresourcesfilter.go | 39 + .../v1alpha2/namedresourcesinstance.go | 53 + .../v1alpha2/namedresourcesintslice.go | 41 + .../v1alpha2/namedresourcesrequest.go | 39 + .../v1alpha2/namedresourcesresources.go | 44 + .../v1alpha2/namedresourcesstringslice.go | 41 + .../resource/v1alpha2/podschedulingcontext.go | 258 + .../podschedulingcontextspec.go} | 16 +- .../podschedulingcontextstatus.go} | 14 +- .../{v1alpha1 => v1alpha2}/resourceclaim.go | 16 +- .../resourceclaimconsumerreference.go | 2 +- .../v1alpha2/resourceclaimparameters.go | 272 + .../resourceclaimparametersreference.go | 2 +- .../resourceclaimschedulingstatus.go | 2 +- .../resourceclaimspec.go | 8 +- .../resourceclaimstatus.go | 2 +- .../resourceclaimtemplate.go | 16 +- .../resourceclaimtemplatespec.go | 2 +- .../{v1alpha1 => v1alpha2}/resourceclass.go | 25 +- .../v1alpha2/resourceclassparameters.go | 277 + .../resourceclassparametersreference.go | 2 +- .../resource/v1alpha2/resourcefilter.go | 48 + .../resource/v1alpha2/resourcefiltermodel.go | 39 + .../resource/v1alpha2/resourcehandle.go | 57 + .../resource/v1alpha2/resourcemodel.go | 39 + .../resource/v1alpha2/resourcerequest.go | 52 + .../resource/v1alpha2/resourcerequestmodel.go | 39 + .../resource/v1alpha2/resourceslice.go | 265 + .../v1alpha2/structuredresourcehandle.go | 75 + .../resource/v1alpha2/vendorparameters.go | 52 + .../storage/v1alpha1/volumeattributesclass.go | 262 + .../v1alpha1/groupversionresource.go} | 30 +- .../v1alpha1/migrationcondition.go | 81 + .../v1alpha1/storageversionmigration.go | 256 + .../v1alpha1/storageversionmigrationspec.go | 48 + .../v1alpha1/storageversionmigrationstatus.go | 53 + .../discovery/aggregated_discovery.go | 226 +- .../client-go/discovery/discovery_client.go | 231 +- .../client-go/discovery/fake/discovery.go | 7 +- .../k8s.io/client-go/features/envvar.go | 138 + .../k8s.io/client-go/features/features.go | 143 + .../client-go/features/known_features.go | 54 + .../k8s.io/client-go/kubernetes/clientset.go | 58 +- cli/vendor/k8s.io/client-go/kubernetes/doc.go | 9 +- .../client-go/kubernetes/scheme/register.go | 12 +- .../v1/admissionregistration_client.go | 10 + .../v1/generated_expansion.go | 4 + .../v1/validatingadmissionpolicy.go | 243 + .../v1/validatingadmissionpolicybinding.go | 197 + .../v1alpha1/validatingadmissionpolicy.go | 46 + .../v1beta1/admissionregistration_client.go | 10 + .../v1beta1/generated_expansion.go | 4 + .../v1beta1/validatingadmissionpolicy.go | 243 + .../validatingadmissionpolicybinding.go | 197 + .../v1/authentication_client.go | 5 + .../authentication/v1/generated_expansion.go | 2 + .../authentication/v1/selfsubjectreview.go | 64 + .../v1beta1/authentication_client.go | 5 + .../v1beta1/generated_expansion.go | 2 + .../v1beta1/selfsubjectreview.go | 64 + .../v1alpha1/certificates_client.go | 107 + .../v1alpha1/clustertrustbundle.go | 197 + .../v1alpha1/doc.go | 0 .../v1alpha1/generated_expansion.go | 8 +- .../typed/events/v1beta1/event_expansion.go | 3 +- .../extensions/v1beta1/extensions_client.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 + .../{v1alpha1 => v1}/flowcontrol_client.go | 38 +- .../{v1alpha1 => v1}/flowschema.go | 70 +- .../{v1alpha1 => v1}/generated_expansion.go | 2 +- .../prioritylevelconfiguration.go | 70 +- .../typed/networking/v1/networkpolicy.go | 48 - .../typed/networking/v1alpha1/clustercidr.go | 197 - .../v1alpha1/generated_expansion.go | 4 +- .../typed/networking/v1alpha1/ipaddress.go | 197 + .../networking/v1alpha1/networking_client.go | 11 +- .../typed/networking/v1alpha1/servicecidr.go | 243 + .../policy/v1beta1/generated_expansion.go | 2 - .../typed/policy/v1beta1/podsecuritypolicy.go | 197 - .../typed/policy/v1beta1/policy_client.go | 5 - .../typed/resource/v1alpha1/podscheduling.go | 256 - .../kubernetes/typed/resource/v1alpha2/doc.go | 20 + .../resource/v1alpha2/generated_expansion.go | 33 + .../resource/v1alpha2/podschedulingcontext.go | 256 + .../{v1alpha1 => v1alpha2}/resource_client.go | 61 +- .../{v1alpha1 => v1alpha2}/resourceclaim.go | 56 +- .../v1alpha2/resourceclaimparameters.go | 208 + .../resourceclaimtemplate.go | 44 +- .../{v1alpha1 => v1alpha2}/resourceclass.go | 44 +- .../v1alpha2/resourceclassparameters.go | 208 + .../typed/resource/v1alpha2/resourceslice.go | 197 + .../storage/v1alpha1/generated_expansion.go | 2 + .../typed/storage/v1alpha1/storage_client.go | 5 + .../storage/v1alpha1/volumeattributesclass.go | 197 + .../v1alpha1/doc.go | 0 .../v1alpha1/generated_expansion.go} | 9 +- .../v1alpha1/storagemigration_client.go | 107 + .../v1alpha1/storageversionmigration.go | 243 + .../k8s.io/client-go/metadata/metadata.go | 4 +- cli/vendor/k8s.io/client-go/openapi/OWNERS | 4 + cli/vendor/k8s.io/client-go/openapi/client.go | 7 +- .../k8s.io/client-go/openapi/groupversion.go | 42 +- .../k8s.io/client-go/openapi/typeconverter.go | 48 + .../k8s.io/client-go/pkg/version/base.go | 3 +- .../plugin/pkg/client/auth/exec/exec.go | 6 +- cli/vendor/k8s.io/client-go/rest/client.go | 3 +- cli/vendor/k8s.io/client-go/rest/config.go | 10 +- cli/vendor/k8s.io/client-go/rest/request.go | 73 +- cli/vendor/k8s.io/client-go/rest/url_utils.go | 4 +- .../k8s.io/client-go/rest/with_retry.go | 18 +- .../k8s.io/client-go/restmapper/shortcut.go | 36 +- .../k8s.io/client-go/tools/cache/OWNERS | 4 +- .../client-go/tools/cache/controller.go | 98 +- .../client-go/tools/cache/delta_fifo.go | 142 +- .../k8s.io/client-go/tools/cache/fifo.go | 14 +- .../k8s.io/client-go/tools/cache/index.go | 3 +- .../client-go/tools/cache/object-names.go | 65 + .../k8s.io/client-go/tools/cache/reflector.go | 509 +- .../reflector_data_consistency_detector.go | 119 + .../client-go/tools/cache/shared_informer.go | 180 +- .../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 | 92 +- .../client-go/tools/clientcmd/api/doc.go | 2 +- .../client-go/tools/clientcmd/api/types.go | 14 +- .../client-go/tools/clientcmd/api/v1/doc.go | 2 +- .../tools/clientcmd/client_config.go | 49 +- .../client-go/tools/clientcmd/loader.go | 24 +- .../tools/clientcmd/merged_client_builder.go | 4 +- .../tools/internal/events/interfaces.go | 59 + .../tools/leaderelection/leaderelection.go | 48 +- .../client-go/tools/leaderelection/metrics.go | 30 +- .../resourcelock/configmaplock.go | 126 - .../resourcelock/endpointslock.go | 121 - .../leaderelection/resourcelock/interface.go | 42 +- .../leaderelection/resourcelock/leaselock.go | 8 +- .../k8s.io/client-go/tools/metrics/metrics.go | 65 + .../k8s.io/client-go/tools/pager/pager.go | 36 +- .../k8s.io/client-go/tools/record/event.go | 227 +- .../k8s.io/client-go/tools/record/fake.go | 30 +- .../k8s.io/client-go/transport/cache.go | 8 +- .../k8s.io/client-go/transport/transport.go | 55 + cli/vendor/k8s.io/client-go/util/cert/cert.go | 36 +- .../client-go/util/flowcontrol/backoff.go | 3 +- .../client-go/util/jsonpath/jsonpath.go | 3 + .../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 +- .../k8s.io/component-base/config/types.go | 80 - .../config/v1alpha1/conversion.go | 53 - .../config/v1alpha1/defaults.go | 98 - .../config/v1alpha1/register.go | 31 - .../component-base/config/v1alpha1/types.go | 82 - .../v1alpha1/zz_generated.conversion.go | 133 - .../config/v1alpha1/zz_generated.deepcopy.go | 88 - .../config/zz_generated.deepcopy.go | 73 - cli/vendor/k8s.io/klog/v2/.golangci.yaml | 6 + cli/vendor/k8s.io/klog/v2/OWNERS | 4 +- cli/vendor/k8s.io/klog/v2/contextual_slog.go | 31 + cli/vendor/k8s.io/klog/v2/format.go | 65 + .../k8s.io/klog/v2/internal/buffer/buffer.go | 12 +- .../k8s.io/klog/v2/internal/clock/clock.go | 21 +- .../klog/v2/internal/serialize/keyvalues.go | 106 +- .../internal/serialize/keyvalues_no_slog.go | 97 + .../v2/internal/serialize/keyvalues_slog.go | 155 + .../internal/sloghandler/sloghandler_slog.go | 96 + cli/vendor/k8s.io/klog/v2/k8s_references.go | 12 +- .../k8s.io/klog/v2/k8s_references_slog.go | 39 + cli/vendor/k8s.io/klog/v2/klog.go | 102 +- cli/vendor/k8s.io/klog/v2/klog_file.go | 4 +- cli/vendor/k8s.io/klog/v2/klogr.go | 46 +- cli/vendor/k8s.io/klog/v2/klogr_slog.go | 96 + cli/vendor/k8s.io/klog/v2/safeptr.go | 34 + .../kube-openapi/pkg/builder3/util/util.go | 51 - .../k8s.io/kube-openapi/pkg/cached/cache.go | 290 + .../k8s.io/kube-openapi/pkg/common/common.go | 89 +- .../kube-openapi/pkg/handler3/handler.go | 246 +- .../k8s.io/kube-openapi/pkg/internal/flags.go | 5 + .../pkg/internal/handler/handler_cache.go | 57 - .../pkg/internal/serialization.go | 65 + .../go-json-experiment/json/arshal.go | 7 + .../go-json-experiment/json/arshal_any.go | 31 +- .../go-json-experiment/json/arshal_default.go | 147 +- .../go-json-experiment/json/arshal_inlined.go | 57 +- .../go-json-experiment/json/arshal_methods.go | 4 +- .../go-json-experiment/json/arshal_time.go | 99 +- .../go-json-experiment/json/decode.go | 12 +- .../go-json-experiment/json/doc.go | 9 +- .../go-json-experiment/json/encode.go | 24 + .../go-json-experiment/json/pools.go | 32 + .../go-json-experiment/json/state.go | 4 +- .../go-json-experiment/json/token.go | 10 +- .../go-json-experiment/json/value.go | 56 +- .../kube-openapi/pkg/openapiconv/convert.go | 322 - .../kube-openapi/pkg/schemaconv/openapi.go | 260 + .../pkg/schemaconv/proto_models.go | 178 + .../k8s.io/kube-openapi/pkg/schemaconv/smd.go | 309 +- .../kube-openapi/pkg/schemamutation/walker.go | 519 - .../k8s.io/kube-openapi/pkg/spec3/encoding.go | 43 +- .../k8s.io/kube-openapi/pkg/spec3/example.go | 39 +- .../pkg/spec3/external_documentation.go | 34 +- .../k8s.io/kube-openapi/pkg/spec3/fuzz.go | 281 + .../k8s.io/kube-openapi/pkg/spec3/header.go | 52 + .../kube-openapi/pkg/spec3/media_type.go | 42 +- .../kube-openapi/pkg/spec3/operation.go | 49 +- .../kube-openapi/pkg/spec3/parameter.go | 53 + .../k8s.io/kube-openapi/pkg/spec3/path.go | 129 +- .../kube-openapi/pkg/spec3/request_body.go | 44 +- .../k8s.io/kube-openapi/pkg/spec3/response.go | 173 +- .../pkg/spec3/security_requirement.go | 56 - .../kube-openapi/pkg/spec3/security_scheme.go | 19 +- .../k8s.io/kube-openapi/pkg/spec3/server.go | 67 +- .../k8s.io/kube-openapi/pkg/spec3/spec.go | 38 + .../kube-openapi/pkg/util/proto/document.go | 2 +- .../pkg/util/proto/document_v3.go | 6 +- .../kube-openapi/pkg/validation/spec/fuzz.go | 502 - .../pkg/validation/spec/gnostic.go | 2 +- .../pkg/validation/spec/header.go | 23 +- .../kube-openapi/pkg/validation/spec/info.go | 33 +- .../kube-openapi/pkg/validation/spec/items.go | 53 +- .../pkg/validation/spec/operation.go | 36 +- .../pkg/validation/spec/parameter.go | 36 +- .../pkg/validation/spec/path_item.go | 28 +- .../kube-openapi/pkg/validation/spec/paths.go | 24 +- .../kube-openapi/pkg/validation/spec/ref.go | 18 +- .../pkg/validation/spec/response.go | 36 +- .../pkg/validation/spec/responses.go | 24 +- .../pkg/validation/spec/schema.go | 79 +- .../pkg/validation/spec/security_scheme.go | 20 +- .../pkg/validation/spec/swagger.go | 82 +- .../kube-openapi/pkg/validation/spec/tag.go | 19 +- cli/vendor/k8s.io/utils/integer/integer.go | 73 - cli/vendor/k8s.io/utils/pointer/pointer.go | 283 +- cli/vendor/k8s.io/utils/ptr/OWNERS | 10 + cli/vendor/k8s.io/utils/ptr/README.md | 3 + cli/vendor/k8s.io/utils/ptr/ptr.go | 73 + cli/vendor/k8s.io/utils/trace/trace.go | 19 + cli/vendor/modules.txt | 333 +- .../controller-runtime/pkg/cache/cache.go | 711 +- .../pkg/cache/delegating_by_gvk_cache.go | 135 + .../pkg/cache/informer_cache.go | 157 +- .../pkg/cache/internal/cache_reader.go | 79 +- .../pkg/cache/internal/deleg_map.go | 126 - .../pkg/cache/internal/disabledeepcopy.go | 35 - .../pkg/cache/internal/informers.go | 596 + .../pkg/cache/internal/informers_map.go | 480 - .../pkg/cache/internal/selector.go | 15 - .../pkg/cache/internal/transformers.go | 55 - .../pkg/cache/multi_namespace_cache.go | 243 +- .../pkg/certwatcher/certwatcher.go | 64 +- .../pkg/client/apiutil/apimachinery.go | 63 +- .../pkg/client/apiutil/dynamicrestmapper.go | 301 - .../pkg/client/apiutil/errors.go | 54 + .../pkg/client/apiutil/lazyrestmapper.go | 266 - .../pkg/client/apiutil/restmapper.go | 335 + .../controller-runtime/pkg/client/client.go | 231 +- ...ient_cache.go => client_rest_resources.go} | 27 +- .../controller-runtime/pkg/client/doc.go | 3 +- .../controller-runtime/pkg/client/dryrun.go | 11 + .../pkg/client/fieldowner.go | 106 + .../pkg/client/interfaces.go | 6 + .../pkg/client/namespaced_client.go | 33 +- .../controller-runtime/pkg/client/options.go | 33 +- .../controller-runtime/pkg/client/split.go | 143 - .../pkg/client/typed_client.go | 26 +- .../pkg/client/unstructured_client.go | 79 +- .../controller-runtime/pkg/client/watch.go | 30 +- .../controller-runtime/pkg/cluster/cluster.go | 198 +- .../pkg/cluster/internal.go | 41 +- .../controller-runtime/pkg/config/config.go | 112 - .../pkg/config/controller.go | 49 + .../controller-runtime/pkg/config/doc.go | 25 - .../pkg/config/v1alpha1/register.go | 37 - .../pkg/config/v1alpha1/types.go | 162 - .../config/v1alpha1/zz_generated.deepcopy.go | 158 - .../pkg/controller/controller.go | 77 +- .../controllerutil/controllerutil.go | 136 +- .../controller-runtime/pkg/event/event.go | 51 +- .../controller-runtime/pkg/handler/enqueue.go | 45 +- .../pkg/handler/enqueue_mapped.go | 67 +- .../pkg/handler/enqueue_owner.go | 108 +- .../pkg/handler/eventhandler.go | 72 +- .../pkg/internal/controller/controller.go | 84 +- .../internal/controller/metrics/metrics.go | 8 + .../pkg/internal/field/selector/utils.go | 16 +- .../pkg/internal/objectutil/objectutil.go | 78 - .../pkg/internal/recorder/recorder.go | 9 +- .../source/event_handler.go} | 74 +- .../pkg/internal/source/kind.go | 137 + .../pkg/internal/syncs/syncs.go | 38 + .../controller-runtime/pkg/log/deleg.go | 43 +- .../controller-runtime/pkg/log/log.go | 55 +- .../pkg/log/zap/kube_helpers.go | 22 - .../controller-runtime/pkg/log/zap/zap.go | 10 +- .../pkg/manager/internal.go | 217 +- .../controller-runtime/pkg/manager/manager.go | 355 +- .../pkg/manager/runnable_group.go | 24 +- .../controller-runtime/pkg/manager/server.go | 109 + .../pkg/metrics/client_go_adapter.go | 89 +- .../pkg/metrics/leaderelection.go | 23 +- .../pkg/metrics/listener.go | 52 - .../pkg/metrics/server/doc.go | 26 + .../pkg/metrics/server/server.go | 340 + .../pkg/metrics/workqueue.go | 4 +- .../pkg/predicate/predicate.go | 202 +- .../pkg/reconcile/reconcile.go | 72 +- .../pkg/runtime/inject/doc.go | 22 - .../pkg/runtime/inject/inject.go | 164 - .../controller-runtime/pkg/scheme/scheme.go | 93 - .../controller-runtime/pkg/source/source.go | 275 +- .../pkg/webhook/admission/decode.go | 38 +- .../pkg/webhook/admission/defaulter.go | 19 +- .../pkg/webhook/admission/defaulter_custom.go | 16 +- .../pkg/webhook/admission/doc.go | 6 - .../pkg/webhook/admission/http.go | 72 +- .../pkg/webhook/admission/inject.go | 31 - .../pkg/webhook/admission/multi.go | 52 - .../pkg/webhook/admission/response.go | 23 +- .../pkg/webhook/admission/validator.go | 109 +- .../pkg/webhook/admission/validator_custom.go | 54 +- .../pkg/webhook/admission/webhook.go | 119 +- .../controller-runtime/pkg/webhook/alias.go | 2 + .../controller-runtime/pkg/webhook/server.go | 254 +- .../internal/golang/encoding/json/decode.go | 5 +- .../internal/golang/encoding/json/encode.go | 37 +- .../internal/golang/encoding/json/fold.go | 5 +- .../internal/golang/encoding/json/scanner.go | 2 + .../internal/golang/encoding/json/stream.go | 1 - cli/vendor/sigs.k8s.io/json/json.go | 28 +- .../v4/fieldpath/pathelementmap.go | 45 +- .../v4/merge/conflict.go | 121 + .../structured-merge-diff/v4/merge/update.go | 358 + .../v4/schema/elements.go | 3 +- .../v4/schema/schemaschema.go | 3 +- .../structured-merge-diff/v4/typed/compare.go | 460 + .../structured-merge-diff/v4/typed/helpers.go | 21 +- .../structured-merge-diff/v4/typed/merge.go | 61 +- .../structured-merge-diff/v4/typed/parser.go | 12 +- .../structured-merge-diff/v4/typed/remove.go | 4 +- .../v4/typed/tofieldset.go | 24 +- .../structured-merge-diff/v4/typed/typed.go | 187 +- .../structured-merge-diff/v4/typed/union.go | 276 - .../v4/typed/validate.go | 14 +- .../v4/value/mapreflect.go | 2 +- .../v4/value/mapunstructured.go | 8 +- .../v4/value/reflectcache.go | 4 +- cli/vendor/sigs.k8s.io/yaml/LICENSE | 256 + cli/vendor/sigs.k8s.io/yaml/OWNERS | 8 +- cli/vendor/sigs.k8s.io/yaml/fields.go | 55 +- .../yaml/goyaml.v2}/LICENSE | 5 +- .../yaml/goyaml.v2/LICENSE.libyaml | 31 + .../yaml/goyaml.v2/NOTICE} | 8 +- cli/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS | 24 + .../sigs.k8s.io/yaml/goyaml.v2/README.md | 143 + cli/vendor/sigs.k8s.io/yaml/goyaml.v2/apic.go | 744 ++ .../sigs.k8s.io/yaml/goyaml.v2/decode.go | 815 ++ .../sigs.k8s.io/yaml/goyaml.v2/emitterc.go | 1685 +++ .../sigs.k8s.io/yaml/goyaml.v2/encode.go | 390 + .../sigs.k8s.io/yaml/goyaml.v2/parserc.go | 1095 ++ .../sigs.k8s.io/yaml/goyaml.v2/readerc.go | 412 + .../sigs.k8s.io/yaml/goyaml.v2/resolve.go | 258 + .../sigs.k8s.io/yaml/goyaml.v2/scannerc.go | 2711 ++++ .../sigs.k8s.io/yaml/goyaml.v2/sorter.go | 113 + .../sigs.k8s.io/yaml/goyaml.v2/writerc.go | 26 + cli/vendor/sigs.k8s.io/yaml/goyaml.v2/yaml.go | 478 + .../sigs.k8s.io/yaml/goyaml.v2/yamlh.go | 739 ++ .../yaml/goyaml.v2/yamlprivateh.go | 173 + cli/vendor/sigs.k8s.io/yaml/yaml.go | 145 +- cli/vendor/sigs.k8s.io/yaml/yaml_go110.go | 17 + 1656 files changed, 144577 insertions(+), 65823 deletions(-) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/LICENSE (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/NOTICE (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl => carvel.dev/kapp-controller/pkg/apis/internalpackaging}/install/install.go (61%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/internalpackaging/v1alpha1/doc.go (80%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/internalpackaging/v1alpha1/register.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/internalpackaging/v1alpha1/types.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/internalpackaging/v1alpha1/zz_generated.deepcopy.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging => carvel.dev/kapp-controller/pkg/apis/kappctrl}/install/install.go (61%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/doc.go (79%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/generated.pb.go (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/generated.proto (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/register.go (95%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/status.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/types.go (95%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/types_deploy.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/types_fetch.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/types_template.go (99%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go (99%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging => carvel.dev/kapp-controller/pkg/apis/packaging}/install/install.go (59%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/packaging/v1alpha1/doc.go (80%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/packaging/v1alpha1/package_install.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/packaging/v1alpha1/package_repository.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/packaging/v1alpha1/register.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/doc.go (84%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/install/install.go (59%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/register.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/types.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go (66%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go (87%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/register.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/types.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go (99%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/clientset.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go (83%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/fake/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/fake/register.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/scheme/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/scheme/register.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go (83%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/generated_expansion.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/app.go (86%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/app_deploy.go (78%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/app_factory.go (63%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/app_fetch.go (76%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/app_reconcile.go (77%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/app_template.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/crd_app.go (80%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/crd_app_watcher.go (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/finalizer.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/reconcile_timer.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/app/reconciler.go (82%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/clientset.go (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/fake/clientset_generated.go (73%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/fake/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/fake/register.go (81%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/scheme/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/scheme/register.go (81%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go (85%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/generated_expansion.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go (81%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/generated_expansion.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/doc.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go (86%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/generated_expansion.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/factory.go (62%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/generic.go (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/internalpackaging/interface.go (77%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go (87%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go (87%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/kappctrl/interface.go (78%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go (86%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go (86%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/packaging/interface.go (78%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go (87%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go (87%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/internalpackaging/v1alpha1/expansion_generated.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/kappctrl/v1alpha1/app.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/kappctrl/v1alpha1/expansion_generated.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/packaging/v1alpha1/expansion_generated.go (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/packaging/v1alpha1/packageinstall.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/client/listers/packaging/v1alpha1/packagerepository.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/componentinfo/component_info.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/config/config.go (85%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/config/os_config.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/config/reconciler.go (69%) create mode 100644 cli/vendor/carvel.dev/kapp-controller/pkg/config/scheme.go rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/deploy/cmd_run_result_buf.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/deploy/factory.go (80%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/deploy/interfaces.go (78%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/deploy/kapp.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/deploy/kapp_restrict.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/exec/cmd_run_result.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/exec/cmd_runner.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/exec/doc.go (84%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/exec/flag.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/fetch/doc.go (77%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/fetch/factory.go (84%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/fetch/inline.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/fetch/vendir.go (86%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/kubeconfig/kubeconfig.go (77%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/kubeconfig/kubeconfig_restricted.go (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/kubeconfig/kubeconfig_secrets.go (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/kubeconfig/service_accounts.go (91%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/memdir/doc.go (83%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/memdir/scoped.go (95%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/memdir/subpath.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/memdir/tmp_dir.go (94%) create mode 100644 cli/vendor/carvel.dev/kapp-controller/pkg/metrics/metrics.go create mode 100644 cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_count_metrics.go create mode 100644 cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_time_metrics.go rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/packageinstall/app.go (88%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/packageinstall/finalizer.go (95%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/packageinstall/packageinstall.go (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/packageinstall/packageinstall_version_handler.go (66%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/packageinstall/reconciler.go (59%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reconciler/configmap_handler.go (58%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reconciler/secret_handler.go (59%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reconciler/status.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reftracker/app_update_status.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reftracker/doc.go (87%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reftracker/ref_key.go (96%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/reftracker/ref_tracker.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/satoken/token_manager.go (99%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/cue.go (92%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/downward_api_values.go (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/factory.go (88%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/helm_template.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/interfaces.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/kbld.go (90%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/sops.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/values.go (95%) rename cli/vendor/{github.com/vmware-tanzu/carvel-kapp-controller => carvel.dev/kapp-controller}/pkg/template/ytt.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/LICENSE (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/NOTICE (100%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/config.go (75%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/data.go (95%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/directory.go (93%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/doc.go (73%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/dockerconfigjson.go (98%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/lock_config.go (74%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/lock_directory.go (80%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/config/resources.go (96%) create mode 100644 cli/vendor/carvel.dev/vendir/pkg/vendir/version/version.go rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/selector.go (94%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/semvers.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/config.go (97%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/generated.pb.go (78%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/generated.proto (89%) rename cli/vendor/{github.com/vmware-tanzu/carvel-vendir => carvel.dev/vendir}/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go (100%) create mode 100644 cli/vendor/github.com/cespare/xxhash/v2/testall.sh create mode 100644 cli/vendor/github.com/cespare/xxhash/v2/xxhash_arm64.s rename cli/vendor/github.com/cespare/xxhash/v2/{xxhash_amd64.go => xxhash_asm.go} (73%) create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/fold.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/fuzz.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/indent.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/scanner.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/stream.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/tables.go create mode 100644 cli/vendor/github.com/evanphx/json-patch/v5/internal/json/tags.go create mode 100644 cli/vendor/github.com/fsnotify/fsnotify/.cirrus.yml create mode 100644 cli/vendor/github.com/go-logr/logr/SECURITY.md create mode 100644 cli/vendor/github.com/go-logr/logr/context.go create mode 100644 cli/vendor/github.com/go-logr/logr/context_noslog.go create mode 100644 cli/vendor/github.com/go-logr/logr/context_slog.go create mode 100644 cli/vendor/github.com/go-logr/logr/sloghandler.go create mode 100644 cli/vendor/github.com/go-logr/logr/slogr.go create mode 100644 cli/vendor/github.com/go-logr/logr/slogr/slogr.go create mode 100644 cli/vendor/github.com/go-logr/logr/slogsink.go create mode 100644 cli/vendor/github.com/go-logr/zapr/.golangci.yaml create mode 100644 cli/vendor/github.com/go-logr/zapr/slogzapr.go create mode 100644 cli/vendor/github.com/go-logr/zapr/zapr_noslog.go create mode 100644 cli/vendor/github.com/go-logr/zapr/zapr_slog.go delete mode 100644 cli/vendor/github.com/go-openapi/jsonpointer/.travis.yml delete mode 100644 cli/vendor/github.com/go-openapi/jsonreference/.travis.yml create mode 100644 cli/vendor/github.com/go-openapi/swag/.gitattributes delete mode 100644 cli/vendor/github.com/go-openapi/swag/.travis.yml create mode 100644 cli/vendor/github.com/go-openapi/swag/file.go rename cli/vendor/github.com/google/{gnostic => gnostic-models}/LICENSE (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/README.md (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/context.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/error.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/extensions.go (97%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/helpers.go (99%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/main.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/compiler/reader.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/extensions/README.md (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/extensions/extension.pb.go (99%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/extensions/extension.proto (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/extensions/extensions.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/README.md (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/base.go (90%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/display.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/models.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/operations.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/reader.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/schema.json (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/jsonschema/writer.go (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/OpenAPIv2.go (99%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/OpenAPIv2.pb.go (99%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/OpenAPIv2.proto (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/README.md (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/document.go (96%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv2/openapi-2.0.json (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/OpenAPIv3.go (99%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/OpenAPIv3.pb.go (99%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/OpenAPIv3.proto (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/README.md (100%) rename cli/vendor/github.com/google/{gnostic => gnostic-models}/openapiv3/document.go (96%) delete mode 100644 cli/vendor/github.com/google/gnostic/openapiv3/openapi-3.0.json delete mode 100644 cli/vendor/github.com/google/gnostic/openapiv3/openapi-3.1.json rename cli/vendor/github.com/google/go-cmp/cmp/{export_unsafe.go => export.go} (94%) delete mode 100644 cli/vendor/github.com/google/go-cmp/cmp/export_panic.go rename cli/vendor/github.com/google/go-cmp/cmp/internal/value/{pointer_unsafe.go => pointer.go} (95%) delete mode 100644 cli/vendor/github.com/google/go-cmp/cmp/internal/value/pointer_purego.go create mode 100644 cli/vendor/github.com/google/uuid/null.go delete mode 100644 cli/vendor/github.com/hashicorp/go-version/CHANGELOG.md delete mode 100644 cli/vendor/github.com/inconshreveable/mousetrap/trap_windows_1.4.go rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/LICENSE (100%) rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/NOTICE (100%) rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/pbutil/.gitignore (100%) rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/pbutil/Makefile (100%) rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/pbutil/decode.go (83%) rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/pbutil/doc.go (100%) rename cli/vendor/github.com/matttproud/golang_protobuf_extensions/{ => v2}/pbutil/encode.go (91%) create mode 100644 cli/vendor/github.com/prometheus/client_golang/prometheus/process_collector_wasip1.go create mode 100644 cli/vendor/github.com/prometheus/client_golang/prometheus/vnext.go create mode 100644 cli/vendor/github.com/prometheus/common/model/value_float.go create mode 100644 cli/vendor/github.com/prometheus/common/model/value_histogram.go create mode 100644 cli/vendor/github.com/prometheus/common/model/value_type.go create mode 100644 cli/vendor/github.com/prometheus/procfs/cpuinfo_loong64.go create mode 100644 cli/vendor/github.com/prometheus/procfs/fs_statfs_notype.go create mode 100644 cli/vendor/github.com/prometheus/procfs/fs_statfs_type.go create mode 100644 cli/vendor/github.com/prometheus/procfs/net_route.go create mode 100644 cli/vendor/github.com/prometheus/procfs/net_wireless.go create mode 100644 cli/vendor/github.com/prometheus/procfs/proc_interrupts.go create mode 100644 cli/vendor/github.com/prometheus/procfs/thread.go create mode 100644 cli/vendor/github.com/spf13/cobra/.golangci.yml delete mode 100644 cli/vendor/github.com/spf13/cobra/.travis.yml delete mode 100644 cli/vendor/github.com/spf13/cobra/CHANGELOG.md create mode 100644 cli/vendor/github.com/spf13/cobra/CONDUCT.md create mode 100644 cli/vendor/github.com/spf13/cobra/MAINTAINERS create mode 100644 cli/vendor/github.com/spf13/cobra/active_help.go delete mode 100644 cli/vendor/github.com/spf13/cobra/bash_completions.md create mode 100644 cli/vendor/github.com/spf13/cobra/bash_completionsV2.go create mode 100644 cli/vendor/github.com/spf13/cobra/completions.go delete mode 100644 cli/vendor/github.com/spf13/cobra/custom_completions.go delete mode 100644 cli/vendor/github.com/spf13/cobra/fish_completions.md create mode 100644 cli/vendor/github.com/spf13/cobra/flag_groups.go delete mode 100644 cli/vendor/github.com/spf13/cobra/powershell_completions.md delete mode 100644 cli/vendor/github.com/spf13/cobra/projects_using_cobra.md delete mode 100644 cli/vendor/github.com/spf13/cobra/shell_completions.md delete mode 100644 cli/vendor/github.com/spf13/cobra/zsh_completions.md delete mode 100644 cli/vendor/github.com/stretchr/testify/assert/assertion_compare_can_convert.go delete mode 100644 cli/vendor/github.com/stretchr/testify/assert/assertion_compare_legacy.go create mode 100644 cli/vendor/github.com/stretchr/testify/assert/yaml/yaml_custom.go create mode 100644 cli/vendor/github.com/stretchr/testify/assert/yaml/yaml_default.go create mode 100644 cli/vendor/github.com/stretchr/testify/assert/yaml/yaml_fail.go delete mode 100644 cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/doc.go delete mode 100644 cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/doc.go delete mode 100644 cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/scheme.go delete mode 100644 cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/metrics/app_metrics.go delete mode 100644 cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version/version.go delete mode 100644 cli/vendor/go.uber.org/atomic/.codecov.yml delete mode 100644 cli/vendor/go.uber.org/atomic/.gitignore delete mode 100644 cli/vendor/go.uber.org/atomic/.travis.yml delete mode 100644 cli/vendor/go.uber.org/atomic/CHANGELOG.md delete mode 100644 cli/vendor/go.uber.org/atomic/LICENSE.txt delete mode 100644 cli/vendor/go.uber.org/atomic/Makefile delete mode 100644 cli/vendor/go.uber.org/atomic/README.md delete mode 100644 cli/vendor/go.uber.org/atomic/bool.go delete mode 100644 cli/vendor/go.uber.org/atomic/doc.go delete mode 100644 cli/vendor/go.uber.org/atomic/duration.go delete mode 100644 cli/vendor/go.uber.org/atomic/duration_ext.go delete mode 100644 cli/vendor/go.uber.org/atomic/float64.go delete mode 100644 cli/vendor/go.uber.org/atomic/float64_ext.go delete mode 100644 cli/vendor/go.uber.org/atomic/gen.go delete mode 100644 cli/vendor/go.uber.org/atomic/int32.go delete mode 100644 cli/vendor/go.uber.org/atomic/int64.go delete mode 100644 cli/vendor/go.uber.org/atomic/nocmp.go delete mode 100644 cli/vendor/go.uber.org/atomic/string.go delete mode 100644 cli/vendor/go.uber.org/atomic/string_ext.go delete mode 100644 cli/vendor/go.uber.org/atomic/uint32.go delete mode 100644 cli/vendor/go.uber.org/atomic/uint64.go delete mode 100644 cli/vendor/go.uber.org/atomic/value.go delete mode 100644 cli/vendor/go.uber.org/multierr/.travis.yml rename cli/vendor/go.uber.org/{atomic/error_ext.go => multierr/error_post_go120.go} (65%) rename cli/vendor/go.uber.org/multierr/{go113.go => error_pre_go120.go} (66%) delete mode 100644 cli/vendor/go.uber.org/multierr/glide.yaml create mode 100644 cli/vendor/go.uber.org/zap/.golangci.yml delete mode 100644 cli/vendor/go.uber.org/zap/array_go118.go rename cli/vendor/go.uber.org/{atomic/bool_ext.go => zap/internal/pool/pool.go} (56%) rename cli/vendor/go.uber.org/zap/{stacktrace.go => internal/stacktrace/stack.go} (73%) rename cli/vendor/go.uber.org/{atomic/error.go => zap/zapcore/lazy_with.go} (60%) create mode 100644 cli/vendor/golang.org/x/exp/LICENSE create mode 100644 cli/vendor/golang.org/x/exp/PATENTS create mode 100644 cli/vendor/golang.org/x/exp/maps/maps.go delete mode 100644 cli/vendor/golang.org/x/net/context/ctxhttp/ctxhttp.go create mode 100644 cli/vendor/golang.org/x/net/http2/config.go create mode 100644 cli/vendor/golang.org/x/net/http2/config_go124.go create mode 100644 cli/vendor/golang.org/x/net/http2/config_pre_go124.go delete mode 100644 cli/vendor/golang.org/x/net/http2/testsync.go create mode 100644 cli/vendor/golang.org/x/net/http2/timer.go create mode 100644 cli/vendor/golang.org/x/sys/unix/bpxsvc_zos.go create mode 100644 cli/vendor/golang.org/x/sys/unix/bpxsvc_zos.s delete mode 100644 cli/vendor/golang.org/x/sys/unix/epoll_zos.go delete mode 100644 cli/vendor/golang.org/x/sys/unix/fstatfs_zos.go create mode 100644 cli/vendor/golang.org/x/sys/unix/sockcmsg_zos.go create mode 100644 cli/vendor/golang.org/x/sys/unix/symaddr_zos_s390x.s create mode 100644 cli/vendor/golang.org/x/sys/unix/vgetrandom_linux.go create mode 100644 cli/vendor/golang.org/x/sys/unix/vgetrandom_unsupported.go create mode 100644 cli/vendor/golang.org/x/sys/unix/zsymaddr_zos_s390x.s delete mode 100644 cli/vendor/golang.org/x/sys/windows/empty.s rename cli/vendor/k8s.io/{component-base/config/v1alpha1 => api/apidiscovery/v2}/doc.go (75%) create mode 100644 cli/vendor/k8s.io/api/apidiscovery/v2/generated.pb.go create mode 100644 cli/vendor/k8s.io/api/apidiscovery/v2/generated.proto create mode 100644 cli/vendor/k8s.io/api/apidiscovery/v2/register.go create mode 100644 cli/vendor/k8s.io/api/apidiscovery/v2/types.go create mode 100644 cli/vendor/k8s.io/api/apidiscovery/v2/zz_generated.deepcopy.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/doc.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/generated.pb.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/generated.proto create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/register.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/types.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/types_swagger_doc_generated.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/zz_generated.deepcopy.go create mode 100644 cli/vendor/k8s.io/api/certificates/v1alpha1/zz_generated.prerelease-lifecycle.go rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/doc.go (73%) rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/generated.pb.go (87%) rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/generated.proto (85%) rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/register.go (95%) rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/types.go (80%) rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/types_swagger_doc_generated.go (86%) rename cli/vendor/k8s.io/api/flowcontrol/{v1alpha1 => v1}/zz_generated.deepcopy.go (93%) delete mode 100644 cli/vendor/k8s.io/api/flowcontrol/v1alpha1/zz_generated.prerelease-lifecycle.go create mode 100644 cli/vendor/k8s.io/api/networking/v1alpha1/well_known_labels.go delete mode 100644 cli/vendor/k8s.io/api/resource/v1alpha1/generated.pb.go delete mode 100644 cli/vendor/k8s.io/api/resource/v1alpha1/generated.proto delete mode 100644 cli/vendor/k8s.io/api/resource/v1alpha1/types_swagger_doc_generated.go delete mode 100644 cli/vendor/k8s.io/api/resource/v1alpha1/zz_generated.deepcopy.go rename cli/vendor/k8s.io/api/resource/{v1alpha1 => v1alpha2}/doc.go (84%) create mode 100644 cli/vendor/k8s.io/api/resource/v1alpha2/generated.pb.go create mode 100644 cli/vendor/k8s.io/api/resource/v1alpha2/generated.proto create mode 100644 cli/vendor/k8s.io/api/resource/v1alpha2/namedresources.go rename cli/vendor/k8s.io/api/resource/{v1alpha1 => v1alpha2}/register.go (88%) rename cli/vendor/k8s.io/api/resource/{v1alpha1 => v1alpha2}/types.go (51%) create mode 100644 cli/vendor/k8s.io/api/resource/v1alpha2/types_swagger_doc_generated.go create mode 100644 cli/vendor/k8s.io/api/resource/v1alpha2/zz_generated.deepcopy.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/doc.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/generated.pb.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/generated.proto create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/register.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/types.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/types_swagger_doc_generated.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/zz_generated.deepcopy.go create mode 100644 cli/vendor/k8s.io/api/storagemigration/v1alpha1/zz_generated.prerelease-lifecycle.go rename cli/vendor/k8s.io/{component-base/config => apimachinery/pkg/api/validation}/OWNERS (84%) create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/api/validation/doc.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/api/validation/generic.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/api/validation/objectmeta.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/apis/meta/internalversion/defaults.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/validation/validation.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/runtime/splice.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/dump/dump.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/endpoints.yaml create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/fieldmanager.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/atmostevery.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/buildmanagerinfo.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/capmanagers.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/conflict.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/fieldmanager.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/fields.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/lastapplied.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/lastappliedmanager.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/lastappliedupdater.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/managedfields.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/managedfieldsupdater.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/manager.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/pathelement.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/skipnonapplied.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/stripmeta.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/structuredmerge.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/typeconverter.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/versioncheck.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/internal/versionconverter.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/node.yaml create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/pod.yaml create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/scalehandler.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/managedfields/typeconverter.go delete mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/sets/ordered.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/validation/OWNERS create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/wait/backoff.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/wait/delay.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/wait/error.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/wait/loop.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/wait/poll.go create mode 100644 cli/vendor/k8s.io/apimachinery/pkg/util/wait/timer.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/auditannotation.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/expressionwarning.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/matchcondition.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/matchresources.go rename cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/{v1alpha1/rulewithoperations.go => v1/namedrulewithoperations.go} (57%) rename cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/{v1alpha1/paramsource.go => v1/paramkind.go} (70%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/paramref.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/typechecking.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/validatingadmissionpolicy.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{policy/v1beta1/podsecuritypolicy.go => admissionregistration/v1/validatingadmissionpolicybinding.go} (60%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/validatingadmissionpolicybindingspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/validatingadmissionpolicyspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/validatingadmissionpolicystatus.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/validation.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1/variable.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/admissionpolicyspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/auditannotation.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/expressionwarning.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/matchcondition.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/rule.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/typechecking.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/validatingadmissionpolicystatus.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1/variable.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/auditannotation.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/expressionwarning.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/matchcondition.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/matchresources.go rename cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/{rulewithoperations.go => namedrulewithoperations.go} (56%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/paramkind.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/paramref.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/rule.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/typechecking.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicy.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicybinding.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicybindingspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicyspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validatingadmissionpolicystatus.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/validation.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/admissionregistration/v1beta1/variable.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/autoscaling/v2/podresourcemetricsource.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/batch/v1/successpolicy.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/batch/v1/successpolicyrule.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/podsecuritypolicy.go => certificates/v1alpha1/clustertrustbundle.go} (65%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/certificates/v1alpha1/clustertrustbundlespec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/apparmorprofile.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/clustertrustbundleprojection.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/containerresizepolicy.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/allowedcsidriver.go => core/v1/hostip.go} (51%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/modifyvolumestatus.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/noderuntimehandler.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/noderuntimehandlerfeatures.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/podresourceclaimstatus.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{extensions/v1beta1/allowedflexvolume.go => core/v1/sleepaction.go} (50%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/volumemountstatus.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/core/v1/volumeresourcerequirements.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/allowedhostpath.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/fsgroupstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/hostportrange.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/idrange.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/networkpolicystatus.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/podsecuritypolicyspec.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/runasgroupstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/runasuserstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/runtimeclassstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/selinuxstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/extensions/v1beta1/supplementalgroupsstrategyoptions.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1/exemptprioritylevelconfiguration.go rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowdistinguishermethod.go (87%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschema.go (94%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschemacondition.go (81%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschemaspec.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/flowschemastatus.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/groupsubject.go (98%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/limitedprioritylevelconfiguration.go (90%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/limitresponse.go (88%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/nonresourcepolicyrule.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/policyruleswithsubjects.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfiguration.go (94%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationcondition.go (81%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationreference.go (98%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationspec.go (73%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/prioritylevelconfigurationstatus.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/queuingconfiguration.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/resourcepolicyrule.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/serviceaccountsubject.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/subject.go (92%) rename cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/{v1alpha1 => v1}/usersubject.go (98%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta1/exemptprioritylevelconfiguration.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta2/exemptprioritylevelconfiguration.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/flowcontrol/v1beta3/exemptprioritylevelconfiguration.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/meta/v1/listmeta.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/meta/v1/status.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/meta/v1/statuscause.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/meta/v1/statusdetails.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/clustercidrspec.go rename cli/vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/{clustercidr.go => ipaddress.go} (69%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/ipaddressspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/parentreference.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{resource/v1alpha1/podscheduling.go => networking/v1alpha1/servicecidr.go} (67%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/networking/v1alpha1/servicecidrspec.go rename cli/vendor/k8s.io/client-go/applyconfigurations/networking/{v1/networkpolicystatus.go => v1alpha1/servicecidrstatus.go} (68%) delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/allowedflexvolume.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/allowedhostpath.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/fsgroupstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/hostportrange.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/idrange.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/podsecuritypolicyspec.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runasgroupstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runasuserstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/runtimeclassstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/selinuxstrategyoptions.go delete mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/policy/v1beta1/supplementalgroupsstrategyoptions.go rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/allocationresult.go (76%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/allocationresultmodel.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/driverallocationresult.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/driverrequests.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{policy/v1beta1/allowedcsidriver.go => resource/v1alpha2/namedresourcesallocationresult.go} (60%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesattribute.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesattributevalue.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesfilter.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesinstance.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesintslice.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesrequest.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesresources.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/namedresourcesstringslice.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/podschedulingcontext.go rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1/podschedulingspec.go => v1alpha2/podschedulingcontextspec.go} (67%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1/podschedulingstatus.go => v1alpha2/podschedulingcontextstatus.go} (64%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaim.go (96%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimconsumerreference.go (99%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclaimparameters.go rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimparametersreference.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimschedulingstatus.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimspec.go (93%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimstatus.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimtemplate.go (96%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclaimtemplatespec.go (99%) rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclass.go (92%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceclassparameters.go rename cli/vendor/k8s.io/client-go/applyconfigurations/resource/{v1alpha1 => v1alpha2}/resourceclassparametersreference.go (99%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcefilter.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcefiltermodel.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcehandle.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcemodel.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcerequest.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcerequestmodel.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceslice.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/structuredresourcehandle.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/resource/v1alpha2/vendorparameters.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/storage/v1alpha1/volumeattributesclass.go rename cli/vendor/k8s.io/client-go/applyconfigurations/{meta/v1/groupversionkind.go => storagemigration/v1alpha1/groupversionresource.go} (55%) create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/storagemigration/v1alpha1/migrationcondition.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/storagemigration/v1alpha1/storageversionmigration.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/storagemigration/v1alpha1/storageversionmigrationspec.go create mode 100644 cli/vendor/k8s.io/client-go/applyconfigurations/storagemigration/v1alpha1/storageversionmigrationstatus.go create mode 100644 cli/vendor/k8s.io/client-go/features/envvar.go create mode 100644 cli/vendor/k8s.io/client-go/features/features.go create mode 100644 cli/vendor/k8s.io/client-go/features/known_features.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicy.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1/validatingadmissionpolicybinding.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicy.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/validatingadmissionpolicybinding.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/authentication/v1/selfsubjectreview.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/authentication/v1beta1/selfsubjectreview.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/certificates_client.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/certificates/v1alpha1/clustertrustbundle.go rename cli/vendor/k8s.io/client-go/kubernetes/typed/{flowcontrol => certificates}/v1alpha1/doc.go (100%) rename cli/vendor/k8s.io/client-go/kubernetes/typed/{resource => certificates}/v1alpha1/generated_expansion.go (78%) delete mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/extensions/v1beta1/podsecuritypolicy.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/v1/doc.go rename cli/vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/flowcontrol_client.go (64%) rename cli/vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/flowschema.go (69%) rename cli/vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/generated_expansion.go (97%) rename cli/vendor/k8s.io/client-go/kubernetes/typed/flowcontrol/{v1alpha1 => v1}/prioritylevelconfiguration.go (69%) delete mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/clustercidr.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/ipaddress.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/networking/v1alpha1/servicecidr.go delete mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/policy/v1beta1/podsecuritypolicy.go delete mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha1/podscheduling.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/doc.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/generated_expansion.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/podschedulingcontext.go rename cli/vendor/k8s.io/client-go/kubernetes/typed/resource/{v1alpha1 => v1alpha2}/resource_client.go (58%) rename cli/vendor/k8s.io/client-go/kubernetes/typed/resource/{v1alpha1 => v1alpha2}/resourceclaim.go (79%) create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resourceclaimparameters.go rename cli/vendor/k8s.io/client-go/kubernetes/typed/resource/{v1alpha1 => v1alpha2}/resourceclaimtemplate.go (80%) rename cli/vendor/k8s.io/client-go/kubernetes/typed/resource/{v1alpha1 => v1alpha2}/resourceclass.go (80%) create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resourceclassparameters.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/resource/v1alpha2/resourceslice.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/storage/v1alpha1/volumeattributesclass.go rename cli/vendor/k8s.io/client-go/kubernetes/typed/{resource => storagemigration}/v1alpha1/doc.go (100%) rename cli/vendor/{sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/doc.go => k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/generated_expansion.go} (75%) create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/storagemigration_client.go create mode 100644 cli/vendor/k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1/storageversionmigration.go create mode 100644 cli/vendor/k8s.io/client-go/openapi/OWNERS create mode 100644 cli/vendor/k8s.io/client-go/openapi/typeconverter.go create mode 100644 cli/vendor/k8s.io/client-go/tools/cache/object-names.go create mode 100644 cli/vendor/k8s.io/client-go/tools/cache/reflector_data_consistency_detector.go create mode 100644 cli/vendor/k8s.io/client-go/tools/cache/synctrack/lazy.go create mode 100644 cli/vendor/k8s.io/client-go/tools/cache/synctrack/synctrack.go create mode 100644 cli/vendor/k8s.io/client-go/tools/internal/events/interfaces.go delete mode 100644 cli/vendor/k8s.io/client-go/tools/leaderelection/resourcelock/configmaplock.go delete mode 100644 cli/vendor/k8s.io/client-go/tools/leaderelection/resourcelock/endpointslock.go delete mode 100644 cli/vendor/k8s.io/component-base/config/types.go delete mode 100644 cli/vendor/k8s.io/component-base/config/v1alpha1/conversion.go delete mode 100644 cli/vendor/k8s.io/component-base/config/v1alpha1/defaults.go delete mode 100644 cli/vendor/k8s.io/component-base/config/v1alpha1/register.go delete mode 100644 cli/vendor/k8s.io/component-base/config/v1alpha1/types.go delete mode 100644 cli/vendor/k8s.io/component-base/config/v1alpha1/zz_generated.conversion.go delete mode 100644 cli/vendor/k8s.io/component-base/config/v1alpha1/zz_generated.deepcopy.go delete mode 100644 cli/vendor/k8s.io/component-base/config/zz_generated.deepcopy.go create mode 100644 cli/vendor/k8s.io/klog/v2/.golangci.yaml create mode 100644 cli/vendor/k8s.io/klog/v2/contextual_slog.go create mode 100644 cli/vendor/k8s.io/klog/v2/format.go create mode 100644 cli/vendor/k8s.io/klog/v2/internal/serialize/keyvalues_no_slog.go create mode 100644 cli/vendor/k8s.io/klog/v2/internal/serialize/keyvalues_slog.go create mode 100644 cli/vendor/k8s.io/klog/v2/internal/sloghandler/sloghandler_slog.go create mode 100644 cli/vendor/k8s.io/klog/v2/k8s_references_slog.go create mode 100644 cli/vendor/k8s.io/klog/v2/klogr_slog.go create mode 100644 cli/vendor/k8s.io/klog/v2/safeptr.go delete mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/builder3/util/util.go create mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/cached/cache.go delete mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/internal/handler/handler_cache.go create mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/internal/serialization.go delete mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/openapiconv/convert.go create mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/schemaconv/openapi.go create mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/schemaconv/proto_models.go delete mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/schemamutation/walker.go create mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/spec3/fuzz.go delete mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/spec3/security_requirement.go delete mode 100644 cli/vendor/k8s.io/kube-openapi/pkg/validation/spec/fuzz.go delete mode 100644 cli/vendor/k8s.io/utils/integer/integer.go create mode 100644 cli/vendor/k8s.io/utils/ptr/OWNERS create mode 100644 cli/vendor/k8s.io/utils/ptr/README.md create mode 100644 cli/vendor/k8s.io/utils/ptr/ptr.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/cache/delegating_by_gvk_cache.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/deleg_map.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/disabledeepcopy.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/informers_map.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/cache/internal/transformers.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/dynamicrestmapper.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/errors.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/lazyrestmapper.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/apiutil/restmapper.go rename cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/{client_cache.go => client_rest_resources.go} (82%) create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/fieldowner.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/client/split.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/config/config.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/config/controller.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/config/doc.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/register.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/types.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/config/v1alpha1/zz_generated.deepcopy.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/internal/objectutil/objectutil.go rename cli/vendor/sigs.k8s.io/controller-runtime/pkg/{source/internal/eventsource.go => internal/source/event_handler.go} (61%) create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/internal/source/kind.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/internal/syncs/syncs.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/manager/server.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/metrics/listener.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/metrics/server/doc.go create mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/metrics/server/server.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/runtime/inject/doc.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/runtime/inject/inject.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/scheme/scheme.go delete mode 100644 cli/vendor/sigs.k8s.io/controller-runtime/pkg/webhook/admission/inject.go create mode 100644 cli/vendor/sigs.k8s.io/structured-merge-diff/v4/merge/conflict.go create mode 100644 cli/vendor/sigs.k8s.io/structured-merge-diff/v4/merge/update.go create mode 100644 cli/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/compare.go delete mode 100644 cli/vendor/sigs.k8s.io/structured-merge-diff/v4/typed/union.go rename cli/vendor/{k8s.io/component-base => sigs.k8s.io/yaml/goyaml.v2}/LICENSE (99%) create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/LICENSE.libyaml rename cli/vendor/{k8s.io/component-base/config/doc.go => sigs.k8s.io/yaml/goyaml.v2/NOTICE} (79%) create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/OWNERS create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/README.md create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/apic.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/decode.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/emitterc.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/encode.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/parserc.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/readerc.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/resolve.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/scannerc.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/sorter.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/writerc.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/yaml.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/yamlh.go create mode 100644 cli/vendor/sigs.k8s.io/yaml/goyaml.v2/yamlprivateh.go diff --git a/cli/cmd/kctrl/kctrl.go b/cli/cmd/kctrl/kctrl.go index b2f5f37f7..d9d56ccec 100644 --- a/cli/cmd/kctrl/kctrl.go +++ b/cli/cmd/kctrl/kctrl.go @@ -6,10 +6,10 @@ package main import ( "os" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd" "github.com/cppforlife/cobrautil" uierrs "github.com/cppforlife/go-cli-ui/errors" "github.com/cppforlife/go-cli-ui/ui" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd" // Import to initialize client auth plugins. _ "k8s.io/client-go/plugin/pkg/client/auth" diff --git a/cli/go.mod b/cli/go.mod index 57452d53f..904781d0c 100644 --- a/cli/go.mod +++ b/cli/go.mod @@ -1,95 +1,91 @@ -module github.com/vmware-tanzu/carvel-kapp-controller/cli +module carvel.dev/kapp-controller/cli -go 1.21 +go 1.23.6 require ( + carvel.dev/kapp-controller v0.55.0 + carvel.dev/vendir v0.43.0 github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663 github.com/getkin/kin-openapi v0.81.0 - github.com/google/gnostic v0.5.7-v3refs - github.com/google/go-containerregistry v0.13.0 + github.com/google/gnostic-models v0.6.8 + github.com/google/go-containerregistry v0.20.2 github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57 github.com/mitchellh/go-wordwrap v1.0.1 github.com/otiai10/copy v1.2.0 - github.com/spf13/cobra v1.6.1 + github.com/spf13/cobra v1.8.1 github.com/spf13/pflag v1.0.5 - github.com/stretchr/testify v1.8.1 - github.com/vmware-tanzu/carvel-kapp-controller v0.46.0 - github.com/vmware-tanzu/carvel-vendir v0.33.1 + github.com/stretchr/testify v1.10.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 - k8s.io/api v0.26.1 - k8s.io/apiextensions-apiserver v0.26.1 - k8s.io/apimachinery v0.26.1 - k8s.io/client-go v0.26.1 - sigs.k8s.io/controller-runtime v0.14.5 - sigs.k8s.io/yaml v1.3.0 + k8s.io/api v0.30.1 + k8s.io/apiextensions-apiserver v0.30.1 + k8s.io/apimachinery v0.30.1 + k8s.io/client-go v0.30.1 + sigs.k8s.io/controller-runtime v0.18.5 + sigs.k8s.io/yaml v1.4.0 ) require ( github.com/beorn7/perks v1.0.1 // indirect - github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 // indirect - github.com/cespare/xxhash/v2 v2.1.2 // indirect - github.com/creack/pty v1.1.11 // indirect + github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect - github.com/emicklei/go-restful/v3 v3.10.1 // indirect - github.com/evanphx/json-patch v4.12.0+incompatible // indirect - github.com/evanphx/json-patch/v5 v5.6.0 // indirect - github.com/fsnotify/fsnotify v1.6.0 // indirect + github.com/emicklei/go-restful/v3 v3.11.0 // indirect + github.com/evanphx/json-patch v5.6.0+incompatible // indirect + github.com/evanphx/json-patch/v5 v5.9.0 // indirect + github.com/fsnotify/fsnotify v1.7.0 // indirect github.com/ghodss/yaml v1.0.0 // indirect - github.com/go-logr/logr v1.2.3 // indirect - github.com/go-logr/zapr v1.2.3 // indirect - github.com/go-openapi/jsonpointer v0.19.5 // indirect - github.com/go-openapi/jsonreference v0.20.0 // indirect - github.com/go-openapi/swag v0.19.15 // indirect + github.com/go-logr/logr v1.4.1 // indirect + github.com/go-logr/zapr v1.3.0 // indirect + github.com/go-openapi/jsonpointer v0.19.6 // indirect + github.com/go-openapi/jsonreference v0.20.2 // indirect + github.com/go-openapi/swag v0.22.3 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/google/uuid v1.2.0 // indirect - github.com/hashicorp/go-version v1.3.0 // indirect + github.com/google/uuid v1.3.0 // indirect + github.com/hashicorp/go-version v1.2.1 // indirect github.com/imdario/mergo v0.3.12 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 // indirect - github.com/mailru/easyjson v0.7.6 // indirect - github.com/mattn/go-colorable v0.1.12 // indirect - github.com/mattn/go-isatty v0.0.17 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect + github.com/mailru/easyjson v0.7.7 // indirect + github.com/mattn/go-colorable v0.1.13 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect github.com/opencontainers/go-digest v1.0.0 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.14.0 // indirect - github.com/prometheus/client_model v0.3.0 // indirect - github.com/prometheus/common v0.37.0 // indirect - github.com/prometheus/procfs v0.8.0 // indirect + github.com/prometheus/client_golang v1.18.0 // indirect + github.com/prometheus/client_model v0.5.0 // indirect + github.com/prometheus/common v0.45.0 // indirect + github.com/prometheus/procfs v0.12.0 // indirect github.com/vito/go-interact v1.0.1 // indirect - go.uber.org/atomic v1.7.0 // indirect - go.uber.org/multierr v1.6.0 // indirect - go.uber.org/zap v1.24.0 // indirect - golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/oauth2 v0.1.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/term v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.26.0 // indirect + golang.org/x/crypto v0.28.0 // indirect + golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect + golang.org/x/net v0.30.0 // indirect + golang.org/x/oauth2 v0.12.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/term v0.25.0 // indirect + golang.org/x/text v0.19.0 // indirect golang.org/x/time v0.3.0 // indirect - gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect + gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.33.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect - k8s.io/component-base v0.26.1 // indirect - k8s.io/klog/v2 v2.90.1 // indirect - k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect - k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect - sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect + k8s.io/klog/v2 v2.120.1 // indirect + k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect + k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect + sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect ) - -replace github.com/spf13/cobra => github.com/spf13/cobra v1.1.1 diff --git a/cli/go.sum b/cli/go.sum index a9c937619..6a27709cd 100644 --- a/cli/go.sum +++ b/cli/go.sum @@ -1,330 +1,149 @@ -cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= -cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= -cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= -cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= -cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= -cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= -cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= -cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= -cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= -cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= -cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= -cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= -cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= -cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= -cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= -cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= -cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= -cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= -cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= -cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= -cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= -cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= -cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= -cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= -cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= -cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= -cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= -cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= -cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= -cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= -cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= -dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= -github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= -github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= -github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= -github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= -github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA= -github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +carvel.dev/kapp-controller v0.55.0 h1:mWOXKZopiC0liK6lbLzZkInqGThOdiuIdjUKc0Qr1/c= +carvel.dev/kapp-controller v0.55.0/go.mod h1:I2nlMDPNSGgCE8GIbQWRtHT0lkVaDbEn5KGyK3xl1/s= +carvel.dev/vendir v0.43.0 h1:TEqLRQK4S/4rzyJEKB+ULrkS1BQSGUG5ZucBFCbZFxI= +carvel.dev/vendir v0.43.0/go.mod h1:pK7tOW8jwz2CdwL4VirKwu4G7FoOn5HQ38++T0I0E/I= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= -github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= -github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= -github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695 h1:naCDnpJeqQq5OHOYR6j01yIVVUk3WI5MuSHpDTy+M1A= -github.com/carvel-dev/semver/v4 v4.0.1-0.20230221220520-8090ce423695/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI= -github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= -github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= -github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= -github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= -github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= -github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= -github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= -github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4 h1:F4rZiMGZyC66j9VB7doVOE4tFHF1yNEihQlOuht4jmM= +github.com/carvel-dev/semver/v4 v4.0.1-0.20240402203627-beb83fbf25e4/go.mod h1:4cFTBLAr/U11ykiEEQMccu4uJ1i0GS+atJmeETHCFtI= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef h1:de10GNLe45JTMghl2qf9WH17H/BjGShK41X3vKAsPJA= github.com/cppforlife/cobrautil v0.0.0-20221130162803-acdfead391ef/go.mod h1:2w+qxVu2KSGW78Ex/XaIqfh/OvBgjEsmN53S4T8vEyA= github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835 h1:mYQweUIBD+TBRjIeQnJmXr0GSVMpI6O0takyb/aaOgo= github.com/cppforlife/color v1.9.1-0.20200716202919-6706ac40b835/go.mod h1:dYeVsKp1vvK8XjdTPR1gF+uk+9doxKeO3hqQTOCr7T4= github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663 h1://VPFw0OpzPIN9JFDftt5iValhLF1SEtLq5IbQiLOOY= github.com/cppforlife/go-cli-ui v0.0.0-20220520125801-e45d9169a663/go.mod h1:SYJ98tNNvI/6pSCbovi32IFglhBXDkc27I8nqq9nGK8= -github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= +github.com/creack/pty v1.1.9 h1:uDmaGzcdjhF4i/plgjmEsriH11Y0o7RKapEf/LDaM3w= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/creack/pty v1.1.11 h1:07n33Z8lZxZ2qwegKbObQohDhXDQxiMMz1NOUGYlesw= -github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= -github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= -github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= -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/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= -github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= -github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/evanphx/json-patch v0.5.2/go.mod h1:ZWS5hhDbVDyob71nXKNL0+PWn6ToqBHMikGIFbs31qQ= -github.com/evanphx/json-patch v4.12.0+incompatible h1:4onqiflcdA9EOZ4RxV643DvftH5pOlLGNtQ5lPWQu84= -github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= -github.com/evanphx/json-patch/v5 v5.6.0 h1:b91NhWfaz02IuVxO9faSllyAtNXHMPkC5J8sJCLunww= -github.com/evanphx/json-patch/v5 v5.6.0/go.mod h1:G79N1coSVB93tBe7j6PhzjmR3/2VvlbKOFpnXhI9Bw4= -github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/emicklei/go-restful/v3 v3.11.0 h1:rAQeMHw1c7zTmncogyy8VvRZwtkmkZ4FxERmMY4rD+g= +github.com/emicklei/go-restful/v3 v3.11.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc= +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 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg= +github.com/evanphx/json-patch/v5 v5.9.0/go.mod h1:VNkHZ/282BpEyt/tObQO8s5CMPmYYq14uClGH4abBuQ= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= -github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbSClcnxKAGw= +github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= +github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/getkin/kin-openapi v0.81.0 h1:avwkWFYWMZBvSMzewNA9ZdQiAPmLkRALYKdU6xC6uyw= github.com/getkin/kin-openapi v0.81.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= -github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= -github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= -github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= -github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= -github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -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-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY= +github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= +github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +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/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= -github.com/go-openapi/jsonreference v0.20.0 h1:MYlu0sBgChmCfJxxUKZ8g1cPWFOB37YSZqewK7OKeyA= -github.com/go-openapi/jsonreference v0.20.0/go.mod h1:Ag74Ico3lPc+zR+qjn4XBUmXymS4zJbYVCZmcgkasdo= +github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE= +github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs= +github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE= +github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k= github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= -github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM= -github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ= -github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= -github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g= +github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI= +github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= -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/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= -github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= -github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= -github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= -github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= -github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= -github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -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/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +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.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-containerregistry v0.13.0 h1:y1C7Z3e149OJbOPDBxLYR8ITPz8dTKqQwjErKVHJC8k= -github.com/google/go-containerregistry v0.13.0/go.mod h1:J9FQ+eSS4a1aC2GNZxvNpbWhgp0487v+cgiilB4FqDo= +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.2 h1:B1wPJ1SN/S7pB+ZAimcciVD+r+yV/l/DSArMxlbwseo= +github.com/google/go-containerregistry v0.20.2/go.mod h1:z38EKdKh4h7IP2gSfUUqEvalZBqs6AoLeWfUy34nQC8= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= -github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= -github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= -github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= -github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= -github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= -github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= -github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec= +github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= -github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= -github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= -github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= -github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= -github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= -github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= -github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= -github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= -github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= -github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= -github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= -github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= -github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.3.0 h1:McDWVJIU/y+u1BRV06dPaLfLCaT7fUTJLp5r04x7iNw= -github.com/hashicorp/go-version v1.3.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= -github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= -github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= -github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= -github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/hashicorp/go-version v1.2.1 h1:zEfKbn2+PDgroKdiOzqiE8rsmLqU2uwi5PB5pBJ3TkI= +github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= -github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= -github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= +github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY= github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= -github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= -github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= -github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= -github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= -github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57 h1:CwBRArr+BWBopnUJhDjJw86rPL/jGbEjfHWKzTasSqE= github.com/k14s/difflib v0.0.0-20201117154628-0c031775bf57/go.mod h1:B0xN2MiNBGWOWi9CcfAo9LBI8IU4J1utlbOIJCsmKr4= github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115 h1:wKSifC/VbCaQMqXYn6/gSFqle82OX4bE3KYALDU9FlU= github.com/k14s/semver/v4 v4.0.1-0.20210701191048-266d47ac6115/go.mod h1:mGrnmO5qnhJIaSiwMo05cvRL6Ww9ccYbTgNFcm6RHZQ= -github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= 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.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/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= github.com/kr/pty v1.1.8 h1:AkaSdXYQOWeaO3neb8EM634ahkXXe3jYbVh/F9lq+GI= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= 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.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA= -github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= -github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0= +github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= -github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= -github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= +github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= -github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/matttproud/golang_protobuf_extensions v1.0.2 h1:hAHbPm5IJGijwng3PWk09JkG9WeqChjprR5s9bBZ+OM= -github.com/matttproud/golang_protobuf_extensions v1.0.2/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= -github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= -github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 h1:jWpvCLoY8Z/e3VKvlsiIGKtc+UG6U5vzxaoagmhXfyg= +github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0/go.mod h1:QUyp042oQthUoa9bqDv0ER0wrtXnBruoNd7aNjkbP+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/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= -github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= -github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= -github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -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.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc= github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= -github.com/onsi/ginkgo/v2 v2.6.0 h1:9t9b9vRUbFq3C4qKFCGkVuq/fIHji802N1nrtkh1mNc= -github.com/onsi/ginkgo/v2 v2.6.0/go.mod h1:63DOGlLAH8+REH8jUGdL3YpCpu7JODesutUjdENfUAc= +github.com/onsi/ginkgo/v2 v2.17.1 h1:V++EzdbhI4ZV4ev0UTIj0PzhzOcReJFyJaLjtSF55M8= +github.com/onsi/ginkgo/v2 v2.17.1/go.mod h1:llBI3WDLL9Z6taip6f33H76YcWtJv+7R3HigUjbIBOs= 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.24.1 h1:KORJXNNTzJXzu4ScJWssJfJMnJ+2QJqhoQSRwNlze9E= -github.com/onsi/gomega v1.24.1/go.mod h1:3AOiACssS3/MajrniINInwbfOOtfZvplPzuRSmvt1jM= +github.com/onsi/gomega v1.32.0 h1:JRYU78fJ1LPxlckP6Txi/EYqJvjtMrDC04/MM5XRHPk= +github.com/onsi/gomega v1.32.0/go.mod h1:a4x4gW6Pz2yK1MAmvluYme5lvYTn61afQ2ETw/8n4Lg= github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U= github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k= @@ -334,479 +153,155 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc= github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= -github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= -github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= -github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= -github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= -github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= -github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= -github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= -github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= -github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= -github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= -github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= -github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= -github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= -github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= -github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= -github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= -github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= -github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= -github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= -github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/prometheus/client_golang v1.18.0 h1:HzFfmkOzH5Q8L8G+kSJKUx5dtG87sewO+FoDDqP5Tbk= +github.com/prometheus/client_golang v1.18.0/go.mod h1:T+GXkCk5wSJyOqMIzVgvvjFDlkOQntgjkJWKrN5txjA= +github.com/prometheus/client_model v0.5.0 h1:VQw1hfvPvk3Uv6Qf29VrPF32JB6rtbgI6cYPYQjL0Qw= +github.com/prometheus/client_model v0.5.0/go.mod h1:dTiFglRmd66nLR9Pv9f0mZi7B7fk5Pm3gvsjB5tr+kI= +github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lneoxM= +github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY= +github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo= +github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo= +github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= +github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= -github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= -github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= -github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= -github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= -github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= -github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= -github.com/spf13/cobra v1.1.1 h1:KfztREH0tPxJJ+geloSLaAkaPkr4ki2Er5quFV1TDo4= -github.com/spf13/cobra v1.1.1/go.mod h1:WnodtKOvamDL/PwE2M4iKs8aMDBZ5Q5klgD3qfVJQMI= -github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= -github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +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 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= -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.1.1/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/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= -github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= 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 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= -github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= -github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/vito/go-interact v1.0.1 h1:O8xi8c93bRUv2Tb/v6HdiuGc+WnWt+AQzF74MOOdlBs= github.com/vito/go-interact v1.0.1/go.mod h1:HrdHSJXD2yn1MhlTwSIMeFgQ5WftiIorszVGd3S/DAA= -github.com/vmware-tanzu/carvel-kapp-controller v0.46.0 h1:UfJwtD0CEn8+30FKiB0rs/P8sN4uRKBb3T+LBYKJ4YA= -github.com/vmware-tanzu/carvel-kapp-controller v0.46.0/go.mod h1:LJf4oaNfKW8kk6ddD8uRaayaUecGiqrz278oe4AEBSc= -github.com/vmware-tanzu/carvel-vendir v0.33.1 h1:5wzx0aRyEiorkWwrpGvACJOpFcgvmCeVqhIY9TPuLvk= -github.com/vmware-tanzu/carvel-vendir v0.33.1/go.mod h1:cZEa46rwzPt/ROdAuIgrCXLDJ+LqxNZaNxbz8MLtwWc= -github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= -github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= -go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= -go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= -go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= -go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= -go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw= -go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= -go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= -go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= -go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo= -go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= -go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= -go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= -go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= -go.uber.org/zap v1.19.0/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= -go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60= -go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg= -golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +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/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.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo= +go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= -golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= -golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= -golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= -golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= -golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= -golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= -golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= -golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= -golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= -golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= -golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= -golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= -golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= -golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= -golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= -golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= -golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= -golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= -golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/crypto v0.28.0 h1:GBDwsMXVQi34v5CCYUm2jkJvu4cbtru2U4TN2PSyQnw= +golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= +golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= -golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= -golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= -golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= -golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= -golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= -golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= -golang.org/x/oauth2 v0.1.0 h1:isLCZuhj4v+tYv7eskaN4v/TM+A1begWWgyVJDdl1+Y= -golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= +golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4= +golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU= +golang.org/x/oauth2 v0.12.0 h1:smVPGxink+n1ZI5pkQa8y6fZT0RW0MgCO5bFpepy4B4= +golang.org/x/oauth2 v0.12.0/go.mod h1:A74bZ3aGXgCY0qaIC9Ahg6Lglin4AMAco8cIv9baba4= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20220411215600-e5f449aeb171/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= -golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/term v0.25.0 h1:WtHI/ltw4NvSUig5KARz9h521QvRC8RmF/cuYqifU24= +golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= -golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM= +golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= -golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.26.0 h1:v/60pFQmzmT9ExmjDv2gGIfi3OqfKoEP6I5+umXlbnQ= +golang.org/x/tools v0.26.0/go.mod h1:TPVVj70c7JJ3WCazhD8OdXcZg/og+b9+tH/KxylGwH0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gomodules.xyz/jsonpatch/v2 v2.2.0 h1:4pT439QV83L+G9FkcCriY6EkpcK6r6bK+A5FBUMI7qY= -gomodules.xyz/jsonpatch/v2 v2.2.0/go.mod h1:WXp+iVDkoLQqPudfQ9GBlwB2eZ5DKOnjQZCYdOS8GPY= -google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= -google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= -google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= -google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= -google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= -google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= -google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= -google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= -google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= -google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= -google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.6/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.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= -google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= -google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= -google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= -google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= -google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= -google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= -google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= -google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= -google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= -google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= -google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= -google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= -google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= -google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= -google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= -google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= -google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= -google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= -google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= -google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI= google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= 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-20190902080502-41f04d3bba15/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/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= -gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= -gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= -honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -k8s.io/api v0.26.1 h1:f+SWYiPd/GsiWwVRz+NbFyCgvv75Pk9NK6dlkZgpCRQ= -k8s.io/api v0.26.1/go.mod h1:xd/GBNgR0f707+ATNyPmQ1oyKSgndzXij81FzWGsejg= -k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI= -k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM= -k8s.io/apimachinery v0.26.1 h1:8EZ/eGJL+hY/MYCNwhmDzVqq2lPl3N3Bo8rvweJwXUQ= -k8s.io/apimachinery v0.26.1/go.mod h1:tnPmbONNJ7ByJNz9+n9kMjNP8ON+1qoAIIC70lztu74= -k8s.io/client-go v0.26.1 h1:87CXzYJnAMGaa/IDDfRdhTzxk/wzGZ+/HUQpqgVSZXU= -k8s.io/client-go v0.26.1/go.mod h1:IWNSglg+rQ3OcvDkhY6+QLeasV4OYHDjdqeWkDQZwGE= -k8s.io/component-base v0.26.1 h1:4ahudpeQXHZL5kko+iDHqLj/FSGAEUnSVO0EBbgDd+4= -k8s.io/component-base v0.26.1/go.mod h1:VHrLR0b58oC035w6YQiBSbtsf0ThuSwXP+p5dD/kAWU= -k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw= -k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E= -k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280/go.mod h1:+Axhij7bCpeqhklhUTe3xmOn6bWxolyZEeyaFpjGtl4= -k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 h1:KTgPnR10d5zhztWptI952TNtt/4u5h3IzDXkdIMuo2Y= -k8s.io/utils v0.0.0-20221128185143-99ec85e7a448/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= -rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= -rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= -sigs.k8s.io/controller-runtime v0.14.5 h1:6xaWFqzT5KuAQ9ufgUaj1G/+C4Y1GRkhrxl+BJ9i+5s= -sigs.k8s.io/controller-runtime v0.14.5/go.mod h1:WqIdsAY6JBsjfc/CqO0CORmNtoCtE4S6qbPc9s68h+0= -sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 h1:iXTIw73aPyC+oRdyqqvVJuloN1p0AC/kzH07hu3NE+k= -sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE= -sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ihdVs8cGKBraizNC69E= -sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo= -sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8= +k8s.io/api v0.30.1 h1:kCm/6mADMdbAxmIh0LBjS54nQBE+U4KmbCfIkF5CpJY= +k8s.io/api v0.30.1/go.mod h1:ddbN2C0+0DIiPntan/bye3SW3PdwLa11/0yqwvuRrJM= +k8s.io/apiextensions-apiserver v0.30.1 h1:4fAJZ9985BmpJG6PkoxVRpXv9vmPUOVzl614xarePws= +k8s.io/apiextensions-apiserver v0.30.1/go.mod h1:R4GuSrlhgq43oRY9sF2IToFh7PVlF1JjfWdoG3pixk4= +k8s.io/apimachinery v0.30.1 h1:ZQStsEfo4n65yAdlGTfP/uSHMQSoYzU/oeEbkmF7P2U= +k8s.io/apimachinery v0.30.1/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= +k8s.io/client-go v0.30.1 h1:uC/Ir6A3R46wdkgCV3vbLyNOYyCJ8oZnjtJGKfytl/Q= +k8s.io/client-go v0.30.1/go.mod h1:wrAqLNs2trwiCH/wxxmT/x3hKVH9PuV0GGW0oDoHVqc= +k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= +k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag= +k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b h1:sgn3ZU783SCgtaSJjpcVVlRqd6GSnlTLKgpAAttJvpI= +k8s.io/utils v0.0.0-20230726121419-3b25d923346b/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +sigs.k8s.io/controller-runtime v0.18.5 h1:nTHio/W+Q4aBlQMgbnC5hZb4IjIidyrizMai9P6n4Rk= +sigs.k8s.io/controller-runtime v0.18.5/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= +sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= +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.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= +sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/cli/pkg/kctrl/cmd/app/app.go b/cli/pkg/kctrl/cmd/app/app.go index 72cf90741..1a31de1b5 100644 --- a/cli/pkg/kctrl/cmd/app/app.go +++ b/cli/pkg/kctrl/cmd/app/app.go @@ -6,11 +6,11 @@ package app import ( "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "github.com/cppforlife/color" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" corev1 "k8s.io/api/core/v1" ) diff --git a/cli/pkg/kctrl/cmd/app/app_tailer.go b/cli/pkg/kctrl/cmd/app/app_tailer.go index e8b683759..51718cbbd 100644 --- a/cli/pkg/kctrl/cmd/app/app_tailer.go +++ b/cli/pkg/kctrl/cmd/app/app_tailer.go @@ -8,12 +8,12 @@ import ( "fmt" "time" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + kcexternalversions "carvel.dev/kapp-controller/pkg/client/informers/externalversions" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - kcexternalversions "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" diff --git a/cli/pkg/kctrl/cmd/app/app_tailer_test.go b/cli/pkg/kctrl/cmd/app/app_tailer_test.go index c175cd081..d1a2acb22 100644 --- a/cli/pkg/kctrl/cmd/app/app_tailer_test.go +++ b/cli/pkg/kctrl/cmd/app/app_tailer_test.go @@ -5,12 +5,12 @@ package app import ( "testing" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + internalv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" "github.com/stretchr/testify/require" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - internalv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" discovery "k8s.io/client-go/discovery" ) diff --git a/cli/pkg/kctrl/cmd/app/delete.go b/cli/pkg/kctrl/cmd/app/delete.go index d5c2cb116..9d95083fe 100644 --- a/cli/pkg/kctrl/cmd/app/delete.go +++ b/cli/pkg/kctrl/cmd/app/delete.go @@ -9,11 +9,11 @@ import ( "fmt" "time" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cli/pkg/kctrl/cmd/app/get.go b/cli/pkg/kctrl/cmd/app/get.go index 41ae03784..9ba71ad91 100644 --- a/cli/pkg/kctrl/cmd/app/get.go +++ b/cli/pkg/kctrl/cmd/app/get.go @@ -7,13 +7,13 @@ import ( "context" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "github.com/cppforlife/color" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/app/init.go b/cli/pkg/kctrl/cmd/app/init.go index a3662f780..8345f1619 100644 --- a/cli/pkg/kctrl/cmd/app/init.go +++ b/cli/pkg/kctrl/cmd/app/init.go @@ -8,13 +8,13 @@ import ( "os" "path/filepath" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" + sources "carvel.dev/kapp-controller/cli/pkg/kctrl/local/sources" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" - sources "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/sources" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/cmd/app/kick.go b/cli/pkg/kctrl/cmd/app/kick.go index e21a23922..b5cfd0887 100644 --- a/cli/pkg/kctrl/cmd/app/kick.go +++ b/cli/pkg/kctrl/cmd/app/kick.go @@ -9,11 +9,11 @@ import ( "fmt" "time" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cli/pkg/kctrl/cmd/app/list.go b/cli/pkg/kctrl/cmd/app/list.go index d64785189..5d576db27 100644 --- a/cli/pkg/kctrl/cmd/app/list.go +++ b/cli/pkg/kctrl/cmd/app/list.go @@ -8,11 +8,11 @@ import ( "fmt" "time" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/app/pause.go b/cli/pkg/kctrl/cmd/app/pause.go index fb465b907..d1978184d 100644 --- a/cli/pkg/kctrl/cmd/app/pause.go +++ b/cli/pkg/kctrl/cmd/app/pause.go @@ -8,11 +8,11 @@ import ( "encoding/json" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cli/pkg/kctrl/cmd/app/release/app_spec_builder.go b/cli/pkg/kctrl/cmd/app/release/app_spec_builder.go index 3248d8339..980b70998 100644 --- a/cli/pkg/kctrl/cmd/app/release/app_spec_builder.go +++ b/cli/pkg/kctrl/cmd/app/release/app_spec_builder.go @@ -11,12 +11,12 @@ import ( "strings" "time" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - cmdlocal "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - fakekc "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + cmdlocal "carvel.dev/kapp-controller/cli/pkg/kctrl/local" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + fakekc "carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/app/release/imgpkg_runner.go b/cli/pkg/kctrl/cmd/app/release/imgpkg_runner.go index cd177fe99..01d1406ee 100644 --- a/cli/pkg/kctrl/cmd/app/release/imgpkg_runner.go +++ b/cli/pkg/kctrl/cmd/app/release/imgpkg_runner.go @@ -11,8 +11,8 @@ import ( "path/filepath" "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" dircopy "github.com/otiai10/copy" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" ) type ImgpkgRunner struct { diff --git a/cli/pkg/kctrl/cmd/app/release/release.go b/cli/pkg/kctrl/cmd/app/release/release.go index 012d0c066..65cf5337b 100644 --- a/cli/pkg/kctrl/cmd/app/release/release.go +++ b/cli/pkg/kctrl/cmd/app/release/release.go @@ -6,11 +6,11 @@ package release import ( "os" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" ) type ReleaseOptions struct { diff --git a/cli/pkg/kctrl/cmd/app/release/release_cmd_runner.go b/cli/pkg/kctrl/cmd/app/release/release_cmd_runner.go index 0db52b5a0..507341427 100644 --- a/cli/pkg/kctrl/cmd/app/release/release_cmd_runner.go +++ b/cli/pkg/kctrl/cmd/app/release/release_cmd_runner.go @@ -10,8 +10,8 @@ import ( "path/filepath" "strings" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/pkg/exec" ) type ReleaseCmdRunner struct { diff --git a/cli/pkg/kctrl/cmd/app/status.go b/cli/pkg/kctrl/cmd/app/status.go index fd3dd1a40..8b75fb900 100644 --- a/cli/pkg/kctrl/cmd/app/status.go +++ b/cli/pkg/kctrl/cmd/app/status.go @@ -6,10 +6,10 @@ package app import ( "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" ) type StatusOptions struct { diff --git a/cli/pkg/kctrl/cmd/core/deps_factory.go b/cli/pkg/kctrl/cmd/core/deps_factory.go index 4eb47274d..6f8c94acc 100644 --- a/cli/pkg/kctrl/cmd/core/deps_factory.go +++ b/cli/pkg/kctrl/cmd/core/deps_factory.go @@ -8,9 +8,9 @@ import ( "fmt" "sync" + pkgclient "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" - pkgclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/dynamic" "k8s.io/client-go/kubernetes" diff --git a/cli/pkg/kctrl/cmd/core/semver_value.go b/cli/pkg/kctrl/cmd/core/semver_value.go index 5cb0d2b58..269b66e92 100644 --- a/cli/pkg/kctrl/cmd/core/semver_value.go +++ b/cli/pkg/kctrl/cmd/core/semver_value.go @@ -4,8 +4,8 @@ package core import ( + versions "carvel.dev/vendir/pkg/vendir/versions" uitable "github.com/cppforlife/go-cli-ui/ui/table" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" ) type ValueSemver struct { diff --git a/cli/pkg/kctrl/cmd/dev/cmd.go b/cli/pkg/kctrl/cmd/dev/cmd.go index 959c2296d..1938cd23f 100644 --- a/cli/pkg/kctrl/cmd/dev/cmd.go +++ b/cli/pkg/kctrl/cmd/dev/cmd.go @@ -9,14 +9,14 @@ import ( "os" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + cmdlocal "carvel.dev/kapp-controller/cli/pkg/kctrl/local" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + fakekc "carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - cmdlocal "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - fakekc "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/cmd/kctrl.go b/cli/pkg/kctrl/cmd/kctrl.go index 306330ab5..6d17baa86 100644 --- a/cli/pkg/kctrl/cmd/kctrl.go +++ b/cli/pkg/kctrl/cmd/kctrl.go @@ -6,20 +6,20 @@ package cmd import ( "io" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/dev" + cmdpkg "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package" + pkgavail "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/available" + pkginst "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/installed" + pkgrel "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/release" + pkgrepo "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/repository" + pkgreporel "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/repository/release" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + "carvel.dev/kapp-controller/cli/pkg/kctrl/version" "github.com/cppforlife/cobrautil" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/dev" - cmdpkg "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package" - pkgavail "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/available" - pkginst "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/installed" - pkgrel "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/release" - pkgrepo "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/repository" - pkgreporel "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/repository/release" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/version" ) type KctrlOptions struct { diff --git a/cli/pkg/kctrl/cmd/logger_flags.go b/cli/pkg/kctrl/cmd/logger_flags.go index 6ca3e80c1..5332a7f2d 100644 --- a/cli/pkg/kctrl/cmd/logger_flags.go +++ b/cli/pkg/kctrl/cmd/logger_flags.go @@ -4,9 +4,9 @@ package cmd import ( + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" ) type LoggerFlags struct { diff --git a/cli/pkg/kctrl/cmd/package/available/cmd.go b/cli/pkg/kctrl/cmd/package/available/cmd.go index ffa98b2a2..a9478ee0b 100644 --- a/cli/pkg/kctrl/cmd/package/available/cmd.go +++ b/cli/pkg/kctrl/cmd/package/available/cmd.go @@ -4,8 +4,8 @@ package available import ( + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/cli/pkg/kctrl/cmd/package/available/get.go b/cli/pkg/kctrl/cmd/package/available/get.go index 4e07257e2..435887b88 100644 --- a/cli/pkg/kctrl/cmd/package/available/get.go +++ b/cli/pkg/kctrl/cmd/package/available/get.go @@ -9,14 +9,14 @@ import ( "os" "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + pkgclient "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/mitchellh/go-wordwrap" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - pkgclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" diff --git a/cli/pkg/kctrl/cmd/package/available/list.go b/cli/pkg/kctrl/cmd/package/available/list.go index a35c1e687..0448cb6cb 100644 --- a/cli/pkg/kctrl/cmd/package/available/list.go +++ b/cli/pkg/kctrl/cmd/package/available/list.go @@ -7,11 +7,11 @@ import ( "context" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" ) diff --git a/cli/pkg/kctrl/cmd/package/available/values_schema.go b/cli/pkg/kctrl/cmd/package/available/values_schema.go index c2360fe11..dfdb178df 100644 --- a/cli/pkg/kctrl/cmd/package/available/values_schema.go +++ b/cli/pkg/kctrl/cmd/package/available/values_schema.go @@ -8,8 +8,8 @@ import ( "fmt" "strings" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" "github.com/getkin/kin-openapi/openapi3" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" ) // DataValueProperty holds the details of each property under Carvel package.spec.valuesSchema.openAPIv3.properties. diff --git a/cli/pkg/kctrl/cmd/package/init.go b/cli/pkg/kctrl/cmd/package/init.go index 540534c2f..c40527400 100644 --- a/cli/pkg/kctrl/cmd/package/init.go +++ b/cli/pkg/kctrl/cmd/package/init.go @@ -9,18 +9,18 @@ import ( "reflect" "strings" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + cmdlocal "carvel.dev/kapp-controller/cli/pkg/kctrl/local" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" + sources "carvel.dev/kapp-controller/cli/pkg/kctrl/local/sources" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + vendirv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - cmdlocal "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" - sources "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/sources" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - vendirv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/validation" "sigs.k8s.io/yaml" diff --git a/cli/pkg/kctrl/cmd/package/installed/cmd.go b/cli/pkg/kctrl/cmd/package/installed/cmd.go index 8edcc6244..e13b6f9ee 100644 --- a/cli/pkg/kctrl/cmd/package/installed/cmd.go +++ b/cli/pkg/kctrl/cmd/package/installed/cmd.go @@ -4,8 +4,8 @@ package installed import ( + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/cli/pkg/kctrl/cmd/package/installed/create_or_update.go b/cli/pkg/kctrl/cmd/package/installed/create_or_update.go index d237a7be0..30121e2dc 100644 --- a/cli/pkg/kctrl/cmd/package/installed/create_or_update.go +++ b/cli/pkg/kctrl/cmd/package/installed/create_or_update.go @@ -10,17 +10,17 @@ import ( "strings" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + pkgclient "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - pkgclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/cli/pkg/kctrl/cmd/package/installed/delete.go b/cli/pkg/kctrl/cmd/package/installed/delete.go index 39928fcf5..b63d9aa5d 100644 --- a/cli/pkg/kctrl/cmd/package/installed/delete.go +++ b/cli/pkg/kctrl/cmd/package/installed/delete.go @@ -10,14 +10,14 @@ import ( "strings" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" "k8s.io/apimachinery/pkg/api/errors" diff --git a/cli/pkg/kctrl/cmd/package/installed/get.go b/cli/pkg/kctrl/cmd/package/installed/get.go index f7b8b499b..9804656f7 100644 --- a/cli/pkg/kctrl/cmd/package/installed/get.go +++ b/cli/pkg/kctrl/cmd/package/installed/get.go @@ -10,14 +10,14 @@ import ( "os" "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "github.com/cppforlife/color" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/package/installed/list.go b/cli/pkg/kctrl/cmd/package/installed/list.go index bf80ecacb..ba13db885 100644 --- a/cli/pkg/kctrl/cmd/package/installed/list.go +++ b/cli/pkg/kctrl/cmd/package/installed/list.go @@ -7,12 +7,12 @@ import ( "context" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/package/installed/package_install_dry_run.go b/cli/pkg/kctrl/cmd/package/installed/package_install_dry_run.go index 972544ff1..a7572b658 100644 --- a/cli/pkg/kctrl/cmd/package/installed/package_install_dry_run.go +++ b/cli/pkg/kctrl/cmd/package/installed/package_install_dry_run.go @@ -3,9 +3,9 @@ package installed import ( "fmt" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" corev1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go b/cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go index bf1e6a545..25503c81d 100644 --- a/cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go +++ b/cli/pkg/kctrl/cmd/package/installed/pause_or_kick.go @@ -10,13 +10,13 @@ import ( "strings" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cli/pkg/kctrl/cmd/package/installed/status.go b/cli/pkg/kctrl/cmd/package/installed/status.go index f4c0e7370..a5e94fc3b 100644 --- a/cli/pkg/kctrl/cmd/package/installed/status.go +++ b/cli/pkg/kctrl/cmd/package/installed/status.go @@ -7,11 +7,11 @@ import ( "context" "fmt" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/package/installed/ytt_overlays.go b/cli/pkg/kctrl/cmd/package/installed/ytt_overlays.go index fd1f24131..e0fa1bde4 100644 --- a/cli/pkg/kctrl/cmd/package/installed/ytt_overlays.go +++ b/cli/pkg/kctrl/cmd/package/installed/ytt_overlays.go @@ -9,7 +9,7 @@ import ( "path/filepath" "strings" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/package/pkg.go b/cli/pkg/kctrl/cmd/package/pkg.go index c1a7dd223..042079936 100644 --- a/cli/pkg/kctrl/cmd/package/pkg.go +++ b/cli/pkg/kctrl/cmd/package/pkg.go @@ -4,8 +4,8 @@ package pkg import ( + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/cli/pkg/kctrl/cmd/package/release/artefact_writer.go b/cli/pkg/kctrl/cmd/package/release/artefact_writer.go index 50d654b42..1f3946c8e 100644 --- a/cli/pkg/kctrl/cmd/package/release/artefact_writer.go +++ b/cli/pkg/kctrl/cmd/package/release/artefact_writer.go @@ -9,9 +9,9 @@ import ( "os" "path/filepath" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcdatav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcdatav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/cmd/package/release/release.go b/cli/pkg/kctrl/cmd/package/release/release.go index 5a0ee0ff3..a6e61124e 100644 --- a/cli/pkg/kctrl/cmd/package/release/release.go +++ b/cli/pkg/kctrl/cmd/package/release/release.go @@ -9,17 +9,17 @@ import ( "strings" "time" + cmdapprelease "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app/release" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + cmdpkg "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/release/schemagenerator" + "carvel.dev/kapp-controller/cli/pkg/kctrl/local" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcdatav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapprelease "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app/release" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - cmdpkg "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/release/schemagenerator" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcdatav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" ) type ReleaseOptions struct { diff --git a/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen.go b/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen.go index 4a89f6c8d..a8a57c0bc 100644 --- a/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen.go +++ b/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen.go @@ -11,7 +11,7 @@ import ( "strconv" "strings" - kcdatav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + kcdatav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" yaml2 "gopkg.in/yaml.v2" yaml3 "gopkg.in/yaml.v3" "k8s.io/apimachinery/pkg/runtime" @@ -312,4 +312,3 @@ func newAnyType() *MapItem { }, } } - diff --git a/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen_test.go b/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen_test.go index 58c7c4672..522f47efa 100644 --- a/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen_test.go +++ b/cli/pkg/kctrl/cmd/package/release/schemagenerator/helm_openapi_schema_gen_test.go @@ -10,8 +10,9 @@ import ( "testing" "github.com/stretchr/testify/require" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/release/schemagenerator" "sigs.k8s.io/yaml" + + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/release/schemagenerator" ) func cleanup() { diff --git a/cli/pkg/kctrl/cmd/package/release/schemagenerator/openapi_schema_gen.go b/cli/pkg/kctrl/cmd/package/release/schemagenerator/openapi_schema_gen.go index cad4eb9a2..665598e74 100644 --- a/cli/pkg/kctrl/cmd/package/release/schemagenerator/openapi_schema_gen.go +++ b/cli/pkg/kctrl/cmd/package/release/schemagenerator/openapi_schema_gen.go @@ -8,7 +8,7 @@ import ( "fmt" goexec "os/exec" - kcdatav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + kcdatav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/cmd/package/repository/add_or_update.go b/cli/pkg/kctrl/cmd/package/repository/add_or_update.go index 9d02359d1..1e94b906c 100644 --- a/cli/pkg/kctrl/cmd/package/repository/add_or_update.go +++ b/cli/pkg/kctrl/cmd/package/repository/add_or_update.go @@ -9,16 +9,16 @@ import ( "strings" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kappctrl "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcpkg "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" "github.com/google/go-containerregistry/pkg/name" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kappctrl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcpkg "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cli/pkg/kctrl/cmd/package/repository/cmd.go b/cli/pkg/kctrl/cmd/package/repository/cmd.go index 60c9a9249..320e8ac54 100644 --- a/cli/pkg/kctrl/cmd/package/repository/cmd.go +++ b/cli/pkg/kctrl/cmd/package/repository/cmd.go @@ -4,8 +4,8 @@ package repository import ( + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" ) func NewCmd() *cobra.Command { diff --git a/cli/pkg/kctrl/cmd/package/repository/delete.go b/cli/pkg/kctrl/cmd/package/repository/delete.go index 683306c0d..5b7f68ef2 100644 --- a/cli/pkg/kctrl/cmd/package/repository/delete.go +++ b/cli/pkg/kctrl/cmd/package/repository/delete.go @@ -8,13 +8,13 @@ import ( "fmt" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/cli/pkg/kctrl/cmd/package/repository/get.go b/cli/pkg/kctrl/cmd/package/repository/get.go index be67b00d6..69eeb0452 100644 --- a/cli/pkg/kctrl/cmd/package/repository/get.go +++ b/cli/pkg/kctrl/cmd/package/repository/get.go @@ -7,11 +7,11 @@ import ( "context" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/package/repository/kick.go b/cli/pkg/kctrl/cmd/package/repository/kick.go index 68cbb2a3f..c8c1e626e 100644 --- a/cli/pkg/kctrl/cmd/package/repository/kick.go +++ b/cli/pkg/kctrl/cmd/package/repository/kick.go @@ -9,12 +9,12 @@ import ( "fmt" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" diff --git a/cli/pkg/kctrl/cmd/package/repository/list.go b/cli/pkg/kctrl/cmd/package/repository/list.go index 4a00b0419..af40a9874 100644 --- a/cli/pkg/kctrl/cmd/package/repository/list.go +++ b/cli/pkg/kctrl/cmd/package/repository/list.go @@ -7,13 +7,13 @@ import ( "context" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/repository/release" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/repository/release" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/cmd/package/repository/release/artifact_writer.go b/cli/pkg/kctrl/cmd/package/repository/release/artifact_writer.go index bc0470be0..c4881a050 100644 --- a/cli/pkg/kctrl/cmd/package/repository/release/artifact_writer.go +++ b/cli/pkg/kctrl/cmd/package/repository/release/artifact_writer.go @@ -6,8 +6,8 @@ import ( "path/filepath" "time" - v1alpha12 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + v1alpha12 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" diff --git a/cli/pkg/kctrl/cmd/package/repository/release/imgpkg.go b/cli/pkg/kctrl/cmd/package/repository/release/imgpkg.go index 40db51325..f1525bb07 100644 --- a/cli/pkg/kctrl/cmd/package/repository/release/imgpkg.go +++ b/cli/pkg/kctrl/cmd/package/repository/release/imgpkg.go @@ -8,9 +8,9 @@ import ( "path/filepath" "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/pkg/exec" dircopy "github.com/otiai10/copy" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" ) type ImgpkgRunner struct { diff --git a/cli/pkg/kctrl/cmd/package/repository/release/release.go b/cli/pkg/kctrl/cmd/package/repository/release/release.go index ff74460d3..c8849d0dd 100644 --- a/cli/pkg/kctrl/cmd/package/repository/release/release.go +++ b/cli/pkg/kctrl/cmd/package/repository/release/release.go @@ -8,12 +8,12 @@ import ( "strings" "time" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/package/repository/release/build" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" + "carvel.dev/kapp-controller/pkg/exec" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/package/repository/release/build" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/cmd/package/repository/release/release_cmd_runner.go b/cli/pkg/kctrl/cmd/package/repository/release/release_cmd_runner.go index 4a0236213..f9e6b876e 100644 --- a/cli/pkg/kctrl/cmd/package/repository/release/release_cmd_runner.go +++ b/cli/pkg/kctrl/cmd/package/repository/release/release_cmd_runner.go @@ -9,8 +9,8 @@ import ( goexec "os/exec" "strings" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/pkg/exec" ) type ReleaseCmdRunner struct { diff --git a/cli/pkg/kctrl/cmd/package/repository/repo_tailer.go b/cli/pkg/kctrl/cmd/package/repository/repo_tailer.go index f2f468641..8f2ebd0e7 100644 --- a/cli/pkg/kctrl/cmd/package/repository/repo_tailer.go +++ b/cli/pkg/kctrl/cmd/package/repository/repo_tailer.go @@ -8,13 +8,13 @@ import ( "fmt" "time" + cmdapp "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/app" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcpkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + kcexternalversions "carvel.dev/kapp-controller/pkg/client/informers/externalversions" "github.com/cppforlife/go-cli-ui/ui" - cmdapp "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/app" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcpkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - kcexternalversions "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/tools/cache" diff --git a/cli/pkg/kctrl/cmd/ui_flags.go b/cli/pkg/kctrl/cmd/ui_flags.go index ebe5fefdd..0839e7025 100644 --- a/cli/pkg/kctrl/cmd/ui_flags.go +++ b/cli/pkg/kctrl/cmd/ui_flags.go @@ -7,7 +7,8 @@ import ( "github.com/cppforlife/go-cli-ui/ui" uitable "github.com/cppforlife/go-cli-ui/ui/table" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" + + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" ) type UIFlags struct { diff --git a/cli/pkg/kctrl/cmd/version.go b/cli/pkg/kctrl/cmd/version.go index 28fe3be23..f48cfe5c1 100644 --- a/cli/pkg/kctrl/cmd/version.go +++ b/cli/pkg/kctrl/cmd/version.go @@ -7,10 +7,10 @@ import ( "context" "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/version" "github.com/cppforlife/go-cli-ui/ui" "github.com/spf13/cobra" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/version" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/pkg/kctrl/local/buildconfigs/app_build.go b/cli/pkg/kctrl/local/buildconfigs/app_build.go index 0e15a9107..cc9ae5f60 100644 --- a/cli/pkg/kctrl/local/buildconfigs/app_build.go +++ b/cli/pkg/kctrl/local/buildconfigs/app_build.go @@ -6,8 +6,8 @@ package buildconfigs import ( "os" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/local/buildconfigs/pkg_build.go b/cli/pkg/kctrl/local/buildconfigs/pkg_build.go index e16bfcb45..cd4aa7dc1 100644 --- a/cli/pkg/kctrl/local/buildconfigs/pkg_build.go +++ b/cli/pkg/kctrl/local/buildconfigs/pkg_build.go @@ -6,8 +6,8 @@ package buildconfigs import ( "os" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/local/config.go b/cli/pkg/kctrl/local/config.go index 2c9778c32..bb50ac546 100644 --- a/cli/pkg/kctrl/local/config.go +++ b/cli/pkg/kctrl/local/config.go @@ -11,9 +11,9 @@ import ( "io/ioutil" "os" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - pkgv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - dpv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + dpv1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/runtime" kyaml "k8s.io/apimachinery/pkg/util/yaml" diff --git a/cli/pkg/kctrl/local/detailed_cmd_runner.go b/cli/pkg/kctrl/local/detailed_cmd_runner.go index 81eab6368..81e7c4539 100644 --- a/cli/pkg/kctrl/local/detailed_cmd_runner.go +++ b/cli/pkg/kctrl/local/detailed_cmd_runner.go @@ -9,7 +9,7 @@ import ( "os" goexec "os/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/exec" ) type DetailedCmdRunner struct { diff --git a/cli/pkg/kctrl/local/local_vendir.go b/cli/pkg/kctrl/local/local_vendir.go index b8c19f833..73d7a612f 100644 --- a/cli/pkg/kctrl/local/local_vendir.go +++ b/cli/pkg/kctrl/local/local_vendir.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" + vendirconf "carvel.dev/vendir/pkg/vendir/config" ) type localVendirConf struct { diff --git a/cli/pkg/kctrl/local/min_core_client.go b/cli/pkg/kctrl/local/min_core_client.go index 5b9881ccf..ecdc44e1b 100644 --- a/cli/pkg/kctrl/local/min_core_client.go +++ b/cli/pkg/kctrl/local/min_core_client.go @@ -6,15 +6,15 @@ package local import ( "context" - openapi_v2 "github.com/google/gnostic/openapiv2" + openapi_v2 "github.com/google/gnostic-models/openapiv2" authenticationv1api "k8s.io/api/authentication/v1" corev1api "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - types "k8s.io/apimachinery/pkg/types" - version "k8s.io/apimachinery/pkg/version" - watch "k8s.io/apimachinery/pkg/watch" + "k8s.io/apimachinery/pkg/types" + "k8s.io/apimachinery/pkg/version" + "k8s.io/apimachinery/pkg/watch" aplcorev1 "k8s.io/client-go/applyconfigurations/core/v1" - discovery "k8s.io/client-go/discovery" + "k8s.io/client-go/discovery" "k8s.io/client-go/kubernetes" admissionregistrationv1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1" admissionregistrationv1alpha1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1" @@ -35,6 +35,7 @@ import ( batchv1 "k8s.io/client-go/kubernetes/typed/batch/v1" batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1" certificatesv1 "k8s.io/client-go/kubernetes/typed/certificates/v1" + certificatesv1alpha1 "k8s.io/client-go/kubernetes/typed/certificates/v1alpha1" certificatesv1beta1 "k8s.io/client-go/kubernetes/typed/certificates/v1beta1" coordinationv1 "k8s.io/client-go/kubernetes/typed/coordination/v1" coordinationv1beta1 "k8s.io/client-go/kubernetes/typed/coordination/v1beta1" @@ -44,7 +45,7 @@ import ( eventsv1 "k8s.io/client-go/kubernetes/typed/events/v1" eventsv1beta1 "k8s.io/client-go/kubernetes/typed/events/v1beta1" extensionsv1beta1 "k8s.io/client-go/kubernetes/typed/extensions/v1beta1" - flowcontrolv1alpha1 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1alpha1" + flowcontrolv1 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1" flowcontrolv1beta1 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta1" flowcontrolv1beta2 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta2" flowcontrolv1beta3 "k8s.io/client-go/kubernetes/typed/flowcontrol/v1beta3" @@ -59,15 +60,16 @@ import ( rbacv1 "k8s.io/client-go/kubernetes/typed/rbac/v1" rbacv1alpha1 "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1" rbacv1beta1 "k8s.io/client-go/kubernetes/typed/rbac/v1beta1" - resourcev1alpha1 "k8s.io/client-go/kubernetes/typed/resource/v1alpha1" + resourcev1alpha2 "k8s.io/client-go/kubernetes/typed/resource/v1alpha2" schedulingv1 "k8s.io/client-go/kubernetes/typed/scheduling/v1" schedulingv1alpha1 "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1" schedulingv1beta1 "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1" storagev1 "k8s.io/client-go/kubernetes/typed/storage/v1" storagev1alpha1 "k8s.io/client-go/kubernetes/typed/storage/v1alpha1" storagev1beta1 "k8s.io/client-go/kubernetes/typed/storage/v1beta1" + storagemigrationv1alpha1 "k8s.io/client-go/kubernetes/typed/storagemigration/v1alpha1" "k8s.io/client-go/openapi" - rest "k8s.io/client-go/rest" + "k8s.io/client-go/rest" ) type localSecrets struct { @@ -162,6 +164,9 @@ func (*MinCoreClient) CertificatesV1() certificatesv1.CertificatesV1Interface { panic("Not implemented") return nil } +func (c *MinCoreClient) CertificatesV1alpha1() certificatesv1alpha1.CertificatesV1alpha1Interface { + panic("Not implemented") +} func (*MinCoreClient) CertificatesV1beta1() certificatesv1beta1.CertificatesV1beta1Interface { panic("Not implemented") return nil @@ -199,7 +204,7 @@ func (*MinCoreClient) ExtensionsV1beta1() extensionsv1beta1.ExtensionsV1beta1Int panic("Not implemented") return nil } -func (*MinCoreClient) FlowcontrolV1alpha1() flowcontrolv1alpha1.FlowcontrolV1alpha1Interface { +func (*MinCoreClient) FlowcontrolV1() flowcontrolv1.FlowcontrolV1Interface { panic("Not implemented") return nil } @@ -247,7 +252,7 @@ func (*MinCoreClient) RbacV1alpha1() rbacv1alpha1.RbacV1alpha1Interface { panic("Not implemented") return nil } -func (*MinCoreClient) ResourceV1alpha1() resourcev1alpha1.ResourceV1alpha1Interface { +func (*MinCoreClient) ResourceV1alpha2() resourcev1alpha2.ResourceV1alpha2Interface { panic("Not implemented") } func (*MinCoreClient) SchedulingV1alpha1() schedulingv1alpha1.SchedulingV1alpha1Interface { @@ -271,6 +276,9 @@ func (*MinCoreClient) StorageV1alpha1() storagev1alpha1.StorageV1alpha1Interface panic("Not implemented") return nil } +func (c *MinCoreClient) StoragemigrationV1alpha1() storagemigrationv1alpha1.StoragemigrationV1alpha1Interface { + panic("Not implemented") +} type MinCoreV1Client struct { client corev1.CoreV1Interface diff --git a/cli/pkg/kctrl/local/reconciler.go b/cli/pkg/kctrl/local/reconciler.go index 63c1728dc..204d8f982 100644 --- a/cli/pkg/kctrl/local/reconciler.go +++ b/cli/pkg/kctrl/local/reconciler.go @@ -10,21 +10,19 @@ import ( "os" "time" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/logger" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - fakedpkg "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/app" - fakekc "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/componentinfo" - kcconfig "github.com/vmware-tanzu/carvel-kapp-controller/pkg/config" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/metrics" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + fakedpkg "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake" + "carvel.dev/kapp-controller/pkg/app" + fakekc "carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake" + "carvel.dev/kapp-controller/pkg/componentinfo" + kcconfig "carvel.dev/kapp-controller/pkg/config" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/kubeconfig" + "carvel.dev/kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/metrics" + "carvel.dev/kapp-controller/pkg/packageinstall" + "carvel.dev/kapp-controller/pkg/reftracker" + vendirconf "carvel.dev/vendir/pkg/vendir/config" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -32,6 +30,9 @@ import ( logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/reconcile" + + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + "carvel.dev/kapp-controller/cli/pkg/kctrl/logger" ) type Reconciler struct { @@ -210,8 +211,9 @@ func (o *Reconciler) newReconcilers( kcConfig := &kcconfig.Config{} - appMetrics := metrics.NewAppMetrics() - appMetrics.RegisterAllMetrics() + appMetrics := metrics.NewMetrics() + appMetrics.ReconcileCountMetrics.RegisterAllMetrics() + appMetrics.ReconcileTimeMetrics.RegisterAllMetrics() refTracker := reftracker.NewAppRefTracker() updateStatusTracker := reftracker.NewAppUpdateStatus() @@ -241,7 +243,7 @@ func (o *Reconciler) newReconcilers( // TODO do not need this in the constructor of Reconciler (*packageinstall.PackageInstallVersionHandler)(nil), runLog.WithName("pkgi"), - compInfo, + compInfo, kcConfig, appMetrics, ) return appReconciler, pkgiReconciler diff --git a/cli/pkg/kctrl/local/sources/git.go b/cli/pkg/kctrl/local/sources/git.go index 29be4330f..48a60e3cc 100644 --- a/cli/pkg/kctrl/local/sources/git.go +++ b/cli/pkg/kctrl/local/sources/git.go @@ -6,9 +6,9 @@ package sources import ( "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + vendirconf "carvel.dev/vendir/pkg/vendir/config" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) type SourceConfiguration interface { diff --git a/cli/pkg/kctrl/local/sources/github_release.go b/cli/pkg/kctrl/local/sources/github_release.go index f00d77f0d..55a485123 100644 --- a/cli/pkg/kctrl/local/sources/github_release.go +++ b/cli/pkg/kctrl/local/sources/github_release.go @@ -6,9 +6,9 @@ package sources import ( "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + vendirconf "carvel.dev/vendir/pkg/vendir/config" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) const ( diff --git a/cli/pkg/kctrl/local/sources/helm.go b/cli/pkg/kctrl/local/sources/helm.go index 9efb664fd..2419205f9 100644 --- a/cli/pkg/kctrl/local/sources/helm.go +++ b/cli/pkg/kctrl/local/sources/helm.go @@ -6,9 +6,9 @@ package sources import ( "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + vendirconf "carvel.dev/vendir/pkg/vendir/config" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" ) type HelmSource struct { diff --git a/cli/pkg/kctrl/local/sources/source.go b/cli/pkg/kctrl/local/sources/source.go index 2da3f47be..f6b57055f 100644 --- a/cli/pkg/kctrl/local/sources/source.go +++ b/cli/pkg/kctrl/local/sources/source.go @@ -6,9 +6,9 @@ package sources import ( "fmt" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" ) const ( diff --git a/cli/pkg/kctrl/local/sources/template.go b/cli/pkg/kctrl/local/sources/template.go index 3b4963fe4..7d2b5bde2 100644 --- a/cli/pkg/kctrl/local/sources/template.go +++ b/cli/pkg/kctrl/local/sources/template.go @@ -8,10 +8,10 @@ import ( "path/filepath" "strings" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" + buildconfigs "carvel.dev/kapp-controller/cli/pkg/kctrl/local/buildconfigs" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "github.com/cppforlife/go-cli-ui/ui" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" - buildconfigs "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/local/buildconfigs" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" ) type Template struct { diff --git a/cli/pkg/kctrl/local/sources/vendir_config.go b/cli/pkg/kctrl/local/sources/vendir_config.go index 728de7698..802217e29 100644 --- a/cli/pkg/kctrl/local/sources/vendir_config.go +++ b/cli/pkg/kctrl/local/sources/vendir_config.go @@ -3,7 +3,7 @@ package sources import ( "os" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" + vendirconf "carvel.dev/vendir/pkg/vendir/config" "sigs.k8s.io/yaml" ) diff --git a/cli/pkg/kctrl/local/sources/vendir_runner.go b/cli/pkg/kctrl/local/sources/vendir_runner.go index e78621311..7072f608f 100644 --- a/cli/pkg/kctrl/local/sources/vendir_runner.go +++ b/cli/pkg/kctrl/local/sources/vendir_runner.go @@ -7,7 +7,7 @@ import ( "os" goexec "os/exec" - cmdcore "github.com/vmware-tanzu/carvel-kapp-controller/cli/pkg/kctrl/cmd/core" + cmdcore "carvel.dev/kapp-controller/cli/pkg/kctrl/cmd/core" ) type VendirRunner struct { diff --git a/cli/test/e2e/package_repository_test.go b/cli/test/e2e/package_repository_test.go index 15d79c7f5..66ee08a10 100644 --- a/cli/test/e2e/package_repository_test.go +++ b/cli/test/e2e/package_repository_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" + kcpkg "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" uitest "github.com/cppforlife/go-cli-ui/ui/test" "github.com/stretchr/testify/require" - kcpkg "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" ) func TestPackageRepository(t *testing.T) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/LICENSE b/cli/vendor/carvel.dev/kapp-controller/LICENSE similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/LICENSE rename to cli/vendor/carvel.dev/kapp-controller/LICENSE diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/NOTICE b/cli/vendor/carvel.dev/kapp-controller/NOTICE similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/NOTICE rename to cli/vendor/carvel.dev/kapp-controller/NOTICE diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/install/install.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/install/install.go similarity index 61% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/install/install.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/install/install.go index 27e80a298..2666dcb94 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/install/install.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/install/install.go @@ -1,10 +1,10 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package install import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/doc.go similarity index 80% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/doc.go index 6df96138a..d4201da8e 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/register.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/register.go index d79fd4e71..30e1f63b9 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/types.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/types.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/types.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/types.go index 8497fd9f1..eb8312658 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/types.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/types.go @@ -1,10 +1,10 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/zz_generated.deepcopy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1/zz_generated.deepcopy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1/zz_generated.deepcopy.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/install/install.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/install/install.go similarity index 61% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/install/install.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/install/install.go index 872c5272d..e8320e2a1 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/install/install.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/install/install.go @@ -1,10 +1,10 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package install import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go similarity index 79% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go index fdbe08d07..ad1e884ca 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go index cfac16db2..e01d0e3c5 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.pb.go @@ -1,16 +1,17 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto +// source: carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto package v1alpha1 import ( fmt "fmt" + v1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" + io "io" proto "github.com/gogo/protobuf/proto" github_com_gogo_protobuf_sortkeys "github.com/gogo/protobuf/sortkeys" - v1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" k8s_io_api_core_v1 "k8s.io/api/core/v1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -34,7 +35,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *AppCluster) Reset() { *m = AppCluster{} } func (*AppCluster) ProtoMessage() {} func (*AppCluster) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{0} + return fileDescriptor_577b51e9dffdab9a, []int{0} } func (m *AppCluster) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -62,7 +63,7 @@ var xxx_messageInfo_AppCluster proto.InternalMessageInfo func (m *AppClusterKubeconfigSecretRef) Reset() { *m = AppClusterKubeconfigSecretRef{} } func (*AppClusterKubeconfigSecretRef) ProtoMessage() {} func (*AppClusterKubeconfigSecretRef) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{1} + return fileDescriptor_577b51e9dffdab9a, []int{1} } func (m *AppClusterKubeconfigSecretRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,7 +91,7 @@ var xxx_messageInfo_AppClusterKubeconfigSecretRef proto.InternalMessageInfo func (m *AppDeploy) Reset() { *m = AppDeploy{} } func (*AppDeploy) ProtoMessage() {} func (*AppDeploy) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{2} + return fileDescriptor_577b51e9dffdab9a, []int{2} } func (m *AppDeploy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,7 +119,7 @@ var xxx_messageInfo_AppDeploy proto.InternalMessageInfo func (m *AppDeployKapp) Reset() { *m = AppDeployKapp{} } func (*AppDeployKapp) ProtoMessage() {} func (*AppDeployKapp) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{3} + return fileDescriptor_577b51e9dffdab9a, []int{3} } func (m *AppDeployKapp) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -146,7 +147,7 @@ var xxx_messageInfo_AppDeployKapp proto.InternalMessageInfo func (m *AppDeployKappDelete) Reset() { *m = AppDeployKappDelete{} } func (*AppDeployKappDelete) ProtoMessage() {} func (*AppDeployKappDelete) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{4} + return fileDescriptor_577b51e9dffdab9a, []int{4} } func (m *AppDeployKappDelete) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -174,7 +175,7 @@ var xxx_messageInfo_AppDeployKappDelete proto.InternalMessageInfo func (m *AppDeployKappInspect) Reset() { *m = AppDeployKappInspect{} } func (*AppDeployKappInspect) ProtoMessage() {} func (*AppDeployKappInspect) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{5} + return fileDescriptor_577b51e9dffdab9a, []int{5} } func (m *AppDeployKappInspect) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -202,7 +203,7 @@ var xxx_messageInfo_AppDeployKappInspect proto.InternalMessageInfo func (m *AppFetch) Reset() { *m = AppFetch{} } func (*AppFetch) ProtoMessage() {} func (*AppFetch) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{6} + return fileDescriptor_577b51e9dffdab9a, []int{6} } func (m *AppFetch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -230,7 +231,7 @@ var xxx_messageInfo_AppFetch proto.InternalMessageInfo func (m *AppFetchGit) Reset() { *m = AppFetchGit{} } func (*AppFetchGit) ProtoMessage() {} func (*AppFetchGit) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{7} + return fileDescriptor_577b51e9dffdab9a, []int{7} } func (m *AppFetchGit) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -258,7 +259,7 @@ var xxx_messageInfo_AppFetchGit proto.InternalMessageInfo func (m *AppFetchHTTP) Reset() { *m = AppFetchHTTP{} } func (*AppFetchHTTP) ProtoMessage() {} func (*AppFetchHTTP) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{8} + return fileDescriptor_577b51e9dffdab9a, []int{8} } func (m *AppFetchHTTP) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -286,7 +287,7 @@ var xxx_messageInfo_AppFetchHTTP proto.InternalMessageInfo func (m *AppFetchHelmChart) Reset() { *m = AppFetchHelmChart{} } func (*AppFetchHelmChart) ProtoMessage() {} func (*AppFetchHelmChart) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{9} + return fileDescriptor_577b51e9dffdab9a, []int{9} } func (m *AppFetchHelmChart) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -314,7 +315,7 @@ var xxx_messageInfo_AppFetchHelmChart proto.InternalMessageInfo func (m *AppFetchHelmChartRepo) Reset() { *m = AppFetchHelmChartRepo{} } func (*AppFetchHelmChartRepo) ProtoMessage() {} func (*AppFetchHelmChartRepo) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{10} + return fileDescriptor_577b51e9dffdab9a, []int{10} } func (m *AppFetchHelmChartRepo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -342,7 +343,7 @@ var xxx_messageInfo_AppFetchHelmChartRepo proto.InternalMessageInfo func (m *AppFetchImage) Reset() { *m = AppFetchImage{} } func (*AppFetchImage) ProtoMessage() {} func (*AppFetchImage) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{11} + return fileDescriptor_577b51e9dffdab9a, []int{11} } func (m *AppFetchImage) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -370,7 +371,7 @@ var xxx_messageInfo_AppFetchImage proto.InternalMessageInfo func (m *AppFetchImgpkgBundle) Reset() { *m = AppFetchImgpkgBundle{} } func (*AppFetchImgpkgBundle) ProtoMessage() {} func (*AppFetchImgpkgBundle) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{12} + return fileDescriptor_577b51e9dffdab9a, []int{12} } func (m *AppFetchImgpkgBundle) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -398,7 +399,7 @@ var xxx_messageInfo_AppFetchImgpkgBundle proto.InternalMessageInfo func (m *AppFetchInline) Reset() { *m = AppFetchInline{} } func (*AppFetchInline) ProtoMessage() {} func (*AppFetchInline) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{13} + return fileDescriptor_577b51e9dffdab9a, []int{13} } func (m *AppFetchInline) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -426,7 +427,7 @@ var xxx_messageInfo_AppFetchInline proto.InternalMessageInfo func (m *AppFetchInlineSource) Reset() { *m = AppFetchInlineSource{} } func (*AppFetchInlineSource) ProtoMessage() {} func (*AppFetchInlineSource) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{14} + return fileDescriptor_577b51e9dffdab9a, []int{14} } func (m *AppFetchInlineSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -454,7 +455,7 @@ var xxx_messageInfo_AppFetchInlineSource proto.InternalMessageInfo func (m *AppFetchInlineSourceRef) Reset() { *m = AppFetchInlineSourceRef{} } func (*AppFetchInlineSourceRef) ProtoMessage() {} func (*AppFetchInlineSourceRef) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{15} + return fileDescriptor_577b51e9dffdab9a, []int{15} } func (m *AppFetchInlineSourceRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -482,7 +483,7 @@ var xxx_messageInfo_AppFetchInlineSourceRef proto.InternalMessageInfo func (m *AppFetchLocalRef) Reset() { *m = AppFetchLocalRef{} } func (*AppFetchLocalRef) ProtoMessage() {} func (*AppFetchLocalRef) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{16} + return fileDescriptor_577b51e9dffdab9a, []int{16} } func (m *AppFetchLocalRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -510,7 +511,7 @@ var xxx_messageInfo_AppFetchLocalRef proto.InternalMessageInfo func (m *AppSpec) Reset() { *m = AppSpec{} } func (*AppSpec) ProtoMessage() {} func (*AppSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{17} + return fileDescriptor_577b51e9dffdab9a, []int{17} } func (m *AppSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -538,7 +539,7 @@ var xxx_messageInfo_AppSpec proto.InternalMessageInfo func (m *AppTemplate) Reset() { *m = AppTemplate{} } func (*AppTemplate) ProtoMessage() {} func (*AppTemplate) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{18} + return fileDescriptor_577b51e9dffdab9a, []int{18} } func (m *AppTemplate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -566,7 +567,7 @@ var xxx_messageInfo_AppTemplate proto.InternalMessageInfo func (m *AppTemplateCue) Reset() { *m = AppTemplateCue{} } func (*AppTemplateCue) ProtoMessage() {} func (*AppTemplateCue) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{19} + return fileDescriptor_577b51e9dffdab9a, []int{19} } func (m *AppTemplateCue) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -594,7 +595,7 @@ var xxx_messageInfo_AppTemplateCue proto.InternalMessageInfo func (m *AppTemplateHelmTemplate) Reset() { *m = AppTemplateHelmTemplate{} } func (*AppTemplateHelmTemplate) ProtoMessage() {} func (*AppTemplateHelmTemplate) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{20} + return fileDescriptor_577b51e9dffdab9a, []int{20} } func (m *AppTemplateHelmTemplate) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -622,7 +623,7 @@ var xxx_messageInfo_AppTemplateHelmTemplate proto.InternalMessageInfo func (m *AppTemplateJsonnet) Reset() { *m = AppTemplateJsonnet{} } func (*AppTemplateJsonnet) ProtoMessage() {} func (*AppTemplateJsonnet) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{21} + return fileDescriptor_577b51e9dffdab9a, []int{21} } func (m *AppTemplateJsonnet) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -650,7 +651,7 @@ var xxx_messageInfo_AppTemplateJsonnet proto.InternalMessageInfo func (m *AppTemplateKbld) Reset() { *m = AppTemplateKbld{} } func (*AppTemplateKbld) ProtoMessage() {} func (*AppTemplateKbld) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{22} + return fileDescriptor_577b51e9dffdab9a, []int{22} } func (m *AppTemplateKbld) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -678,7 +679,7 @@ var xxx_messageInfo_AppTemplateKbld proto.InternalMessageInfo func (m *AppTemplateKustomize) Reset() { *m = AppTemplateKustomize{} } func (*AppTemplateKustomize) ProtoMessage() {} func (*AppTemplateKustomize) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{23} + return fileDescriptor_577b51e9dffdab9a, []int{23} } func (m *AppTemplateKustomize) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -706,7 +707,7 @@ var xxx_messageInfo_AppTemplateKustomize proto.InternalMessageInfo func (m *AppTemplateSops) Reset() { *m = AppTemplateSops{} } func (*AppTemplateSops) ProtoMessage() {} func (*AppTemplateSops) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{24} + return fileDescriptor_577b51e9dffdab9a, []int{24} } func (m *AppTemplateSops) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -734,7 +735,7 @@ var xxx_messageInfo_AppTemplateSops proto.InternalMessageInfo func (m *AppTemplateSopsAge) Reset() { *m = AppTemplateSopsAge{} } func (*AppTemplateSopsAge) ProtoMessage() {} func (*AppTemplateSopsAge) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{25} + return fileDescriptor_577b51e9dffdab9a, []int{25} } func (m *AppTemplateSopsAge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -762,7 +763,7 @@ var xxx_messageInfo_AppTemplateSopsAge proto.InternalMessageInfo func (m *AppTemplateSopsPGP) Reset() { *m = AppTemplateSopsPGP{} } func (*AppTemplateSopsPGP) ProtoMessage() {} func (*AppTemplateSopsPGP) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{26} + return fileDescriptor_577b51e9dffdab9a, []int{26} } func (m *AppTemplateSopsPGP) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -790,7 +791,7 @@ var xxx_messageInfo_AppTemplateSopsPGP proto.InternalMessageInfo func (m *AppTemplateSopsPrivateKeysSecretRef) Reset() { *m = AppTemplateSopsPrivateKeysSecretRef{} } func (*AppTemplateSopsPrivateKeysSecretRef) ProtoMessage() {} func (*AppTemplateSopsPrivateKeysSecretRef) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{27} + return fileDescriptor_577b51e9dffdab9a, []int{27} } func (m *AppTemplateSopsPrivateKeysSecretRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -818,7 +819,7 @@ var xxx_messageInfo_AppTemplateSopsPrivateKeysSecretRef proto.InternalMessageInf func (m *AppTemplateValuesDownwardAPI) Reset() { *m = AppTemplateValuesDownwardAPI{} } func (*AppTemplateValuesDownwardAPI) ProtoMessage() {} func (*AppTemplateValuesDownwardAPI) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{28} + return fileDescriptor_577b51e9dffdab9a, []int{28} } func (m *AppTemplateValuesDownwardAPI) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -846,7 +847,7 @@ var xxx_messageInfo_AppTemplateValuesDownwardAPI proto.InternalMessageInfo func (m *AppTemplateValuesDownwardAPIItem) Reset() { *m = AppTemplateValuesDownwardAPIItem{} } func (*AppTemplateValuesDownwardAPIItem) ProtoMessage() {} func (*AppTemplateValuesDownwardAPIItem) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{29} + return fileDescriptor_577b51e9dffdab9a, []int{29} } func (m *AppTemplateValuesDownwardAPIItem) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -874,7 +875,7 @@ var xxx_messageInfo_AppTemplateValuesDownwardAPIItem proto.InternalMessageInfo func (m *AppTemplateValuesSource) Reset() { *m = AppTemplateValuesSource{} } func (*AppTemplateValuesSource) ProtoMessage() {} func (*AppTemplateValuesSource) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{30} + return fileDescriptor_577b51e9dffdab9a, []int{30} } func (m *AppTemplateValuesSource) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -902,7 +903,7 @@ var xxx_messageInfo_AppTemplateValuesSource proto.InternalMessageInfo func (m *AppTemplateValuesSourceRef) Reset() { *m = AppTemplateValuesSourceRef{} } func (*AppTemplateValuesSourceRef) ProtoMessage() {} func (*AppTemplateValuesSourceRef) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{31} + return fileDescriptor_577b51e9dffdab9a, []int{31} } func (m *AppTemplateValuesSourceRef) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -930,7 +931,7 @@ var xxx_messageInfo_AppTemplateValuesSourceRef proto.InternalMessageInfo func (m *AppTemplateYtt) Reset() { *m = AppTemplateYtt{} } func (*AppTemplateYtt) ProtoMessage() {} func (*AppTemplateYtt) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{32} + return fileDescriptor_577b51e9dffdab9a, []int{32} } func (m *AppTemplateYtt) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -958,7 +959,7 @@ var xxx_messageInfo_AppTemplateYtt proto.InternalMessageInfo func (m *Condition) Reset() { *m = Condition{} } func (*Condition) ProtoMessage() {} func (*Condition) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{33} + return fileDescriptor_577b51e9dffdab9a, []int{33} } func (m *Condition) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -986,7 +987,7 @@ var xxx_messageInfo_Condition proto.InternalMessageInfo func (m *GenericStatus) Reset() { *m = GenericStatus{} } func (*GenericStatus) ProtoMessage() {} func (*GenericStatus) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{34} + return fileDescriptor_577b51e9dffdab9a, []int{34} } func (m *GenericStatus) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1014,7 +1015,7 @@ var xxx_messageInfo_GenericStatus proto.InternalMessageInfo func (m *KubernetesAPIs) Reset() { *m = KubernetesAPIs{} } func (*KubernetesAPIs) ProtoMessage() {} func (*KubernetesAPIs) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{35} + return fileDescriptor_577b51e9dffdab9a, []int{35} } func (m *KubernetesAPIs) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1042,7 +1043,7 @@ var xxx_messageInfo_KubernetesAPIs proto.InternalMessageInfo func (m *Version) Reset() { *m = Version{} } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_e972ccf085273df7, []int{36} + return fileDescriptor_577b51e9dffdab9a, []int{36} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1068,211 +1069,212 @@ func (m *Version) XXX_DiscardUnknown() { var xxx_messageInfo_Version proto.InternalMessageInfo func init() { - proto.RegisterType((*AppCluster)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppCluster") - proto.RegisterType((*AppClusterKubeconfigSecretRef)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppClusterKubeconfigSecretRef") - proto.RegisterType((*AppDeploy)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeploy") - proto.RegisterType((*AppDeployKapp)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeployKapp") - proto.RegisterType((*AppDeployKappDelete)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeployKappDelete") - proto.RegisterType((*AppDeployKappInspect)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeployKappInspect") - proto.RegisterType((*AppFetch)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetch") - proto.RegisterType((*AppFetchGit)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchGit") - proto.RegisterType((*AppFetchHTTP)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchHTTP") - proto.RegisterType((*AppFetchHelmChart)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchHelmChart") - proto.RegisterType((*AppFetchHelmChartRepo)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchHelmChartRepo") - proto.RegisterType((*AppFetchImage)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchImage") - proto.RegisterType((*AppFetchImgpkgBundle)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchImgpkgBundle") - proto.RegisterType((*AppFetchInline)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInline") - proto.RegisterMapType((map[string]string)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInline.PathsEntry") - proto.RegisterType((*AppFetchInlineSource)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInlineSource") - proto.RegisterType((*AppFetchInlineSourceRef)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInlineSourceRef") - proto.RegisterType((*AppFetchLocalRef)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchLocalRef") - proto.RegisterType((*AppSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppSpec") - proto.RegisterType((*AppTemplate)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplate") - proto.RegisterType((*AppTemplateCue)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateCue") - proto.RegisterType((*AppTemplateHelmTemplate)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateHelmTemplate") - proto.RegisterType((*AppTemplateJsonnet)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateJsonnet") - proto.RegisterType((*AppTemplateKbld)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateKbld") - proto.RegisterType((*AppTemplateKustomize)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateKustomize") - proto.RegisterType((*AppTemplateSops)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSops") - proto.RegisterType((*AppTemplateSopsAge)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSopsAge") - proto.RegisterType((*AppTemplateSopsPGP)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSopsPGP") - proto.RegisterType((*AppTemplateSopsPrivateKeysSecretRef)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSopsPrivateKeysSecretRef") - proto.RegisterType((*AppTemplateValuesDownwardAPI)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesDownwardAPI") - proto.RegisterType((*AppTemplateValuesDownwardAPIItem)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesDownwardAPIItem") - proto.RegisterType((*AppTemplateValuesSource)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesSource") - proto.RegisterType((*AppTemplateValuesSourceRef)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesSourceRef") - proto.RegisterType((*AppTemplateYtt)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateYtt") - proto.RegisterType((*Condition)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.Condition") - proto.RegisterType((*GenericStatus)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.GenericStatus") - proto.RegisterType((*KubernetesAPIs)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.KubernetesAPIs") - proto.RegisterType((*Version)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.Version") + proto.RegisterType((*AppCluster)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppCluster") + proto.RegisterType((*AppClusterKubeconfigSecretRef)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppClusterKubeconfigSecretRef") + proto.RegisterType((*AppDeploy)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeploy") + proto.RegisterType((*AppDeployKapp)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeployKapp") + proto.RegisterType((*AppDeployKappDelete)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeployKappDelete") + proto.RegisterType((*AppDeployKappInspect)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppDeployKappInspect") + proto.RegisterType((*AppFetch)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetch") + proto.RegisterType((*AppFetchGit)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchGit") + proto.RegisterType((*AppFetchHTTP)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchHTTP") + proto.RegisterType((*AppFetchHelmChart)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchHelmChart") + proto.RegisterType((*AppFetchHelmChartRepo)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchHelmChartRepo") + proto.RegisterType((*AppFetchImage)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchImage") + proto.RegisterType((*AppFetchImgpkgBundle)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchImgpkgBundle") + proto.RegisterType((*AppFetchInline)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInline") + proto.RegisterMapType((map[string]string)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInline.PathsEntry") + proto.RegisterType((*AppFetchInlineSource)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInlineSource") + proto.RegisterType((*AppFetchInlineSourceRef)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchInlineSourceRef") + proto.RegisterType((*AppFetchLocalRef)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppFetchLocalRef") + proto.RegisterType((*AppSpec)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppSpec") + proto.RegisterType((*AppTemplate)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplate") + proto.RegisterType((*AppTemplateCue)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateCue") + proto.RegisterType((*AppTemplateHelmTemplate)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateHelmTemplate") + proto.RegisterType((*AppTemplateJsonnet)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateJsonnet") + proto.RegisterType((*AppTemplateKbld)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateKbld") + proto.RegisterType((*AppTemplateKustomize)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateKustomize") + proto.RegisterType((*AppTemplateSops)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSops") + proto.RegisterType((*AppTemplateSopsAge)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSopsAge") + proto.RegisterType((*AppTemplateSopsPGP)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSopsPGP") + proto.RegisterType((*AppTemplateSopsPrivateKeysSecretRef)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateSopsPrivateKeysSecretRef") + proto.RegisterType((*AppTemplateValuesDownwardAPI)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesDownwardAPI") + proto.RegisterType((*AppTemplateValuesDownwardAPIItem)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesDownwardAPIItem") + proto.RegisterType((*AppTemplateValuesSource)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesSource") + proto.RegisterType((*AppTemplateValuesSourceRef)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateValuesSourceRef") + proto.RegisterType((*AppTemplateYtt)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppTemplateYtt") + proto.RegisterType((*Condition)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.Condition") + proto.RegisterType((*GenericStatus)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.GenericStatus") + proto.RegisterType((*KubernetesAPIs)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.KubernetesAPIs") + proto.RegisterType((*Version)(nil), "carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.Version") } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto", fileDescriptor_e972ccf085273df7) -} - -var fileDescriptor_e972ccf085273df7 = []byte{ - // 2535 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x5a, 0x4d, 0x6c, 0x1b, 0xc7, - 0x15, 0xf6, 0x8a, 0x94, 0x28, 0x3e, 0xfd, 0x58, 0x1e, 0x5b, 0x0d, 0xab, 0x36, 0xa2, 0xb1, 0x01, - 0x82, 0x18, 0xad, 0x49, 0x58, 0x70, 0x5c, 0xa3, 0x05, 0x0a, 0x88, 0x92, 0x25, 0xcb, 0xb2, 0x6c, - 0x62, 0x28, 0xbb, 0x71, 0xda, 0xc4, 0x59, 0x2e, 0x47, 0xe4, 0x96, 0xcb, 0xdd, 0xed, 0xee, 0x2c, - 0x2d, 0x06, 0x29, 0xd0, 0x3f, 0x14, 0x69, 0x53, 0xa0, 0x46, 0x81, 0xa4, 0x45, 0x0b, 0xf4, 0x52, - 0xa0, 0xf7, 0xa2, 0x3d, 0xe6, 0x52, 0xf4, 0x62, 0xa0, 0x28, 0x10, 0x20, 0x97, 0xf4, 0xc2, 0xd6, - 0xec, 0xa9, 0xc7, 0x22, 0xb7, 0x9c, 0x8a, 0xf9, 0xd9, 0x3f, 0x92, 0x32, 0x55, 0x40, 0xeb, 0x38, - 0x40, 0x6f, 0xbb, 0x6f, 0xde, 0xbc, 0xef, 0xcd, 0x9b, 0x99, 0xf7, 0xb7, 0x0b, 0xf7, 0x9a, 0x06, - 0x6d, 0xf9, 0xf5, 0x92, 0x6e, 0x77, 0xca, 0xdd, 0xce, 0x03, 0xcd, 0x25, 0x17, 0xa9, 0x66, 0xbd, - 0xe9, 0x97, 0x75, 0xcd, 0xed, 0x12, 0xf3, 0x62, 0x5b, 0x73, 0x9c, 0x8b, 0xba, 0x6d, 0x51, 0xd7, - 0x36, 0x4d, 0xe2, 0x96, 0x9d, 0x76, 0xb3, 0xac, 0x39, 0x86, 0x57, 0x66, 0x03, 0x3a, 0x75, 0xcd, - 0x72, 0xf7, 0x92, 0x66, 0x3a, 0x2d, 0xed, 0x52, 0xb9, 0x49, 0x2c, 0xe2, 0x6a, 0x94, 0x34, 0x4a, - 0x8e, 0x6b, 0x53, 0x1b, 0xed, 0x44, 0xa2, 0x4b, 0x42, 0xf4, 0x7d, 0x2e, 0xba, 0x24, 0x44, 0xdf, - 0x67, 0x12, 0xee, 0x47, 0xa2, 0x4b, 0x4e, 0xbb, 0x59, 0x62, 0xa2, 0x4b, 0x81, 0xe8, 0x52, 0x20, - 0x7a, 0xe5, 0x62, 0x4c, 0xcb, 0xa6, 0xdd, 0xb4, 0xcb, 0x1c, 0xa1, 0xee, 0x1f, 0xf0, 0x37, 0xfe, - 0xc2, 0x9f, 0x04, 0xf2, 0x0a, 0x9e, 0xb0, 0xa8, 0x2e, 0xb1, 0x1a, 0x86, 0x58, 0x8b, 0x7c, 0xec, - 0x12, 0xd7, 0x33, 0x6c, 0xcb, 0x3b, 0x72, 0x35, 0x2b, 0x97, 0xdb, 0x57, 0xbd, 0x92, 0x61, 0xb3, - 0xc5, 0x77, 0x34, 0xbd, 0x65, 0x58, 0xc4, 0xed, 0x45, 0xd6, 0xe8, 0x10, 0xaa, 0x95, 0xbb, 0xa3, - 0xb3, 0xca, 0x47, 0xcd, 0x72, 0x7d, 0x8b, 0x1a, 0x1d, 0x32, 0x32, 0xe1, 0xca, 0xa4, 0x09, 0x9e, - 0xde, 0x22, 0x1d, 0x6d, 0x78, 0x9e, 0xfa, 0xb1, 0x02, 0xb0, 0xee, 0x38, 0x1b, 0xa6, 0xef, 0x51, - 0xe2, 0xa2, 0x32, 0xe4, 0x2d, 0xad, 0x43, 0x3c, 0x47, 0xd3, 0x49, 0x41, 0x39, 0xaf, 0xbc, 0x94, - 0xaf, 0x9c, 0x79, 0xd4, 0x2f, 0x9e, 0x1a, 0xf4, 0x8b, 0xf9, 0x5b, 0xc1, 0x00, 0x8e, 0x78, 0xd0, - 0x1f, 0x15, 0x38, 0xdb, 0xf6, 0xeb, 0x44, 0xb7, 0xad, 0x03, 0xa3, 0x59, 0x23, 0xba, 0x4b, 0x28, - 0x26, 0x07, 0x85, 0xa9, 0xf3, 0xca, 0x4b, 0x73, 0x6b, 0xad, 0xd2, 0x89, 0xed, 0x65, 0x29, 0xd2, - 0x72, 0x77, 0x14, 0xaf, 0xf2, 0xdc, 0xa0, 0x5f, 0x3c, 0x3b, 0x66, 0x00, 0x8f, 0xd3, 0x4e, 0x7d, - 0x03, 0x9e, 0x7f, 0xa2, 0x38, 0x74, 0x1e, 0xb2, 0x6c, 0x8d, 0xd2, 0x04, 0xf3, 0xd2, 0x04, 0x59, - 0x66, 0x02, 0xcc, 0x47, 0xd0, 0xf3, 0x90, 0x69, 0x93, 0x1e, 0x5f, 0x67, 0xbe, 0x32, 0x27, 0x19, - 0x32, 0xbb, 0xa4, 0x87, 0x19, 0x5d, 0xfd, 0xa1, 0x02, 0xf9, 0x75, 0xc7, 0xd9, 0x24, 0x8e, 0x69, - 0xf7, 0x50, 0x17, 0xb2, 0x6c, 0x41, 0x5c, 0xdc, 0xdc, 0xda, 0x2b, 0x27, 0x6b, 0x15, 0x81, 0xb1, - 0xab, 0x39, 0x4e, 0x65, 0x96, 0x29, 0xc9, 0x9e, 0x30, 0xc7, 0x53, 0xdf, 0xcb, 0xc0, 0x42, 0x82, - 0x03, 0xbd, 0x08, 0x33, 0x86, 0x45, 0xed, 0x5b, 0x9e, 0x5c, 0xda, 0xa2, 0xd4, 0x7c, 0x66, 0x87, - 0x53, 0xb1, 0x1c, 0x45, 0x45, 0x98, 0xee, 0x68, 0xce, 0x2d, 0xaf, 0x30, 0x75, 0x3e, 0xf3, 0x52, - 0xbe, 0x92, 0x1f, 0xf4, 0x8b, 0xd3, 0x7b, 0x8c, 0x80, 0x05, 0x1d, 0x95, 0x00, 0x5c, 0xed, 0xc1, - 0x6d, 0x87, 0xb2, 0xe3, 0x5f, 0xc8, 0x70, 0xae, 0xc5, 0x41, 0xbf, 0x08, 0x38, 0xa4, 0xe2, 0x18, - 0x07, 0xfa, 0xb1, 0x02, 0x39, 0xc3, 0xf2, 0x1c, 0xa2, 0xd3, 0x42, 0x96, 0x9b, 0xe1, 0x7e, 0x5a, - 0x66, 0xd8, 0x11, 0x30, 0x95, 0xb9, 0x41, 0xbf, 0x98, 0x93, 0x2f, 0x38, 0x00, 0x47, 0x3f, 0x50, - 0x60, 0xa6, 0x41, 0x4c, 0x42, 0x49, 0x61, 0x9a, 0xeb, 0xf1, 0x7a, 0x5a, 0x7a, 0x6c, 0x72, 0x94, - 0x0a, 0x30, 0xf3, 0x8a, 0x67, 0x2c, 0x91, 0xd5, 0x6b, 0x70, 0x76, 0x0c, 0xeb, 0x90, 0x51, 0x95, - 0x49, 0x46, 0x55, 0xb7, 0xe0, 0xdc, 0xb8, 0x95, 0xff, 0xcf, 0x72, 0xfe, 0x34, 0x03, 0xb3, 0xeb, - 0x8e, 0xb3, 0x45, 0xa8, 0xde, 0x42, 0xdf, 0x65, 0x47, 0xc4, 0x34, 0x2c, 0x22, 0x8f, 0xeb, 0xbd, - 0x93, 0xb5, 0x0f, 0x07, 0xd9, 0xe1, 0x00, 0xc2, 0x34, 0xe2, 0x19, 0x4b, 0x50, 0xd4, 0x83, 0x69, - 0xa3, 0xa3, 0x35, 0x89, 0x74, 0x21, 0xaf, 0xa4, 0x81, 0xce, 0xe4, 0x8b, 0x33, 0xcd, 0x1f, 0xb1, - 0x40, 0x44, 0x3e, 0x64, 0x5b, 0x94, 0x3a, 0x85, 0x0c, 0x47, 0xfe, 0x46, 0x0a, 0xc8, 0xd7, 0xf7, - 0xf7, 0xab, 0xe2, 0x96, 0xb2, 0x27, 0xcc, 0xe1, 0xd0, 0x77, 0x20, 0xd3, 0x34, 0x82, 0x5b, 0x71, - 0x37, 0x05, 0xd4, 0x6d, 0x83, 0x56, 0x72, 0xcc, 0x3d, 0x6d, 0x1b, 0x14, 0x33, 0x2c, 0xf4, 0x13, - 0x05, 0xf2, 0x2d, 0x62, 0x76, 0x36, 0x5a, 0x9a, 0x4b, 0xe5, 0x3d, 0xf8, 0x56, 0x1a, 0xeb, 0x0d, - 0x30, 0x2a, 0x0b, 0x2c, 0x84, 0x84, 0xaf, 0x38, 0x42, 0x47, 0xef, 0x2a, 0x30, 0x6f, 0x74, 0x9a, - 0x4e, 0xbb, 0x59, 0xf1, 0xad, 0x86, 0x49, 0x0a, 0x33, 0x69, 0xb8, 0x07, 0xb9, 0xf1, 0x11, 0x4c, - 0x65, 0x69, 0xd0, 0x2f, 0xce, 0xc7, 0x29, 0x38, 0xa1, 0x06, 0x8b, 0x01, 0x8e, 0x46, 0x5b, 0x85, - 0x5c, 0x32, 0x06, 0x54, 0x35, 0xda, 0xc2, 0x7c, 0x44, 0xfd, 0x6b, 0x06, 0xe6, 0x62, 0x36, 0x66, - 0x31, 0xc1, 0x77, 0x4d, 0xe9, 0x59, 0xc3, 0x98, 0x70, 0x07, 0xdf, 0xc4, 0x8c, 0xce, 0x86, 0x5d, - 0x19, 0x1a, 0x63, 0xc3, 0x2c, 0x48, 0x31, 0x3a, 0xfa, 0xa9, 0x02, 0xf3, 0x2e, 0x39, 0xa8, 0x11, - 0x93, 0xe8, 0xec, 0x5a, 0x4a, 0x3b, 0xec, 0x4f, 0xb2, 0x83, 0x48, 0x45, 0xf8, 0xf2, 0xe5, 0x63, - 0x90, 0x95, 0x44, 0x06, 0xb8, 0x2b, 0x28, 0xa1, 0x6c, 0xb1, 0x78, 0x1c, 0x43, 0xc3, 0x09, 0x6c, - 0xf4, 0xb6, 0x02, 0x79, 0x2f, 0x8c, 0xe6, 0xe2, 0x42, 0x7c, 0x33, 0x85, 0x1d, 0xb9, 0x69, 0xeb, - 0x9a, 0xc9, 0x02, 0x38, 0x3f, 0x1f, 0x51, 0xd8, 0x8e, 0xc0, 0xd1, 0x05, 0xc8, 0x79, 0x7e, 0x9d, - 0x99, 0x9d, 0x5f, 0x91, 0x7c, 0xe5, 0xb4, 0x34, 0x5d, 0xae, 0x26, 0xc8, 0x38, 0x18, 0x47, 0x5f, - 0x83, 0x05, 0xf3, 0xc0, 0xab, 0xb5, 0x0d, 0xa7, 0xd6, 0xf1, 0x1b, 0x4d, 0xe1, 0xe1, 0x67, 0x2b, - 0xcb, 0x72, 0xc2, 0xc2, 0xcd, 0xad, 0x5a, 0x34, 0x88, 0x93, 0xbc, 0xea, 0x3b, 0x53, 0x30, 0x1f, - 0xbf, 0xa7, 0x93, 0xb6, 0xf3, 0x45, 0x98, 0xf1, 0x5a, 0xda, 0xda, 0xcb, 0x57, 0xe4, 0x8e, 0x86, - 0xa1, 0xb4, 0x76, 0x7d, 0x7d, 0xed, 0xe5, 0x2b, 0x58, 0x8e, 0x7e, 0x36, 0x4d, 0xc9, 0x12, 0xc3, - 0x33, 0x23, 0xb7, 0xf8, 0x18, 0x79, 0xd1, 0x05, 0xc8, 0xc9, 0xe3, 0x27, 0xcd, 0x12, 0x42, 0xc8, - 0x33, 0x88, 0x83, 0x71, 0xf4, 0x50, 0x01, 0x70, 0x89, 0x63, 0x7b, 0x06, 0xb5, 0xdd, 0x9e, 0xb4, - 0xcc, 0x1b, 0x69, 0x7a, 0x21, 0x4c, 0x1c, 0x5b, 0x06, 0xc2, 0x10, 0x17, 0xc7, 0x74, 0x50, 0xff, - 0xac, 0xc0, 0xf2, 0xd8, 0x59, 0x93, 0x0e, 0x43, 0x72, 0x93, 0xa7, 0x3e, 0xc5, 0x4d, 0x56, 0xff, - 0x33, 0xc5, 0x93, 0xbe, 0x28, 0xd2, 0x4d, 0xd2, 0x9d, 0x39, 0x1e, 0xaa, 0x35, 0x23, 0xc7, 0x93, - 0x4d, 0xdb, 0xf1, 0xec, 0xc7, 0xd0, 0x70, 0x02, 0xfb, 0x19, 0x32, 0x64, 0xfc, 0xb6, 0x64, 0x26, - 0xdc, 0x96, 0x0f, 0xa7, 0x78, 0x26, 0x36, 0x12, 0x64, 0xd0, 0x0b, 0x41, 0x36, 0x23, 0x8c, 0xbf, - 0x20, 0x25, 0x24, 0xf3, 0x8e, 0x91, 0x0d, 0xc8, 0xfc, 0x7f, 0x03, 0xd8, 0x49, 0xfe, 0xf7, 0x14, - 0x2c, 0x26, 0x33, 0x46, 0x96, 0xb8, 0x4c, 0xb3, 0xd8, 0x2b, 0xb2, 0xda, 0xb9, 0xb5, 0x46, 0x6a, - 0xc9, 0x69, 0x89, 0x6d, 0xac, 0x77, 0xcd, 0xa2, 0x6e, 0x2f, 0xda, 0x36, 0x4e, 0xc3, 0x42, 0x03, - 0xe6, 0xbf, 0xf2, 0xfc, 0x69, 0xcb, 0xb5, 0x3b, 0xbc, 0x50, 0x4a, 0x29, 0x6b, 0xe1, 0xfa, 0xd4, - 0x6c, 0xdf, 0xd5, 0x49, 0x54, 0x8e, 0x57, 0x03, 0x64, 0x1c, 0x29, 0xb1, 0x72, 0x15, 0x20, 0x52, - 0x1b, 0x2d, 0x89, 0x1a, 0x95, 0x1f, 0x3d, 0x5e, 0x96, 0xa2, 0x73, 0x30, 0xdd, 0xd5, 0x4c, 0x5f, - 0x24, 0xd7, 0x79, 0x2c, 0x5e, 0xbe, 0x3a, 0x75, 0x55, 0x51, 0xff, 0x12, 0x3f, 0xc1, 0x31, 0x40, - 0xf4, 0xf3, 0xc4, 0x79, 0x10, 0x25, 0x41, 0x3d, 0xe5, 0x55, 0x3e, 0xf9, 0x5e, 0xfe, 0x4a, 0x81, - 0x79, 0x51, 0xb0, 0xef, 0x69, 0x4e, 0x74, 0x48, 0x9f, 0x86, 0x52, 0xfc, 0xf2, 0x6c, 0xc4, 0xb0, - 0x71, 0x42, 0x13, 0xf5, 0x10, 0x9e, 0x3b, 0x62, 0x2a, 0xcb, 0x4d, 0x1a, 0x86, 0x4b, 0x74, 0x16, - 0x67, 0xb8, 0x4f, 0x11, 0xe1, 0x31, 0xcc, 0x4d, 0x36, 0xe3, 0x83, 0x38, 0xc9, 0x3b, 0x39, 0xee, - 0xaa, 0x97, 0x61, 0x69, 0xf8, 0x66, 0x1d, 0x63, 0xd6, 0xfb, 0x33, 0x90, 0x5b, 0x77, 0x9c, 0x9a, - 0x43, 0x74, 0x74, 0x03, 0x90, 0x47, 0xdc, 0xae, 0xa1, 0x93, 0x75, 0x5d, 0xb7, 0x7d, 0x8b, 0xde, - 0x8a, 0xe6, 0xae, 0xc8, 0xb9, 0xa8, 0x36, 0xc2, 0x81, 0xc7, 0xcc, 0x42, 0x6f, 0x41, 0x4e, 0x17, - 0xdd, 0x15, 0xb9, 0x39, 0x77, 0x52, 0xe9, 0x04, 0x89, 0x12, 0x5f, 0xbe, 0xe0, 0x00, 0x12, 0x1d, - 0xc2, 0xf4, 0x01, 0x33, 0x04, 0x6f, 0x4b, 0xcc, 0xad, 0xd5, 0x52, 0x38, 0x18, 0x91, 0x4b, 0xe0, - 0xaf, 0x58, 0x00, 0xa2, 0x1f, 0x29, 0x30, 0x4b, 0x49, 0xc7, 0x31, 0x35, 0x4a, 0x0a, 0x59, 0x8e, - 0x7e, 0xc2, 0x05, 0xdd, 0xbe, 0x94, 0x5e, 0x59, 0x92, 0x0a, 0xcc, 0x06, 0x14, 0x1c, 0x22, 0xa3, - 0xb7, 0x60, 0xa6, 0xc1, 0x9b, 0x02, 0x85, 0x69, 0xae, 0xc3, 0x7e, 0x1a, 0x2d, 0x8e, 0x28, 0xe1, - 0x15, 0xef, 0x58, 0x62, 0xb2, 0xc4, 0xd8, 0xd1, 0x7c, 0x8f, 0x34, 0x78, 0x05, 0x33, 0x1b, 0xf1, - 0x55, 0x39, 0x15, 0xcb, 0x51, 0xf4, 0x65, 0x98, 0xd5, 0x35, 0x4b, 0x27, 0x26, 0x69, 0xf0, 0x22, - 0x6b, 0x36, 0x5a, 0xd3, 0x86, 0xa4, 0xe3, 0x90, 0x03, 0xbd, 0x0e, 0xe0, 0xf5, 0x2c, 0xbd, 0x4a, - 0x5c, 0xc3, 0x6e, 0x14, 0x66, 0xf9, 0xa9, 0x2a, 0x95, 0x44, 0xdb, 0xb3, 0x14, 0x6f, 0x7b, 0x46, - 0xca, 0x77, 0x08, 0xd5, 0x4a, 0xdd, 0x4b, 0xa5, 0x4d, 0xdf, 0xd5, 0x78, 0xec, 0xe3, 0xa9, 0x5f, - 0x2d, 0x94, 0x82, 0x63, 0x12, 0xd1, 0x1a, 0x80, 0x65, 0xdb, 0xb2, 0x13, 0x53, 0xc8, 0x73, 0x7d, - 0x90, 0xd4, 0x07, 0x6e, 0x85, 0x23, 0x38, 0xc6, 0xa5, 0xfe, 0x36, 0xc7, 0x0b, 0xc0, 0x60, 0x07, - 0x10, 0x85, 0x4c, 0x8f, 0xd2, 0x74, 0xfa, 0x26, 0x01, 0xc8, 0x3d, 0x2a, 0x8b, 0xf9, 0x7b, 0x94, - 0x62, 0x06, 0x87, 0x0e, 0x21, 0xdb, 0xae, 0x9b, 0x0d, 0x79, 0xd3, 0x5e, 0x4d, 0x07, 0x76, 0xb7, - 0x6e, 0x36, 0x64, 0x7f, 0xb1, 0x6e, 0x36, 0x30, 0x47, 0xe4, 0x9e, 0x98, 0x15, 0xf2, 0x01, 0x93, - 0x4c, 0x5c, 0xea, 0xe9, 0xa8, 0x70, 0x3d, 0x86, 0x24, 0x3c, 0x71, 0x9c, 0x82, 0x13, 0x9a, 0xa0, - 0x9f, 0x29, 0x90, 0x6f, 0xfb, 0x1e, 0xb5, 0x3b, 0xc6, 0x9b, 0x24, 0x9d, 0x8e, 0x63, 0x68, 0x9a, - 0x00, 0x46, 0xc4, 0xac, 0xf0, 0x15, 0x47, 0x0a, 0x30, 0xc7, 0x90, 0xfb, 0xb6, 0x67, 0x5b, 0x16, - 0x09, 0xda, 0x2d, 0xaf, 0xa5, 0xa3, 0xcc, 0x0d, 0x01, 0x22, 0x3c, 0xa3, 0x7c, 0xc1, 0x01, 0x34, - 0x3b, 0x2a, 0x9e, 0xed, 0x78, 0xb2, 0xb5, 0x90, 0xd2, 0x51, 0xa9, 0xd9, 0x8e, 0x27, 0x8e, 0x0a, - 0x7b, 0xc2, 0x1c, 0x91, 0x5d, 0x0d, 0xdd, 0x27, 0xfc, 0x9e, 0xa7, 0x76, 0x35, 0x36, 0x7c, 0x22, - 0xae, 0xc6, 0x86, 0x4f, 0x30, 0x83, 0x63, 0x79, 0xf9, 0x62, 0x92, 0x01, 0x15, 0xe3, 0x09, 0xa4, - 0xec, 0x6c, 0x27, 0xd2, 0xba, 0xf7, 0x14, 0x00, 0x9e, 0x17, 0xc5, 0xf3, 0xba, 0x94, 0x8e, 0xf4, - 0x5d, 0x8e, 0x23, 0x53, 0xbb, 0xd0, 0xdb, 0xdc, 0x0d, 0xd1, 0x71, 0x4c, 0x13, 0xb4, 0x0e, 0xa7, - 0x0d, 0xcb, 0xf1, 0xe9, 0xb5, 0x43, 0xc7, 0x25, 0x9e, 0x17, 0x14, 0x0a, 0xf9, 0xca, 0x73, 0x72, - 0xe2, 0xe9, 0x9d, 0xe4, 0x30, 0x1e, 0xe6, 0x47, 0x9b, 0xb0, 0x64, 0xfb, 0x34, 0x29, 0x43, 0x74, - 0x02, 0x0a, 0x52, 0xc6, 0xd2, 0xed, 0xa1, 0x71, 0x3c, 0x32, 0x43, 0xfd, 0x7b, 0x96, 0xa7, 0x39, - 0xe3, 0xee, 0xe5, 0x31, 0x3a, 0x04, 0x89, 0x6f, 0x4c, 0x53, 0xc7, 0xf8, 0xc6, 0x14, 0x34, 0xe2, - 0x32, 0x47, 0x35, 0xe2, 0x86, 0xb7, 0x2c, 0xfb, 0xcc, 0x6c, 0xd9, 0x2f, 0x15, 0x38, 0xd3, 0xf6, - 0xeb, 0xc4, 0xb5, 0x08, 0x25, 0x9e, 0xac, 0xc5, 0xa4, 0x03, 0xc0, 0x27, 0xa8, 0x9f, 0x94, 0x5c, - 0x59, 0x1e, 0xf4, 0x8b, 0x67, 0x76, 0x87, 0x01, 0xf1, 0xa8, 0x0e, 0xe8, 0x5d, 0x05, 0x16, 0x23, - 0xea, 0x7a, 0x75, 0x27, 0x70, 0x0a, 0x27, 0x79, 0x37, 0x77, 0x13, 0x00, 0x15, 0x34, 0xe8, 0x17, - 0x17, 0x93, 0x34, 0x3c, 0xa4, 0x84, 0x7a, 0x0e, 0xd0, 0xa8, 0x37, 0x53, 0xd7, 0xe0, 0xf4, 0x50, - 0x2c, 0x9a, 0x78, 0x8f, 0xd5, 0xcf, 0xf1, 0x82, 0x66, 0xc4, 0x49, 0xab, 0xbf, 0x9f, 0x4a, 0x08, - 0x63, 0x3e, 0x0a, 0x1d, 0x42, 0xc6, 0x69, 0x06, 0xdf, 0xe7, 0x5e, 0x4b, 0xcf, 0x2d, 0x56, 0xb7, - 0xab, 0xc2, 0x43, 0x55, 0xb7, 0xab, 0x98, 0x41, 0x46, 0xcb, 0x98, 0x3a, 0xc2, 0x1d, 0x1d, 0x42, - 0x46, 0x6b, 0x06, 0x91, 0x35, 0x45, 0xd5, 0xd6, 0x9b, 0xd2, 0x79, 0xae, 0x37, 0x09, 0x66, 0x90, - 0xea, 0x87, 0x4a, 0x62, 0x2f, 0x24, 0x13, 0x7a, 0x5f, 0x81, 0x73, 0x8e, 0x6b, 0x74, 0x99, 0x51, - 0x49, 0xcf, 0xab, 0x0d, 0xd5, 0x86, 0x56, 0x8a, 0xd6, 0x1b, 0x83, 0x5a, 0x29, 0x0c, 0xfa, 0xc5, - 0x73, 0xe3, 0x46, 0xf0, 0x58, 0x2d, 0xc7, 0xad, 0xaa, 0xba, 0x5d, 0xfd, 0xac, 0xaf, 0x6a, 0x1b, - 0x5e, 0x38, 0x86, 0xd8, 0x63, 0x54, 0x84, 0x7f, 0x50, 0xe0, 0x8b, 0x23, 0xde, 0x6e, 0xd3, 0x7e, - 0x60, 0x3d, 0xd0, 0xdc, 0xc6, 0x7a, 0x75, 0x07, 0x3d, 0x54, 0x60, 0xda, 0xa0, 0xa4, 0x13, 0x74, - 0x60, 0xda, 0x69, 0xba, 0xd9, 0x18, 0xf0, 0x0e, 0x25, 0x9d, 0x58, 0xff, 0x8c, 0x69, 0x80, 0x85, - 0x22, 0xea, 0xdf, 0xb2, 0x70, 0x7e, 0xd2, 0xd4, 0xe3, 0x05, 0xa6, 0x03, 0x83, 0x98, 0x8d, 0x58, - 0x75, 0x1e, 0x06, 0xa6, 0xad, 0x60, 0x00, 0x47, 0x3c, 0x47, 0x78, 0xf7, 0xcc, 0x33, 0xe0, 0xdd, - 0x7f, 0xa7, 0xc0, 0x32, 0x93, 0xb3, 0x11, 0xca, 0x0f, 0xb4, 0xcb, 0xa6, 0xa6, 0xdd, 0xe7, 0x07, - 0xfd, 0xe2, 0xf2, 0xee, 0x38, 0x50, 0x3c, 0x5e, 0x97, 0x71, 0x31, 0x68, 0xfa, 0x59, 0x88, 0x41, - 0xef, 0x24, 0xf3, 0x9b, 0x78, 0xc4, 0x47, 0xbf, 0x18, 0xd3, 0x0e, 0x23, 0xe9, 0x67, 0x1a, 0x4f, - 0xee, 0x88, 0xfd, 0x66, 0x7c, 0x47, 0xec, 0x29, 0xe9, 0x35, 0xa1, 0x29, 0x76, 0x8c, 0xfc, 0xed, - 0xd7, 0x0a, 0xcc, 0x35, 0xa2, 0xfb, 0x2a, 0x0f, 0x69, 0xf3, 0x29, 0x79, 0x96, 0xca, 0xe9, 0x41, - 0xbf, 0x38, 0x17, 0x23, 0xe0, 0xb8, 0x32, 0xea, 0xd7, 0x61, 0xe5, 0xe8, 0xc5, 0x1f, 0xc3, 0xa3, - 0x7e, 0x9c, 0x49, 0xd4, 0x20, 0xf7, 0x28, 0x45, 0x35, 0x58, 0x36, 0x9a, 0x96, 0xed, 0x92, 0x3b, - 0x56, 0xdb, 0xb2, 0x1f, 0x58, 0x1b, 0x76, 0xa7, 0x43, 0x2c, 0x2a, 0x7e, 0xca, 0x99, 0xad, 0x3c, - 0x2f, 0xa5, 0x2c, 0xef, 0x8c, 0x63, 0xc2, 0xe3, 0xe7, 0xf2, 0xef, 0x91, 0xd4, 0x35, 0x74, 0xca, - 0x77, 0x3f, 0xd6, 0x76, 0xa9, 0x71, 0x2a, 0x96, 0xa3, 0xb1, 0xff, 0x3b, 0x32, 0x9f, 0xc6, 0xff, - 0x1d, 0x61, 0xc2, 0x93, 0x3d, 0x22, 0xe1, 0xf9, 0x12, 0x73, 0xc3, 0x26, 0xd9, 0xd3, 0xdc, 0xb6, - 0xc7, 0xfb, 0x57, 0x79, 0x71, 0xf2, 0xb7, 0x02, 0x22, 0x8e, 0xc6, 0x87, 0x33, 0xff, 0x99, 0x67, - 0x25, 0xf3, 0x57, 0xff, 0xa1, 0x40, 0x7e, 0xc3, 0xb6, 0x1a, 0x06, 0xff, 0xa8, 0x72, 0x09, 0xb2, - 0xb4, 0xe7, 0x04, 0xa7, 0x24, 0xd8, 0xdf, 0xec, 0x7e, 0xcf, 0x21, 0x9f, 0xf4, 0x8b, 0x0b, 0x21, - 0x23, 0x23, 0x60, 0xce, 0x8a, 0x6e, 0xb2, 0xed, 0xd4, 0xa8, 0xef, 0xc9, 0x50, 0x74, 0x39, 0xda, - 0x4e, 0x46, 0xfd, 0xa4, 0x5f, 0x54, 0xa3, 0x7f, 0xfe, 0xca, 0xba, 0xed, 0x92, 0x72, 0xf7, 0x52, - 0x29, 0x94, 0x24, 0xb8, 0xb0, 0x94, 0xc1, 0x0e, 0x87, 0x4b, 0x34, 0x2f, 0x2c, 0x19, 0xc3, 0xc3, - 0x81, 0x39, 0x15, 0xcb, 0x51, 0x74, 0x01, 0x72, 0x1d, 0xe2, 0x79, 0x2c, 0xe3, 0x1c, 0xfa, 0x42, - 0xbc, 0x27, 0xc8, 0x38, 0x18, 0x57, 0xbf, 0x9f, 0x81, 0x85, 0x6d, 0x62, 0x11, 0xd7, 0xd0, 0x05, - 0x18, 0xba, 0x01, 0xc8, 0xae, 0x7b, 0xc4, 0xed, 0x92, 0xc6, 0xb6, 0xf8, 0xcf, 0x90, 0x45, 0x1c, - 0xb6, 0xe6, 0x4c, 0xd4, 0x41, 0xbe, 0x3d, 0xc2, 0x81, 0xc7, 0xcc, 0x42, 0x6f, 0x2b, 0x00, 0x7a, - 0xb0, 0x18, 0x4f, 0x56, 0xe1, 0x27, 0xd9, 0xc7, 0x0c, 0x2d, 0x15, 0x6d, 0x65, 0x48, 0xf2, 0x70, - 0x0c, 0x1b, 0xed, 0xc1, 0xd9, 0x03, 0xd7, 0x20, 0x56, 0xc3, 0xec, 0x6d, 0x12, 0x4f, 0x77, 0x0d, - 0x87, 0x46, 0xb5, 0xf7, 0x17, 0xe4, 0xe4, 0xb3, 0x5b, 0xa3, 0x2c, 0x78, 0xdc, 0x3c, 0x66, 0x25, - 0xdf, 0x23, 0x07, 0xbe, 0x79, 0xcd, 0x75, 0x6d, 0x77, 0x2f, 0x61, 0xed, 0xd0, 0x4a, 0x77, 0x46, - 0x38, 0xf0, 0x98, 0x59, 0xea, 0x0e, 0x0c, 0xc5, 0x32, 0xf4, 0x15, 0x58, 0x68, 0xba, 0xb6, 0xef, - 0xc8, 0x18, 0x1b, 0x94, 0x47, 0x67, 0x06, 0xfd, 0xe2, 0xc2, 0x76, 0x7c, 0x00, 0x27, 0xf9, 0xd4, - 0xcb, 0x10, 0x7c, 0xa1, 0x8f, 0x7f, 0xc3, 0x57, 0x9e, 0xfc, 0x0d, 0xbf, 0x62, 0x3f, 0x7a, 0xbc, - 0x7a, 0xea, 0x83, 0xc7, 0xab, 0xa7, 0x3e, 0x7a, 0xbc, 0x7a, 0xea, 0x7b, 0x83, 0x55, 0xe5, 0xd1, - 0x60, 0x55, 0xf9, 0x60, 0xb0, 0xaa, 0x7c, 0x34, 0x58, 0x55, 0xfe, 0x39, 0x58, 0x55, 0x1e, 0xfe, - 0x6b, 0xf5, 0xd4, 0xab, 0x3b, 0x27, 0xf6, 0xb7, 0xf0, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x5f, - 0x86, 0xfa, 0x6d, 0x79, 0x2c, 0x00, 0x00, + proto.RegisterFile("carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto", fileDescriptor_577b51e9dffdab9a) +} + +var fileDescriptor_577b51e9dffdab9a = []byte{ + // 2545 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x5a, 0x4d, 0x8c, 0x1b, 0x49, + 0xf5, 0x4f, 0x8f, 0x3d, 0x1f, 0x7e, 0x33, 0x93, 0x4c, 0x2a, 0x99, 0xff, 0xfa, 0x1f, 0xd8, 0xf1, + 0xa8, 0x57, 0x5a, 0x65, 0x05, 0x6b, 0x2b, 0xa3, 0x64, 0x89, 0x40, 0x0a, 0xeb, 0x9e, 0xaf, 0x4c, + 0x26, 0x33, 0x31, 0xe5, 0x49, 0x50, 0x16, 0x01, 0xdb, 0xd3, 0x5d, 0x63, 0x37, 0x6e, 0x77, 0xb7, + 0xba, 0xab, 0x9d, 0x18, 0x22, 0xc4, 0x02, 0x82, 0x1b, 0x2c, 0x57, 0x04, 0xe2, 0x0a, 0x12, 0x17, + 0xce, 0x1c, 0xf6, 0x48, 0x24, 0x24, 0xb4, 0xc7, 0x3d, 0x79, 0x89, 0xb9, 0x72, 0xe6, 0xb0, 0x07, + 0x84, 0xea, 0xa3, 0xbf, 0x6c, 0x4f, 0x66, 0x18, 0x3b, 0x09, 0x70, 0xeb, 0x7e, 0xf5, 0xea, 0xf7, + 0xab, 0x57, 0xaf, 0xea, 0xd5, 0x7b, 0xd5, 0x0d, 0x9b, 0x86, 0xee, 0x77, 0x88, 0x5d, 0x36, 0x49, + 0xa7, 0xd2, 0xd2, 0x3d, 0xef, 0x6d, 0xc3, 0x75, 0xa8, 0xef, 0xda, 0x36, 0xf1, 0x2b, 0x5e, 0xab, + 0x51, 0xd1, 0x3d, 0x2b, 0xe0, 0x0d, 0x06, 0xf5, 0xed, 0x4a, 0xe7, 0x9a, 0x6e, 0x7b, 0x4d, 0xfd, + 0x5a, 0xa5, 0x41, 0x1c, 0xe2, 0xeb, 0x94, 0x98, 0x65, 0xcf, 0x77, 0xa9, 0x8b, 0x6e, 0x24, 0x30, + 0x65, 0xa6, 0xfd, 0xed, 0x04, 0xa6, 0xec, 0xb5, 0x1a, 0x65, 0x06, 0x53, 0x8e, 0x60, 0xca, 0x11, + 0xcc, 0x95, 0x5b, 0x29, 0xf6, 0x0e, 0x71, 0x4c, 0x4b, 0x90, 0xca, 0xc7, 0x0e, 0xf1, 0x03, 0xcb, + 0x75, 0x82, 0x63, 0x69, 0xaf, 0xbc, 0xdd, 0xb0, 0x68, 0x33, 0x3c, 0x2c, 0x1b, 0x6e, 0xbb, 0xd2, + 0x70, 0x1b, 0x6e, 0x85, 0x8b, 0x0f, 0xc3, 0x23, 0xfe, 0xc6, 0x5f, 0xf8, 0x93, 0x54, 0xbf, 0xde, + 0xba, 0x19, 0x94, 0x2d, 0x97, 0x19, 0xd5, 0xd6, 0x8d, 0xa6, 0xe5, 0x10, 0xbf, 0x9b, 0x58, 0xd9, + 0x26, 0x54, 0xaf, 0x74, 0x86, 0x49, 0x2a, 0xc7, 0xf5, 0xf2, 0x43, 0x87, 0x5a, 0x6d, 0x32, 0xd4, + 0xe1, 0x9d, 0x93, 0x3a, 0x04, 0x46, 0x93, 0xb4, 0xf5, 0xc1, 0x7e, 0xea, 0xa7, 0x0a, 0x40, 0xd5, + 0xf3, 0xd6, 0xed, 0x30, 0xa0, 0xc4, 0x47, 0x15, 0x28, 0x38, 0x7a, 0x9b, 0x04, 0x9e, 0x6e, 0x90, + 0xa2, 0xb2, 0xaa, 0x5c, 0x2d, 0x68, 0x17, 0x9f, 0xf6, 0x4a, 0xe7, 0xfa, 0xbd, 0x52, 0x61, 0x3f, + 0x6a, 0xc0, 0x89, 0x0e, 0xfa, 0x8d, 0x02, 0x97, 0x5a, 0xe1, 0x21, 0x31, 0x5c, 0xe7, 0xc8, 0x6a, + 0xd4, 0x89, 0xe1, 0x13, 0x8a, 0xc9, 0x51, 0x71, 0x6a, 0x55, 0xb9, 0x3a, 0xbf, 0x76, 0x50, 0x3e, + 0x93, 0x8f, 0xca, 0xc9, 0x88, 0x76, 0x87, 0xb1, 0xb5, 0xd7, 0xfa, 0xbd, 0xd2, 0xa5, 0x11, 0x0d, + 0x78, 0xd4, 0x48, 0xd4, 0xf7, 0xe1, 0xf5, 0xe7, 0xc2, 0xa1, 0x55, 0xc8, 0x33, 0x7b, 0xa4, 0xb9, + 0x0b, 0xd2, 0xdc, 0x3c, 0x33, 0x17, 0xf3, 0x16, 0xf4, 0x3a, 0xe4, 0x5a, 0xa4, 0xcb, 0x6d, 0x2a, + 0x68, 0xf3, 0x52, 0x21, 0xb7, 0x4b, 0xba, 0x98, 0xc9, 0x55, 0x17, 0x0a, 0x55, 0xcf, 0xdb, 0x20, + 0x9e, 0xed, 0x76, 0xd1, 0x21, 0xe4, 0x99, 0x3d, 0x1c, 0x6d, 0x7e, 0x6d, 0xe3, 0xec, 0x13, 0x20, + 0xf0, 0x76, 0x75, 0xcf, 0xd3, 0xe6, 0xd8, 0x78, 0xd8, 0x13, 0xe6, 0xd8, 0xea, 0xdf, 0xa7, 0x60, + 0x31, 0xa3, 0x81, 0xde, 0x84, 0x19, 0xcb, 0xa1, 0xee, 0x7e, 0x20, 0xad, 0x38, 0x2f, 0x07, 0x39, + 0xb3, 0xc3, 0xa5, 0x58, 0xb6, 0xa2, 0x12, 0x4c, 0xb7, 0x75, 0x6f, 0x3f, 0x28, 0x4e, 0xad, 0xe6, + 0xae, 0x16, 0xb4, 0x42, 0xbf, 0x57, 0x9a, 0xde, 0x63, 0x02, 0x2c, 0xe4, 0xa8, 0x0c, 0xe0, 0xeb, + 0x8f, 0xee, 0x79, 0x94, 0x6d, 0x82, 0x62, 0x8e, 0x6b, 0x9d, 0xef, 0xf7, 0x4a, 0x80, 0x63, 0x29, + 0x4e, 0x69, 0x20, 0x1f, 0x66, 0x2d, 0x27, 0xf0, 0x88, 0x41, 0x8b, 0x79, 0x6e, 0xf1, 0xee, 0x24, + 0x2c, 0xde, 0x11, 0x90, 0xda, 0x7c, 0xbf, 0x57, 0x9a, 0x95, 0x2f, 0x38, 0x22, 0x42, 0x0e, 0xcc, + 0x98, 0xc4, 0x26, 0x94, 0x14, 0xa7, 0x39, 0xe5, 0x9d, 0x49, 0x50, 0x6e, 0x70, 0x44, 0x0d, 0xd8, + 0xa4, 0x89, 0x67, 0x2c, 0x59, 0xd4, 0x4d, 0xb8, 0x34, 0x42, 0x75, 0x60, 0xaa, 0x94, 0x93, 0xa6, + 0x4a, 0xdd, 0x82, 0xcb, 0xa3, 0x8c, 0xfc, 0xb7, 0x71, 0xfe, 0x38, 0x0d, 0x73, 0x55, 0xcf, 0xdb, + 0x22, 0xd4, 0x68, 0x22, 0x8b, 0x39, 0xde, 0xb6, 0x1c, 0x22, 0x17, 0xdc, 0xe6, 0xd9, 0xe7, 0x82, + 0x03, 0xee, 0x70, 0x30, 0x31, 0x0d, 0xe2, 0x19, 0x4b, 0x02, 0x44, 0x60, 0xda, 0x6a, 0xeb, 0x0d, + 0x22, 0xf7, 0xf6, 0xc6, 0xb8, 0x4c, 0x0c, 0x4b, 0xac, 0x40, 0xfe, 0x88, 0x05, 0x3a, 0xd2, 0x21, + 0xdf, 0xa4, 0xd4, 0x2b, 0xe6, 0x38, 0xcb, 0xfa, 0x98, 0x2c, 0xb7, 0x0f, 0x0e, 0x6a, 0x62, 0xff, + 0xb0, 0x27, 0xcc, 0xa1, 0xd1, 0x37, 0x21, 0xd7, 0xb0, 0xa2, 0x05, 0xab, 0x8d, 0xc9, 0xb0, 0x6d, + 0x51, 0x6d, 0x96, 0xc5, 0x83, 0x6d, 0x8b, 0x62, 0x86, 0x8b, 0x42, 0x28, 0x34, 0x89, 0xdd, 0x5e, + 0x6f, 0xea, 0x3e, 0x95, 0x4b, 0xf4, 0xf6, 0xb8, 0x66, 0x44, 0x78, 0xda, 0x22, 0x0b, 0xc5, 0xf1, + 0x2b, 0x4e, 0x98, 0xd0, 0x07, 0x0a, 0x2c, 0x58, 0xed, 0x86, 0xd7, 0x6a, 0x68, 0xa1, 0x63, 0xda, + 0xa4, 0x38, 0x33, 0xee, 0x86, 0x94, 0x7e, 0x4a, 0x20, 0xb5, 0xa5, 0x7e, 0xaf, 0xb4, 0x90, 0x96, + 0xe0, 0x0c, 0x25, 0x8b, 0xa5, 0x9e, 0x4e, 0x9b, 0xc5, 0xd9, 0x6c, 0x2c, 0xad, 0xe9, 0xb4, 0x89, + 0x79, 0x8b, 0xfa, 0xb3, 0x3c, 0xcc, 0xa7, 0xa6, 0x8e, 0xc5, 0xd6, 0xd0, 0xb7, 0x65, 0xd8, 0x8a, + 0x63, 0xeb, 0x7d, 0x7c, 0x17, 0x33, 0x39, 0x6b, 0xf6, 0xe5, 0x71, 0x92, 0x6a, 0x66, 0xc1, 0x9e, + 0xc9, 0x51, 0x07, 0x16, 0x7c, 0x72, 0x54, 0x27, 0x36, 0x31, 0xd8, 0xe6, 0x90, 0x26, 0xbf, 0x9b, + 0x36, 0x59, 0x1c, 0xec, 0xdc, 0x52, 0xf9, 0x18, 0x9d, 0xf1, 0x89, 0xad, 0x0f, 0x84, 0x24, 0xc6, + 0x11, 0x76, 0xe2, 0x14, 0x32, 0xce, 0xf0, 0x20, 0x0a, 0x85, 0x20, 0x3e, 0xeb, 0xc4, 0x4a, 0xdd, + 0x1e, 0x73, 0x9e, 0xef, 0xba, 0x86, 0x6e, 0xb3, 0xe3, 0x8d, 0x7b, 0x38, 0x39, 0xd4, 0x12, 0x22, + 0xf4, 0x16, 0xcc, 0x06, 0xe1, 0x21, 0x9b, 0x4c, 0xbe, 0x76, 0x0b, 0xda, 0x05, 0x39, 0x21, 0xb3, + 0x75, 0x21, 0xc6, 0x51, 0x3b, 0xfa, 0x0a, 0x2c, 0xda, 0x47, 0x41, 0xbd, 0x65, 0x79, 0xf5, 0x76, + 0x68, 0x36, 0x44, 0xa8, 0x9c, 0xd3, 0x96, 0x65, 0x87, 0xc5, 0xbb, 0x5b, 0xf5, 0xa4, 0x11, 0x67, + 0x75, 0xd1, 0x1d, 0x40, 0x47, 0xae, 0x6f, 0x10, 0xbe, 0x79, 0xf4, 0xc0, 0x32, 0xaa, 0xa1, 0xf4, + 0xe9, 0x9c, 0x76, 0x45, 0x22, 0xa0, 0xad, 0x21, 0x0d, 0x3c, 0xa2, 0x17, 0x3b, 0x71, 0x4c, 0xe2, + 0xd1, 0x66, 0x71, 0x6e, 0x55, 0xb9, 0x9a, 0x13, 0xfb, 0x7d, 0x83, 0x09, 0xb0, 0x90, 0xab, 0xff, + 0x50, 0x60, 0x21, 0xbd, 0x5b, 0x4f, 0x5a, 0x11, 0x6f, 0xc2, 0x4c, 0xd0, 0xd4, 0xd7, 0x6e, 0xbc, + 0x23, 0x17, 0x45, 0x7c, 0xd4, 0xd5, 0x6f, 0x57, 0xd7, 0x6e, 0xbc, 0x83, 0x65, 0xeb, 0x7f, 0xbc, + 0x8b, 0xd4, 0x9e, 0x02, 0x17, 0x87, 0xf6, 0xf7, 0x29, 0xb2, 0x91, 0xb7, 0x60, 0x56, 0xae, 0x60, + 0x39, 0x03, 0x31, 0x85, 0x5c, 0xc6, 0x38, 0x6a, 0x47, 0x4f, 0x00, 0x7c, 0xe2, 0xb9, 0x81, 0x45, + 0x5d, 0xbf, 0x2b, 0x27, 0xe1, 0xee, 0xa4, 0x42, 0x11, 0x26, 0x9e, 0x2b, 0x0f, 0xaa, 0x98, 0x03, + 0xa7, 0xf8, 0xd4, 0xdf, 0x2b, 0xb0, 0x3c, 0xb2, 0xd7, 0x49, 0x2e, 0xce, 0xb8, 0x6e, 0xea, 0x25, + 0xb9, 0x4e, 0xfd, 0x93, 0xc8, 0xaa, 0x92, 0xc3, 0xe9, 0xa4, 0x61, 0x76, 0x60, 0x81, 0xea, 0x8d, + 0x24, 0xf8, 0xe4, 0x27, 0x19, 0x7c, 0x0e, 0x52, 0xc8, 0x38, 0xc3, 0xf3, 0x6a, 0xa6, 0x27, 0xbd, + 0xb2, 0x73, 0x27, 0xac, 0xec, 0xdf, 0x4d, 0xf1, 0x54, 0x67, 0xe8, 0xf8, 0x40, 0x6f, 0x44, 0x29, + 0x84, 0x98, 0xd2, 0x45, 0x89, 0x90, 0x4d, 0x00, 0x06, 0xa7, 0x35, 0xf7, 0xbf, 0x3c, 0xad, 0xea, + 0x47, 0x53, 0x70, 0x3e, 0x9b, 0x7c, 0xa1, 0x10, 0xa6, 0xd9, 0x51, 0x29, 0x72, 0xc1, 0xf9, 0xb5, + 0xda, 0x44, 0x52, 0xba, 0x32, 0xf3, 0x4c, 0xb0, 0xe9, 0x50, 0xbf, 0x9b, 0xcc, 0x3b, 0x97, 0x61, + 0xc1, 0x86, 0x9e, 0x40, 0x81, 0x3f, 0x6c, 0xf9, 0x6e, 0x9b, 0xd7, 0x07, 0x13, 0xc8, 0x1d, 0x38, + 0x75, 0xdd, 0x0d, 0x7d, 0x83, 0x24, 0x85, 0x64, 0x2d, 0x62, 0xc1, 0x09, 0xe1, 0x95, 0x9b, 0x00, + 0xc9, 0x08, 0xd1, 0x92, 0xa8, 0xb8, 0xf8, 0x32, 0xe1, 0x45, 0x16, 0xba, 0x0c, 0xd3, 0x1d, 0xdd, + 0x0e, 0x45, 0xf6, 0x59, 0xc0, 0xe2, 0xe5, 0xcb, 0x53, 0x37, 0x15, 0xf5, 0x97, 0xe9, 0xd5, 0x96, + 0x22, 0x44, 0xdf, 0x4b, 0x3b, 0x54, 0xa4, 0xc7, 0xfb, 0x13, 0x34, 0xe8, 0xf9, 0xdb, 0xe5, 0xc7, + 0x0a, 0x2c, 0x88, 0x4a, 0x73, 0x4f, 0xf7, 0x92, 0x15, 0x35, 0xe9, 0x01, 0xf0, 0x45, 0xbd, 0x9e, + 0xe2, 0xc1, 0x19, 0x56, 0xf5, 0x31, 0xbc, 0x76, 0x4c, 0x57, 0x96, 0x22, 0x98, 0x96, 0x4f, 0x0c, + 0x16, 0xab, 0xf9, 0xb6, 0x16, 0xa7, 0x49, 0x9c, 0x22, 0x6c, 0xa4, 0x1b, 0x71, 0x56, 0xf7, 0xe4, + 0x63, 0x4a, 0xbd, 0x0e, 0x4b, 0x83, 0xdb, 0xe0, 0x14, 0xbd, 0xfe, 0x30, 0x03, 0xb3, 0x55, 0xcf, + 0xab, 0x7b, 0xc4, 0x60, 0x69, 0x48, 0x40, 0xfc, 0x8e, 0x65, 0x90, 0xaa, 0x61, 0xb8, 0xa1, 0x43, + 0xf7, 0x93, 0xbe, 0x71, 0x1a, 0x52, 0x1f, 0xd2, 0xc0, 0x23, 0x7a, 0xa1, 0x26, 0xcc, 0x1a, 0xe2, + 0x0a, 0x40, 0x3a, 0xa2, 0x3a, 0xf6, 0xd5, 0x84, 0xa8, 0x4e, 0xe5, 0x0b, 0x8e, 0xe0, 0x91, 0x09, + 0xd3, 0x47, 0xcc, 0x68, 0x5e, 0x3c, 0xcf, 0xaf, 0x7d, 0x75, 0x4c, 0x87, 0x27, 0x9b, 0x95, 0xbf, + 0x62, 0x01, 0x8e, 0x3c, 0x98, 0xa3, 0xa4, 0xed, 0xd9, 0x3a, 0x25, 0xc5, 0x3c, 0x27, 0x1a, 0xa3, + 0x8e, 0x39, 0x90, 0x48, 0xda, 0x92, 0xe4, 0x9a, 0x8b, 0x24, 0x38, 0x66, 0x41, 0x4d, 0x56, 0x75, + 0xb3, 0xda, 0xb5, 0x38, 0xcd, 0xf9, 0xde, 0x1d, 0xb7, 0xea, 0x4e, 0x32, 0x37, 0xf1, 0x8e, 0x25, + 0x3e, 0xcb, 0xf0, 0x3c, 0x3d, 0x0c, 0x88, 0xc9, 0xd3, 0xf9, 0xb9, 0x44, 0xaf, 0xc6, 0xa5, 0x58, + 0xb6, 0xa2, 0x2f, 0xc2, 0x9c, 0xa1, 0x3b, 0x06, 0xb1, 0x89, 0x29, 0x93, 0xd3, 0x78, 0xfc, 0xeb, + 0x52, 0x8e, 0x63, 0x0d, 0xf4, 0x2d, 0x80, 0xa0, 0xeb, 0x18, 0x35, 0xe2, 0x5b, 0xae, 0xc9, 0xb3, + 0xd1, 0xf9, 0xb5, 0x72, 0x59, 0x5c, 0x9b, 0x95, 0xd3, 0xd7, 0x66, 0xc9, 0xe0, 0xdb, 0x84, 0xea, + 0xe5, 0xce, 0xb5, 0xf2, 0x46, 0xe8, 0xeb, 0xfc, 0x08, 0xe1, 0xd9, 0x4e, 0x3d, 0x46, 0xc1, 0x29, + 0x44, 0xb4, 0x06, 0xe0, 0xb8, 0xae, 0xbc, 0x1c, 0x28, 0x16, 0xf8, 0x78, 0x90, 0x1c, 0x0f, 0xec, + 0xc7, 0x2d, 0x38, 0xa5, 0x85, 0x36, 0x60, 0xc9, 0x24, 0x47, 0x7a, 0x68, 0xd3, 0xf8, 0x72, 0xad, + 0x08, 0x7c, 0x7d, 0x17, 0x65, 0xcf, 0xa5, 0x8d, 0x81, 0x76, 0x3c, 0xd4, 0x43, 0xfd, 0x70, 0x86, + 0x97, 0x54, 0x91, 0xcf, 0xd0, 0xfb, 0x90, 0xeb, 0x52, 0x3a, 0xfe, 0x85, 0x40, 0x04, 0xf8, 0x90, + 0xca, 0x0a, 0xf7, 0x21, 0xa5, 0x98, 0x41, 0x23, 0x13, 0xf2, 0xad, 0x43, 0xdb, 0x94, 0x5b, 0x69, + 0x6b, 0x7c, 0x8a, 0xdd, 0x43, 0xdb, 0x94, 0xd7, 0x5c, 0x87, 0xb6, 0x89, 0x39, 0x3a, 0x0f, 0xa1, + 0xac, 0xbc, 0x8d, 0x94, 0x64, 0x26, 0xb0, 0x3f, 0x3e, 0xdd, 0xed, 0x14, 0xaa, 0x08, 0xa1, 0x69, + 0x09, 0xce, 0xb0, 0xa2, 0xc7, 0x50, 0x68, 0x85, 0x01, 0x75, 0xdb, 0xd6, 0x77, 0xc9, 0xf8, 0x97, + 0x5c, 0xb1, 0xc5, 0x11, 0xa4, 0x38, 0x43, 0xe2, 0x57, 0x9c, 0x90, 0x21, 0x0f, 0x66, 0xbf, 0x13, + 0xb8, 0x8e, 0x43, 0xa2, 0x6b, 0x84, 0x9d, 0xf1, 0x79, 0xef, 0x08, 0x40, 0x11, 0xbc, 0xe4, 0x0b, + 0x8e, 0x68, 0x98, 0x63, 0x03, 0xd7, 0x0b, 0x64, 0x1d, 0x3d, 0x01, 0xc7, 0xd6, 0x5d, 0x2f, 0x10, + 0x8e, 0x65, 0x4f, 0x98, 0xa3, 0xb3, 0x05, 0x6a, 0x84, 0x84, 0xef, 0xd9, 0x89, 0x2c, 0xd0, 0xf5, + 0x90, 0x88, 0x05, 0xba, 0x1e, 0x12, 0xcc, 0xa0, 0xa3, 0xac, 0x2a, 0xa5, 0xc0, 0x0a, 0xd1, 0x24, + 0xab, 0x92, 0x57, 0x9f, 0x99, 0xfc, 0xe7, 0x87, 0x0a, 0x00, 0xcf, 0x2a, 0xd2, 0x19, 0xd0, 0x04, + 0x16, 0xdb, 0x03, 0x8e, 0x29, 0x93, 0xa0, 0x38, 0x22, 0x3c, 0x88, 0x99, 0x70, 0x8a, 0x15, 0x55, + 0xe1, 0x82, 0xe5, 0x78, 0x21, 0xdd, 0x7c, 0xec, 0xf9, 0x24, 0x08, 0xa2, 0xfc, 0xb7, 0xa0, 0xbd, + 0x26, 0x3b, 0x5e, 0xd8, 0xc9, 0x36, 0xe3, 0x41, 0x7d, 0x16, 0x54, 0xdc, 0x90, 0x66, 0x31, 0xf2, + 0xd9, 0xa0, 0x72, 0x6f, 0xa0, 0x1d, 0x0f, 0xf5, 0x50, 0x7f, 0x9d, 0xe7, 0x99, 0xc3, 0xa8, 0x1d, + 0x73, 0x8a, 0x1a, 0x35, 0xf3, 0x1d, 0x61, 0xea, 0x14, 0xdf, 0x11, 0xa2, 0x8b, 0xa3, 0xdc, 0x71, + 0x17, 0x47, 0x83, 0xee, 0xc9, 0xbf, 0x12, 0xf7, 0xfc, 0x48, 0x81, 0x8b, 0xad, 0xf0, 0x90, 0xf8, + 0x0e, 0xa1, 0x24, 0x90, 0x25, 0x86, 0xdc, 0x9c, 0xb7, 0xce, 0x38, 0x16, 0x89, 0xa2, 0x2d, 0xf7, + 0x7b, 0xa5, 0x8b, 0xbb, 0x83, 0xe0, 0x78, 0x98, 0x0f, 0x7d, 0xa0, 0xc0, 0xf9, 0x44, 0x5a, 0xad, + 0xed, 0x44, 0x1b, 0xf6, 0xac, 0x7b, 0x69, 0x37, 0x03, 0xa6, 0xa1, 0x7e, 0xaf, 0x74, 0x3e, 0x2b, + 0xc3, 0x03, 0x84, 0xea, 0x65, 0x40, 0xc3, 0x51, 0x45, 0x5d, 0x83, 0x0b, 0x03, 0x51, 0xfd, 0xc4, + 0x7d, 0xa7, 0xfe, 0x1f, 0x4f, 0xdf, 0x87, 0xe2, 0xa2, 0xfa, 0x4f, 0x25, 0x03, 0xc6, 0xe2, 0x07, + 0x32, 0x21, 0xe7, 0x35, 0xa2, 0x8f, 0x2b, 0x3b, 0x93, 0x09, 0x4f, 0xb5, 0xed, 0x9a, 0x88, 0x1e, + 0xb5, 0xed, 0x1a, 0x66, 0xf0, 0xc9, 0x90, 0xa7, 0x8e, 0x09, 0x15, 0x26, 0xe4, 0x58, 0x15, 0x9b, + 0x9b, 0xe4, 0x30, 0xaa, 0x0d, 0x19, 0xc4, 0xaa, 0x0d, 0x82, 0x19, 0xbc, 0xfa, 0x91, 0x92, 0x99, + 0x63, 0xa9, 0x84, 0x7e, 0xab, 0xc0, 0x65, 0xcf, 0xb7, 0x3a, 0x6c, 0xb2, 0x48, 0x37, 0xa8, 0x0f, + 0x94, 0x38, 0xef, 0x4d, 0x68, 0x56, 0x46, 0x30, 0x68, 0xc5, 0x7e, 0xaf, 0x74, 0x79, 0x54, 0x0b, + 0x1e, 0x39, 0xa2, 0x51, 0x16, 0xd4, 0xb6, 0x6b, 0xff, 0x4d, 0x16, 0x6c, 0xc3, 0x1b, 0xa7, 0x80, + 0x3d, 0x45, 0x61, 0xf3, 0x2b, 0x05, 0x3e, 0x3f, 0x14, 0x75, 0x36, 0xdc, 0x47, 0xce, 0x23, 0xdd, + 0x37, 0xab, 0xb5, 0x1d, 0xf4, 0x04, 0xa6, 0x2d, 0x4a, 0xda, 0x51, 0xd5, 0xff, 0xf5, 0x49, 0x45, + 0xb6, 0x14, 0xc7, 0x0e, 0x25, 0xed, 0xd4, 0xa5, 0x0b, 0x63, 0xc3, 0x82, 0x54, 0xfd, 0x45, 0x1e, + 0x56, 0x4f, 0xea, 0x7a, 0xba, 0xb8, 0x7f, 0x64, 0x11, 0xdb, 0x4c, 0xd5, 0x93, 0x71, 0xdc, 0xdf, + 0x8a, 0x1a, 0x70, 0xa2, 0x73, 0x4c, 0x40, 0xcd, 0xbd, 0xe4, 0x80, 0xfa, 0x73, 0x05, 0x96, 0x19, + 0xce, 0x7a, 0x8c, 0x1f, 0x8d, 0x24, 0x3f, 0x91, 0x91, 0xfc, 0x7f, 0xbf, 0x57, 0x5a, 0xde, 0x1d, + 0x45, 0x80, 0x47, 0xf3, 0x8e, 0x0a, 0xf1, 0xd3, 0x2f, 0x3b, 0xc4, 0xff, 0x25, 0x97, 0x49, 0x01, + 0xd2, 0x07, 0x25, 0xfa, 0xfe, 0xf0, 0xdd, 0xca, 0xd7, 0x26, 0x7b, 0x16, 0x3f, 0xff, 0x7a, 0xe5, + 0xa7, 0xa3, 0xaf, 0x57, 0x5e, 0xc0, 0x18, 0x4e, 0xb8, 0x61, 0x39, 0x45, 0xe6, 0xf2, 0x13, 0x05, + 0xe6, 0xcd, 0x64, 0x2b, 0xc9, 0x35, 0x55, 0x7f, 0x01, 0x1b, 0x5c, 0xbb, 0xd0, 0xef, 0x95, 0xe6, + 0x53, 0x02, 0x9c, 0x26, 0x56, 0x6f, 0xc1, 0x95, 0xe3, 0x0d, 0x3d, 0x45, 0x0c, 0xfb, 0x73, 0x2e, + 0x93, 0x55, 0x3f, 0xa4, 0x14, 0xd5, 0x61, 0xd9, 0x6a, 0x38, 0xae, 0x4f, 0xee, 0x3b, 0x2d, 0xc7, + 0x7d, 0xe4, 0xac, 0xbb, 0xed, 0x36, 0x71, 0xa8, 0xf8, 0x0f, 0x61, 0x4e, 0x7b, 0x5d, 0xa2, 0x2c, + 0xef, 0x8c, 0x52, 0xc2, 0xa3, 0xfb, 0xf2, 0x4f, 0x3c, 0xd4, 0xb7, 0x0c, 0xca, 0xbd, 0x9a, 0xba, + 0x00, 0xa8, 0x73, 0x29, 0x96, 0xad, 0xa9, 0x8f, 0xdf, 0xb9, 0x17, 0xfd, 0xf1, 0x3b, 0x4e, 0x09, + 0xf2, 0xc7, 0xa4, 0x04, 0x5f, 0x60, 0x91, 0xcf, 0x26, 0x7b, 0xba, 0xdf, 0x0a, 0xf8, 0x0d, 0x49, + 0x41, 0xac, 0xde, 0xad, 0x48, 0x88, 0x93, 0xf6, 0xc1, 0x5c, 0x76, 0xe6, 0x55, 0xe4, 0xb2, 0xea, + 0xa7, 0x0a, 0x14, 0xd6, 0x5d, 0xc7, 0xb4, 0xf8, 0xed, 0xf7, 0x35, 0xc8, 0xd3, 0xae, 0x17, 0x79, + 0x3f, 0xf2, 0x5b, 0xfe, 0xa0, 0xeb, 0x91, 0xcf, 0x7a, 0xa5, 0xc5, 0x58, 0x91, 0x09, 0x30, 0x57, + 0x45, 0x77, 0x99, 0x9b, 0x74, 0x1a, 0x06, 0x32, 0xd2, 0x5f, 0x4f, 0xdc, 0xc4, 0xa4, 0x9f, 0xf5, + 0x4a, 0x6a, 0xf2, 0x57, 0x52, 0xc5, 0x70, 0x7d, 0x52, 0xe9, 0x5c, 0x2b, 0xc7, 0x48, 0x42, 0x0b, + 0x4b, 0x0c, 0xe6, 0x74, 0x9f, 0xe8, 0x41, 0x5c, 0xf0, 0xc4, 0x4e, 0xc7, 0x5c, 0x8a, 0x65, 0x2b, + 0x7a, 0x0b, 0x66, 0xdb, 0x24, 0x08, 0x58, 0xfe, 0x35, 0xf0, 0x85, 0x6d, 0x4f, 0x88, 0x71, 0xd4, + 0xce, 0xff, 0x93, 0xd9, 0x26, 0x0e, 0xf1, 0x2d, 0x43, 0x90, 0xa1, 0x3b, 0x80, 0xdc, 0xc3, 0x80, + 0xf8, 0x1d, 0x62, 0x6e, 0x8b, 0x3f, 0xa1, 0x58, 0x90, 0x57, 0xf8, 0xa7, 0xc9, 0xf8, 0x4a, 0xf1, + 0xde, 0x90, 0x06, 0x1e, 0xd1, 0x0b, 0x51, 0x00, 0x23, 0xb2, 0x25, 0x90, 0xe5, 0xe2, 0x59, 0x2f, + 0xc5, 0xe2, 0x49, 0x49, 0xbc, 0x16, 0x8b, 0x02, 0x9c, 0xe2, 0x41, 0x7b, 0x70, 0xe9, 0xc8, 0xb7, + 0x88, 0x63, 0xda, 0xdd, 0x0d, 0x12, 0x18, 0xbe, 0xe5, 0xd1, 0xa4, 0x48, 0xfc, 0x9c, 0xec, 0x7c, + 0x69, 0x6b, 0x58, 0x05, 0x8f, 0xea, 0xc7, 0x26, 0x24, 0x0c, 0xc8, 0x51, 0x68, 0x6f, 0xfa, 0xbe, + 0xeb, 0xef, 0x65, 0x26, 0x36, 0x9e, 0x90, 0xfb, 0x43, 0x1a, 0x78, 0x44, 0x2f, 0x75, 0x07, 0x06, + 0x4e, 0x14, 0xf4, 0x25, 0x58, 0x6c, 0xf8, 0x6e, 0xe8, 0xc9, 0x53, 0x2d, 0xaa, 0x01, 0x2e, 0xf6, + 0x7b, 0xa5, 0xc5, 0xed, 0x74, 0x03, 0xce, 0xea, 0xa9, 0xd7, 0x21, 0xfa, 0x98, 0x99, 0xfe, 0xdc, + 0xa9, 0x3c, 0xff, 0x73, 0xa7, 0xf6, 0x8d, 0xa7, 0xcf, 0x56, 0xce, 0x7d, 0xfc, 0x6c, 0xe5, 0xdc, + 0x27, 0xcf, 0x56, 0xce, 0xfd, 0xa0, 0xbf, 0xa2, 0x3c, 0xed, 0xaf, 0x28, 0x1f, 0xf7, 0x57, 0x94, + 0x4f, 0xfa, 0x2b, 0xca, 0x5f, 0xfb, 0x2b, 0xca, 0x87, 0x7f, 0x5b, 0x39, 0xf7, 0xde, 0x8d, 0x33, + 0xfd, 0x7e, 0xf8, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe3, 0x4b, 0xe9, 0xe0, 0xb6, 0x28, 0x00, + 0x00, } func (m *AppCluster) Marshal() (dAtA []byte, err error) { @@ -1637,6 +1639,19 @@ func (m *AppFetchGit) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.Depth != nil { + i = encodeVarintGenerated(dAtA, i, uint64(*m.Depth)) + i-- + dAtA[i] = 0x40 + } + i-- + if m.ForceHTTPBasicAuth { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x38 if m.RefSelection != nil { { size, err := m.RefSelection.MarshalToSizedBuffer(dAtA[:i]) @@ -2120,6 +2135,11 @@ func (m *AppSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.DefaultNamespace) + copy(dAtA[i:], m.DefaultNamespace) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.DefaultNamespace))) + i-- + dAtA[i] = 0x52 i-- if m.NoopDelete { dAtA[i] = 1 @@ -3292,6 +3312,10 @@ func (m *AppFetchGit) Size() (n int) { l = m.RefSelection.Size() n += 1 + l + sovGenerated(uint64(l)) } + n += 2 + if m.Depth != nil { + n += 1 + sovGenerated(uint64(*m.Depth)) + } return n } @@ -3487,6 +3511,8 @@ func (m *AppSpec) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } n += 2 + l = len(m.DefaultNamespace) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -3943,6 +3969,8 @@ func (this *AppFetchGit) String() string { `SubPath:` + fmt.Sprintf("%v", this.SubPath) + `,`, `LFSSkipSmudge:` + fmt.Sprintf("%v", this.LFSSkipSmudge) + `,`, `RefSelection:` + strings.Replace(fmt.Sprintf("%v", this.RefSelection), "VersionSelection", "v1alpha1.VersionSelection", 1) + `,`, + `ForceHTTPBasicAuth:` + fmt.Sprintf("%v", this.ForceHTTPBasicAuth) + `,`, + `Depth:` + valueToStringGenerated(this.Depth) + `,`, `}`, }, "") return s @@ -4095,6 +4123,7 @@ func (this *AppSpec) String() string { `Canceled:` + fmt.Sprintf("%v", this.Canceled) + `,`, `SyncPeriod:` + strings.Replace(fmt.Sprintf("%v", this.SyncPeriod), "Duration", "v1.Duration", 1) + `,`, `NoopDelete:` + fmt.Sprintf("%v", this.NoopDelete) + `,`, + `DefaultNamespace:` + fmt.Sprintf("%v", this.DefaultNamespace) + `,`, `}`, }, "") return s @@ -5569,6 +5598,46 @@ func (m *AppFetchGit) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 7: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ForceHTTPBasicAuth", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.ForceHTTPBasicAuth = bool(v != 0) + case 8: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Depth", wireType) + } + var v int64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.Depth = &v default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -7204,6 +7273,38 @@ func (m *AppSpec) Unmarshal(dAtA []byte) error { } } m.NoopDelete = bool(v != 0) + case 10: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DefaultNamespace", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DefaultNamespace = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto index 751896e47..299d69f76 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto @@ -3,15 +3,15 @@ syntax = "proto2"; -package github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1; +package carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1; -import "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto"; +import "carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1"; +option go_package = "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1"; // +k8s:openapi-gen=true message AppCluster { @@ -109,7 +109,7 @@ message AppFetchGit { // Specifies a strategy to resolve to an explicit ref (optional; v0.24.0+) // +optional - optional github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection refSelection = 6; + optional carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection refSelection = 6; // Secret with auth details. allowed keys: ssh-privatekey, ssh-knownhosts, username, password (optional) // (if ssh-knownhosts is not specified, git will not perform strict host checking) @@ -123,6 +123,14 @@ message AppFetchGit { // Skip lfs download (optional) // +optional optional bool lfsSkipSmudge = 5; + + // Force the usage of HTTP Basic Auth when Basic Auth is provided (optional) + // +optional + optional bool forceHTTPBasicAuth = 7; + + // depth of commits to fetch; 1 (default) means only latest commit, 0 means everything (optional) + // +optional + optional int64 depth = 8; } // +k8s:openapi-gen=true @@ -178,7 +186,7 @@ message AppFetchImage { // Specifies a strategy to choose a tag (optional; v0.24.0+) // if specified, do not include a tag in url key // +optional - optional github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 4; + optional carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 4; // Secret may include one or more keys: username, password, token. // By default anonymous access is used for authentication. @@ -199,7 +207,7 @@ message AppFetchImgpkgBundle { // Specifies a strategy to choose a tag (optional; v0.24.0+) // if specified, do not include a tag in url key // +optional - optional github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 3; + optional carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection tagSelection = 3; // Secret may include one or more keys: username, password, token. // By default anonymous access is used for authentication. @@ -280,6 +288,11 @@ message AppSpec { // (optional; default=false; v0.18.0+) // +optional optional bool noopDelete = 9; + + // Specifies the default namespace to install the App resources, by default this is + // same as the App's namespace (optional; v0.48.0+) + // +optional + optional string defaultNamespace = 10; } // +k8s:openapi-gen=true diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go similarity index 95% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go index ea53bdecc..b85712092 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go index bc97e8f65..71fc4bb2d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/status.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go similarity index 95% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go index ead900af1..9c2fb5a60 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 @@ -76,6 +76,10 @@ type AppSpec struct { // (optional; default=false; v0.18.0+) // +optional NoopDelete bool `json:"noopDelete,omitempty" protobuf:"varint,9,opt,name=noopDelete"` + // Specifies the default namespace to install the App resources, by default this is + // same as the App's namespace (optional; v0.48.0+) + // +optional + DefaultNamespace string `json:"defaultNamespace,omitempty" protobuf:"bytes,10,opt,name=defaultNamespace"` } // +k8s:openapi-gen=true diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go index cee423eff..ff52e5f03 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_deploy.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go index 2a598a09b..85b2bc489 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_fetch.go @@ -1,10 +1,10 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) // +k8s:openapi-gen=true @@ -106,6 +106,12 @@ type AppFetchGit struct { // Skip lfs download (optional) // +optional LFSSkipSmudge bool `json:"lfsSkipSmudge,omitempty" protobuf:"varint,5,opt,name=lfsSkipSmudge"` + // Force the usage of HTTP Basic Auth when Basic Auth is provided (optional) + // +optional + ForceHTTPBasicAuth bool `json:"forceHTTPBasicAuth,omitempty" protobuf:"varint,7,opt,name=forceHTTPBasicAuth"` + // depth of commits to fetch; 1 (default) means only latest commit, 0 means everything (optional) + // +optional + Depth *int64 `json:"depth,omitempty" protobuf:"bytes,8,opt,name=depth"` } // +k8s:openapi-gen=true diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go similarity index 99% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go index 1e9470d4d..09c7a0055 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/types_template.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 //nolint:revive // we're unlikely to write descriptive godoc comments in this file. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go similarity index 99% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go index b51afa929..e578693e1 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - versionsv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + versionsv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) @@ -234,6 +234,11 @@ func (in *AppFetchGit) DeepCopyInto(out *AppFetchGit) { *out = new(AppFetchLocalRef) **out = **in } + if in.Depth != nil { + in, out := &in.Depth, &out.Depth + *out = new(int64) + **out = **in + } return } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/install/install.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/install/install.go similarity index 59% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/install/install.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/install/install.go index a031b20f9..c3605cc71 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/install/install.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/install/install.go @@ -1,10 +1,10 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package install import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/doc.go similarity index 80% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/doc.go index 8b244e452..746048840 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/doc.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go index 5fa083aa9..321904465 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/package_install.go @@ -1,11 +1,11 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versions "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + versions "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) @@ -75,6 +75,10 @@ type PackageInstallSpec struct { // associated resources. // +optional NoopDelete bool `json:"noopDelete,omitempty"` + // Specifies the default namespace to install the Package resources, by default this is + // same as the PackageInstall namespace (optional; v0.48.0+) + // +optional + DefaultNamespace string `json:"defaultNamespace,omitempty"` } type PackageRef struct { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go index c622b1491..a3ec022cc 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/package_repository.go @@ -1,10 +1,10 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/register.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/register.go index dd339fb05..d718b8db5 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go index a92b8c534..ee21032b1 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1/zz_generated.deepcopy.go @@ -6,8 +6,8 @@ package v1alpha1 import ( - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versionsv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + versionsv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/doc.go similarity index 84% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/doc.go index 49fcf9474..6f30ec906 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/doc.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:deepcopy-gen=package diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/install/install.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/install/install.go similarity index 59% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/install/install.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/install/install.go index 180e2b5d0..23c06668a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/install/install.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/install/install.go @@ -1,11 +1,11 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package install import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging" + "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" "k8s.io/apimachinery/pkg/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/register.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/register.go index 4a60367b9..5fb5f57a0 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/register.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package datapackaging diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/types.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/types.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/types.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/types.go index 821fe4a03..113e43435 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/types.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/types.go @@ -1,10 +1,10 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package datapackaging import ( - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go index 2329408a8..43e2902e9 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/conversion.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go similarity index 66% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go index eecc1da5a..f978e8849 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/doc.go @@ -1,9 +1,9 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // +k8s:openapi-gen=true // +k8s:deepcopy-gen=package -// +k8s:conversion-gen=github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging +// +k8s:conversion-gen=carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging // +k8s:defaulter-gen=TypeMeta // +groupName=data.packaging.carvel.dev diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go similarity index 87% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go index 22ed0b388..4d367c581 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.pb.go @@ -1,15 +1,16 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto +// source: carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto package v1alpha1 import ( fmt "fmt" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + io "io" proto "github.com/gogo/protobuf/proto" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" math "math" math_bits "math/bits" @@ -31,7 +32,7 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *AppTemplateSpec) Reset() { *m = AppTemplateSpec{} } func (*AppTemplateSpec) ProtoMessage() {} func (*AppTemplateSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{0} + return fileDescriptor_7bb3e39432f4c5b8, []int{0} } func (m *AppTemplateSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -59,7 +60,7 @@ var xxx_messageInfo_AppTemplateSpec proto.InternalMessageInfo func (m *IncludedSoftware) Reset() { *m = IncludedSoftware{} } func (*IncludedSoftware) ProtoMessage() {} func (*IncludedSoftware) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{1} + return fileDescriptor_7bb3e39432f4c5b8, []int{1} } func (m *IncludedSoftware) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -87,7 +88,7 @@ var xxx_messageInfo_IncludedSoftware proto.InternalMessageInfo func (m *Maintainer) Reset() { *m = Maintainer{} } func (*Maintainer) ProtoMessage() {} func (*Maintainer) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{2} + return fileDescriptor_7bb3e39432f4c5b8, []int{2} } func (m *Maintainer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -115,7 +116,7 @@ var xxx_messageInfo_Maintainer proto.InternalMessageInfo func (m *Package) Reset() { *m = Package{} } func (*Package) ProtoMessage() {} func (*Package) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{3} + return fileDescriptor_7bb3e39432f4c5b8, []int{3} } func (m *Package) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -143,7 +144,7 @@ var xxx_messageInfo_Package proto.InternalMessageInfo func (m *PackageList) Reset() { *m = PackageList{} } func (*PackageList) ProtoMessage() {} func (*PackageList) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{4} + return fileDescriptor_7bb3e39432f4c5b8, []int{4} } func (m *PackageList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -171,7 +172,7 @@ var xxx_messageInfo_PackageList proto.InternalMessageInfo func (m *PackageMetadata) Reset() { *m = PackageMetadata{} } func (*PackageMetadata) ProtoMessage() {} func (*PackageMetadata) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{5} + return fileDescriptor_7bb3e39432f4c5b8, []int{5} } func (m *PackageMetadata) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -199,7 +200,7 @@ var xxx_messageInfo_PackageMetadata proto.InternalMessageInfo func (m *PackageMetadataList) Reset() { *m = PackageMetadataList{} } func (*PackageMetadataList) ProtoMessage() {} func (*PackageMetadataList) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{6} + return fileDescriptor_7bb3e39432f4c5b8, []int{6} } func (m *PackageMetadataList) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -227,7 +228,7 @@ var xxx_messageInfo_PackageMetadataList proto.InternalMessageInfo func (m *PackageMetadataSpec) Reset() { *m = PackageMetadataSpec{} } func (*PackageMetadataSpec) ProtoMessage() {} func (*PackageMetadataSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{7} + return fileDescriptor_7bb3e39432f4c5b8, []int{7} } func (m *PackageMetadataSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -255,7 +256,7 @@ var xxx_messageInfo_PackageMetadataSpec proto.InternalMessageInfo func (m *PackageSpec) Reset() { *m = PackageSpec{} } func (*PackageSpec) ProtoMessage() {} func (*PackageSpec) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{8} + return fileDescriptor_7bb3e39432f4c5b8, []int{8} } func (m *PackageSpec) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -283,7 +284,7 @@ var xxx_messageInfo_PackageSpec proto.InternalMessageInfo func (m *ValuesSchema) Reset() { *m = ValuesSchema{} } func (*ValuesSchema) ProtoMessage() {} func (*ValuesSchema) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{9} + return fileDescriptor_7bb3e39432f4c5b8, []int{9} } func (m *ValuesSchema) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -311,7 +312,7 @@ var xxx_messageInfo_ValuesSchema proto.InternalMessageInfo func (m *VersionSelection) Reset() { *m = VersionSelection{} } func (*VersionSelection) ProtoMessage() {} func (*VersionSelection) Descriptor() ([]byte, []int) { - return fileDescriptor_ff0bf4d4d6edd19a, []int{10} + return fileDescriptor_7bb3e39432f4c5b8, []int{10} } func (m *VersionSelection) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -337,98 +338,96 @@ func (m *VersionSelection) XXX_DiscardUnknown() { var xxx_messageInfo_VersionSelection proto.InternalMessageInfo func init() { - proto.RegisterType((*AppTemplateSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.AppTemplateSpec") - proto.RegisterType((*IncludedSoftware)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.IncludedSoftware") - proto.RegisterType((*Maintainer)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.Maintainer") - proto.RegisterType((*Package)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.Package") - proto.RegisterType((*PackageList)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageList") - proto.RegisterType((*PackageMetadata)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadata") - proto.RegisterType((*PackageMetadataList)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadataList") - proto.RegisterType((*PackageMetadataSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadataSpec") - proto.RegisterType((*PackageSpec)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageSpec") - proto.RegisterType((*ValuesSchema)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.ValuesSchema") - proto.RegisterType((*VersionSelection)(nil), "github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.VersionSelection") + proto.RegisterType((*AppTemplateSpec)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.AppTemplateSpec") + proto.RegisterType((*IncludedSoftware)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.IncludedSoftware") + proto.RegisterType((*Maintainer)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.Maintainer") + proto.RegisterType((*Package)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.Package") + proto.RegisterType((*PackageList)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageList") + proto.RegisterType((*PackageMetadata)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadata") + proto.RegisterType((*PackageMetadataList)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadataList") + proto.RegisterType((*PackageMetadataSpec)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageMetadataSpec") + proto.RegisterType((*PackageSpec)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.PackageSpec") + proto.RegisterType((*ValuesSchema)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.ValuesSchema") + proto.RegisterType((*VersionSelection)(nil), "carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1.VersionSelection") } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto", fileDescriptor_ff0bf4d4d6edd19a) -} - -var fileDescriptor_ff0bf4d4d6edd19a = []byte{ - // 1156 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcd, 0x6f, 0x1b, 0x45, - 0x14, 0xcf, 0x26, 0x2e, 0x76, 0xc6, 0x29, 0x31, 0x53, 0x10, 0x96, 0x0f, 0xeb, 0xc8, 0x17, 0x52, - 0xa4, 0xac, 0x69, 0x68, 0xab, 0x4a, 0x9c, 0xe2, 0x04, 0xa1, 0xd0, 0xa6, 0x8d, 0xc6, 0x55, 0x54, - 0x10, 0x6a, 0x98, 0xac, 0x5f, 0xec, 0xa9, 0xf7, 0x63, 0x3a, 0x33, 0x76, 0x09, 0x07, 0x84, 0xc4, - 0xd7, 0x0d, 0xb8, 0x71, 0xe0, 0xc2, 0x9d, 0x4b, 0xff, 0x8c, 0x88, 0x53, 0x4f, 0xa8, 0xa7, 0x88, - 0x18, 0x89, 0xbf, 0x00, 0xee, 0x68, 0xc7, 0xe3, 0xdd, 0xf5, 0x1a, 0x37, 0x25, 0x92, 0x73, 0x1b, - 0xbf, 0xaf, 0xdf, 0xfb, 0xbd, 0xf7, 0xe6, 0xed, 0x18, 0x75, 0xda, 0x4c, 0x75, 0x7a, 0x07, 0x8e, - 0x1b, 0xfa, 0xf5, 0xbe, 0xff, 0x84, 0x0a, 0x58, 0x53, 0x34, 0xf8, 0xbc, 0x57, 0x77, 0xa9, 0xe8, - 0x83, 0xb7, 0xd6, 0xa5, 0x9c, 0xaf, 0xb9, 0x61, 0xa0, 0x44, 0xe8, 0x79, 0x20, 0xea, 0xbc, 0xdb, - 0xae, 0x53, 0xce, 0x24, 0x88, 0x3e, 0x08, 0x7d, 0xaa, 0xb7, 0xa8, 0xa2, 0x9c, 0xba, 0x5d, 0xda, - 0x66, 0x41, 0xbb, 0xde, 0xbf, 0x46, 0x3d, 0xde, 0xa1, 0xd7, 0xea, 0x6d, 0x08, 0x40, 0x50, 0x05, - 0x2d, 0x87, 0x8b, 0x50, 0x85, 0xf8, 0x41, 0x82, 0xe4, 0x0c, 0x91, 0xf6, 0x35, 0x92, 0x33, 0x44, - 0xda, 0x8f, 0x90, 0xf6, 0x13, 0x24, 0x87, 0x77, 0xdb, 0x4e, 0x8c, 0xa4, 0x4f, 0xce, 0x18, 0x92, - 0x33, 0x42, 0xaa, 0xac, 0xa5, 0x38, 0xb4, 0xc3, 0x76, 0x58, 0xd7, 0x80, 0x07, 0xbd, 0x43, 0xfd, - 0x4b, 0xff, 0xd0, 0xa7, 0x61, 0x22, 0x95, 0x8f, 0xce, 0x49, 0xb9, 0x1e, 0x29, 0x5c, 0x25, 0xbc, - 0xa9, 0x1c, 0x2b, 0xd7, 0xbb, 0xb7, 0xa4, 0xc3, 0xc2, 0xc8, 0xdc, 0xa7, 0x6e, 0x87, 0x05, 0x20, - 0x8e, 0x12, 0x7f, 0x1f, 0x14, 0xad, 0xf7, 0x27, 0xbd, 0xea, 0xd3, 0xbc, 0x44, 0x2f, 0x50, 0xcc, - 0x87, 0x09, 0x87, 0x9b, 0x67, 0x39, 0x48, 0xb7, 0x03, 0x3e, 0xcd, 0xfa, 0xd5, 0xbe, 0xb2, 0xd0, - 0xf2, 0x06, 0xe7, 0xf7, 0xc1, 0xe7, 0x1e, 0x55, 0xd0, 0xe4, 0xe0, 0x62, 0x8e, 0x72, 0x92, 0x83, - 0x5b, 0xb6, 0x56, 0xac, 0xd5, 0xe2, 0x3a, 0x71, 0xce, 0xd9, 0x25, 0x67, 0x54, 0x9c, 0xb8, 0x2d, - 0xce, 0x06, 0xe7, 0x11, 0x42, 0xa3, 0x30, 0x38, 0xa9, 0xe6, 0xa2, 0x13, 0xd1, 0x48, 0xb5, 0x5f, - 0x2d, 0x54, 0xda, 0x0e, 0x5c, 0xaf, 0xd7, 0x82, 0x56, 0x33, 0x3c, 0x54, 0x11, 0x08, 0xbe, 0x81, - 0x8a, 0x2d, 0x26, 0xb9, 0x47, 0x8f, 0xee, 0x52, 0x1f, 0x74, 0x36, 0x8b, 0x8d, 0x2b, 0xc7, 0x27, - 0xd5, 0xb9, 0xc1, 0x49, 0xb5, 0xb8, 0x95, 0xa8, 0x48, 0xda, 0x0e, 0x5f, 0x45, 0xf9, 0x3e, 0x08, - 0xc9, 0xc2, 0xa0, 0x3c, 0xaf, 0x5d, 0x96, 0x8d, 0x4b, 0x7e, 0x6f, 0x28, 0x26, 0x23, 0xbd, 0x46, - 0x00, 0xe9, 0x0a, 0xc6, 0x55, 0x64, 0xbe, 0x90, 0x41, 0x48, 0x54, 0x24, 0x6d, 0x57, 0x73, 0x10, - 0xda, 0xa1, 0x2c, 0x50, 0x34, 0xaa, 0x32, 0x5e, 0x41, 0xb9, 0x20, 0xc9, 0x6f, 0xc9, 0x78, 0xe7, - 0x74, 0x62, 0x5a, 0x53, 0xfb, 0xc7, 0x42, 0xf9, 0x5d, 0x3d, 0xa3, 0x80, 0x3f, 0x45, 0x85, 0xa8, - 0xe7, 0xd1, 0xd8, 0x9a, 0xfa, 0xbe, 0xe3, 0x0c, 0x5b, 0xe7, 0xa4, 0x5b, 0x97, 0x14, 0x31, 0xb2, - 0x76, 0xfa, 0xd7, 0x9c, 0x7b, 0x07, 0x8f, 0xc0, 0x55, 0x3b, 0xa0, 0x68, 0x03, 0x1b, 0x0c, 0x94, - 0xc8, 0x48, 0x1c, 0x15, 0x7f, 0x67, 0x99, 0xf6, 0xcd, 0xeb, 0xf0, 0xe0, 0xcc, 0xea, 0x92, 0x39, - 0x86, 0x93, 0xee, 0x68, 0xcc, 0x3b, 0xd5, 0xd5, 0xbf, 0x2d, 0x54, 0x34, 0x36, 0x77, 0x98, 0x54, - 0xf8, 0x93, 0x09, 0xee, 0xce, 0xcb, 0x71, 0x8f, 0xbc, 0x35, 0xf3, 0x92, 0x41, 0x29, 0x8c, 0x24, - 0x29, 0xde, 0xdf, 0x5a, 0xe8, 0x12, 0x53, 0xe0, 0xcb, 0xf2, 0xfc, 0xca, 0xc2, 0x6a, 0x71, 0x9d, - 0xce, 0x9c, 0x78, 0xe3, 0xb2, 0x49, 0xe7, 0xd2, 0x76, 0x84, 0x4b, 0x86, 0xf0, 0xb5, 0x6f, 0xe6, - 0xd1, 0xb2, 0xb1, 0xd8, 0x19, 0x25, 0x37, 0xfb, 0xb6, 0xff, 0x30, 0xde, 0x76, 0x7f, 0xe6, 0xec, - 0x47, 0xdc, 0xa6, 0xb6, 0xff, 0xeb, 0x79, 0x74, 0x25, 0x63, 0x7b, 0x01, 0x63, 0xf0, 0x7d, 0x66, - 0x0c, 0xd8, 0x85, 0x15, 0x62, 0xca, 0x38, 0xfc, 0x95, 0x9b, 0x28, 0x83, 0xde, 0xb2, 0xe7, 0x5c, - 0x6f, 0x1b, 0x68, 0xd9, 0x0b, 0x83, 0x76, 0x6a, 0x39, 0x99, 0x35, 0xf7, 0xa6, 0x71, 0x5d, 0xbe, - 0x33, 0xae, 0x26, 0x59, 0x7b, 0xbc, 0x85, 0x4a, 0xb2, 0x13, 0x0a, 0xb5, 0x35, 0xb1, 0xfb, 0xca, - 0x26, 0x46, 0xa9, 0x99, 0xd1, 0x93, 0x09, 0x0f, 0xfc, 0x1e, 0xba, 0xcc, 0xdc, 0x30, 0x68, 0xee, - 0x7d, 0xd0, 0xa0, 0x12, 0x6e, 0x5e, 0x2f, 0xe7, 0x74, 0x88, 0x37, 0x4c, 0x88, 0xcb, 0xdb, 0x69, - 0x25, 0x19, 0xb7, 0xc5, 0xb7, 0xd0, 0x12, 0x17, 0x61, 0x9f, 0xb5, 0x40, 0x68, 0xf6, 0x97, 0xb4, - 0xef, 0xeb, 0xc6, 0x77, 0x69, 0x37, 0xa5, 0x23, 0x63, 0x96, 0xf8, 0x67, 0x0b, 0x15, 0xfd, 0x78, - 0xfb, 0xca, 0xf2, 0x2b, 0xba, 0xcb, 0xad, 0xd9, 0x75, 0x39, 0x59, 0xf5, 0x49, 0x77, 0x12, 0x99, - 0x24, 0xe9, 0x6c, 0xb0, 0x83, 0x90, 0x4b, 0x15, 0xb4, 0x43, 0xc1, 0x40, 0x96, 0xf3, 0x2b, 0x0b, - 0xab, 0x8b, 0x8d, 0x57, 0xa3, 0x3b, 0xbb, 0x19, 0x4b, 0x49, 0xca, 0x02, 0x7f, 0x88, 0xb0, 0xec, - 0x71, 0x9e, 0x69, 0x46, 0x41, 0x57, 0xa3, 0x62, 0xd0, 0x70, 0x73, 0xc2, 0x82, 0xfc, 0x87, 0x57, - 0xed, 0x29, 0x8a, 0xd7, 0xad, 0x1e, 0xb0, 0xab, 0x28, 0x2f, 0xe0, 0x30, 0x35, 0x5c, 0xf1, 0x87, - 0x90, 0x0c, 0xc5, 0x64, 0xa4, 0xff, 0x3f, 0xdf, 0xcc, 0x55, 0x54, 0xf0, 0x98, 0x0b, 0x81, 0x04, - 0x59, 0x5e, 0xd0, 0xfc, 0x96, 0x86, 0x37, 0x71, 0x28, 0x23, 0xb1, 0x16, 0x3f, 0x44, 0x48, 0x80, - 0x07, 0x54, 0x42, 0x6b, 0x43, 0xe9, 0xe9, 0x28, 0xae, 0xbf, 0xfd, 0x72, 0x37, 0xfd, 0x3e, 0xf3, - 0x21, 0xd9, 0x77, 0x24, 0x8e, 0x42, 0x52, 0x11, 0xf1, 0x63, 0x54, 0x75, 0xa3, 0x86, 0x31, 0x75, - 0x44, 0xe0, 0x71, 0x8f, 0x09, 0xf0, 0x21, 0x50, 0x32, 0x5d, 0xc8, 0xe1, 0x58, 0xbd, 0x65, 0x02, - 0x55, 0x37, 0x23, 0x73, 0xc5, 0xa6, 0x99, 0x93, 0xb3, 0xe2, 0x45, 0x63, 0x6b, 0x12, 0xb8, 0x1b, - 0x2a, 0x88, 0x86, 0x6f, 0x6c, 0x6c, 0x49, 0x4a, 0x47, 0xc6, 0x2c, 0xf1, 0x4f, 0x16, 0x2a, 0x28, - 0xf3, 0xc8, 0x2a, 0xe7, 0x75, 0x2d, 0x66, 0xb8, 0x99, 0x32, 0x2f, 0xba, 0x64, 0x61, 0x8e, 0xa4, - 0x24, 0x4e, 0x06, 0xff, 0x62, 0xa1, 0xa5, 0x3e, 0xf5, 0x7a, 0x20, 0x9b, 0xfa, 0x89, 0xa8, 0xa7, - 0xaf, 0xb8, 0x7e, 0x38, 0xbb, 0xec, 0xf6, 0x52, 0x68, 0x49, 0xf1, 0xd2, 0x52, 0x32, 0x96, 0x11, - 0x7e, 0x6a, 0xa1, 0x12, 0xcb, 0x3c, 0x0f, 0xcb, 0x8b, 0xfa, 0xe2, 0x3f, 0x9a, 0x5d, 0x9a, 0xd9, - 0x07, 0x69, 0xb2, 0x1d, 0xb3, 0x1a, 0x32, 0x91, 0x1d, 0xfe, 0xdd, 0x42, 0x76, 0x04, 0xbd, 0x19, - 0x23, 0x9b, 0x9b, 0xd4, 0x04, 0x0f, 0x5c, 0x3d, 0x9c, 0x48, 0xd7, 0x79, 0x86, 0x04, 0xb2, 0x88, - 0x8d, 0xda, 0xe0, 0xa4, 0x6a, 0xdf, 0x7e, 0x61, 0x56, 0xe4, 0x8c, 0xac, 0xf1, 0x6f, 0x16, 0xaa, - 0x74, 0x7b, 0x07, 0x20, 0x02, 0x50, 0x20, 0x27, 0x48, 0x15, 0x2f, 0x9c, 0x94, 0x3d, 0x38, 0xa9, - 0x56, 0x6e, 0x4f, 0xcd, 0x88, 0xbc, 0x20, 0xdb, 0x5a, 0x80, 0xc6, 0xc6, 0x0e, 0x3f, 0x44, 0x8b, - 0x21, 0x87, 0x60, 0x63, 0x77, 0xbb, 0xff, 0xae, 0x79, 0x9b, 0xac, 0x4d, 0xdd, 0x58, 0xe6, 0x9f, - 0x95, 0x43, 0xe8, 0x93, 0xf7, 0x3f, 0x53, 0x10, 0x44, 0xa1, 0x1b, 0xaf, 0x99, 0x19, 0x59, 0xbc, - 0x37, 0x8a, 0x43, 0x92, 0x90, 0xb5, 0x6d, 0x54, 0x9a, 0x28, 0xe8, 0x0d, 0x54, 0x74, 0xc3, 0x40, - 0x2a, 0x11, 0x7d, 0x46, 0x64, 0xf6, 0x1d, 0xb0, 0x99, 0xa8, 0x48, 0xda, 0xae, 0xf1, 0xc5, 0xf1, - 0xa9, 0x3d, 0xf7, 0xec, 0xd4, 0x9e, 0x7b, 0x7e, 0x6a, 0xcf, 0x7d, 0x39, 0xb0, 0xad, 0xe3, 0x81, - 0x6d, 0x3d, 0x1b, 0xd8, 0xd6, 0xf3, 0x81, 0x6d, 0xfd, 0x31, 0xb0, 0xad, 0x1f, 0xff, 0xb4, 0xe7, - 0x3e, 0x7e, 0x30, 0xab, 0xff, 0xf2, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xaf, 0x1f, 0xcd, - 0x26, 0x10, 0x00, 0x00, + proto.RegisterFile("carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto", fileDescriptor_7bb3e39432f4c5b8) +} + +var fileDescriptor_7bb3e39432f4c5b8 = []byte{ + // 1134 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x57, 0xcf, 0x6e, 0x1b, 0x45, + 0x18, 0xcf, 0x26, 0x0e, 0xb6, 0xc7, 0x09, 0x31, 0x53, 0x10, 0x56, 0x0e, 0xeb, 0xc8, 0x17, 0x52, + 0xa4, 0x8c, 0x49, 0x68, 0xab, 0x4a, 0x48, 0x48, 0x71, 0x52, 0xa1, 0xd0, 0xa6, 0x0d, 0xe3, 0x10, + 0x09, 0x54, 0x15, 0x26, 0xeb, 0x2f, 0xce, 0xd6, 0xfb, 0x67, 0x3a, 0x33, 0x76, 0x09, 0x5c, 0x90, + 0x38, 0x70, 0xe1, 0xc0, 0x03, 0xf0, 0x06, 0xdc, 0x79, 0x00, 0x4e, 0x39, 0x70, 0xa8, 0x38, 0xf5, + 0x14, 0x1a, 0xf3, 0x00, 0xf0, 0x08, 0x68, 0xc7, 0xe3, 0xdd, 0xf5, 0x1a, 0x37, 0x01, 0x39, 0xbd, + 0x8d, 0xbf, 0x3f, 0xbf, 0xef, 0xcf, 0xef, 0x9b, 0x6f, 0xc7, 0x68, 0xdf, 0x61, 0xa2, 0x07, 0x1e, + 0x69, 0x41, 0xaf, 0xde, 0x61, 0x9c, 0xaf, 0x39, 0x61, 0xa0, 0x44, 0xe8, 0x79, 0x20, 0xea, 0xbc, + 0xd3, 0xae, 0x33, 0xee, 0x4a, 0x10, 0x3d, 0x10, 0xfa, 0x54, 0x6f, 0x31, 0xc5, 0x38, 0x73, 0x3a, + 0xac, 0xed, 0x06, 0xed, 0x7a, 0x6f, 0x9d, 0x79, 0xfc, 0x98, 0xad, 0xd7, 0xdb, 0x10, 0x80, 0x60, + 0x0a, 0x5a, 0x84, 0x8b, 0x50, 0x85, 0x78, 0x3b, 0x41, 0x25, 0x11, 0xea, 0x17, 0x09, 0x2a, 0xe1, + 0x9d, 0x36, 0x89, 0x51, 0xf5, 0x89, 0x8c, 0xa0, 0x92, 0x21, 0xea, 0xf2, 0x9d, 0x4b, 0xe4, 0xa6, + 0x15, 0x8e, 0x12, 0xde, 0xc4, 0x64, 0x96, 0xd7, 0xda, 0xae, 0x3a, 0xee, 0x1e, 0x12, 0x27, 0xf4, + 0xeb, 0xed, 0xb0, 0x1d, 0xd6, 0xb5, 0xf8, 0xb0, 0x7b, 0xa4, 0x7f, 0xe9, 0x1f, 0xfa, 0x64, 0xcc, + 0x6f, 0x74, 0x6e, 0x4b, 0xe2, 0x86, 0x11, 0xba, 0xcf, 0x9c, 0x63, 0x37, 0x00, 0x71, 0x92, 0x84, + 0xf3, 0x41, 0xb1, 0x7a, 0x6f, 0x3c, 0x48, 0x7d, 0x92, 0x97, 0xe8, 0x06, 0xca, 0xf5, 0x61, 0xcc, + 0xe1, 0xd6, 0x45, 0x0e, 0xd2, 0x39, 0x06, 0x9f, 0x65, 0xfd, 0x6a, 0x21, 0x5a, 0xda, 0xe4, 0x7c, + 0x1f, 0x7c, 0xee, 0x31, 0x05, 0x4d, 0x0e, 0x0e, 0x7e, 0x88, 0x72, 0x92, 0x83, 0x53, 0xb1, 0x56, + 0xac, 0xd5, 0xd2, 0xc6, 0x87, 0xe4, 0x12, 0xcd, 0x27, 0xc3, 0xb6, 0xc5, 0xdd, 0x26, 0x9b, 0x9c, + 0x47, 0x68, 0x8d, 0x42, 0xff, 0xac, 0x9a, 0x8b, 0x4e, 0x54, 0xa3, 0xd6, 0x7e, 0xb6, 0x50, 0x79, + 0x27, 0x70, 0xbc, 0x6e, 0x0b, 0x5a, 0xcd, 0xf0, 0x48, 0x3d, 0x65, 0x02, 0xf0, 0x4d, 0x54, 0x6a, + 0xb9, 0x92, 0x7b, 0xec, 0xe4, 0x3e, 0xf3, 0x41, 0x47, 0x2e, 0x36, 0xae, 0x9d, 0x9e, 0x55, 0x67, + 0xfa, 0x67, 0xd5, 0xd2, 0x76, 0xa2, 0xa2, 0x69, 0x3b, 0x7c, 0x1d, 0xe5, 0x7b, 0x20, 0xa4, 0x1b, + 0x06, 0x95, 0x59, 0xed, 0xb2, 0x64, 0x5c, 0xf2, 0x07, 0x03, 0x31, 0x1d, 0xea, 0x75, 0x04, 0x90, + 0x8e, 0x70, 0xb9, 0x8a, 0xcc, 0xe7, 0x32, 0x11, 0x12, 0x15, 0x4d, 0xdb, 0xd5, 0x08, 0x42, 0xbb, + 0xcc, 0x0d, 0x14, 0x8b, 0x1a, 0x8a, 0x57, 0x50, 0x2e, 0x48, 0xf2, 0x5b, 0x30, 0xde, 0x39, 0x9d, + 0x98, 0xd6, 0xd4, 0x5e, 0x58, 0x28, 0xbf, 0xa7, 0x47, 0x0f, 0xf0, 0x97, 0xa8, 0x10, 0xd1, 0x1b, + 0x4d, 0xa3, 0xe9, 0xe5, 0x7b, 0x64, 0xc0, 0x12, 0x49, 0xb3, 0x94, 0x34, 0x31, 0xb2, 0x26, 0xbd, + 0x75, 0xf2, 0xe0, 0xf0, 0x31, 0x38, 0x6a, 0x17, 0x14, 0x6b, 0x60, 0x13, 0x03, 0x25, 0x32, 0x1a, + 0xa3, 0x62, 0x69, 0x98, 0x9a, 0xd5, 0xe8, 0x9f, 0x90, 0x69, 0x5c, 0x13, 0x62, 0xd2, 0xd7, 0xe4, + 0xc5, 0x25, 0xa6, 0x08, 0xfc, 0xc3, 0x42, 0x25, 0x63, 0x73, 0xcf, 0x95, 0x0a, 0x3f, 0x1c, 0x2b, + 0x93, 0x5c, 0xae, 0xcc, 0xc8, 0x5b, 0x17, 0x59, 0x36, 0x51, 0x0a, 0x43, 0x49, 0xaa, 0x44, 0x81, + 0xe6, 0x5d, 0x05, 0xbe, 0xac, 0xcc, 0xae, 0xcc, 0xad, 0x96, 0x36, 0x76, 0xa7, 0x5a, 0x63, 0x63, + 0xd1, 0x44, 0x9e, 0xdf, 0x89, 0x62, 0xd0, 0x41, 0xa8, 0xda, 0xdf, 0x16, 0x5a, 0x32, 0x16, 0xbb, + 0xc3, 0x3c, 0xae, 0x9e, 0xcc, 0x6f, 0x46, 0xc8, 0xfc, 0x6c, 0xaa, 0x85, 0x0e, 0xcb, 0x98, 0x48, + 0xea, 0x5f, 0x16, 0xba, 0x96, 0xb1, 0x7d, 0x05, 0xe4, 0x7e, 0x3d, 0x4a, 0xee, 0xa7, 0x57, 0x52, + 0xf3, 0x04, 0x92, 0x7f, 0xcf, 0x8d, 0x55, 0xac, 0xb7, 0xdf, 0xff, 0x5c, 0x45, 0x9b, 0x68, 0xc9, + 0x0b, 0x83, 0x76, 0x6a, 0x91, 0x98, 0x95, 0xf4, 0xb6, 0x71, 0x5d, 0xba, 0x37, 0xaa, 0xa6, 0x59, + 0x7b, 0xbc, 0x8d, 0xca, 0xf2, 0x38, 0x14, 0x6a, 0x7b, 0x6c, 0x4f, 0x55, 0x0c, 0x46, 0xb9, 0x99, + 0xd1, 0xd3, 0x31, 0x0f, 0xfc, 0x01, 0x5a, 0x74, 0x9d, 0x30, 0x68, 0x1e, 0x7c, 0xd4, 0x60, 0x12, + 0x6e, 0xdd, 0xa8, 0xe4, 0x34, 0xc4, 0x5b, 0x06, 0x62, 0x71, 0x27, 0xad, 0xa4, 0xa3, 0xb6, 0xf8, + 0x36, 0x5a, 0xe0, 0x22, 0xec, 0xb9, 0x2d, 0x10, 0xba, 0xfa, 0x79, 0xed, 0xfb, 0xa6, 0xf1, 0x5d, + 0xd8, 0x4b, 0xe9, 0xe8, 0x88, 0x25, 0xfe, 0xde, 0x42, 0x25, 0x3f, 0xde, 0x94, 0xb2, 0xf2, 0x9a, + 0x66, 0x74, 0x6f, 0x3a, 0x8c, 0x26, 0x2b, 0x38, 0x61, 0x22, 0x91, 0x49, 0x9a, 0x8e, 0x8c, 0x09, + 0x42, 0x0e, 0x53, 0xd0, 0x0e, 0x85, 0x0b, 0xb2, 0x92, 0x5f, 0x99, 0x5b, 0x2d, 0x36, 0x5e, 0x8f, + 0x6e, 0xdd, 0x56, 0x2c, 0xa5, 0x29, 0x0b, 0xfc, 0x31, 0xc2, 0xb2, 0xcb, 0x79, 0xa6, 0xf1, 0x05, + 0x5d, 0xf9, 0xb2, 0x89, 0x86, 0x9b, 0x63, 0x16, 0xf4, 0x5f, 0xbc, 0x6a, 0xbf, 0x15, 0xe3, 0xdd, + 0xa8, 0x87, 0xe9, 0x3a, 0xca, 0x0b, 0x38, 0x4a, 0x0d, 0x52, 0xfc, 0x81, 0xa2, 0x03, 0x31, 0x1d, + 0xea, 0xff, 0xcb, 0xb7, 0x6c, 0x15, 0x15, 0x3c, 0xd7, 0x81, 0x40, 0x82, 0xac, 0xcc, 0xe9, 0xfa, + 0x16, 0x06, 0x17, 0x6c, 0x20, 0xa3, 0xb1, 0x16, 0x3f, 0x42, 0x48, 0x80, 0x07, 0x4c, 0x42, 0x6b, + 0x53, 0xe9, 0x49, 0x28, 0x6d, 0xbc, 0x7b, 0xb9, 0x0b, 0xbc, 0xef, 0xfa, 0x90, 0x6c, 0x2c, 0x1a, + 0xa3, 0xd0, 0x14, 0x22, 0x7e, 0x82, 0xaa, 0x4e, 0x44, 0x98, 0xab, 0x4e, 0x28, 0x3c, 0xe9, 0xba, + 0x02, 0x7c, 0x08, 0x94, 0x4c, 0x37, 0x72, 0x30, 0x42, 0xef, 0x18, 0xa0, 0xea, 0x56, 0x64, 0xae, + 0xdc, 0x49, 0xe6, 0xf4, 0x22, 0xbc, 0x68, 0x44, 0x4d, 0x02, 0xf7, 0x43, 0x05, 0xd1, 0xa0, 0x8d, + 0x8c, 0x28, 0x4d, 0xe9, 0xe8, 0x88, 0x25, 0xfe, 0xce, 0x42, 0x05, 0x65, 0x1e, 0x3a, 0x95, 0xbc, + 0xee, 0xc5, 0x94, 0x36, 0x4e, 0xe6, 0x05, 0x95, 0xec, 0xbc, 0xa1, 0x94, 0xc6, 0x81, 0xf1, 0x0f, + 0x16, 0x5a, 0xe8, 0x31, 0xaf, 0x0b, 0xb2, 0xa9, 0x5f, 0x64, 0x7a, 0xd2, 0x4a, 0x1b, 0x74, 0x3a, + 0x99, 0x1c, 0xa4, 0x90, 0x93, 0xa6, 0xa4, 0xa5, 0x74, 0x24, 0x3a, 0xfe, 0xc9, 0x42, 0x65, 0x37, + 0xf3, 0x1c, 0xab, 0x14, 0xf5, 0xe5, 0x3d, 0x98, 0x4e, 0x4a, 0xd9, 0xc7, 0x5e, 0xb2, 0xcd, 0xb2, + 0x1a, 0x3a, 0x96, 0x09, 0xfe, 0xd5, 0x42, 0x76, 0x14, 0x7a, 0x2b, 0x8e, 0x6c, 0x6e, 0x43, 0x13, + 0x3c, 0x70, 0xf4, 0x80, 0x21, 0xdd, 0xbf, 0x29, 0x25, 0x9b, 0x45, 0x6f, 0xd4, 0xfa, 0x67, 0x55, + 0xfb, 0xee, 0x4b, 0x33, 0xa0, 0x17, 0x64, 0x88, 0x7f, 0xb1, 0xd0, 0x72, 0xa7, 0x7b, 0x08, 0x22, + 0x00, 0x05, 0x72, 0xac, 0x80, 0xd2, 0x95, 0x16, 0x60, 0xf7, 0xcf, 0xaa, 0xcb, 0x77, 0x27, 0x46, + 0xa7, 0x2f, 0xc9, 0xac, 0x16, 0xa0, 0x91, 0xd1, 0xc1, 0x8f, 0x50, 0x31, 0xe4, 0x10, 0x6c, 0xee, + 0xed, 0xf4, 0xde, 0x37, 0xcf, 0x81, 0xb5, 0x89, 0xdb, 0xc4, 0xfc, 0xf1, 0x20, 0x94, 0x3d, 0xbd, + 0xf3, 0x95, 0x82, 0x20, 0x82, 0x6e, 0xbc, 0x61, 0xb8, 0x2f, 0x3e, 0x18, 0xe2, 0xd0, 0x04, 0xb2, + 0xb6, 0x83, 0xca, 0x63, 0xcd, 0xbb, 0x89, 0x4a, 0x4e, 0x18, 0x48, 0x25, 0xa2, 0x15, 0x2f, 0xb3, + 0xdf, 0xe3, 0xad, 0x44, 0x45, 0xd3, 0x76, 0x8d, 0xc7, 0xa7, 0xe7, 0xf6, 0xcc, 0xb3, 0x73, 0x7b, + 0xe6, 0xf9, 0xb9, 0x3d, 0xf3, 0x6d, 0xdf, 0xb6, 0x4e, 0xfb, 0xb6, 0xf5, 0xac, 0x6f, 0x5b, 0xcf, + 0xfb, 0xb6, 0xf5, 0xa2, 0x6f, 0x5b, 0x3f, 0xfe, 0x69, 0xcf, 0x7c, 0xbe, 0x3d, 0x8d, 0xbf, 0xab, + 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xc3, 0xbf, 0xa9, 0xa0, 0xf5, 0x0e, 0x00, 0x00, } func (m *AppTemplateSpec) Marshal() (dAtA []byte, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto index 642485bf1..ba0283c01 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/generated.proto @@ -3,18 +3,18 @@ syntax = "proto2"; -package github.com.vmware_tanzu.carvel_kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1; +package carvel.dev.kapp_controller.pkg.apiserver.apis.datapackaging.v1alpha1; -import "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto"; +import "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1/generated.proto"; import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/generated.proto"; import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto"; // Package-wide variables from generator "generated". -option go_package = "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"; +option go_package = "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1"; message AppTemplateSpec { - optional github.com.vmware_tanzu.carvel_kapp_controller.pkg.apis.kappctrl.v1alpha1.AppSpec spec = 1; + optional carvel.dev.kapp_controller.pkg.apis.kappctrl.v1alpha1.AppSpec spec = 1; } // IncludedSoftware contains the underlying Software Contents of a Package diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/register.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/register.go index 246a13f56..bef6070d2 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/register.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/types.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/types.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/types.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/types.go index 7df844104..b2407e517 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/types.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/types.go @@ -1,10 +1,10 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 import ( - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go similarity index 99% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go index e7e38a148..d077553b0 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.conversion.go @@ -8,8 +8,8 @@ package v1alpha1 import ( unsafe "unsafe" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - datapackaging "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + datapackaging "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging" conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go index f42edfdf5..e41194470 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package v1alpha1 import ( - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go index 64f5f0100..316e35db4 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/zz_generated.deepcopy.go @@ -6,7 +6,7 @@ package datapackaging import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" runtime "k8s.io/apimachinery/pkg/runtime" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/clientset.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/clientset.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/clientset.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/clientset.go index f0280faf0..9dc57d5ba 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/clientset.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/clientset.go @@ -6,7 +6,7 @@ import ( "fmt" "net/http" - datav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1" + datav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -17,8 +17,7 @@ type Interface interface { DataV1alpha1() datav1alpha1.DataV1alpha1Interface } -// Clientset contains the clients for groups. Each group has exactly one -// version included in a Clientset. +// Clientset contains the clients for groups. type Clientset struct { *discovery.DiscoveryClient dataV1alpha1 *datav1alpha1.DataV1alpha1Client diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go similarity index 83% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go index 7ebb09a3b..df03dc1d8 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/clientset_generated.go @@ -3,9 +3,9 @@ package fake import ( - clientset "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned" - datav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1" - fakedatav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake" + clientset "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned" + datav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1" + fakedatav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/register.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/register.go index 01889eb14..7308944aa 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/fake/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/fake/register.go @@ -3,7 +3,7 @@ package fake import ( - datav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + datav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/register.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/register.go index 6ada23c67..d6365865a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme/register.go @@ -3,7 +3,7 @@ package scheme import ( - datav1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + datav1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go index dfb3ceb2e..3c711113d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/datapackaging_client.go @@ -5,8 +5,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go similarity index 83% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go index 2e92b5914..c10deffe4 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_datapackaging_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go index b437380a1..0da7130ab 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_package.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakePackages struct { ns string } -var packagesResource = schema.GroupVersionResource{Group: "data.packaging.carvel.dev", Version: "v1alpha1", Resource: "packages"} +var packagesResource = v1alpha1.SchemeGroupVersion.WithResource("packages") -var packagesKind = schema.GroupVersionKind{Group: "data.packaging.carvel.dev", Version: "v1alpha1", Kind: "Package"} +var packagesKind = v1alpha1.SchemeGroupVersion.WithKind("Package") // Get takes name of the foo_Package, and returns the corresponding foo_Package object, and an error if there is any. func (c *FakePackages) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Package, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go index 8048b35c9..f57560388 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/fake/fake_foo_packagemetadata.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakePackageMetadatas struct { ns string } -var packagemetadatasResource = schema.GroupVersionResource{Group: "data.packaging.carvel.dev", Version: "v1alpha1", Resource: "packagemetadatas"} +var packagemetadatasResource = v1alpha1.SchemeGroupVersion.WithResource("packagemetadatas") -var packagemetadatasKind = schema.GroupVersionKind{Group: "data.packaging.carvel.dev", Version: "v1alpha1", Kind: "PackageMetadata"} +var packagemetadatasKind = v1alpha1.SchemeGroupVersion.WithKind("PackageMetadata") // Get takes name of the foo_PackageMetadata, and returns the corresponding foo_PackageMetadata object, and an error if there is any. func (c *FakePackageMetadatas) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PackageMetadata, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go index c050569f3..b8fe6c247 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_package.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go index ca89aafb9..015b5d5ed 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/foo_packagemetadata.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/generated_expansion.go b/cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/generated_expansion.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/generated_expansion.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned/typed/datapackaging/v1alpha1/generated_expansion.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app.go similarity index 86% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/app.go index 8ac6eec15..fcb917ec8 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -7,15 +7,16 @@ import ( "sync" "time" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/deploy" + "carvel.dev/kapp-controller/pkg/fetch" + "carvel.dev/kapp-controller/pkg/metrics" + "carvel.dev/kapp-controller/pkg/reftracker" + "carvel.dev/kapp-controller/pkg/template" "github.com/go-logr/logr" "github.com/k14s/semver/v4" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/metrics" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/template" v1 "k8s.io/api/core/v1" + "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" ) @@ -56,7 +57,7 @@ type App struct { log logr.Logger opts Opts - appMetrics *metrics.AppMetrics + appMetrics *metrics.Metrics pendingStatusUpdate bool flushAllStatusUpdates bool @@ -65,7 +66,7 @@ type App struct { func NewApp(app v1alpha1.App, hooks Hooks, fetchFactory fetch.Factory, templateFactory template.Factory, - deployFactory deploy.Factory, log logr.Logger, opts Opts, appMetrics *metrics.AppMetrics, compInfo ComponentInfo) *App { + deployFactory deploy.Factory, log logr.Logger, opts Opts, appMetrics *metrics.Metrics, compInfo ComponentInfo) *App { return &App{app: app, appPrev: *(app.DeepCopy()), hooks: hooks, fetchFactory: fetchFactory, templateFactory: templateFactory, @@ -75,6 +76,9 @@ func NewApp(app v1alpha1.App, hooks Hooks, func (a *App) Name() string { return a.app.Name } func (a *App) Namespace() string { return a.app.Namespace } +// Kind return kind of App +func (a *App) Kind() string { return "App" } + func (a *App) Status() v1alpha1.AppStatus { return a.app.Status } func (a *App) StatusAsYAMLBytes() ([]byte, error) { @@ -276,6 +280,38 @@ func (a *App) ConfigMapRefs() map[reftracker.RefKey]struct{} { return configMaps } +func (a *App) noopDeleteDueToTerminatingNamespaces() bool { + if a.app.Status.Deploy == nil || a.app.Status.Deploy.KappDeployStatus == nil || a.app.Spec.ServiceAccountName == "" { + return false + } + if !a.isNamespaceTerminatingOrTerminated(a.app.Namespace) { + return false + } + // Ensure that no cluster scoped resources are created by the app + // and all affected namespaces are terminating + for _, ns := range a.app.Status.Deploy.KappDeployStatus.AssociatedResources.Namespaces { + if ns == "(cluster)" { + return false + } + if !a.isNamespaceTerminatingOrTerminated(ns) { + return false + } + } + a.log.Info("Safely performing noop delete to avoid blocking namespace deletion") + return true +} + +func (a *App) isNamespaceTerminatingOrTerminated(namespace string) bool { + status, err := a.compInfo.NamespaceStatus(namespace) + if err != nil { + if errors.IsNotFound(err) { + return true + } + a.log.Error(err, "Error getting app namespace status", "app", a.app.Name, "namespace", a.app.Namespace) + } + return status.Phase == v1.NamespaceTerminating +} + // HasImageOrImgpkgBundle is used to determine if the // App's spec contains a fetch stage for an image or // imgpkgbundle. It is mainly used to determine whether @@ -292,11 +328,3 @@ func (a App) HasImageOrImgpkgBundle() bool { } return false } - -func (a App) isNamespaceTerminating() bool { - status, err := a.compInfo.NamespaceStatus(a.app.Namespace) - if err != nil { - a.log.Error(err, "Error getting app namespace status", "app", a.app.Name, "namespace", a.app.Namespace) - } - return status.Phase == v1.NamespaceTerminating -} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_deploy.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_deploy.go similarity index 78% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_deploy.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/app_deploy.go index ae5aa08b7..e91fcdf2a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_deploy.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_deploy.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -6,10 +6,10 @@ package app import ( "fmt" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - ctldep "github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + ctldep "carvel.dev/kapp-controller/pkg/deploy" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/kubeconfig" ) func (a *App) deploy(tplOutput string, changedFunc func(exec.CmdRunResult)) exec.CmdRunResult { @@ -57,15 +57,7 @@ func (a *App) delete(changedFunc func(exec.CmdRunResult)) exec.CmdRunResult { var result exec.CmdRunResult - appResourcesInSameNs := a.app.Status.Deploy != nil && a.app.Status.Deploy.KappDeployStatus != nil && - len(a.app.Status.Deploy.KappDeployStatus.AssociatedResources.Namespaces) == 1 && - a.app.Status.Deploy.KappDeployStatus.AssociatedResources.Namespaces[0] == a.app.Namespace - - // Use noopDelete if the namespace is terminating and app resources are in same namespace because - // the app resources will be automatically deleted including the kapp ServiceAccount - noopDelete := a.isNamespaceTerminating() && appResourcesInSameNs && a.app.Spec.Cluster == nil - - if !a.app.Spec.NoopDelete && !noopDelete { + if !a.app.Spec.NoopDelete && !a.noopDeleteDueToTerminatingNamespaces() { for _, dep := range a.app.Spec.Deploy { switch { case dep.Kapp != nil: @@ -146,7 +138,9 @@ func (a *App) trySaveMetadata(kapp *ctldep.Kapp) { func (a *App) newKapp(kapp v1alpha1.AppDeployKapp, cancelCh chan struct{}) (*ctldep.Kapp, error) { return a.deployFactory.NewKapp(kapp, a.app.Spec.ServiceAccountName, - a.app.Spec.Cluster, cancelCh, kubeconfig.AccessLocation{Name: a.app.Name, Namespace: a.app.Namespace}) + a.app.Spec.Cluster, cancelCh, kubeconfig.AccessLocation{Name: a.app.Name, Namespace: a.app.Namespace}, + a.app.Spec.DefaultNamespace, a.app.Namespace, + ) } type cancelCondition func(v1alpha1.App) bool diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_factory.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_factory.go similarity index 63% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_factory.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/app_factory.go index 4b42fb86d..64ca40351 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_factory.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_factory.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -6,18 +6,18 @@ package app import ( "path/filepath" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + "carvel.dev/kapp-controller/pkg/config" + "carvel.dev/kapp-controller/pkg/deploy" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/fetch" + "carvel.dev/kapp-controller/pkg/kubeconfig" + "carvel.dev/kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/metrics" + "carvel.dev/kapp-controller/pkg/template" + vendirconf "carvel.dev/vendir/pkg/vendir/config" "github.com/go-logr/logr" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/config" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/metrics" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/template" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" "k8s.io/client-go/kubernetes" ) @@ -26,7 +26,7 @@ type CRDAppFactory struct { CoreClient kubernetes.Interface AppClient kcclient.Interface KcConfig *config.Config - AppMetrics *metrics.AppMetrics + AppMetrics *metrics.Metrics VendirConfigHook func(vendirconf.Config) vendirconf.Config KbldAllowBuild bool CmdRunner exec.CmdRunner diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_fetch.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_fetch.go similarity index 76% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_fetch.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/app_fetch.go index ff9a827bb..f3fffaafc 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_fetch.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_fetch.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -8,9 +8,15 @@ import ( "fmt" "path" "strconv" + "strings" "time" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/exec" +) + +const ( + addCACertMissingHintMsg = "(hint: The CA Certificate from URL is unknown/invalid. Add valid CA certificate to the kapp-controller configuration to reconcile successfully)" + caCertMissingError = "x509: certificate signed by unknown authority" ) func (a *App) fetch(dstPath string) (string, exec.CmdRunResult) { @@ -67,6 +73,9 @@ func (a *App) fetch(dstPath string) (string, exec.CmdRunResult) { } } if result.Error != nil { + if strings.Contains(result.Stderr, caCertMissingError) { + result.Stderr = fmt.Sprintf("%s%s", result.Stderr, addCACertMissingHintMsg) + } return "", result } } @@ -76,6 +85,12 @@ func (a *App) fetch(dstPath string) (string, exec.CmdRunResult) { dstPath = path.Join(dstPath, "0") } + if result.Error != nil { + if strings.Contains(result.Stderr, caCertMissingError) { + result.Stderr = fmt.Sprintf("%s%s", result.Stderr, addCACertMissingHintMsg) + } + } + return dstPath, result } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_reconcile.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_reconcile.go similarity index 77% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_reconcile.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/app_reconcile.go index fc36ab365..08633e0c0 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_reconcile.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_reconcile.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -7,9 +7,9 @@ import ( "fmt" "time" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/memdir" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/reconcile" @@ -21,7 +21,7 @@ func (a *App) Reconcile(force bool) (reconcile.Result, error) { var err error - a.appMetrics.InitMetrics(a.Name(), a.Namespace()) + a.appMetrics.ReconcileCountMetrics.InitMetrics(a.Kind(), a.Name(), a.Namespace()) timerOpts := ReconcileTimerOpts{ DefaultSyncPeriod: a.opts.DefaultSyncPeriod, @@ -103,6 +103,13 @@ func (a *App) reconcileDeploy() error { } func (a *App) reconcileFetchTemplateDeploy() exec.CmdRunResult { + reconcileStartTime := time.Now() + a.appMetrics.IsFirstReconcile = a.appMetrics.ReconcileCountMetrics.GetReconcileAttemptCounterValue(a.Kind(), a.Name(), a.Namespace()) == 1 + defer func() { + a.appMetrics.ReconcileTimeMetrics.RegisterOverallTime(a.Kind(), a.Name(), a.Namespace(), a.appMetrics.IsFirstReconcile, + time.Since(reconcileStartTime)) + }() + tmpDir := memdir.NewTmpDir("fetch-template-deploy") err := tmpDir.Create() @@ -129,6 +136,9 @@ func (a *App) reconcileFetchTemplateDeploy() exec.CmdRunResult { UpdatedAt: metav1.NewTime(time.Now().UTC()), } + a.appMetrics.ReconcileTimeMetrics.RegisterFetchTime(a.Kind(), a.Name(), a.Namespace(), a.appMetrics.IsFirstReconcile, + a.app.Status.Fetch.UpdatedAt.Sub(a.app.Status.Fetch.StartedAt.Time)) + err := a.updateStatus("marking fetch completed") if err != nil { return exec.NewCmdRunResultWithErr(err) @@ -139,6 +149,8 @@ func (a *App) reconcileFetchTemplateDeploy() exec.CmdRunResult { } } + templateStartTime := time.Now() + tplResult := a.template(assetsPath) a.app.Status.Template = &v1alpha1.AppStatusTemplate{ @@ -148,6 +160,9 @@ func (a *App) reconcileFetchTemplateDeploy() exec.CmdRunResult { UpdatedAt: metav1.NewTime(time.Now().UTC()), } + a.appMetrics.ReconcileTimeMetrics.RegisterTemplateTime(a.Kind(), a.Name(), a.Namespace(), a.appMetrics.IsFirstReconcile, + a.app.Status.Template.UpdatedAt.Sub(templateStartTime)) + err = a.updateStatus("marking template completed") if err != nil { return exec.NewCmdRunResultWithErr(err) @@ -166,13 +181,14 @@ func (a *App) updateLastDeploy(result exec.CmdRunResult) exec.CmdRunResult { result = result.WithFriendlyYAMLStrings() a.app.Status.Deploy = &v1alpha1.AppStatusDeploy{ - Stdout: result.Stdout, - Stderr: result.Stderr, - Finished: result.Finished, - ExitCode: result.ExitCode, - Error: result.ErrorStr(), - StartedAt: a.app.Status.Deploy.StartedAt, - UpdatedAt: metav1.NewTime(time.Now().UTC()), + Stdout: result.Stdout, + Stderr: result.Stderr, + Finished: result.Finished, + ExitCode: result.ExitCode, + Error: result.ErrorStr(), + StartedAt: a.app.Status.Deploy.StartedAt, + UpdatedAt: metav1.NewTime(time.Now().UTC()), + KappDeployStatus: a.app.Status.Deploy.KappDeployStatus, } defer a.updateStatus("marking last deploy") @@ -181,6 +197,11 @@ func (a *App) updateLastDeploy(result exec.CmdRunResult) exec.CmdRunResult { return result } + // Do not overwrite kapp deploy status during delete + if len(a.metadata.LastChange.Namespaces) == 0 { + return result + } + usedGKs := []metav1.GroupKind{} for _, gk := range a.metadata.UsedGKs { usedGKs = append(usedGKs, metav1.GroupKind{ @@ -196,6 +217,9 @@ func (a *App) updateLastDeploy(result exec.CmdRunResult) exec.CmdRunResult { }, } + a.appMetrics.ReconcileTimeMetrics.RegisterDeployTime(a.Kind(), a.Name(), a.Namespace(), a.appMetrics.IsFirstReconcile, + a.Status().Deploy.UpdatedAt.Sub(a.Status().Deploy.StartedAt.Time)) + return result } @@ -247,7 +271,7 @@ func (a *App) setReconciling() { Status: corev1.ConditionTrue, }) - a.appMetrics.RegisterReconcileAttempt(a.app.Name, a.app.Namespace) + a.appMetrics.ReconcileCountMetrics.RegisterReconcileAttempt(a.Kind(), a.Name(), a.Namespace()) a.app.Status.FriendlyDescription = "Reconciling" } @@ -263,7 +287,7 @@ func (a *App) setReconcileCompleted(result exec.CmdRunResult) { a.app.Status.ConsecutiveReconcileFailures++ a.app.Status.ConsecutiveReconcileSuccesses = 0 a.app.Status.FriendlyDescription = fmt.Sprintf("Reconcile failed: %s", result.ErrorStr()) - a.appMetrics.RegisterReconcileFailure(a.app.Name, a.app.Namespace) + a.appMetrics.ReconcileCountMetrics.RegisterReconcileFailure(a.Kind(), a.Name(), a.Namespace()) a.setUsefulErrorMessage(result) } else { a.app.Status.Conditions = append(a.app.Status.Conditions, v1alpha1.Condition{ @@ -274,7 +298,7 @@ func (a *App) setReconcileCompleted(result exec.CmdRunResult) { a.app.Status.ConsecutiveReconcileSuccesses++ a.app.Status.ConsecutiveReconcileFailures = 0 a.app.Status.FriendlyDescription = "Reconcile succeeded" - a.appMetrics.RegisterReconcileSuccess(a.app.Name, a.app.Namespace) + a.appMetrics.ReconcileCountMetrics.RegisterReconcileSuccess(a.Kind(), a.Name(), a.Namespace()) a.app.Status.UsefulErrorMessage = "" } } @@ -287,7 +311,7 @@ func (a *App) setDeleting() { Status: corev1.ConditionTrue, }) - a.appMetrics.RegisterReconcileDeleteAttempt(a.app.Name, a.app.Namespace) + a.appMetrics.ReconcileCountMetrics.RegisterReconcileDeleteAttempt(a.Kind(), a.Name(), a.Namespace()) a.app.Status.FriendlyDescription = "Deleting" } @@ -303,10 +327,10 @@ func (a *App) setDeleteCompleted(result exec.CmdRunResult) { a.app.Status.ConsecutiveReconcileFailures++ a.app.Status.ConsecutiveReconcileSuccesses = 0 a.app.Status.FriendlyDescription = fmt.Sprintf("Delete failed: %s", result.ErrorStr()) - a.appMetrics.RegisterReconcileDeleteFailed(a.app.Name, a.app.Namespace) + a.appMetrics.ReconcileCountMetrics.RegisterReconcileDeleteFailed(a.Kind(), a.Name(), a.Namespace()) a.setUsefulErrorMessage(result) } else { - a.appMetrics.DeleteMetrics(a.app.Name, a.app.Namespace) + a.appMetrics.ReconcileCountMetrics.DeleteMetrics(a.Kind(), a.Name(), a.Namespace()) } } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_template.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_template.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_template.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/app_template.go index 91b335aa5..05867b0e9 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/app_template.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/app_template.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -7,9 +7,9 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - ctltpl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/template" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + ctltpl "carvel.dev/kapp-controller/pkg/template" ) func (a *App) template(dirPath string) exec.CmdRunResult { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/crd_app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/crd_app.go similarity index 80% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/crd_app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/crd_app.go index 97132754b..cfe025274 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/crd_app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/crd_app.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -8,33 +8,31 @@ import ( "fmt" "reflect" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + "carvel.dev/kapp-controller/pkg/deploy" + "carvel.dev/kapp-controller/pkg/fetch" + "carvel.dev/kapp-controller/pkg/metrics" + "carvel.dev/kapp-controller/pkg/reftracker" + "carvel.dev/kapp-controller/pkg/template" "github.com/go-logr/logr" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/metrics" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/template" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/reconcile" ) type CRDApp struct { - app *App - appModel *kcv1alpha1.App - log logr.Logger - appMetrics *metrics.AppMetrics - appClient kcclient.Interface + app *App + appModel *kcv1alpha1.App + log logr.Logger + appClient kcclient.Interface } // NewCRDApp creates new CRD app -func NewCRDApp(appModel *kcv1alpha1.App, log logr.Logger, appMetrics *metrics.AppMetrics, - appClient kcclient.Interface, fetchFactory fetch.Factory, +func NewCRDApp(appModel *kcv1alpha1.App, log logr.Logger, appMetrics *metrics.Metrics, appClient kcclient.Interface, fetchFactory fetch.Factory, templateFactory template.Factory, deployFactory deploy.Factory, compInfo ComponentInfo, opts Opts) *CRDApp { - crdApp := &CRDApp{appModel: appModel, log: log, appMetrics: appMetrics, appClient: appClient} + crdApp := &CRDApp{appModel: appModel, log: log, appClient: appClient} crdApp.app = NewApp(*appModel, Hooks{ BlockDeletion: crdApp.blockDeletion, diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/crd_app_watcher.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/crd_app_watcher.go similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/crd_app_watcher.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/crd_app_watcher.go index 76ae54a1b..62006c248 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/crd_app_watcher.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/crd_app_watcher.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -7,8 +7,8 @@ import ( "context" "fmt" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/fields" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/finalizer.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/finalizer.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/finalizer.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/finalizer.go index 9490a7fb9..873e5b0a4 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/finalizer.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/finalizer.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/reconcile_timer.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/reconcile_timer.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/reconcile_timer.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/reconcile_timer.go index 2c6d6dad5..bcd9925d3 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/reconcile_timer.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/reconcile_timer.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -8,7 +8,7 @@ import ( "math" "time" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/reconciler.go b/cli/vendor/carvel.dev/kapp-controller/pkg/app/reconciler.go similarity index 82% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/reconciler.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/app/reconciler.go index db454360d..d5761d50f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/app/reconciler.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/app/reconciler.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package app @@ -7,17 +7,18 @@ import ( "context" "fmt" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + "carvel.dev/kapp-controller/pkg/reconciler" + "carvel.dev/kapp-controller/pkg/reftracker" "github.com/go-logr/logr" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" ) @@ -47,8 +48,8 @@ func NewReconciler(appClient kcclient.Interface, log logr.Logger, crdAppFactory var _ reconcile.Reconciler = &Reconciler{} // AttachWatches configures watches needed for reconciler to reconcile Apps. -func (r *Reconciler) AttachWatches(controller controller.Controller) error { - err := controller.Watch(&source.Kind{Type: &kcv1alpha1.App{}}, &handler.EnqueueRequestForObject{}) +func (r *Reconciler) AttachWatches(controller controller.Controller, mgr manager.Manager) error { + err := controller.Watch(source.Kind(mgr.GetCache(), &kcv1alpha1.App{}, &handler.TypedEnqueueRequestForObject[*kcv1alpha1.App]{})) if err != nil { return fmt.Errorf("Watch Apps: %s", err) } @@ -56,12 +57,12 @@ func (r *Reconciler) AttachWatches(controller controller.Controller) error { secretHandler := reconciler.NewSecretHandler(r.log, r.appRefTracker, r.appUpdateStatus) cmHandler := reconciler.NewConfigMapHandler(r.log, r.appRefTracker, r.appUpdateStatus) - err = controller.Watch(&source.Kind{Type: &corev1.Secret{}}, secretHandler) + err = controller.Watch(source.Kind(mgr.GetCache(), &corev1.Secret{}, secretHandler)) if err != nil { return fmt.Errorf("Watch Secrets: %s", err) } - err = controller.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, cmHandler) + err = controller.Watch(source.Kind(mgr.GetCache(), &corev1.ConfigMap{}, cmHandler)) if err != nil { return fmt.Errorf("Watch ConfigMaps: %s", err) } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/clientset.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/clientset.go similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/clientset.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/clientset.go index 03446ff81..c972771ea 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/clientset.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/clientset.go @@ -6,9 +6,9 @@ import ( "fmt" "net/http" - internalv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" + internalv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" discovery "k8s.io/client-go/discovery" rest "k8s.io/client-go/rest" flowcontrol "k8s.io/client-go/util/flowcontrol" @@ -21,8 +21,7 @@ type Interface interface { PackagingV1alpha1() packagingv1alpha1.PackagingV1alpha1Interface } -// Clientset contains the clients for groups. Each group has exactly one -// version included in a Clientset. +// Clientset contains the clients for groups. type Clientset struct { *discovery.DiscoveryClient internalV1alpha1 *internalv1alpha1.InternalV1alpha1Client diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/clientset_generated.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/clientset_generated.go similarity index 73% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/clientset_generated.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/clientset_generated.go index 84257573c..a6b3c94f9 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/clientset_generated.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/clientset_generated.go @@ -3,13 +3,13 @@ package fake import ( - clientset "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" - fakeinternalv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" - fakekappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" - fakepackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake" + clientset "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" + fakeinternalv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" + fakekappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" + fakepackagingv1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/watch" "k8s.io/client-go/discovery" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/register.go similarity index 81% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/register.go index e9202867d..e3fd841b5 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/fake/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/fake/register.go @@ -3,9 +3,9 @@ package fake import ( - internalv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + internalv1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme/register.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme/register.go similarity index 81% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme/register.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme/register.go index b95a693a2..53be53569 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme/register.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme/register.go @@ -3,9 +3,9 @@ package scheme import ( - internalv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + internalv1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go index 1b28f1c93..42b917590 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackage.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakeInternalPackages struct { ns string } -var internalpackagesResource = schema.GroupVersionResource{Group: "internal.packaging.carvel.dev", Version: "v1alpha1", Resource: "internalpackages"} +var internalpackagesResource = v1alpha1.SchemeGroupVersion.WithResource("internalpackages") -var internalpackagesKind = schema.GroupVersionKind{Group: "internal.packaging.carvel.dev", Version: "v1alpha1", Kind: "InternalPackage"} +var internalpackagesKind = v1alpha1.SchemeGroupVersion.WithKind("InternalPackage") // Get takes name of the internalPackage, and returns the corresponding internalPackage object, and an error if there is any. func (c *FakeInternalPackages) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.InternalPackage, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go index a2d714ead..9209450e4 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackagemetadata.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakeInternalPackageMetadatas struct { ns string } -var internalpackagemetadatasResource = schema.GroupVersionResource{Group: "internal.packaging.carvel.dev", Version: "v1alpha1", Resource: "internalpackagemetadatas"} +var internalpackagemetadatasResource = v1alpha1.SchemeGroupVersion.WithResource("internalpackagemetadatas") -var internalpackagemetadatasKind = schema.GroupVersionKind{Group: "internal.packaging.carvel.dev", Version: "v1alpha1", Kind: "InternalPackageMetadata"} +var internalpackagemetadatasKind = v1alpha1.SchemeGroupVersion.WithKind("InternalPackageMetadata") // Get takes name of the internalPackageMetadata, and returns the corresponding internalPackageMetadata object, and an error if there is any. func (c *FakeInternalPackageMetadatas) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.InternalPackageMetadata, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go similarity index 85% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go index ccdeeb0b8..97fcd7552 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/fake/fake_internalpackaging_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/generated_expansion.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/generated_expansion.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/generated_expansion.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/generated_expansion.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go index 8032f655f..89716956d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackage.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go index b5e45dd1d..676789373 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackagemetadata.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go index 3f6a61385..4c517969a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/internalpackaging/v1alpha1/internalpackaging_client.go @@ -5,8 +5,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go index 4bf034bba..07897b968 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/app.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go index 943314e60..68f6ae24c 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_app.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakeApps struct { ns string } -var appsResource = schema.GroupVersionResource{Group: "kappctrl.k14s.io", Version: "v1alpha1", Resource: "apps"} +var appsResource = v1alpha1.SchemeGroupVersion.WithResource("apps") -var appsKind = schema.GroupVersionKind{Group: "kappctrl.k14s.io", Version: "v1alpha1", Kind: "App"} +var appsKind = v1alpha1.SchemeGroupVersion.WithKind("App") // Get takes name of the app, and returns the corresponding app object, and an error if there is any. func (c *FakeApps) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.App, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go similarity index 81% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go index b80d06e50..2dfece536 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/fake/fake_kappctrl_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/generated_expansion.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/generated_expansion.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/generated_expansion.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/generated_expansion.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go index 958fba5d4..e618cda72 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/kappctrl/v1alpha1/kappctrl_client.go @@ -5,8 +5,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/doc.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/doc.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go index 598250e2b..e9dfe33e8 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packageinstall.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakePackageInstalls struct { ns string } -var packageinstallsResource = schema.GroupVersionResource{Group: "packaging.carvel.dev", Version: "v1alpha1", Resource: "packageinstalls"} +var packageinstallsResource = v1alpha1.SchemeGroupVersion.WithResource("packageinstalls") -var packageinstallsKind = schema.GroupVersionKind{Group: "packaging.carvel.dev", Version: "v1alpha1", Kind: "PackageInstall"} +var packageinstallsKind = v1alpha1.SchemeGroupVersion.WithKind("PackageInstall") // Get takes name of the packageInstall, and returns the corresponding packageInstall object, and an error if there is any. func (c *FakePackageInstalls) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PackageInstall, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go index e4aa8dd8e..3b02da9eb 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packagerepository.go @@ -5,10 +5,9 @@ package fake import ( "context" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" - schema "k8s.io/apimachinery/pkg/runtime/schema" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" @@ -20,9 +19,9 @@ type FakePackageRepositories struct { ns string } -var packagerepositoriesResource = schema.GroupVersionResource{Group: "packaging.carvel.dev", Version: "v1alpha1", Resource: "packagerepositories"} +var packagerepositoriesResource = v1alpha1.SchemeGroupVersion.WithResource("packagerepositories") -var packagerepositoriesKind = schema.GroupVersionKind{Group: "packaging.carvel.dev", Version: "v1alpha1", Kind: "PackageRepository"} +var packagerepositoriesKind = v1alpha1.SchemeGroupVersion.WithKind("PackageRepository") // Get takes name of the packageRepository, and returns the corresponding packageRepository object, and an error if there is any. func (c *FakePackageRepositories) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.PackageRepository, err error) { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go similarity index 86% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go index 067d88c1a..d765a08dc 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/fake/fake_packaging_client.go @@ -3,7 +3,7 @@ package fake import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1" rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/generated_expansion.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/generated_expansion.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/generated_expansion.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/generated_expansion.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go index 3748c5acc..f2939fc77 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packageinstall.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go index 4ac2b69dd..e4c6f8772 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packagerepository.go @@ -6,8 +6,8 @@ import ( "context" "time" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - scheme "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + scheme "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go index b8f8ca04e..0a95cb83f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/clientset/versioned/typed/packaging/v1alpha1/packaging_client.go @@ -5,8 +5,8 @@ package v1alpha1 import ( "net/http" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" rest "k8s.io/client-go/rest" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/factory.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/factory.go similarity index 62% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/factory.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/factory.go index 0071f5ce3..d59506aba 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/factory.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/factory.go @@ -7,11 +7,11 @@ import ( sync "sync" time "time" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - internalpackaging "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging" - kappctrl "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl" - packaging "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + internalpackaging "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging" + kappctrl "carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl" + packaging "carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" @@ -28,11 +28,17 @@ type sharedInformerFactory struct { lock sync.Mutex defaultResync time.Duration customResync map[reflect.Type]time.Duration + transform cache.TransformFunc informers map[reflect.Type]cache.SharedIndexInformer // startedInformers is used for tracking which informers have been started. // This allows Start() to be called multiple times safely. startedInformers map[reflect.Type]bool + // wg tracks how many goroutines were started. + wg sync.WaitGroup + // shuttingDown is true when Shutdown has been called. It may still be running + // because it needs to wait for goroutines. + shuttingDown bool } // WithCustomResyncConfig sets a custom resync period for the specified informer types. @@ -61,6 +67,14 @@ func WithNamespace(namespace string) SharedInformerOption { } } +// WithTransform sets a transform on all informers. +func WithTransform(transform cache.TransformFunc) SharedInformerOption { + return func(factory *sharedInformerFactory) *sharedInformerFactory { + factory.transform = transform + return factory + } +} + // NewSharedInformerFactory constructs a new instance of sharedInformerFactory for all namespaces. func NewSharedInformerFactory(client versioned.Interface, defaultResync time.Duration) SharedInformerFactory { return NewSharedInformerFactoryWithOptions(client, defaultResync) @@ -93,20 +107,39 @@ func NewSharedInformerFactoryWithOptions(client versioned.Interface, defaultResy return factory } -// Start initializes all requested informers. func (f *sharedInformerFactory) Start(stopCh <-chan struct{}) { f.lock.Lock() defer f.lock.Unlock() + if f.shuttingDown { + return + } + for informerType, informer := range f.informers { if !f.startedInformers[informerType] { - go informer.Run(stopCh) + f.wg.Add(1) + // We need a new variable in each loop iteration, + // otherwise the goroutine would use the loop variable + // and that keeps changing. + informer := informer + go func() { + defer f.wg.Done() + informer.Run(stopCh) + }() f.startedInformers[informerType] = true } } } -// WaitForCacheSync waits for all started informers' cache were synced. +func (f *sharedInformerFactory) Shutdown() { + f.lock.Lock() + f.shuttingDown = true + f.lock.Unlock() + + // Will return immediately if there is nothing to wait for. + f.wg.Wait() +} + func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool { informers := func() map[reflect.Type]cache.SharedIndexInformer { f.lock.Lock() @@ -128,7 +161,7 @@ func (f *sharedInformerFactory) WaitForCacheSync(stopCh <-chan struct{}) map[ref return res } -// InternalInformerFor returns the SharedIndexInformer for obj using an internal +// InformerFor returns the SharedIndexInformer for obj using an internal // client. func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer { f.lock.Lock() @@ -146,6 +179,7 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal } informer = newFunc(f.client, resyncPeriod) + informer.SetTransform(f.transform) f.informers[informerType] = informer return informer @@ -153,11 +187,58 @@ func (f *sharedInformerFactory) InformerFor(obj runtime.Object, newFunc internal // SharedInformerFactory provides shared informers for resources in all known // API group versions. +// +// It is typically used like this: +// +// ctx, cancel := context.Background() +// defer cancel() +// factory := NewSharedInformerFactory(client, resyncPeriod) +// defer factory.WaitForStop() // Returns immediately if nothing was started. +// genericInformer := factory.ForResource(resource) +// typedInformer := factory.SomeAPIGroup().V1().SomeType() +// factory.Start(ctx.Done()) // Start processing these informers. +// synced := factory.WaitForCacheSync(ctx.Done()) +// for v, ok := range synced { +// if !ok { +// fmt.Fprintf(os.Stderr, "caches failed to sync: %v", v) +// return +// } +// } +// +// // Creating informers can also be created after Start, but then +// // Start must be called again: +// anotherGenericInformer := factory.ForResource(resource) +// factory.Start(ctx.Done()) type SharedInformerFactory interface { internalinterfaces.SharedInformerFactory - ForResource(resource schema.GroupVersionResource) (GenericInformer, error) + + // Start initializes all requested informers. They are handled in goroutines + // which run until the stop channel gets closed. + Start(stopCh <-chan struct{}) + + // Shutdown marks a factory as shutting down. At that point no new + // informers can be started anymore and Start will return without + // doing anything. + // + // In addition, Shutdown blocks until all goroutines have terminated. For that + // to happen, the close channel(s) that they were started with must be closed, + // either before Shutdown gets called or while it is waiting. + // + // Shutdown may be called multiple times, even concurrently. All such calls will + // block until all goroutines have terminated. + Shutdown() + + // WaitForCacheSync blocks until all started informers' caches were synced + // or the stop channel gets closed. WaitForCacheSync(stopCh <-chan struct{}) map[reflect.Type]bool + // ForResource gives generic access to a shared informer of the matching type. + ForResource(resource schema.GroupVersionResource) (GenericInformer, error) + + // InformerFor returns the SharedIndexInformer for obj using an internal + // client. + InformerFor(obj runtime.Object, newFunc internalinterfaces.NewInformerFunc) cache.SharedIndexInformer + Internal() internalpackaging.Interface Kappctrl() kappctrl.Interface Packaging() packaging.Interface diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/generic.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/generic.go similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/generic.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/generic.go index b4218100d..561e19c3b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/generic.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/generic.go @@ -5,9 +5,9 @@ package externalversions import ( "fmt" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go index f161118ed..93ff16609 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -5,7 +5,7 @@ package internalinterfaces import ( time "time" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/interface.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/interface.go similarity index 77% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/interface.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/interface.go index 274dc999d..20f8b240a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/interface.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/interface.go @@ -3,8 +3,8 @@ package internalpackaging import ( - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go index 5da30a187..7bdcc8725 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go similarity index 87% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go index 8cba67f9f..04c2bbd34 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackage.go @@ -6,10 +6,10 @@ import ( "context" time "time" - internalpackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1" + internalpackagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go similarity index 87% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go index d9c350a33..bee0c2365 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalpackaging/v1alpha1/internalpackagemetadata.go @@ -6,10 +6,10 @@ import ( "context" time "time" - internalpackagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1" + internalpackagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/interface.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/interface.go similarity index 78% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/interface.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/interface.go index bb3013265..e7a7e91d4 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/interface.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/interface.go @@ -3,8 +3,8 @@ package kappctrl import ( - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go similarity index 86% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go index e6d5da6cd..5af2e521d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/app.go @@ -6,10 +6,10 @@ import ( "context" time "time" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/kappctrl/v1alpha1" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/listers/kappctrl/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go similarity index 86% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go index e7bbbfb66..598911a8f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/kappctrl/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/interface.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/interface.go similarity index 78% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/interface.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/interface.go index 34f7475ea..f0fafcccb 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/interface.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/interface.go @@ -3,8 +3,8 @@ package packaging import ( - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1" ) // Interface provides access to each of this group's versions. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go index ee213cc2a..a1772e50f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/interface.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" ) // Interface provides access to all the informers in this group version. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go similarity index 87% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go index 07f9460af..7710ddb7b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packageinstall.go @@ -6,10 +6,10 @@ import ( "context" time "time" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go similarity index 87% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go index ae9bc7918..0590e67ca 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/informers/externalversions/packaging/v1alpha1/packagerepository.go @@ -6,10 +6,10 @@ import ( "context" time "time" - packagingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - versioned "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - internalinterfaces "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/informers/externalversions/internalinterfaces" - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1" + packagingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + versioned "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + internalinterfaces "carvel.dev/kapp-controller/pkg/client/informers/externalversions/internalinterfaces" + v1alpha1 "carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/expansion_generated.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/expansion_generated.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/expansion_generated.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/expansion_generated.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go index fe5dd8f70..c1b61b554 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackage.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go index 50e5fb74c..bc1f05b8f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/internalpackaging/v1alpha1/internalpackagemetadata.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/internalpackaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/internalpackaging/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/kappctrl/v1alpha1/app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/kappctrl/v1alpha1/app.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/kappctrl/v1alpha1/app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/kappctrl/v1alpha1/app.go index 753248bf8..e359184b6 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/kappctrl/v1alpha1/app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/kappctrl/v1alpha1/app.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/kappctrl/v1alpha1/expansion_generated.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/kappctrl/v1alpha1/expansion_generated.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/kappctrl/v1alpha1/expansion_generated.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/kappctrl/v1alpha1/expansion_generated.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/expansion_generated.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/expansion_generated.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/expansion_generated.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/expansion_generated.go diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/packageinstall.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/packageinstall.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/packageinstall.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/packageinstall.go index 18f65d7a8..a59142ed2 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/packageinstall.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/packageinstall.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/packagerepository.go b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/packagerepository.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/packagerepository.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/packagerepository.go index 72ef61b69..1c9fd85b8 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/listers/packaging/v1alpha1/packagerepository.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/client/listers/packaging/v1alpha1/packagerepository.go @@ -3,7 +3,7 @@ package v1alpha1 import ( - v1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" + v1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/componentinfo/component_info.go b/cli/vendor/carvel.dev/kapp-controller/pkg/componentinfo/component_info.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/componentinfo/component_info.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/componentinfo/component_info.go index 23313dcab..574884498 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/componentinfo/component_info.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/componentinfo/component_info.go @@ -1,4 +1,4 @@ -// Copyright 2022 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package componentinfo provides access to version and configuration information about components of the system. @@ -8,9 +8,9 @@ import ( "context" "fmt" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/kubeconfig" "github.com/k14s/semver/v4" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -50,7 +50,7 @@ func (ci *ComponentInfo) KubernetesVersion(serviceAccountName string, specCluste return ci.parseAndScrubVersion(v.String()) case specCluster != nil: - accessInfo, err := ci.clusterAccess.ClusterAccess(serviceAccountName, specCluster, kubeconfig.AccessLocation{Name: objMeta.Name, Namespace: objMeta.Namespace}) + accessInfo, err := ci.clusterAccess.ClusterAccess(serviceAccountName, specCluster, kubeconfig.AccessLocation{Name: objMeta.Name, Namespace: objMeta.Namespace}, "") if err != nil { return semver.Version{}, err } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/config.go b/cli/vendor/carvel.dev/kapp-controller/pkg/config/config.go similarity index 85% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/config.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/config/config.go index 62a67516b..aa477a20e 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/config.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/config/config.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config @@ -38,8 +38,9 @@ type configData struct { kappDeployRawOptions []string skipTLSVerify string - appDefaultSyncPeriod time.Duration - appMinimumSyncPeriod time.Duration + appDefaultSyncPeriod time.Duration + appMinimumSyncPeriod time.Duration + packageInstallDefaultSyncPeriod time.Duration } const ( @@ -163,11 +164,17 @@ func (gc *Config) KappDeployRawOptions() []string { gc.dataLock.RLock() defer gc.dataLock.RUnlock() + kappOptions := make([]string, 0) + // Configure kapp to keep only 5 app changes as it seems that // larger number of ConfigMaps negative affects other controllers on the cluster. // Eventually kapp can be smart enough to keep minimal number of app changes. // Set default first so that it can be overridden by user provided options. - return append([]string{"--app-changes-max-to-keep=5"}, gc.data.kappDeployRawOptions...) + // return append([]string{"--app-changes-max-to-keep=5"}, gc.data.kappDeployRawOptions...) + kappOptions = append(kappOptions, "--app-changes-max-to-keep=5") + kappOptions = append(kappOptions, "--apply-timeout=5m") + kappOptions = append(kappOptions, gc.data.kappDeployRawOptions...) + return kappOptions } // AppDefaultSyncPeriod returns duration that is used by Apps @@ -191,6 +198,20 @@ func (gc *Config) AppMinimumSyncPeriod() time.Duration { return min } +// PackageInstallDefaultSyncPeriod returns duration that is used by Apps +// that do not explicitly specify sync period. +func (gc *Config) PackageInstallDefaultSyncPeriod() time.Duration { + const defaultSyncPeriod = 10 * time.Minute + const minDefaultSyncPeriod = 30 * time.Second + if gc.data.packageInstallDefaultSyncPeriod != 0 { + if gc.data.packageInstallDefaultSyncPeriod > minDefaultSyncPeriod { + return gc.data.packageInstallDefaultSyncPeriod + } + return minDefaultSyncPeriod + } + return defaultSyncPeriod +} + func (gc *Config) addSecretDataToConfig(secret *v1.Secret) error { extractedValues := map[string]string{} for key, value := range secret.Data { @@ -218,6 +239,14 @@ func (gc *Config) addDataToConfig(rawData map[string]string) error { data.appDefaultSyncPeriod = dur } + if val := rawData["packageInstallDefaultSyncPeriod"]; len(val) > 0 { + dur, err := time.ParseDuration(val) + if err != nil { + return fmt.Errorf("Unmarshaling packageInstallDefaultSyncPeriod as duration: %s", err) + } + data.packageInstallDefaultSyncPeriod = dur + } + if val := rawData["appMinimumSyncPeriod"]; len(val) > 0 { dur, err := time.ParseDuration(val) if err != nil { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/os_config.go b/cli/vendor/carvel.dev/kapp-controller/pkg/config/os_config.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/os_config.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/config/os_config.go index 804f88fe1..0e301f63b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/os_config.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/config/os_config.go @@ -1,4 +1,4 @@ -// Copyright 2022 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/reconciler.go b/cli/vendor/carvel.dev/kapp-controller/pkg/config/reconciler.go similarity index 69% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/reconciler.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/config/reconciler.go index e1415dc99..e59fd1c1d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/config/reconciler.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/config/reconciler.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config @@ -10,9 +10,9 @@ import ( "github.com/go-logr/logr" v1 "k8s.io/api/core/v1" "k8s.io/client-go/kubernetes" - "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" @@ -36,18 +36,28 @@ func NewReconciler(coreClient kubernetes.Interface, var _ reconcile.Reconciler = &Reconciler{} // AttachWatches configures watches needed for reconciler to reconcile the kapp-controller Config. -func (r *Reconciler) AttachWatches(controller controller.Controller, ns string) error { +func (r *Reconciler) AttachWatches(controller controller.Controller, ns string, mgr manager.Manager) error { // only reconcile on the KC's config - p := predicate.NewPredicateFuncs(func(o client.Object) bool { - return o.GetNamespace() == ns && o.GetName() == kcConfigName - }) + configMapPredicate := []predicate.TypedPredicate[*v1.ConfigMap]{ + predicate.NewTypedPredicateFuncs[*v1.ConfigMap](func(cm *v1.ConfigMap) bool { + return cm.GetNamespace() == ns && cm.GetName() == kcConfigName + }), + } - err := controller.Watch(&source.Kind{Type: &v1.ConfigMap{}}, &handler.EnqueueRequestForObject{}, p) + err := controller.Watch( + source.Kind(mgr.GetCache(), &v1.ConfigMap{}, &handler.TypedEnqueueRequestForObject[*v1.ConfigMap]{}, configMapPredicate...), + ) if err != nil { return fmt.Errorf("Watching Configmaps: %s", err) } - err = controller.Watch(&source.Kind{Type: &v1.Secret{}}, &handler.EnqueueRequestForObject{}, p) + secretPredicate := []predicate.TypedPredicate[*v1.Secret]{ + predicate.NewTypedPredicateFuncs[*v1.Secret](func(s *v1.Secret) bool { + return s.GetNamespace() == ns && s.GetName() == kcConfigName + }), + } + + err = controller.Watch(source.Kind(mgr.GetCache(), &v1.Secret{}, &handler.TypedEnqueueRequestForObject[*v1.Secret]{}, secretPredicate...)) if err != nil { return fmt.Errorf("Watching Secrets: %s", err) } diff --git a/cli/vendor/carvel.dev/kapp-controller/pkg/config/scheme.go b/cli/vendor/carvel.dev/kapp-controller/pkg/config/scheme.go new file mode 100644 index 000000000..5a9d7f2ce --- /dev/null +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/config/scheme.go @@ -0,0 +1,23 @@ +// Copyright 2024 The Carvel Authors. +// SPDX-License-Identifier: Apache-2.0 + +package config + +import ( + internalpkging "carvel.dev/kapp-controller/pkg/apis/internalpackaging/install" + installkctrl "carvel.dev/kapp-controller/pkg/apis/kappctrl/install" + pkging "carvel.dev/kapp-controller/pkg/apis/packaging/install" + datapackaging "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/install" + "k8s.io/client-go/kubernetes/scheme" +) + +var ( + Scheme = scheme.Scheme +) + +func init() { + pkging.Install(Scheme) + internalpkging.Install(Scheme) + installkctrl.Install(Scheme) + datapackaging.Install(Scheme) +} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/cmd_run_result_buf.go b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/cmd_run_result_buf.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/cmd_run_result_buf.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/deploy/cmd_run_result_buf.go index d3ba4078c..04ad525ed 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/cmd_run_result_buf.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/cmd_run_result_buf.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package deploy @@ -6,7 +6,7 @@ package deploy import ( "sync" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/exec" ) type WriterFunc func([]byte) (int, error) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/factory.go b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/factory.go similarity index 80% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/factory.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/deploy/factory.go index 795473668..cd681838b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/factory.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/factory.go @@ -1,13 +1,13 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package deploy import ( + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/kubeconfig" "github.com/go-logr/logr" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig" "k8s.io/client-go/kubernetes" ) @@ -36,21 +36,22 @@ func NewFactory(coreClient kubernetes.Interface, kubeconfig *kubeconfig.Kubeconf // NewKapp configures and returns a deployer of type Kapp func (f Factory) NewKapp(opts v1alpha1.AppDeployKapp, saName string, - clusterOpts *v1alpha1.AppCluster, cancelCh chan struct{}, location kubeconfig.AccessLocation) (*Kapp, error) { + clusterOpts *v1alpha1.AppCluster, cancelCh chan struct{}, location kubeconfig.AccessLocation, + defaultNamespace string, appNamespace string) (*Kapp, error) { - clusterAccess, err := f.kubeconfig.ClusterAccess(saName, clusterOpts, location) + clusterAccess, err := f.kubeconfig.ClusterAccess(saName, clusterOpts, location, defaultNamespace) if err != nil { return nil, err } const suffix string = ".app" return NewKapp(suffix, opts, clusterAccess, - f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner), nil + f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner, appNamespace), nil } // NewKappPrivileged is used for package repositories where users aren't required to provide // a service account, so it will install resources using its own privileges. -func (f Factory) NewKappPrivilegedForPackageRepository(opts v1alpha1.AppDeployKapp, clusterAccess kubeconfig.AccessInfo, cancelCh chan struct{}) (*Kapp, error) { +func (f Factory) NewKappPrivilegedForPackageRepository(opts v1alpha1.AppDeployKapp, clusterAccess kubeconfig.AccessInfo, cancelCh chan struct{}, appNamespace string) (*Kapp, error) { const suffix string = ".pkgr" @@ -61,7 +62,7 @@ func (f Factory) NewKappPrivilegedForPackageRepository(opts v1alpha1.AppDeployKa DangerousUsePodServiceAccount: true, } - return NewKapp(suffix, opts, kconfAccess, f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner), nil + return NewKapp(suffix, opts, kconfAccess, f.globalKappDeployRawOpts(), cancelCh, f.cmdRunner, appNamespace), nil } func (f Factory) globalKappDeployRawOpts() []string { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/interfaces.go b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/interfaces.go similarity index 78% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/interfaces.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/deploy/interfaces.go index 9a1112500..1a859fcf1 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/interfaces.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/interfaces.go @@ -1,10 +1,10 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package deploy import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/exec" ) type Deploy interface { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/kapp.go b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/kapp.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/kapp.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/deploy/kapp.go index 44f3f6966..aace9169b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/kapp.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/kapp.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package deploy @@ -13,10 +13,10 @@ import ( "strings" "time" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/kubeconfig" + "carvel.dev/kapp-controller/pkg/memdir" "sigs.k8s.io/yaml" ) @@ -34,6 +34,7 @@ type Kapp struct { cancelCh chan struct{} cmdRunner exec.CmdRunner appMeta *Meta + appNamespace string } var _ Deploy = &Kapp{} @@ -42,9 +43,9 @@ var _ Deploy = &Kapp{} // additional info from the larger app resource (e.g. service account, name, namespace) as genericOpts, // and a cancel channel that gets passed through to the exec call that runs kapp. func NewKapp(appSuffix string, opts v1alpha1.AppDeployKapp, clusterAccess kubeconfig.AccessInfo, - globalDeployRawOpts []string, cancelCh chan struct{}, cmdRunner exec.CmdRunner) *Kapp { + globalDeployRawOpts []string, cancelCh chan struct{}, cmdRunner exec.CmdRunner, appNamespace string) *Kapp { - return &Kapp{appSuffix, opts, clusterAccess, globalDeployRawOpts, cancelCh, cmdRunner, nil} + return &Kapp{appSuffix, opts, clusterAccess, globalDeployRawOpts, cancelCh, cmdRunner, nil, appNamespace} } // Deploy takes the output from templating, and the app name, @@ -258,6 +259,10 @@ func (a *Kapp) addGenericArgs(args []string, appName string) ([]string, []string args = append(args, []string{"--namespace", a.clusterAccess.Namespace}...) } + if len(a.clusterAccess.DeployNamespace) > 0 { + args = append(args, []string{"--app-namespace", a.clusterAccess.DeployNamespace}...) + } + switch { case a.clusterAccess.Kubeconfig != nil: env = append(env, "KAPP_KUBECONFIG_YAML="+a.clusterAccess.Kubeconfig.AsYAML()) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/kapp_restrict.go b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/kapp_restrict.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/kapp_restrict.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/deploy/kapp_restrict.go index e5cf49f82..99dc9d03e 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/deploy/kapp_restrict.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/deploy/kapp_restrict.go @@ -1,10 +1,10 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package deploy import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/exec" ) var ( @@ -41,6 +41,7 @@ var ( "--diff-mask", "--diff-run", "--diff-summary", + "--diff-anchored", // Applying "--apply-check-interval", diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/cmd_run_result.go b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/cmd_run_result.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/cmd_run_result.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/exec/cmd_run_result.go index 1364a4982..3e7b057e2 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/cmd_run_result.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/cmd_run_result.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package exec diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/cmd_runner.go b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/cmd_runner.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/cmd_runner.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/exec/cmd_runner.go index 2abf7f6a7..5d9ce0c7b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/cmd_runner.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/cmd_runner.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package exec diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/doc.go similarity index 84% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/exec/doc.go index 7cac6f4da..09dcf20bb 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/doc.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package exec wraps os/exec to add a little error sanitization and standardization around process return codes and a channel-based cancel mechanism diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/flag.go b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/flag.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/flag.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/exec/flag.go index 219f9ea5c..d507eba63 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec/flag.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/exec/flag.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package exec diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/doc.go similarity index 77% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/fetch/doc.go index c71c3fb49..8c1fdb763 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/doc.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package fetch provides information retrieval, mostly by wrapping vendir. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/factory.go b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/factory.go similarity index 84% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/factory.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/fetch/factory.go index b9ca66122..043c313f6 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/factory.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/factory.go @@ -1,11 +1,11 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package fetch import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/inline.go b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/inline.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/inline.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/fetch/inline.go index b2ab3f6c4..0c45d9820 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/inline.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/inline.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package fetch @@ -10,8 +10,8 @@ import ( "os" "path/filepath" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/memdir" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/vendir.go b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/vendir.go similarity index 86% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/vendir.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/fetch/vendir.go index 2c6ef85c2..4420ed6db 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch/vendir.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/fetch/vendir.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package fetch @@ -7,20 +7,28 @@ import ( "bytes" "context" "fmt" + "net/url" "os" goexec "os/exec" "path/filepath" "strings" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" // we run vendir by shelling out to it, but we create the vendir configs with help from a vendored copy of vendir. - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - vendirconf "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config" + vendirconf "carvel.dev/vendir/pkg/vendir/config" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" kyaml "sigs.k8s.io/yaml" ) +const ( + // GitURL source type to extract host + GitURL = iota + // ImageRegistry source type to extract host + ImageRegistry +) + const ( vendirEntireDirPath = "." ) @@ -122,7 +130,7 @@ func (v *Vendir) imageConf(image v1alpha1.AppFetchImage) vendirconf.DirectoryCon URL: image.URL, TagSelection: image.TagSelection, SecretRef: v.localRefConf(image.SecretRef), - DangerousSkipTLSVerify: v.shouldSkipTLSVerify(image.URL), + DangerousSkipTLSVerify: v.shouldSkipTLSVerify(image.URL, ImageRegistry), }, } } @@ -134,7 +142,7 @@ func (v *Vendir) imgpkgBundleConf(imgpkgBundle v1alpha1.AppFetchImgpkgBundle) ve Image: imgpkgBundle.Image, TagSelection: imgpkgBundle.TagSelection, SecretRef: v.localRefConf(imgpkgBundle.SecretRef), - DangerousSkipTLSVerify: v.shouldSkipTLSVerify(imgpkgBundle.Image), + DangerousSkipTLSVerify: v.shouldSkipTLSVerify(imgpkgBundle.Image, ImageRegistry), }, } } @@ -152,15 +160,25 @@ func (v *Vendir) httpConf(http v1alpha1.AppFetchHTTP) vendirconf.DirectoryConten } func (v *Vendir) gitConf(git v1alpha1.AppFetchGit) vendirconf.DirectoryContents { + + // By default, we only fetch the latest commit. + depth := 1 + if git.Depth != nil { + depth = int(*(git.Depth)) + } + return vendirconf.DirectoryContents{ Path: vendirEntireDirPath, NewRootPath: git.SubPath, Git: &vendirconf.DirectoryContentsGit{ - URL: git.URL, - RefSelection: git.RefSelection, - Ref: git.Ref, - SecretRef: v.localRefConf(git.SecretRef), - LFSSkipSmudge: git.LFSSkipSmudge, + URL: git.URL, + Ref: git.Ref, + RefSelection: git.RefSelection, + SecretRef: v.localRefConf(git.SecretRef), + LFSSkipSmudge: git.LFSSkipSmudge, + DangerousSkipTLSVerify: v.shouldSkipTLSVerify(git.URL, GitURL), + ForceHTTPBasicAuth: git.ForceHTTPBasicAuth, + Depth: depth, }, } } @@ -217,7 +235,7 @@ func (v *Vendir) localRefConf(ref *v1alpha1.AppFetchLocalRef) *vendirconf.Direct // ConfigBytes fetches all the referenced Secrets & ConfigMaps and returns the // multi-document YAML-encoded config that vendir consumes. -// https://github.com/vmware-tanzu/carvel-vendir/blob/develop/examples/secrets/vendir.yml +// https://carvel.dev/vendir/blob/develop/examples/secrets/vendir.yml func (v *Vendir) ConfigBytes() ([]byte, error) { var resourcesYaml [][]byte for _, dir := range v.config.Directories { @@ -376,11 +394,9 @@ func (v *Vendir) configMapBytes(configMapRef vendirconf.DirectoryContentsLocalRe return kyaml.Marshal(configMap) } -// This function only works on image refs. If in the future we decide to -// expand this option to other fetch options, we will need to add hostname -// extraction for those -func (v *Vendir) shouldSkipTLSVerify(url string) bool { - return v.opts.SkipTLSConfig.ShouldSkipTLSForAuthority(ExtractImageRegistry(url)) +// This function works on image refs and hostname extraction based on source type +func (v *Vendir) shouldSkipTLSVerify(url string, sourceType int) bool { + return v.opts.SkipTLSConfig.ShouldSkipTLSForAuthority(ExtractHost(url, sourceType)) } // Run executes vendir command based on given configuration. @@ -410,8 +426,8 @@ func (v *Vendir) ClearCache(cacheID string) error { return os.RemoveAll(filepath.Join(v.opts.BaseCacheFolder, cacheID)) } -// ExtractImageRegistry returns the registry portion of a Docker image reference -func ExtractImageRegistry(name string) string { +// extractImageRegistry returns the registry portion of a Docker image reference +func extractImageRegistry(name string) string { parts := strings.SplitN(name, "/", 2) var registry string if len(parts) == 2 && (strings.ContainsRune(parts[0], '.') || strings.ContainsRune(parts[0], ':')) { @@ -421,3 +437,24 @@ func ExtractImageRegistry(name string) string { } return registry } + +// extractGitHostname extracts the hostname from the git URL. +func extractGitHostname(input string) string { + u, err := url.Parse(input) + if err != nil { + return "" + } + return u.Hostname() +} + +// ExtractHost return registry for Docker Image and Host for git url +func ExtractHost(input string, sourceType int) string { + switch sourceType { + case GitURL: + return extractGitHostname(input) + case ImageRegistry: + return extractImageRegistry(input) + default: + return "" + } +} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig.go b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig.go similarity index 77% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig.go index f2d53635a..6cd0942ff 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig.go @@ -1,4 +1,4 @@ -// Copyright 2022 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package kubeconfig provides access to the cluster for kapp-controller @@ -7,8 +7,8 @@ package kubeconfig import ( "fmt" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "github.com/go-logr/logr" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" "k8s.io/client-go/kubernetes" ) @@ -32,6 +32,8 @@ type AccessInfo struct { Name string Namespace string + DeployNamespace string + Kubeconfig *Restricted DangerousUsePodServiceAccount bool } @@ -47,7 +49,7 @@ func NewKubeconfig(coreClient kubernetes.Interface, log logr.Logger) *Kubeconfig // ClusterAccess takes cluster info and a ServiceAccount Name, and returns a populated kubeconfig that can connect to a cluster. // if the saName is empty then you'll connect to a cluster via the clusterOpts inside the genericOpts, otherwise you'll use the specified SA. -func (k Kubeconfig) ClusterAccess(saName string, clusterOpts *v1alpha1.AppCluster, accessLocation AccessLocation) (AccessInfo, error) { +func (k Kubeconfig) ClusterAccess(saName string, clusterOpts *v1alpha1.AppCluster, accessLocation AccessLocation, defaultNamespace string) (AccessInfo, error) { var err error var clusterAccessInfo AccessInfo @@ -63,9 +65,19 @@ func (k Kubeconfig) ClusterAccess(saName string, clusterOpts *v1alpha1.AppCluste if err != nil { return AccessInfo{}, err } + // Use kubeconfig preferred namespace as deploy namespace if + // defaultNamespace is provided and cluster.namespace is not provided, + if defaultNamespace != "" && clusterAccessInfo.DeployNamespace == "" { + clusterAccessInfo.DeployNamespace = clusterAccessInfo.Kubeconfig.defaultNamespace + } default: return AccessInfo{}, fmt.Errorf("Expected service account or cluster specified") } + + if defaultNamespace != "" { + clusterAccessInfo.Namespace = defaultNamespace + } + return clusterAccessInfo, nil } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig_restricted.go b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig_restricted.go similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig_restricted.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig_restricted.go index 8f11e0d69..3e5cad7e8 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig_restricted.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig_restricted.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package kubeconfig @@ -13,6 +13,8 @@ import ( // Restricted contains a kubernetes kubeconfig as a string type Restricted struct { result string + + defaultNamespace string } // NewKubeconfigRestricted takes kubeconfig yaml as input and returns kubeconfig yaml with certain fields restricted (removed). @@ -65,6 +67,7 @@ func NewKubeconfigRestricted(input string) (*Restricted, error) { }) } + defaultNamespace := "default" // TODO: Use the value from client-go directly for _, inputCtx := range inputConfig.Contexts { resultConfig.Contexts = append(resultConfig.Contexts, clientcmd.NamedContext{ Name: inputCtx.Name, @@ -74,6 +77,9 @@ func NewKubeconfigRestricted(input string) (*Restricted, error) { Namespace: inputCtx.Context.Namespace, }, }) + if inputCtx.Name == inputConfig.CurrentContext && inputCtx.Context.Namespace != "" { + defaultNamespace = inputCtx.Context.Namespace + } } bs, err := yaml.Marshal(resultConfig) @@ -81,7 +87,7 @@ func NewKubeconfigRestricted(input string) (*Restricted, error) { return nil, fmt.Errorf("Marshaling kubeconfig: %s", err) } - return &Restricted{string(bs)}, nil + return &Restricted{string(bs), defaultNamespace}, nil } // AsYAML returns a string formatted kubernetes kubeconfig diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig_secrets.go b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig_secrets.go similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig_secrets.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig_secrets.go index d0fb2c1bf..ce615a9bf 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/kubeconfig_secrets.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/kubeconfig_secrets.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package kubeconfig @@ -8,7 +8,7 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" ) @@ -49,8 +49,10 @@ func (s *Secrets) Find(accessLocation AccessLocation, Name: accessLocation.Name, // Override destination namespace; if it's empty // assume kubeconfig contains preferred namespace - Namespace: clusterOpts.Namespace, - Kubeconfig: kubeconfigRestricted, + Namespace: clusterOpts.Namespace, + // Use provided namespace as app namespace + DeployNamespace: clusterOpts.Namespace, + Kubeconfig: kubeconfigRestricted, } return pgoForCluster, nil diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/service_accounts.go b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/service_accounts.go similarity index 91% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/service_accounts.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/service_accounts.go index 7b089e877..0892ff609 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/kubeconfig/service_accounts.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/kubeconfig/service_accounts.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package kubeconfig @@ -11,8 +11,8 @@ import ( "sync" "time" + "carvel.dev/kapp-controller/pkg/satoken" "github.com/go-logr/logr" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/satoken" authenticationv1 "k8s.io/api/authentication/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" @@ -51,9 +51,10 @@ func (s *ServiceAccounts) Find(accessLocation AccessLocation, saName string) (Ac } pgoForSA := AccessInfo{ - Name: accessLocation.Name, - Namespace: "", // Assume kubeconfig contains preferred namespace from SA - Kubeconfig: kubeconfigRestricted, + Name: accessLocation.Name, + Namespace: "", // Assume kubeconfig contains preferred namespace from SA + DeployNamespace: accessLocation.Namespace, // App namespace is same as SA namespace + Kubeconfig: kubeconfigRestricted, } return pgoForSA, nil diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/doc.go similarity index 83% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/memdir/doc.go index 7a5919967..6413b125e 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/doc.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package memdir is used to create temporary directories while writing to the filesystem to handle security and concurrency issues. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/scoped.go b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/scoped.go similarity index 95% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/scoped.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/memdir/scoped.go index fa6493fe3..154707083 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/scoped.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/scoped.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package memdir diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/subpath.go b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/subpath.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/subpath.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/memdir/subpath.go index c685e42b2..e03f905bb 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/subpath.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/subpath.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package memdir diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/tmp_dir.go b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/tmp_dir.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/tmp_dir.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/memdir/tmp_dir.go index cfd83ce10..b615494b9 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir/tmp_dir.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/memdir/tmp_dir.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package memdir diff --git a/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/metrics.go b/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/metrics.go new file mode 100644 index 000000000..b89aab725 --- /dev/null +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/metrics.go @@ -0,0 +1,20 @@ +// Copyright 2024 The Carvel Authors. +// SPDX-License-Identifier: Apache-2.0 + +package metrics + +// Metrics holds all metrics +type Metrics struct { + *ReconcileCountMetrics + *ReconcileTimeMetrics + IsFirstReconcile bool +} + +// NewMetrics is a factory function that returns a new instance of Metrics. +func NewMetrics() *Metrics { + return &Metrics{ + ReconcileCountMetrics: NewCountMetrics(), + ReconcileTimeMetrics: NewReconcileTimeMetrics(), + IsFirstReconcile: false, + } +} diff --git a/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_count_metrics.go b/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_count_metrics.go new file mode 100644 index 000000000..b0244dd33 --- /dev/null +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_count_metrics.go @@ -0,0 +1,144 @@ +// Copyright 2024 The Carvel Authors. +// SPDX-License-Identifier: Apache-2.0 + +package metrics + +import ( + "sync" + + "github.com/prometheus/client_golang/prometheus" + dto "github.com/prometheus/client_model/go" + "sigs.k8s.io/controller-runtime/pkg/metrics" +) + +// ReconcileCountMetrics holds server metrics +type ReconcileCountMetrics struct { + reconcileAttemptTotal *prometheus.CounterVec + reconcileSuccessTotal *prometheus.CounterVec + reconcileFailureTotal *prometheus.CounterVec + reconcileDeleteAttemptTotal *prometheus.CounterVec + reconcileDeleteFailedTotal *prometheus.CounterVec +} + +var ( + once sync.Once +) + +// NewCountMetrics creates ReconcileCountMetrics object +func NewCountMetrics() *ReconcileCountMetrics { + const ( + metricNamespace = "kappctrl" + kappNameLabel = "name" + kappNamespaceLabel = "namespace" + resourceTypeLabel = "controller" + ) + return &ReconcileCountMetrics{ + reconcileAttemptTotal: prometheus.NewCounterVec( + prometheus.CounterOpts{ + Namespace: metricNamespace, + Name: "app_reconcile_attempt_total", + Help: "Total number of attempted reconciles", + }, + []string{resourceTypeLabel, kappNameLabel, kappNamespaceLabel}, + ), + reconcileSuccessTotal: prometheus.NewCounterVec( + prometheus.CounterOpts{ + Namespace: metricNamespace, + Name: "app_reconcile_success_total", + Help: "Total number of succeeded reconciles", + }, + []string{resourceTypeLabel, kappNameLabel, kappNamespaceLabel}, + ), + reconcileFailureTotal: prometheus.NewCounterVec( + prometheus.CounterOpts{ + Namespace: metricNamespace, + Name: "app_reconcile_failure_total", + Help: "Total number of failed reconciles", + }, + []string{resourceTypeLabel, kappNameLabel, kappNamespaceLabel}, + ), + reconcileDeleteAttemptTotal: prometheus.NewCounterVec( + prometheus.CounterOpts{ + Namespace: metricNamespace, + Name: "app_reconcile_delete_attempt_total", + Help: "Total number of attempted reconcile deletions", + }, + []string{resourceTypeLabel, kappNameLabel, kappNamespaceLabel}, + ), + reconcileDeleteFailedTotal: prometheus.NewCounterVec( + prometheus.CounterOpts{ + Namespace: metricNamespace, + Name: "app_reconcile_delete_failed_total", + Help: "Total number of failed reconcile deletions", + }, + []string{resourceTypeLabel, kappNameLabel, kappNamespaceLabel}, + ), + } +} + +// RegisterAllMetrics registers all prometheus metrics. +func (am *ReconcileCountMetrics) RegisterAllMetrics() { + once.Do(func() { + metrics.Registry.MustRegister( + am.reconcileAttemptTotal, + am.reconcileSuccessTotal, + am.reconcileFailureTotal, + am.reconcileDeleteAttemptTotal, + am.reconcileDeleteFailedTotal, + ) + }) +} + +// InitMetrics initializes metrics +func (am *ReconcileCountMetrics) InitMetrics(resourceType, name, namespace string) { + // Initializes counter metrics + am.reconcileAttemptTotal.WithLabelValues(resourceType, name, namespace).Add(0) + am.reconcileSuccessTotal.WithLabelValues(resourceType, name, namespace).Add(0) + am.reconcileFailureTotal.WithLabelValues(resourceType, name, namespace).Add(0) + am.reconcileDeleteAttemptTotal.WithLabelValues(resourceType, name, namespace).Add(0) + am.reconcileDeleteFailedTotal.WithLabelValues(resourceType, name, namespace).Add(0) +} + +// DeleteMetrics deletes metrics +func (am *ReconcileCountMetrics) DeleteMetrics(resourceType, name, namespace string) { + // Delete counter metrics + am.reconcileAttemptTotal.DeleteLabelValues(resourceType, name, namespace) + am.reconcileSuccessTotal.DeleteLabelValues(resourceType, name, namespace) + am.reconcileFailureTotal.DeleteLabelValues(resourceType, name, namespace) + am.reconcileDeleteAttemptTotal.DeleteLabelValues(resourceType, name, namespace) + am.reconcileDeleteFailedTotal.DeleteLabelValues(resourceType, name, namespace) +} + +// RegisterReconcileAttempt increments reconcileAttemptTotal +func (am *ReconcileCountMetrics) RegisterReconcileAttempt(resourceType, appName, namespace string) { + am.reconcileAttemptTotal.WithLabelValues(resourceType, appName, namespace).Inc() +} + +// RegisterReconcileSuccess increments reconcileSuccessTotal +func (am *ReconcileCountMetrics) RegisterReconcileSuccess(resourceType, appName, namespace string) { + am.reconcileSuccessTotal.WithLabelValues(resourceType, appName, namespace).Inc() +} + +// RegisterReconcileFailure increments reconcileFailureTotal +func (am *ReconcileCountMetrics) RegisterReconcileFailure(resourceType, appName, namespace string) { + am.reconcileFailureTotal.WithLabelValues(resourceType, appName, namespace).Inc() +} + +// RegisterReconcileDeleteAttempt increments reconcileDeleteAttemptTotal +func (am *ReconcileCountMetrics) RegisterReconcileDeleteAttempt(resourceType, appName, namespace string) { + am.reconcileDeleteAttemptTotal.WithLabelValues(resourceType, appName, namespace).Inc() +} + +// RegisterReconcileDeleteFailed increments reconcileDeleteFailedTotal +func (am *ReconcileCountMetrics) RegisterReconcileDeleteFailed(resourceType, appName, namespace string) { + am.reconcileDeleteFailedTotal.WithLabelValues(resourceType, appName, namespace).Inc() +} + +// GetReconcileAttemptCounterValue return reconcile count +func (am *ReconcileCountMetrics) GetReconcileAttemptCounterValue(resourceType, appName, namespace string) int64 { + var m = &dto.Metric{} + if err := am.reconcileAttemptTotal.WithLabelValues(resourceType, appName, namespace).Write(m); err != nil { + return 0 + } + return int64(m.Counter.GetValue()) +} diff --git a/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_time_metrics.go b/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_time_metrics.go new file mode 100644 index 000000000..737ff07fd --- /dev/null +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/metrics/reconcile_time_metrics.go @@ -0,0 +1,103 @@ +// Copyright 2024 The Carvel Authors. +// SPDX-License-Identifier: Apache-2.0 + +// Package metrics to define all prometheus metric methods +package metrics + +import ( + "strconv" + "sync" + "time" + + "github.com/prometheus/client_golang/prometheus" + "sigs.k8s.io/controller-runtime/pkg/metrics" +) + +// ReconcileTimeMetrics holds reconcile time metrics +type ReconcileTimeMetrics struct { + reconcileTimeSeconds *prometheus.GaugeVec + reconcileDeployTimeSeconds *prometheus.GaugeVec + reconcileFetchTimeSeconds *prometheus.GaugeVec + reconcileTemplateTimeSeconds *prometheus.GaugeVec +} + +var ( + timeMetricsOnce sync.Once +) + +// NewReconcileTimeMetrics creates ReconcileTimeMetrics object +func NewReconcileTimeMetrics() *ReconcileTimeMetrics { + const ( + metricNamespace = "kappctrl" + resourceTypeLabel = "controller" + resourceNameLabel = "name" + firstReconcileLabel = "firstReconcile" + namespaceLabel = "namespace" + ) + return &ReconcileTimeMetrics{ + reconcileTimeSeconds: prometheus.NewGaugeVec( + prometheus.GaugeOpts{ + Namespace: metricNamespace, + Name: "reconcile_time_seconds", + Help: "Overall time taken to reconcile a CR", + }, + []string{resourceTypeLabel, resourceNameLabel, namespaceLabel, firstReconcileLabel}, + ), + reconcileFetchTimeSeconds: prometheus.NewGaugeVec( + prometheus.GaugeOpts{ + Namespace: metricNamespace, + Name: "reconcile_fetch_time_seconds", + Help: "Time taken to perform a fetch for a CR", + }, + []string{resourceTypeLabel, resourceNameLabel, namespaceLabel, firstReconcileLabel}, + ), + reconcileTemplateTimeSeconds: prometheus.NewGaugeVec( + prometheus.GaugeOpts{ + Namespace: metricNamespace, + Name: "reconcile_template_time_seconds", + Help: "Time taken to perform a templating for a CR", + }, + []string{resourceTypeLabel, resourceNameLabel, namespaceLabel, firstReconcileLabel}, + ), + reconcileDeployTimeSeconds: prometheus.NewGaugeVec( + prometheus.GaugeOpts{ + Namespace: metricNamespace, + Name: "reconcile_deploy_time_seconds", + Help: "Time taken to perform a deploy for a CR", + }, + []string{resourceTypeLabel, resourceNameLabel, namespaceLabel, firstReconcileLabel}, + ), + } +} + +// RegisterAllMetrics registers reconcile time prometheus metrics. +func (tm *ReconcileTimeMetrics) RegisterAllMetrics() { + timeMetricsOnce.Do(func() { + metrics.Registry.MustRegister( + tm.reconcileTimeSeconds, + tm.reconcileFetchTimeSeconds, + tm.reconcileTemplateTimeSeconds, + tm.reconcileDeployTimeSeconds, + ) + }) +} + +// RegisterOverallTime sets overall time +func (tm *ReconcileTimeMetrics) RegisterOverallTime(resourceType, name, namespace string, firstReconcile bool, time time.Duration) { + tm.reconcileTimeSeconds.WithLabelValues(resourceType, name, namespace, strconv.FormatBool(firstReconcile)).Set(time.Seconds()) +} + +// RegisterFetchTime sets fetch time +func (tm *ReconcileTimeMetrics) RegisterFetchTime(resourceType, name, namespace string, firstReconcile bool, time time.Duration) { + tm.reconcileFetchTimeSeconds.WithLabelValues(resourceType, name, namespace, strconv.FormatBool(firstReconcile)).Set(time.Seconds()) +} + +// RegisterTemplateTime sets template time +func (tm *ReconcileTimeMetrics) RegisterTemplateTime(resourceType, name, namespace string, firstReconcile bool, time time.Duration) { + tm.reconcileTemplateTimeSeconds.WithLabelValues(resourceType, name, namespace, strconv.FormatBool(firstReconcile)).Set(time.Seconds()) +} + +// RegisterDeployTime sets deploy time +func (tm *ReconcileTimeMetrics) RegisterDeployTime(resourceType, name, namespace string, firstReconcile bool, time time.Duration) { + tm.reconcileDeployTimeSeconds.WithLabelValues(resourceType, name, namespace, strconv.FormatBool(firstReconcile)).Set(time.Seconds()) +} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/app.go b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/app.go similarity index 88% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/app.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/app.go index f46df527f..10d2deca2 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/app.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/app.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package packageinstall @@ -7,13 +7,12 @@ import ( "fmt" "sort" "strings" - "time" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + datapkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" ) @@ -33,7 +32,9 @@ const ( ExtFetchSecretNameAnnKeyFmt = "ext.packaging.carvel.dev/fetch-%d-secret-name" ) -func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall, pkgVersion datapkgingv1alpha1.Package) (*v1alpha1.App, error) { +// NewApp creates a new instance of v1alpha1.App based on the provided parameters. +// It takes an existingApp, pkgInstall, pkgVersion, and opts, and returns the newly created App. +func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall, pkgVersion datapkgingv1alpha1.Package, opts Opts) (*v1alpha1.App, error) { desiredApp := existingApp.DeepCopy() if _, found := existingApp.Annotations[ManuallyControlledAnnKey]; found { @@ -53,7 +54,7 @@ func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall desiredApp.Spec = *pkgVersion.Spec.Template.Spec desiredApp.Spec.ServiceAccountName = pkgInstall.Spec.ServiceAccountName if pkgInstall.Spec.SyncPeriod == nil { - desiredApp.Spec.SyncPeriod = &metav1.Duration{Duration: time.Minute * 10} + desiredApp.Spec.SyncPeriod = &metav1.Duration{Duration: opts.DefaultSyncPeriod} } else { desiredApp.Spec.SyncPeriod = pkgInstall.Spec.SyncPeriod } @@ -61,6 +62,7 @@ func NewApp(existingApp *v1alpha1.App, pkgInstall *pkgingv1alpha1.PackageInstall desiredApp.Spec.Paused = pkgInstall.Spec.Paused desiredApp.Spec.Canceled = pkgInstall.Spec.Canceled desiredApp.Spec.Cluster = pkgInstall.Spec.Cluster + desiredApp.Spec.DefaultNamespace = pkgInstall.Spec.DefaultNamespace err := controllerutil.SetControllerReference(pkgInstall, desiredApp, scheme.Scheme) if err != nil { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/finalizer.go b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/finalizer.go similarity index 95% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/finalizer.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/finalizer.go index 18d6b8a6d..47f9a004d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/finalizer.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/finalizer.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package packageinstall diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/packageinstall.go b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/packageinstall.go similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/packageinstall.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/packageinstall.go index 7440d6672..1600591a8 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/packageinstall.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/packageinstall.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package packageinstall @@ -6,19 +6,21 @@ package packageinstall import ( "context" "fmt" - + "time" + + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + datapkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + pkgclient "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + "carvel.dev/kapp-controller/pkg/client/clientset/versioned/scheme" + "carvel.dev/kapp-controller/pkg/metrics" + "carvel.dev/kapp-controller/pkg/reconciler" + "carvel.dev/vendir/pkg/vendir/versions" + verv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/go-logr/logr" semver "github.com/k14s/semver/v4" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - pkgclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned/scheme" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" - verv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" "k8s.io/apimachinery/pkg/api/errors" @@ -52,13 +54,27 @@ type PackageInstallCR struct { pkgclient pkgclient.Interface coreClient kubernetes.Interface compInfo ComponentInfo + opts Opts + + pkgMetrics *metrics.Metrics +} + +// Kind return kind of pkg install +func (pi *PackageInstallCR) Kind() string { + return "PackageInstall" +} + +// nolint: revive +type Opts struct { + DefaultSyncPeriod time.Duration } func NewPackageInstallCR(model *pkgingv1alpha1.PackageInstall, log logr.Logger, - kcclient kcclient.Interface, pkgclient pkgclient.Interface, coreClient kubernetes.Interface, compInfo ComponentInfo) *PackageInstallCR { + kcclient kcclient.Interface, pkgclient pkgclient.Interface, coreClient kubernetes.Interface, + compInfo ComponentInfo, opts Opts, pkgMetrics *metrics.Metrics) *PackageInstallCR { return &PackageInstallCR{model: model, unmodifiedModel: model.DeepCopy(), log: log, - kcclient: kcclient, pkgclient: pkgclient, coreClient: coreClient, compInfo: compInfo} + kcclient: kcclient, pkgclient: pkgclient, coreClient: coreClient, compInfo: compInfo, opts: opts, pkgMetrics: pkgMetrics} } func (pi *PackageInstallCR) Reconcile() (reconcile.Result, error) { @@ -67,6 +83,8 @@ func (pi *PackageInstallCR) Reconcile() (reconcile.Result, error) { func(st kcv1alpha1.GenericStatus) { pi.model.Status.GenericStatus = st }, } + pi.pkgMetrics.ReconcileCountMetrics.InitMetrics(pi.Kind(), pi.model.Name, pi.model.Namespace) + var result reconcile.Result var err error @@ -93,6 +111,14 @@ func (pi *PackageInstallCR) Reconcile() (reconcile.Result, error) { func (pi *PackageInstallCR) reconcile(modelStatus *reconciler.Status) (reconcile.Result, error) { pi.log.Info("Reconciling") + pi.pkgMetrics.ReconcileCountMetrics.RegisterReconcileAttempt(pi.Kind(), pi.model.Name, pi.model.Namespace) + + reconcileStartTime := time.Now() + pi.pkgMetrics.IsFirstReconcile = pi.pkgMetrics.ReconcileCountMetrics.GetReconcileAttemptCounterValue(pi.Kind(), pi.model.Name, pi.model.Namespace) == 1 + defer func() { + pi.pkgMetrics.ReconcileTimeMetrics.RegisterOverallTime(pi.Kind(), pi.model.Name, pi.model.Namespace, + pi.pkgMetrics.IsFirstReconcile, time.Since(reconcileStartTime)) + }() err := pi.blockDeletion() if err != nil { @@ -174,7 +200,7 @@ func (pi *PackageInstallCR) reconcile(modelStatus *reconciler.Status) (reconcile } func (pi *PackageInstallCR) createAppFromPackage(pkg datapkgingv1alpha1.Package) (reconcile.Result, error) { - desiredApp, err := NewApp(&v1alpha1.App{}, pi.model, pkg) + desiredApp, err := NewApp(&v1alpha1.App{}, pi.model, pkg, pi.opts) if err != nil { return reconcile.Result{Requeue: true}, err } @@ -193,7 +219,7 @@ func (pi *PackageInstallCR) reconcileAppWithPackage(existingApp *kcv1alpha1.App, return reconcile.Result{}, err } - desiredApp, err := NewApp(existingApp, pi.model, pkgWithPlaceholderSecrets) + desiredApp, err := NewApp(existingApp, pi.model, pkgWithPlaceholderSecrets, pi.opts) if err != nil { return reconcile.Result{Requeue: true}, err } @@ -366,6 +392,7 @@ func (pi *PackageInstallCR) reconcileDelete(modelStatus *reconciler.Status) (rec if existingApp.Spec.Canceled != pi.model.Spec.Canceled { existingApp.Spec.Canceled = pi.model.Spec.Canceled } + existingApp.Spec.DefaultNamespace = pi.model.Spec.DefaultNamespace if !equality.Semantic.DeepEqual(existingApp, unchangeExistingApp) { existingApp, err = pi.kcclient.KappctrlV1alpha1().Apps(existingApp.Namespace).Update( diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/packageinstall_version_handler.go b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/packageinstall_version_handler.go similarity index 66% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/packageinstall_version_handler.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/packageinstall_version_handler.go index 57b1288c8..6e5fe9571 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/packageinstall_version_handler.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/packageinstall_version_handler.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package packageinstall @@ -6,12 +6,12 @@ package packageinstall import ( "context" + pkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + datapkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + "carvel.dev/vendir/pkg/vendir/versions" + verv1alpha1 "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" "github.com/go-logr/logr" - pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions" - verv1alpha1 "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" @@ -31,13 +31,14 @@ type PackageInstallVersionHandler struct { log logr.Logger } -var _ handler.EventHandler = &PackageInstallVersionHandler{} +var _ handler.TypedEventHandler[*datapkgingv1alpha1.Package] = &PackageInstallVersionHandler{} func NewPackageInstallVersionHandler(c kcclient.Interface, globalNS string, log logr.Logger) *PackageInstallVersionHandler { return &PackageInstallVersionHandler{c, globalNS, log} } -func (ipvh *PackageInstallVersionHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +// Create is called in response to an create event +func (ipvh *PackageInstallVersionHandler) Create(_ context.Context, evt event.TypedCreateEvent[*datapkgingv1alpha1.Package], q workqueue.RateLimitingInterface) { ipvh.log.Info("enqueueing PackageInstallList") err := ipvh.enqueueEligiblePackageInstalls(q, evt.Object) if err != nil { @@ -45,7 +46,8 @@ func (ipvh *PackageInstallVersionHandler) Create(evt event.CreateEvent, q workqu } } -func (ipvh *PackageInstallVersionHandler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +// Update is called in response to an update event +func (ipvh *PackageInstallVersionHandler) Update(_ context.Context, evt event.TypedUpdateEvent[*datapkgingv1alpha1.Package], q workqueue.RateLimitingInterface) { ipvh.log.Info("enqueueing PackageInstallList") err := ipvh.enqueueEligiblePackageInstalls(q, evt.ObjectNew) if err != nil { @@ -53,7 +55,8 @@ func (ipvh *PackageInstallVersionHandler) Update(evt event.UpdateEvent, q workqu } } -func (ipvh *PackageInstallVersionHandler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +// Delete is called in response to a delete event +func (ipvh *PackageInstallVersionHandler) Delete(_ context.Context, evt event.TypedDeleteEvent[*datapkgingv1alpha1.Package], q workqueue.RateLimitingInterface) { ipvh.log.Info("enqueueing PackageInstallList") err := ipvh.enqueueEligiblePackageInstalls(q, evt.Object) if err != nil { @@ -61,7 +64,9 @@ func (ipvh *PackageInstallVersionHandler) Delete(evt event.DeleteEvent, q workqu } } -func (ipvh *PackageInstallVersionHandler) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) { +// Generic is called in response to an event of an unknown type or a synthetic event triggered as a cron or +// external trigger request - e.g. reconcile Autoscaling, or a Webhook. +func (ipvh *PackageInstallVersionHandler) Generic(_ context.Context, evt event.TypedGenericEvent[*datapkgingv1alpha1.Package], q workqueue.RateLimitingInterface) { ipvh.log.Info("enqueueing installedPkgList") err := ipvh.enqueueEligiblePackageInstalls(q, evt.Object) if err != nil { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/reconciler.go b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/reconciler.go similarity index 59% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/reconciler.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/reconciler.go index 367d0270f..b960beaa6 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/packageinstall/reconciler.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/packageinstall/reconciler.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package packageinstall @@ -7,17 +7,20 @@ import ( "context" "fmt" + kappctrlv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + pkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apis/packaging/v1alpha1" + datapkgingv1alpha1 "carvel.dev/kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" + pkgclient "carvel.dev/kapp-controller/pkg/apiserver/client/clientset/versioned" + kcclient "carvel.dev/kapp-controller/pkg/client/clientset/versioned" + kcconfig "carvel.dev/kapp-controller/pkg/config" + "carvel.dev/kapp-controller/pkg/metrics" "github.com/go-logr/logr" - kappctrlv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - pkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/packaging/v1alpha1" - datapkgingv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/apis/datapackaging/v1alpha1" - pkgclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apiserver/client/clientset/versioned" - kcclient "github.com/vmware-tanzu/carvel-kapp-controller/pkg/client/clientset/versioned" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/source" ) @@ -30,39 +33,42 @@ type Reconciler struct { pkgToPkgInstallHandler *PackageInstallVersionHandler compInfo ComponentInfo log logr.Logger + kcConfig *kcconfig.Config + pkgMetrics *metrics.Metrics } // NewReconciler is the constructor for the Reconciler struct func NewReconciler(kcClient kcclient.Interface, pkgClient pkgclient.Interface, coreClient kubernetes.Interface, pkgToPkgInstallHandler *PackageInstallVersionHandler, - log logr.Logger, compInfo ComponentInfo) *Reconciler { + log logr.Logger, compInfo ComponentInfo, kcConfig *kcconfig.Config, pkgMetrics *metrics.Metrics) *Reconciler { return &Reconciler{kcClient: kcClient, pkgClient: pkgClient, coreClient: coreClient, pkgToPkgInstallHandler: pkgToPkgInstallHandler, compInfo: compInfo, - log: log} + log: log, + kcConfig: kcConfig, + pkgMetrics: pkgMetrics, + } } var _ reconcile.Reconciler = &Reconciler{} // AttachWatches configures watches needed for reconciler to reconcile PackageInstalls. -func (r *Reconciler) AttachWatches(controller controller.Controller) error { - err := controller.Watch(&source.Kind{Type: &pkgingv1alpha1.PackageInstall{}}, &handler.EnqueueRequestForObject{}) +func (r *Reconciler) AttachWatches(controller controller.Controller, mgr manager.Manager) error { + err := controller.Watch(source.Kind(mgr.GetCache(), &pkgingv1alpha1.PackageInstall{}, &handler.TypedEnqueueRequestForObject[*pkgingv1alpha1.PackageInstall]{})) if err != nil { return fmt.Errorf("Watching PackageInstalls: %s", err) } - err = controller.Watch(&source.Kind{Type: &datapkgingv1alpha1.Package{}}, r.pkgToPkgInstallHandler) + err = controller.Watch(source.Kind(mgr.GetCache(), &datapkgingv1alpha1.Package{}, r.pkgToPkgInstallHandler)) if err != nil { return fmt.Errorf("Watching Packages: %s", err) } - err = controller.Watch(&source.Kind{Type: &kappctrlv1alpha1.App{}}, &handler.EnqueueRequestForOwner{ - OwnerType: &pkgingv1alpha1.PackageInstall{}, - IsController: true, - }) + err = controller.Watch(source.Kind(mgr.GetCache(), &kappctrlv1alpha1.App{}, handler.TypedEnqueueRequestForOwner[*kappctrlv1alpha1.App]( + mgr.GetScheme(), mgr.GetRESTMapper(), &pkgingv1alpha1.PackageInstall{}, handler.OnlyControllerOwner()))) if err != nil { return fmt.Errorf("Watching Apps: %s", err) } @@ -85,5 +91,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) ( return reconcile.Result{}, err } - return NewPackageInstallCR(existingPkgInstall, log, r.kcClient, r.pkgClient, r.coreClient, r.compInfo).Reconcile() + return NewPackageInstallCR(existingPkgInstall, log, r.kcClient, r.pkgClient, r.coreClient, r.compInfo, + Opts{DefaultSyncPeriod: r.kcConfig.PackageInstallDefaultSyncPeriod()}, r.pkgMetrics).Reconcile() } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/configmap_handler.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/configmap_handler.go similarity index 58% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/configmap_handler.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/configmap_handler.go index b3ce35e46..ed7cdd98c 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/configmap_handler.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/configmap_handler.go @@ -1,11 +1,14 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package reconciler import ( + "context" + + "carvel.dev/kapp-controller/pkg/reftracker" "github.com/go-logr/logr" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/event" @@ -19,26 +22,32 @@ type ConfigMapHandler struct { appUpdateStatus *reftracker.AppUpdateStatus } -var _ handler.EventHandler = &ConfigMapHandler{} +var _ handler.TypedEventHandler[*corev1.ConfigMap] = &ConfigMapHandler{} func NewConfigMapHandler(log logr.Logger, as *reftracker.AppRefTracker, aus *reftracker.AppUpdateStatus) *ConfigMapHandler { return &ConfigMapHandler{log, as, aus} } -func (sch *ConfigMapHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +// Create is called in response to create event +func (sch *ConfigMapHandler) Create(_ context.Context, evt event.TypedCreateEvent[*corev1.ConfigMap], q workqueue.RateLimitingInterface) { sch.enqueueAppsForUpdate(evt.Object.GetName(), evt.Object.GetNamespace(), q) } -func (sch *ConfigMapHandler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +// Update is called in response to an update event +func (sch *ConfigMapHandler) Update(_ context.Context, evt event.TypedUpdateEvent[*corev1.ConfigMap], q workqueue.RateLimitingInterface) { sch.enqueueAppsForUpdate(evt.ObjectNew.GetName(), evt.ObjectNew.GetNamespace(), q) } -func (sch *ConfigMapHandler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +// Delete is called in response to a delete event +func (sch *ConfigMapHandler) Delete(_ context.Context, evt event.TypedDeleteEvent[*corev1.ConfigMap], q workqueue.RateLimitingInterface) { sch.enqueueAppsForUpdate(evt.Object.GetName(), evt.Object.GetNamespace(), q) sch.appRefTracker.RemoveRef(reftracker.NewConfigMapKey(evt.Object.GetName(), evt.Object.GetNamespace())) } -func (sch *ConfigMapHandler) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) {} +// Generic is called in response to an event of an unknown type or a synthetic event triggered as a cron or +// external trigger request - e.g. reconcile Autoscaling, or a Webhook. +func (sch *ConfigMapHandler) Generic(_ context.Context, _ event.TypedGenericEvent[*corev1.ConfigMap], _ workqueue.RateLimitingInterface) { +} func (sch *ConfigMapHandler) enqueueAppsForUpdate(cfgmName, cfgmNamespace string, q workqueue.RateLimitingInterface) error { apps, err := sch.appRefTracker.AppsForRef(reftracker.NewConfigMapKey(cfgmName, cfgmNamespace)) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/secret_handler.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/secret_handler.go similarity index 59% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/secret_handler.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/secret_handler.go index 9e0a17dfa..93b701e0f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/secret_handler.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/secret_handler.go @@ -1,11 +1,14 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package reconciler import ( + "context" + + "carvel.dev/kapp-controller/pkg/reftracker" "github.com/go-logr/logr" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker" + corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/event" @@ -19,26 +22,32 @@ type SecretHandler struct { appUpdateStatus *reftracker.AppUpdateStatus } -var _ handler.EventHandler = &SecretHandler{} +var _ handler.TypedEventHandler[*corev1.Secret] = &SecretHandler{} func NewSecretHandler(log logr.Logger, as *reftracker.AppRefTracker, aus *reftracker.AppUpdateStatus) *SecretHandler { return &SecretHandler{log, as, aus} } -func (sch *SecretHandler) Create(evt event.CreateEvent, q workqueue.RateLimitingInterface) { +// Create is called in response to an create event +func (sch *SecretHandler) Create(_ context.Context, evt event.TypedCreateEvent[*corev1.Secret], q workqueue.RateLimitingInterface) { sch.enqueueAppsForUpdate(evt.Object.GetName(), evt.Object.GetNamespace(), q) } -func (sch *SecretHandler) Update(evt event.UpdateEvent, q workqueue.RateLimitingInterface) { +// Update is called in response to an update event +func (sch *SecretHandler) Update(_ context.Context, evt event.TypedUpdateEvent[*corev1.Secret], q workqueue.RateLimitingInterface) { sch.enqueueAppsForUpdate(evt.ObjectNew.GetName(), evt.ObjectNew.GetNamespace(), q) } -func (sch *SecretHandler) Delete(evt event.DeleteEvent, q workqueue.RateLimitingInterface) { +// Delete is called in response to a delete event +func (sch *SecretHandler) Delete(_ context.Context, evt event.TypedDeleteEvent[*corev1.Secret], q workqueue.RateLimitingInterface) { sch.enqueueAppsForUpdate(evt.Object.GetName(), evt.Object.GetNamespace(), q) sch.appRefTracker.RemoveRef(reftracker.NewSecretKey(evt.Object.GetName(), evt.Object.GetNamespace())) } -func (sch *SecretHandler) Generic(evt event.GenericEvent, q workqueue.RateLimitingInterface) {} +// Generic is called in response to an event of an unknown type or a synthetic event triggered as a cron or +// external trigger request - e.g. reconcile Autoscaling, or a Webhook. +func (sch *SecretHandler) Generic(_ context.Context, _ event.TypedGenericEvent[*corev1.Secret], _ workqueue.RateLimitingInterface) { +} func (sch *SecretHandler) enqueueAppsForUpdate(secretName, secretNamespace string, q workqueue.RateLimitingInterface) error { apps, err := sch.appRefTracker.AppsForRef(reftracker.NewSecretKey(secretName, secretNamespace)) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/status.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/status.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/status.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/status.go index 4c474c0de..384ec25e3 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reconciler/status.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reconciler/status.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package reconciler @@ -7,7 +7,7 @@ import ( "fmt" "strings" - kcv1alpha1 "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + kcv1alpha1 "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/app_update_status.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/app_update_status.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/app_update_status.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/app_update_status.go index b97c8a91c..cdb538b39 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/app_update_status.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/app_update_status.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package reftracker diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/doc.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/doc.go similarity index 87% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/doc.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/doc.go index a7308a014..881ce638a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/doc.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/doc.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package reftracker contains structs used for tracking secret and configmap referenced by the app. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/ref_key.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/ref_key.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/ref_key.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/ref_key.go index f4a27d01b..c47764053 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/ref_key.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/ref_key.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package reftracker diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/ref_tracker.go b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/ref_tracker.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/ref_tracker.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/ref_tracker.go index 063ee8526..26a2c0101 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/reftracker/ref_tracker.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/reftracker/ref_tracker.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package reftracker diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/satoken/token_manager.go b/cli/vendor/carvel.dev/kapp-controller/pkg/satoken/token_manager.go similarity index 99% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/satoken/token_manager.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/satoken/token_manager.go index ddd18815d..c33fb3f6b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/satoken/token_manager.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/satoken/token_manager.go @@ -1,4 +1,4 @@ -// Copyright 2022 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // This file is a modified version of diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/cue.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/cue.go similarity index 92% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/cue.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/cue.go index 8d0a86155..e811ca99d 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/cue.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/cue.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package template provides a factory pattern design of instantiating a new "templater" in kapp-controller @@ -11,9 +11,9 @@ import ( "io" goexec "os/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/memdir" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/downward_api_values.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/downward_api_values.go similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/downward_api_values.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/downward_api_values.go index 8b2aeb61c..80ef13b13 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/downward_api_values.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/downward_api_values.go @@ -1,4 +1,4 @@ -// Copyright 2022 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -9,7 +9,7 @@ import ( "regexp" "strings" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" "gopkg.in/yaml.v2" "k8s.io/client-go/util/jsonpath" ) @@ -55,9 +55,9 @@ func (a DownwardAPIValues) AsYAMLs() ([][]byte, error) { if err != nil { return nil, err } - keyValueContent, err = yaml.Marshal(map[string]string{item.Name: v}) + keyValueContent, err = a.nestedKeyValue(item.Name, v) } else { - keyValueContent, err = yaml.Marshal(map[string]string{item.Name: item.KubernetesVersion.Version}) + keyValueContent, err = a.nestedKeyValue(item.Name, item.KubernetesVersion.Version) } case item.KappControllerVersion != nil: if item.KappControllerVersion.Version == "" { @@ -65,9 +65,9 @@ func (a DownwardAPIValues) AsYAMLs() ([][]byte, error) { if err != nil { return nil, err } - keyValueContent, err = yaml.Marshal(map[string]string{item.Name: v}) + keyValueContent, err = a.nestedKeyValue(item.Name, v) } else { - keyValueContent, err = yaml.Marshal(map[string]string{item.Name: item.KappControllerVersion.Version}) + keyValueContent, err = a.nestedKeyValue(item.Name, item.KappControllerVersion.Version) } case item.KubernetesAPIs != nil: if item.KubernetesAPIs.GroupVersions == nil { @@ -75,9 +75,9 @@ func (a DownwardAPIValues) AsYAMLs() ([][]byte, error) { if err != nil { return nil, err } - keyValueContent, err = yaml.Marshal(map[string]interface{}{item.Name: v}) + keyValueContent, err = a.nestedKeyValue(item.Name, v) } else { - keyValueContent, err = yaml.Marshal(map[string]interface{}{item.Name: item.KubernetesAPIs.GroupVersions}) + keyValueContent, err = a.nestedKeyValue(item.Name, item.KubernetesAPIs.GroupVersions) } default: return nil, fmt.Errorf("Invalid downward API item given") diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/factory.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/factory.go similarity index 88% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/factory.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/factory.go index e49e3b91c..c7f2d606b 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/factory.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/factory.go @@ -1,12 +1,12 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template import ( - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/fetch" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/helm_template.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/helm_template.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/helm_template.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/helm_template.go index ff406acb4..5870cef85 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/helm_template.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/helm_template.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -11,9 +11,9 @@ import ( goexec "os/exec" "strings" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/memdir" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/interfaces.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/interfaces.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/interfaces.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/interfaces.go index 7f303138b..51246dc82 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/interfaces.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/interfaces.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -6,7 +6,7 @@ package template import ( "io" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/exec" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/kbld.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/kbld.go similarity index 90% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/kbld.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/kbld.go index 9e9209b08..65b228d99 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/kbld.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/kbld.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -9,9 +9,9 @@ import ( "io" goexec "os/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/memdir" ) // Kbld executes kbld tool. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/sops.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/sops.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/sops.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/sops.go index a08d6eb41..1e7848bb0 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/sops.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/sops.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -14,9 +14,9 @@ import ( "path/filepath" "strings" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/memdir" "golang.org/x/crypto/openpgp" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/values.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/values.go similarity index 95% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/values.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/values.go index 06a49e2b9..1e0a6c644 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/values.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/values.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -9,8 +9,8 @@ import ( "os" "sort" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/memdir" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/ytt.go b/cli/vendor/carvel.dev/kapp-controller/pkg/template/ytt.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/ytt.go rename to cli/vendor/carvel.dev/kapp-controller/pkg/template/ytt.go index 12d135bb2..f2aaed7c5 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-kapp-controller/pkg/template/ytt.go +++ b/cli/vendor/carvel.dev/kapp-controller/pkg/template/ytt.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package template @@ -9,10 +9,10 @@ import ( "io" goexec "os/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/apis/kappctrl/v1alpha1" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/exec" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/fetch" - "github.com/vmware-tanzu/carvel-kapp-controller/pkg/memdir" + "carvel.dev/kapp-controller/pkg/apis/kappctrl/v1alpha1" + "carvel.dev/kapp-controller/pkg/exec" + "carvel.dev/kapp-controller/pkg/fetch" + "carvel.dev/kapp-controller/pkg/memdir" "k8s.io/client-go/kubernetes" ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/LICENSE b/cli/vendor/carvel.dev/vendir/LICENSE similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/LICENSE rename to cli/vendor/carvel.dev/vendir/LICENSE diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/NOTICE b/cli/vendor/carvel.dev/vendir/NOTICE similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/NOTICE rename to cli/vendor/carvel.dev/vendir/NOTICE diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/config.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/config.go similarity index 75% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/config.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/config.go index 479e88ecb..f56b2536f 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/config.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/config.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config @@ -6,10 +6,11 @@ package config import ( "fmt" "path/filepath" + "reflect" "strings" + "carvel.dev/vendir/pkg/vendir/version" semver "github.com/hashicorp/go-version" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/version" "sigs.k8s.io/yaml" ) @@ -31,7 +32,7 @@ func NewConfigFromFiles(paths []string) (Config, []Secret, []ConfigMap, error) { var configs []Config var secrets []Secret var configMaps []ConfigMap - + secretsNames := map[string]Secret{} err := parseResources(paths, func(docBytes []byte) error { var res resource @@ -48,7 +49,14 @@ func NewConfigFromFiles(paths []string) (Config, []Secret, []ConfigMap, error) { if err != nil { return fmt.Errorf("Unmarshaling secret: %s", err) } - secrets = append(secrets, secret) + + if s, ok := secretsNames[secret.Metadata.Name]; ok { + if !reflect.DeepEqual(s.Data, secret.Data) { + return fmt.Errorf( + "Expected to find one secret '%s', but found multiple", s.Metadata.Name) + } + } + secretsNames[secret.Metadata.Name] = secret case res.APIVersion == "v1" && res.Kind == "ConfigMap": var cm ConfigMap @@ -61,6 +69,7 @@ func NewConfigFromFiles(paths []string) (Config, []Secret, []ConfigMap, error) { case res.APIVersion == knownAPIVersion && res.Kind == knownKind: config, err := NewConfigFromBytes(docBytes) + config.cleanPaths() if err != nil { return fmt.Errorf("Unmarshaling config: %s", err) } @@ -72,6 +81,11 @@ func NewConfigFromFiles(paths []string) (Config, []Secret, []ConfigMap, error) { } return nil }) + + for _, v := range secretsNames { + secrets = append(secrets, v) + } + if err != nil { return Config{}, nil, nil, err } @@ -170,6 +184,7 @@ func (c Config) UseDirectory(path, dirPath string) error { ExcludePaths: con.ExcludePaths, IgnorePaths: con.IgnorePaths, LegalPaths: con.LegalPaths, + Lazy: con.Lazy, } dir.Contents[j] = newCon c.Directories[i] = dir @@ -194,25 +209,26 @@ func (c Config) Subset(paths []string) (Config, error) { } for _, dir := range c.Directories { + newDir := dir + newDir.Contents = []DirectoryContents{} + for _, con := range dir.Contents { - path := filepath.Join(dir.Path, con.Path) + entirePath := filepath.Join(dir.Path, con.Path) - seen, found := pathsToSeen[path] + seen, found := pathsToSeen[entirePath] if !found { continue } if seen { - return Config{}, fmt.Errorf("Expected to match path '%s' once, but matched multiple", path) + return Config{}, fmt.Errorf("Expected to match path '%s' once, but matched multiple", entirePath) } - pathsToSeen[path] = true + pathsToSeen[entirePath] = true - newCon := con // copy (but not deep unfortunately) - newCon.Path = EntireDirPath + newDir.Contents = append(newDir.Contents, con) + } - result.Directories = append(result.Directories, Directory{ - Path: path, - Contents: []DirectoryContents{newCon}, - }) + if len(newDir.Contents) > 0 { + result.Directories = append(result.Directories, newDir) } } @@ -245,22 +261,45 @@ func (c Config) Lock(lockConfig LockConfig) error { } func (c Config) checkOverlappingPaths() error { + checkPaths := func(paths []string) error { + for i, path := range paths { + for i2, path2 := range paths { + if i != i2 && strings.HasPrefix(path2+string(filepath.Separator), path+string(filepath.Separator)) { + return fmt.Errorf("Expected to not manage overlapping paths: '%s' and '%s'", path2, path) + } + } + } + return nil + } + paths := []string{} + for _, dir := range c.Directories { + paths = append(paths, dir.Path) + } + + if err := checkPaths(paths); err != nil { + return err + } for _, dir := range c.Directories { - for _, con := range dir.Contents { - paths = append(paths, filepath.Join(dir.Path, con.Path)) + paths = []string{} + for _, cont := range dir.Contents { + paths = append(paths, filepath.Join(dir.Path, cont.Path)) } - } - for i, path := range paths { - for i2, path2 := range paths { - if i != i2 && strings.HasPrefix(path2+string(filepath.Separator), path+string(filepath.Separator)) { - return fmt.Errorf("Expected to not "+ - "manage overlapping paths: '%s' and '%s'", path2, path) - } + if err := checkPaths(paths); err != nil { + return err } } return nil } + +func (c *Config) cleanPaths() { + for i, dir := range c.Directories { + c.Directories[i].Path = filepath.Clean(dir.Path) + for j, con := range dir.Contents { + c.Directories[i].Contents[j].Path = filepath.Clean(con.Path) + } + } +} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/data.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/data.go similarity index 95% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/data.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/data.go index b12c0857e..62ac44a33 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/data.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/data.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/directory.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/directory.go similarity index 93% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/directory.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/directory.go index a386cdd97..72c786965 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/directory.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/directory.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config @@ -8,7 +8,7 @@ import ( "os" "strings" - ctlver "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + ctlver "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) const ( @@ -34,6 +34,7 @@ type Directory struct { type DirectoryContents struct { Path string `json:"path"` + Lazy bool `json:"lazy,omitempty"` Git *DirectoryContentsGit `json:"git,omitempty"` Hg *DirectoryContentsHg `json:"hg,omitempty"` @@ -67,9 +68,11 @@ type DirectoryContentsGit struct { // +optional SecretRef *DirectoryContentsLocalRef `json:"secretRef,omitempty"` // +optional - LFSSkipSmudge bool `json:"lfsSkipSmudge,omitempty"` - SkipInitSubmodules bool `json:"skipInitSubmodules,omitempty"` - Depth int `json:"depth,omitempty"` + LFSSkipSmudge bool `json:"lfsSkipSmudge,omitempty"` + DangerousSkipTLSVerify bool `json:"dangerousSkipTLSVerify,omitempty"` + SkipInitSubmodules bool `json:"skipInitSubmodules,omitempty"` + Depth int `json:"depth,omitempty"` + ForceHTTPBasicAuth bool `json:"forceHTTPBasicAuth,omitempty"` } type DirectoryContentsGitVerification struct { @@ -110,10 +113,11 @@ type DirectoryContentsImage struct { // Secret may include one or more keys: username, password, token. // By default anonymous access is used for authentication. - // TODO support docker config formated secret + // TODO support docker config formatted secret // +optional SecretRef *DirectoryContentsLocalRef `json:"secretRef,omitempty"` + ResponseHeaderTimeout int `json:"responseHeaderTimeout,omitempty"` DangerousSkipTLSVerify bool `json:"dangerousSkipTLSVerify,omitempty"` } @@ -128,12 +132,16 @@ type DirectoryContentsImgpkgBundle struct { // Secret may include one or more keys: username, password, token. // By default anonymous access is used for authentication. - // TODO support docker config formated secret + // TODO support docker config formatted secret // +optional SecretRef *DirectoryContentsLocalRef `json:"secretRef,omitempty"` + ResponseHeaderTimeout int `json:"responseHeaderTimeout,omitempty"` DangerousSkipTLSVerify bool `json:"dangerousSkipTLSVerify,omitempty"` Recursive bool `json:"recursive,omitempty"` + // Paths to PEM files containing additional CA certificates + // +optional + AdditionalCACertificates []string `json:"additionalCACertificates,omitempty"` } func (c DirectoryContentsImgpkgBundle) PreresolvedTag() string { return c.preresolvedTag } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/doc.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/doc.go similarity index 73% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/doc.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/doc.go index 67c691097..5ebe798fa 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/doc.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/doc.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 // Package config contains logic for parsing config. diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/dockerconfigjson.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/dockerconfigjson.go similarity index 98% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/dockerconfigjson.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/dockerconfigjson.go index e325977b3..963abfcd5 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/dockerconfigjson.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/dockerconfigjson.go @@ -1,4 +1,4 @@ -// Copyright 2021 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/lock_config.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/lock_config.go similarity index 74% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/lock_config.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/lock_config.go index d2a0c2cb5..828503b07 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/lock_config.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/lock_config.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config @@ -114,42 +114,57 @@ func (c LockConfig) FindContents(dirPath, conPath string) (LockDirectoryContents "Expected to find directory '%s' within lock config, but did not", dirPath) } -func (c LockConfig) Merge(other LockConfig) error { +func (c LockConfig) FindDirectory(dirPath string) (LockDirectory, error) { + for _, dir := range c.Directories { + if dir.Path == dirPath { + return dir, nil + } + } + return LockDirectory{}, fmt.Errorf( + "Expected to find directory '%s' within lock config, but did not", dirPath) +} + +func (c *LockConfig) Merge(other LockConfig) error { for _, dir := range other.Directories { + replaced := false for _, con := range dir.Contents { - err := c.MergeContents(filepath.Join(dir.Path, con.Path), con) - if err != nil { - return err + replaced = c.ReplaceContents(filepath.Join(dir.Path, con.Path), con) + if replaced { + continue } + replaced = c.AppendContents(dir.Path, con) + if replaced { + continue + } + } + if !replaced { + c.Directories = append(c.Directories, dir) } } return nil } -func (c LockConfig) MergeContents(path string, replaceCon LockDirectoryContents) error { - var matched bool - +func (c *LockConfig) ReplaceContents(path string, replaceCon LockDirectoryContents) bool { for i, dir := range c.Directories { for j, con := range dir.Contents { if filepath.Join(dir.Path, con.Path) != path { continue } - - if matched { - return fmt.Errorf("Expected to match exactly one directory, but matched multiple") - } - matched = true - - newCon := replaceCon - newCon.Path = con.Path - - dir.Contents[j] = newCon + dir.Contents[j] = replaceCon c.Directories[i] = dir + return true } } - if !matched { - return fmt.Errorf("Expected to match exactly one directory, but did not match any") + return false +} + +func (c *LockConfig) AppendContents(path string, appendCon LockDirectoryContents) bool { + for i, dir := range c.Directories { + if dir.Path == path { + c.Directories[i].Contents = append(dir.Contents, appendCon) + return true + } } - return nil + return false } diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/lock_directory.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/lock_directory.go similarity index 80% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/lock_directory.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/lock_directory.go index 41651e478..2fd4db2d4 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/lock_directory.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/lock_directory.go @@ -1,15 +1,18 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config +import "fmt" + type LockDirectory struct { Path string `json:"path"` Contents []LockDirectoryContents `json:"contents"` } type LockDirectoryContents struct { - Path string `json:"path"` + Path string `json:"path"` + ConfigDigest string `json:"configDigest,omitempty"` Git *LockDirectoryContentsGit `json:"git,omitempty"` Hg *LockDirectoryContentsHg `json:"hg,omitempty"` @@ -62,3 +65,13 @@ type LockDirectoryContentsManual struct{} type LockDirectoryContentsDirectory struct{} type LockDirectoryContentsInline struct{} + +func (d LockDirectory) FindContents(conPath string) (LockDirectoryContents, error) { + for _, con := range d.Contents { + if con.Path == conPath { + return con, nil + } + } + return LockDirectoryContents{}, fmt.Errorf("Expected to find contents '%s' "+ + "within directory '%s' in lock config, but did not", conPath, d.Path) +} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/resources.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/resources.go similarity index 96% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/resources.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/config/resources.go index 3497b789e..06698af8a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/config/resources.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/config/resources.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package config diff --git a/cli/vendor/carvel.dev/vendir/pkg/vendir/version/version.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/version/version.go new file mode 100644 index 000000000..1101b4a0b --- /dev/null +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/version/version.go @@ -0,0 +1,41 @@ +// Copyright 2024 The Carvel Authors. +// SPDX-License-Identifier: Apache-2.0 + +package version + +import ( + "runtime/debug" +) + +var ( + // Version can be set via: + // -ldflags="-X 'carvel.dev/vendir/pkg/vendir/version.Version=$TAG'" + defaultVersion = "0.0.0+develop" + Version = "" + moduleName = "carvel.dev/vendir" +) + +func init() { + Version = version() +} + +func version() string { + if Version != "" { + // Version was set via ldflags, just return it. + return Version + } + + info, ok := debug.ReadBuildInfo() + if !ok { + return defaultVersion + } + + // Anything else. + for _, dep := range info.Deps { + if dep.Path == moduleName { + return dep.Version + } + } + + return defaultVersion +} diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/selector.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/selector.go similarity index 94% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/selector.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/versions/selector.go index 292650a55..131eff29a 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/selector.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/selector.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package versions @@ -7,7 +7,7 @@ import ( "fmt" "strings" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" ) type ConstraintCallback struct { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/semvers.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/semvers.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/semvers.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/versions/semvers.go index 517829f24..e315367c5 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/semvers.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/semvers.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package versions @@ -8,8 +8,8 @@ import ( "sort" "strings" + "carvel.dev/vendir/pkg/vendir/versions/v1alpha1" semver "github.com/carvel-dev/semver/v4" - "github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1" ) type Semvers struct { diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go similarity index 97% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go index 02011d05f..080fd0b86 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/config.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/config.go @@ -1,4 +1,4 @@ -// Copyright 2020 VMware, Inc. +// Copyright 2024 The Carvel Authors. // SPDX-License-Identifier: Apache-2.0 package v1alpha1 diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go similarity index 78% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go index c67facc7c..56ab6b7dc 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.pb.go +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +// source: carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto package v1alpha1 @@ -24,12 +24,12 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package func (m *VersionSelection) Reset() { *m = VersionSelection{} } func (*VersionSelection) ProtoMessage() {} func (*VersionSelection) Descriptor() ([]byte, []int) { - return fileDescriptor_8d3ef80c738fc456, []int{0} + return fileDescriptor_f7fa722d77d11bd9, []int{0} } func (m *VersionSelection) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -57,7 +57,7 @@ var xxx_messageInfo_VersionSelection proto.InternalMessageInfo func (m *VersionSelectionSemver) Reset() { *m = VersionSelectionSemver{} } func (*VersionSelectionSemver) ProtoMessage() {} func (*VersionSelectionSemver) Descriptor() ([]byte, []int) { - return fileDescriptor_8d3ef80c738fc456, []int{1} + return fileDescriptor_f7fa722d77d11bd9, []int{1} } func (m *VersionSelectionSemver) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,7 +85,7 @@ var xxx_messageInfo_VersionSelectionSemver proto.InternalMessageInfo func (m *VersionSelectionSemverPrereleases) Reset() { *m = VersionSelectionSemverPrereleases{} } func (*VersionSelectionSemverPrereleases) ProtoMessage() {} func (*VersionSelectionSemverPrereleases) Descriptor() ([]byte, []int) { - return fileDescriptor_8d3ef80c738fc456, []int{2} + return fileDescriptor_f7fa722d77d11bd9, []int{2} } func (m *VersionSelectionSemverPrereleases) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -111,40 +111,38 @@ func (m *VersionSelectionSemverPrereleases) XXX_DiscardUnknown() { var xxx_messageInfo_VersionSelectionSemverPrereleases proto.InternalMessageInfo func init() { - proto.RegisterType((*VersionSelection)(nil), "github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelection") - proto.RegisterType((*VersionSelectionSemver)(nil), "github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemver") - proto.RegisterType((*VersionSelectionSemverPrereleases)(nil), "github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemverPrereleases") + proto.RegisterType((*VersionSelection)(nil), "carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelection") + proto.RegisterType((*VersionSelectionSemver)(nil), "carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemver") + proto.RegisterType((*VersionSelectionSemverPrereleases)(nil), "carvel.dev.vendir.pkg.vendir.versions.v1alpha1.VersionSelectionSemverPrereleases") } func init() { - proto.RegisterFile("github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_8d3ef80c738fc456) -} - -var fileDescriptor_8d3ef80c738fc456 = []byte{ - // 354 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x8f, 0x31, 0x4b, 0xf3, 0x40, - 0x1c, 0xc6, 0x73, 0xef, 0x0b, 0xc5, 0x5e, 0x06, 0x25, 0x82, 0x14, 0x87, 0xab, 0x76, 0xea, 0xd2, - 0x0b, 0x15, 0xfc, 0x02, 0x71, 0x72, 0x93, 0x14, 0x3a, 0x74, 0x29, 0xd7, 0xf4, 0xdf, 0xf4, 0x68, - 0x7a, 0x17, 0x2e, 0xd7, 0x08, 0x0e, 0xe2, 0x47, 0x10, 0x27, 0x3f, 0x52, 0xc7, 0x8e, 0x9d, 0x8a, - 0x8d, 0x9b, 0x9f, 0x42, 0x7a, 0xd7, 0x92, 0x20, 0x82, 0x83, 0xb8, 0x3d, 0xf7, 0xbf, 0x87, 0xdf, - 0xf3, 0x3c, 0x38, 0x8c, 0xb9, 0x9e, 0x2e, 0x46, 0x34, 0x92, 0x73, 0x3f, 0x9f, 0xdf, 0x33, 0x05, - 0x1d, 0xcd, 0xc4, 0xc3, 0xc2, 0x8f, 0x98, 0xca, 0x21, 0xe9, 0xe4, 0x20, 0xc6, 0x5c, 0xf9, 0xe9, - 0x2c, 0xf6, 0xf7, 0x32, 0x07, 0x95, 0x71, 0x29, 0x32, 0x3f, 0xef, 0xb2, 0x24, 0x9d, 0xb2, 0xae, - 0x1f, 0x83, 0x00, 0xc5, 0x34, 0x8c, 0x69, 0xaa, 0xa4, 0x96, 0x5e, 0x50, 0x32, 0xa9, 0x65, 0x0e, - 0x0d, 0x93, 0x5a, 0xe6, 0xd0, 0x82, 0x68, 0x3a, 0x8b, 0xe9, 0x5e, 0x1e, 0x98, 0xf4, 0xc0, 0x3c, - 0xef, 0x54, 0x7a, 0xc5, 0x32, 0x96, 0xbe, 0x41, 0x8f, 0x16, 0x13, 0xf3, 0x32, 0x0f, 0xa3, 0x6c, - 0x64, 0xeb, 0x05, 0xe1, 0x93, 0xbe, 0x85, 0xf4, 0x20, 0x81, 0x48, 0x73, 0x29, 0xbc, 0x47, 0x5c, - 0xcb, 0x60, 0x9e, 0x83, 0x6a, 0xa0, 0x0b, 0xd4, 0x76, 0xaf, 0x06, 0xf4, 0xf7, 0xc5, 0xe8, 0xd7, - 0x94, 0x9e, 0x49, 0x08, 0x70, 0xb1, 0x69, 0xd6, 0xac, 0x0e, 0xf7, 0xa9, 0xad, 0x0f, 0x84, 0xcf, - 0xbe, 0xb7, 0x7b, 0xd7, 0xd8, 0x8d, 0xa4, 0xc8, 0xb4, 0x62, 0x5c, 0xe8, 0xcc, 0xf4, 0xab, 0x07, - 0xa7, 0xcb, 0x4d, 0xd3, 0x29, 0x36, 0x4d, 0xf7, 0xa6, 0xfc, 0x0a, 0xab, 0x3e, 0xef, 0x15, 0x61, - 0x37, 0x55, 0xa0, 0x20, 0x01, 0x96, 0x41, 0xd6, 0xf8, 0x67, 0x76, 0xc1, 0xdf, 0xed, 0xba, 0x2b, - 0xc3, 0x82, 0xe3, 0x5d, 0xb5, 0xca, 0x21, 0xac, 0x56, 0x69, 0xf5, 0xf1, 0xe5, 0x8f, 0x08, 0xaf, - 0x8b, 0x5d, 0x3e, 0x06, 0xa1, 0xf9, 0x84, 0x83, 0xda, 0xcd, 0xfe, 0xdf, 0xae, 0x5b, 0xee, 0x6d, - 0x79, 0x0e, 0xab, 0x9e, 0x80, 0x2e, 0xb7, 0xc4, 0x59, 0x6d, 0x89, 0xb3, 0xde, 0x12, 0xe7, 0xa9, - 0x20, 0x68, 0x59, 0x10, 0xb4, 0x2a, 0x08, 0x5a, 0x17, 0x04, 0xbd, 0x15, 0x04, 0x3d, 0xbf, 0x13, - 0x67, 0x70, 0x74, 0xd8, 0xf1, 0x19, 0x00, 0x00, 0xff, 0xff, 0x97, 0x30, 0x55, 0x40, 0xd1, 0x02, - 0x00, 0x00, + proto.RegisterFile("carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto", fileDescriptor_f7fa722d77d11bd9) +} + +var fileDescriptor_f7fa722d77d11bd9 = []byte{ + // 333 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x8f, 0x31, 0x4b, 0xfb, 0x40, + 0x18, 0xc6, 0x73, 0xff, 0x3f, 0x14, 0x7b, 0x19, 0x94, 0x08, 0x52, 0x1c, 0xae, 0xda, 0xa9, 0x8b, + 0x17, 0x2a, 0xb8, 0x3a, 0x44, 0x10, 0xdc, 0x34, 0x85, 0x0e, 0x6e, 0x69, 0xf2, 0x36, 0x3d, 0x9b, + 0xde, 0x85, 0xbb, 0x6b, 0x46, 0x71, 0xf0, 0x03, 0xf8, 0xb1, 0x3a, 0x76, 0x92, 0x4e, 0xc5, 0x9e, + 0x5f, 0x44, 0x7a, 0x31, 0x24, 0x88, 0x20, 0x82, 0xdb, 0x73, 0xef, 0xbd, 0xcf, 0xef, 0x7d, 0x1e, + 0x7c, 0x19, 0x47, 0xb2, 0x80, 0x8c, 0x26, 0x50, 0xf8, 0x05, 0xf0, 0x84, 0x49, 0x3f, 0x9f, 0xa5, + 0x95, 0x2c, 0x40, 0x2a, 0x26, 0xb8, 0xf2, 0x8b, 0x41, 0x94, 0xe5, 0xd3, 0x68, 0xe0, 0xa7, 0xc0, + 0x41, 0x46, 0x1a, 0x12, 0x9a, 0x4b, 0xa1, 0x85, 0x47, 0x6b, 0x3f, 0x2d, 0x4d, 0x34, 0x9f, 0xa5, + 0x95, 0xac, 0xfc, 0xb4, 0xf2, 0x1f, 0x9f, 0xa5, 0x4c, 0x4f, 0x17, 0x63, 0x1a, 0x8b, 0xb9, 0x9f, + 0x8a, 0x54, 0xf8, 0x16, 0x33, 0x5e, 0x4c, 0xec, 0xcb, 0x3e, 0xac, 0x2a, 0xf1, 0xbd, 0x47, 0x7c, + 0x30, 0x2a, 0x19, 0x43, 0xc8, 0x20, 0xd6, 0x4c, 0x70, 0xef, 0x01, 0xb7, 0x14, 0xcc, 0x0b, 0x90, + 0x1d, 0x74, 0x82, 0xfa, 0xee, 0xf9, 0xf5, 0x2f, 0x33, 0xd0, 0xaf, 0xc4, 0xa1, 0xa5, 0x05, 0xd8, + 0x6c, 0xba, 0xad, 0x52, 0x87, 0x9f, 0x17, 0x7a, 0xaf, 0x08, 0x1f, 0x7d, 0xbf, 0xee, 0x5d, 0x60, + 0x37, 0x16, 0x5c, 0x69, 0x19, 0x31, 0xae, 0x95, 0xcd, 0xd2, 0x0e, 0x0e, 0x97, 0x9b, 0xae, 0x63, + 0x36, 0x5d, 0xf7, 0xaa, 0xfe, 0x0a, 0x9b, 0x7b, 0xde, 0x33, 0xc2, 0x6e, 0x2e, 0x41, 0x42, 0x06, + 0x91, 0x02, 0xd5, 0xf9, 0x67, 0x3b, 0xdc, 0xfd, 0x4d, 0x87, 0xdb, 0x1a, 0x1c, 0xec, 0xef, 0x62, + 0x34, 0x06, 0x61, 0xf3, 0x6c, 0x6f, 0x84, 0x4f, 0x7f, 0x44, 0x78, 0x03, 0xec, 0xb2, 0x04, 0xb8, + 0x66, 0x13, 0x06, 0x72, 0x57, 0xf1, 0x7f, 0xbf, 0x5d, 0x72, 0x6f, 0xea, 0x71, 0xd8, 0xdc, 0x09, + 0xe8, 0x72, 0x4b, 0x9c, 0xd5, 0x96, 0x38, 0xeb, 0x2d, 0x71, 0x9e, 0x0c, 0x41, 0x4b, 0x43, 0xd0, + 0xca, 0x10, 0xb4, 0x36, 0x04, 0xbd, 0x19, 0x82, 0x5e, 0xde, 0x89, 0x73, 0xbf, 0x57, 0xf5, 0xf8, + 0x08, 0x00, 0x00, 0xff, 0xff, 0xff, 0x5f, 0x50, 0x3c, 0x80, 0x02, 0x00, 0x00, } func (m *VersionSelection) Marshal() (dAtA []byte, err error) { @@ -424,10 +422,7 @@ func (m *VersionSelection) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { @@ -545,10 +540,7 @@ func (m *VersionSelectionSemver) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { @@ -630,10 +622,7 @@ func (m *VersionSelectionSemverPrereleases) Unmarshal(dAtA []byte) error { if err != nil { return err } - if skippy < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) < 0 { + if (skippy < 0) || (iNdEx+skippy) < 0 { return ErrInvalidLengthGenerated } if (iNdEx + skippy) > l { @@ -651,6 +640,7 @@ func (m *VersionSelectionSemverPrereleases) Unmarshal(dAtA []byte) error { func skipGenerated(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 + depth := 0 for iNdEx < l { var wire uint64 for shift := uint(0); ; shift += 7 { @@ -682,10 +672,8 @@ func skipGenerated(dAtA []byte) (n int, err error) { break } } - return iNdEx, nil case 1: iNdEx += 8 - return iNdEx, nil case 2: var length int for shift := uint(0); ; shift += 7 { @@ -706,55 +694,30 @@ func skipGenerated(dAtA []byte) (n int, err error) { return 0, ErrInvalidLengthGenerated } iNdEx += length - if iNdEx < 0 { - return 0, ErrInvalidLengthGenerated - } - return iNdEx, nil case 3: - for { - var innerWire uint64 - var start int = iNdEx - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return 0, ErrIntOverflowGenerated - } - if iNdEx >= l { - return 0, io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - innerWire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - innerWireType := int(innerWire & 0x7) - if innerWireType == 4 { - break - } - next, err := skipGenerated(dAtA[start:]) - if err != nil { - return 0, err - } - iNdEx = start + next - if iNdEx < 0 { - return 0, ErrInvalidLengthGenerated - } - } - return iNdEx, nil + depth++ case 4: - return iNdEx, nil + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupGenerated + } + depth-- case 5: iNdEx += 4 - return iNdEx, nil default: return 0, fmt.Errorf("proto: illegal wireType %d", wireType) } + if iNdEx < 0 { + return 0, ErrInvalidLengthGenerated + } + if depth == 0 { + return iNdEx, nil + } } - panic("unreachable") + return 0, io.ErrUnexpectedEOF } var ( - ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling") - ErrIntOverflowGenerated = fmt.Errorf("proto: integer overflow") + ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowGenerated = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupGenerated = fmt.Errorf("proto: unexpected end of group") ) diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto similarity index 89% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto rename to cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto index c9b2f884c..537db467e 100644 --- a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/generated.proto +++ b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/generated.proto @@ -3,7 +3,7 @@ syntax = 'proto2'; -package github.com.vmware_tanzu.carvel_vendir.pkg.vendir.versions.v1alpha1; +package carvel.dev.vendir.pkg.vendir.versions.v1alpha1; // Package-wide variables from generator "generated". option go_package = "v1alpha1"; diff --git a/cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go b/cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go similarity index 100% rename from cli/vendor/github.com/vmware-tanzu/carvel-vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go rename to cli/vendor/carvel.dev/vendir/pkg/vendir/versions/v1alpha1/zz_generated.deepcopy.go diff --git a/cli/vendor/github.com/carvel-dev/semver/v4/range.go b/cli/vendor/github.com/carvel-dev/semver/v4/range.go index 95f7139b9..dbfb91f2e 100644 --- a/cli/vendor/github.com/carvel-dev/semver/v4/range.go +++ b/cli/vendor/github.com/carvel-dev/semver/v4/range.go @@ -67,8 +67,8 @@ func (vr *versionRange) rangeFunc() Range { // Range represents a range of versions. // A Range can be used to check if a Version satisfies it: // -// range, err := semver.ParseRange(">1.0.0 <2.0.0") -// range(semver.MustParse("1.1.1") // returns true +// range, err := semver.ParseRange(">1.0.0 <2.0.0") +// range(semver.MustParse("1.1.1") // returns true type Range func(Version) bool // OR combines the existing Range with another Range using logical OR. @@ -108,7 +108,7 @@ func (rf Range) AND(f Range) Range { // // Ranges can be combined by both AND and OR // -// - `>1.0.0 <2.0.0 || >3.0.0 !4.2.1` would match `1.2.3`, `1.9.9`, `3.1.1`, but not `4.2.1`, `2.1.1` +// - `>1.0.0 <2.0.0 || >3.0.0 !4.2.1` would match `1.2.3`, `1.9.9`, `3.1.1`, but not `4.2.1`, `2.1.1` func ParseRange(s string) (Range, error) { parts := splitAndTrim(s) orParts, err := splitORParts(parts) @@ -269,10 +269,10 @@ func createVersionFromWildcard(vStr string) string { // handle 1.x if len(parts) == 2 { - return vStr2 + ".0" + vStr2 = vStr2 + ".0" } - return vStr2 + return vStr2 + "-0" } // incrementMajorVersion will increment the major version @@ -327,12 +327,12 @@ func expandWildcardVersion(parts [][]string) ([][]string, error) { for _, p := range parts { var newParts []string for _, ap := range p { - if strings.Contains(ap, "x") { - opStr, vStr, err := splitComparatorVersion(ap) - if err != nil { - return nil, err - } + opStr, vStr, err := splitComparatorVersion(ap) + if err != nil { + return nil, err + } + if containsWildcard(ap) { versionWildcardType := getWildcardType(vStr) flatVersion := createVersionFromWildcard(vStr) @@ -381,6 +381,16 @@ func expandWildcardVersion(parts [][]string) ([][]string, error) { return expandedParts, nil } +// containsWildcard returns true if there's a wildcard in any of the major, minor or patch components +func containsWildcard(v string) bool { + return strings.Contains(trimIdentifiers(v), ".x") +} + +// trimIdentifiers removes any pre-release and build metadata from a version +func trimIdentifiers(v string) string { + return strings.Split(strings.Split(v, "+")[0], "-")[0] +} + func parseComparator(s string) comparator { switch s { case "==": diff --git a/cli/vendor/github.com/cespare/xxhash/v2/README.md b/cli/vendor/github.com/cespare/xxhash/v2/README.md index 792b4a60b..8bf0e5b78 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/README.md +++ b/cli/vendor/github.com/cespare/xxhash/v2/README.md @@ -3,8 +3,7 @@ [![Go Reference](https://pkg.go.dev/badge/github.com/cespare/xxhash/v2.svg)](https://pkg.go.dev/github.com/cespare/xxhash/v2) [![Test](https://github.com/cespare/xxhash/actions/workflows/test.yml/badge.svg)](https://github.com/cespare/xxhash/actions/workflows/test.yml) -xxhash is a Go implementation of the 64-bit -[xxHash](http://cyan4973.github.io/xxHash/) algorithm, XXH64. This is a +xxhash is a Go implementation of the 64-bit [xxHash] algorithm, XXH64. This is a high-quality hashing algorithm that is much faster than anything in the Go standard library. @@ -25,8 +24,11 @@ func (*Digest) WriteString(string) (int, error) func (*Digest) Sum64() uint64 ``` -This implementation provides a fast pure-Go implementation and an even faster -assembly implementation for amd64. +The package is written with optimized pure Go and also contains even faster +assembly implementations for amd64 and arm64. If desired, the `purego` build tag +opts into using the Go code even on those architectures. + +[xxHash]: http://cyan4973.github.io/xxHash/ ## Compatibility @@ -45,19 +47,20 @@ I recommend using the latest release of Go. Here are some quick benchmarks comparing the pure-Go and assembly implementations of Sum64. -| input size | purego | asm | -| --- | --- | --- | -| 5 B | 979.66 MB/s | 1291.17 MB/s | -| 100 B | 7475.26 MB/s | 7973.40 MB/s | -| 4 KB | 17573.46 MB/s | 17602.65 MB/s | -| 10 MB | 17131.46 MB/s | 17142.16 MB/s | +| input size | purego | asm | +| ---------- | --------- | --------- | +| 4 B | 1.3 GB/s | 1.2 GB/s | +| 16 B | 2.9 GB/s | 3.5 GB/s | +| 100 B | 6.9 GB/s | 8.1 GB/s | +| 4 KB | 11.7 GB/s | 16.7 GB/s | +| 10 MB | 12.0 GB/s | 17.3 GB/s | -These numbers were generated on Ubuntu 18.04 with an Intel i7-8700K CPU using -the following commands under Go 1.11.2: +These numbers were generated on Ubuntu 20.04 with an Intel Xeon Platinum 8252C +CPU using the following commands under Go 1.19.2: ``` -$ go test -tags purego -benchtime 10s -bench '/xxhash,direct,bytes' -$ go test -benchtime 10s -bench '/xxhash,direct,bytes' +benchstat <(go test -tags purego -benchtime 500ms -count 15 -bench 'Sum64$') +benchstat <(go test -benchtime 500ms -count 15 -bench 'Sum64$') ``` ## Projects using this package diff --git a/cli/vendor/github.com/cespare/xxhash/v2/testall.sh b/cli/vendor/github.com/cespare/xxhash/v2/testall.sh new file mode 100644 index 000000000..94b9c4439 --- /dev/null +++ b/cli/vendor/github.com/cespare/xxhash/v2/testall.sh @@ -0,0 +1,10 @@ +#!/bin/bash +set -eu -o pipefail + +# Small convenience script for running the tests with various combinations of +# arch/tags. This assumes we're running on amd64 and have qemu available. + +go test ./... +go test -tags purego ./... +GOARCH=arm64 go test +GOARCH=arm64 go test -tags purego diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash.go b/cli/vendor/github.com/cespare/xxhash/v2/xxhash.go index 15c835d54..a9e0d45c9 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/xxhash.go +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash.go @@ -16,19 +16,11 @@ const ( prime5 uint64 = 2870177450012600261 ) -// NOTE(caleb): I'm using both consts and vars of the primes. Using consts where -// possible in the Go code is worth a small (but measurable) performance boost -// by avoiding some MOVQs. Vars are needed for the asm and also are useful for -// convenience in the Go code in a few places where we need to intentionally -// avoid constant arithmetic (e.g., v1 := prime1 + prime2 fails because the -// result overflows a uint64). -var ( - prime1v = prime1 - prime2v = prime2 - prime3v = prime3 - prime4v = prime4 - prime5v = prime5 -) +// Store the primes in an array as well. +// +// The consts are used when possible in Go code to avoid MOVs but we need a +// contiguous array of the assembly code. +var primes = [...]uint64{prime1, prime2, prime3, prime4, prime5} // Digest implements hash.Hash64. type Digest struct { @@ -50,10 +42,10 @@ func New() *Digest { // Reset clears the Digest's state so that it can be reused. func (d *Digest) Reset() { - d.v1 = prime1v + prime2 + d.v1 = primes[0] + prime2 d.v2 = prime2 d.v3 = 0 - d.v4 = -prime1v + d.v4 = -primes[0] d.total = 0 d.n = 0 } @@ -69,21 +61,23 @@ func (d *Digest) Write(b []byte) (n int, err error) { n = len(b) d.total += uint64(n) + memleft := d.mem[d.n&(len(d.mem)-1):] + if d.n+n < 32 { // This new data doesn't even fill the current block. - copy(d.mem[d.n:], b) + copy(memleft, b) d.n += n return } if d.n > 0 { // Finish off the partial block. - copy(d.mem[d.n:], b) + c := copy(memleft, b) d.v1 = round(d.v1, u64(d.mem[0:8])) d.v2 = round(d.v2, u64(d.mem[8:16])) d.v3 = round(d.v3, u64(d.mem[16:24])) d.v4 = round(d.v4, u64(d.mem[24:32])) - b = b[32-d.n:] + b = b[c:] d.n = 0 } @@ -133,21 +127,20 @@ func (d *Digest) Sum64() uint64 { h += d.total - i, end := 0, d.n - for ; i+8 <= end; i += 8 { - k1 := round(0, u64(d.mem[i:i+8])) + b := d.mem[:d.n&(len(d.mem)-1)] + for ; len(b) >= 8; b = b[8:] { + k1 := round(0, u64(b[:8])) h ^= k1 h = rol27(h)*prime1 + prime4 } - if i+4 <= end { - h ^= uint64(u32(d.mem[i:i+4])) * prime1 + if len(b) >= 4 { + h ^= uint64(u32(b[:4])) * prime1 h = rol23(h)*prime2 + prime3 - i += 4 + b = b[4:] } - for i < end { - h ^= uint64(d.mem[i]) * prime5 + for ; len(b) > 0; b = b[1:] { + h ^= uint64(b[0]) * prime5 h = rol11(h) * prime1 - i++ } h ^= h >> 33 diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s index be8db5bf7..3e8b13257 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.s @@ -1,215 +1,209 @@ +//go:build !appengine && gc && !purego // +build !appengine // +build gc // +build !purego #include "textflag.h" -// Register allocation: -// AX h -// SI pointer to advance through b -// DX n -// BX loop end -// R8 v1, k1 -// R9 v2 -// R10 v3 -// R11 v4 -// R12 tmp -// R13 prime1v -// R14 prime2v -// DI prime4v - -// round reads from and advances the buffer pointer in SI. -// It assumes that R13 has prime1v and R14 has prime2v. -#define round(r) \ - MOVQ (SI), R12 \ - ADDQ $8, SI \ - IMULQ R14, R12 \ - ADDQ R12, r \ - ROLQ $31, r \ - IMULQ R13, r - -// mergeRound applies a merge round on the two registers acc and val. -// It assumes that R13 has prime1v, R14 has prime2v, and DI has prime4v. -#define mergeRound(acc, val) \ - IMULQ R14, val \ - ROLQ $31, val \ - IMULQ R13, val \ - XORQ val, acc \ - IMULQ R13, acc \ - ADDQ DI, acc +// Registers: +#define h AX +#define d AX +#define p SI // pointer to advance through b +#define n DX +#define end BX // loop end +#define v1 R8 +#define v2 R9 +#define v3 R10 +#define v4 R11 +#define x R12 +#define prime1 R13 +#define prime2 R14 +#define prime4 DI + +#define round(acc, x) \ + IMULQ prime2, x \ + ADDQ x, acc \ + ROLQ $31, acc \ + IMULQ prime1, acc + +// round0 performs the operation x = round(0, x). +#define round0(x) \ + IMULQ prime2, x \ + ROLQ $31, x \ + IMULQ prime1, x + +// mergeRound applies a merge round on the two registers acc and x. +// It assumes that prime1, prime2, and prime4 have been loaded. +#define mergeRound(acc, x) \ + round0(x) \ + XORQ x, acc \ + IMULQ prime1, acc \ + ADDQ prime4, acc + +// blockLoop processes as many 32-byte blocks as possible, +// updating v1, v2, v3, and v4. It assumes that there is at least one block +// to process. +#define blockLoop() \ +loop: \ + MOVQ +0(p), x \ + round(v1, x) \ + MOVQ +8(p), x \ + round(v2, x) \ + MOVQ +16(p), x \ + round(v3, x) \ + MOVQ +24(p), x \ + round(v4, x) \ + ADDQ $32, p \ + CMPQ p, end \ + JLE loop // func Sum64(b []byte) uint64 -TEXT ·Sum64(SB), NOSPLIT, $0-32 +TEXT ·Sum64(SB), NOSPLIT|NOFRAME, $0-32 // Load fixed primes. - MOVQ ·prime1v(SB), R13 - MOVQ ·prime2v(SB), R14 - MOVQ ·prime4v(SB), DI + MOVQ ·primes+0(SB), prime1 + MOVQ ·primes+8(SB), prime2 + MOVQ ·primes+24(SB), prime4 // Load slice. - MOVQ b_base+0(FP), SI - MOVQ b_len+8(FP), DX - LEAQ (SI)(DX*1), BX + MOVQ b_base+0(FP), p + MOVQ b_len+8(FP), n + LEAQ (p)(n*1), end // The first loop limit will be len(b)-32. - SUBQ $32, BX + SUBQ $32, end // Check whether we have at least one block. - CMPQ DX, $32 + CMPQ n, $32 JLT noBlocks // Set up initial state (v1, v2, v3, v4). - MOVQ R13, R8 - ADDQ R14, R8 - MOVQ R14, R9 - XORQ R10, R10 - XORQ R11, R11 - SUBQ R13, R11 - - // Loop until SI > BX. -blockLoop: - round(R8) - round(R9) - round(R10) - round(R11) - - CMPQ SI, BX - JLE blockLoop - - MOVQ R8, AX - ROLQ $1, AX - MOVQ R9, R12 - ROLQ $7, R12 - ADDQ R12, AX - MOVQ R10, R12 - ROLQ $12, R12 - ADDQ R12, AX - MOVQ R11, R12 - ROLQ $18, R12 - ADDQ R12, AX - - mergeRound(AX, R8) - mergeRound(AX, R9) - mergeRound(AX, R10) - mergeRound(AX, R11) + MOVQ prime1, v1 + ADDQ prime2, v1 + MOVQ prime2, v2 + XORQ v3, v3 + XORQ v4, v4 + SUBQ prime1, v4 + + blockLoop() + + MOVQ v1, h + ROLQ $1, h + MOVQ v2, x + ROLQ $7, x + ADDQ x, h + MOVQ v3, x + ROLQ $12, x + ADDQ x, h + MOVQ v4, x + ROLQ $18, x + ADDQ x, h + + mergeRound(h, v1) + mergeRound(h, v2) + mergeRound(h, v3) + mergeRound(h, v4) JMP afterBlocks noBlocks: - MOVQ ·prime5v(SB), AX + MOVQ ·primes+32(SB), h afterBlocks: - ADDQ DX, AX - - // Right now BX has len(b)-32, and we want to loop until SI > len(b)-8. - ADDQ $24, BX - - CMPQ SI, BX - JG fourByte - -wordLoop: - // Calculate k1. - MOVQ (SI), R8 - ADDQ $8, SI - IMULQ R14, R8 - ROLQ $31, R8 - IMULQ R13, R8 - - XORQ R8, AX - ROLQ $27, AX - IMULQ R13, AX - ADDQ DI, AX - - CMPQ SI, BX - JLE wordLoop - -fourByte: - ADDQ $4, BX - CMPQ SI, BX - JG singles - - MOVL (SI), R8 - ADDQ $4, SI - IMULQ R13, R8 - XORQ R8, AX - - ROLQ $23, AX - IMULQ R14, AX - ADDQ ·prime3v(SB), AX - -singles: - ADDQ $4, BX - CMPQ SI, BX + ADDQ n, h + + ADDQ $24, end + CMPQ p, end + JG try4 + +loop8: + MOVQ (p), x + ADDQ $8, p + round0(x) + XORQ x, h + ROLQ $27, h + IMULQ prime1, h + ADDQ prime4, h + + CMPQ p, end + JLE loop8 + +try4: + ADDQ $4, end + CMPQ p, end + JG try1 + + MOVL (p), x + ADDQ $4, p + IMULQ prime1, x + XORQ x, h + + ROLQ $23, h + IMULQ prime2, h + ADDQ ·primes+16(SB), h + +try1: + ADDQ $4, end + CMPQ p, end JGE finalize -singlesLoop: - MOVBQZX (SI), R12 - ADDQ $1, SI - IMULQ ·prime5v(SB), R12 - XORQ R12, AX +loop1: + MOVBQZX (p), x + ADDQ $1, p + IMULQ ·primes+32(SB), x + XORQ x, h + ROLQ $11, h + IMULQ prime1, h - ROLQ $11, AX - IMULQ R13, AX - - CMPQ SI, BX - JL singlesLoop + CMPQ p, end + JL loop1 finalize: - MOVQ AX, R12 - SHRQ $33, R12 - XORQ R12, AX - IMULQ R14, AX - MOVQ AX, R12 - SHRQ $29, R12 - XORQ R12, AX - IMULQ ·prime3v(SB), AX - MOVQ AX, R12 - SHRQ $32, R12 - XORQ R12, AX - - MOVQ AX, ret+24(FP) + MOVQ h, x + SHRQ $33, x + XORQ x, h + IMULQ prime2, h + MOVQ h, x + SHRQ $29, x + XORQ x, h + IMULQ ·primes+16(SB), h + MOVQ h, x + SHRQ $32, x + XORQ x, h + + MOVQ h, ret+24(FP) RET -// writeBlocks uses the same registers as above except that it uses AX to store -// the d pointer. - // func writeBlocks(d *Digest, b []byte) int -TEXT ·writeBlocks(SB), NOSPLIT, $0-40 +TEXT ·writeBlocks(SB), NOSPLIT|NOFRAME, $0-40 // Load fixed primes needed for round. - MOVQ ·prime1v(SB), R13 - MOVQ ·prime2v(SB), R14 + MOVQ ·primes+0(SB), prime1 + MOVQ ·primes+8(SB), prime2 // Load slice. - MOVQ b_base+8(FP), SI - MOVQ b_len+16(FP), DX - LEAQ (SI)(DX*1), BX - SUBQ $32, BX + MOVQ b_base+8(FP), p + MOVQ b_len+16(FP), n + LEAQ (p)(n*1), end + SUBQ $32, end // Load vN from d. - MOVQ d+0(FP), AX - MOVQ 0(AX), R8 // v1 - MOVQ 8(AX), R9 // v2 - MOVQ 16(AX), R10 // v3 - MOVQ 24(AX), R11 // v4 + MOVQ s+0(FP), d + MOVQ 0(d), v1 + MOVQ 8(d), v2 + MOVQ 16(d), v3 + MOVQ 24(d), v4 // We don't need to check the loop condition here; this function is // always called with at least one block of data to process. -blockLoop: - round(R8) - round(R9) - round(R10) - round(R11) - - CMPQ SI, BX - JLE blockLoop + blockLoop() // Copy vN back to d. - MOVQ R8, 0(AX) - MOVQ R9, 8(AX) - MOVQ R10, 16(AX) - MOVQ R11, 24(AX) - - // The number of bytes written is SI minus the old base pointer. - SUBQ b_base+8(FP), SI - MOVQ SI, ret+32(FP) + MOVQ v1, 0(d) + MOVQ v2, 8(d) + MOVQ v3, 16(d) + MOVQ v4, 24(d) + + // The number of bytes written is p minus the old base pointer. + SUBQ b_base+8(FP), p + MOVQ p, ret+32(FP) RET diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_arm64.s b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_arm64.s new file mode 100644 index 000000000..7e3145a22 --- /dev/null +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_arm64.s @@ -0,0 +1,183 @@ +//go:build !appengine && gc && !purego +// +build !appengine +// +build gc +// +build !purego + +#include "textflag.h" + +// Registers: +#define digest R1 +#define h R2 // return value +#define p R3 // input pointer +#define n R4 // input length +#define nblocks R5 // n / 32 +#define prime1 R7 +#define prime2 R8 +#define prime3 R9 +#define prime4 R10 +#define prime5 R11 +#define v1 R12 +#define v2 R13 +#define v3 R14 +#define v4 R15 +#define x1 R20 +#define x2 R21 +#define x3 R22 +#define x4 R23 + +#define round(acc, x) \ + MADD prime2, acc, x, acc \ + ROR $64-31, acc \ + MUL prime1, acc + +// round0 performs the operation x = round(0, x). +#define round0(x) \ + MUL prime2, x \ + ROR $64-31, x \ + MUL prime1, x + +#define mergeRound(acc, x) \ + round0(x) \ + EOR x, acc \ + MADD acc, prime4, prime1, acc + +// blockLoop processes as many 32-byte blocks as possible, +// updating v1, v2, v3, and v4. It assumes that n >= 32. +#define blockLoop() \ + LSR $5, n, nblocks \ + PCALIGN $16 \ + loop: \ + LDP.P 16(p), (x1, x2) \ + LDP.P 16(p), (x3, x4) \ + round(v1, x1) \ + round(v2, x2) \ + round(v3, x3) \ + round(v4, x4) \ + SUB $1, nblocks \ + CBNZ nblocks, loop + +// func Sum64(b []byte) uint64 +TEXT ·Sum64(SB), NOSPLIT|NOFRAME, $0-32 + LDP b_base+0(FP), (p, n) + + LDP ·primes+0(SB), (prime1, prime2) + LDP ·primes+16(SB), (prime3, prime4) + MOVD ·primes+32(SB), prime5 + + CMP $32, n + CSEL LT, prime5, ZR, h // if n < 32 { h = prime5 } else { h = 0 } + BLT afterLoop + + ADD prime1, prime2, v1 + MOVD prime2, v2 + MOVD $0, v3 + NEG prime1, v4 + + blockLoop() + + ROR $64-1, v1, x1 + ROR $64-7, v2, x2 + ADD x1, x2 + ROR $64-12, v3, x3 + ROR $64-18, v4, x4 + ADD x3, x4 + ADD x2, x4, h + + mergeRound(h, v1) + mergeRound(h, v2) + mergeRound(h, v3) + mergeRound(h, v4) + +afterLoop: + ADD n, h + + TBZ $4, n, try8 + LDP.P 16(p), (x1, x2) + + round0(x1) + + // NOTE: here and below, sequencing the EOR after the ROR (using a + // rotated register) is worth a small but measurable speedup for small + // inputs. + ROR $64-27, h + EOR x1 @> 64-27, h, h + MADD h, prime4, prime1, h + + round0(x2) + ROR $64-27, h + EOR x2 @> 64-27, h, h + MADD h, prime4, prime1, h + +try8: + TBZ $3, n, try4 + MOVD.P 8(p), x1 + + round0(x1) + ROR $64-27, h + EOR x1 @> 64-27, h, h + MADD h, prime4, prime1, h + +try4: + TBZ $2, n, try2 + MOVWU.P 4(p), x2 + + MUL prime1, x2 + ROR $64-23, h + EOR x2 @> 64-23, h, h + MADD h, prime3, prime2, h + +try2: + TBZ $1, n, try1 + MOVHU.P 2(p), x3 + AND $255, x3, x1 + LSR $8, x3, x2 + + MUL prime5, x1 + ROR $64-11, h + EOR x1 @> 64-11, h, h + MUL prime1, h + + MUL prime5, x2 + ROR $64-11, h + EOR x2 @> 64-11, h, h + MUL prime1, h + +try1: + TBZ $0, n, finalize + MOVBU (p), x4 + + MUL prime5, x4 + ROR $64-11, h + EOR x4 @> 64-11, h, h + MUL prime1, h + +finalize: + EOR h >> 33, h + MUL prime2, h + EOR h >> 29, h + MUL prime3, h + EOR h >> 32, h + + MOVD h, ret+24(FP) + RET + +// func writeBlocks(d *Digest, b []byte) int +TEXT ·writeBlocks(SB), NOSPLIT|NOFRAME, $0-40 + LDP ·primes+0(SB), (prime1, prime2) + + // Load state. Assume v[1-4] are stored contiguously. + MOVD d+0(FP), digest + LDP 0(digest), (v1, v2) + LDP 16(digest), (v3, v4) + + LDP b_base+8(FP), (p, n) + + blockLoop() + + // Store updated state. + STP (v1, v2), 0(digest) + STP (v3, v4), 16(digest) + + BIC $31, n + MOVD n, ret+32(FP) + RET diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_asm.go similarity index 73% rename from cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go rename to cli/vendor/github.com/cespare/xxhash/v2/xxhash_asm.go index ad14b807f..9216e0a40 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_amd64.go +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_asm.go @@ -1,3 +1,5 @@ +//go:build (amd64 || arm64) && !appengine && gc && !purego +// +build amd64 arm64 // +build !appengine // +build gc // +build !purego diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_other.go b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_other.go index 4a5a82160..26df13bba 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_other.go +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_other.go @@ -1,4 +1,5 @@ -// +build !amd64 appengine !gc purego +//go:build (!amd64 && !arm64) || appengine || !gc || purego +// +build !amd64,!arm64 appengine !gc purego package xxhash @@ -14,10 +15,10 @@ func Sum64(b []byte) uint64 { var h uint64 if n >= 32 { - v1 := prime1v + prime2 + v1 := primes[0] + prime2 v2 := prime2 v3 := uint64(0) - v4 := -prime1v + v4 := -primes[0] for len(b) >= 32 { v1 = round(v1, u64(b[0:8:len(b)])) v2 = round(v2, u64(b[8:16:len(b)])) @@ -36,19 +37,18 @@ func Sum64(b []byte) uint64 { h += uint64(n) - i, end := 0, len(b) - for ; i+8 <= end; i += 8 { - k1 := round(0, u64(b[i:i+8:len(b)])) + for ; len(b) >= 8; b = b[8:] { + k1 := round(0, u64(b[:8])) h ^= k1 h = rol27(h)*prime1 + prime4 } - if i+4 <= end { - h ^= uint64(u32(b[i:i+4:len(b)])) * prime1 + if len(b) >= 4 { + h ^= uint64(u32(b[:4])) * prime1 h = rol23(h)*prime2 + prime3 - i += 4 + b = b[4:] } - for ; i < end; i++ { - h ^= uint64(b[i]) * prime5 + for ; len(b) > 0; b = b[1:] { + h ^= uint64(b[0]) * prime5 h = rol11(h) * prime1 } diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_safe.go b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_safe.go index fc9bea7a3..e86f1b5fd 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_safe.go +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_safe.go @@ -1,3 +1,4 @@ +//go:build appengine // +build appengine // This file contains the safe implementations of otherwise unsafe-using code. diff --git a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go index 376e0ca2e..1c1638fd8 100644 --- a/cli/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go +++ b/cli/vendor/github.com/cespare/xxhash/v2/xxhash_unsafe.go @@ -1,3 +1,4 @@ +//go:build !appengine // +build !appengine // This file encapsulates usage of unsafe. @@ -11,7 +12,7 @@ import ( // In the future it's possible that compiler optimizations will make these // XxxString functions unnecessary by realizing that calls such as -// Sum64([]byte(s)) don't need to copy s. See https://golang.org/issue/2205. +// Sum64([]byte(s)) don't need to copy s. See https://go.dev/issue/2205. // If that happens, even if we keep these functions they can be replaced with // the trivial safe code. diff --git a/cli/vendor/github.com/emicklei/go-restful/v3/CHANGES.md b/cli/vendor/github.com/emicklei/go-restful/v3/CHANGES.md index 02a73ccfd..5edd5a7ca 100644 --- a/cli/vendor/github.com/emicklei/go-restful/v3/CHANGES.md +++ b/cli/vendor/github.com/emicklei/go-restful/v3/CHANGES.md @@ -1,6 +1,15 @@ # Change history of go-restful -## [v3.10.1] - 2022-11-19 +## [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/cli/vendor/github.com/emicklei/go-restful/v3/README.md b/cli/vendor/github.com/emicklei/go-restful/v3/README.md index 0625359dc..e3e30080e 100644 --- a/cli/vendor/github.com/emicklei/go-restful/v3/README.md +++ b/cli/vendor/github.com/emicklei/go-restful/v3/README.md @@ -79,7 +79,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 @@ -96,6 +96,7 @@ There are several hooks to customize the behavior of the go-restful package. - 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 +109,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/cli/vendor/github.com/emicklei/go-restful/v3/route.go b/cli/vendor/github.com/emicklei/go-restful/v3/route.go index ea05b3da8..306c44be7 100644 --- a/cli/vendor/github.com/emicklei/go-restful/v3/route.go +++ b/cli/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/cli/vendor/github.com/emicklei/go-restful/v3/route_builder.go b/cli/vendor/github.com/emicklei/go-restful/v3/route_builder.go index 830ebf148..75168c12e 100644 --- a/cli/vendor/github.com/emicklei/go-restful/v3/route_builder.go +++ b/cli/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/cli/vendor/github.com/evanphx/json-patch/patch.go b/cli/vendor/github.com/evanphx/json-patch/patch.go index dc2b7e51e..4bce5936d 100644 --- a/cli/vendor/github.com/evanphx/json-patch/patch.go +++ b/cli/vendor/github.com/evanphx/json-patch/patch.go @@ -568,29 +568,6 @@ 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 { @@ -657,25 +634,6 @@ 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 { diff --git a/cli/vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go b/cli/vendor/github.com/evanphx/json-patch/v5/internal/json/decode.go new file mode 100644 index 000000000..e9bb0efe7 --- /dev/null +++ b/cli/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/cli/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go b/cli/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go new file mode 100644 index 000000000..2e6eca448 --- /dev/null +++ b/cli/vendor/github.com/evanphx/json-patch/v5/internal/json/encode.go @@ -0,0 +1,1486 @@ +// 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