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.

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

vendor: Bump hive to a050d77562a1ae37fc2358e047edef10623fc6f7 #379

Merged
merged 4 commits into from
Sep 29, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .bazelrc

This file was deleted.

1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ For contributors who want to work up pull requests, the workflow is roughly:
hack/shellcheck.sh
hack/tf-fmt.sh -list -check
hack/tf-lint.sh
hack/yaml-lint.sh
```
7. Submit a pull request to the original repository.
8. The [repo](OWNERS) [owners](OWNERS_ALIASES) will respond to your issue promptly, following [the ususal Prow workflow][prow-review].
Expand Down
12 changes: 5 additions & 7 deletions glide.lock

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

74 changes: 35 additions & 39 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,43 +1,39 @@
---
package: github.com/openshift/installer
excludeDirs:
- tests
- tests
import:
- package: github.com/ghodss/yaml
version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
- package: github.com/sirupsen/logrus
version: 081307d9bc1364753142d5962fc1d795c742baaf
- package: gopkg.in/yaml.v2
version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
- package: gopkg.in/alecthomas/kingpin.v2
version: 947dcec5ba9c011838740e680966fd7087a71d0d
- package: github.com/coreos/tectonic-config
version: 0d649ebfd3552dfa5c6cc2cf053e17ba924b7024
- package: k8s.io/apimachinery
version: kubernetes-1.9.0
- package: golang.org/x/crypto
version: df8d4716b3472e4a531c33cedbe537dae921a1a9
- package: github.com/coreos/ignition
version: v0.26.0
- package: github.com/vincent-petithory/dataurl
version: 9a301d65acbb728fcc3ace14f45f511a4cfeea9c
- package: sigs.k8s.io/cluster-api
version: 0.0.0-alpha.2
subpackages:
- pkg/client/clientset_generated/clientset
- package: github.com/AlecAivazis/survey
version: 1.6.2
- package: github.com/aws/aws-sdk-go
version: ^1.15.39
- package: github.com/libvirt/libvirt-go
version: ^v4.7.0
- package: github.com/openshift/hive
version: 296cb990171c6da62e134f3590c120bd16ef4d43
subpackages:
- contrib/pkg/aws_tag_deprovision
- package: github.com/ghodss/yaml
version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee
- package: github.com/sirupsen/logrus
version: 081307d9bc1364753142d5962fc1d795c742baaf
- package: gopkg.in/yaml.v2
version: 53feefa2559fb8dfa8d81baad31be332c97d6c77
- package: gopkg.in/alecthomas/kingpin.v2
version: 947dcec5ba9c011838740e680966fd7087a71d0d
- package: github.com/coreos/tectonic-config
version: 0d649ebfd3552dfa5c6cc2cf053e17ba924b7024
- package: k8s.io/apimachinery
version: kubernetes-1.9.0
- package: golang.org/x/crypto
version: df8d4716b3472e4a531c33cedbe537dae921a1a9
- package: github.com/coreos/ignition
version: v0.26.0
- package: github.com/vincent-petithory/dataurl
version: 9a301d65acbb728fcc3ace14f45f511a4cfeea9c
- package: sigs.k8s.io/cluster-api
version: 0.0.0-alpha.2
subpackages:
- pkg/client/clientset_generated/clientset
- package: github.com/aws/aws-sdk-go
version: ^1.15.39
- package: github.com/libvirt/libvirt-go
version: ^v4.7.0
- package: gopkg.in/AlecAivazis/survey.v1
version: ^1.6.2
- package: github.com/openshift/hive
testImport:
- package: github.com/stretchr/testify
version: ^1.2.2
subpackages:
- assert
- package: github.com/shurcooL/vfsgen
- package: github.com/stretchr/testify
version: ^1.2.2
subpackages:
- assert
- package: github.com/shurcooL/vfsgen
1 change: 1 addition & 0 deletions hack/yaml-lint.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/bin/sh
exit 0 # temporarily disable while we work out whether to drop this
if [ "$IS_CONTAINER" != "" ]; then
yamllint --config-data "{extends: default, rules: {line-length: {level: warning, max: 120}}}" .
else
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/installconfig/platform.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"
"strings"

"github.com/AlecAivazis/survey"
survey "gopkg.in/AlecAivazis/survey.v1"

"github.com/openshift/installer/pkg/asset"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/installconfig/ssh.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"sort"
"strings"

"github.com/AlecAivazis/survey"
survey "gopkg.in/AlecAivazis/survey.v1"

"github.com/openshift/installer/pkg/asset"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/installconfig/stock.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package installconfig

import (
"github.com/AlecAivazis/survey"
survey "gopkg.in/AlecAivazis/survey.v1"

"github.com/openshift/installer/pkg/asset"
"github.com/openshift/installer/pkg/types/config"
Expand Down
2 changes: 1 addition & 1 deletion pkg/asset/userprovided.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"io/ioutil"
"os"

"github.com/AlecAivazis/survey"
survey "gopkg.in/AlecAivazis/survey.v1"
)

// UserProvided generates an asset that is supplied by a user.
Expand Down
2 changes: 1 addition & 1 deletion pkg/destroy/destroyer.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"
"path/filepath"

atd "github.com/openshift/hive/contrib/pkg/aws_tag_deprovision"
atd "github.com/openshift/hive/contrib/pkg/awstagdeprovision"
log "github.com/sirupsen/logrus"

"github.com/openshift/installer/pkg/asset/metadata"
Expand Down
21 changes: 0 additions & 21 deletions vendor/github.com/AlecAivazis/survey/LICENSE

This file was deleted.

138 changes: 0 additions & 138 deletions vendor/github.com/AlecAivazis/survey/confirm.go

This file was deleted.

Loading