Skip to content

Commit f434f30

Browse files
committed
Bumps the api version to kubernetes 1.22
Signed-off-by: Daniel Sover <[email protected]> Upstream-repository: api Upstream-commit: 74543ec8c395244fa7892466b310ec38ec2ab375
1 parent 1bbfa1f commit f434f30

File tree

9 files changed

+305
-108
lines changed

9 files changed

+305
-108
lines changed

staging/api/.github/workflows/go.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
- name: Set up Go
1515
uses: actions/setup-go@v2
1616
with:
17-
go-version: 1.15
17+
go-version: 1.16
1818
id: go
1919
- name: Check out code into the Go module directory
2020
uses: actions/checkout@v2
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up Go
3030
uses: actions/setup-go@v2
3131
with:
32-
go-version: 1.15
32+
go-version: 1.16
3333
id: go
3434
- name: Check out code into the Go module directory
3535
uses: actions/checkout@v2

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

Lines changed: 62 additions & 33 deletions
Large diffs are not rendered by default.

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

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ spec:
7676
description: Name of the environment variable. Must be a C_IDENTIFIER.
7777
type: string
7878
value:
79-
description: 'Variable references $(VAR_NAME) are expanded using the previous defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. The $(VAR_NAME) syntax can be escaped with a double $$, ie: $$(VAR_NAME). Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
79+
description: 'Variable references $(VAR_NAME) are expanded using the previously defined environment variables in the container and any service environment variables. If a variable cannot be resolved, the reference in the input string will be unchanged. Double $$ are reduced to a single $, which allows for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)". Escaped references will never be expanded, regardless of whether the variable exists or not. Defaults to "".'
8080
type: string
8181
valueFrom:
8282
description: Source for the environment variable's value. Cannot be used if value is not empty.
@@ -555,7 +555,23 @@ spec:
555555
items:
556556
type: string
557557
dataSource:
558-
description: 'This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) * An existing PVC (PersistentVolumeClaim) * An existing custom resource that implements data population (Alpha) In order to use custom resource types that implement data population, the AnyVolumeDataSource feature gate must be enabled. If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source.'
558+
description: 'This field can be used to specify either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot) * An existing PVC (PersistentVolumeClaim) If the provisioner or an external controller can support the specified data source, it will create a new volume based on the contents of the specified data source. If the AnyVolumeDataSource feature gate is enabled, this field will always have the same contents as the DataSourceRef field.'
559+
type: object
560+
required:
561+
- kind
562+
- name
563+
properties:
564+
apiGroup:
565+
description: APIGroup is the group for the resource being referenced. If APIGroup is not specified, the specified Kind must be in the core API group. For any other third-party types, APIGroup is required.
566+
type: string
567+
kind:
568+
description: Kind is the type of resource being referenced
569+
type: string
570+
name:
571+
description: Name is the name of resource being referenced
572+
type: string
573+
dataSourceRef:
574+
description: 'Specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any local object from a non-empty API group (non core object) or a PersistentVolumeClaim object. When this field is specified, volume binding will only succeed if the type of the specified object matches some installed volume populator or dynamic provisioner. This field will replace the functionality of the DataSource field and as such if both fields are non-empty, they must have the same value. For backwards compatibility, both fields (DataSource and DataSourceRef) will be set to the same value automatically if one of them is empty and the other is non-empty. There are two important differences between DataSource and DataSourceRef: * While DataSource only allows two specific types of objects, DataSourceRef allows any non-core object, as well as PersistentVolumeClaim objects. * While DataSource ignores disallowed values (dropping them), DataSourceRef preserves all values, and generates an error if a disallowed value is specified. (Alpha) Using this field requires the AnyVolumeDataSource feature gate to be enabled.'
559575
type: object
560576
required:
561577
- kind

staging/api/crds/zz_defs.go

Lines changed: 2 additions & 2 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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
module github.com/operator-framework/api
22

3-
go 1.15
3+
go 1.16
44

55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/blang/semver/v4 v4.0.0
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.7.0
11+
github.com/sirupsen/logrus v1.8.1
1212
github.com/spf13/cobra v1.1.3
1313
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
14+
k8s.io/api v0.22.0
15+
k8s.io/apiextensions-apiserver v0.22.0
16+
k8s.io/apimachinery v0.22.0
17+
k8s.io/client-go v0.22.0
1818
sigs.k8s.io/controller-runtime v0.9.0
1919
sigs.k8s.io/controller-tools v0.6.0
2020
)

0 commit comments

Comments
 (0)