Output from running UPSTREAM-MERGE.sh

upstream-merge.log

[jesusr@transam ocp-release-operator-sdk{master}]$ git remote -v
openshift       https://github.com/openshift/ocp-release-operator-sdk.git (fetch)
openshift       no_push (push)
origin  [email protected]:jmrodri/ocp-release-operator-sdk.git (fetch)
origin  [email protected]:jmrodri/ocp-release-operator-sdk.git (push)
upstream        https://github.com/operator-framework/operator-sdk.git (fetch)
upstream        no_push (push)
[jesusr@transam ocp-release-operator-sdk{master}]$ ./UPSTREAM-MERGE.sh v1.1.0
Already on 'master'
Your branch is up to date with 'origin/master'.
Already up to date.
Switched to a new branch 'v1.1.0-rebase-master'
Removing website/content/en/faq/_index.md
Removing website/content/en/docs/versioning.md
CONFLICT (file location): website/content/en/docs/migration/v0.19.4.md added in HEAD inside a directory that was renamed in tags/v1.1.0, suggesting it should perhaps be moved to website/cont
ent/en/docs/upgrading-sdk-version/v0.19.4.md.
CONFLICT (file location): website/content/en/docs/migration/v0.19.3.md added in HEAD inside a directory that was renamed in tags/v1.1.0, suggesting it should perhaps be moved to website/cont
ent/en/docs/upgrading-sdk-version/v0.19.3.md.
CONFLICT (file location): website/content/en/docs/migration/v0.19.2.md added in HEAD inside a directory that was renamed in tags/v1.1.0, suggesting it should perhaps be moved to website/cont
ent/en/docs/upgrading-sdk-version/v0.19.2.md.
CONFLICT (file location): website/content/en/docs/migration/v0.19.1.md added in HEAD inside a directory that was renamed in tags/v1.1.0, suggesting it should perhaps be moved to website/cont
ent/en/docs/upgrading-sdk-version/v0.19.1.md.
Auto-merging website/content/en/docs/upgrading-sdk-version/v0.19.0.md
CONFLICT (content): Merge conflict in website/content/en/docs/upgrading-sdk-version/v0.19.0.md
Auto-merging website/content/en/docs/upgrading-sdk-version/v0.18.0.md
CONFLICT (file location): website/content/en/docs/migration/v0.17.1.md added in HEAD inside a directory that was renamed in tags/v1.1.0, suggesting it should perhaps be moved to website/cont
ent/en/docs/upgrading-sdk-version/v0.17.1.md.
Removing website/content/en/docs/scorecard/scorecard.md
CONFLICT (modify/delete): website/content/en/docs/scorecard/scorecard-alpha.md deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of website/content/en/docs/scorecard/scorecard-alpha.
md left in tree.
Removing website/content/en/docs/scorecard/_index.md
Removing website/content/en/docs/olm-integration/legacy/testing-deployment.md
Removing website/content/en/docs/olm-integration/legacy/quickstart-package-manifests.md
Removing website/content/en/docs/olm-integration/legacy/quickstart-bundle.md
Removing website/content/en/docs/olm-integration/legacy/generating-a-csv.md
Removing website/content/en/docs/olm-integration/legacy/cli-overview.md
Removing website/content/en/docs/olm-integration/legacy/_index.md
Auto-merging website/content/en/docs/olm-integration/generation.md
CONFLICT (content): Merge conflict in website/content/en/docs/olm-integration/generation.md
Removing website/content/en/docs/new-cli/operator-sdk_version.md
Removing website/content/en/docs/new-cli/operator-sdk_run_packagemanifests.md
Removing website/content/en/docs/new-cli/operator-sdk_run.md
Removing website/content/en/docs/new-cli/operator-sdk_olm_uninstall.md
Removing website/content/en/docs/new-cli/operator-sdk_olm_status.md
Removing website/content/en/docs/new-cli/operator-sdk_olm_install.md
Removing website/content/en/docs/new-cli/operator-sdk_olm.md
Removing website/content/en/docs/new-cli/operator-sdk_new.md
CONFLICT (modify/delete): website/content/en/docs/new-cli/operator-sdk_generate_packagemanifests.md deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of website/content/en/docs/new-c
li/operator-sdk_generate_packagemanifests.md left in tree.
Removing website/content/en/docs/new-cli/operator-sdk_generate_bundle.md
Removing website/content/en/docs/new-cli/operator-sdk_generate.md
Removing website/content/en/docs/new-cli/operator-sdk_completion_zsh.md
Removing website/content/en/docs/new-cli/operator-sdk_completion_bash.md
Removing website/content/en/docs/new-cli/operator-sdk_completion.md
Removing website/content/en/docs/new-cli/operator-sdk_cleanup_packagemanifests.md
Removing website/content/en/docs/new-cli/operator-sdk_cleanup.md
Removing website/content/en/docs/new-cli/operator-sdk_bundle_validate.md
Removing website/content/en/docs/new-cli/operator-sdk_bundle.md
Removing website/content/en/docs/new-cli/operator-sdk_build.md
Removing website/content/en/docs/new-cli/operator-sdk_alpha_scorecard.md
Removing website/content/en/docs/new-cli/operator-sdk_alpha.md
Removing website/content/en/docs/new-cli/operator-sdk.md
Removing website/content/en/docs/new-cli/_index.md
Removing website/content/en/docs/migration/_index.md
Removing website/content/en/docs/legacy-common/operator-scope.md
Removing website/content/en/docs/legacy-common/crds-scope.md
Auto-merging website/content/en/docs/installation/install-operator-sdk.md
CONFLICT (content): Merge conflict in website/content/en/docs/installation/install-operator-sdk.md
Removing website/content/en/docs/helm/reference/watches.md
Removing website/content/en/docs/helm/reference/scaffolding.md
Removing website/content/en/docs/helm/reference/_index.md
Removing website/content/en/docs/helm/migration.md
Removing website/content/en/docs/helm/installation.md
Removing website/content/en/docs/helm/_index.md
Removing website/content/en/docs/golang/webhooks.md
Removing website/content/en/docs/golang/references/markers.md
CONFLICT (modify/delete): website/content/en/docs/golang/project_migration_guide.md deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of website/content/en/docs/golang/project_migrat
ion_guide.md left in tree.
Removing website/content/en/docs/golang/legacy/unit-testing.md
Removing website/content/en/docs/golang/legacy/references/project-layout.md
Removing website/content/en/docs/golang/legacy/references/markers.md
Removing website/content/en/docs/golang/legacy/references/logging.md
Removing website/content/en/docs/golang/legacy/references/event-filtering.md
Removing website/content/en/docs/golang/legacy/references/client.md
Removing website/content/en/docs/golang/legacy/references/_index.md
Removing website/content/en/docs/golang/legacy/quickstart.md
Removing website/content/en/docs/golang/legacy/monitoring/service-monitor.md
Removing website/content/en/docs/golang/legacy/monitoring/prometheus.md
Removing website/content/en/docs/golang/legacy/monitoring/_index.md
Removing website/content/en/docs/golang/legacy/migrating-existing-apis.md
Removing website/content/en/docs/golang/legacy/e2e-tests.md
Removing website/content/en/docs/golang/legacy/_index.md
Removing website/content/en/docs/golang/_index.md
Removing website/content/en/docs/contribution-guidelines/testing/travis-build.md
Removing website/content/en/docs/contribution-guidelines/testing/running-the-tests.md
Removing website/content/en/docs/contribution-guidelines/testing/_index.md
Removing website/content/en/docs/contribution-guidelines/release.md
Removing website/content/en/docs/contribution-guidelines/local-docs.md
Removing website/content/en/docs/contribution-guidelines/local-changes.md
Removing website/content/en/docs/contribution-guidelines/backport-policy.md
Removing website/content/en/docs/cli/operator-sdk_test_local.md
Removing website/content/en/docs/cli/operator-sdk_test.md
Removing website/content/en/docs/cli/operator-sdk_run_local.md
Removing website/content/en/docs/cli/operator-sdk_print-deps.md
Removing website/content/en/docs/cli/operator-sdk_new.md
Auto-merging website/content/en/docs/cli/operator-sdk_generate_packagemanifests.md
Removing website/content/en/docs/cli/operator-sdk_generate_k8s.md
Removing website/content/en/docs/cli/operator-sdk_generate_crds.md
Removing website/content/en/docs/cli/operator-sdk_cleanup_packagemanifests.md
Removing website/content/en/docs/cli/operator-sdk_build.md
Removing website/content/en/docs/cli/operator-sdk_alpha_scorecard.md
Removing website/content/en/docs/cli/operator-sdk_alpha.md
Removing website/content/en/docs/cli/operator-sdk_add_controller.md
Removing website/content/en/docs/cli/operator-sdk_add_api.md
Removing website/content/en/docs/cli/operator-sdk_add.md
Auto-merging website/content/en/docs/building-operators/golang/tutorial.md
CONFLICT (content): Merge conflict in website/content/en/docs/building-operators/golang/tutorial.md
Removing website/content/en/docs/ansible/reference/scaffolding.md
Removing website/content/en/docs/ansible/reference/apb-migration-guide.md
Removing website/content/en/docs/ansible/quickstart.md
Removing website/content/en/docs/ansible/development-tips.md
Removing website/content/en/build/images/message.png
Auto-merging website/config.toml
CONFLICT (content): Merge conflict in website/config.toml
Removing test/test-framework/test/e2e/memcached_test.go
Removing test/test-framework/test/e2e/main_test.go
Removing test/test-framework/pkg/controller/memcachedrs/memcachedrs_controller.go
Removing test/test-framework/pkg/controller/memcached/memcached_controller.go
Removing test/test-framework/pkg/controller/add_memcachedrs.go
Removing test/test-framework/pkg/controller/add_memcached.go
Removing test/test-framework/pkg/apis/cache/v1alpha1/zz_generated.deepcopy.go
Removing test/test-framework/pkg/apis/cache/v1alpha1/register.go
Removing test/test-framework/pkg/apis/cache/v1alpha1/memcachedrs_types.go
Removing test/test-framework/pkg/apis/cache/v1alpha1/memcached_types.go
Removing test/test-framework/pkg/apis/cache/v1alpha1/doc.go
Removing test/test-framework/pkg/apis/addtoscheme_cache_v1alpha1.go
Removing test/test-framework/go.mod
Removing test/test-framework/deploy/test-pod.yaml
Removing test/test-framework/deploy/service_account.yaml
Removing test/test-framework/deploy/role.yaml
Removing test/test-framework/deploy/operator.yaml
Removing test/test-framework/deploy/olm-catalog/memcached-operator/memcached-operator.package.yaml
Removing test/test-framework/deploy/olm-catalog/memcached-operator/0.0.3/memcached-operator.v0.0.3.clusterserviceversion.yaml
Removing test/test-framework/deploy/olm-catalog/memcached-operator/0.0.3/cache.example.com_memcacheds_crd.yaml
Removing test/test-framework/deploy/olm-catalog/memcached-operator/0.0.3/cache.example.com_memcachedrs_crd.yaml
Removing test/test-framework/deploy/olm-catalog/memcached-operator/0.0.2/memcached-operator.v0.0.2.clusterserviceversion.yaml
Removing test/test-framework/deploy/olm-catalog/memcached-operator/0.0.2/cache.example.com_memcachedrs_crd.yaml
Removing test/test-framework/deploy/namespace-init.yaml
Removing test/test-framework/deploy/crds/cache.example.com_v1alpha1_memcachedrs_cr.yaml
Removing test/test-framework/deploy/crds/cache.example.com_v1alpha1_memcached_cr.yaml
Removing test/test-framework/deploy/crds/cache.example.com_otherdummies_crd.yaml
Removing test/test-framework/deploy/crds/cache.example.com_memcachedrs_crd.yaml
Removing test/test-framework/deploy/crds/cache.example.com_dummys_crd.yaml
Removing test/test-framework/cmd/manager/main.go
CONFLICT (modify/delete): test/test-framework/build/bin/user_setup deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of test/test-framework/build/bin/user_setup left in tree.
CONFLICT (modify/delete): test/test-framework/build/bin/entrypoint deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of test/test-framework/build/bin/entrypoint left in tree.
Removing test/test-framework/build/Dockerfile
Removing test/test-framework/.test-osdk-scorecard.yaml
Removing test/test-framework/.test-osdk-scorecard-ci.yaml
Removing test/test-framework/.osdk-scorecard.yaml
Removing test/test-framework/.osdk-scorecard-v1alpha2.yaml
Removing test/test-framework/.osdk-scorecard-invalid.yaml
Removing test/test-framework/.osdk-scorecard-ci.yaml
Removing test/test-framework/.osdk-scorecard-bundle.yaml
Removing test/kind-config.yaml
Removing test/internal/utils.go
Removing test/e2e/tls_util_test.go
Removing test/e2e/testdata/gencert.sh
Removing test/e2e/testdata/gencert.json
Removing test/e2e/testdata/empty.yaml
Removing test/e2e/testdata/ca.key
Removing test/e2e/testdata/ca.csr
Removing test/e2e/testdata/ca.crt
Removing test/e2e/testdata/ca-csr.json
Removing test/e2e/main_test.go
Removing test/e2e/_incluster-test-code/memcached_test.go
Removing test/e2e/_incluster-test-code/main_test.go
Removing test/e2e-new/e2e_test.go
CONFLICT (modify/delete): test/e2e-new/e2e_suite.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of test/e2e-new/e2e_suite.go left in tree.
Removing test/ansible/molecule/cluster/tasks/servicemonitor_test.yml
Removing test/ansible-memcached/verify.yml
Removing test/ansible-memcached/molecule.yml
Auto-merging release.sh
CONFLICT (content): Merge conflict in release.sh
Removing pkg/tls/tls.go
Removing pkg/tls/primitives.go
Removing pkg/tls/error.go
Removing pkg/test/resource_creator_test.go
Removing pkg/test/resource_creator.go
Removing pkg/test/main_entry.go
Removing pkg/test/framework.go
Removing pkg/test/e2eutil/wait_util.go
Removing pkg/test/context_test.go
Removing pkg/test/context.go
Removing pkg/test/client.go
Removing pkg/status/conditions_test.go
Removing pkg/status/conditions.go
Removing pkg/ready/ready_test.go
Removing pkg/ready/ready.go
Removing pkg/predicate/predicate.go
Removing pkg/metrics/service-monitor.go
Removing pkg/metrics/metrics.go
Removing pkg/log/zap/logger_test.go
Removing pkg/log/zap/logger.go
Removing pkg/log/zap/flags_test.go
Removing pkg/log/zap/flags.go
Removing pkg/leader/leader.go
Removing pkg/leader/doc.go
Removing pkg/kube-metrics/uclient.go
Removing pkg/kube-metrics/store.go
Removing pkg/kube-metrics/server.go
Removing pkg/kube-metrics/metrics.go
Removing pkg/k8sutil/k8sutil_test.go
Removing pkg/k8sutil/k8sutil.go
Removing pkg/internal/predicate/dependent.go
Removing pkg/helm/watches/watches_test.go
CONFLICT (modify/delete): pkg/helm/run.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of pkg/helm/run.go left in tree.
Removing pkg/helm/flags/flag.go
Removing pkg/handler/enqueue_annotation.go
Removing pkg/apis/scorecard/v1alpha3/types.go
Removing pkg/apis/scorecard/v1alpha3/register.go
Removing pkg/apis/scorecard/v1alpha3/formatter.go
Removing pkg/apis/scorecard/v1alpha3/doc.go
Removing pkg/apis/scorecard/v1alpha2/zz_generated.deepcopy.go
Removing pkg/apis/scorecard/v1alpha2/types.go
Removing pkg/apis/scorecard/v1alpha2/register.go
Removing pkg/apis/scorecard/v1alpha2/formatter.go
Removing pkg/ansible/watches/testdata/roles/role/tasks.yaml
Removing pkg/ansible/watches/testdata/playbook.yml
Removing pkg/ansible/watches/testdata/ansible_collections/nameSpace/collection/roles/someRole/empty_file
Removing pkg/ansible/runner/testdata/roles/role/tasks.yaml
Removing pkg/ansible/runner/testdata/playbook.yml
CONFLICT (modify/delete): pkg/ansible/run.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of pkg/ansible/run.go left in tree.
Removing pkg/ansible/flags/flag.go
Removing pkg/ansible/OWNERS
Auto-merging internal/version/version.go
CONFLICT (content): Merge conflict in internal/version/version.go
Removing internal/util/projutil/sdk_stamps_util.go
Auto-merging internal/util/projutil/project_util.go
CONFLICT (content): Merge conflict in internal/util/projutil/project_util.go
Removing internal/util/projutil/exec.go
Removing internal/util/kubebuilder/project.go
Removing internal/util/k8sutil/manifest.go
Removing internal/util/fileutil/file_util.go
Removing internal/scorecard/scorecard_output.go
Removing internal/scorecard/plugins/runner_test.go
Removing internal/scorecard/plugins/resource_handler.go
Removing internal/scorecard/plugins/plugin_runner.go
Removing internal/scorecard/plugins/olm_tests.go
Removing internal/scorecard/plugins/labels_test.go
Removing internal/scorecard/plugins/labels.go
Removing internal/scorecard/plugins/config.go
Removing internal/scorecard/plugins/basic_tests.go
Removing internal/scorecard/interfaces.go
Removing internal/scorecard/helpers/versions_test.go
Removing internal/scorecard/helpers/versions.go
Removing internal/scorecard/helpers/test_definitions.go
Removing internal/scorecard/alpha/testdata/bundle/tests/scorecard/config.yaml
Removing internal/scorecard/alpha/testdata/bundle.tar.gz
Removing internal/scorecard/alpha/scorecard.go
Removing internal/scorecard/alpha/run_test.go
Removing internal/scorecard/alpha/labels_test.go
Removing internal/scorecard/alpha/examples/custom-scorecard-tests/internal/tests/tests.go
Removing internal/scorecard/alpha/examples/custom-scorecard-tests/images/custom-scorecard-tests/cmd/test/main.go
Removing internal/scorecard/alpha/examples/custom-scorecard-tests/go.mod
Removing internal/scorecard/alpha/examples/custom-scorecard-tests/bundle/tests/scorecard/config.yaml
Removing internal/scorecard/alpha/examples/custom-scorecard-tests/bundle/metadata/annotations.yaml
Removing internal/scorecard/alpha/examples/custom-scorecard-tests/Makefile
Removing internal/scorecard/alpha/config.go
Removing internal/scorecard/alpha/bundle_test.go
Removing internal/scaffold/types_test.go
Removing internal/scaffold/types.go
Removing internal/scaffold/tools_test.go
Removing internal/scaffold/tools.go
Removing internal/scaffold/testdata/testroles/valid_role6/mergedRole.yaml
Removing internal/scaffold/testdata/testroles/valid_role4/mergedRole.yaml
Removing internal/scaffold/testdata/testroles/valid_role3/mergedRole.yaml
Removing internal/scaffold/testdata/testroles/valid_role2/mergedRole.yaml
Removing internal/scaffold/testdata/testroles/valid_role1/mergedRole.yaml
Removing internal/scaffold/testdata/testroles/valid_clusterrole/mergedRole.yaml
Removing internal/scaffold/testdata/testroles/invalid_role/deploy/role.yaml
Removing internal/scaffold/test_setup.go
Removing internal/scaffold/service_account_test.go
Removing internal/scaffold/scaffold.go
Removing internal/scaffold/rolebinding_test.go
Removing internal/scaffold/rolebinding.go
Removing internal/scaffold/role_test.go
Removing internal/scaffold/role.go
Removing internal/scaffold/resource.go
Removing internal/scaffold/register_test.go
Removing internal/scaffold/register.go
Removing internal/scaffold/operator_test.go
Removing internal/scaffold/operator.go
Removing internal/scaffold/internal/testutil/test_util.go
Removing internal/scaffold/internal/deps/print_go_mod.go
Removing internal/scaffold/input/input.go
Removing internal/scaffold/helm/usersetup.go
Removing internal/scaffold/helm/operator.go
Removing internal/scaffold/helm/main.go
Removing internal/scaffold/helm/init.go
CONFLICT (modify/delete): internal/scaffold/helm/go_mod.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of internal/scaffold/helm/go_mod.go left in tree.
Removing internal/scaffold/helm/entrypoint.go
Removing internal/scaffold/helm/dockerfilehybrid.go
Removing internal/scaffold/helm/dockerfile.go
Removing internal/scaffold/helm/api.go
Removing internal/scaffold/group_test.go
Removing internal/scaffold/group.go
Removing internal/scaffold/go_mod_test.go
CONFLICT (modify/delete): internal/scaffold/go_mod.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of internal/scaffold/go_mod.go left in tree.
Removing internal/scaffold/gitignore_test.go
Removing internal/scaffold/gitignore.go
Removing internal/scaffold/entrypoint_test.go
Removing internal/scaffold/entrypoint.go
Removing internal/scaffold/doc_test.go
Removing internal/scaffold/doc.go
Removing internal/scaffold/customrender.go
Removing internal/scaffold/cr_test.go
Removing internal/scaffold/cr.go
Removing internal/scaffold/controller_test.go
Removing internal/scaffold/controller_kind_test.go
Removing internal/scaffold/controller_kind.go
Removing internal/scaffold/controller.go
Removing internal/scaffold/constants.go
Removing internal/scaffold/build_dockerfile_test.go
Removing internal/scaffold/build_dockerfile.go
Removing internal/scaffold/boilerplate_go_txt_test.go
Removing internal/scaffold/boilerplate_go_txt.go
Removing internal/scaffold/apis_test.go
Removing internal/scaffold/ansible/watches_test.go
Removing internal/scaffold/ansible/watches.go
Removing internal/scaffold/ansible/usersetup.go
Removing internal/scaffold/ansible/travis.go
Removing internal/scaffold/ansible/testdata/valid2/validWatches.yaml
Removing internal/scaffold/ansible/testdata/valid1/validWatches.yaml
Removing internal/scaffold/ansible/testdata/invalid/invalid_watch/watches.yaml
Removing internal/scaffold/ansible/testdata/invalid/emptywatchfile/watches.yaml
Removing internal/scaffold/ansible/roles_templates.go
Removing internal/scaffold/ansible/roles_tasks_main.go
Removing internal/scaffold/ansible/roles_handlers_main.go
Removing internal/scaffold/ansible/roles_defaults_main.go
Removing internal/scaffold/ansible/molecule_test_local_verify.go
Removing internal/scaffold/ansible/molecule_test_local_molecule.go
Removing internal/scaffold/ansible/molecule_test_local_converge.go
Removing internal/scaffold/ansible/molecule_templates_operator.go
Removing internal/scaffold/ansible/molecule_default_verify.go
Removing internal/scaffold/ansible/molecule_default_prepare.go
Removing internal/scaffold/ansible/molecule_default_converge.go
Removing internal/scaffold/ansible/molecule_cluster_verify.go
Removing internal/scaffold/ansible/molecule_cluster_prepare.go
Removing internal/scaffold/ansible/molecule_cluster_destroy.go
Removing internal/scaffold/ansible/molecule_cluster_converge.go
Removing internal/scaffold/ansible/main.go
Removing internal/scaffold/ansible/input.go
CONFLICT (modify/delete): internal/scaffold/ansible/go_mod.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of internal/scaffold/ansible/go_mod.go left in tree.
Removing internal/scaffold/ansible/entrypoint.go
CONFLICT (modify/delete): internal/scaffold/ansible/dockerfilehybrid.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of internal/scaffold/ansible/dockerfilehybrid.go left in tre
e.
Removing internal/scaffold/ansible/deploy_operator.go
Removing internal/scaffold/ansible/constants.go
Removing internal/scaffold/ansible/build_dockerfile.go
Removing internal/scaffold/addtoscheme_test.go
Removing internal/scaffold/addtoscheme.go
Removing internal/scaffold/add_controller_test.go
Removing internal/scaffold/add_controller.go
Auto-merging internal/registry/validate.go
CONFLICT (content): Merge conflict in internal/registry/validate.go
Auto-merging internal/registry/labels.go
CONFLICT (content): Merge conflict in internal/registry/labels.go
Removing internal/plugins/helm/init.go
Removing internal/plugins/helm/flags.go
Removing internal/plugins/helm/api.go
Auto-merging internal/plugins/golang/v2/init.go
CONFLICT (content): Merge conflict in internal/plugins/golang/v2/init.go
Removing internal/olm/operator/tenancy.go
Auto-merging internal/olm/operator/registry/configmap/deployment.go
Removing internal/olm/operator/packagemanifests_manager.go
Removing internal/olm/operator/packagemanifests.go
Removing internal/olm/operator/operator_manager.go
Removing internal/olm/operator/olm.go
Auto-merging internal/olm/client/client.go
CONFLICT (content): Merge conflict in internal/olm/client/client.go
Removing internal/genutil/k8s.go
Removing internal/genutil/genutil.go
Removing internal/genutil/crds.go
Removing internal/generate/testdata/non-standard-layout/main.go
Removing internal/generate/testdata/non-standard-layout/expected-catalog/olm-catalog/memcached-operator/memcached-operator.package.yaml
Removing internal/generate/testdata/non-standard-layout/expected-catalog/olm-catalog/memcached-operator/0.0.4/memcached-operator.v0.0.4.clusterserviceversion.yaml
Removing internal/generate/testdata/non-standard-layout/expected-catalog/olm-catalog/memcached-operator/0.0.3/memcached-operator.v0.0.3.clusterserviceversion.yaml
Removing internal/generate/testdata/non-standard-layout/expected-catalog/olm-catalog/memcached-operator/0.0.1/memcached-operator.v0.0.1.clusterserviceversion.yaml
Removing internal/generate/testdata/non-standard-layout/config/service_account.yaml
Removing internal/generate/testdata/non-standard-layout/config/role.yaml
Removing internal/generate/testdata/non-standard-layout/config/operator.yaml
Removing internal/generate/testdata/non-standard-layout/api/cache/v1alpha1/memcached_types.go
Removing internal/generate/testdata/go/emptydir/.keep
Removing internal/generate/testdata/go/deploy/service_account.yaml
Removing internal/generate/testdata/go/deploy/role.yaml
Removing internal/generate/testdata/go/deploy/operator.yaml
Removing internal/generate/testdata/go/deploy/olm-catalog/memcached-operator/memcached-operator.package.yaml
Removing internal/generate/testdata/go/deploy/olm-catalog/memcached-operator/manifests/memcached-operator.clusterserviceversion.yaml
Removing internal/generate/testdata/go/deploy/olm-catalog/memcached-operator/0.0.3/memcached-operator.v0.0.3.clusterserviceversion.yaml
Removing internal/generate/testdata/go/deploy/olm-catalog/memcached-operator/0.0.2/memcached-operator.v0.0.2.clusterserviceversion.yaml
Removing internal/generate/testdata/go/deploy/crds_v1beta1/cache.example.com_v1alpha1_memcachedrs_cr.yaml
Removing internal/generate/testdata/go/deploy/crds_v1beta1/cache.example.com_v1alpha1_memcached_cr.yaml
Removing internal/generate/testdata/go/deploy/crds_v1beta1/cache.example.com_memcacheds_crd.yaml
Removing internal/generate/testdata/go/deploy/crds_v1beta1/cache.example.com_memcachedrs_crd.yaml
Removing internal/generate/testdata/go/deploy/crds_v1/cache.example.com_v1alpha1_memcachedrs_cr.yaml
Removing internal/generate/testdata/go/deploy/crds_v1/cache.example.com_memcachedrs_crd.yaml
Removing internal/generate/testdata/go/cmd/manager/main.go
Removing internal/generate/olm-catalog/package_manifest_test.go
Removing internal/generate/olm-catalog/package_manifest.go
Removing internal/generate/olm-catalog/descriptor/search.go
Removing internal/generate/olm-catalog/descriptor/parse_test.go
Removing internal/generate/olm-catalog/descriptor/parse.go
Removing internal/generate/olm-catalog/descriptor/descriptor_test.go
Removing internal/generate/olm-catalog/descriptor/descriptor.go
Removing internal/generate/olm-catalog/csv_util.go
Removing internal/generate/olm-catalog/csv_go_test.go
Removing internal/generate/olm-catalog/csv.go
Removing internal/generate/gen/rules.go
Removing internal/generate/gen/generator.go
Removing internal/generate/crd/crd_test.go
Removing internal/generate/crd/crd.go
Auto-merging internal/generate/collector/manifests.go
CONFLICT (content): Merge conflict in internal/generate/collector/manifests.go
CONFLICT (add/add): Merge conflict in internal/generate/collector/clusterserviceversion_test.go
Auto-merging internal/generate/collector/clusterserviceversion_test.go
CONFLICT (add/add): Merge conflict in internal/generate/collector/clusterserviceversion.go
Auto-merging internal/generate/collector/clusterserviceversion.go
Auto-merging internal/generate/clusterserviceversion/clusterserviceversion_updaters.go
Removing internal/generate/clusterserviceversion/bases/markers.go
Removing internal/flags/watch/flags.go
Removing internal/flags/apiflags/flags_test.go
Removing internal/flags/apiflags/flags.go
Auto-merging internal/cmd/operator-sdk/generate/packagemanifests/packagemanifests.go
Auto-merging internal/cmd/operator-sdk/generate/packagemanifests/cmd.go
Auto-merging internal/cmd/operator-sdk/generate/internal/genutil.go
Auto-merging internal/cmd/operator-sdk/generate/bundle/bundle.go
CONFLICT (content): Merge conflict in internal/cmd/operator-sdk/generate/bundle/bundle.go
Auto-merging internal/cmd/operator-sdk/bundle/validate/validate_test.go
CONFLICT (content): Merge conflict in internal/cmd/operator-sdk/bundle/validate/validate_test.go
Auto-merging internal/ansible/runner/eventapi/types.go
Auto-merging internal/ansible/controller/reconcile.go
CONFLICT (content): Merge conflict in internal/ansible/controller/reconcile.go
Removing internal/annotations/prefix_test.go
Removing internal/annotations/prefix.go
Removing images/scorecard-proxy/cmd/proxy/main.go
CONFLICT (modify/delete): images/scorecard-proxy/bin/user_setup deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of images/scorecard-proxy/bin/user_setup left in tree.
CONFLICT (modify/delete): images/scorecard-proxy/bin/entrypoint deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of images/scorecard-proxy/bin/entrypoint left in tree.
Removing images/scorecard-proxy/Dockerfile
Removing hack/tests/subcommand.sh
Removing hack/tests/subcommand-scorecard.sh
Removing hack/tests/subcommand-generate-csv.sh
Removing hack/tests/subcommand-bundle.sh
Removing hack/tests/scaffolding/scaffold-memcached.go
Removing hack/tests/scaffolding/e2e-go-scaffold.sh
Auto-merging hack/tests/integration.sh
Removing hack/tests/e2e-go-new.sh
Auto-merging hack/tests/e2e-ansible-molecule.sh
CONFLICT (content): Merge conflict in hack/tests/e2e-ansible-molecule.sh
Removing hack/tests/check-lint.sh
Removing hack/image/helm/scaffold-helm-image.go
Removing hack/image/build-scorecard-proxy-image.sh
Removing hack/image/ansible/scaffold-ansible-image.go
Removing hack/generate/test-framework/gen-test-framework.sh
Removing hack/generate/cli-doc/gen-cli-doc.sh
Removing hack/generate/changelog/util/testdata/ignore/non-yaml.txt
CONFLICT (rename/rename): Rename "hack/generate/changelog/util/fragment_test.go"->"hack/generate/changelog/util/fragment_test.go.bak" in branch "HEAD" rename "hack/generate/changelog/util/fr
agment_test.go"->"hack/generate/changelog/internal/util/fragment_test.go" in "tags/v1.1.0"
Removing hack/ci/setup-build-dependencies.sh
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Removing example/memcached-operator/memcached_controller.go.tmpl
Removing design/milestone-0.2.0/csv-generation.md
Removing design/milestone-0.0.2/query-api.md
Removing design/milestone-0.0.2/action-api.md
Removing design/long-term/testing-operators.md
Removing design/long-term/simple-extensions.md
Removing design/long-term/norms-to-follow.md
Removing cmd/operator-sdk/test/local.go
Removing cmd/operator-sdk/scorecard/cmd.go
Removing cmd/operator-sdk/run/packagemanifests/packagemanifests.go
Removing cmd/operator-sdk/run/local/local.go
Removing cmd/operator-sdk/run/local/cmd.go
Removing cmd/operator-sdk/run/cmd.go
Removing cmd/operator-sdk/printdeps/cmd.go
Removing cmd/operator-sdk/new/cmd.go
Removing cmd/operator-sdk/migrate/cmd.go
Auto-merging cmd/operator-sdk/main.go
CONFLICT (content): Merge conflict in cmd/operator-sdk/main.go
Removing cmd/operator-sdk/generate/packagemanifests/packagemanifests_legacy.go
Removing cmd/operator-sdk/generate/k8s.go
Removing cmd/operator-sdk/generate/csv.go
Removing cmd/operator-sdk/generate/crds.go
Removing cmd/operator-sdk/generate/bundle/bundle_legacy.go
Removing cmd/operator-sdk/cli/legacy.go
Removing cmd/operator-sdk/cleanup/packagemanifests/packagemanifests.go
Removing cmd/operator-sdk/cleanup/cmd.go
CONFLICT (modify/delete): cmd/operator-sdk/bundle/validate.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of cmd/operator-sdk/bundle/validate.go left in tree.
Removing cmd/operator-sdk/bundle/create_test.go
CONFLICT (modify/delete): cmd/operator-sdk/bundle/create.go deleted in tags/v1.1.0 and modified in HEAD. Version HEAD of cmd/operator-sdk/bundle/create.go left in tree.
Removing cmd/operator-sdk/build/cmd.go
Removing cmd/operator-sdk/add/crd.go
Removing cmd/operator-sdk/add/controller.go
Removing cmd/operator-sdk/add/cmd.go
Removing cmd/operator-sdk/add/api.go
Auto-merging OWNERS
CONFLICT (content): Merge conflict in OWNERS
Auto-merging Makefile
Removing MAINTAINERS
Auto-merging CHANGELOG.md
CONFLICT (content): Merge conflict in CHANGELOG.md
Auto-merging .gitignore
Automatic merge failed; fix conflicts and then commit the result.
rm 'cmd/operator-sdk/bundle/create.go'
rm 'cmd/operator-sdk/bundle/validate.go'
rm 'hack/generate/changelog/util/fragment_test.go'
rm 'hack/generate/changelog/util/fragment_test.go.bak'
rm 'images/scorecard-proxy/bin/entrypoint'
rm 'images/scorecard-proxy/bin/user_setup'
rm 'internal/scaffold/ansible/dockerfilehybrid.go'
rm 'internal/scaffold/ansible/go_mod.go'
rm 'internal/scaffold/go_mod.go'
rm 'internal/scaffold/helm/go_mod.go'
rm 'pkg/ansible/run.go'
rm 'pkg/helm/run.go'
rm 'test/e2e-new/e2e_suite.go'
rm 'test/test-framework/build/bin/entrypoint'
rm 'test/test-framework/build/bin/user_setup'
rm 'website/content/en/docs/golang/project_migration_guide.md'
rm 'website/content/en/docs/new-cli/operator-sdk_generate_packagemanifests.md'
rm 'website/content/en/docs/scorecard/scorecard-alpha.md'
rm 'website/content/en/docs/upgrading-sdk-version/v0.17.1.md'
rm 'website/content/en/docs/upgrading-sdk-version/v0.19.1.md'
rm 'website/content/en/docs/upgrading-sdk-version/v0.19.2.md'
rm 'website/content/en/docs/upgrading-sdk-version/v0.19.3.md'
rm 'website/content/en/docs/upgrading-sdk-version/v0.19.4.md'
[v1.1.0-rebase-master 56300aab] Merge upstream tag v1.1.0
9d27e224 (tag: v1.1.0, upstream/latest) Release v1.1.0 (#4031)
c36f1b61 change makefile test target for no longer be required manual steps to run the commands (#3983)
63a080fa Makefile: run cli-doc generator directly (#4033)
c3e2231b *: clean up samples (#4035)
e4635fa2 add marc and move bharathi-tenneti to sdk-emeritus-approvers (#4019)
6eb31294 doc: add base doc that clarifies how users can test their projects (#3823)
1254d834 runbundle: refactor printing deployment/pod errors (#3908)
b3125be8 Add k8s black lives matter statement (#4022)
bb866f7f Add tests for configmap.go (#3990)
fc038e32 Ansible: pin community-kubernetes to <1.0.0 in tests to match ansible project scaffold (#4014)
0c46569d doc: update places to direct the users to check the samples in /testdata/ (#3995)
7bda41c8 changelog/fragments/csv-whdescs-defaults.yaml: change to bugfixes, update descriptions (#4005)
53779909 Add fragment for run-bundle. (#3988)
fe44b3e0 Update docs on Conditions (#3997)
bfd849cc Update go version in SDK (#3987)
59899ddf update bundle image name in examples to denote this is a bundle image (#3992)
44ed2f5c feat: add memcached go sample (#3980)
2e4c14a9 *: ensure no exported APIs (#3993)
8e9811d5 feat: add ansible memcached sample (#3981)
e6d94aae run bundle: Enable run bundle (#3877)
c157caa5 Makefile: rename, remove, and reorganize rules (#3986)
cf85c2d5 cleanup: scorecard with its own test (#3921)
ae473bd2 doc: remove very old docs from master (#3982)
adcef86d Modify e2e test to use OLM version "0.15.1"  (#3965)
6a495ddd doc: Update advance topics (#3885)
f7e10e21 cmd/ansible|helm-operator: minor nit improvements (#3978)
14121383 proposals/automating-releases.md: automate the release process (#3939)
9cebb81d ansible-operator|helm-operator: add the kubernetes auth clients (#3974)
3c98e2fc Initial docs for project issue processes (#3952)
c1e08808 Sample autogenerate code implementation with Helm sample (#3910)
791a8861 Switch the base image from ubi8 to ubi8-minimal (#3963)
bfc6bfae [olm] Store previous versions of olm manifests (#3906)
cfb7ee86 change kutt-test.yaml to specify suppressLog setting (#3961)
98a73bae Add sdk base image (#3902)
576b971b bump kuttl version to 0.6.1 in scorecard-test-kuttl (#3957)
38ed7260 go.mod: bump operator-registry to v1.14.3 for bundle validation improvements (#3953)
57541211 OWNERS: add OWNERS_ALIASES, add approvers/reviewers who already held roles (#3955)
b661055a OWNERS: add jberkhahn as reviewer (#3954)
5ec19ea7 docs/building-operators/ansible/testing-guide.md: pin links to v2.9 (#3956)
80c83e34 Disable fact gathering by default (#3933)
4ce0d162 doc: operator-scope update examples with the new layout and clarifies steps.  (#3705)
b2ab9281 changelog/fragments: add bugfix 3936 fragment (#3942)
8759f01a deps: fix upstream JSON patch issues (#3936)
0c463087 [olm] Improve error message in olm install cmd (#3907)
f7ad6251 docs/contribution-guidelines: improve formatting, remove specifics of tests (#3879)
8417795c remove versioning doc (#3929)
5cc888c5 Pin to ansible 2.9 (#3935)
1973360f `bundle validate`: enable optional validators (#3719)
7f432899 run bundle: OperatorGroup Install modes (#3861)
82086097 Revert "updates to add message from Paul (#3188)" (#3932)
eccc0ac2 fix upgrade version menu (#3926)
f7d99769 Centralize the logic for scorecard dev image replacement on e2e tests (#3920)
d0c25289 [e2e-test] Added the ginkgo style checks for e2e tests (#3914)
88a6f988 CHANGELOG.md: add v0.19.4 and v1.0.1 (#3917)
6f4dae4b `generate`: default CSV `admissionReviewVersions` and `sideEffects` (#3903)
40e00a33 *: use CI-built scorecard images during e2e tests (#3909)
7db9ec2f remove references to --manifests command in generate packagemanifest docs (#3890)
f3a767bc `generate`: correctly set CSV webhookDefinition deployment names (#3761)
004d4923 Replace method 'Should(Succeed())' with 'NotTo(HaveOccurred())' (#3898)
51e2e14c Relax csv name validation (#3887)
ab1b4b7a Fix broken Go e2e link (#3891)
f6423be9 restrict autoprefixer version (#3883)
838ed745 cleanup go e2e tests and perform improvements (#3499)
5ab7236d for helm/ansible fix msg for multigroup support  (#3822)
8e1bd94a e2e: use regex replace to forcibly replace scaffolded Dockerfile base image strings (#3874)
4fe0e731 run packagemanifests: registry server should use world-writable directory to write files (#3867)
3f264808 Drop the use of memecached in Go migration docs (#3869)
1f2dff14 .travis.yml: re-enable s390x, consolidate builds (#3855)
34c0fcac Makefile,internal/version: inject version based on git tree (#3854)
e0edd396 bugfix: use the tags in the scorecard scaffolded manifests (#3845)
91005524 run bundle: Add deployment status check when verifying installed operator. (#3819)
0981dcde doc: fix a typo in the header (#3864)
5bd66d99 docs/upgrade-sdk-version: fix v0.17.x version reference, condense v1.0.0 guides (#3853)
535882df :book: fix broken links (#3866)
aed6d385 Refactor create/update for catalog source and registry pod (#3832)
6c866061 internal/olm/operator: fix operator-registry image for run packagemanifests (#3856)
24b7dbad internal/cmd: add git commit logging in run subcommand (#3849)
fe70e1db removed customer-scorecard-tests binary that was inadvertly added (#3851)
9adf1554 doc: fixes annotations example layout on Ansible development tips
312a6dd4 Verify install plan generation and approve install plan for subscription (#3838)
a5142f5d Include 0.19.x stream in the changelog (#3841)
379bc47c Enable gosec lint check with exclude rules
b9cd0707 fix fragment file name (#3821)
0684f5dc Use rpm installed setuptools (#3827)
1a4ed604 manifest generation: remove `metadata.namespace` from manifests (#3813)
0e123740 cleanup: remove unused code (#3814)
497b7f8c For Ansible-based Operator, add .gitignore file which was missing. (#3806)
00a1f310 redirect links for webhook to point kubebuilder doc (#3694)
ab52c5c1 cleanup: helm gitignore (#3810)
16403cbe Make bundle validate subcommand respect verbosity (#3795)
cb9f4c41 doc: fix wrong link to the envtest script (#3808)
a7092729 remove definition of namespace scope from CRD scope section. (#3802)
faa003ec doc: helm prequierements (#3777)
d8a75568 Bugfix: Helm operator: add finalizers permission for created APIs (#3779)
6917885e fix: use relative path in documentation (#3791)
a9d6b1bb internal/olm: refactor package `internal/operator` and `run packagemanifests` logic (#3764)
e8077e73 .github/ISSUE_TEMPLATE: update template comments and add language labels (#3782)
01df5b3b internal/olm/operator: handle conflicting OperatorGroups (#3689)
35df1589 doc: Tweak development tips for Ansible operator (#3236)
6672d534 add e2e test for custom scorecard test (#3772)
732f2a4d Run Scorecard tests in Ansible e2e (#3773)
df05ce7b internal/generate/clusterserviceversion: append non-empty permissions (#3715)
8209bff6 docs: add missing prerequisite for Ansible plugin (#3754)
b7638da8 Scorecard push kuttl multiarch images and build custom scorecard test image (#3759)
e3b1cc0d Run scorecard tests in helm e2e tests (#3768)
5cf9e6c5 feat: ansible e2e tests (#3734)
7449f944 use kuttl v0.5.2 as the base for scorecard-test-kuttl (#3751)
7d672a12 docs: fixing minor typos (#3757)
bba4b75f `generate`: support only AllNamespaces by default in CSV bases (#3746)
ddce5985 docs: fix Go API xDesriptor marker example (#3750)
a87bfd10 Implement IndexImageCatalogCreator and add grpc catalog source creation (#3467)
874d1201 update scorecard custom docs (#3745)
dc1a7361 Scorecard custom image update and relocation (#3711)
0f7a8922 Update release guide so that ALL steps are numbered and co-located. (#3731)
39437d10 doc: Fix main.go path, and desc for zap stacktrace level (#3686)
e0b27a98 fix: (helm) - in some rare helm install cases, status is missing InstallSuccessful (#3735)
140fdedf website layout: adds analytics code (#3178)
63153ff2 Adding  gocyclo to Linter (#3723)
3aca1133 internal/operator-sdk/run|cleanup: initial boilerplate (#3636)
43e617e6 Removing stale sockets while running Ansible operators (#3721)
31210214 fix ansible-operator link to CR sample (#3732)
28a8caad Adding fragment file for PR #3650 (Rescue tasks reconciliation) (#3729)
a805491a Adding unconvert to linter with fixes (#3724)
4c8c54db Added code to handle reading in from module, sets reconciliation period (#3582)
70e4f89c ci: skip test jobs when the just the tmpl used as example was changed (#3611)
be086be8 fix broken link in ansible quickstart docs (#3725)
cc0785b1 Adding checks for rescued tasks during reconciliation (#3650)
34fe8037 Clarify that a role or playbook is necessary. (#3662)
05d4eb6a doc: update `Advanced Topics` conditions with operator-framework/operator-lib (#3703)
41d27c14 Switch registry pod to use controller runtime client (#3665)
050efeb3 Narrower Linter to Project NOT Global (#3685)
6fa90045 bump kuttl base image version (#3659)
5328661b add kuttl logs into scorecard output when running kuttl tests (#3652)
4a263372 *: post-release version update (#3717)
d7d5e0cd (tag: v1.0.0) *: release v1.0.0 (#3713)
646fa8b7 Makefile,.travis.yml: Remove docker image builds for s390x architecture (#3710)
ccd621b0 internal/plugins: scaffold a vanilla `go.kubebuilder.io/v2` project when `--project-version=2` (#3697)
2a654eb3 run packagemanifests: change default install mode to AllNamespaces (#3663)
4739c1fc wait for CRD deletion; delete all objects created by install plan (#3664)
a8f5e00e [olm] Remove olm-namespace flag from install sub-command (#3670)
9b77437a test/integration: use default service account for CSV perms (#3668)
8bca0209 Various molecule scaffolding tweaks (#3661)
c9348b5e update docs to reflect call to NewManager (#3651)
f04ad073 doc: migration guide for Ansible and quickstart fixes (#3571)
260e5474 doc: Fix/Update the migration guide for Go projects (#3543)
6712c8c7 website: fix old e2e file link (#3657)
2d8149ec internal/plugins/{ansible,helm}: run `CreateAPI` phase 2 plugins in `Init` (#3655)
13198cfc operator-sdk cleanup: remove packagemanifests, add generic command (#3644)
cec69abd Fix undefined var in scaffolded molecule tests (#3654)
fc530e4e go.mod: controller-runtime v0.6.2 (#3653)
7e029625 doc: quickstart for Go  projects (#3551)
00a7f19f website/content/en/docs/: fix links pointing to master docs site (#3649)
f20a7962 This commit adds a scaffold marker `+kubebuilder:scaffold:manifestskustomizesamples` (#3645)
ce96b751 Bug 1865808:  Fixed the Version issue osdk (#3643)
8e5d03bd internal/plugins/manifests: inject operator image using `IMG=<tag>` (#3634)
beae1ce8 fix licenses (#3618)
f936a6c6 Post release PR (#3629)
182f0219 (tag: v1.0.0-alpha.2) Release PR for v1.0.0-alpha.2 (#3628)
3270033b generate: consider service accounts when generating a CSV (#3610)
bfe13ff6 Modify rbac role, rather than patch with kustomize (#3624)
b580bba3 CHANGELOG.md: update scorecard API links (#3627)
b8a23bad scorecard: use api repo v1alpha3 API, remove existing (#3622)
533a2757 remove MAINTAINERS: official list maintained in OWNERS file (#3621)
bd9057cc Closes #2262: Allowing users to specify arbitrary CLI arguments for Ansible-based operators (#3374)
96b4e32d Scorecard e2e Testing (#3507)
ab15e8e5 version: move to internal/version (#3617)
5f0caf6e bump operator-lib to v0.1.0 (#3616)
6bcaff82 removal: cleanup over legacy support (#3539)
fc84e604 doc: helm : tiny improvements and fixes (#3595)
1cf15154 Update website dependencies (#3612)
27f1cc6a update tutorial to new layout (#3598)
aa84f543 cmd/helm|ansible-operator: add cobra subcommands (#3596)
a383aa59 deps: bump operator-registry to v1.13.4 (#3602)
ffb207ff fix: (ansible) - kustomize target is missing realpath (#3603)
1ab72919 <run|cleanup> packagemanifests: remove `--olm-namespace`, change `--operator-namespace` to `--namespace` (#3601)
bbc2f254 generate: remove `--operator-name` (#3530)
e5d23f0a <run|cleanup> packagemanifests: remove `--include-paths`, change `--operator-version` to `--version` (#3599)
6bd8f821 doc: fix duplicated line (#3597)
f2088cf1 doc: quickstart for Helm projects and more details for the migration guide (#3552)
92ddae36 release.sh, website: update release script and docs (#3591)
0e1ab6b8 website/content/en/docs/building-operators: update legacy references (#3575)
1c151907 doc: fix typo issue over variable watchNamespace name in operator-scope (#3592)
9a781dce website: fix typo in helm override_values.md (#3588)
690e24f0 cleaanup: rename cmd suite of tests (#3550)
d3b7b3bc post release update master changelog (#3587)
3a44c209 website/content/en/docs: reorganize helm-based operator docs (#3583)
35c871fa Add some documentation for Ansible operator scaffolding (#3538)
b1d85c3f *: post-release version reset (#3577)
b95f052d (tag: v1.0.0-alpha.1) *: release v1.0.0-alpha.1 (#3574)
56b50ac2 Allows OLM subcommands work for Helm/Ansible new layout (#3341)
ad2759e2 internal/plugins/ansible: manager scaffolding updates for --metrics-addr and envvars (#3570)
4054b5f0 Move cmd APIs to internal/cmd/operator-sdk (#3568)
b468973e doc: quickstart for Ansible projects  (#3555)
4396ba56 cmd/operator-sdk: remove `build` subcommand (#3566)
7f3e4cbe Ansible/Helm: use structured logging for version info (#3564)
af70eacf doc: additionals and improvements on helm migration steps (#3554)
3ac32672 Add back setting environment variable (#3549)
c092d125 Meta ansible operator meta (#3562)
55f1b845 *: move pkg/ansible to internal/ansible (#3560)
8b95fdca Move pkg/helm to internal/helm (#3537)
62a8f29d cmd/operator-sdk,internal: remove legacy CLI, clean up utils (#3533)
df55ef43 website: fix install from source instructions (#3535)
92bb47f7 *: remove the `add crd` subcommand and related utilities (#3547)
3abfbaf6 internal/plugins: refactor plugins packages, utils (#3548)
871455ce test,website: use --plugins=helm when referencing the plugin name (#3534)
47392dff Remove operator-sdk new|add api commands and ansible scaffolding. (#3531)
84765540 doc: steps and info to setup envtest (#3510)
b999502b Port Ansible scaffolding to Kubebuilder plugin (#3488)
64197735 pkg/predicate: move predicates elsewhere and remove (#3532)
9db3ee84 scorecard,generate-csv: consider api "group" while checking for known types (#3334)
faa4a563 *: consistently use *.sdk.operatorframework.io wherever we use domains (#3527)
a3fe99e2 move zap flags internally (#3525)
0e966e06 cleanup: remove the funcs from k8sutil which are no longer used (#3513)
69e3bfbb replace instrumented handler with the one from operator-lib (#3523)
cb1bb88a hack/generate/changelog: fixes in preparation for v1.0.0-alpha1 release (#3528)
ea7a11bc internal/scorecard: fix cleanup skip on timeout bug (#3526)
24d73f78 internal/plugins/helm: add `--project-name` and use `Config.ProjectName` in scaffold (#3438)
a8946fb7 Remove EnqueueRequestForAnnotation handler from SDK (#3506)
765bb5f7 internal/plugins/helm: refactor for organization and isolation (#3521)
6d47a0f4 Fix flag name in error message for generate packagemanifests (#3508)
d63151be cmd/operator-sdk/generate/packagemanifests: add `--from-version` flag (#3509)
b158b7e5 docs: fix broken links (CI) (#3514)
804a24bf website: Fix link to the pull requests that implements support for configuring a liveness probe for an Ansible operator. (#3501)
35934ad2 Remove leader and status which have moved to operator-lib. (#3503)
c610e188 remove leftover test-framework file (#3505)
4368a457 website: fix scorecard links (#3504)
ff737125 scorecard: make config a componentconfig, scaffold config kustomization on `init` (#3490)
d7ca5580 update scorecard docs to be consistent in command examples (#3495)
26f64961 fix: reword changelog fragment for renaming flag (#3497)
c0c17e48 changelog: move fragment to correct dir (#3496)
e97ccb89 allow fragments to end in either .yml or .yaml (#3493)
5256f82d generate: parse CSV annotations with `controller-tools/pkg/markers` (#2792)
0c7d59bf Switch ansible/helm to use operator-lib predicate. (#3481)
0d4ba1b6 Update golang.org/x/text to v0.3.3 (#3458)
11901813 Ansible: add leader election flags, use lease-based election (#3457)
b021beca Add Ansible metrics address flag (#3489)
6a330760 Remove pkg/metrics and pkg/kube-metrics (#3484)
9115ab12 helm:replace test in shell for go (#3423)
c1b615c6 internal/plugins/helm: initialize manager role; other minor flag usage fixes (#3487)
c51b80cb scorecard: add bundle metadata (#3474)
40aebd20 add scorecard ns from context code (#3478)
581238d7 cmd/operator-sdk/generate: remove unused legacy code (#3483)
b7b0c174 Remove metrics logic from cmd/anisble-operator/main.go (#3466)
5fbd6518 internal/plugins/helm/v1/scaffolds/templates/role.go: simplify updates (#3482)
d4c33038 Remove pkg/ready (#3476)
d3c17285 Move pkg/k8sutil to internal/util/k8sutil (#3475)
409f02d9 remmoval: helm legacy scaffold (#3343)
920bb966 migrate role tests for the new layout (#3473)
0536020e gen-changelog: use yaml extension for fragments (#3472)
650b85cf Remove pkg/tls (#3468)
ebe63612 cmd/operator-sdk/scorecard: change source of truth for bundle metadata (#3450)
132dbe2c *: remove legacy CLI docs (#3455)
6a360231 internal/scaffold/role_test.go: make tests execute properly (#3465)
5e78ab91 internal/plugins/helm/v1/scaffolds/templates/role.go: remove metrics rules (#3464)
236aa843 ansible/helm: Rename max-workers to max-concurrent-reconciles (#3452)
efe38e88 fix: remove max-workers flag for ansible (#3456)
b6c8ae91 feat: allows format the command text just for the CLI docs generation (#3426)
a5daa916 docs: update helm docs for the new layout (#3326)
25b8054d Add unit tests for cmd/version (#3454)
1248c1ca [docs] Reorganize hugo doc site (#3382)
34021112 .gitignore: ignore scorecard example go.sum (#3453)
b747a2cf Remove metrics logic from cmd/helm-operator/main.go (#3451)
612e02b8 add unit tests for cmd/run (#3413)
8b95e1b1 Helm: add leader election flags, use lease-based election (#3446)
76b641d7 Remove legacy generate and bundle commands (#3414)
9defce64 ansible: rename cmd line flag and add global variable (#3435)
9f6ccd62 Added new handler for metrics (#3436)
e9865b09 cmd/helm-operator/main.go: add --metrics-addr flag (#3440)
5302bde1 update scorecard doc links (#3449)
4744d57c Make Ansible Operator parameter case conversion optional (#3245)
85992196 Scorecard move alpha (#3444)
97c633c8 hack/lib/common.sh: use uname instead of arch, use explicit flags (#3441)
97580c06 website/content/en/docs/golang/project_migration_guide.md: fix broken link (#3442)
4b000534 internal/scorecard/alpha: add parallelism support (#3434)
5a9ca472 website,example: remove legacy docs and fixup links (#3432)
370edff0 refactor cmd/cleanup/packagemanifests to be more testable (#3375)
0fe8cf4a feat: add helm plugin scaffolding new layout (#3421)
96d8bae4 test/test-framework: remove, and update/remove references and dependent tests (#3424)
27398bb1 doc: add extra info over ansible watches and reconcile period (#3384)
60d75724 contrib: update release guide with helm/ansible operator and website info (#3383)
4d8960cb scorecard: use TestList for output, exit 1 on test failure (#3427)
fe330c18 Trivial - use consts rather than literals for env vars (#3430)
5c77be39 scorecard: fix label permission bug (#3428)
0cc777e7 cmd/ansible-operator,cmd/helm-operator: embed code in main.go (#3415)
d1e2183e Removed escape characters for OSX (#3425)
e4f0d865 Creation of bundle registry pod (#3337)
80ecb4ca fix: Update scorecard example image (#3402)
c384111e changelog/fragments: add rm-legacy-go.yaml and rm-legacy-run.yaml (#3416)
e7e2f064 Add unit tests for cmd/olm (#3411)
281c6bd5 changelog: add test framework removal fragment (#3412)
2594430b cmd/operator-sdk/run: remove legacy run subcommand (#3406)
f075c55b *: remove `test` subcommand, `pkg/test`, and internal e2e tests for legacy projects (#3409)
9907f301 internal/registry/labels.go: FindMetadataDir fix (#3408)
3c0b764f helm-operator: use "Upgrade" instead of "Update" in var/fn names (#3388)
67fe0df7 helm/doc:replace the word update to upgrade in the info log (#3404)
795bc252 cleanup: keeping sdk scaffolds centralized (#3349)
987da120 docs: add link in project migration guide (#3405)
53c0f350 Remove legacy CLI, code, and scaffold templates (#3385)
e0767e86 doc: fix command create api in the migration guide (#3399)
4f024709 docs: fix go version (#3403)
c33b1146 Fix typos in golang legacy migration guide (#3401)
d0753ec4 Add link to 0.19.x docs (#3391)
1d78c2d2 fix migration link which appears in the deprecate notice (#3395)
91d56876 feat: allow know the project type by the config file (#3330)
c83c0ffb docs: Added the selector feature to docs (#3302)
297ddaca Closes #2790: Standardize on sigs.k8s.io/yaml (#3338)
ebfa4cde *: post release v0.19.0 (#3380)

** Upstream merge complete! **
View the above incoming commits to verify all is well
(mirrors the commit listing the PR will show)

Now make a pull request.
[jesusr@transam ocp-release-operator-sdk{v1.1.0-rebase-master}]$