Skip to content

Commit d99a4c8

Browse files
author
Per Goncalves da Silva
committed
Regenerate CRDs and fix unit test
Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
1 parent a702863 commit d99a4c8

File tree

5 files changed

+95
-14
lines changed

5 files changed

+95
-14
lines changed

‎crds/operators.coreos.com_catalogsources.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,9 +1045,10 @@ spec:
10451045
operator:
10461046
description: |-
10471047
Operator represents a key's relationship to the value.
1048-
Valid operators are Exists and Equal. Defaults to Equal.
1048+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
10491049
Exists is equivalent to wildcard for value, so that a pod can
10501050
tolerate all taints of a particular category.
1051+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
10511052
type: string
10521053
tolerationSeconds:
10531054
description: |-

‎crds/operators.coreos.com_clusterserviceversions.yaml‎

Lines changed: 68 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2556,7 +2556,9 @@ spec:
25562556
type: integer
25572557
format: int32
25582558
resizePolicy:
2559-
description: Resources resize policy for the container.
2559+
description: |-
2560+
Resources resize policy for the container.
2561+
This field cannot be set on ephemeral containers.
25602562
type: array
25612563
items:
25622564
description: ContainerResizePolicy represents resource resize policy for the container.
@@ -5630,7 +5632,9 @@ spec:
56305632
type: integer
56315633
format: int32
56325634
resizePolicy:
5633-
description: Resources resize policy for the container.
5635+
description: |-
5636+
Resources resize policy for the container.
5637+
This field cannot be set on ephemeral containers.
56345638
type: array
56355639
items:
56365640
description: ContainerResizePolicy represents resource resize policy for the container.
@@ -6387,8 +6391,8 @@ spec:
63876391
will be made available to those containers which consume them
63886392
by name.
63896393

6390-
This is an alpha field and requires enabling the
6391-
DynamicResourceAllocation feature gate.
6394+
This is a stable field but requires that the
6395+
DynamicResourceAllocation feature gate is enabled.
63926396

63936397
This field is immutable.
63946398
type: array
@@ -6842,9 +6846,10 @@ spec:
68426846
operator:
68436847
description: |-
68446848
Operator represents a key's relationship to the value.
6845-
Valid operators are Exists and Equal. Defaults to Equal.
6849+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
68466850
Exists is equivalent to wildcard for value, so that a pod can
68476851
tolerate all taints of a particular category.
6852+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
68486853
type: string
68496854
tolerationSeconds:
68506855
description: |-
@@ -7606,7 +7611,7 @@ spec:
76067611
resources:
76077612
description: |-
76087613
resources represents the minimum resources the volume should have.
7609-
If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
7614+
Users are allowed to specify resource requirements
76107615
that are lower than previous value but must still be higher than capacity recorded in the
76117616
status field of the claim.
76127617
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -8443,6 +8448,24 @@ spec:
84438448
signerName:
84448449
description: Kubelet's generated CSRs will be addressed to this signer.
84458450
type: string
8451+
userAnnotations:
8452+
description: |-
8453+
userAnnotations allow pod authors to pass additional information to
8454+
the signer implementation. Kubernetes does not restrict or validate this
8455+
metadata in any way.
8456+
8457+
These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
8458+
the PodCertificateRequest objects that Kubelet creates.
8459+
8460+
Entries are subject to the same validation as object metadata annotations,
8461+
with the addition that all keys must be domain-prefixed. No restrictions
8462+
are placed on values, except an overall size limitation on the entire field.
8463+
8464+
Signers should document the keys and values they support. Signers should
8465+
deny requests that contain keys they do not recognize.
8466+
type: object
8467+
additionalProperties:
8468+
type: string
84468469
secret:
84478470
description: secret information about the secret data to project
84488471
type: object
@@ -8841,6 +8864,42 @@ spec:
88418864
x-kubernetes-list-map-keys:
88428865
- name
88438866
x-kubernetes-list-type: map
8867+
workloadRef:
8868+
description: |-
8869+
WorkloadRef provides a reference to the Workload object that this Pod belongs to.
8870+
This field is used by the scheduler to identify the PodGroup and apply the
8871+
correct group scheduling policies. The Workload object referenced
8872+
by this field may not exist at the time the Pod is created.
8873+
This field is immutable, but a Workload object with the same name
8874+
may be recreated with different policies. Doing this during pod scheduling
8875+
may result in the placement not conforming to the expected policies.
8876+
type: object
8877+
required:
8878+
- name
8879+
- podGroup
8880+
properties:
8881+
name:
8882+
description: |-
8883+
Name defines the name of the Workload object this Pod belongs to.
8884+
Workload must be in the same namespace as the Pod.
8885+
If it doesn't match any existing Workload, the Pod will remain unschedulable
8886+
until a Workload object is created and observed by the kube-scheduler.
8887+
It must be a DNS subdomain.
8888+
type: string
8889+
podGroup:
8890+
description: |-
8891+
PodGroup is the name of the PodGroup within the Workload that this Pod
8892+
belongs to. If it doesn't match any existing PodGroup within the Workload,
8893+
the Pod will remain unschedulable until the Workload object is recreated
8894+
and observed by the kube-scheduler. It must be a DNS label.
8895+
type: string
8896+
podGroupReplicaKey:
8897+
description: |-
8898+
PodGroupReplicaKey specifies the replica key of the PodGroup to which this
8899+
Pod belongs. It is used to distinguish pods belonging to different replicas
8900+
of the same pod group. The pod group policy is applied separately to each replica.
8901+
When set, it must be a DNS label.
8902+
type: string
88448903
permissions:
88458904
type: array
88468905
items:
@@ -9156,7 +9215,9 @@ spec:
91569215
type: string
91579216
x-kubernetes-map-type: atomic
91589217
reinvocationPolicy:
9159-
description: ReinvocationPolicyType specifies what type of policy the admission hook uses.
9218+
description: |-
9219+
ReinvocationPolicyType specifies what type of policy is used when other admission plugins also perform
9220+
modifications.
91609221
type: string
91619222
rules:
91629223
type: array

