Skip to content

Commit 344f1a3

Browse files
committed
chore(deps): bump to kube 1.17.3
* Updates kube dependencies to 1.17.3. * Also removes dependency on k8s.io/kubernetes my manually vendoring 1.17 version of it inside pkg/lib/ as a stop gap measure till other alternatives to rbac authorizer and any other parts of k8s.io/kubernetes used in olm is found.
1 parent 2dea823 commit 344f1a3

File tree

916 files changed

+71322
-35708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

916 files changed

+71322
-35708
lines changed

go.mod

Lines changed: 15 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.12
55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/coreos/go-semver v0.3.0
8+
github.com/davecgh/go-spew v1.1.1
89
github.com/fsnotify/fsnotify v1.4.7
910
github.com/ghodss/yaml v1.0.0
1011
github.com/go-openapi/spec v0.19.4
@@ -14,10 +15,10 @@ require (
1415
github.com/mitchellh/hashstructure v1.0.0
1516
github.com/onsi/ginkgo v1.10.1
1617
github.com/onsi/gomega v1.7.0
17-
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
18+
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
1819
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
19-
github.com/operator-framework/operator-registry v1.5.8
20-
github.com/otiai10/copy v1.0.1
20+
github.com/operator-framework/operator-registry v1.6.1
21+
github.com/otiai10/copy v1.0.2
2122
github.com/pkg/errors v0.9.1
2223
github.com/prometheus/client_golang v1.2.1
2324
github.com/sirupsen/logrus v1.4.2
@@ -26,19 +27,18 @@ require (
2627
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
2728
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
2829
google.golang.org/grpc v1.27.0
29-
gopkg.in/yaml.v2 v2.2.4
30+
gopkg.in/yaml.v2 v2.2.8
3031
helm.sh/helm/v3 v3.1.2
31-
k8s.io/api v0.17.2
32-
k8s.io/apiextensions-apiserver v0.17.2
33-
k8s.io/apimachinery v0.17.2
34-
k8s.io/apiserver v0.0.0
35-
k8s.io/client-go v8.0.0+incompatible
36-
k8s.io/code-generator v0.0.0
37-
k8s.io/component-base v0.0.0
32+
k8s.io/api v0.17.3
33+
k8s.io/apiextensions-apiserver v0.17.3
34+
k8s.io/apimachinery v0.17.3
35+
k8s.io/apiserver v0.17.3
36+
k8s.io/client-go v0.17.3
37+
k8s.io/code-generator v0.17.3
38+
k8s.io/component-base v0.17.3
3839
k8s.io/klog v1.0.0
39-
k8s.io/kube-aggregator v0.0.0
40-
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
41-
k8s.io/kubernetes v1.16.0
40+
k8s.io/kube-aggregator v0.17.3
41+
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
4242
sigs.k8s.io/controller-tools v0.2.4
4343
)
4444

@@ -49,30 +49,5 @@ replace (
4949
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
5050
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
5151
google.golang.org/grpc => google.golang.org/grpc v1.26.0 // https://github.com/etcd-io/etcd/issues/11563
52-
53-
// Pin to kube 1.16
54-
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
55-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
56-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
57-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
58-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
59-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
60-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
61-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
62-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
63-
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
64-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
65-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
66-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
67-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
68-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
69-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
70-
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
71-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
72-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
73-
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
74-
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
75-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
76-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
77-
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
52+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
7853
)

go.sum

Lines changed: 123 additions & 0 deletions
Large diffs are not rendered by default.

pkg/controller/install/deployment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import (
44
"fmt"
55
"hash/fnv"
66

7+
hashutil "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/util/hash"
78
log "github.com/sirupsen/logrus"
89
appsv1 "k8s.io/api/apps/v1"
910
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1011
"k8s.io/apimachinery/pkg/util/rand"
11-
hashutil "k8s.io/kubernetes/pkg/util/hash"
1212

1313
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
1414
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/wrappers"

pkg/controller/install/deployment_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ import (
44
"fmt"
55
"testing"
66

7+
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/util/labels"
78
"github.com/stretchr/testify/assert"
89
"github.com/stretchr/testify/require"
910
appsv1 "k8s.io/api/apps/v1"
1011
corev1 "k8s.io/api/core/v1"
1112
rbacv1 "k8s.io/api/rbac/v1"
1213
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
13-
"k8s.io/kubernetes/pkg/util/labels"
1414

1515
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
1616
clientfakes "github.com/operator-framework/operator-lifecycle-manager/pkg/api/wrappers/wrappersfakes"

pkg/controller/install/rule_checker.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ package install
33
import (
44
"fmt"
55

6+
rbacauthorizer "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/plugin/pkg/auth/authorizer/rbac"
67
corev1 "k8s.io/api/core/v1"
78
rbacv1 "k8s.io/api/rbac/v1"
89
"k8s.io/apimachinery/pkg/labels"
910
"k8s.io/apiserver/pkg/authorization/authorizer"
1011
crbacv1 "k8s.io/client-go/listers/rbac/v1"
11-
rbacauthorizer "k8s.io/kubernetes/plugin/pkg/auth/authorizer/rbac"
1212

1313
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
1414
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/ownerutil"

pkg/controller/operators/olm/operatorgroup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ import (
66
"strings"
77

88
v1 "github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1"
9+
utillabels "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/util/labels"
910
"github.com/sirupsen/logrus"
1011
corev1 "k8s.io/api/core/v1"
1112
rbacv1 "k8s.io/api/rbac/v1"
1213
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1314
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1415
"k8s.io/apimachinery/pkg/labels"
1516
"k8s.io/apimachinery/pkg/util/errors"
16-
utillabels "k8s.io/kubernetes/pkg/util/labels"
1717

1818
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
1919
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/install"

pkg/controller/registry/reconciler/configmap_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"time"
88

99
"github.com/ghodss/yaml"
10+
k8slabels "github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubernetes/pkg/util/labels"
1011
"github.com/stretchr/testify/require"
1112
corev1 "k8s.io/api/core/v1"
1213
rbacv1 "k8s.io/api/rbac/v1"
@@ -18,7 +19,6 @@ import (
1819
"k8s.io/apimachinery/pkg/types"
1920
"k8s.io/client-go/informers"
2021
"k8s.io/client-go/tools/cache"
21-
k8slabels "k8s.io/kubernetes/pkg/util/labels"
2222

2323
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
2424
"github.com/operator-framework/operator-lifecycle-manager/pkg/controller/registry"
File renamed without changes.

vendor/k8s.io/kubernetes/pkg/apis/rbac/BUILD renamed to pkg/lib/kubernetes/pkg/apis/rbac/BUILD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ go_library(
1515
"types.go",
1616
"zz_generated.deepcopy.go",
1717
],
18-
importpath = "k8s.io/kubernetes/pkg/apis/rbac",
18+
importpath = "lib/kubernetes/pkg/apis/rbac",
1919
deps = [
2020
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
2121
"//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",

0 commit comments

Comments
 (0)