Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-vendor K8s to ~1.11.0-alpha.2 #248

Merged
merged 2 commits into from
May 3, 2018
Merged

Re-vendor K8s to ~1.11.0-alpha.2 #248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b75c477
Update vendor
May 3, 2018
26b98db
Remove secret generator and replace with simple kubectl call
May 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 12 additions & 12 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions Gopkg.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ ignored = ["k8s.io/kubernetes/pkg/api"]

[[constraint]]
name = "k8s.io/api"
revision = "kubernetes-1.10.0-rc.1"
revision = "kubernetes-1.11.0-alpha.2"

# This needs to be an override as it is a non-direct dependency and will not be
# considered by `dep` as a constraint.
[[override]]
name = "k8s.io/apiserver"
revision = "kubernetes-1.10.0-rc.1"
revision = "kubernetes-1.11.0-alpha.2"

[[constraint]]
name = "k8s.io/apimachinery"
revision = "kubernetes-1.10.0-rc.1"
revision = "kubernetes-1.11.0-alpha.2"

[[constraint]]
name = "k8s.io/client-go"
revision = "kubernetes-1.10.0-rc.1"
revision = "kubernetes-1.11.0-alpha.2"

[[constraint]]
name = "k8s.io/kubernetes"
revision = "9c40f5b5a622c61c2e37efd37bf136d174d6799a"
revision = "33d85b01fe42663de500747def3eaae75cfa0950"

# This needs to be an override as it is a non-direct dependency and will not be
# considered by `dep` as a constraint.
Expand Down
4 changes: 0 additions & 4 deletions examples/https/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,13 @@ all:

KEY = /tmp/tls.key
CERT = /tmp/tls.crt
SECRET = /tmp/tls.json
HOST=example.com
NAME=tls-secret

keys:
# The CName used here is specific to the service specified in nginx-app.yaml.
openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout $(KEY) -out $(CERT) -subj "/CN=$(HOST)/O=$(HOST)"

secret:
godep go run make_secret.go -crt $(CERT) -key $(KEY) -name $(NAME) > $(SECRET)

clean:
rm $(KEY)
rm $(CERT)
4 changes: 2 additions & 2 deletions examples/https/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

Create secret
```console
$ make keys secret
$ kubectl create -f /tmp/tls.json
$ make keys
$ kubectl create secret tls foo-secret --key /tmp/tls.key --cert /tmp/tls.crt
```

Make sure you have the l7 controller running:
Expand Down
75 changes: 0 additions & 75 deletions examples/https/make_secret.go
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions vendor/github.com/howeyc/gopass/.travis.yml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions vendor/github.com/howeyc/gopass/LICENSE.txt
View file
Open in desktop

This file was deleted.

Loading