‎crds/operators.coreos.com_subscriptions.yaml‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,9 +1297,10 @@ spec:
12971297
operator:
12981298
description: |-
12991299
Operator represents a key's relationship to the value.
1300-
Valid operators are Exists and Equal. Defaults to Equal.
1300+
Valid operators are Exists, Equal, Lt, and Gt. Defaults to Equal.
13011301
Exists is equivalent to wildcard for value, so that a pod can
13021302
tolerate all taints of a particular category.
1303+
Lt and Gt perform numeric comparisons (requires feature gate TaintTolerationComparisonOperators).
13031304
type: string
13041305
tolerationSeconds:
13051306
description: |-
@@ -1943,7 +1944,7 @@ spec:
19431944
resources:
19441945
description: |-
19451946
resources represents the minimum resources the volume should have.
1946-
If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements
1947+
Users are allowed to specify resource requirements
19471948
that are lower than previous value but must still be higher than capacity recorded in the
19481949
status field of the claim.
19491950
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources
@@ -2780,6 +2781,24 @@ spec:
27802781
signerName:
27812782
description: Kubelet's generated CSRs will be addressed to this signer.
27822783
type: string
2784+
userAnnotations:
2785+
description: |-
2786+
userAnnotations allow pod authors to pass additional information to
2787+
the signer implementation. Kubernetes does not restrict or validate this
2788+
metadata in any way.
2789+
2790+
These values are copied verbatim into the `spec.unverifiedUserAnnotations` field of
2791+
the PodCertificateRequest objects that Kubelet creates.
2792+
2793+
Entries are subject to the same validation as object metadata annotations,
2794+
with the addition that all keys must be domain-prefixed. No restrictions
2795+
are placed on values, except an overall size limitation on the entire field.
2796+
2797+
Signers should document the keys and values they support. Signers should
2798+
deny requests that contain keys they do not recognize.
2799+
type: object
2800+
additionalProperties:
2801+
type: string
27832802
secret:
27842803
description: secret information about the secret data to project
27852804
type: object

‎crds/zz_defs.go‎

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

‎pkg/validation/internal/csv_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestValidateCSV(t *testing.T) {
6868
description: "csv with name over 63 characters limit",
6969
wantErr: true,
7070
errors: []errors.Error{
71-
errors.ErrInvalidCSV(`metadata.name "someoperatorwithanextremelylongnamethatmakenosensewhatsoever.v999.999.999" is invalid: must be no more than 63 characters`, "someoperatorwithanextremelylongnamethatmakenosensewhatsoever.v999.999.999"),
71+
errors.ErrInvalidCSV(`metadata.name "someoperatorwithanextremelylongnamethatmakenosensewhatsoever.v999.999.999" is invalid: must be no more than 63 bytes`, "someoperatorwithanextremelylongnamethatmakenosensewhatsoever.v999.999.999"),
7272
},
7373
},
7474
filepath.Join("testdata", "badName.csv.yaml"),

0 commit comments

Comments
 (0)