Skip to content
This repository has been archived by the owner on Jun 13, 2024. It is now read-only.

Check for missing commits vs devel #49

Closed
gundalow opened this issue Mar 9, 2020 · 13 comments
Closed

Check for missing commits vs devel #49

gundalow opened this issue Mar 9, 2020 · 13 comments
Labels
type/bug Something isn't working

Comments

@gundalow
Copy link
Contributor

gundalow commented Mar 9, 2020

SUMMARY

The "Big Migration" has now taken place.

As this collection already exists, we need to carefully check to see if any further commits went into devel since this repo was created.

Please check the contents of https://github.com/ansible-collection-migration/community.kubernetes against this repo

ISSUE TYPE
  • Bug Report
@geerlingguy
Copy link
Collaborator

@gundalow - Just noting that this repo has also had some commits since it was forked out of devel, but I believe 4b6fdb1 is where we could do a one-by-one diff of the relevant files. I'll work on that today. I tried to make sure none of the PRs against ansible/ansible tagged with k8s were unaccounted for here but I could've missed something!

@gundalow
Copy link
Contributor Author

gundalow commented Mar 9, 2020

Clarification:

  • Please do a per-file level diff against every file in the ansible-collection-migration repo and this one
  • Pay care to files added and removed.
  • During the last two weeks there have been lots of fixes, especially around and tests, dependencies, and new collection features e.g. meta/action_groups.yml

@geerlingguy
Copy link
Collaborator

git remote add -f migrated_repo https://github.com/ansible-collection-migration/community.kubernetes.git
git remote update
git diff master remotes/migrated_repo/master
git remote rm migrated_repo

Here's the output from a one-for-one diff of the two repos (from this repo):

full-diff.txt

@geerlingguy
Copy link
Collaborator

geerlingguy commented Mar 9, 2020

File-by-file breakdown:

  • Punted (new file) meta/action_groups.yml - New file, not sure what this is for?
  • Noop (new file) meta/routing.yml - New file, not sure what this is for?
  • Fixed (missing) plugins/connection/kubectl.py - This is not in the auto-migrated collection - opened follow-up issues
  • Fixed plugins/doc_fragments/k8s_auth_options.py - new param persist_config... will need to investigate (from k8s: persist refreshed tokens ansible/ansible#63219)
  • Fixed plugins/doc_fragments/k8s_scale_options.py - a required: True was missing, we fixed that I believe to match argspec
  • Fixed plugins/inventory/k8s.py - NAME is different (FQCN)
  • Fixed plugins/inventory/openshift.py
    • Import line looks wrong in this repo's copy
    • NAME is different (FQCN)
  • Fixed plugins/lookup/k8s.py
    • Some quoting differences.
    • Removal of 'version_added' line.
  • TODO plugins/lookup/openshift.py - this file doesn't exist in this collection...
  • Fixed plugins/module_utils/common.py - missing new var persist_config in argspec and in load_kube_config calls (from k8s: persist refreshed tokens ansible/ansible#63219)
  • Fixed plugins/module_utils/raw.py
  • Fixed plugins/modules/k8s.py
    • remove all the 'version_added' strings?
    • c(type) changed to C(type)
    • Ignore An instance of default: True was changed to default: no in suboptions docs...
    • Example 'Create a Service object by reading the definition from a file' was removed
    • Many examples were changed to add a | from_yaml filter (from Fix examples to use from_yaml filter with lookup ansible/ansible#65424)
  • Fixed plugins/modules/k8s_auth.py - version_added was removed
  • Noop plugins/modules/k8s_exec.py - was added to this project, not upstream
  • Noop plugins/modules/k8s_facts.py - not in this project (was deprecated alias to k8s_info)
  • Fixed plugins/modules/k8s_info.py - version_added was removed
  • Noop plugins/modules/k8s_log.py - was added to this project, not upstream
  • Noop plugins/modules/k8s_raw.py - not in this project (was deprecated alias to k8s)
  • Fixed plugins/modules/k8s_scale.py - version_added was removed
  • Fixed plugins/modules/k8s_service.py - version_added was removed
  • Noop plugins/modules/openshift_raw.py - not in this project (was deprecated alias to k8s)
  • Noop plugins/modules/openshift_scale.py - not in this project (was deprecated alias to k8s_scale)

All the other changes are inconsequential (e.g. test changes, fixes we've done in this repo to whittle down the sanity check ignore lists) and/or related to naming (e.g. modules being in plugins/k8s instead of plugins).

@geerlingguy
Copy link
Collaborator

For the missing file, that was a mistake on my part, I forgot to route kubectl.py to this collection so it was dumped into community.general. I've opened two follow-up issues to fix it:

@geerlingguy
Copy link
Collaborator

geerlingguy commented Mar 9, 2020

Three fixes didn't make their way into this collection's code:

@geerlingguy geerlingguy added the type/bug Something isn't working label Mar 12, 2020
@geerlingguy
Copy link
Collaborator

I'm going to try to get the rests of these fixes in today.

@geerlingguy
Copy link
Collaborator

I created the above three PRs with commits attributed to the original authors, once tests pass I'll merge them in order. It seems like they will not conflict in any way so it should just be a matter of waiting for all of them to pass.

Note that #55 and #56 at least (not sure about #54) were slated for 2.10, so if we add the change to the 0.9.x release series it would be a feature addition that would likely wind up in Ansible 2.10/ACD. I'm okay with that as it doesn't seem to be a breaking change... but just wanted to point that out.

The first ACD release could be a bit of a wild ride, at least for any modules that are actively maintained between now and it's release day...

@geerlingguy
Copy link
Collaborator

Those three PRs are in, but I'm going to have to pause the fixing of the rest of the minor changes (mostly taking out version_added since that's not relevant in this collection anymore...).

@geerlingguy
Copy link
Collaborator

I'm not going to add action_groups.yml for now; see #58 for follow-up.

@geerlingguy
Copy link
Collaborator

Not going to touch the routing.yml file for now either. Not sure if any of that is required since this collection is not going to support deprecated modules.

@geerlingguy
Copy link
Collaborator

PR with final fixes for this issue: #59

@geerlingguy
Copy link
Collaborator

Final fixes are in; other issues are broken out (and not blocking further releases of this collection), so I'm going to close this issue now.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
type/bug Something isn't working
Projects
None yet
Development

No branches or pull requests

2 participants