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.

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

images: enrich metalk8s-utils image #2374

Merged
merged 1 commit into from
Apr 7, 2020
Merged

Conversation

NicolasT
Copy link
Contributor

@NicolasT NicolasT commented Apr 6, 2020

This patch extends the metalk8s-utils Dockerfile to add a bunch of
packages (and make some related changes):

  • The Kubernetes and SaltStack repositories are enabled in the image

  • No longer override the entrypoint

  • Fail when a given package (name) doesn't exist

  • Add the following packages to the image:

    • bash-completion
    • bash-completion-extras
    • bzip2
    • conntrack-tools
    • cri-tools, for crictl
    • e2fsprogs
    • ebtables
    • etcd, for etcdctl
    • ethtool
    • gdb
    • git
    • htop
    • httpd-tools, for htpasswd (see Adding a new user should not require to fetch and deploy new packages #2352)
    • iotop
    • iperf3 (next to iperf which was already installed)
    • ipset
    • iptables
    • ipvsadm
    • jnettop
    • jq
    • kubectl (pinned to the version of Kubernetes this MetalK8s release ships with)
    • less
    • lsof
    • ltrace
    • lvm2
    • net-tools
    • nethogs
    • nmap
    • nmap-ncat, for nc
    • openssh-clients
    • openssh-server
    • openssl, for its CLI interface
    • parted
    • perf
    • rsync
    • salt-master, for salt and salt-run
    • salt-minion, for salt-call
    • strace
    • sysstat
    • tcpdump
    • util-linux, for nsenter and others
    • vim
    • wget
    • wireshark, for tshark
    • xfsprogs

This resolves #2156 to a great extent. However, documentation on how to
use the image is still lacking, as well as some of the tools referred to
in the ticket, for which no upstream packages are available.

See: #2156
See: #2352

@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2020

Hello nicolast,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@NicolasT NicolasT force-pushed the improvement/more-utils branch 3 times, most recently from 8b506ac to 88dbf2f Compare April 6, 2020 21:35
This patch extends the `metalk8s-utils` `Dockerfile` to add a bunch of
packages (and make some related changes):

- The Kubernetes and SaltStack repositories are enabled in the image
- No longer override the entrypoint
- Fail when a given package (name) doesn't exist
- Add the following packages to the image:

  * `bash-completion`
  * `bash-completion-extras`
  * `bzip2`
  * `conntrack-tools`
  * `cri-tools`, for `crictl`
  * `e2fsprogs`
  * `ebtables`
  * `etcd`, for `etcdctl`
  * `ethtool`
  * `gdb`
  * `git`
  * `htop`
  * `httpd-tools`, for `htpasswd` (see #2352)
  * `iotop`
  * `iperf3` (next to `iperf` which was already installed)
  * `ipset`
  * `iptables`
  * `ipvsadm`
  * `jnettop`
  * `jq`
  * `kubectl` (pinned to the version of Kubernetes this MetalK8s release
    ships with)
  * `less`
  * `lsof`
  * `ltrace`
  * `lvm2`
  * `net-tools`
  * `nethogs`
  * `nmap`
  * `nmap-ncat`, for `nc`
  * `openssh-clients`
  * `openssh-server`
  * `openssl`, for its CLI interface
  * `parted`
  * `perf`
  * `rsync`
  * `salt-master`, for `salt` and `salt-run`
  * `salt-minion`, for `salt-call`
  * `strace`
  * `sysstat`
  * `tcpdump`
  * `util-linux`, for `nsenter` and others
  * `vim`
  * `wget`
  * `wireshark`, for `tshark`
  * `xfsprogs`

This resolves #2156 to a great extent. However, documentation on how to
use the image is still lacking, as well as some of the tools referred to
in the ticket, for which no upstream packages are available.

See: #2156
See: #2352
@NicolasT NicolasT marked this pull request as ready for review April 6, 2020 21:40
@NicolasT NicolasT requested a review from a team as a code owner April 6, 2020 21:40
@NicolasT
Copy link
Contributor Author

NicolasT commented Apr 6, 2020

@bert-e approve

@bert-e
Copy link
Contributor

bert-e commented Apr 6, 2020

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2020

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.6

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Apr 7, 2020

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.6

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5

Please check the status of the associated issue None.

Goodbye nicolast.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Extend metalk8s-utils image content
3 participants