github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-06 03:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #81008 from bclau/test-images/agnhost-enhancements

Browse Source 
test images: Adds version and bind-tools to agnhost
This commit is contained in:
Kubernetes Prow Robot
2019-08-17 02:42:07 -07:00
committed by GitHub
parent d2b553045a 103498f538
commit fb64b76036
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/images/agnhost/Dockerfile
View File

@@ -22,7 +22,7 @@ CROSS_BUILD_COPY qemu-QEMUARCH-static /usr/bin/
# - iproute2: includes ss used in NodePort tests # - iproute2: includes ss used in NodePort tests
# from iperf image # from iperf image
# install necessary packages: iperf, bash # install necessary packages: iperf, bash
RUN apk --update add curl netcat-openbsd iproute2 iperf bash && rm -rf /var/cache/apk/* \ RUN apk --update add bind-tools curl netcat-openbsd iproute2 iperf bash && rm -rf /var/cache/apk/* \
&& ln -s /usr/bin/iperf /usr/local/bin/iperf \ && ln -s /usr/bin/iperf /usr/local/bin/iperf \
&& ls -altrh /usr/local/bin/iperf && ls -altrh /usr/local/bin/iperf

9
test/images/agnhost/README.md
View File

@@ -15,6 +15,15 @@ word of the words agnostic and host.
The image was created for testing purposes, reducing the need for having different test The image was created for testing purposes, reducing the need for having different test
cases for the same tested behaviour. cases for the same tested behaviour.
## Developer notes
We've introduced versioning into the `agnhost` binary for debugging purposes (e.g.: if the
image and binary versions do not match, see [here](https://github.com/kubernetes/kubernetes/pull/79667#discussion_r304198370)).
Whenever the image `VERSION` is bumped, the `Version` in `agnhost.go` will also have to be bumped.
## Usage ## Usage
The `agnhost` binary has several subcommands which are can be used to test different The `agnhost` binary has several subcommands which are can be used to test different

3
test/images/agnhost/agnhost.go
View File

@@ -44,7 +44,8 @@ import (
) )
func main() { func main() {
rootCmd := &cobra.Command{Use: "app"} rootCmd := &cobra.Command{Use: "app", Version: "2.5"}
rootCmd.AddCommand(auditproxy.CmdAuditProxy) rootCmd.AddCommand(auditproxy.CmdAuditProxy)
rootCmd.AddCommand(connect.CmdConnect) rootCmd.AddCommand(connect.CmdConnect)
rootCmd.AddCommand(crdconvwebhook.CmdCrdConversionWebhook) rootCmd.AddCommand(crdconvwebhook.CmdCrdConversionWebhook)