Skip to content

Commit 0d3101d

Browse files
author
Eric Stroczynski
authored
Merge pull request #89 from estroz/deps/ks8-1-20
deps: bump k8s deps to v1.20
2 parents 640da4e + df4de0e commit 0d3101d

File tree

649 files changed

+51724
-41189
lines changed

Some content is hidden

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

649 files changed

+51724
-41189
lines changed

‎crds/operators.coreos.com_clusterserviceversions.yaml‎

Lines changed: 15 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -2968,9 +2968,7 @@ spec:
29682968
when it might take a long time to
29692969
load data or warm a cache, than
29702970
during steady-state operation. This
2971-
cannot be updated. This is a beta
2972-
feature enabled by the StartupProbe
2973-
feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
2971+
cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
29742972
type: object
29752973
properties:
29762974
exec:
@@ -6071,9 +6069,7 @@ spec:
60716069
when it might take a long time to
60726070
load data or warm a cache, than
60736071
during steady-state operation. This
6074-
cannot be updated. This is a beta
6075-
feature enabled by the StartupProbe
6076-
feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
6072+
cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
60776073
type: object
60786074
properties:
60796075
exec:
@@ -6523,8 +6519,8 @@ spec:
65236519
It will have no effect on ephemeral
65246520
volume types such as: secret, configmaps
65256521
and emptydir. Valid values are "OnRootMismatch"
6526-
and "Always". If not specified defaults
6527-
to "Always".'
6522+
and "Always". If not specified, "Always"
6523+
is used.'
65286524
type: string
65296525
runAsGroup:
65306526
description: The GID to run the entrypoint
@@ -7597,35 +7593,24 @@ spec:
75977593
can be used to specify
75987594
either: * An existing
75997595
VolumeSnapshot object
7600-
(snapshot.storage.k8s.io/VolumeSnapshot
7601-
- Beta) * An existing
7602-
PVC (PersistentVolumeClaim)
7596+
(snapshot.storage.k8s.io/VolumeSnapshot)
7597+
* An existing PVC (PersistentVolumeClaim)
76037598
* An existing custom
7604-
resource/object that
7605-
implements data population
7606-
(Alpha) In order to
7607-
use VolumeSnapshot object
7608-
types, the appropriate
7599+
resource that implements
7600+
data population (Alpha)
7601+
In order to use custom
7602+
resource types that
7603+
implement data population,
7604+
the AnyVolumeDataSource
76097605
feature gate must be
7610-
enabled (VolumeSnapshotDataSource
7611-
or AnyVolumeDataSource)
7612-
If the provisioner or
7613-
an external controller
7606+
enabled. If the provisioner
7607+
or an external controller
76147608
can support the specified
76157609
data source, it will
76167610
create a new volume
76177611
based on the contents
76187612
of the specified data
7619-
source. If the specified
7620-
data source is not supported,
7621-
the volume will not
7622-
be created and the failure
7623-
will be reported as
7624-
an event. In the future,
7625-
we plan to support more
7626-
data source types and
7627-
the behavior of the
7628-
provisioner may change.'
7613+
source.'
76297614
type: object
76307615
required:
76317616
- kind
@@ -8243,8 +8228,6 @@ spec:
82438228
resources secrets, configmaps, and
82448229
downward API
82458230
type: object
8246-
required:
8247-
- sources
82488231
properties:
82498232
defaultMode:
82508233
description: Mode bits used to

‎crds/operators.coreos.com_subscriptions.yaml‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -856,22 +856,16 @@ spec:
856856
dataSource:
857857
description: 'This field can be used to specify
858858
either: * An existing VolumeSnapshot object
859-
(snapshot.storage.k8s.io/VolumeSnapshot -
860-
Beta) * An existing PVC (PersistentVolumeClaim)
861-
* An existing custom resource/object that
862-
implements data population (Alpha) In order
863-
to use VolumeSnapshot object types, the appropriate
864-
feature gate must be enabled (VolumeSnapshotDataSource
865-
or AnyVolumeDataSource) If the provisioner
866-
or an external controller can support the
867-
specified data source, it will create a new
868-
volume based on the contents of the specified
869-
data source. If the specified data source
870-
is not supported, the volume will not be created
871-
and the failure will be reported as an event.
872-
In the future, we plan to support more data
873-
source types and the behavior of the provisioner
874-
may change.'
859+
(snapshot.storage.k8s.io/VolumeSnapshot) *
860+
An existing PVC (PersistentVolumeClaim) *
861+
An existing custom resource that implements
862+
data population (Alpha) In order to use custom
863+
resource types that implement data population,
864+
the AnyVolumeDataSource feature gate must
865+
be enabled. If the provisioner or an external
866+
controller can support the specified data
867+
source, it will create a new volume based
868+
on the contents of the specified data source.'
875869
type: object
876870
required:
877871
- kind
@@ -1332,8 +1326,6 @@ spec:
13321326
description: Items for all in one resources secrets, configmaps,
13331327
and downward API
13341328
type: object
1335-
required:
1336-
- sources
13371329
properties:
13381330
defaultMode:
13391331
description: Mode bits used to set permissions on created

‎crds/zz_defs.go‎

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

‎go.mod‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ module github.com/operator-framework/api
33
go 1.15
44

55
require (
6-
github.com/blang/semver v3.5.0+incompatible
6+
github.com/blang/semver/v4 v4.0.0
77
github.com/ghodss/yaml v1.0.0
88
github.com/go-bindata/go-bindata/v3 v3.1.3
99
github.com/mikefarah/yq/v2 v2.4.1
1010
github.com/sirupsen/logrus v1.6.0
11-
github.com/spf13/cobra v1.0.0
12-
github.com/stretchr/testify v1.5.1
13-
k8s.io/api v0.19.3
14-
k8s.io/apiextensions-apiserver v0.19.3
15-
k8s.io/apimachinery v0.19.3
16-
k8s.io/client-go v0.19.3
11+
github.com/spf13/cobra v1.1.1
12+
github.com/stretchr/testify v1.6.1
13+
k8s.io/api v0.20.0
14+
k8s.io/apiextensions-apiserver v0.20.0
15+
k8s.io/apimachinery v0.20.0
16+
k8s.io/client-go v0.20.0
1717
sigs.k8s.io/controller-runtime v0.7.0
1818
sigs.k8s.io/controller-tools v0.4.1
1919
)

0 commit comments

Comments
 (0)