Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

treecompose: use atomic-openshift-* packages #327

Merged
merged 2 commits into from
Oct 3, 2018
Merged

treecompose: use atomic-openshift-* packages #327

merged 2 commits into from
Oct 3, 2018

Conversation

miabbott
Copy link
Member

This swaps out the use of origin-* packages for signed atomic-openshift-*packages produced by the ART team.

Currently, these are 3.11 packages, but once 4.0 versions are being produced by ART, we can switch to them.

The package diff is nicely contained:

ostree diff commit old: 0de27f731fcdedd767ea99e3b341065146b570628bf9d76d3d6837eb524550da
ostree diff commit new: fcae50fcd1c3339efbce808b29f34acce135c6e52b75c61942189666e5a9a3cb
Removed:
  origin-clients-4.0.0-0.alpha.0.9.8d6f6f3.x86_64
  origin-hyperkube-4.0.0-0.alpha.0.9.8d6f6f3.x86_64
  origin-node-4.0.0-0.alpha.0.9.8d6f6f3.x86_64
Added:
  atomic-openshift-clients-3.11.16-1.git.0.b48b8f8.el7.x86_64
  atomic-openshift-hyperkube-3.11.16-1.git.0.b48b8f8.el7.x86_64
  atomic-openshift-node-3.11.16-1.git.0.b48b8f8.el7.x86_64

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 27, 2018
@miabbott
Copy link
Member Author

Note, the original Jira ticket (COREOS-468) requested 4.0 packages, so this might have to wait until ART is generating them.

@cgwalters
Copy link
Member

Note, the original Jira ticket (COREOS-468) requested 4.0 packages, so this might have to wait until ART is generating them.

I can't say for sure but I'd be surprised if there wasn't some dependency on newer kubelet features at this point.

@ashcrow
Copy link
Member

ashcrow commented Sep 28, 2018

I can't say for sure but I'd be surprised if there wasn't some dependency on newer kubelet features at this point.

Agreed. Once @tbielawa's group is producing 4 compat packages we can make the switch. Until then origin is the closest we have.

@miabbott
Copy link
Member Author

OK I'll hold this until the 4.0 bits land.

@miabbott
Copy link
Member Author

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 28, 2018
@miabbott
generate-openshift-repo: make atomic-openshift repo
8cf1e4d 
This queries a repo file from a well known location for signed
`atomic-openshift` RPMs and drops a truncated version in the current
directory. (It drops the debug and source RPM portion of the repo)
@miabbott
host*: use signed atomic-openshift packages
a1ca417 
This replaces the `origin-*` packages with signed `atomic-openshift-*`
versions of the packages.  Notably:
  - atomic-openshift-clients
  - atomic-openshift-hyperkube
  - atomic-openshift-node
@miabbott miabbott force-pushed the atomic-openshift-pkgs branch from d75515b to a1ca417 Compare October 2, 2018 18:10
@miabbott
Copy link
Member Author

miabbott commented Oct 2, 2018

Latest commits switched to the 4.0 bits. Got the following diff:

ostree diff commit old: 16b726488bf4e58c3d4175e5f96c73eb134452f5a1bbafeb5a0a30b47918de74
ostree diff commit new: fddbbfbf295002caf84f600ad9ce2a2a06367eeb008ead90b9f1dbeffd7db00c
Upgraded:
  python-setuptools 0.9.8-7.el7 -> 17.1.1-4.el7
Removed:
  origin-clients-4.0.0-0.alpha.0.9.8d6f6f3.x86_64
  origin-hyperkube-4.0.0-0.alpha.0.9.8d6f6f3.x86_64
  origin-node-4.0.0-0.alpha.0.9.8d6f6f3.x86_64
  python-requests-2.6.0-1.el7_1.noarch
  python-urllib3-1.10.2-5.el7.noarch
Added:
  atomic-openshift-clients-4.0.0-0.7.0.git.0.d8687bf.el7.x86_64
  atomic-openshift-hyperkube-4.0.0-0.7.0.git.0.d8687bf.el7.x86_64
  atomic-openshift-node-4.0.0-0.7.0.git.0.d8687bf.el7.x86_64
  pyOpenSSL-0.13.1-3.el7.x86_64
  python-cffi-1.6.0-5.el7.x86_64
  python-enum34-1.0.4-1.el7.noarch
  python-idna-2.4-1.el7.noarch
  python-ply-3.4-11.el7.noarch
  python-pycparser-2.14-1.el7.noarch
  python2-cryptography-1.7.2-2.el7.x86_64
  python2-pyasn1-0.1.9-7.el7.noarch
  python2-pysocks-1.5.7-4.el7.noarch
  python2-requests-2.14.2-1.el7ost.noarch
  python2-urllib3-1.21.1-1.el7.noarch

So....ew, more Python?

@miabbott
Copy link
Member Author

miabbott commented Oct 3, 2018

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 3, 2018
@miabbott
Copy link
Member Author

miabbott commented Oct 3, 2018

I've warily lifted the hold...I'm curious what is dragging in all those python packages, but I don't think it would prevent this from being merged

@ashcrow
Copy link
Member

ashcrow commented Oct 3, 2018

Likely the specs for atomic-openshift-* have extra dependencies. I'm sure they were absolutely required at one point but probably are no longer required... we can help on that later :-)

@cgwalters
Copy link
Member

Offhand I'm guessing those are dependencies Ansible needs on the host, or needed at one time.

@ashcrow
Copy link
Member

ashcrow commented Oct 3, 2018

One issue is it seems to be pulling 3.x packages still.

@miabbott
Copy link
Member Author

miabbott commented Oct 3, 2018

One issue is it seems to be pulling 3.x packages still.

Added:
  atomic-openshift-clients-4.0.0-0.7.0.git.0.d8687bf.el7.x86_64
  atomic-openshift-hyperkube-4.0.0-0.7.0.git.0.d8687bf.el7.x86_64
  atomic-openshift-node-4.0.0-0.7.0.git.0.d8687bf.el7.x86_64

Looks like 4.0 to me?

@ashcrow
Copy link
Member

ashcrow commented Oct 3, 2018 •
edited
Loading

Oops, you're right. Sorry @miabbott! I read the initial and my brain didn't update for the later paste.

@ashcrow
Copy link
Member

ashcrow commented Oct 3, 2018

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 3, 2018
@openshift-merge-robot openshift-merge-robot merged commit e3c1b1d into openshift:master Oct 3, 2018
@wking wking mentioned this pull request Oct 4, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ashcrow ashcrow ashcrow approved these changes

@cgwalters cgwalters Awaiting requested review from cgwalters

@dm0- dm0- Awaiting requested review from dm0-

Assignees

@ashcrow ashcrow

Labels
lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@miabbott @cgwalters @ashcrow @openshift-ci-robot @openshift-merge-robot