added custom plugins support
derailed
parent
67884d1735
commit
c9d01234ff
|
|
@ -0,0 +1,114 @@
|
|||
<img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/k9s_small.png" align="right" width="200" height="auto"/>
|
||||
|
||||
# Release v0.8.0
|
||||
|
||||
## Notes
|
||||
|
||||
Thank you to all that contributed with flushing out issues and enhancements for K9s! I'll try to mark some of these issues as fixed. But if you don't mind grab the latest rev and see if we're happier with some of the fixes! If you've filed an issue please help me verify and close. Your support, kindness and awesome suggestions to make K9s better is as ever very much noticed and appreciated!
|
||||
|
||||
Also if you dig this tool, please make some noise on social! [@kitesurfer](https://twitter.com/kitesurfer)
|
||||
|
||||
---
|
||||
|
||||
## Change Logs
|
||||
|
||||
Pretty excited about this drop! I am as ever humbled by all the cool comments and suggestions you guys are coming up with.
|
||||
There are a few features that were requested that are simply excellent! Thank you all for your support, feedback and observations 👏
|
||||
|
||||
Now that said, some features might be more or less baked, so there might be some disturbance in the force with this drop since much code churned. So please file issues or PRs 🥰 if you notice anything that no longer works as expected.
|
||||
|
||||
### Client Update
|
||||
|
||||
In the mist of the next Kubernetes 1.16 drop, deprecating some old apis, we've decided to update K9s to support 1.15.1 client. We don't forsee any issues here but please make sure all is cool with this K9s drop on your clusters. If not please let us know so we can address. Thank you!!
|
||||
|
||||
### Scaling Pods
|
||||
|
||||
This was feature #12 filed by [Tyler Lewis](https://github.com/alairock) many moons ago. So big thanks to Tyler!! To be honest I was on the fence with this feature as I am not a big fan of one offs when it comes to cluster management. However I think it's a great way to validate adequate HPA settings while putting your cluster under load and use K9s to figure out what reasonable number of pods might be. Now this feature was not my own implementation so all kudos on this one goes to [Nathan Piper](https://github.com/nathanpiper) for spending the time to make this a reality for all of us. So many thanks to you Nathan!!
|
||||
By Nathan's implementation you can now leverage the `s` shorcut for scale deployments, replication controllers and statefulsets. Very cool!
|
||||
|
||||
### FuzzBuzz!
|
||||
|
||||
Another enhancement request came this time from [Arthur Koziel](https://github.com/arthurk) and I think you guys will dig this one. So big thanks to Arthur for this report!! K9s now leverages a fuzzy finder to be able to search for resources. Previous implementation just used regex to locate matches. For example with this addition you can now type `promse` while in search mode `/` to locate all prometheus-server-5d5f6db7cc-XXX pods. That's so cool! Once this implementation is vetted, we will enable fuzzy searching on other views as well.
|
||||
|
||||
### ClipBoarding
|
||||
|
||||
This feature comes out of [Raman Gupta](https://github.com/rocketraman) report. Thank you Raman!! This allows a K9s operator to now just hit `c` while on a resource table view to copy the currently selected resource name to the clipboard. This allows you to navigate between K9s and other tools to search, grep/etc.. thru the currently selected resource. We may want to improve on this some but the basic implementation is now available.
|
||||
|
||||
### OldiesButGoodies?
|
||||
|
||||
So the initial few releases of K9s did not have any failsafe counter measures while deleting resources. So we've beefed the deletion logic to make sure you did not inadvertantly blow something away by leveraging
|
||||
dialogs. This was totally a reasonable thing to do! However in case of managed pods, one may want to quickly cycle on or more pod perhaps to pickup a new image or configuration. For this purporse we've introduced an alternate deletion mechanism to delete pod under `alt-k` for kill. Thanks to my fellow frenchma [ftorto](https://github.com/ftorto) for this one ;)
|
||||
|
||||
### HairPlugs!
|
||||
|
||||
This one is cool! I think this thought came about from (Markus)[https://github.com/Makusi75]. Thank you Markus!! This feature allows K9s users to now customize K9s with their own plugin commands. You will be able to add a new menu shortcut to the K9s menu and fire off a custom command on a selected resource. Some of you might be leveraging kubectl plugins and now you will be able to fire these off directly from K9s along with many other shell commands.
|
||||
|
||||
In order to specify a custom plugin command, you will need to modify your .k9s/config.yml file. For example here is a sample extension to list out all the pods in the `fred` namespace while in a pod or deployment views. When this plugin is available a new command `<alt-p>` will show only while in pod and deploy views.
|
||||
|
||||
```yaml
|
||||
plugins:
|
||||
cmd1:
|
||||
# The menu mnmemoic to trigger the command. Valid values are [a-z], Shift-[A-Z], Crtl-[A-Z] or Alt-[A-Z]
|
||||
# Note! Mind the cases!!!
|
||||
shortCut: Alt-P
|
||||
scopes: # View names are typically matching the resource shortname ie po for pod, deploy for deployment, svc for service etc... If no shortname is available use the resource name.
|
||||
- po
|
||||
- deploy
|
||||
description: ViewPods # => Name to show on K9s menu
|
||||
command: kubectl # => The binary to use. Must be on your $PATH.
|
||||
# Arguments on per line preceeded with a dash! This will run > kubectl get pods -n fred
|
||||
args:
|
||||
- get
|
||||
- pods
|
||||
- -n
|
||||
- fred
|
||||
```
|
||||
|
||||
Ok so this is pretty cool but what if I want to run a command to leverage the current pod name, namespace, container or other? You bet! Here is a more elaborated example. Say per Markus's report, I want to run my ksniff kubectl plugin from within K9s. So now I can hit `S` while in container view with a selected pod and sniff out incoming traffic. Here is an example plugin config for this.
|
||||
|
||||
```yaml
|
||||
plugins:
|
||||
ksniff:
|
||||
# Enable `S` on the K9s mennu while in container view
|
||||
shortCut: Shift-S
|
||||
scopes:
|
||||
- co
|
||||
description: Sniff
|
||||
# NOTE! Ksniff has been install as a kubectl extension!
|
||||
command: kubectl
|
||||
# Run this command in the background so that I can still do K9s stuff...
|
||||
background: true
|
||||
args:
|
||||
- sniff
|
||||
# Use a K9s env var to extract the pod name from the current view.
|
||||
- $POD
|
||||
- -n
|
||||
# Use K9s current namespace
|
||||
- $NAMESPACE
|
||||
# Oh and pick out the container name from column 0 on that table. Noace!!
|
||||
- -c
|
||||
- $COL-0 # Use $COL-[0-9] to pick up the value from the desired resource table column.
|
||||
```
|
||||
|
||||
NOTE: This is experimental and the schema/behavior WILL change in the future, so please thread lightly!
|
||||
|
||||
### That's a wrap!
|
||||
|
||||
We hope you will find some of these features useful on your day to day work with K9s. We know they are now more vendors coming into this space, most with big teams, big names and big budgets. Hence more choices for you to assess which of those makes you most happy and productive. My goal is to continue to improve, speed up and stabilize K9s. My fuel is to see folks using it, file reports, contribute and seeing that occasional ATTA BOY! which I must say is much more rewarding to me than money or fame. Many thanks to all of you for your time, ideas, contributions and support!!
|
||||
|
||||
---
|
||||
|
||||
## Resolved Bugs/Features
|
||||
|
||||
+ [Issue #274](https://github.com/derailed/k9s/issues/274)
|
||||
+ [Issue #273](https://github.com/derailed/k9s/issues/273)
|
||||
+ [Issue #272](https://github.com/derailed/k9s/issues/272)
|
||||
+ [Issue #271](https://github.com/derailed/k9s/issues/271)
|
||||
+ [Issue #267](https://github.com/derailed/k9s/issues/267)
|
||||
+ [Issue #247](https://github.com/derailed/k9s/issues/247)
|
||||
+ [Issue #203](https://github.com/derailed/k9s/issues/203)
|
||||
+ [Issue #12](https://github.com/derailed/k9s/issues/12) Thank you Nathan!!
|
||||
|
||||
---
|
||||
|
||||
<img src="https://raw.githubusercontent.com/derailed/k9s/master/assets/imhotep_logo.png" width="32" height="auto"/> © 2019 Imhotep Software LLC. All materials licensed under [Apache v2.0](http://www.apache.org/licenses/LICENSE-2.0)
|
||||
141
go.sum
141
go.sum
|
|
@ -27,7 +27,6 @@ github.com/auth0/go-jwt-middleware v0.0.0-20170425171159-5493cabe49f7/go.mod h1:
|
|||
github.com/aws/aws-sdk-go v1.16.26/go.mod h1:KmX6BPdI08NWTb3/sm4ZGu5ShLoqVDhKgpiN924inxo=
|
||||
github.com/bazelbuild/bazel-gazelle v0.0.0-20181012220611-c728ce9f663e/go.mod h1:uHBSeeATKpVazAACZBDPL/Nk/UhQDDsJWDlqYJo8/Us=
|
||||
github.com/bazelbuild/buildtools v0.0.0-20180226164855-80c7f0d45d7e/go.mod h1:5JP0TXzWDHXv8qvxRC4InIazwdyDseBDbzESUMKk1yU=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 h1:xJ4a3vCFaGF/jqvzLMYoU8P317H5OQ+Via4RmuPwCS0=
|
||||
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
|
||||
github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
|
||||
github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
|
||||
|
|
@ -59,16 +58,11 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
|
|||
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
|
||||
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/daviddengcn/go-colortext v0.0.0-20160507010035-511bcaf42ccd/go.mod h1:dv4zxwHi5C/8AeI+4gX4dCWOIvNi7I6JCSX0HvlKPgE=
|
||||
github.com/derailed/tview v0.1.12 h1:EVTzx+Mq3PJzbGnCDwUVu5fD479mbQU/0rabxTm7tHA=
|
||||
github.com/derailed/tview v0.1.12/go.mod h1:g+ZyIsV5osK+lQ6LajiGQeLW10BQLJ6aMvy8Ldt2oa0=
|
||||
github.com/derailed/tview v0.2.0 h1:Mkc2LCy+ct+j0lBwP9Gkq0vXiuWOLufmP9A2lR36bFY=
|
||||
github.com/derailed/tview v0.2.0/go.mod h1:aDhJBLLf7pXbkaNmVroSvsjiP8ry6sfBVWNHTz6klZw=
|
||||
github.com/derailed/tview v0.2.1 h1:3UjeNni+Q94WmmVnc8tLSTZab5NuRVrwolghCiXCtSs=
|
||||
github.com/derailed/tview v0.2.1/go.mod h1:aDhJBLLf7pXbkaNmVroSvsjiP8ry6sfBVWNHTz6klZw=
|
||||
github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda h1:NyywMz59neOoVRFDz+ccfKWxn784fiHMDnZSy6T+JXY=
|
||||
github.com/dgrijalva/jwt-go v0.0.0-20160705203006-01aeca54ebda/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
|
||||
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
|
||||
github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff h1:FKH02LHYqSmeWd3GBh0KIkM8JBpw3RrShgtcWShdWJg=
|
||||
github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||
github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/go-connections v0.3.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
||||
|
|
@ -78,9 +72,7 @@ github.com/docker/spdystream v0.0.0-20160310174837-449fdfce4d96/go.mod h1:Qh8CwZ
|
|||
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c h1:ZfSZ3P3BedhKGUhzj7BQlPSU4OvT6tfOKe3DVHzOA7s=
|
||||
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c/go.mod h1:Qh8CwZgvJUkLughtfhJv5dyTYa91l1fOUCrgjqmcifM=
|
||||
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
|
||||
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f h1:8GDPb0tCY8LQ+OJ3dbHb5sA6YZWXFORQYZx5sdsTlMs=
|
||||
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
|
||||
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f h1:AUj1VoZUfhPhOPHULCQQDnGhRelpFWHMLhQVWDsS0v4=
|
||||
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f/go.mod h1:gNh8nYJoAm43RfaxurUnxr+N1PwuFV3ZMl/efxlIlY8=
|
||||
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633 h1:H2pdYOb3KQ1/YsqVWoWNLQO+fusocsw354rqGTZtAgw=
|
||||
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
|
||||
|
|
@ -98,9 +90,6 @@ github.com/gdamore/encoding v0.0.0-20151215212835-b23993cbb635/go.mod h1:yrQYJKK
|
|||
github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko=
|
||||
github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
|
||||
github.com/gdamore/tcell v0.0.0-20170915061752-0a0db94084df/go.mod h1:tqyG50u7+Ctv1w5VX67kLzKcj9YXR/JSBZQq/+mLl1A=
|
||||
github.com/gdamore/tcell v1.1.1 h1:U73YL+jMem2XfhvaIUfPO6MpJawaG92B2funXVb9qLs=
|
||||
github.com/gdamore/tcell v1.1.1/go.mod h1:K1udHkiR3cOtlpKG5tZPD5XxrF7v2y7lDq7Whcj+xkQ=
|
||||
github.com/gdamore/tcell v1.1.2 h1:Afe8cU6SECC06UmvaJ55Jr3Eh0tz/ywLjqWYqjGZp3s=
|
||||
github.com/gdamore/tcell v1.1.2/go.mod h1:h3kq4HO9l2On+V9ed8w8ewqQEmGCSSHOgQ+2h8uzurE=
|
||||
github.com/gdamore/tcell v1.2.0 h1:ikixzsxc8K8o3V2/CEmyoEW8mJZaNYQQ3NP3VIQdUe4=
|
||||
github.com/gdamore/tcell v1.2.0/go.mod h1:Hjvr+Ofd+gLglo7RYKxxnzCBmev3BzsS67MebKS4zMM=
|
||||
|
|
@ -140,7 +129,6 @@ github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE=
|
|||
github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
|
||||
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
|
||||
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef h1:veQD95Isof8w9/WXiA+pa3tz3fJXkt5B7QaRBrM62gk=
|
||||
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
|
||||
github.com/golang/mock v0.0.0-20160127222235-bd3c8e81be01/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
|
||||
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
|
||||
|
|
@ -160,7 +148,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
|
|||
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
|
||||
github.com/google/gofuzz v1.0.0 h1:A8PeW59pxE9IoFRqBp37U+mSNaQoZ46F1f0f863XSXw=
|
||||
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
|
||||
github.com/google/uuid v1.0.0 h1:b4Gk+7WdP/d3HZH8EJsZpvV7EtDOgaZLtnaNGIu1adA=
|
||||
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
|
||||
github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY=
|
||||
github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhpy9g=
|
||||
|
|
@ -187,12 +174,10 @@ github.com/heketi/heketi v0.0.0-20181109135656-558b29266ce0/go.mod h1:bB9ly3Rchc
|
|||
github.com/heketi/rest v0.0.0-20180404230133-aa6a65207413/go.mod h1:BeS3M108VzVlmAue3lv2WcGuPAX94/KN63MUURzbYSI=
|
||||
github.com/heketi/tests v0.0.0-20151005000721-f3775cbcefd6/go.mod h1:xGMAM8JLi7UkZt1i4FQeQy0R2T8GLUwQhOP5M1gBhy4=
|
||||
github.com/heketi/utils v0.0.0-20170317161834-435bc5bdfa64/go.mod h1:RYlF4ghFZPPmk2TC5REt5OFwvfb6lzxFWrTWB+qs28s=
|
||||
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
|
||||
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
|
||||
github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
|
||||
github.com/imdario/mergo v0.3.7 h1:Y+UAYTZ7gDEuOfhxKWy+dvb5dRQ6rJjFSdX2HZY1/gI=
|
||||
github.com/imdario/mergo v0.3.7/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
|
||||
github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
|
||||
github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
|
||||
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
|
||||
github.com/jonboulle/clockwork v0.0.0-20141017032234-72f9bd7c4e0c/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
|
||||
|
|
@ -203,70 +188,44 @@ github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1
|
|||
github.com/jteeuwen/go-bindata v0.0.0-20151023091102-a0ff2567cfb7/go.mod h1:JVvhzYOiGBnFSYRyV00iY8q7/0PThjIYav1p9h5dmKs=
|
||||
github.com/jtolds/gls v4.2.1+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
|
||||
github.com/junegunn/fzf v0.0.0-20190808063552-509589924557 h1:KLUZiqiMfcwH3YItRzwxIWGFEVg8qjvxIyaWFNaQ1lE=
|
||||
github.com/junegunn/fzf v0.0.0-20190808063552-509589924557/go.mod h1:mW81EF7s4wSvB4dnjrdXv/kCV+eAOXL4vqVT9h8aXsw=
|
||||
github.com/kardianos/osext v0.0.0-20150410034420-8fef92e41e22/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
|
||||
github.com/karrick/godirwalk v1.7.5/go.mod h1:2c9FRhkDxdIbgkOnCEvnSWs71Bhugbl46shStcFDJ34=
|
||||
github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
|
||||
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
|
||||
github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
|
||||
github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169 h1:YUrU1/jxRqnt0PSrKj1Uj/wEjk/fjnE80QFfi2Zlj7Q=
|
||||
github.com/kr/fs v0.0.0-20131111012553-2788f0dbd169/go.mod h1:glhvuHOU9Hy7/8PwwdtnarXqLagOX0b/TbZx2zLMqEg=
|
||||
github.com/kr/pretty v0.0.0-20140812000539-f31442d60e51/go.mod h1:Bvhd+E3laJ0AVkG0c9rmtZcnhV0HQ3+c3YxxqTvc/gA=
|
||||
github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
|
||||
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
|
||||
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
|
||||
github.com/kr/text v0.0.0-20130911015532-6807e777504f/go.mod h1:sjUstKUATFIcff4qlB53Kml0wQPtJVc/3fWrmuUmcfA=
|
||||
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
|
||||
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
|
||||
github.com/ktr0731/go-fuzzyfinder v0.1.2 h1:Y+Vm86X/QmE/+DitA2RrLndZU134cZtBUOtO18CTVcE=
|
||||
github.com/ktr0731/go-fuzzyfinder v0.1.2/go.mod h1:RzAqRU8h8f4uSLSP+THd87krOFnBploGlGn/8RQhd7M=
|
||||
github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
|
||||
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
|
||||
github.com/libopenstorage/openstorage v0.0.0-20170906232338-093a0c388875/go.mod h1:Sp1sIObHjat1BeXhfMqLZ14wnOzEhNx2YQedreMcUyc=
|
||||
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
|
||||
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=
|
||||
github.com/lpabon/godbc v0.1.1/go.mod h1:Jo9QV0cf3U6jZABgiJ2skINAXb9j8m51r07g4KI92ZA=
|
||||
github.com/lucasb-eyer/go-colorful v0.0.0-20170223221042-c900de9dbbc7/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4=
|
||||
github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY=
|
||||
github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4=
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a h1:TpvdAwDAt1K4ANVOfcihouRdvP+MgAfDWwBuct4l6ZY=
|
||||
github.com/mailru/easyjson v0.0.0-20160728113105-d5b7844b561a/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
|
||||
=======
|
||||
=======
|
||||
github.com/lucasb-eyer/go-colorful v1.0.2 h1:mCMFu6PgSozg9tDNMMK3g18oJBX7oYGrC09mS6CXfO4=
|
||||
github.com/lucasb-eyer/go-colorful v1.0.2/go.mod h1:0MS4r+7BZKSJ5mw4/S5MPN+qHFF1fYclkSPilDOKW0s=
|
||||
>>>>>>> checkpoint
|
||||
github.com/magiconair/properties v0.0.0-20160816085511-61b492c03cf4/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
|
||||
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329 h1:2gxZ0XQIU/5z3Z3bUBu+FXuk2pFbkN6tcwi/pjyaDic=
|
||||
github.com/mailru/easyjson v0.0.0-20180823135443-60711f1a8329/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
|
||||
github.com/marstr/guid v0.0.0-20170427235115-8bdf7d1a087c/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho=
|
||||
<<<<<<< HEAD
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
=======
|
||||
github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c h1:3nKFouDdpgGUV/uerJcYWH45ZbJzX0SiVWfTgmUeTzc=
|
||||
github.com/mattn/go-isatty v0.0.0-20160806122752-66b8e73f3f5c/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
|
||||
github.com/mattn/go-runewidth v0.0.0-20170201023540-14207d285c6c/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
|
||||
>>>>>>> checkpoint
|
||||
github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y=
|
||||
github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
|
||||
github.com/mattn/go-shellwords v0.0.0-20180605041737-f8471b0a71de/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
|
||||
github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
|
||||
github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
|
||||
<<<<<<< HEAD
|
||||
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
|
||||
=======
|
||||
github.com/mesos/mesos-go v0.0.9/go.mod h1:kPYCMQ9gsOXVAle1OsoY4I1+9kPu8GHkf88aV59fDr4=
|
||||
github.com/mholt/caddy v0.0.0-20180213163048-2de495001514/go.mod h1:Wb1PlT4DAYSqOEd03MsqkdkXnTxA8v9pKjdpxbqM1kY=
|
||||
github.com/miekg/dns v0.0.0-20160614162101-5d001d020961/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
|
||||
github.com/mindprince/gonvml v0.0.0-20171110221305-fee913ce8fb2/go.mod h1:2eu9pRWp8mo84xCg6KswZ+USQHjwgRhNp06sozOdsTY=
|
||||
github.com/mistifyio/go-zfs v0.0.0-20151009155749-1b4ae6fb4e77/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4=
|
||||
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
|
||||
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
|
||||
|
|
@ -279,30 +238,19 @@ github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8m
|
|||
github.com/mvdan/xurls v0.0.0-20160110113200-1b768d7c393a/go.mod h1:tQlNn3BED8bE/15hnSL2HLkDeLWpNPAwtw7wkEq44oU=
|
||||
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
|
||||
github.com/natefinch/lumberjack v2.0.0+incompatible/go.mod h1:Wi9p2TTF5DG5oU+6YfsmYQpsTIOm0B1VNzQg9Mw6nPk=
|
||||
github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d h1:x3S6kxmy49zXVVyhcnrFqxvNVCBPb2KZ9hV2RBdS840=
|
||||
github.com/nsf/termbox-go v0.0.0-20190121233118-02980233997d/go.mod h1:IuKpRQcYE1Tfu+oAQqaLisqDeXgjyyltCfsaoYN18NQ=
|
||||
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/ginkgo v1.8.0 h1:VkHVNpR4iVnU8XQR6DBm8BqYjN7CRzw+xKUbVVbbW9w=
|
||||
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
|
||||
github.com/onsi/gomega v0.0.0-20190113212917-5533ce8a0da3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
github.com/onsi/gomega v1.5.0 h1:izbySO9zDPmjJ8rDjLvkA2zJHIo+HkYXHnf7eN7SSyo=
|
||||
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
|
||||
=======
|
||||
=======
|
||||
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420 h1:Yu3681ykYHDfLoI6XVjL4JWmkE+3TX9yfIWwRCh1kFM=
|
||||
>>>>>>> checkpoint
|
||||
github.com/opencontainers/go-digest v0.0.0-20170106003457-a6d0ee40d420/go.mod h1:cMLVZDEM3+U2I4VmLI6N8jQYUd2OVphdqWwCJHrFt2s=
|
||||
github.com/opencontainers/image-spec v0.0.0-20170604055404-372ad780f634/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
|
||||
github.com/opencontainers/runc v0.0.0-20181113202123-f000fe11ece1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
|
||||
github.com/opencontainers/runtime-spec v1.0.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
|
||||
github.com/opencontainers/selinux v0.0.0-20170621221121-4a2974bf1ee9/go.mod h1:+BLncwf63G4dgOzykXAxcmnFlUaOlkDdmw/CqsW6pjs=
|
||||
github.com/pborman/uuid v1.2.0 h1:J7Q5mO4ysT1dv8hyrUGHb9+ooztCXu1D8MY8DZYsu3g=
|
||||
github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
|
||||
github.com/pelletier/go-toml v1.0.1/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
|
||||
github.com/peterbourgon/diskv v2.0.1+incompatible h1:UBdAOUP5p4RWqPBg048CAvpKN+vxiaj6gdUUzhl4XmI=
|
||||
github.com/peterbourgon/diskv v2.0.1+incompatible/go.mod h1:uqqh8zWWbv1HBMNONnaR/tNboyR3/BZd58JJSHlUSCU=
|
||||
|
|
@ -311,27 +259,20 @@ github.com/petergtz/pegomock v0.0.0-20181206220228-b113d17a7e81/go.mod h1:nuBLWZ
|
|||
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
|
||||
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
|
||||
github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6 h1:V8AT/I4KmIDRfObq0yBUvbD4DeaYmQY9GhC5sKl24Mo=
|
||||
github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6/go.mod h1:NxmoDg/QLVWluQDUYG7XBZTLUpKeFa8e3aMf1BfjyHk=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA=
|
||||
github.com/pquerna/ffjson v0.0.0-20180717144149-af8b230fcd20/go.mod h1:YARuvh7BUWHNhzDq2OM5tzR2RiCcN2D7sapiKyCel/M=
|
||||
github.com/prometheus/client_golang v0.9.2 h1:awm861/B8OKDd2I/6o1dy3ra4BamzKhYOiGItCeZ740=
|
||||
github.com/prometheus/client_golang v0.9.2/go.mod h1:OsXs2jCmiKlQ1lTBmv21f2mNfw4xf/QclQDMrYNZzcM=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 h1:idejC8f05m9MGOsuEi1ATq9shN03HrxNkD/luQvxCv8=
|
||||
github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
|
||||
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275 h1:PnBWHBf+6L0jOqq0gIVUe6Yk0/QMZ640k6NvkxcBf+8=
|
||||
github.com/prometheus/common v0.0.0-20181126121408-4724e9255275/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
|
||||
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a h1:9a8MnZMP0X2nLJdBg+pBmGgkJlSaKC2KaQmTCk1XDtE=
|
||||
github.com/prometheus/procfs v0.0.0-20181204211112-1dc9a6cbc91a/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
|
||||
github.com/quobyte/api v0.1.2/go.mod h1:jL7lIHrmqQ7yh05OJ+eEEdHr0u/kmT1Ff9iHd+4H6VI=
|
||||
github.com/rakyll/hey v0.1.2 h1:XlGaKcBdmXJaPImiTnE+TGLDUWQ2toYuHCwdrylLjmg=
|
||||
github.com/rakyll/hey v0.1.2/go.mod h1:S5M+++KwbmxA7w68S92B5NdWiCB+cIhITaMUkq9W608=
|
||||
github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uYEyJGbgTkfkS4+E/PavXkNJcbFIpEtjt2B0KDQ5+9M=
|
||||
github.com/rivo/tview v0.0.0-20190213202703-b373355e9db4/go.mod h1:J4W+hErFfITUbyFAEXizpmkuxX7ZN56dopxHB4XQhMw=
|
||||
github.com/rivo/uniseg v0.0.0-20190313204849-f699dde9c340 h1:nOZbL5f2xmBAHWYrrHbHV1xatzZirN++oOQ3g83Ypgs=
|
||||
github.com/rivo/uniseg v0.0.0-20190313204849-f699dde9c340/go.mod h1:SOLvOL4ybwgLJ6TYoX/rtaJ8EGOulH4XU7E9/TLrTCE=
|
||||
github.com/rivo/uniseg v0.0.0-20190513083848-b9f5b9457d44 h1:XKCbzPvK4/BbMXoMJOkYP2ANxiAEO0HM1xn6psSbXxY=
|
||||
github.com/rivo/uniseg v0.0.0-20190513083848-b9f5b9457d44/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/robfig/cron v0.0.0-20170309132418-df38d32658d8/go.mod h1:JGuDeoQd7Z6yL4zQhZ3OPEVHB7fL6Ka6skscFHfmt2k=
|
||||
|
|
@ -339,21 +280,6 @@ github.com/rogpeppe/go-charset v0.0.0-20180617210344-2471d30d28b4/go.mod h1:qgYe
|
|||
github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
|
||||
github.com/rs/zerolog v1.14.3 h1:4EGfSkR2hJDB0s3oFfrlPqjU1e4WLncergLil3nEKW0=
|
||||
github.com/rs/zerolog v1.14.3/go.mod h1:3WXPzbXEEliJ+a6UFE4vhIxV8qR1EML6ngzP9ug4eYg=
|
||||
<<<<<<< HEAD
|
||||
github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
||||
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
|
||||
github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||
github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
|
||||
github.com/spf13/cobra v0.0.3 h1:ZlrZ4XsMRm04Fr5pSFxBgfND2EBVa1nLpiy1stUsX/8=
|
||||
github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
github.com/spf13/cobra v0.0.5 h1:f0B+LkLX6DtmRH1isoNA9VTtNUK9K8xYd28JNNfOv/s=
|
||||
github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU=
|
||||
github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
|
||||
github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
|
||||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s=
|
||||
=======
|
||||
github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
|
||||
github.com/russross/blackfriday v0.0.0-20151117072312-300106c228d5/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
|
||||
github.com/sahilm/fuzzy v0.1.0 h1:FzWGaw2Opqyu+794ZQ9SYifWv2EIXpwP4q8dY1kDAwI=
|
||||
|
|
@ -367,7 +293,6 @@ github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1
|
|||
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s=
|
||||
github.com/smartystreets/goconvey v0.0.0-20190330032615-68dc04aab96a/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
|
||||
github.com/soheilhy/cmux v0.1.3/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
|
||||
github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97 h1:Gv1HykSEG+RKWWWkM69nPrJKhE/EM2oFb1nBWogHNv8=
|
||||
github.com/spf13/afero v0.0.0-20160816080757-b28a7effac97/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
|
||||
github.com/spf13/cast v0.0.0-20160730092037-e31f36ffc91a/go.mod h1:r2rcYCSwa1IExKTDiTfzaxqT2FNHs8hODu4LnUfgKEg=
|
||||
github.com/spf13/cobra v0.0.0-20180319062004-c439c4fa0937/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
|
||||
|
|
@ -379,15 +304,11 @@ github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
|
|||
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
|
||||
github.com/spf13/viper v0.0.0-20160820190039-7fb2782df3d8/go.mod h1:A8kyI5cUJhb8N+3pkfONlcEcZbueH6nhAm0Fq7SrnBM=
|
||||
github.com/storageos/go-api v0.0.0-20180912212459-343b3eff91fc/go.mod h1:ZrLn+e0ZuF3Y65PNF6dIwbJPZqfmtCXxFm9ckv0agOY=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
|
||||
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
|
||||
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
|
||||
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
|
||||
<<<<<<< HEAD
|
||||
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
|
||||
=======
|
||||
github.com/syndtr/gocapability v0.0.0-20160928074757-e7cb7fa329f4/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
|
||||
github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
|
||||
github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4=
|
||||
|
|
@ -397,21 +318,14 @@ github.com/vmware/govmomi v0.20.1/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59b
|
|||
github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc/go.mod h1:e6humHha1ekIwTCm+A5Qed5mG8V4JL+ChHcUOJ+L/8U=
|
||||
github.com/xanzy/go-cloudstack v0.0.0-20160728180336-1e2cbf647e57/go.mod h1:s3eL3z5pNXF5FVybcT+LIVdId8pYn709yv6v5mrkrQE=
|
||||
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 h1:j2hhcujLRHAg872RWAV5yaUrEjHEObwDv3aImCaNLek=
|
||||
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1/go.mod h1:QcJo0QPSfTONNIgpN5RA8prR7fF8nkF6cTWTcNerRO8=
|
||||
github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
|
||||
github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q=
|
||||
go.uber.org/atomic v0.0.0-20181018215023-8dc6146f7569/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
|
||||
go.uber.org/multierr v0.0.0-20180122172545-ddea229ff1df/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
|
||||
go.uber.org/zap v0.0.0-20180814183419-67bc79d13d15/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
|
||||
golang.org/x/crypto v0.0.0-20170728183002-558b6879de74/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
<<<<<<< HEAD
|
||||
golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
=======
|
||||
golang.org/x/crypto v0.0.0-20181025213731-e84da0312774/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
|
||||
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
|
||||
golang.org/x/crypto v0.0.0-20190426145343-a29dc8fdc734 h1:p/H982KKEjUnLJkM3tt/LemDnOc1GiZL5FCVlORJ5zo=
|
||||
|
|
@ -440,20 +354,11 @@ golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJ
|
|||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
<<<<<<< HEAD
|
||||
golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181122145206-62eef0e2fa9b/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
=======
|
||||
golang.org/x/sys v0.0.0-20181004145325-8469e314837c/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190426135247-a129542de9ae h1:mQLHiymj/JXKnnjc62tb7nD5pZLs940/sXJu+Xp3DBA=
|
||||
golang.org/x/sys v0.0.0-20190426135247-a129542de9ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190509141414-a5b02f93d862/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756 h1:9nuHUbU8dRnRRfj9KjWUVrJeoexdbeMjttk6Oh1rD10=
|
||||
golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
|
|
@ -477,27 +382,18 @@ gonum.org/v1/netlib v0.0.0-20190313105609-8cb42192e0e0/go.mod h1:wa6Ws7BG/ESfp6d
|
|||
gonum.org/v1/netlib v0.0.0-20190331212654-76723241ea4e/go.mod h1:kS+toOQn6AQKjmKJ7gzohV1XkqsFehRA2FbsbkopSuQ=
|
||||
google.golang.org/api v0.0.0-20181220000619-583d854617af/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
|
||||
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
|
||||
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
|
||||
google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6 h1:72GtwBPfq6av9X0Ru2HtAopsPW+d+vh1K1zaxanTdE8=
|
||||
google.golang.org/genproto v0.0.0-20170731182057-09f6ed296fc6/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
|
||||
google.golang.org/grpc v1.13.0 h1:bHIbVsCwmvbArgCJmLdgOdHFXlKqTOVjbibbS19cXHc=
|
||||
google.golang.org/grpc v1.13.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
|
||||
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY=
|
||||
gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0/go.mod h1:OdE7CF6DbADk7lN8LIKRzRJTTZXIjtWgA5THM5lhBAw=
|
||||
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
|
||||
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
|
||||
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
|
||||
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
|
||||
gopkg.in/gcfg.v1 v1.2.0/go.mod h1:yesOnuUOFQAhST5vPY4nbZsb/huCgGGXlipJsBn0b3o=
|
||||
gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
|
||||
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
|
||||
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
|
||||
gopkg.in/natefinch/lumberjack.v2 v2.0.0-20150622162204-20b71e5b60d7/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k=
|
||||
gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84 h1:ELQJ5WuT+ydETLCpWvAuw8iGBQRGoJq+A3RAbbAcZUY=
|
||||
gopkg.in/square/go-jose.v2 v2.0.0-20180411045311-89060dee6a84/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI=
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
|
||||
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
|
||||
gopkg.in/warnings.v0 v0.1.1/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
|
||||
gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=
|
||||
|
|
@ -506,56 +402,20 @@ gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
|
|||
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
|
||||
gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
|
||||
gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
|
||||
<<<<<<< HEAD
|
||||
honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
|
||||
k8s.io/api v0.0.0-20190222213804-5cb15d344471 h1:MzQGt8qWQCR+39kbYRd0uQqsvSidpYqJLFeWiJ9l4OE=
|
||||
k8s.io/api v0.0.0-20190222213804-5cb15d344471/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
|
||||
k8s.io/apiextensions-apiserver v0.0.0-20190325193600-475668423e9f h1:+GpMltIq6SUOswgSQ3HcxgldikyBCreeRDkCYOzwfGk=
|
||||
k8s.io/apiextensions-apiserver v0.0.0-20190325193600-475668423e9f/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
|
||||
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628 h1:UYfHH+KEF88OTg+GojQUwFTNxbxwmoktLwutUzR0GPg=
|
||||
k8s.io/apimachinery v0.0.0-20190221213512-86fb29eff628/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
|
||||
k8s.io/apiserver v0.0.0-20190319190228-a4358799e4fe h1:zD63Eo0qbcR9JzZ90yQsFMzXYSbfsCa5ICB2D2nX1tg=
|
||||
k8s.io/apiserver v0.0.0-20190319190228-a4358799e4fe/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
|
||||
k8s.io/cli-runtime v0.0.0-20190325194458-f2b4781c3ae1 h1:yIrGaL3GC1eoxtkSXoNMHKzF1QIbC0TLq07OApgVvc0=
|
||||
k8s.io/cli-runtime v0.0.0-20190325194458-f2b4781c3ae1/go.mod h1:qWnH3/b8sp/l7EvlDh7ulDU3UWA4P4N1NFbEEP791tM=
|
||||
k8s.io/client-go v0.0.0-20190307161346-7621a5ebb88b h1:bLd5Yb1SyymFAEOqKAKd376ak8SN++QHZprkosLhV8Q=
|
||||
k8s.io/client-go v0.0.0-20190307161346-7621a5ebb88b/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
|
||||
k8s.io/client-go v10.0.0+incompatible h1:F1IqCqw7oMBzDkqlcBymRq1450wD0eNqLE9jzUrIi34=
|
||||
k8s.io/client-go v10.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
|
||||
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
|
||||
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
|
||||
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
|
||||
k8s.io/kube-openapi v0.0.0-20190426233423-c5d3b0f4bee0 h1:D//p4U8H78y6as0HmrCe8QucazHZqI6hs9eu+rJflKw=
|
||||
k8s.io/kube-openapi v0.0.0-20190426233423-c5d3b0f4bee0/go.mod h1:iU+ZGYsNlvU9XKUSso6SQfKTCCw7lFduMZy26Mgr2Fw=
|
||||
k8s.io/kubernetes v1.13.5 h1:nI5TsYNPpcXnPPptVx+OpoXdAckpq6omYLkDZy/WYuE=
|
||||
k8s.io/kubernetes v1.13.5/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
|
||||
k8s.io/metrics v0.0.0-20190325194013-29123f6a4aa6 h1:JjAl5n2siv5gPLfvXgSoUkV6tf63/EEtvCuni1zIU8Q=
|
||||
k8s.io/metrics v0.0.0-20190325194013-29123f6a4aa6/go.mod h1:a25VAbm3QT3xiVl1jtoF1ueAKQM149UdZ+L93ePfV3M=
|
||||
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 h1:8r+l4bNWjRlsFYlQJnKJ2p7s1YQPj4XyXiJVqDHRx7c=
|
||||
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=
|
||||
sigs.k8s.io/structured-merge-diff v0.0.0-20190426204423-ea680f03cc65/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
|
||||
=======
|
||||
k8s.io/api v0.0.0-20190718183219-b59d8169aab5 h1:X3LHYU4fwu75lvvWypbppCKuhqg1KrvcZ1lLaAgmE/g=
|
||||
k8s.io/api v0.0.0-20190718183219-b59d8169aab5/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A=
|
||||
k8s.io/apiextensions-apiserver v0.0.0-20190718185103-d1ef975d28ce h1:w/sVJ08K4SlPb03ruyc55+qsFyXR0zwUjgovVuuT6wo=
|
||||
k8s.io/apiextensions-apiserver v0.0.0-20190718185103-d1ef975d28ce/go.mod h1:SIDeZVS+xvGOAg5fv5Oft3AgtsdgKfndLLWjdO6eDog=
|
||||
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719 h1:uV4S5IB5g4Nvi+TBVNf3e9L4wrirlwYJ6w88jUQxTUw=
|
||||
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
|
||||
k8s.io/apiserver v0.0.0-20190718184206-a1aa83af71a7 h1:8mEhvrlegNEsADNHBah9RiCpEGaG1WVLall4pitumBs=
|
||||
k8s.io/apiserver v0.0.0-20190718184206-a1aa83af71a7/go.mod h1:U+p3oErZ9CNJpjYE9Kx0IZ0VHFiDC92/xM4znOfwqaU=
|
||||
k8s.io/cli-runtime v0.0.0-20190718185405-0ce9869d0015 h1:lTX3SLGRZD/XHC+OzGg8h8RPALS77vqKpSDE555UuE8=
|
||||
k8s.io/cli-runtime v0.0.0-20190718185405-0ce9869d0015/go.mod h1:hun1d/RYmxPm/W+k/bSobRdzpvpK0yUxAqBk8zfasRA=
|
||||
k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5 h1:ZIHnBytv9H1jiI7K/Szva829lP6zKsluhjVRdxf5kHA=
|
||||
k8s.io/client-go v0.0.0-20190718183610-8e956561bbf5/go.mod h1:ozblAqkW495yoAX60QZyxQBq5W0YixE9Ffn4F91RO0g=
|
||||
k8s.io/cloud-provider v0.0.0-20190718190308-f8e43aa19282 h1:hfUkvEYZRrLYDmu+IKuRq3ou0jrO+fJhJ4pmLT70aXo=
|
||||
k8s.io/cloud-provider v0.0.0-20190718190308-f8e43aa19282/go.mod h1:fAs4ws2Pg83wofENp7qjEZQSvuiu0aSUnZb6g7ev/uI=
|
||||
k8s.io/cluster-bootstrap v0.0.0-20190718190146-f7b0473036f9/go.mod h1:9GyPupmI5TluVinY92AETGuWS8lIjxpCiAdJPlHSr2c=
|
||||
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
|
||||
k8s.io/component-base v0.0.0-20190718183727-0ececfbe9772 h1:KvNHv5DejGm2lQZ+mD4T2cMpWK6BH/9kXJ6YQqt73u4=
|
||||
k8s.io/component-base v0.0.0-20190718183727-0ececfbe9772/go.mod h1:VLedAFwENz2swOjm0zmUXpAP2mV55c49xgaOzPBI/QQ=
|
||||
k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1 h1:NVZIgq492plCUB4GlZUTdgGQRPOKmBWpw2HlOJDm9OQ=
|
||||
k8s.io/cri-api v0.0.0-20190531030430-6117653b35f1/go.mod h1:K6Ux7uDbzKhacgqW0OJg3rjXk/SR9kprCPfSUDXGB5A=
|
||||
k8s.io/csi-translation-lib v0.0.0-20190718190424-bef8d46b95de/go.mod h1:DoX2bT9qrc2Bf4HVqxUZwmxmnV4FE0tdQ7m9GFigg00=
|
||||
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
|
||||
|
|
@ -586,7 +446,6 @@ modernc.org/xc v1.0.0/go.mod h1:mRNCo0bvLjGhHO9WsyuKVU4q0ceiDDDoEeWDJHrNx8I=
|
|||
sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0=
|
||||
sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU=
|
||||
sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI=
|
||||
>>>>>>> update to k8s 1.15.1
|
||||
sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs=
|
||||
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
|
||||
vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc/go.mod h1:so/NYdZXCz+E3ZpW0uAoCj6uzU2+8OWDFv/HxUSs7kI=
|
||||
|
|
|
|||
|
|
@ -301,6 +301,7 @@ var expectedConfig = `k9s:
|
|||
- dp
|
||||
description: blee
|
||||
command: duh
|
||||
background: false
|
||||
args:
|
||||
- -n
|
||||
- $NAMESPACE
|
||||
|
|
@ -329,6 +330,7 @@ var resetConfig = `k9s:
|
|||
- dp
|
||||
description: blee
|
||||
command: duh
|
||||
background: false
|
||||
args:
|
||||
- -n
|
||||
- $NAMESPACE
|
||||
|
|
|
|||
|
|
@ -6,5 +6,6 @@ type Plugin struct {
|
|||
Scopes []string `yaml:"scopes"`
|
||||
Description string `yaml:"description"`
|
||||
Command string `yaml:"command"`
|
||||
Background bool `yaml:"background"`
|
||||
Args []string `yaml:"args"`
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@ func (r *ReplicationController) Delete(ns, n string, cascade, force bool) error
|
|||
|
||||
// Scale a ReplicationController.
|
||||
func (r *ReplicationController) Scale(ns, n string, replicas int32) error {
|
||||
scale, err := r.DialOrDie().Core().ReplicationControllers(ns).GetScale(n, metav1.GetOptions{})
|
||||
scale, err := r.DialOrDie().CoreV1().ReplicationControllers(ns).GetScale(n, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
scale.Spec.Replicas = replicas
|
||||
_, err = r.DialOrDie().Core().ReplicationControllers(ns).UpdateScale(n, scale)
|
||||
_, err = r.DialOrDie().CoreV1().ReplicationControllers(ns).UpdateScale(n, scale)
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -51,12 +51,12 @@ func (s *StatefulSet) Delete(ns, n string, cascade, force bool) error {
|
|||
|
||||
// Scale a StatefulSet.
|
||||
func (s *StatefulSet) Scale(ns, n string, replicas int32) error {
|
||||
scale, err := s.DialOrDie().Apps().StatefulSets(ns).GetScale(n, metav1.GetOptions{})
|
||||
scale, err := s.DialOrDie().AppsV1().StatefulSets(ns).GetScale(n, metav1.GetOptions{})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
scale.Spec.Replicas = replicas
|
||||
_, err = s.DialOrDie().Apps().StatefulSets(ns).UpdateScale(n, scale)
|
||||
_, err = s.DialOrDie().AppsV1().StatefulSets(ns).UpdateScale(n, scale)
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,4 +93,4 @@ func (r *ReplicationController) Fields(ns string) Row {
|
|||
// Scale the specified resource.
|
||||
func (r *ReplicationController) Scale(ns, n string, replicas int32) error {
|
||||
return r.Resource.(Scalable).Scale(ns, n, replicas)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -308,59 +308,59 @@ func initStdKeys() {
|
|||
}
|
||||
|
||||
func initShiftKeys() {
|
||||
tcell.KeyNames[tcell.Key(KeyShiftA)] = "SHIFT-A"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftB)] = "SHIFT-B"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftC)] = "SHIFT-C"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftD)] = "SHIFT-D"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftE)] = "SHIFT-E"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftF)] = "SHIFT-F"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftG)] = "SHIFT-G"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftH)] = "SHIFT-H"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftI)] = "SHIFT-I"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftJ)] = "SHIFT-J"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftK)] = "SHIFT-K"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftL)] = "SHIFT-L"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftM)] = "SHIFT-M"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftN)] = "SHIFT-N"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftO)] = "SHIFT-O"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftP)] = "SHIFT-P"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftQ)] = "SHIFT-Q"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftR)] = "SHIFT-R"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftS)] = "SHIFT-S"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftT)] = "SHIFT-T"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftU)] = "SHIFT-U"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftV)] = "SHIFT-V"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftW)] = "SHIFT-W"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftX)] = "SHIFT-X"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftY)] = "SHIFT-Y"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftZ)] = "SHIFT-Z"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftA)] = "Shift-A"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftB)] = "Shift-B"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftC)] = "Shift-C"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftD)] = "Shift-D"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftE)] = "Shift-E"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftF)] = "Shift-F"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftG)] = "Shift-G"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftH)] = "Shift-H"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftI)] = "Shift-I"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftJ)] = "Shift-J"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftK)] = "Shift-K"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftL)] = "Shift-L"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftM)] = "Shift-M"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftN)] = "Shift-N"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftO)] = "Shift-O"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftP)] = "Shift-P"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftQ)] = "Shift-Q"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftR)] = "Shift-R"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftS)] = "Shift-S"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftT)] = "Shift-T"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftU)] = "Shift-U"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftV)] = "Shift-V"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftW)] = "Shift-W"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftX)] = "Shift-X"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftY)] = "Shift-Y"
|
||||
tcell.KeyNames[tcell.Key(KeyShiftZ)] = "Shift-Z"
|
||||
}
|
||||
|
||||
func initAltKeys() {
|
||||
tcell.KeyNames[tcell.Key(KeyAltA)] = "ALT-A"
|
||||
tcell.KeyNames[tcell.Key(KeyAltB)] = "ALT-B"
|
||||
tcell.KeyNames[tcell.Key(KeyAltC)] = "ALT-C"
|
||||
tcell.KeyNames[tcell.Key(KeyAltD)] = "ALT-D"
|
||||
tcell.KeyNames[tcell.Key(KeyAltE)] = "ALT-E"
|
||||
tcell.KeyNames[tcell.Key(KeyAltF)] = "ALT-F"
|
||||
tcell.KeyNames[tcell.Key(KeyAltG)] = "ALT-G"
|
||||
tcell.KeyNames[tcell.Key(KeyAltH)] = "ALT-H"
|
||||
tcell.KeyNames[tcell.Key(KeyAltI)] = "ALT-I"
|
||||
tcell.KeyNames[tcell.Key(KeyAltJ)] = "ALT-J"
|
||||
tcell.KeyNames[tcell.Key(KeyAltK)] = "ALT-K"
|
||||
tcell.KeyNames[tcell.Key(KeyAltL)] = "ALT-L"
|
||||
tcell.KeyNames[tcell.Key(KeyAltM)] = "ALT-M"
|
||||
tcell.KeyNames[tcell.Key(KeyAltN)] = "ALT-N"
|
||||
tcell.KeyNames[tcell.Key(KeyAltO)] = "ALT-O"
|
||||
tcell.KeyNames[tcell.Key(KeyAltP)] = "ALT-P"
|
||||
tcell.KeyNames[tcell.Key(KeyAltQ)] = "ALT-Q"
|
||||
tcell.KeyNames[tcell.Key(KeyAltR)] = "ALT-R"
|
||||
tcell.KeyNames[tcell.Key(KeyAltS)] = "ALT-S"
|
||||
tcell.KeyNames[tcell.Key(KeyAltT)] = "ALT-T"
|
||||
tcell.KeyNames[tcell.Key(KeyAltU)] = "ALT-U"
|
||||
tcell.KeyNames[tcell.Key(KeyAltV)] = "ALT-V"
|
||||
tcell.KeyNames[tcell.Key(KeyAltW)] = "ALT-W"
|
||||
tcell.KeyNames[tcell.Key(KeyAltX)] = "ALT-X"
|
||||
tcell.KeyNames[tcell.Key(KeyAltY)] = "ALT-Y"
|
||||
tcell.KeyNames[tcell.Key(KeyAltZ)] = "ALT-Z"
|
||||
tcell.KeyNames[tcell.Key(KeyAltA)] = "Alt-A"
|
||||
tcell.KeyNames[tcell.Key(KeyAltB)] = "Alt-B"
|
||||
tcell.KeyNames[tcell.Key(KeyAltC)] = "Alt-C"
|
||||
tcell.KeyNames[tcell.Key(KeyAltD)] = "Alt-D"
|
||||
tcell.KeyNames[tcell.Key(KeyAltE)] = "Alt-E"
|
||||
tcell.KeyNames[tcell.Key(KeyAltF)] = "Alt-F"
|
||||
tcell.KeyNames[tcell.Key(KeyAltG)] = "Alt-G"
|
||||
tcell.KeyNames[tcell.Key(KeyAltH)] = "Alt-H"
|
||||
tcell.KeyNames[tcell.Key(KeyAltI)] = "Alt-I"
|
||||
tcell.KeyNames[tcell.Key(KeyAltJ)] = "Alt-J"
|
||||
tcell.KeyNames[tcell.Key(KeyAltK)] = "Alt-K"
|
||||
tcell.KeyNames[tcell.Key(KeyAltL)] = "Alt-L"
|
||||
tcell.KeyNames[tcell.Key(KeyAltM)] = "Alt-M"
|
||||
tcell.KeyNames[tcell.Key(KeyAltN)] = "Alt-N"
|
||||
tcell.KeyNames[tcell.Key(KeyAltO)] = "Alt-O"
|
||||
tcell.KeyNames[tcell.Key(KeyAltP)] = "Alt-P"
|
||||
tcell.KeyNames[tcell.Key(KeyAltQ)] = "Alt-Q"
|
||||
tcell.KeyNames[tcell.Key(KeyAltR)] = "Alt-R"
|
||||
tcell.KeyNames[tcell.Key(KeyAltS)] = "Alt-S"
|
||||
tcell.KeyNames[tcell.Key(KeyAltT)] = "Alt-T"
|
||||
tcell.KeyNames[tcell.Key(KeyAltU)] = "Alt-U"
|
||||
tcell.KeyNames[tcell.Key(KeyAltV)] = "Alt-V"
|
||||
tcell.KeyNames[tcell.Key(KeyAltW)] = "Alt-W"
|
||||
tcell.KeyNames[tcell.Key(KeyAltX)] = "Alt-X"
|
||||
tcell.KeyNames[tcell.Key(KeyAltY)] = "Alt-Y"
|
||||
tcell.KeyNames[tcell.Key(KeyAltZ)] = "Alt-Z"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package ui
|
|||
import (
|
||||
"fmt"
|
||||
"path"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
"github.com/derailed/k9s/internal/config"
|
||||
|
|
@ -74,6 +75,16 @@ func NewTable(title string, styles *config.Styles) *Table {
|
|||
return &v
|
||||
}
|
||||
|
||||
// GetRow retrieves the entire selected row.
|
||||
func (v *Table) GetRow() resource.Row {
|
||||
r := make(resource.Row, v.GetColumnCount())
|
||||
for i := 0; i < v.GetColumnCount(); i++ {
|
||||
c := v.GetCell(v.selectedRow, i)
|
||||
r[i] = strings.TrimSpace(c.Text)
|
||||
}
|
||||
return r
|
||||
}
|
||||
|
||||
// AddSelectedRowListener add a new selected row listener.
|
||||
func (v *Table) AddSelectedRowListener(f SelectedRowFunc) {
|
||||
v.selListeners = append(v.selListeners, f)
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ type containerView struct {
|
|||
func newContainerView(ns string, app *appView, list resource.List, path string, exitFn func()) resourceViewer {
|
||||
v := containerView{logResourceView: newLogResourceView(ns, app, list)}
|
||||
v.path = &path
|
||||
v.envFn = v.k9sEnv
|
||||
v.containerFn = v.selectedContainer
|
||||
v.extraActionsFn = v.extraActions
|
||||
v.enterFn = v.viewLogs
|
||||
|
|
@ -53,6 +54,17 @@ func (v *containerView) extraActions(aa ui.KeyActions) {
|
|||
aa[ui.KeyAltM] = ui.NewKeyAction("Sort MEM%", v.sortColCmd(9, false), true)
|
||||
}
|
||||
|
||||
func (v *containerView) k9sEnv() K9sEnv {
|
||||
env := v.defaultK9sEnv()
|
||||
|
||||
ns, n := namespaced(*v.path)
|
||||
env["POD"] = n
|
||||
env["NAMESPACE"] = ns
|
||||
log.Debug().Msgf("OVER ENV %#v", env)
|
||||
|
||||
return env
|
||||
}
|
||||
|
||||
func (v *containerView) selectedContainer() string {
|
||||
return v.masterPage().GetSelectedItem()
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,8 +27,8 @@ func newDeployView(title string, app *appView, list resource.List) resourceViewe
|
|||
func (v *deployView) extraActions(aa ui.KeyActions) {
|
||||
v.logResourceView.extraActions(aa)
|
||||
v.scalableResourceView.extraActions(aa)
|
||||
aa[KeyShiftD] = newKeyAction("Sort Desired", v.sortColCmd(2, false), true)
|
||||
aa[KeyShiftC] = newKeyAction("Sort Current", v.sortColCmd(3, false), true)
|
||||
aa[ui.KeyShiftD] = ui.NewKeyAction("Sort Desired", v.sortColCmd(2, false), true)
|
||||
aa[ui.KeyShiftC] = ui.NewKeyAction("Sort Current", v.sortColCmd(3, false), true)
|
||||
}
|
||||
|
||||
func (v *deployView) showPods(app *appView, _, res, sel string) {
|
||||
|
|
|
|||
|
|
@ -0,0 +1,26 @@
|
|||
package views
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// K9sEnv represent K9s available env variables.
|
||||
type K9sEnv map[string]string
|
||||
|
||||
// EnvRX match $XXX custom arg.
|
||||
var envRX = regexp.MustCompile(`\A\$([\w|-]+)`)
|
||||
|
||||
func (e K9sEnv) envFor(n string) (string, error) {
|
||||
envs := envRX.FindStringSubmatch(n)
|
||||
if len(envs) == 0 {
|
||||
return n, nil
|
||||
}
|
||||
env, ok := e[strings.ToUpper(envs[1])]
|
||||
if !ok {
|
||||
return "", fmt.Errorf("No matching for %s", n)
|
||||
}
|
||||
|
||||
return env, nil
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
package views
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestK9sEnv(t *testing.T) {
|
||||
|
||||
uu := map[string]struct {
|
||||
q string
|
||||
err error
|
||||
e string
|
||||
}{
|
||||
"match": {q: "$A", err: nil, e: "10"},
|
||||
"noMatch": {q: "$BLEE", err: errors.New("No matching for $BLEE"), e: ""},
|
||||
"lower": {q: "$b", err: nil, e: "blee"},
|
||||
"dash": {q: "$col-0", err: nil, e: "fred"},
|
||||
}
|
||||
|
||||
e := K9sEnv{
|
||||
"A": "10",
|
||||
"B": "blee",
|
||||
"COL-0": "fred",
|
||||
}
|
||||
|
||||
for k, u := range uu {
|
||||
t.Run(k, func(t *testing.T) {
|
||||
a, err := e.envFor(u.q)
|
||||
assert.Equal(t, u.err, err)
|
||||
assert.Equal(t, u.e, a)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
|
@ -20,12 +20,12 @@ func runK(clear bool, app *appView, args ...string) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
return run(clear, app, bin, args...)
|
||||
return run(clear, app, bin, false, args...)
|
||||
}
|
||||
|
||||
func run(clear bool, app *appView, bin string, args ...string) bool {
|
||||
func run(clear bool, app *appView, bin string, bg bool, args ...string) bool {
|
||||
return app.Suspend(func() {
|
||||
if err := execute(clear, bin, args...); err != nil {
|
||||
if err := execute(clear, bin, bg, args...); err != nil {
|
||||
app.Flash().Errf("Command exited: %v", err)
|
||||
}
|
||||
})
|
||||
|
|
@ -38,14 +38,13 @@ func edit(clear bool, app *appView, args ...string) bool {
|
|||
return false
|
||||
}
|
||||
|
||||
return run(clear, app, bin, args...)
|
||||
return run(clear, app, bin, false, args...)
|
||||
}
|
||||
|
||||
func execute(clear bool, bin string, args ...string) error {
|
||||
func execute(clear bool, bin string, bg bool, args ...string) error {
|
||||
if clear {
|
||||
clearScreen()
|
||||
}
|
||||
log.Debug().Msgf("Running command > %s %s", bin, strings.Join(args, " "))
|
||||
ctx, cancel := context.WithCancel(context.Background())
|
||||
defer cancel()
|
||||
|
||||
|
|
@ -57,9 +56,17 @@ func execute(clear bool, bin string, args ...string) error {
|
|||
cancel()
|
||||
}()
|
||||
|
||||
log.Debug().Msgf("Running command > %s %s", bin, strings.Join(args, " "))
|
||||
|
||||
cmd := exec.Command(bin, args...)
|
||||
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
||||
err := cmd.Run()
|
||||
|
||||
var err error
|
||||
if bg {
|
||||
err = cmd.Start()
|
||||
} else {
|
||||
cmd.Stdin, cmd.Stdout, cmd.Stderr = os.Stdin, os.Stdout, os.Stderr
|
||||
err = cmd.Run()
|
||||
}
|
||||
log.Debug().Msgf("Command returned error?? %v", err)
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
|
|
|
|||
|
|
@ -1,14 +1,38 @@
|
|||
package views
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"path"
|
||||
"strings"
|
||||
|
||||
"github.com/derailed/k9s/internal/config"
|
||||
"github.com/gdamore/tcell"
|
||||
"golang.org/x/text/language"
|
||||
"golang.org/x/text/message"
|
||||
)
|
||||
|
||||
// In check if a string belongs to a set.
|
||||
func in(ss []string, s string) bool {
|
||||
for _, v := range ss {
|
||||
if v == s {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
// AsKey maps a string representation of a key to a tcell key.
|
||||
func asKey(key string) (tcell.Key, error) {
|
||||
for k, v := range tcell.KeyNames {
|
||||
if v == key {
|
||||
return k, nil
|
||||
}
|
||||
}
|
||||
|
||||
return 0, fmt.Errorf("No matching key found %s", key)
|
||||
}
|
||||
|
||||
// FwFQN returns a fully qualified ns/name:container id.
|
||||
func fwFQN(po, co string) string {
|
||||
return po + ":" + co
|
||||
|
|
|
|||
|
|
@ -121,27 +121,28 @@ func (v *podView) killCmd(evt *tcell.EventKey) *tcell.EventKey {
|
|||
if err := v.list.Resource().Delete(sel, true, false); err != nil {
|
||||
v.app.Flash().Errf("Delete failed with %s", err)
|
||||
} else {
|
||||
deletePortForward(v.app.forwarders, sel)
|
||||
v.refresh()
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (v *podView) sniffCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
if !v.masterPage().RowSelected() {
|
||||
return evt
|
||||
}
|
||||
// func (v *podView) sniffCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
// if !v.masterPage().RowSelected() {
|
||||
// return evt
|
||||
// }
|
||||
|
||||
ns, n := namespaced(v.masterPage().GetSelectedItem())
|
||||
var args []string
|
||||
args = append(args, "sniff", n, "-n", ns)
|
||||
// ns, n := namespaced(v.masterPage().GetSelectedItem())
|
||||
// var args []string
|
||||
// args = append(args, "sniff", n, "-n", ns)
|
||||
|
||||
if runK(true, v.app, args...) {
|
||||
v.app.Flash().Info("Sniff launched!")
|
||||
} else {
|
||||
v.app.Flash().Info("Sniff failed!")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
// if runK(true, v.app, args...) {
|
||||
// v.app.Flash().Info("Sniff launched!")
|
||||
// } else {
|
||||
// v.app.Flash().Info("Sniff failed!")
|
||||
// }
|
||||
// return nil
|
||||
// }
|
||||
|
||||
func (v *podView) logsCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
if v.viewLogs(false) {
|
||||
|
|
|
|||
|
|
@ -16,6 +16,9 @@ import (
|
|||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
// EnvFn represent the current view exposed environment.
|
||||
type envFn func() K9sEnv
|
||||
|
||||
type (
|
||||
updatable interface {
|
||||
restartUpdates()
|
||||
|
|
@ -33,12 +36,16 @@ type (
|
|||
path *string
|
||||
colorerFn ui.ColorerFunc
|
||||
decorateFn decorateFn
|
||||
envFn envFn
|
||||
}
|
||||
)
|
||||
|
||||
func newResourceView(title string, app *appView, list resource.List) resourceViewer {
|
||||
v := resourceView{list: list}
|
||||
v := resourceView{
|
||||
list: list,
|
||||
}
|
||||
v.masterDetail = newMasterDetail(title, list.GetNamespace(), app, v.backCmd)
|
||||
v.envFn = v.defaultK9sEnv
|
||||
|
||||
return &v
|
||||
}
|
||||
|
|
@ -190,6 +197,7 @@ func (v *resourceView) deleteCmd(evt *tcell.EventKey) *tcell.EventKey {
|
|||
if err := v.list.Resource().Delete(sel, cascade, force); err != nil {
|
||||
v.app.Flash().Errf("Delete failed with %s", err)
|
||||
} else {
|
||||
deletePortForward(v.app.forwarders, sel)
|
||||
v.refresh()
|
||||
}
|
||||
}, func() {
|
||||
|
|
@ -198,6 +206,16 @@ func (v *resourceView) deleteCmd(evt *tcell.EventKey) *tcell.EventKey {
|
|||
return nil
|
||||
}
|
||||
|
||||
func deletePortForward(ff map[string]forwarder, sel string) {
|
||||
for k, v := range ff {
|
||||
tokens := strings.Split(k, ":")
|
||||
if tokens[0] == sel {
|
||||
log.Debug().Msgf("Deleting associated portForward %s", k)
|
||||
v.Stop()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (v *resourceView) defaultEnter(ns, _, selection string) {
|
||||
if !v.list.Access(resource.DescribeAccess) {
|
||||
return
|
||||
|
|
@ -372,60 +390,46 @@ func (v *resourceView) refreshActions() {
|
|||
v.app.SetHints(t.Hints())
|
||||
}
|
||||
|
||||
func in(ss []string, s string) bool {
|
||||
for _, v := range ss {
|
||||
if v == s {
|
||||
return true
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
func asKey(key string) (tcell.Key, error) {
|
||||
for k, v := range tcell.KeyNames {
|
||||
if v == key {
|
||||
return k, nil
|
||||
}
|
||||
}
|
||||
|
||||
return 0, fmt.Errorf("No matching key found %s", key)
|
||||
}
|
||||
|
||||
func (v *resourceView) customActions(aa ui.KeyActions) {
|
||||
for _, plugin := range v.app.Config.K9s.Plugins {
|
||||
for k, plugin := range v.app.Config.K9s.Plugins {
|
||||
if !in(plugin.Scopes, v.list.GetName()) {
|
||||
continue
|
||||
}
|
||||
key, err := asKey(strings.ToUpper(plugin.ShortCut))
|
||||
key, err := asKey(plugin.ShortCut)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Msg("Unable to map shortcut to a key")
|
||||
continue
|
||||
}
|
||||
_, ok := aa[key]
|
||||
if ok {
|
||||
log.Error().Err(fmt.Errorf("Doh! you are trying to overide an existing command `%s", k)).Msg("Invalid shortcut")
|
||||
continue
|
||||
}
|
||||
aa[key] = ui.NewKeyAction(
|
||||
plugin.Description,
|
||||
v.execCmd(plugin.Command, plugin.Args...),
|
||||
v.execCmd(plugin.Command, plugin.Background, plugin.Args...),
|
||||
true)
|
||||
}
|
||||
}
|
||||
|
||||
func (v *resourceView) execCmd(bin string, args ...string) ui.ActionHandler {
|
||||
func (v *resourceView) execCmd(bin string, bg bool, args ...string) ui.ActionHandler {
|
||||
return func(evt *tcell.EventKey) *tcell.EventKey {
|
||||
if !v.masterPage().RowSelected() {
|
||||
return evt
|
||||
}
|
||||
|
||||
ns, n := namespaced(v.masterPage().GetSelectedItem())
|
||||
env := v.envFn()
|
||||
aa := make([]string, len(args))
|
||||
for i, a := range args {
|
||||
switch a {
|
||||
case "$NAMESPACE":
|
||||
args[i] = ns
|
||||
case "$NAME":
|
||||
args[i] = n
|
||||
var err error
|
||||
aa[i], err = env.envFor(a)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Msg("Args match failed")
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
if run(true, v.app, bin, args...) {
|
||||
if run(true, v.app, bin, bg, aa...) {
|
||||
v.app.Flash().Info("Custom CMD launched!")
|
||||
} else {
|
||||
v.app.Flash().Info("Custom CMD failed!")
|
||||
|
|
@ -433,3 +437,19 @@ func (v *resourceView) execCmd(bin string, args ...string) ui.ActionHandler {
|
|||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
func (v *resourceView) defaultK9sEnv() K9sEnv {
|
||||
ns, n := namespaced(v.masterPage().GetSelectedItem())
|
||||
env := K9sEnv{
|
||||
"NAMESPACE": ns,
|
||||
"NAME": n,
|
||||
}
|
||||
|
||||
row := v.masterPage().GetRow()
|
||||
for i, r := range row {
|
||||
env["COL-"+strconv.Itoa(i)] = r
|
||||
}
|
||||
|
||||
log.Debug().Msgf("ENVs %#v", env)
|
||||
return env
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import (
|
|||
"strconv"
|
||||
|
||||
"github.com/derailed/k9s/internal/resource"
|
||||
"github.com/derailed/k9s/internal/ui"
|
||||
"github.com/derailed/tview"
|
||||
"github.com/gdamore/tcell"
|
||||
)
|
||||
|
|
@ -27,16 +28,16 @@ func newScalableResourceViewForParent(parent *resourceView) *scalableResourceVie
|
|||
return &v
|
||||
}
|
||||
|
||||
func (v *scalableResourceView) extraActions(aa keyActions) {
|
||||
aa[KeyS] = newKeyAction("Scale", v.scaleCmd, true)
|
||||
func (v *scalableResourceView) extraActions(aa ui.KeyActions) {
|
||||
aa[ui.KeyS] = ui.NewKeyAction("Scale", v.scaleCmd, true)
|
||||
}
|
||||
|
||||
func (v *scalableResourceView) scaleCmd(evt *tcell.EventKey) *tcell.EventKey {
|
||||
if !v.rowSelected() {
|
||||
if !v.masterPage().RowSelected() {
|
||||
return evt
|
||||
}
|
||||
|
||||
v.showScaleDialog(v.list.GetName(), v.getSelectedItem())
|
||||
v.showScaleDialog(v.list.GetName(), v.masterPage().GetSelectedItem())
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -47,7 +48,7 @@ func (v *scalableResourceView) scale(selection string, replicas int) {
|
|||
|
||||
err := r.Scale(ns, n, int32(replicas))
|
||||
if err != nil {
|
||||
v.app.flash().err(err)
|
||||
v.app.Flash().Err(err)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -98,9 +99,9 @@ func (v *scalableResourceView) createStyledForm() *tview.Form {
|
|||
|
||||
func (v *scalableResourceView) okSelected(replicas string) {
|
||||
if val, err := strconv.Atoi(replicas); err == nil {
|
||||
v.scale(v.selectedItem, val)
|
||||
v.scale(v.masterPage().GetSelectedItem(), val)
|
||||
} else {
|
||||
v.app.flash().err(err)
|
||||
v.app.Flash().Err(err)
|
||||
}
|
||||
|
||||
v.dismissScaleDialog()
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ func newStatefulSetView(t string, app *appView, list resource.List) resourceView
|
|||
func (v *statefulSetView) extraActions(aa ui.KeyActions) {
|
||||
v.logResourceView.extraActions(aa)
|
||||
v.scalableResourceView.extraActions(aa)
|
||||
aa[KeyShiftD] = newKeyAction("Sort Desired", v.sortColCmd(1, false), true)
|
||||
aa[KeyShiftC] = newKeyAction("Sort Current", v.sortColCmd(2, false), true)
|
||||
aa[ui.KeyShiftD] = ui.NewKeyAction("Sort Desired", v.sortColCmd(1, false), true)
|
||||
aa[ui.KeyShiftC] = ui.NewKeyAction("Sort Current", v.sortColCmd(2, false), true)
|
||||
}
|
||||
|
||||
func (v *statefulSetView) showPods(app *appView, ns, res, sel string) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue