Skip to content

Commit 03b6e7e

Browse files
varshaprasad96timflannagan
authored andcommitted
chore: bump k8s to 1.21 (openshift#130)
This commit bemps controller runtime to 0.9.0 and other k8s dependencies to 1.21. Upstream-repository: api Upstream-commit: 392ae3918731dbd1f8732823048b2b3ec56401b0
1 parent 7dc6cb5 commit 03b6e7e

10 files changed

+357
-264
lines changed

staging/api/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.4.1
5+
controller-gen.kubebuilder.io/version: v0.6.0
66
creationTimestamp: null
77
name: catalogsources.operators.coreos.com
88
spec:

staging/api/crds/operators.coreos.com_clusterserviceversions.yaml

Lines changed: 177 additions & 21 deletions
Large diffs are not rendered by default.

staging/api/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.4.1
5+
controller-gen.kubebuilder.io/version: v0.6.0
66
creationTimestamp: null
77
name: installplans.operators.coreos.com
88
spec:

staging/api/crds/operators.coreos.com_operatorconditions.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.4.1
5+
controller-gen.kubebuilder.io/version: v0.6.0
66
creationTimestamp: null
77
name: operatorconditions.operators.coreos.com
88
spec:

staging/api/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.4.1
5+
controller-gen.kubebuilder.io/version: v0.6.0
66
creationTimestamp: null
77
name: operatorgroups.operators.coreos.com
88
spec:

staging/api/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.4.1
5+
controller-gen.kubebuilder.io/version: v0.6.0
66
creationTimestamp: null
77
name: operators.operators.coreos.com
88
spec:

staging/api/crds/operators.coreos.com_subscriptions.yaml

Lines changed: 6 additions & 9 deletions
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.4.1
5+
controller-gen.kubebuilder.io/version: v0.6.0
66
creationTimestamp: null
77
name: subscriptions.operators.coreos.com
88
spec:
@@ -183,7 +183,7 @@ spec:
183183
type: object
184184
properties:
185185
limits:
186-
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
186+
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
187187
type: object
188188
additionalProperties:
189189
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
@@ -192,7 +192,7 @@ spec:
192192
- type: string
193193
x-kubernetes-int-or-string: true
194194
requests:
195-
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
195+
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
196196
type: object
197197
additionalProperties:
198198
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
@@ -533,12 +533,9 @@ spec:
533533
- type: string
534534
x-kubernetes-int-or-string: true
535535
ephemeral:
536-
description: "Ephemeral represents a volume that is handled by a cluster storage driver (Alpha feature). The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity tracking are needed, c) the storage driver is specified through a storage class, and d) the storage driver supports dynamic volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource for more information on the connection between this volume type and PersistentVolumeClaim). \n Use PersistentVolumeClaim or one of the vendor-specific APIs for volumes that persist for longer than the lifecycle of an individual pod. \n Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to be used that way - see the documentation of the driver for more information. \n A pod can use both types of ephemeral volumes and persistent volumes at the same time."
536+
description: "Ephemeral represents a volume that is handled by a cluster storage driver. The volume's lifecycle is tied to the pod that defines it - it will be created before the pod starts, and deleted when the pod is removed. \n Use this if: a) the volume is only needed while the pod runs, b) features of normal volumes like restoring from snapshot or capacity tracking are needed, c) the storage driver is specified through a storage class, and d) the storage driver supports dynamic volume provisioning through a PersistentVolumeClaim (see EphemeralVolumeSource for more information on the connection between this volume type and PersistentVolumeClaim). \n Use PersistentVolumeClaim or one of the vendor-specific APIs for volumes that persist for longer than the lifecycle of an individual pod. \n Use CSI for light-weight local ephemeral volumes if the CSI driver is meant to be used that way - see the documentation of the driver for more information. \n A pod can use both types of ephemeral volumes and persistent volumes at the same time. \n This is a beta feature and only available when the GenericEphemeralVolume feature gate is enabled."
537537
type: object
538538
properties:
539-
readOnly:
540-
description: Specifies a read-only configuration for the volume. Defaults to false (read/write).
541-
type: boolean
542539
volumeClaimTemplate:
543540
description: "Will be used to create a stand-alone PVC to provision the volume. The pod in which this EphemeralVolumeSource is embedded will be the owner of the PVC, i.e. the PVC will be deleted together with the pod. The name of the PVC will be `<pod name>-<volume name>` where `<volume name>` is the name from the `PodSpec.Volumes` array entry. Pod validation will reject the pod if the concatenated name is not valid for a PVC (for example, too long). \n An existing PVC with that name that is not owned by the pod will *not* be used for the pod to avoid using an unrelated volume by mistake. Starting the pod is then blocked until the unrelated PVC is removed. If such a pre-created PVC is meant to be used by the pod, the PVC has to updated with an owner reference to the pod once the pod exists. Normally this should not be necessary, but it may be useful when manually reconstructing a broken cluster. \n This field is read-only and no changes will be made by Kubernetes to the PVC after it has been created. \n Required, must not be nil."
544541
type: object
@@ -578,7 +575,7 @@ spec:
578575
type: object
579576
properties:
580577
limits:
581-
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
578+
description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
582579
type: object
583580
additionalProperties:
584581
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
@@ -587,7 +584,7 @@ spec:
587584
- type: string
588585
x-kubernetes-int-or-string: true
589586
requests:
590-
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
587+
description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
591588
type: object
592589
additionalProperties:
593590
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$

staging/api/crds/zz_defs.go

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

staging/api/go.mod

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ require (
88
github.com/ghodss/yaml v1.0.0
99
github.com/go-bindata/go-bindata/v3 v3.1.3
1010
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
11-
github.com/sirupsen/logrus v1.6.0
12-
github.com/spf13/cobra v1.1.1
13-
github.com/stretchr/testify v1.6.1
14-
k8s.io/api v0.20.1
15-
k8s.io/apiextensions-apiserver v0.20.1
16-
k8s.io/apimachinery v0.20.1
17-
k8s.io/client-go v0.20.1
18-
sigs.k8s.io/controller-runtime v0.8.0
19-
sigs.k8s.io/controller-tools v0.4.1
11+
github.com/sirupsen/logrus v1.7.0
12+
github.com/spf13/cobra v1.1.3
13+
github.com/stretchr/testify v1.7.0
14+
k8s.io/api v0.21.1
15+
k8s.io/apiextensions-apiserver v0.21.1
16+
k8s.io/apimachinery v0.21.1
17+
k8s.io/client-go v0.21.1
18+
sigs.k8s.io/controller-runtime v0.9.0
19+
sigs.k8s.io/controller-tools v0.6.0
2020
)

0 commit comments

Comments
 (0)