Skip to content

Commit 181aef1

Browse files
jianzhangbjzci-robot
jianzhangbjz
authored and
ci-robot
committed
fix: disable WatchListClient for envtest-based tests (#3756)
Upstream-repository: operator-lifecycle-manager Upstream-commit: 2ab26dd771697edbb3f02d5c88335ad5bd11c8bd
1 parent 194f3a8 commit 181aef1

18 files changed

Lines changed: 218 additions & 36 deletions

‎manifests/0000_50_olm_00-catalogsources.crd.yaml‎

Lines changed: 3 additions & 2 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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"
@@ -1049,9 +1049,10 @@ spec:
10491049
operator:
10501050
description: |-
10511051
Operator represents a key's relationship to the value.
1052-
Valid operators are Exists and Equal. Defaults to Equal.
1052+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
10531053
Exists is equivalent to wildcard for value, so that a pod can
10541054
tolerate all taints of a particular category.
1055+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
10551056
type: string
10561057
tolerationSeconds:
10571058
description: |-

‎manifests/0000_50_olm_00-clusterserviceversions.crd.yaml‎

Lines changed: 69 additions & 8 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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"
@@ -2560,7 +2560,9 @@ spec:
25602560
type: integer
25612561
format: int32
25622562
resizePolicy:
2563-
description: Resources resize policy for the container.
2563+
description: |-
2564+
Resources resize policy for the container.
2565+
This field cannot be set on ephemeral containers.
25642566
type: array
25652567
items:
25662568
description: ContainerResizePolicy represents resource resize policy for the container.
@@ -5633,7 +5635,9 @@ spec:
56335635
type: integer
56345636
format: int32
56355637
resizePolicy:
5636-
description: Resources resize policy for the container.
5638+
description: |-
5639+
Resources resize policy for the container.
5640+
This field cannot be set on ephemeral containers.
56375641
type: array
56385642
items:
56395643
description: ContainerResizePolicy represents resource resize policy for the container.
@@ -6390,8 +6394,8 @@ spec:
63906394
will be made available to those containers which consume them
63916395
by name.
63926396

6393-
This is an alpha field and requires enabling the
6394-
DynamicResourceAllocation feature gate.
6397+
This is a stable field but requires that the
6398+
DynamicResourceAllocation feature gate is enabled.
63956399

63966400
This field is immutable.
63976401
type: array
@@ -6845,9 +6849,10 @@ spec:
68456849
operator:
68466850
description: |-
68476851
Operator represents a key's relationship to the value.
6848-
Valid operators are Exists and Equal. Defaults to Equal.
6852+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
68496853
Exists is equivalent to wildcard for value, so that a pod can
68506854
tolerate all taints of a particular category.
6855+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
68516856
type: string
68526857
tolerationSeconds:
68536858
description: |-
@@ -7609,7 +7614,7 @@ spec:
76097614
resources:
76107615
description: |-
76117616
resources represents the minimum resources the volume should have.
7612-
If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
7617+
Users are allowed to specify resource requirements
76137618
that are lower than previous value but must still be higher than capacity recorded in the
76147619
status field of the claim.
76157620
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -8446,6 +8451,24 @@ spec:
84468451
signerName:
84478452
description: Kubelet's generated CSRs will be addressed to this signer.
84488453
type: string
8454+
userAnnotations:
8455+
description: |-
8456+
userAnnotations allow pod authors to pass additional information to
8457+
the signer implementation. Kubernetes does not restrict or validate this
8458+
metadata in any way.
8459+
8460+
These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
8461+
the PodCertificateRequest objects that Kubelet creates.
8462+
8463+
Entries are subject to the same validation as object metadata annotations,
8464+
with the addition that all keys must be domain-prefixed. No restrictions
8465+
are placed on values, except an overall size limitation on the entire field.
8466+
8467+
Signers should document the keys and values they support. Signers should
8468+
deny requests that contain keys they do not recognize.
8469+
type: object
8470+
additionalProperties:
8471+
type: string
84498472
secret:
84508473
description: secret information about the secret data to project
84518474
type: object
@@ -8844,6 +8867,42 @@ spec:
88448867
x-kubernetes-list-map-keys:
88458868
- name
88468869
x-kubernetes-list-type: map
8870+
workloadRef:
8871+
description: |-
8872+
WorkloadRef provides a reference to the Workload object that this Pod belongs to.
8873+
This field is used by the scheduler to identify the PodGroup and apply the
8874+
correct group scheduling policies. The Workload object referenced
8875+
by this field may not exist at the time the Pod is created.
8876+
This field is immutable, but a Workload object with the same name
8877+
may be recreated with different policies. Doing this during pod scheduling
8878+
may result in the placement not conforming to the expected policies.
8879+
type: object
8880+
required:
8881+
- name
8882+
- podGroup
8883+
properties:
8884+
name:
8885+
description: |-
8886+
Name defines the name of the Workload object this Pod belongs to.
8887+
Workload must be in the same namespace as the Pod.
8888+
If it doesn't match any existing Workload, the Pod will remain unschedulable
8889+
until a Workload object is created and observed by the kube-scheduler.
8890+
It must be a DNS subdomain.
8891+
type: string
8892+
podGroup:
8893+
description: |-
8894+
PodGroup is the name of the PodGroup within the Workload that this Pod
8895+
belongs to. If it doesn't match any existing PodGroup within the Workload,
8896+
the Pod will remain unschedulable until the Workload object is recreated
8897+
and observed by the kube-scheduler. It must be a DNS label.
8898+
type: string
8899+
podGroupReplicaKey:
8900+
description: |-
8901+
PodGroupReplicaKey specifies the replica key of the PodGroup to which this
8902+
Pod belongs. It is used to distinguish pods belonging to different replicas
8903+
of the same pod group. The pod group policy is applied separately to each replica.
8904+
When set, it must be a DNS label.
8905+
type: string
88478906
permissions:
88488907
type: array
88498908
items:
@@ -9159,7 +9218,9 @@ spec:
91599218
type: string
91609219
x-kubernetes-map-type: atomic
91619220
reinvocationPolicy:
9162-
description: ReinvocationPolicyType specifies what type of policy the admission hook uses.
9221+
description: |-
9222+
ReinvocationPolicyType specifies what type of policy is used when other admission plugins also perform
9223+
modifications.
91639224
type: string
91649225
rules:
91659226
type: array

‎manifests/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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

‎manifests/0000_50_olm_00-olmconfigs.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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

‎manifests/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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

‎manifests/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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

‎manifests/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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

‎manifests/0000_50_olm_00-subscriptions.crd.yaml‎

Lines changed: 22 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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"
@@ -1301,9 +1301,10 @@ spec:
13011301
operator:
13021302
description: |-
13031303
Operator represents a key's relationship to the value.
1304-
Valid operators are Exists and Equal. Defaults to Equal.
1304+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
13051305
Exists is equivalent to wildcard for value, so that a pod can
13061306
tolerate all taints of a particular category.
1307+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
13071308
type: string
13081309
tolerationSeconds:
13091310
description: |-
@@ -1947,7 +1948,7 @@ spec:
19471948
resources:
19481949
description: |-
19491950
resources represents the minimum resources the volume should have.
1950-
If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
1951+
Users are allowed to specify resource requirements
19511952
that are lower than previous value but must still be higher than capacity recorded in the
19521953
status field of the claim.
19531954
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -2784,6 +2785,24 @@ spec:
27842785
signerName:
27852786
description: Kubelet's generated CSRs will be addressed to this signer.
27862787
type: string
2788+
userAnnotations:
2789+
description: |-
2790+
userAnnotations allow pod authors to pass additional information to
2791+
the signer implementation. Kubernetes does not restrict or validate this
2792+
metadata in any way.
2793+
2794+
These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
2795+
the PodCertificateRequest objects that Kubelet creates.
2796+
2797+
Entries are subject to the same validation as object metadata annotations,
2798+
with the addition that all keys must be domain-prefixed. No restrictions
2799+
are placed on values, except an overall size limitation on the entire field.
2800+
2801+
Signers should document the keys and values they support. Signers should
2802+
deny requests that contain keys they do not recognize.
2803+
type: object
2804+
additionalProperties:
2805+
type: string
27872806
secret:
27882807
description: secret information about the secret data to project
27892808
type: object

‎microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml‎

Lines changed: 3 additions & 2 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.19.0
5+
controller-gen.kubebuilder.io/version: v0.20.0
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"
@@ -1049,9 +1049,10 @@ spec:
10491049
operator:
10501050
description: |-
10511051
Operator represents a key's relationship to the value.
1052-
Valid operators are Exists and Equal. Defaults to Equal.
1052+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
10531053
Exists is equivalent to wildcard for value, so that a pod can
10541054
tolerate all taints of a particular category.
1055+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
10551056
type: string
10561057
tolerationSeconds:
10571058
description: |-

0 commit comments

Comments
 (0)