Skip to content
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
263 changes: 139 additions & 124 deletions glide.lock

Large diffs are not rendered by default.

18 changes: 10 additions & 8 deletions glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ import:

# kube
- package: k8s.io/apimachinery
version: kubernetes-1.14.0
version: kubernetes-1.16.0
- package: k8s.io/api
version: kubernetes-1.14.0
version: kubernetes-1.16.0
- package: k8s.io/apiserver
version: kubernetes-1.14.0
version: kubernetes-1.16.0
- package: k8s.io/client-go
version: kubernetes-1.14.0
version: kubernetes-1.16.0
- package: k8s.io/kube-aggregator
version: kubernetes-1.14.0
version: kubernetes-1.16.0
- package: k8s.io/code-generator
version: kubernetes-1.14.0
version: kubernetes-1.16.0
- package: k8s.io/component-base
version: kubernetes-1.14.0
version: kubernetes-1.16.0

# openshift
- package: github.com/openshift/api
Expand All @@ -29,10 +29,12 @@ import:

# codegen
- package: k8s.io/gengo/args
version: 01a732e01d00cb9a81bb0ca050d3e6d2b947927b
version: 26a664648505d962332bda642b27306bc10d1082
- package: golang.org/x/tools/imports

# third party
- package: sigs.k8s.io/structured-merge-diff
version: 0c1d754dd6485aa156ff3c8c599079adac6ec82f
- package: github.com/go-test/deep
version: master

Expand Down
5 changes: 2 additions & 3 deletions pkg/console/subresource/configmap/service_ca_test.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package configmap

import (
"github.com/go-test/deep"
"testing"

"github.com/go-test/deep"

corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

Expand Down Expand Up @@ -41,7 +42,6 @@ func TestDefaultServiceCAConfigMap(t *testing.T) {
Labels: map[string]string{"app": api.OpenShiftConsoleName},
Annotations: map[string]string{injectCABundleAnnotation: "true"},
OwnerReferences: nil,
Initializers: nil,
Finalizers: nil,
},
},
Expand Down Expand Up @@ -75,7 +75,6 @@ func TestServiceCAStub(t *testing.T) {
Labels: map[string]string{"app": api.OpenShiftConsoleName},
Annotations: map[string]string{injectCABundleAnnotation: "true"},
OwnerReferences: nil,
Initializers: nil,
Finalizers: nil,
},
Data: nil,
Expand Down
3 changes: 0 additions & 3 deletions pkg/console/subresource/deployment/deployment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ func TestDefaultDeployment(t *testing.T) {
consoleImageAnnotation: "",
},
OwnerReferences: nil,
Initializers: nil,
Finalizers: nil,
ClusterName: "",
}
Expand All @@ -87,7 +86,6 @@ func TestDefaultDeployment(t *testing.T) {
Labels: labels,
Annotations: nil,
OwnerReferences: nil,
Initializers: nil,
Finalizers: nil,
ClusterName: "",
},
Expand Down Expand Up @@ -320,7 +318,6 @@ func TestStub(t *testing.T) {
DeletionGracePeriodSeconds: nil,
Annotations: map[string]string{},
OwnerReferences: nil,
Initializers: nil,
Finalizers: nil,
ClusterName: "",
},
Expand Down
1 change: 0 additions & 1 deletion pkg/console/subresource/route/route_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ func TestStub(t *testing.T) {
Labels: map[string]string{"app": api.OpenShiftConsoleName},
Annotations: map[string]string{},
OwnerReferences: nil,
Initializers: nil,
Finalizers: nil,
ClusterName: "",
},
Expand Down

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

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

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

57 changes: 25 additions & 32 deletions vendor/github.com/coreos/etcd/.travis.yml

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

Loading