Skip to content

Commit

Permalink
chore(apis): Regenerate API types in accordance with openapi3 specifi…
Browse files Browse the repository at this point in the history 
…cation

In kube 1.17, the openapi structural schema validation was updated to validate
CRDs according to the documented API semantics of x-kubernetes-list-type and
x-kubernetes-map-type atomic to reject non-atomic sub-types. This PR updates
the API types to follow the specification.
See kubernetes/kubernetes#84722 for more details.
  • Loading branch information
@anik120
anik120 committed Mar 19, 2020
1 parent b4a603f commit f8f75f6
Show file tree
Hide file tree
Showing 15 changed files with 259 additions and 481 deletions.
66 changes: 30 additions & 36 deletions deploy/chart/templates/0000_50_olm_03-clusterserviceversion.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -173,7 +173,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand All @@ -198,7 +198,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -237,7 +237,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -294,7 +294,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand All @@ -319,7 +319,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -363,7 +363,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -413,7 +413,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand All @@ -438,7 +438,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -476,7 +476,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -526,7 +526,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand All @@ -551,7 +551,7 @@ spec:
used to delay JSON decoding or precompute a JSON encoding.
type: string
format: byte
x-descriptors:
xDescriptors:
type: array
items:
type: string
Expand Down Expand Up @@ -1827,7 +1827,8 @@ spec:
metadata.namespace, metadata.labels,
metadata.annotations, spec.nodeName,
spec.serviceAccountName,
status.hostIP, status.podIP.'
status.hostIP, status.podIP,
status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -2781,10 +2782,9 @@ spec:
and PodSecurityContext, the
value specified in SecurityContext
takes precedence. This field
is alpha-level and it is only
honored by servers that enable
the WindowsRunAsUserName feature
flag.
is beta-level and may be disabled
with the WindowsRunAsUserName
feature flag.
type: string
startupProbe:
description: 'StartupProbe indicates
Expand Down Expand Up @@ -3084,7 +3084,6 @@ spec:
environment. Defaults to ""
(volume's root). SubPathExpr
and SubPath are mutually exclusive.
This field is beta in 1.15.
type: string
workingDir:
description: Container's working directory.
Expand Down Expand Up @@ -3291,7 +3290,8 @@ spec:
metadata.namespace, metadata.labels,
metadata.annotations, spec.nodeName,
spec.serviceAccountName,
status.hostIP, status.podIP.'
status.hostIP, status.podIP,
status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -4225,10 +4225,9 @@ spec:
and PodSecurityContext, the
value specified in SecurityContext
takes precedence. This field
is alpha-level and it is only
honored by servers that enable
the WindowsRunAsUserName feature
flag.
is beta-level and may be disabled
with the WindowsRunAsUserName
feature flag.
type: string
startupProbe:
description: Probes are not allowed
Expand Down Expand Up @@ -4526,7 +4525,6 @@ spec:
environment. Defaults to ""
(volume's root). SubPathExpr
and SubPath are mutually exclusive.
This field is beta in 1.15.
type: string
workingDir:
description: Container's working directory.
Expand Down Expand Up @@ -4732,7 +4730,8 @@ spec:
metadata.namespace, metadata.labels,
metadata.annotations, spec.nodeName,
spec.serviceAccountName,
status.hostIP, status.podIP.'
status.hostIP, status.podIP,
status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -5686,10 +5685,9 @@ spec:
and PodSecurityContext, the
value specified in SecurityContext
takes precedence. This field
is alpha-level and it is only
honored by servers that enable
the WindowsRunAsUserName feature
flag.
is beta-level and may be disabled
with the WindowsRunAsUserName
feature flag.
type: string
startupProbe:
description: 'StartupProbe indicates
Expand Down Expand Up @@ -5989,7 +5987,6 @@ spec:
environment. Defaults to ""
(volume's root). SubPathExpr
and SubPath are mutually exclusive.
This field is beta in 1.15.
type: string
workingDir:
description: Container's working directory.
Expand Down Expand Up @@ -6259,9 +6256,8 @@ spec:
If set in both SecurityContext and
PodSecurityContext, the value specified
in SecurityContext takes precedence.
This field is alpha-level and it
is only honored by servers that
enable the WindowsRunAsUserName
This field is beta-level and may
be disabled with the WindowsRunAsUserName
feature flag.
type: string
serviceAccount:
Expand All @@ -6283,9 +6279,7 @@ spec:
process in each container will not be assigned
PID 1. HostPID and ShareProcessNamespace
cannot both be set. Optional: Default to
false. This field is beta-level and may
be disabled with the PodShareProcessNamespace
feature.'
false.'
type: boolean
subdomain:
description: If specified, the fully qualified
Expand Down
4 changes: 2 additions & 2 deletions deploy/chart/templates/0000_50_olm_05-subscription.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.'
status.podIP, status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -370,7 +370,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15.
exclusive.
type: string
volumes:
description: List of Volumes to set in the podSpec.
Expand Down

0 comments on commit f8f75f6

Please sign in to comment.