Remove operator-sdk new|add api commands and ansible scaffolding. #3531

varshaprasad96 · 2020-07-24T19:51:56Z

Description of the change:
Remove operator-sdk new|add api commands and ansible scaffolding.
This commit does the following:

Remove operator-sdk new and operator-sdk add api in favour of ansible plugins.
Remove ansible scaffolding (ie) internal/scaffold/ansible.
Remove internal/flags/apiflags/flags.go and relevant tests which were used in the commands.
Update IsOperatorAnsible() to check only for new layouts.
Remove reference to new|add api commands in cli.

Motivation for the change:
Remove support for legacy commands and layouts in Operator SDK 1.0

Things to-do in follow up PR:

Remove operator-sdk add crd and relevant crd generator code/its tests which are not used.
Remove legacy cli support from cmd/operator-sdk/main.go

c/c @joelanford @jmrodri @camilamacedo86 @fabianvf

Summary of changes:

A       changelog/fragments/rm-cmd-legacy-ansible.yaml
D       cmd/operator-sdk/add/api.go
M       cmd/operator-sdk/add/cmd.go
M       cmd/operator-sdk/cli/cli.go
M       cmd/operator-sdk/cli/legacy.go
M       cmd/operator-sdk/main.go
D       cmd/operator-sdk/new/cmd.go
M       hack/tests/e2e-ansible.sh
D       internal/flags/apiflags/flags.go
D       internal/flags/apiflags/flags_test.go
D       internal/scaffold/ansible/OWNERS
D       internal/scaffold/ansible/build_dockerfile.go
D       internal/scaffold/ansible/constants.go
D       internal/scaffold/ansible/deploy_operator.go
D       internal/scaffold/ansible/input.go
D       internal/scaffold/ansible/molecule_cluster_converge.go
D       internal/scaffold/ansible/molecule_cluster_create.go
D       internal/scaffold/ansible/molecule_cluster_destroy.go
D       internal/scaffold/ansible/molecule_cluster_molecule.go
D       internal/scaffold/ansible/molecule_cluster_prepare.go
D       internal/scaffold/ansible/molecule_cluster_verify.go
D       internal/scaffold/ansible/molecule_default_converge.go
D       internal/scaffold/ansible/molecule_default_molecule.go
D       internal/scaffold/ansible/molecule_default_prepare.go
D       internal/scaffold/ansible/molecule_default_verify.go
D       internal/scaffold/ansible/molecule_templates_operator.go
D       internal/scaffold/ansible/molecule_test_local_converge.go
D       internal/scaffold/ansible/molecule_test_local_molecule.go
D       internal/scaffold/ansible/molecule_test_local_prepare.go
D       internal/scaffold/ansible/molecule_test_local_verify.go
D       internal/scaffold/ansible/playbook.go
D       internal/scaffold/ansible/requirements.go
D       internal/scaffold/ansible/roles_defaults_main.go
D       internal/scaffold/ansible/roles_files.go
D       internal/scaffold/ansible/roles_handlers_main.go
D       internal/scaffold/ansible/roles_meta_main.go
D       internal/scaffold/ansible/roles_readme.go
D       internal/scaffold/ansible/roles_tasks_main.go
D       internal/scaffold/ansible/roles_templates.go
D       internal/scaffold/ansible/roles_vars_main.go
D       internal/scaffold/ansible/testdata/invalid/emptywatchfile/watches.yaml
D       internal/scaffold/ansible/testdata/invalid/invalid_watch/watches.yaml
D       internal/scaffold/ansible/testdata/valid1/validWatches.yaml
D       internal/scaffold/ansible/testdata/valid2/validWatches.yaml
D       internal/scaffold/ansible/travis.go
D       internal/scaffold/ansible/watches.go
D       internal/scaffold/ansible/watches_test.go
M       internal/util/projutil/project_util.go
M       website/content/en/docs/cli/operator-sdk.md
D       website/content/en/docs/cli/operator-sdk_new.md

Checklist

If the pull request includes user-facing changes, extra documentation is required:

Add a new changelog fragment in changelog/fragments (see changelog/fragments/00-template.yaml)
Add or update relevant sections of the docs website in website/content/en/docs

varshaprasad96 · 2020-07-24T19:55:47Z

.travis.yml

@@ -117,6 +117,7 @@ jobs:
    ## Operator test stage jobs ##

    # Build and test ansible and test ansible using molecule
+    # TODO: Replace with the required scripts after ansible plugin PR is merged


Leaving install set up here, thought not necessary.

joelanford

/lgtm

camilamacedo86 · 2020-07-24T19:59:36Z

hack/tests/e2e-ansible.sh

-
-popd
-popd
+# TODO: Include test script after ansible plugins PR is merged.


We can remove the full file and target.

but do not need to do it in this PR we can do in a follow-up. Let's save Travis cycles.

camilamacedo86 · 2020-07-24T20:02:43Z

.travis.yml

@@ -125,7 +126,6 @@ jobs:
        - pip install --user ansible
      script:
        - make test-e2e-ansible
-        - make test-e2e-ansible-molecule

    # Test subcommands
    - <<: *test


Shows that we can remove all: /operator-sdk/internal/scaffold/
Required check if has some part of code which will require it.

