Skip to content

Commit ecc33ea

Browse files
authored
Merge pull request #30 from estroz/chore/bump-k8s-v1.18
chore(deps): bump to k8s v1.18
2 parents 50f95fe + 23b9b49 commit ecc33ea

File tree

654 files changed

+96554
-45497
lines changed

Some content is hidden

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

654 files changed

+96554
-45497
lines changed

crds/operators.coreos.com_catalogsources.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: catalogsources.operators.coreos.com
88
spec:

crds/operators.coreos.com_clusterserviceversions.yaml

Lines changed: 31 additions & 61 deletions
Large diffs are not rendered by default.

crds/operators.coreos.com_installplans.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: installplans.operators.coreos.com
88
spec:

crds/operators.coreos.com_operatorgroups.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: operatorgroups.operators.coreos.com
88
spec:

crds/operators.coreos.com_operators.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: operators.operators.coreos.com
88
spec:

crds/operators.coreos.com_subscriptions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.2.8
5+
controller-gen.kubebuilder.io/version: v0.3.0
66
creationTimestamp: null
77
name: subscriptions.operators.coreos.com
88
spec:

crds/zz_defs.go

Lines changed: 12 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,31 @@ module github.com/operator-framework/api
33
go 1.13
44

55
require (
6+
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d // indirect
7+
github.com/bitly/go-simplejson v0.5.0 // indirect
68
github.com/blang/semver v3.5.0+incompatible
9+
github.com/bshuster-repo/logrus-logstash-hook v0.4.1 // indirect
10+
github.com/bugsnag/bugsnag-go v1.5.3 // indirect
11+
github.com/bugsnag/panicwrap v1.2.0 // indirect
12+
github.com/garyburd/redigo v1.6.0 // indirect
713
github.com/ghodss/yaml v1.0.0
814
github.com/go-bindata/go-bindata/v3 v3.1.3
15+
github.com/gofrs/uuid v3.2.0+incompatible // indirect
16+
github.com/gorilla/handlers v1.4.2 // indirect
917
github.com/mikefarah/yq/v2 v2.4.1
10-
github.com/operator-framework/operator-registry v1.5.3
11-
github.com/pkg/errors v0.8.1
18+
github.com/operator-framework/operator-registry v1.12.1
19+
github.com/pkg/errors v0.9.1
1220
github.com/sirupsen/logrus v1.4.2
13-
github.com/spf13/cobra v0.0.5
14-
github.com/stretchr/testify v1.4.0
15-
k8s.io/api v0.17.3
16-
k8s.io/apiextensions-apiserver v0.17.3
17-
k8s.io/apimachinery v0.17.3
18-
k8s.io/client-go v0.17.3
19-
sigs.k8s.io/controller-runtime v0.5.2
20-
sigs.k8s.io/controller-tools v0.2.8
21+
github.com/spf13/cobra v0.0.6
22+
github.com/stretchr/testify v1.5.1
23+
github.com/yvasiyarov/go-metrics v0.0.0-20150112132944-c25f46c4b940 // indirect
24+
github.com/yvasiyarov/gorelic v0.0.7 // indirect
25+
github.com/yvasiyarov/newrelic_platform_go v0.0.0-20160601141957-9c099fbc30e9 // indirect
26+
k8s.io/api v0.18.2
27+
k8s.io/apiextensions-apiserver v0.18.2
28+
k8s.io/apimachinery v0.18.2
29+
k8s.io/client-go v0.18.2
30+
rsc.io/letsencrypt v0.0.3 // indirect
31+
sigs.k8s.io/controller-runtime v0.6.0
32+
sigs.k8s.io/controller-tools v0.3.0
2133
)

go.sum

Lines changed: 270 additions & 39 deletions
Large diffs are not rendered by default.

pkg/internal/bundle.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,23 @@ func (l *manifestsLoad) AddPackageChannels(pkg registry.PackageManifest) error {
5555
return nil
5656
}
5757

58+
// AddBundleSemver is a no-op to implement the registry.Load interface.
59+
func (l *manifestsLoad) AddBundleSemver(pkg *registry.Package, bundle *registry.Bundle) error {
60+
return nil
61+
}
62+
5863
// AddBundlePackageChannels is a no-op to implement the registry.Load interface.
59-
func (l *manifestsLoad) AddBundlePackageChannels(manifest registry.PackageManifest, bundle registry.Bundle) error {
64+
func (*manifestsLoad) AddBundlePackageChannels(registry.PackageManifest, *registry.Bundle) error {
6065
return nil
6166
}
6267

63-
// RmPackageName is a no-op to implement the registry.Load interface.
64-
func (l *manifestsLoad) RmPackageName(packageName string) error {
68+
// RmPemoveckageNas a no-op to implement the registry.Load interface.
69+
func (l *manifestsLoad) RemovePackage(packageName string) error {
6570
return nil
6671
}
6772

6873
// ClearNonDefaultBundles is a no-op to implement the registry.Load interface.
69-
func (l *manifestsLoad) ClearNonDefaultBundles(packageName string) error {
74+
func (l *manifestsLoad) ClearNonHeadBundles() error {
7075
return nil
7176
}
7277

0 commit comments

Comments
 (0)