summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #9842 from AlbanBedel/play-kube-env-from-secretsOpenShift Merge Robot2021-03-29
|\ | | | | Add support for env from secrets in play kube
| * play kube: add support for env vars defined from secretsAlban Bedel2021-03-28
| | | | | | | | | | | | | | | | | | | | Add support for secretRef and secretKeyRef to allow env vars to be set from a secret. As K8S secrets are dictionaries the secret value must be a JSON dictionary compatible with the data field of a K8S secret object. The keys must consist of alphanumeric characters, '-', '_' or '.', and the values must be base64 encoded strings. Signed-off-by: Alban Bedel <albeu@free.fr>
| * play kube: support optional/mandatory env var from config mapAlban Bedel2021-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | In K8S the pod creation fails if an env var reference a non existing config map key. It can be marked as optional, but per default it is mandatory. Podman on the other hand always treat such references as optional. Rework envVarsFrom() and envVarValue() to additionaly return an error and add support for the optional attribute in configMapRef and configMapKeyRef. Signed-off-by: Alban Bedel <albeu@free.fr>
| * play kube: prepare supporting other env source than config mapsAlban Bedel2021-03-28
| | | | | | | | | | | | | | | | | | | | | | Rework envVarsFromConfigMap() and envVarValue() to simplify supporting other env sources than config maps. For this we pass the whole spec generator options struct as parameter instead of just the config maps list. Then we rename envVarsFromConfigMap() to envVarsFrom() and in envVarValue() we reposition the loop over the config maps to only run it when a configMapRef element exists. Signed-off-by: Alban Bedel <albeu@free.fr>
* | Merge pull request #9858 from rhatdan/warnOpenShift Merge Robot2021-03-29
|\ \ | | | | | | [NO TESTS NEEDED] Drop Warning to Info, if cgroups not mounted
| * | [NO TESTS NEEDED] Drop Warning to Info, if cgroups not mountedDaniel J Walsh2021-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If I run podman within a container without /sys/fs/cgroups mounted, we get this warning, which the user can not do much about. I don't see a reason for requiring this warning to show by default, so we should drop it to Info. User can not do anything about it either, and code works well with the somewhat expected error. Helps fix: https://github.com/containers/podman/issues/9753 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9861 from TristanCacqueray/version-swaggerOpenShift Merge Robot2021-03-29
|\ \ \ | | | | | | | | [CI:DOCS] swagger: update system version response body
| * | | swagger: update system version response bodyTristan Cacqueray2021-03-29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This change updates the swagger documentation of the system version response body to match the actual response. Fixes: #9522 Signed-off-by: Tristan Cacqueray <tdecacqu@redhat.com>
* | | Merge pull request #9862 from edsantiago/bud_reenable_pull_neverOpenShift Merge Robot2021-03-29
|\ \ \ | | | | | | | | buildah-bud tests: reenable pull-never test
| * | | buildah-bud tests: reenable pull-never testEd Santiago2021-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #9573 (podman build --pull-never is a NOP) is fixed. Remove the 'skip' in the buildah-bud pull-never test. Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | Merge pull request #9307 from Luap99/powershell-completionOpenShift Merge Robot2021-03-29
|\ \ \ \ | | | | | | | | | | Add powershell completions
| * | | | Add powershell completionsPaul Holzinger2021-03-29
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for generating powershell completion files. This is especially useful for people using the podman remote client on windows. [NO TESTS NEEDED] Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | Merge pull request #9856 from Luap99/fix-longflagOpenShift Merge Robot2021-03-29
|\ \ \ \ | | | | | | | | | | [CI:DOCS] Fix long option format on docs.podman.io
| * | | | Fix long option format on docs.podman.ioPaul Holzinger2021-03-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Escape the two dashes, otherwise they are combined into one long dash. I tested that this change is safe and still renders correctly on github and with the man pages. This commit also contains a small change to make it build locally. Assuming you have the dependencies installed you can do: ``` cd docs make html ``` Preview the html files in docs/build/html with `python -m http.server 8000 --directory build/html`. Fixes containers/podman.io#373 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #9857 from edsantiago/batsOpenShift Merge Robot2021-03-29
|\ \ \ \ \ | | | | | | | | | | | | system tests: friendier messages for 2-arg is()
| * | | | | system tests: friendier messages for 2-arg is()Ed Santiago2021-03-29
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'is' check was intended to be called with three arguments, the last one being a nice helpful test name. There's a fallback for two-argument calls, but it was a horrible FIXME. New fallback: the most recently run podman command. We keep track of it in each run_podman() invocation. This is not ideal, because it's theoretically possible to invoke 'is' on something other than the output of run_podman, but this at least fixes the by-far-most-common case. [NO TESTS NEEDED] Signed-off-by: Ed Santiago <santiago@redhat.com>
* | | | | Merge pull request #9848 from Luap99/fix-9776OpenShift Merge Robot2021-03-29
|\ \ \ \ \ | | | | | | | | | | | | podman generate systemd --new do not duplicate params
| * | | | | podman generate systemd --new do not duplicate paramsPaul Holzinger2021-03-28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | podman generate systemd --new inserts extra idfile arguments. The generated unit can break when the user did provide their own idfile arguments as they overwrite the arguments added by generate systemd. This also happens when a user tries to generate the systemd unit on a container already create with a --new unit. This should now create a identical unit. The solution is to remove all user provided idfile arguments. This commit also ensures that we do not remove arguments that are part off the containers entrypoint. Fixes #9776 Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
* | | | | Merge pull request #9844 from afbjorklund/qemu-kvmOpenShift Merge Robot2021-03-29
|\ \ \ \ \ | |_|_|/ / |/| | | | Add machine support for more Linux distros
| * | | | Add machine support for more Linux distrosAnders F Björklund2021-03-28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no regression tests for machine [NO TESTS NEEDED] Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
* | | | Merge pull request #9631 from rhatdan/pullOpenShift Merge Robot2021-03-29
|\ \ \ \ | |_|/ / |/| | | Fix podman build --pull-never
| * | | Fix podman build --pull-neverDaniel J Walsh2021-03-27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently pull policy is set incorrectly when users set --pull-never. Also pull-policy is not being translated correctly when using podman-remote. Fixes: #9573 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9854 from vrothberg/fix-9853OpenShift Merge Robot2021-03-29
|\ \ \ \ | | | | | | | | | | [CI:DOCS] man pages: correct seccomp-policy label
| * | | | man pages: correct seccomp-policy labelValentin Rothberg2021-03-29
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation uses `io.containers.seccomp.profile` while the docs mentioned `io.podman`. Correct the two references in the docs to reflect the implementation. Fixes: #9853 Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
* | | | Merge pull request #9829 from rhatdan/rmiOpenShift Merge Robot2021-03-28
|\ \ \ \ | |_|/ / |/| | | [NO TESTS NEEDED] Use same function podman-remote rmi as podman
| * | | [NO TESTS NEEDED] Use same function podman-remote rmi as podmanDaniel J Walsh2021-03-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure fixes that go into local podman commands also work in podman-remote, by using the same function. Since this is just a rewrite of existing code, existing tests should handle it. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9467 from rhatdan/buildahOpenShift Merge Robot2021-03-28
|\ \ \ \ | | | | | | | | | | [NO TESTS NEEDED] Turn on podman-remote build --isolation
| * | | | [NO TESTS NEEDED] Turn on podman-remote build --isolationDaniel J Walsh2021-03-26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently podman only works with --isolation chroot. This PR fixes this by allowing the isolation mode to default to OCI and to also allow users to pass the isolation mode into the containers. The current tests for --isolation should cause this code to be tested. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9836 from baude/vmcreateresizeOpenShift Merge Robot2021-03-28
|\ \ \ \ | |_|/ / |/| | | Podman machine enhancements
| * | | Podman machine enhancementsbaude2021-03-27
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Podman machine remove is now called `rm`. Podman machine create now supports resizing the image to the value of --disk-size as provided. The default is to 10G. Added systemd unit file on guest via ignition that sends a Ready message to the host over a virtio-socket so that we know when the VM is booted and ready for use. Podman machine commands no longer require a VM name as an argument. A default VM name is defined and if no VM name is provided as a arg, the default will be used. [NO TESTS NEEDED] Signed-off-by: baude <bbaude@redhat.com>
* | | Merge pull request #9838 from xordspar0/kubeVolumeErrorsOpenShift Merge Robot2021-03-28
|\ \ \ | |/ / |/| | Add problematic volume name to kube play error messages
| * | Add problematic volume name to kube play error messagesJordan Christiansen2021-03-27
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When kube play fails to create a volume, it should say which volume had the problem so the user doesn't have to guess. For the following pod spec: apiVersion: v1 kind: Pod metadata: name: mypod spec: containers: - name: myfrontend image: nginx volumeMounts: - mountPath: "/var/www/html" name: mypd volumes: - name: mypd hostPath: path: /var/blah podman will now report: Error: failed to create volume "mypd": error in parsing HostPath in YAML: error checking path "/var/blah": stat /var/blah: no such file or directory Signed-off-by: Jordan Christiansen <xordspar0@gmail.com>
* | Merge pull request #9822 from jmguzik/fix-pods-list-filters-http-apiOpenShift Merge Robot2021-03-27
|\ \ | | | | | | Fix list pods filter handling in libpod api
| * | Fix list pods filter handling in libpod apiJakub Guzik2021-03-26
| | | | | | | | | | | | Signed-off-by: Jakub Guzik <jakubmguzik@gmail.com>
* | | Merge pull request #9835 from ntkme/check-userns-supportOpenShift Merge Robot2021-03-27
|\ \ \ | |_|/ |/| | [NO TESTS NEEDED] Fix for kernel without CONFIG_USER_NS
| * | [NO TESTS NEEDED] Fix for kernel without CONFIG_USER_NSなつき2021-03-26
|/ / | | | | Signed-off-by: Natsuki <i@ntk.me>
* | Merge pull request #9833 from rhatdan/resizeOpenShift Merge Robot2021-03-27
|\ \ | | | | | | Remove resize race condition
| * | Remove resize race conditionDaniel J Walsh2021-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since podman-remote resize requests can come in at random times, this generates a real potential for race conditions. We should only be attempting to resize TTY on running containers, but the containers can go from running to stopped at any time, and returning an error to the caller is just causing noice. This change will basically ignore requests to resize terminals if the container is not running and return the caller to success. All other callers will still return failure. Fixes: https://github.com/containers/podman/issues/9831 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9821 from rhatdan/VENDOROpenShift Merge Robot2021-03-26
|\ \ \ | |/ / |/| | [NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
| * | [NO TESTS NEEDED] Vendor in containers/buildah v1.20.0Daniel J Walsh2021-03-26
| | | | | | | | | | | | Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #9832 from rhatdan/commitOpenShift Merge Robot2021-03-26
|\ \ \ | | | | | | | | Use TMPDIR when commiting images
| * | | Use TMPDIR when commiting imagesDaniel J Walsh2021-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: https://github.com/containers/podman/issues/9825 Currently we are using TMPDIR for storaing temporary files when building images, but not when you directly commit the images. This change simply uses the TMPDIR environment variable if set to store temporary files. Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | | Merge pull request #9726 from tunacado/add_runroot_mount_require_to_systemd_genOpenShift Merge Robot2021-03-26
|\ \ \ \ | |_|/ / |/| | | Add RequiresMountsFor= to systemd generate
| * | | Add RequiresMountsFor= to systemd generateRobb Manes2021-03-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is rare but possible that storage locations for the graphroot and the runroot are not mounted at boot time, and therefore might race when doing container operations. An example we've seen in the wild is that a slow tmpfs mount for the runroot would suddenly mount over /run, causing the container to lose all currently-running data, requiring a system refresh to get it back. This patch adds RequiresMountsFor= to the systemd.unit header to ensure the paths for both the graphroot and runroot are mounted prior to starting any generated unit files. Signed-off-by: Robb Manes <rmanes@redhat.com>
* | | | Merge pull request #9826 from ↵OpenShift Merge Robot2021-03-26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/vbauerster/mpb/v6-6.0.3 Bump github.com/vbauerster/mpb/v6 from 6.0.2 to 6.0.3
| * | | | Bump github.com/vbauerster/mpb/v6 from 6.0.2 to 6.0.3dependabot[bot]2021-03-26
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/vbauerster/mpb/v6](https://github.com/vbauerster/mpb) from 6.0.2 to 6.0.3. - [Release notes](https://github.com/vbauerster/mpb/releases) - [Commits](https://github.com/vbauerster/mpb/compare/v6.0.2...v6.0.3) Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #9820 from ashley-cui/machineinitOpenShift Merge Robot2021-03-26
|\ \ \ \ | | | | | | | | | | [NO TESTS NEEDED] Rename podman machine create to init and clean up
| * | | | Rename podman machine create to init and clean upAshley Cui2021-03-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename podman machine create to init because we're initing a VM, not really creating it Wire up CPUs flag Suppress QEMU GUI from popping up when not in debug mode [NO TESTS NEEDED] Signed-off-by: Ashley Cui <acui@redhat.com>
* | | | | Merge pull request #9782 from afbjorklund/terminal-getsizeOpenShift Merge Robot2021-03-26
|\ \ \ \ \ | |_|/ / / |/| | | | [NO TESTS NEEDED] Fix swapped dimensions from terminal.GetSize
| * | | | Fix swapped dimensions from terminal.GetSizeAnders F Björklund2021-03-26
|/ / / / | | | | | | | | | | | | Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>