Skip to content

Commit dafb9fd

Browse files
awgreeneawgreene
committed
consume new API
1 parent 47d3319 commit dafb9fd

File tree

250 files changed

+16023
-6396
lines changed

Some content is hidden

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

250 files changed

+16023
-6396
lines changed

‎deploy/chart/crds/0000_50_olm_00-catalogsources.crd.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.6.0
5+
controller-gen.kubebuilder.io/version: v0.6.2
66
creationTimestamp: null
77
name: catalogsources.operators.coreos.com
88
spec:

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

Lines changed: 63 additions & 34 deletions
Large diffs are not rendered by default.

‎deploy/chart/crds/0000_50_olm_00-installplans.crd.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.6.0
5+
controller-gen.kubebuilder.io/version: v0.6.2
66
creationTimestamp: null
77
name: installplans.operators.coreos.com
88
spec:

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

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
apiVersion: apiextensions.k8s.io/v1
2+
kind: CustomResourceDefinition
3+
metadata:
4+
annotations:
5+
controller-gen.kubebuilder.io/version: v0.6.2
6+
creationTimestamp: null
7+
name: olmconfigs.operators.coreos.com
8+
spec:
9+
group: operators.coreos.com
10+
names:
11+
categories:
12+
- olm
13+
kind: OLMConfig
14+
listKind: OLMConfigList
15+
plural: olmconfigs
16+
singular: olmconfig
17+
scope: Cluster
18+
versions:
19+
- name: v1
20+
schema:
21+
openAPIV3Schema:
22+
description: OLMConfig is a resource responsible for configuring OLM.
23+
type: object
24+
required:
25+
- metadata
26+
properties:
27+
apiVersion:
28+
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'
29+
type: string
30+
kind:
31+
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'
32+
type: string
33+
metadata:
34+
type: object
35+
spec:
36+
description: OLMConfigSpec is the spec for an OLMConfig resource.
37+
type: object
38+
properties:
39+
features:
40+
description: Features contains the list of configurable OLM features.
41+
type: object
42+
properties:
43+
disableCopiedCSVs:
44+
description: DisableCopiedCSVs is used to disable OLM's "Copied CSV" feature for operators installed at the cluster scope, where a cluster scoped operator is one that has been installed in an OperatorGroup that targets all namespaces. When reenabled, OLM will recreate the "Copied CSVs" for each cluster scoped operator.
45+
type: boolean
46+
default: false
47+
status:
48+
description: OLMConfigStatus is the status for an OLMConfig resource.
49+
type: object
50+
properties:
51+
conditions:
52+
type: array
53+
items:
54+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
55+
type: object
56+
required:
57+
- lastTransitionTime
58+
- message
59+
- reason
60+
- status
61+
- type
62+
properties:
63+
lastTransitionTime:
64+
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
65+
type: string
66+
format: date-time
67+
message:
68+
description: message is a human readable message indicating details about the transition. This may be an empty string.
69+
type: string
70+
maxLength: 32768
71+
observedGeneration:
72+
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
73+
type: integer
74+
format: int64
75+
minimum: 0
76+
reason:
77+
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
78+
type: string
79+
maxLength: 1024
80+
minLength: 1
81+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
82+
status:
83+
description: status of the condition, one of True, False, Unknown.
84+
type: string
85+
enum:
86+
- "True"
87+
- "False"
88+
- Unknown
89+
type:
90+
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
91+
type: string
92+
maxLength: 316
93+
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
94+
served: true
95+
storage: true
96+
subresources:
97+
status: {}

‎deploy/chart/crds/0000_50_olm_00-operatorconditions.crd.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.6.0
5+
controller-gen.kubebuilder.io/version: v0.6.2
66
creationTimestamp: null
77
name: operatorconditions.operators.coreos.com
88
spec:

‎deploy/chart/crds/0000_50_olm_00-operatorgroups.crd.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.6.0
5+
controller-gen.kubebuilder.io/version: v0.6.2
66
creationTimestamp: null
77
name: operatorgroups.operators.coreos.com
88
spec:

