Skip to content

Commit 72d0608

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1903 from awgreene/bump-deps-k8s-1.20
Bug 1908471: Bump deps k8s 1.20
2 parents ffb66b0 + 3a08055 commit 72d0608

File tree

1,490 files changed

+118578
-117139
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,490 files changed

+118578
-117139
lines changed

‎cmd/olm/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ func main() {
231231
}
232232

233233
// Start the controller manager
234-
if err := mgr.Start(ctx.Done()); err != nil {
234+
if err := mgr.Start(ctx); err != nil {
235235
logger.WithError(err).Fatal("controller manager stopped")
236236
}
237237

‎cmd/olm/manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
var log = ctrl.Log.WithName("manager")
1414

1515
func Manager(ctx context.Context, debug bool) (ctrl.Manager, error) {
16-
ctrl.SetLogger(zap.Logger(debug))
16+
ctrl.SetLogger(zap.New(zap.UseDevMode(debug)))
1717
setupLog := log.WithName("setup").V(4)
1818

1919
// Setup a Manager

‎deploy/chart/crds/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 147 additions & 179 deletions
Original file line numberDiff line numberDiff line change
@@ -2,197 +2,165 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.3.0
5+
controller-gen.kubebuilder.io/version: v0.4.1
66
creationTimestamp: null
77
name: catalogsources.operators.coreos.com
88
spec:
99
group: operators.coreos.com
1010
names:
1111
categories:
12-
- olm
12+
- olm
1313
kind: CatalogSource
1414
listKind: CatalogSourceList
1515
plural: catalogsources
1616
shortNames:
17-
- catsrc
17+
- catsrc
1818
singular: catalogsource
1919
scope: Namespaced
2020
versions:
21-
- additionalPrinterColumns:
22-
- description: The pretty name of the catalog
23-
jsonPath: .spec.displayName
24-
name: Display
25-
type: string
26-
- description: The type of the catalog
27-
jsonPath: .spec.sourceType
28-
name: Type
29-
type: string
30-
- description: The publisher of the catalog
31-
jsonPath: .spec.publisher
32-
name: Publisher
33-
type: string
34-
- jsonPath: .metadata.creationTimestamp
35-
name: Age
36-
type: date
37-
name: v1alpha1
38-
schema:
39-
openAPIV3Schema:
40-
description: CatalogSource is a repository of CSVs, CRDs, and operator packages.
41-
type: object
42-
required:
43-
- metadata
44-
- spec
45-
properties:
46-
apiVersion:
47-
description: 'APIVersion defines the versioned schema of this representation
48-
of an object. Servers should convert recognized schemas to the latest
49-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
50-
type: string
51-
kind:
52-
description: 'Kind is a string value representing the REST resource this
53-
object represents. Servers may infer this from the endpoint the client
54-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
55-
type: string
56-
metadata:
57-
type: object
58-
spec:
59-
type: object
60-
required:
61-
- sourceType
62-
properties:
63-
address:
64-
description: 'Address is a host that OLM can use to connect to a pre-existing
65-
registry. Format: <registry-host or ip>:<port> Only used when SourceType
66-
= SourceTypeGrpc. Ignored when the Image field is set.'
67-
type: string
68-
configMap:
69-
description: ConfigMap is the name of the ConfigMap to be used to
70-
back a configmap-server registry. Only used when SourceType = SourceTypeConfigmap
71-
or SourceTypeInternal.
72-
type: string
73-
description:
74-
type: string
75-
displayName:
76-
description: Metadata
77-
type: string
78-
icon:
79-
type: object
80-
required:
81-
- base64data
82-
- mediatype
83-
properties:
84-
base64data:
85-
type: string
86-
mediatype:
87-
type: string
88-
image:
89-
description: Image is an operator-registry container image to instantiate
90-
a registry-server with. Only used when SourceType = SourceTypeGrpc.
91-
If present, the address field is ignored.
92-
type: string
93-
priority:
94-
description: 'Priority field assigns a weight to the catalog source
95-
to prioritize them so that it can be consumed by the dependency
96-
resolver. Usage: Higher weight indicates that this catalog source
97-
is preferred over lower weighted catalog sources during dependency
98-
resolution. The range of the priority value can go from positive
99-
to negative in the range of int32. The default value to a catalog
100-
source with unassigned priority would be 0. The catalog source with
101-
the same priority values will be ranked lexicographically based
102-
on its name.'
103-
type: integer
104-
publisher:
105-
type: string
106-
secrets:
107-
description: Secrets represent set of secrets that can be used to
108-
access the contents of the catalog. It is best to keep this list
109-
small, since each will need to be tried for every catalog entry.
110-
type: array
111-
items:
21+
- additionalPrinterColumns:
22+
- description: The pretty name of the catalog
23+
jsonPath: .spec.displayName
24+
name: Display
25+
type: string
26+
- description: The type of the catalog
27+
jsonPath: .spec.sourceType
28+
name: Type
29+
type: string
30+
- description: The publisher of the catalog
31+
jsonPath: .spec.publisher
32+
name: Publisher
33+
type: string
34+
- jsonPath: .metadata.creationTimestamp
35+
name: Age
36+
type: date
37+
name: v1alpha1
38+
schema:
39+
openAPIV3Schema:
40+
description: CatalogSource is a repository of CSVs, CRDs, and operator packages.
41+
type: object
42+
required:
43+
- metadata
44+
- spec
45+
properties:
46+
apiVersion:
47+
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
48+
type: string
49+
kind:
50+
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
51+
type: string
52+
metadata:
53+
type: object
54+
spec:
55+
type: object
56+
required:
57+
- sourceType
58+
properties:
59+
address:
60+
description: 'Address is a host that OLM can use to connect to a pre-existing registry. Format: <registry-host or ip>:<port> Only used when SourceType = SourceTypeGrpc. Ignored when the Image field is set.'
11261
type: string
113-
sourceType:
114-
description: SourceType is the type of source
115-
type: string
116-
updateStrategy:
117-
description: UpdateStrategy defines how updated catalog source images
118-
can be discovered Consists of an interval that defines polling duration
119-
and an embedded strategy type
120-
type: object
121-
properties:
122-
registryPoll:
123-
type: object
124-
properties:
125-
interval:
126-
description: Interval is used to determine the time interval
127-
between checks of the latest catalog source version. The
128-
catalog operator polls to see if a new version of the catalog
129-
source is available. If available, the latest image is pulled
130-
and gRPC traffic is directed to the latest catalog source.
131-
type: string
132-
status:
133-
type: object
134-
properties:
135-
configMapReference:
136-
type: object
137-
required:
138-
- name
139-
- namespace
140-
properties:
141-
lastUpdateTime:
142-
type: string
143-
format: date-time
144-
name:
145-
type: string
146-
namespace:
147-
type: string
148-
resourceVersion:
149-
type: string
150-
uid:
151-
description: UID is a type that holds unique ID values, including
152-
UUIDs. Because we don't ONLY use UUIDs, this is an alias to
153-
string. Being a type captures intent and helps make sure that
154-
UIDs and names do not get conflated.
155-
type: string
156-
connectionState:
157-
type: object
158-
required:
159-
- lastObservedState
160-
properties:
161-
address:
162-
type: string
163-
lastConnect:
164-
type: string
165-
format: date-time
166-
lastObservedState:
167-
type: string
168-
latestImageRegistryPoll:
169-
description: The last time the CatalogSource image registry has been
170-
polled to ensure the image is up-to-date
171-
type: string
172-
format: date-time
173-
message:
174-
description: A human readable message indicating details about why
175-
the CatalogSource is in this condition.
176-
type: string
177-
reason:
178-
description: Reason is the reason the CatalogSource was transitioned
179-
to its current state.
180-
type: string
181-
registryService:
182-
type: object
183-
properties:
184-
createdAt:
185-
type: string
186-
format: date-time
187-
port:
188-
type: string
189-
protocol:
190-
type: string
191-
serviceName:
192-
type: string
193-
serviceNamespace:
62+
configMap:
63+
description: ConfigMap is the name of the ConfigMap to be used to back a configmap-server registry. Only used when SourceType = SourceTypeConfigmap or SourceTypeInternal.
64+
type: string
65+
description:
66+
type: string
67+
displayName:
68+
description: Metadata
69+
type: string
70+
icon:
71+
type: object
72+
required:
73+
- base64data
74+
- mediatype
75+
properties:
76+
base64data:
77+
type: string
78+
mediatype:
79+
type: string
80+
image:
81+
description: Image is an operator-registry container image to instantiate a registry-server with. Only used when SourceType = SourceTypeGrpc. If present, the address field is ignored.
82+
type: string
83+
priority:
84+
description: 'Priority field assigns a weight to the catalog source to prioritize them so that it can be consumed by the dependency resolver. Usage: Higher weight indicates that this catalog source is preferred over lower weighted catalog sources during dependency resolution. The range of the priority value can go from positive to negative in the range of int32. The default value to a catalog source with unassigned priority would be 0. The catalog source with the same priority values will be ranked lexicographically based on its name.'
85+
type: integer
86+
publisher:
87+
type: string
88+
secrets:
89+
description: Secrets represent set of secrets that can be used to access the contents of the catalog. It is best to keep this list small, since each will need to be tried for every catalog entry.
90+
type: array
91+
items:
19492
type: string
195-
served: true
196-
storage: true
197-
subresources:
198-
status: {}
93+
sourceType:
94+
description: SourceType is the type of source
95+
type: string
96+
updateStrategy:
97+
description: UpdateStrategy defines how updated catalog source images can be discovered Consists of an interval that defines polling duration and an embedded strategy type
98+
type: object
99+
properties:
100+
registryPoll:
101+
type: object
102+
properties:
103+
interval:
104+
description: Interval is used to determine the time interval between checks of the latest catalog source version. The catalog operator polls to see if a new version of the catalog source is available. If available, the latest image is pulled and gRPC traffic is directed to the latest catalog source.
105+
type: string
106+
status:
107+
type: object
108+
properties:
109+
configMapReference:
110+
type: object
111+
required:
112+
- name
113+
- namespace
114+
properties:
115+
lastUpdateTime:
116+
type: string
117+
format: date-time
118+
name:
119+
type: string
120+
namespace:
121+
type: string
122+
resourceVersion:
123+
type: string
124+
uid:
125+
description: UID is a type that holds unique ID values, including UUIDs. Because we don't ONLY use UUIDs, this is an alias to string. Being a type captures intent and helps make sure that UIDs and names do not get conflated.
126+
type: string
127+
connectionState:
128+
type: object
129+
required:
130+
- lastObservedState
131+
properties:
132+
address:
133+
type: string
134+
lastConnect:
135+
type: string
136+
format: date-time
137+
lastObservedState:
138+
type: string
139+
latestImageRegistryPoll:
140+
description: The last time the CatalogSource image registry has been polled to ensure the image is up-to-date
141+
type: string
142+
format: date-time
143+
message:
144+
description: A human readable message indicating details about why the CatalogSource is in this condition.
145+
type: string
146+
reason:
147+
description: Reason is the reason the CatalogSource was transitioned to its current state.
148+
type: string
149+
registryService:
150+
type: object
151+
properties:
152+
createdAt:
153+
type: string
154+
format: date-time
155+
port:
156+
type: string
157+
protocol:
158+
type: string
159+
serviceName:
160+
type: string
161+
serviceNamespace:
162+
type: string
163+
served: true
164+
storage: true
165+
subresources:
166+
status: {}

0 commit comments

Comments
 (0)