summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Merge pull request #13489 from Luap99/k8sOpenShift Merge Robot2022-03-16
|\ | | | | move k8s deps into podman
| * pkg/k8s.io: add small readme with copyright noticePaul Holzinger2022-03-15
| | | | | | | | Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * pkg/k8s.io/api/core/v1: remove unneeded typesPaul Holzinger2022-03-15
| | | | | | | | | | | | | | | | Remove types that are not applicable for podman. This are types I do not think we need, there is definitely more that could be removed but this should be handled by someone who knows the k8s code better than me. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * pkg/k8s.io/...: remove more unneeded filesPaul Holzinger2022-03-15
| | | | | | | | | | | | We do not use the types defined in these fields. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * pkg/k8s.io/...: remove protobuf field tagsPaul Holzinger2022-03-15
| | | | | | | | | | | | | | | | | | | | | | Since we do not use protobuf we can remove these field tags. This will save some KB in the final binary size. This change was automated with the following commands: find pkg/k8s.io/ -type f -name "*.go" -exec sed -i -e 's/\sprotobuf\:\".*\"//g' {} + find pkg/k8s.io/ -type f -name "*.go" -exec sed -i -e 's/\s`protobuf\:\".*\"`//g' {} + Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * pkg/k8s.io/...: fix lint errorsPaul Holzinger2022-03-15
| | | | | | | | | | | | | | | | | | | | | | Fix linting errors. We use different/stricter linters, instead of skipping these packages we should fix it. Most errors are about naming conventions, since I do not want to change the names I added the nolint comment there. I also removed some unused fields where the linter complained. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * remove unneeded k8s codePaul Holzinger2022-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is a lot of unneeded code, k8s is the by far the biggest dependency in podman. We should remove as much as possible so that we only have the stuff left that we use. This is just a quick skim over the code which removes a lot of the generated code and many packages that are now unused. I know that this will be impossible to properly review. I will try to make smaller changes in follow up work. Right now this reduces about 8 MB in binary size!!! [NO NEW TESTS NEEDED] Hopefully existing tests will catch any problems. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * move k8s deps into podmanPaul Holzinger2022-03-15
| | | | | | | | | | | | | | | | We only need a small part of the k8s dependencies but they are the biggest dependencies in podman by far. Moving them into podman allows us to remove the unnecessary parts. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #13519 from Luap99/version-newlineOpenShift Merge Robot2022-03-16
|\ \ | | | | | | fix empty newline in version output
| * | fix empty newline in version outputPaul Holzinger2022-03-15
|/ / | | | | | | | | | | | | | | | | | | | | | | | | When podman is build without git commit information it will print a empty newline instead. This is undesirable and a regression introduced in commit 7d22cc88ef38. To test build podman with `go build -mod=vendor -o bin/podman ./cmd/podman` and check the output of bin/podman version with and without this commit. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #13514 from Luap99/bindingsOpenShift Merge Robot2022-03-15
|\ \ | | | | | | fix breaking change in pkg/bindings
| * | Fix windows win-sshproxy buildPaul Holzinger2022-03-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | Github no longer supports the unauthenticated git protocol, so switch to using https instead. https://github.blog/2021-09-01-improving-git-protocol-security-github/ Signed-off-by: Paul Holzinger <pholzing@redhat.com>
| * | fix breaking change in pkg/bindingsPaul Holzinger2022-03-15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | pkg/bindings is considered stable. We cannot make changes that would break any users. If someone uses this field their code would fail to compile. Since the fix is obviously correct we will keep it but also add the old field back in to keep compatibility with old code. When both fields are set ImportArchive is preferred over ImportAchive. Fixes changes from commit 217197340c8f [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | Merge pull request #13512 from ↵OpenShift Merge Robot2022-03-15
|\ \ | | | | | | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.13incompatible Bump github.com/docker/docker from 20.10.12+incompatible to 20.10.13+incompatible
| * | Bump github.com/docker/dockerdependabot[bot]2022-03-15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.12+incompatible to 20.10.13+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.12...v20.10.13) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #13513 from ↵OpenShift Merge Robot2022-03-15
|\ \ | |/ |/| | | | | containers/dependabot/go_modules/github.com/spf13/cobra-1.4.0 Bump github.com/spf13/cobra from 1.3.0 to 1.4.0
| * Bump github.com/spf13/cobra from 1.3.0 to 1.4.0dependabot[bot]2022-03-15
|/ | | | | | | | | | | | | | | Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/spf13/cobra/releases) - [Changelog](https://github.com/spf13/cobra/blob/master/CHANGELOG.md) - [Commits](https://github.com/spf13/cobra/compare/v1.3.0...v1.4.0) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* Merge pull request #13238 from lsm5/e2e-aardvarkOpenShift Merge Robot2022-03-15
|\ | | | | test/e2e: add aardvark specific tests
| * test/e2e: add aardvark specific testsLokesh Mandvekar2022-03-08
| | | | | | | | | | Co-authored-by: Brent Baude <bbaude@redhat.com> Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | Merge pull request #13498 from flouthoc/podman-vendor-buildahOpenShift Merge Robot2022-03-15
|\ \ | | | | | | vendor: update `c/buildah`, `c/image` and `c/storage`
| * | apply-podman-deltas: skip modified test case for --add-host which adds anomalyAditya R2022-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All podman tests in CI expects exit code 125, which might not be true since exit code from runtime is relayed as it is without any modification both in `buildah` and `podman`. Following behviour is seen when PR https://github.com/containers/buildah/pull/3809 added a test here https://github.com/containers/buildah/blob/main/tests/bud.bats#L3183 which relays exit code from runtime as it is, in case of both `podman` and `buildah`. However apart from this test case no other test case was able to trigger this behviour hence marking this test as an anomaly. Since its debatable if we should override this returned error number or not hence adding a note here. Signed-off-by: Aditya R <arajan@redhat.com>
| * | docs: podman-build add --no-hostsAditya R2022-03-14
| | | | | | | | | | | | | | | | | | | | | Add newly added `--no-hosts` to build docs and document its conflicting nature with `--add-host` Signed-off-by: Aditya R <arajan@redhat.com>
| * | vendor: bump buildah, c/image and c/storageAditya R2022-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps c/buildah to -> `v1.24.3-0.20220310160415-5ec70bf01ea5` c/storage to -> `v1.38.3-0.20220308085612-93ce26691863` c/image to -> `v5.20.1-0.20220310094651-0d8056ee346f` Signed-off-by: Aditya R <arajan@redhat.com>
* | | Merge pull request #13485 from Luap99/ipv6-slirpOpenShift Merge Robot2022-03-14
|\ \ \ | | | | | | | | slirp: fix setup on ipv6 disabled systems
| * | | slirp: fix setup on ipv6 disabled systemsPaul Holzinger2022-03-14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When enable_ipv6=true is set for slirp4netns (default since podman v4), we will try to set the accept sysctl. This sysctl will not exist on systems that have ipv6 disabled. In this case we should not error and just ignore the extra ipv6 setup. Also the current logic to wait for the slirp4 setup was kinda broken, it did not actually wait until the sysctl was set before starting slirp. This should now be fixed by using two `sync.WaitGroup`s. [NO NEW TESTS NEEDED] Fixes #13388 Signed-off-by: Paul Holzinger <pholzing@redhat.com>
* | | | Merge pull request #13499 from rst0git/fix-typoOpenShift Merge Robot2022-03-14
|\ \ \ \ | |/ / / |/| | | Fix typo
| * | | Fix typoRadostin Stoyanov2022-03-14
| |/ / | | | | | | | | | | | | | | | [NO NEW TESTS NEEDED] Signed-off-by: Radostin Stoyanov <rstoyanov@fedoraproject.org>
* | | Merge pull request #13221 from LStandman/mainOpenShift Merge Robot2022-03-14
|\ \ \ | |/ / |/| | Add support for --chrootdirs
| * | Add support for --chrootdirsLStandman2022-03-14
|/ / | | | | | | Signed-off-by: LStandman <65296484+LStandman@users.noreply.github.com>
* | Merge pull request #13481 from PascalBourdier/golang-1.17OpenShift Merge Robot2022-03-13
|\ \ | | | | | | Bump golang to 1.17
| * | Bump golang to 1.17 in `vendor-in-container`Pascal Bourdier2022-03-11
| | | | | | | | | | | | | | | | | | Go 1.17 compiler got faster Signed-off-by: Pascal Bourdier <pascal.bourdier@gmail.com>
* | | Merge pull request #13494 from n1hility/fix-ttyOpenShift Merge Robot2022-03-13
|\ \ \ | | | | | | | | Fixes TTY & resizing on Mac and Windows
| * | | Fixes TTY & resizing on Mac and WindowsJason T. Greene2022-03-12
| | | | | | | | | | | | | | | | Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
* | | | Merge pull request #13486 from lsm5/copr-auto-build-rhel-8OpenShift Merge Robot2022-03-13
|\ \ \ \ | |/ / / |/| | | podman.spec.rpkg: enable rhel8 builds on copr
| * | | podman.spec.rpkg: enable rhel8 builds on coprLokesh Mandvekar2022-03-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix conditionals and buildtags to enable rhel8 builds [NO NEW TESTS NEEDED] Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
* | | | Merge pull request #13483 from ↵OpenShift Merge Robot2022-03-11
|\ \ \ \ | |/ / / |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/spf13/cobra-1.4.0 Bump github.com/spf13/cobra from 1.3.0 to 1.4.0
| * | | Bump github.com/spf13/cobra from 1.3.0 to 1.4.0dependabot[bot]2022-03-11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/spf13/cobra](https://github.com/spf13/cobra) from 1.3.0 to 1.4.0. - [Release notes](https://github.com/spf13/cobra/releases) - [Changelog](https://github.com/spf13/cobra/blob/master/CHANGELOG.md) - [Commits](https://github.com/spf13/cobra/compare/v1.3.0...v1.4.0) --- updated-dependencies: - dependency-name: github.com/spf13/cobra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #13484 from ↵OpenShift Merge Robot2022-03-11
|\ \ \ | |/ / |/| | | | | | | | containers/dependabot/go_modules/github.com/docker/docker-20.10.13incompatible Bump github.com/docker/docker from 20.10.12+incompatible to 20.10.13+incompatible
| * | Bump github.com/docker/dockerdependabot[bot]2022-03-11
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.12+incompatible to 20.10.13+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Changelog](https://github.com/moby/moby/blob/master/CHANGELOG.md) - [Commits](https://github.com/docker/docker/compare/v20.10.12...v20.10.13) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | Merge pull request #13445 from rhatdan/annotationOpenShift Merge Robot2022-03-10
|\ \ | | | | | | Add podman play kube --annotation
| * | Add podman play kube --annotationDaniel J Walsh2022-03-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow users to add annotions in the podman play kube command. This PR Also fixes the fact that annotations in the pod spec were not being passed down to containers. Fixes: https://github.com/containers/podman/issues/12968 Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
* | | Merge pull request #13440 from eriksjolund/remove_web_tab_numberOpenShift Merge Robot2022-03-10
|\ \ \ | | | | | | | | [CI:DOCS] Remove "(1)" from web tab text
| * | | [CI:DOCS] Remove "(1)" from web tab textErik Sjölund2022-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove the ending text "(1)" to avoid it from being displayed in the web tab title for a command man page on the web. Often such a text indicates that a web page got an update. For instance GitHub issues shows the number of new comments that have been written after the user's last visit. Fixes #13438 Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | Merge pull request #13475 from PascalBourdier/golangci-lint-install-fixOpenShift Merge Robot2022-03-10
|\ \ \ \ | | | | | | | | | | CI: fix golangci-lint installation
| * | | | CI: fix golangci-lint installationPascal Bourdier2022-03-10
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avoid this warn: ``` golangci/golangci-lint info installed ./bin/golangci-lint golangci/golangci-lint err this script is deprecated, please do not use it anymore. check https://github.com/goreleaser/godownloader/issues/207 ``` Signed-off-by: Pascal Bourdier <pascal.bourdier@gmail.com>
* | | | Merge pull request #13477 from ↵OpenShift Merge Robot2022-03-10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | containers/dependabot/go_modules/github.com/containernetworking/plugins-1.1.1 Bump github.com/containernetworking/plugins from 1.1.0 to 1.1.1
| * | | | Bump github.com/containernetworking/plugins from 1.1.0 to 1.1.1dependabot[bot]2022-03-10
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/containernetworking/plugins](https://github.com/containernetworking/plugins) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/containernetworking/plugins/releases) - [Commits](https://github.com/containernetworking/plugins/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: github.com/containernetworking/plugins dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
* | | | Merge pull request #13476 from ↵OpenShift Merge Robot2022-03-10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | containers/dependabot/go_modules/github.com/vbauerster/mpb/v7-7.4.1 Bump github.com/vbauerster/mpb/v7 from 7.3.2 to 7.4.1
| * | | Bump github.com/vbauerster/mpb/v7 from 7.3.2 to 7.4.1dependabot[bot]2022-03-10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [github.com/vbauerster/mpb/v7](https://github.com/vbauerster/mpb) from 7.3.2 to 7.4.1. - [Release notes](https://github.com/vbauerster/mpb/releases) - [Commits](https://github.com/vbauerster/mpb/compare/v7.3.2...v7.4.1) --- updated-dependencies: - dependency-name: github.com/vbauerster/mpb/v7 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>
* | | Merge pull request #12913 from rhatdan/kubeOpenShift Merge Robot2022-03-09
|\ \ \ | | | | | | | | Add --context-dir option to podman play kube