‎deploy/chart/crds/0000_50_olm_00-operators.crd.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.6.0
5+
controller-gen.kubebuilder.io/version: v0.6.2
66
creationTimestamp: null
77
name: operators.operators.coreos.com
88
spec:

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

Lines changed: 19 additions & 3 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.6.0
5+
controller-gen.kubebuilder.io/version: v0.6.2
66
creationTimestamp: null
77
name: subscriptions.operators.coreos.com
88
spec:
@@ -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

‎go.mod

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@ require (
1313
github.com/go-air/gini v1.0.4
1414
github.com/go-bindata/go-bindata/v3 v3.1.3
1515
github.com/go-logr/logr v0.4.0
16-
github.com/golang/mock v1.4.1
16+
github.com/golang/mock v1.5.0
1717
github.com/google/go-cmp v0.5.6
1818
github.com/googleapis/gnostic v0.5.5
1919
github.com/itchyny/gojq v0.11.0
2020
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2
2121
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
2222
github.com/mitchellh/hashstructure v1.0.0
23-
github.com/mitchellh/mapstructure v1.1.2
23+
github.com/mitchellh/mapstructure v1.4.1
2424
github.com/onsi/ginkgo v1.16.4
25-
github.com/onsi/gomega v1.13.0
25+
github.com/onsi/gomega v1.15.0
2626
github.com/openshift/api v0.0.0-20200331152225-585af27e34fd
2727
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0
2828
github.com/operator-framework/api v0.10.3
@@ -33,35 +33,36 @@ require (
3333
github.com/prometheus/client_model v0.2.0
3434
github.com/prometheus/common v0.26.0
3535
github.com/sirupsen/logrus v1.8.1
36-
github.com/spf13/cobra v1.1.3
36+
github.com/spf13/cobra v1.2.1
3737
github.com/spf13/pflag v1.0.5
3838
github.com/stretchr/testify v1.7.0
3939
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023
4040
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac
4141
google.golang.org/grpc v1.38.0
4242
gopkg.in/yaml.v2 v2.4.0
4343
helm.sh/helm/v3 v3.6.1
44-
k8s.io/api v0.22.0
45-
k8s.io/apiextensions-apiserver v0.22.0
46-
k8s.io/apimachinery v0.22.0
47-
k8s.io/apiserver v0.22.0
48-
k8s.io/client-go v0.22.0
49-
k8s.io/code-generator v0.22.0
50-
k8s.io/component-base v0.22.0
44+
k8s.io/api v0.22.1
45+
k8s.io/apiextensions-apiserver v0.22.1
46+
k8s.io/apimachinery v0.22.1
47+
k8s.io/apiserver v0.22.1
48+
k8s.io/client-go v0.22.1
49+
k8s.io/code-generator v0.22.1
50+
k8s.io/component-base v0.22.1
5151
k8s.io/klog v1.0.0
5252
k8s.io/kube-aggregator v0.22.0
5353
k8s.io/kube-openapi v0.0.0-20210527164424-3c818078ee3d
54-
k8s.io/utils v0.0.0-20210707171843-4b05e18ac7d9
54+
k8s.io/utils v0.0.0-20210802155522-efc7438f0176
5555
rsc.io/letsencrypt v0.0.3 // indirect
56-
sigs.k8s.io/controller-runtime v0.9.2
57-
sigs.k8s.io/controller-tools v0.6.1
56+
sigs.k8s.io/controller-runtime v0.10.0
57+
sigs.k8s.io/controller-tools v0.6.2
5858
sigs.k8s.io/kind v0.11.1
5959
)
6060

6161
replace (
6262
// controller runtime
6363
github.com/openshift/api => github.com/openshift/api v0.0.0-20200331152225-585af27e34fd // release-4.5
6464
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 // release-4.5
65+
github.com/operator-framework/api => ../api //TODO: Remove
6566
// Patch for a race condition involving metadata-only
6667
// informers until it can be resolved upstream:
6768
sigs.k8s.io/controller-runtime v0.9.2 => github.com/benluddy/controller-runtime v0.9.3-0.20210720171926-9bcb99bd9bd3

0 commit comments

Comments
 (0)