Skip to content

Commit 9e26850

Browse files
ecordellecordell
committed
chore(deps): bump to kube 1.18
1 parent 573194a commit 9e26850

File tree

1,817 files changed

+92681
-99696
lines changed

Some content is hidden

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

1,817 files changed

+92681
-99696
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM openshift/origin-release:golang-1.12 as builder
1+
FROM openshift/origin-release:golang-1.13 as builder
22
RUN yum update -y
33
RUN yum install -y make git
44

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ setup-bare: clean e2e.namespace
117117

118118
# e2e test exculding the rh-operators directory which tests rh-operators and their metric cardinality.
119119
e2e:
120-
go test -v $(MOD_FLAGS) -failfast -timeout 70m ./test/e2e/... -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager -dummyImage=bitnami/nginx:latest
120+
go test -v $(MOD_FLAGS) -failfast -timeout 150m ./test/e2e/... -namespace=openshift-operators -kubeconfig=${KUBECONFIG} -olmNamespace=openshift-operator-lifecycle-manager -dummyImage=bitnami/nginx:latest
121121

122122
e2e-local: build-linux build-wait build-util-linux
123123
. ./scripts/build_local.sh

‎cmd/olm/cleanup.go

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
package main
22

33
import (
4+
"context"
45
"time"
56

6-
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
7-
87
"github.com/sirupsen/logrus"
98
rbacv1 "k8s.io/api/rbac/v1"
109
"k8s.io/apimachinery/pkg/api/errors"
@@ -14,6 +13,7 @@ import (
1413
"k8s.io/apimachinery/pkg/util/wait"
1514
"k8s.io/client-go/util/retry"
1615
apiregv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
16+
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
1717

1818
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/apis/operators/v1alpha1"
1919
"github.com/operator-framework/operator-lifecycle-manager/pkg/api/client/clientset/versioned"
@@ -88,53 +88,53 @@ func waitForDelete(checkResource checkResourceFunc, deleteResource deleteResourc
8888

8989
func checkClusterServiceVersion(crc versioned.Interface, name string) checkResourceFunc {
9090
return func() error {
91-
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(*namespace).Get(name, metav1.GetOptions{})
91+
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(*namespace).Get(context.TODO(), name, metav1.GetOptions{})
9292
return err
9393
}
9494
}
9595

9696
func deleteClusterServiceVersion(crc versioned.Interface, name string) deleteResourceFunc {
9797
return func() error {
98-
return crc.OperatorsV1alpha1().ClusterServiceVersions(*namespace).Delete(name, metav1.NewDeleteOptions(0))
98+
return crc.OperatorsV1alpha1().ClusterServiceVersions(*namespace).Delete(context.TODO(), name, *metav1.NewDeleteOptions(0))
9999
}
100100
}
101101

102102
func checkSubscription(crc versioned.Interface, name string) checkResourceFunc {
103103
return func() error {
104-
_, err := crc.OperatorsV1alpha1().Subscriptions(*namespace).Get(name, metav1.GetOptions{})
104+
_, err := crc.OperatorsV1alpha1().Subscriptions(*namespace).Get(context.TODO(), name, metav1.GetOptions{})
105105
return err
106106
}
107107
}
108108

109109
func deleteSubscription(crc versioned.Interface, name string) deleteResourceFunc {
110110
return func() error {
111-
return crc.OperatorsV1alpha1().Subscriptions(*namespace).Delete(name, metav1.NewDeleteOptions(0))
111+
return crc.OperatorsV1alpha1().Subscriptions(*namespace).Delete(context.TODO(), name, *metav1.NewDeleteOptions(0))
112112
}
113113
}
114114

115115
func checkConfigMap(c operatorclient.ClientInterface, name string) checkResourceFunc {
116116
return func() error {
117-
_, err := c.KubernetesInterface().CoreV1().ConfigMaps(*namespace).Get(name, metav1.GetOptions{})
117+
_, err := c.KubernetesInterface().CoreV1().ConfigMaps(*namespace).Get(context.TODO(), name, metav1.GetOptions{})
118118
return err
119119
}
120120
}
121121

122122
func deleteConfigMap(c operatorclient.ClientInterface, name string) deleteResourceFunc {
123123
return func() error {
124-
return c.KubernetesInterface().CoreV1().ConfigMaps(*namespace).Delete(name, metav1.NewDeleteOptions(0))
124+
return c.KubernetesInterface().CoreV1().ConfigMaps(*namespace).Delete(context.TODO(), name, *metav1.NewDeleteOptions(0))
125125
}
126126
}
127127

128128
func checkCatalogSource(crc versioned.Interface, name string) checkResourceFunc {
129129
return func() error {
130-
_, err := crc.OperatorsV1alpha1().CatalogSources(*namespace).Get(name, metav1.GetOptions{})
130+
_, err := crc.OperatorsV1alpha1().CatalogSources(*namespace).Get(context.TODO(), name, metav1.GetOptions{})
131131
return err
132132
}
133133
}
134134

135135
func deleteCatalogSource(crc versioned.Interface, name string) deleteResourceFunc {
136136
return func() error {
137-
return crc.OperatorsV1alpha1().CatalogSources(*namespace).Delete(name, metav1.NewDeleteOptions(0))
137+
return crc.OperatorsV1alpha1().CatalogSources(*namespace).Delete(context.TODO(), name, *metav1.NewDeleteOptions(0))
138138
}
139139
}
140140

@@ -145,7 +145,7 @@ func deleteCatalogSource(crc versioned.Interface, name string) deleteResourceFun
145145
// OwnerReference, and in cases where OLM is updated, they must be removed to prevent erroneous deletion of OLM's self-hosted components.
146146
func cleanupOwnerReferences(c operatorclient.ClientInterface, crc versioned.Interface) error {
147147
listOpts := metav1.ListOptions{}
148-
csvs, err := crc.OperatorsV1alpha1().ClusterServiceVersions(metav1.NamespaceAll).List(listOpts)
148+
csvs, err := crc.OperatorsV1alpha1().ClusterServiceVersions(metav1.NamespaceAll).List(context.TODO(), listOpts)
149149
if err != nil {
150150
return err
151151
}
@@ -162,26 +162,26 @@ func cleanupOwnerReferences(c operatorclient.ClientInterface, crc versioned.Inte
162162
objs = append(objs, &obj)
163163
}
164164

165-
clusterRoles, _ := c.KubernetesInterface().RbacV1().ClusterRoles().List(listOpts)
165+
clusterRoles, _ := c.KubernetesInterface().RbacV1().ClusterRoles().List(context.TODO(), listOpts)
166166
for _, obj := range clusterRoles.Items {
167167
objs = append(objs, &obj)
168168
}
169169

170-
clusterRoleBindings, _ := c.KubernetesInterface().RbacV1().ClusterRoleBindings().List(listOpts)
170+
clusterRoleBindings, _ := c.KubernetesInterface().RbacV1().ClusterRoleBindings().List(context.TODO(), listOpts)
171171
for _, obj := range clusterRoleBindings.Items {
172172
objs = append(objs, &obj)
173173
}
174174

175-
roles, _ := c.KubernetesInterface().RbacV1().Roles(metav1.NamespaceAll).List(listOpts)
175+
roles, _ := c.KubernetesInterface().RbacV1().Roles(metav1.NamespaceAll).List(context.TODO(), listOpts)
176176
for _, obj := range roles.Items {
177177
objs = append(objs, &obj)
178178
}
179-
roleBindings, _ := c.KubernetesInterface().RbacV1().RoleBindings(metav1.NamespaceAll).List(listOpts)
179+
roleBindings, _ := c.KubernetesInterface().RbacV1().RoleBindings(metav1.NamespaceAll).List(context.TODO(), listOpts)
180180
for _, obj := range roleBindings.Items {
181181
objs = append(objs, &obj)
182182
}
183183

184-
apiServices, _ := c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().List(listOpts)
184+
apiServices, _ := c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().List(context.TODO(), listOpts)
185185
for _, obj := range apiServices.Items {
186186
objs = append(objs, &obj)
187187
}
@@ -198,32 +198,32 @@ func cleanupOwnerReferences(c operatorclient.ClientInterface, crc versioned.Inte
198198
switch v := obj.(type) {
199199
case *v1alpha1.ClusterServiceVersion:
200200
update = func() error {
201-
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(v.GetNamespace()).Update(v)
201+
_, err := crc.OperatorsV1alpha1().ClusterServiceVersions(v.GetNamespace()).Update(context.TODO(), v, metav1.UpdateOptions{})
202202
return err
203203
}
204204
case *rbacv1.ClusterRole:
205205
update = func() error {
206-
_, err = c.KubernetesInterface().RbacV1().ClusterRoles().Update(v)
206+
_, err = c.KubernetesInterface().RbacV1().ClusterRoles().Update(context.TODO(), v, metav1.UpdateOptions{})
207207
return err
208208
}
209209
case *rbacv1.ClusterRoleBinding:
210210
update = func() error {
211-
_, err = c.KubernetesInterface().RbacV1().ClusterRoleBindings().Update(v)
211+
_, err = c.KubernetesInterface().RbacV1().ClusterRoleBindings().Update(context.TODO(), v, metav1.UpdateOptions{})
212212
return err
213213
}
214214
case *rbacv1.Role:
215215
update = func() error {
216-
_, err = c.KubernetesInterface().RbacV1().Roles(v.GetNamespace()).Update(v)
216+
_, err = c.KubernetesInterface().RbacV1().Roles(v.GetNamespace()).Update(context.TODO(), v, metav1.UpdateOptions{})
217217
return err
218218
}
219219
case *rbacv1.RoleBinding:
220220
update = func() error {
221-
_, err = c.KubernetesInterface().RbacV1().RoleBindings(v.GetNamespace()).Update(v)
221+
_, err = c.KubernetesInterface().RbacV1().RoleBindings(v.GetNamespace()).Update(context.TODO(), v, metav1.UpdateOptions{})
222222
return err
223223
}
224224
case *apiregv1.APIService:
225225
update = func() error {
226-
_, err = c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().Update(v)
226+
_, err = c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().Update(context.TODO(), v, metav1.UpdateOptions{})
227227
return err
228228
}
229229
}
@@ -263,7 +263,7 @@ func crossNamespaceOwnerReferenceRemoval(kind string, uidNamespaces map[types.UI
263263
// ensureAPIServiceLabels checks the labels of existing APIService objects to ensure ownership is set correctly.
264264
// If the APIService label does not correspond to the expected packageserver owner the APIService labels are updated
265265
func ensureAPIServiceLabels(c clientset.Interface) error {
266-
apiService, err := c.ApiregistrationV1().APIServices().Get(olm.PackageserverName, metav1.GetOptions{})
266+
apiService, err := c.ApiregistrationV1().APIServices().Get(context.TODO(), olm.PackageserverName, metav1.GetOptions{})
267267
if err != nil && !k8serrors.IsNotFound(err) {
268268
logrus.WithField("apiService", "packageserver").Debugf("get error: %s", err)
269269
return err
@@ -280,7 +280,7 @@ func ensureAPIServiceLabels(c clientset.Interface) error {
280280
if apiService.Labels[ownerutil.OwnerKey] != ownerutil.OwnerPackageServer {
281281
apiService.Labels[ownerutil.OwnerKey] = ownerutil.OwnerPackageServer
282282
update := func() error {
283-
_, err := c.ApiregistrationV1().APIServices().Update(apiService)
283+
_, err := c.ApiregistrationV1().APIServices().Update(context.TODO(), apiService, metav1.UpdateOptions{})
284284
return err
285285
}
286286
if err := retry.RetryOnConflict(retry.DefaultBackoff, update); err != nil {

‎cmd/olm/cleanup_test.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package main
22

33
import (
4+
"context"
45
"testing"
56

67
"github.com/stretchr/testify/require"
@@ -481,23 +482,23 @@ func TestCleanupOwnerReferences(t *testing.T) {
481482
require.NoError(t, err)
482483
require.ElementsMatch(t, tt.expected.csvs, csvs.Items)
483484

484-
clusterRoles, err := c.KubernetesInterface().RbacV1().ClusterRoles().List(listOpts)
485+
clusterRoles, err := c.KubernetesInterface().RbacV1().ClusterRoles().List(context.TODO(), listOpts)
485486
require.NoError(t, err)
486487
require.ElementsMatch(t, tt.expected.clusterRoles, clusterRoles.Items)
487488

488-
clusterRoleBindings, err := c.KubernetesInterface().RbacV1().ClusterRoleBindings().List(listOpts)
489+
clusterRoleBindings, err := c.KubernetesInterface().RbacV1().ClusterRoleBindings().List(context.TODO(), listOpts)
489490
require.NoError(t, err)
490491
require.ElementsMatch(t, tt.expected.clusterRoleBindings, clusterRoleBindings.Items)
491492

492-
roles, err := c.KubernetesInterface().RbacV1().Roles(metav1.NamespaceAll).List(listOpts)
493+
roles, err := c.KubernetesInterface().RbacV1().Roles(metav1.NamespaceAll).List(context.TODO(), listOpts)
493494
require.NoError(t, err)
494495
require.ElementsMatch(t, tt.expected.roles, roles.Items)
495496

496-
roleBindings, err := c.KubernetesInterface().RbacV1().RoleBindings(metav1.NamespaceAll).List(listOpts)
497+
roleBindings, err := c.KubernetesInterface().RbacV1().RoleBindings(metav1.NamespaceAll).List(context.TODO(), listOpts)
497498
require.NoError(t, err)
498499
require.ElementsMatch(t, tt.expected.roleBindings, roleBindings.Items)
499500

500-
apiService, err := c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().List(listOpts)
501+
apiService, err := c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().List(context.TODO(), listOpts)
501502
require.NoError(t, err)
502503
require.ElementsMatch(t, tt.expected.apiServices, apiService.Items)
503504
})
@@ -593,7 +594,7 @@ func TestCheckAPIServiceLabels(t *testing.T) {
593594
c := operatorclient.NewClient(k8sClient, apiextensionsfake.NewSimpleClientset(), apiregistrationfake.NewSimpleClientset(tt.fields.apiServices...))
594595
require.Equal(t, tt.expected.err, ensureAPIServiceLabels(c.ApiregistrationV1Interface()))
595596

596-
apiService, err := c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().List(listOpts)
597+
apiService, err := c.ApiregistrationV1Interface().ApiregistrationV1().APIServices().List(context.TODO(), listOpts)
597598
require.NoError(t, err)
598599
require.ElementsMatch(t, tt.expected.apiServices, apiService.Items)
599600
})

‎go.mod

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,36 @@ require (
1111
github.com/go-bindata/go-bindata/v3 v3.1.3
1212
github.com/go-openapi/spec v0.19.4
1313
github.com/golang/mock v1.3.1
14+
github.com/google/go-cmp v0.4.0
1415
github.com/irifrance/gini v1.0.1
1516
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
1617
github.com/mikefarah/yq/v2 v2.4.1
1718
github.com/mitchellh/hashstructure v1.0.0
18-
github.com/onsi/ginkgo v1.10.1
19-
github.com/onsi/gomega v1.7.0
20-
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
21-
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
22-
github.com/operator-framework/operator-registry v1.6.1
19+
github.com/onsi/ginkgo v1.12.0
20+
github.com/onsi/gomega v1.9.0
21+
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
22+
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
23+
github.com/operator-framework/operator-registry v1.11.0
2324
github.com/otiai10/copy v1.0.2
2425
github.com/pkg/errors v0.9.1
2526
github.com/prometheus/client_golang v1.2.1
2627
github.com/sirupsen/logrus v1.4.2
27-
github.com/spf13/cobra v0.0.5
28-
github.com/stretchr/testify v1.4.0
28+
github.com/spf13/cobra v1.0.0
29+
github.com/stretchr/testify v1.5.1
2930
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
3031
google.golang.org/grpc v1.27.0
3132
gopkg.in/yaml.v2 v2.2.8
3233
helm.sh/helm/v3 v3.1.2
33-
k8s.io/api v0.17.3
34-
k8s.io/apiextensions-apiserver v0.17.3
35-
k8s.io/apimachinery v0.17.3
36-
k8s.io/apiserver v0.17.3
37-
k8s.io/client-go v0.17.3
38-
k8s.io/code-generator v0.17.3
39-
k8s.io/component-base v0.17.3
34+
k8s.io/api v0.18.0
35+
k8s.io/apiextensions-apiserver v0.18.0
36+
k8s.io/apimachinery v0.18.0
37+
k8s.io/apiserver v0.18.0
38+
k8s.io/client-go v0.18.0
39+
k8s.io/code-generator v0.18.0
40+
k8s.io/component-base v0.18.0
4041
k8s.io/klog v1.0.0
41-
k8s.io/kube-aggregator v0.17.3
42-
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
42+
k8s.io/kube-aggregator v0.18.0
43+
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
4344
rsc.io/letsencrypt v0.0.3 // indirect
4445
sigs.k8s.io/controller-tools v0.2.4
4546
sigs.k8s.io/kind v0.7.0
@@ -48,9 +49,14 @@ require (
4849
replace (
4950
github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.3.2+incompatible
5051
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309 // Required by Helm
51-
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
52-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
52+
github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd // release-4.5
53+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
5354
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
5455
google.golang.org/grpc => google.golang.org/grpc v1.26.0 // https://github.com/etcd-io/etcd/issues/11563
56+
57+
// pinned because no tag supports 1.18 yet
58+
helm.sh/helm/v3 => helm.sh/helm/v3 v3.1.0-rc.1.0.20200416205415-853ba2de16a0
59+
// pinned because no tag supports 1.18 yet
60+
// sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.5.1-0.20200414221803-bac7e8aaf90a
5561
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
5662
)

0 commit comments

Comments
 (0)