Some of it is still used while scaffolding kustomize templates (eg: in generate/kustomize/manifests.go) and in add crd.
With the removal of add crd, Ill clean up internal/scaffold too.

camilamacedo86

/lgtm

You can remove it if pass in the CI and then we can do follow-ups with what can be missing here👍

asmacdo · 2020-07-24T20:07:07Z

hack/tests/e2e-ansible-molecule.sh

@@ -1,69 +0,0 @@
-#!/usr/bin/env bash


@fabianvf since you are modifying this file for the ansible-plugin, I assume @varshaprasad96 should leave this file untouched?

they've been rewritten in the scaffold PR, this will just cause a conflict

Ill add this, and comment the targets in Makefile where its called.

e2e tests will fail if the scaffolding is removed. so we either need to block this PR on the plugin PR

Or have the plugin PR rebase and re-add these tests.

Either way is fine by me.

varshaprasad96 · 2020-07-24T21:42:59Z

/hold Will make changes after #3488 gets merged.

joelanford

/lgtm

Just one question

hack/tests/e2e-ansible.sh

This commit does the following: 1. Remove operator-sdk new and operator-sdk add api in favour of ansible plugins. 2. Remove ansible scaffolding (ie) internal/scaffold/ansible. 3. Remove internal/flags/apiflags/flags.go and relevant tests which were used in the commands. 4. Update IsOperatorAnsible() to check only for new layouts. 5. Remove hack/tests/e2e-ansible-molecule.sh and rewrite hack/tests/e2e-ansible.sh (which will get updated after ansible plugins).

openshift-ci-robot · 2020-07-25T02:16:54Z

New changes are detected. LGTM label has been removed.

openshift-ci-robot requested review from jmrodri and rashmigottipati July 24, 2020 19:51

varshaprasad96 commented Jul 24, 2020

View reviewed changes

joelanford approved these changes Jul 24, 2020

View reviewed changes

openshift-ci-robot assigned joelanford Jul 24, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2020

camilamacedo86 reviewed Jul 24, 2020

View reviewed changes

camilamacedo86 approved these changes Jul 24, 2020

View reviewed changes

openshift-ci-robot assigned camilamacedo86 Jul 24, 2020

asmacdo reviewed Jul 24, 2020

View reviewed changes

joelanford mentioned this pull request Jul 24, 2020

Operator SDK 1.0 Meta-issue #3327

Closed

92 tasks

openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 24, 2020

estroz mentioned this pull request Jul 24, 2020

cmd/operator-sdk,internal: remove legacy CLI, clean up utils #3533

Merged

2 tasks

varshaprasad96 force-pushed the ansible/remove-add-new-api branch from eef7771 to 7f1b536 Compare July 25, 2020 01:42

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2020

varshaprasad96 force-pushed the ansible/remove-add-new-api branch from 7f1b536 to 04658a8 Compare July 25, 2020 01:44

varshaprasad96 requested review from fabianvf and asmacdo July 25, 2020 01:47

varshaprasad96 removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 25, 2020

varshaprasad96 requested a review from camilamacedo86 July 25, 2020 01:53

joelanford approved these changes Jul 25, 2020

View reviewed changes

hack/tests/e2e-ansible.sh Outdated Show resolved Hide resolved

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2020

varshaprasad96 force-pushed the ansible/remove-add-new-api branch from 04658a8 to f8f203c Compare July 25, 2020 02:16

openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Jul 25, 2020

camilamacedo86 mentioned this pull request Jul 25, 2020

removal: cleanup over legacy support #3539

Merged

joelanford merged commit 47392df into operator-framework:master Jul 25, 2020

estroz mentioned this pull request Jul 26, 2020

*: remove the add crd subcommand and related utilities #3547

Merged

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove operator-sdk new|add api commands and ansible scaffolding. #3531

Remove operator-sdk new|add api commands and ansible scaffolding. #3531

varshaprasad96 commented Jul 24, 2020 •

edited

Loading

varshaprasad96 Jul 24, 2020

joelanford left a comment

camilamacedo86 Jul 24, 2020

camilamacedo86 Jul 24, 2020

camilamacedo86 Jul 24, 2020

varshaprasad96 Jul 24, 2020 •

edited

Loading

camilamacedo86 left a comment

asmacdo Jul 24, 2020

fabianvf Jul 24, 2020

fabianvf Jul 24, 2020

varshaprasad96 Jul 24, 2020

joelanford Jul 24, 2020

varshaprasad96 commented Jul 24, 2020

joelanford left a comment •

edited

Loading

openshift-ci-robot commented Jul 25, 2020

Remove operator-sdk new|add api commands and ansible scaffolding. #3531

Remove operator-sdk new|add api commands and ansible scaffolding. #3531

Conversation

varshaprasad96 commented Jul 24, 2020 • edited Loading

Choose a reason for hiding this comment

joelanford left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

varshaprasad96 Jul 24, 2020 • edited Loading

Choose a reason for hiding this comment

camilamacedo86 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

varshaprasad96 commented Jul 24, 2020

joelanford left a comment • edited Loading

Choose a reason for hiding this comment

openshift-ci-robot commented Jul 25, 2020

varshaprasad96 commented Jul 24, 2020 •

edited

Loading

varshaprasad96 Jul 24, 2020 •

edited

Loading

joelanford left a comment •

edited

Loading