Update to 1.18 of crossplane
Signed-off-by: Knut-Erik Johnsen <abstract@knut-erik.org>
This commit is contained in:
parent
a2db617e7b
commit
272e596c69
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.14.0
|
controller-gen.kubebuilder.io/version: v0.16.5
|
||||||
name: compositeresourcedefinitions.apiextensions.crossplane.io
|
name: compositeresourcedefinitions.apiextensions.crossplane.io
|
||||||
spec:
|
spec:
|
||||||
group: apiextensions.crossplane.io
|
group: apiextensions.crossplane.io
|
||||||
|
@ -36,7 +36,6 @@ spec:
|
||||||
A CompositeResourceDefinition defines the schema for a new custom Kubernetes
|
A CompositeResourceDefinition defines the schema for a new custom Kubernetes
|
||||||
API.
|
API.
|
||||||
|
|
||||||
|
|
||||||
Read the Crossplane documentation for
|
Read the Crossplane documentation for
|
||||||
[more information about CustomResourceDefinitions](https://docs.crossplane.io/latest/concepts/composite-resource-definitions).
|
[more information about CustomResourceDefinitions](https://docs.crossplane.io/latest/concepts/composite-resource-definitions).
|
||||||
properties:
|
properties:
|
||||||
|
@ -155,7 +154,6 @@ spec:
|
||||||
service is a reference to the service for this webhook. Either
|
service is a reference to the service for this webhook. Either
|
||||||
service or url must be specified.
|
service or url must be specified.
|
||||||
|
|
||||||
|
|
||||||
If the webhook is running within the cluster, then you should use `service`.
|
If the webhook is running within the cluster, then you should use `service`.
|
||||||
properties:
|
properties:
|
||||||
name:
|
name:
|
||||||
|
@ -189,29 +187,24 @@ spec:
|
||||||
(`scheme://host:port/path`). Exactly one of `url` or `service`
|
(`scheme://host:port/path`). Exactly one of `url` or `service`
|
||||||
must be specified.
|
must be specified.
|
||||||
|
|
||||||
|
|
||||||
The `host` should not refer to a service running in the cluster; use
|
The `host` should not refer to a service running in the cluster; use
|
||||||
the `service` field instead. The host might be resolved via external
|
the `service` field instead. The host might be resolved via external
|
||||||
DNS in some apiservers (e.g., `kube-apiserver` cannot resolve
|
DNS in some apiservers (e.g., `kube-apiserver` cannot resolve
|
||||||
in-cluster DNS as that would be a layering violation). `host` may
|
in-cluster DNS as that would be a layering violation). `host` may
|
||||||
also be an IP address.
|
also be an IP address.
|
||||||
|
|
||||||
|
|
||||||
Please note that using `localhost` or `127.0.0.1` as a `host` is
|
Please note that using `localhost` or `127.0.0.1` as a `host` is
|
||||||
risky unless you take great care to run this webhook on all hosts
|
risky unless you take great care to run this webhook on all hosts
|
||||||
which run an apiserver which might need to make calls to this
|
which run an apiserver which might need to make calls to this
|
||||||
webhook. Such installs are likely to be non-portable, i.e., not easy
|
webhook. Such installs are likely to be non-portable, i.e., not easy
|
||||||
to turn up in a new cluster.
|
to turn up in a new cluster.
|
||||||
|
|
||||||
|
|
||||||
The scheme must be "https"; the URL must begin with "https://".
|
The scheme must be "https"; the URL must begin with "https://".
|
||||||
|
|
||||||
|
|
||||||
A path is optional, and if present may be any string permissible in
|
A path is optional, and if present may be any string permissible in
|
||||||
a URL. You may use the path to pass an arbitrary string to the
|
a URL. You may use the path to pass an arbitrary string to the
|
||||||
webhook, for example, a cluster identifier.
|
webhook, for example, a cluster identifier.
|
||||||
|
|
||||||
|
|
||||||
Attempting to use a user or basic auth e.g. "user:password@" is not
|
Attempting to use a user or basic auth e.g. "user:password@" is not
|
||||||
allowed. Fragments ("#...") and query parameters ("?...") are not
|
allowed. Fragments ("#...") and query parameters ("?...") are not
|
||||||
allowed, either.
|
allowed, either.
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.14.0
|
controller-gen.kubebuilder.io/version: v0.16.5
|
||||||
name: compositions.apiextensions.crossplane.io
|
name: compositions.apiextensions.crossplane.io
|
||||||
spec:
|
spec:
|
||||||
group: apiextensions.crossplane.io
|
group: apiextensions.crossplane.io
|
||||||
|
@ -35,7 +35,6 @@ spec:
|
||||||
A Composition defines a collection of managed resources or functions that
|
A Composition defines a collection of managed resources or functions that
|
||||||
Crossplane uses to create and manage new composite resources.
|
Crossplane uses to create and manage new composite resources.
|
||||||
|
|
||||||
|
|
||||||
Read the Crossplane documentation for
|
Read the Crossplane documentation for
|
||||||
[more information about Compositions](https://docs.crossplane.io/latest/concepts/compositions).
|
[more information about Compositions](https://docs.crossplane.io/latest/concepts/compositions).
|
||||||
properties:
|
properties:
|
||||||
|
@ -77,143 +76,54 @@ spec:
|
||||||
x-kubernetes-validations:
|
x-kubernetes-validations:
|
||||||
- message: Value is immutable
|
- message: Value is immutable
|
||||||
rule: self == oldSelf
|
rule: self == oldSelf
|
||||||
environment:
|
mode:
|
||||||
|
default: Resources
|
||||||
description: |-
|
description: |-
|
||||||
Environment configures the environment in which resources are rendered.
|
Mode controls what type or "mode" of Composition will be used.
|
||||||
|
|
||||||
|
"Pipeline" indicates that a Composition specifies a pipeline of
|
||||||
|
Composition Functions, each of which is responsible for producing
|
||||||
|
composed resources that Crossplane should create or update.
|
||||||
|
|
||||||
THIS IS AN ALPHA FIELD. Do not use it in production. It is not honored
|
"Resources" indicates that a Composition uses what is commonly referred
|
||||||
unless the relevant Crossplane feature flag is enabled, and may be
|
to as "Patch & Transform" or P&T composition. This mode of Composition
|
||||||
changed or removed without notice.
|
uses an array of resources, each a template for a composed resource.
|
||||||
properties:
|
|
||||||
defaultData:
|
All Compositions should use Pipeline mode. Resources mode is deprecated.
|
||||||
additionalProperties:
|
Resources mode won't be removed in Crossplane 1.x, and will remain the
|
||||||
x-kubernetes-preserve-unknown-fields: true
|
default to avoid breaking legacy Compositions. However, it's no longer
|
||||||
|
accepting new features, and only accepting security related bug fixes.
|
||||||
|
enum:
|
||||||
|
- Resources
|
||||||
|
- Pipeline
|
||||||
|
type: string
|
||||||
|
patchSets:
|
||||||
description: |-
|
description: |-
|
||||||
DefaultData statically defines the initial state of the environment.
|
PatchSets define a named set of patches that may be included by any
|
||||||
It has the same schema-less structure as the data field in
|
resource in this Composition. PatchSets cannot themselves refer to other
|
||||||
environment configs.
|
PatchSets.
|
||||||
It is overwritten by the selected environment configs.
|
|
||||||
type: object
|
|
||||||
environmentConfigs:
|
|
||||||
description: |-
|
|
||||||
EnvironmentConfigs selects a list of `EnvironmentConfig`s. The resolved
|
|
||||||
resources are stored in the composite resource at
|
|
||||||
`spec.environmentConfigRefs` and is only updated if it is null.
|
|
||||||
|
|
||||||
|
PatchSets are only used by the "Resources" mode of Composition. They
|
||||||
|
are ignored by other modes.
|
||||||
|
|
||||||
The list of references is used to compute an in-memory environment at
|
Deprecated: Use Composition Functions instead.
|
||||||
compose time. The data of all object is merged in the order they are
|
|
||||||
listed, meaning the values of EnvironmentConfigs with a larger index take
|
|
||||||
priority over ones with smaller indices.
|
|
||||||
|
|
||||||
|
|
||||||
The computed environment can be accessed in a composition using
|
|
||||||
`FromEnvironmentFieldPath` and `CombineFromEnvironment` patches.
|
|
||||||
items:
|
items:
|
||||||
description: EnvironmentSource selects a EnvironmentConfig resource.
|
|
||||||
properties:
|
|
||||||
ref:
|
|
||||||
description: |-
|
description: |-
|
||||||
Ref is a named reference to a single EnvironmentConfig.
|
A PatchSet is a set of patches that can be reused from all resources within
|
||||||
Either Ref or Selector is required.
|
a Composition.
|
||||||
properties:
|
properties:
|
||||||
name:
|
name:
|
||||||
description: The name of the object.
|
description: Name of this PatchSet.
|
||||||
type: string
|
type: string
|
||||||
required:
|
|
||||||
- name
|
|
||||||
type: object
|
|
||||||
selector:
|
|
||||||
description: Selector selects EnvironmentConfig(s) via labels.
|
|
||||||
properties:
|
|
||||||
matchLabels:
|
|
||||||
description: MatchLabels ensures an object with matching
|
|
||||||
labels is selected.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
An EnvironmentSourceSelectorLabelMatcher acts like a k8s label selector but
|
|
||||||
can draw the label value from a different path.
|
|
||||||
properties:
|
|
||||||
fromFieldPathPolicy:
|
|
||||||
default: Required
|
|
||||||
description: |-
|
|
||||||
FromFieldPathPolicy specifies the policy for the valueFromFieldPath.
|
|
||||||
The default is Required, meaning that an error will be returned if the
|
|
||||||
field is not found in the composite resource.
|
|
||||||
Optional means that if the field is not found in the composite resource,
|
|
||||||
that label pair will just be skipped. N.B. other specified label
|
|
||||||
matchers will still be used to retrieve the desired
|
|
||||||
environment config, if any.
|
|
||||||
enum:
|
|
||||||
- Optional
|
|
||||||
- Required
|
|
||||||
type: string
|
|
||||||
key:
|
|
||||||
description: Key of the label to match.
|
|
||||||
type: string
|
|
||||||
type:
|
|
||||||
default: FromCompositeFieldPath
|
|
||||||
description: Type specifies where the value for
|
|
||||||
a label comes from.
|
|
||||||
enum:
|
|
||||||
- FromCompositeFieldPath
|
|
||||||
- Value
|
|
||||||
type: string
|
|
||||||
value:
|
|
||||||
description: Value specifies a literal label value.
|
|
||||||
type: string
|
|
||||||
valueFromFieldPath:
|
|
||||||
description: ValueFromFieldPath specifies the
|
|
||||||
field path to look for the label value.
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- key
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
maxMatch:
|
|
||||||
description: MaxMatch specifies the number of extracted
|
|
||||||
EnvironmentConfigs in Multiple mode, extracts all
|
|
||||||
if nil.
|
|
||||||
format: int64
|
|
||||||
type: integer
|
|
||||||
minMatch:
|
|
||||||
description: MinMatch specifies the required minimum
|
|
||||||
of extracted EnvironmentConfigs in Multiple mode.
|
|
||||||
format: int64
|
|
||||||
type: integer
|
|
||||||
mode:
|
|
||||||
default: Single
|
|
||||||
description: 'Mode specifies retrieval strategy: "Single"
|
|
||||||
or "Multiple".'
|
|
||||||
enum:
|
|
||||||
- Single
|
|
||||||
- Multiple
|
|
||||||
type: string
|
|
||||||
sortByFieldPath:
|
|
||||||
default: metadata.name
|
|
||||||
description: SortByFieldPath is the path to the field
|
|
||||||
based on which list of EnvironmentConfigs is alphabetically
|
|
||||||
sorted.
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type:
|
|
||||||
default: Reference
|
|
||||||
description: |-
|
|
||||||
Type specifies the way the EnvironmentConfig is selected.
|
|
||||||
Default is `Reference`
|
|
||||||
enum:
|
|
||||||
- Reference
|
|
||||||
- Selector
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
patches:
|
patches:
|
||||||
description: |-
|
description: Patches will be applied as an overlay to the base
|
||||||
Patches is a list of environment patches that are executed before a
|
resource.
|
||||||
composition's resources are composed.
|
|
||||||
items:
|
items:
|
||||||
description: EnvironmentPatch is a patch for a Composition environment.
|
description: |-
|
||||||
|
Patch objects are applied between composite and composed resources. Their
|
||||||
|
behaviour depends on the Type selected. The default Type,
|
||||||
|
FromCompositeFieldPath, copies a value from the composite resource to
|
||||||
|
the composed resource, applying any defined transformers.
|
||||||
properties:
|
properties:
|
||||||
combine:
|
combine:
|
||||||
description: |-
|
description: |-
|
||||||
|
@ -270,422 +180,6 @@ spec:
|
||||||
to be used as input. Required when type is FromCompositeFieldPath or
|
to be used as input. Required when type is FromCompositeFieldPath or
|
||||||
ToCompositeFieldPath.
|
ToCompositeFieldPath.
|
||||||
type: string
|
type: string
|
||||||
policy:
|
|
||||||
description: Policy configures the specifics of patching
|
|
||||||
behaviour.
|
|
||||||
properties:
|
|
||||||
fromFieldPath:
|
|
||||||
description: |-
|
|
||||||
FromFieldPath specifies how to patch from a field path. The default is
|
|
||||||
'Optional', which means the patch will be a no-op if the specified
|
|
||||||
fromFieldPath does not exist. Use 'Required' if the patch should fail if
|
|
||||||
the specified path does not exist.
|
|
||||||
enum:
|
|
||||||
- Optional
|
|
||||||
- Required
|
|
||||||
type: string
|
|
||||||
mergeOptions:
|
|
||||||
description: MergeOptions Specifies merge options on
|
|
||||||
a field path.
|
|
||||||
properties:
|
|
||||||
appendSlice:
|
|
||||||
description: Specifies that already existing elements
|
|
||||||
in a merged slice should be preserved
|
|
||||||
type: boolean
|
|
||||||
keepMapValues:
|
|
||||||
description: Specifies that already existing values
|
|
||||||
in a merged map should be preserved
|
|
||||||
type: boolean
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
toFieldPath:
|
|
||||||
description: |-
|
|
||||||
ToFieldPath is the path of the field on the resource whose value will
|
|
||||||
be changed with the result of transforms. Leave empty if you'd like to
|
|
||||||
propagate to the same path as fromFieldPath.
|
|
||||||
type: string
|
|
||||||
transforms:
|
|
||||||
description: |-
|
|
||||||
Transforms are the list of functions that are used as a FIFO pipe for the
|
|
||||||
input to be transformed.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
Transform is a unit of process whose input is transformed into an output with
|
|
||||||
the supplied configuration.
|
|
||||||
properties:
|
|
||||||
convert:
|
|
||||||
description: Convert is used to cast the input into
|
|
||||||
the given output type.
|
|
||||||
properties:
|
|
||||||
format:
|
|
||||||
description: |-
|
|
||||||
The expected input format.
|
|
||||||
|
|
||||||
|
|
||||||
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
|
|
||||||
Only used during `string -> float64` conversions.
|
|
||||||
* `json` - parses the input as a JSON string.
|
|
||||||
Only used during `string -> object` or `string -> list` conversions.
|
|
||||||
|
|
||||||
|
|
||||||
If this property is null, the default conversion is applied.
|
|
||||||
enum:
|
|
||||||
- none
|
|
||||||
- quantity
|
|
||||||
- json
|
|
||||||
type: string
|
|
||||||
toType:
|
|
||||||
description: ToType is the type of the output
|
|
||||||
of this transform.
|
|
||||||
enum:
|
|
||||||
- string
|
|
||||||
- int
|
|
||||||
- int64
|
|
||||||
- bool
|
|
||||||
- float64
|
|
||||||
- object
|
|
||||||
- array
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- toType
|
|
||||||
type: object
|
|
||||||
map:
|
|
||||||
additionalProperties:
|
|
||||||
x-kubernetes-preserve-unknown-fields: true
|
|
||||||
description: Map uses the input as a key in the given
|
|
||||||
map and returns the value.
|
|
||||||
type: object
|
|
||||||
match:
|
|
||||||
description: Match is a more complex version of Map
|
|
||||||
that matches a list of patterns.
|
|
||||||
properties:
|
|
||||||
fallbackTo:
|
|
||||||
default: Value
|
|
||||||
description: Determines to what value the transform
|
|
||||||
should fallback if no pattern matches.
|
|
||||||
enum:
|
|
||||||
- Value
|
|
||||||
- Input
|
|
||||||
type: string
|
|
||||||
fallbackValue:
|
|
||||||
description: |-
|
|
||||||
The fallback value that should be returned by the transform if now pattern
|
|
||||||
matches.
|
|
||||||
x-kubernetes-preserve-unknown-fields: true
|
|
||||||
patterns:
|
|
||||||
description: |-
|
|
||||||
The patterns that should be tested against the input string.
|
|
||||||
Patterns are tested in order. The value of the first match is used as
|
|
||||||
result of this transform.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
MatchTransformPattern is a transform that returns the value that matches a
|
|
||||||
pattern.
|
|
||||||
properties:
|
|
||||||
literal:
|
|
||||||
description: |-
|
|
||||||
Literal exactly matches the input string (case sensitive).
|
|
||||||
Is required if `type` is `literal`.
|
|
||||||
type: string
|
|
||||||
regexp:
|
|
||||||
description: |-
|
|
||||||
Regexp to match against the input string.
|
|
||||||
Is required if `type` is `regexp`.
|
|
||||||
type: string
|
|
||||||
result:
|
|
||||||
description: The value that is used as result
|
|
||||||
of the transform if the pattern matches.
|
|
||||||
x-kubernetes-preserve-unknown-fields: true
|
|
||||||
type:
|
|
||||||
default: literal
|
|
||||||
description: |-
|
|
||||||
Type specifies how the pattern matches the input.
|
|
||||||
|
|
||||||
|
|
||||||
* `literal` - the pattern value has to exactly match (case sensitive) the
|
|
||||||
input string. This is the default.
|
|
||||||
|
|
||||||
|
|
||||||
* `regexp` - the pattern treated as a regular expression against
|
|
||||||
which the input string is tested. Crossplane will throw an error if the
|
|
||||||
key is not a valid regexp.
|
|
||||||
enum:
|
|
||||||
- literal
|
|
||||||
- regexp
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- result
|
|
||||||
- type
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
type: object
|
|
||||||
math:
|
|
||||||
description: |-
|
|
||||||
Math is used to transform the input via mathematical operations such as
|
|
||||||
multiplication.
|
|
||||||
properties:
|
|
||||||
clampMax:
|
|
||||||
description: ClampMax makes sure that the value
|
|
||||||
is not bigger than the given value.
|
|
||||||
format: int64
|
|
||||||
type: integer
|
|
||||||
clampMin:
|
|
||||||
description: ClampMin makes sure that the value
|
|
||||||
is not smaller than the given value.
|
|
||||||
format: int64
|
|
||||||
type: integer
|
|
||||||
multiply:
|
|
||||||
description: Multiply the value.
|
|
||||||
format: int64
|
|
||||||
type: integer
|
|
||||||
type:
|
|
||||||
default: Multiply
|
|
||||||
description: Type of the math transform to be
|
|
||||||
run.
|
|
||||||
enum:
|
|
||||||
- Multiply
|
|
||||||
- ClampMin
|
|
||||||
- ClampMax
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
string:
|
|
||||||
description: |-
|
|
||||||
String is used to transform the input into a string or a different kind
|
|
||||||
of string. Note that the input does not necessarily need to be a string.
|
|
||||||
properties:
|
|
||||||
convert:
|
|
||||||
description: |-
|
|
||||||
Optional conversion method to be specified.
|
|
||||||
`ToUpper` and `ToLower` change the letter case of the input string.
|
|
||||||
`ToBase64` and `FromBase64` perform a base64 conversion based on the input string.
|
|
||||||
`ToJson` converts any input value into its raw JSON representation.
|
|
||||||
`ToSha1`, `ToSha256` and `ToSha512` generate a hash value based on the input
|
|
||||||
converted to JSON.
|
|
||||||
`ToAdler32` generate a addler32 hash based on the input string.
|
|
||||||
enum:
|
|
||||||
- ToUpper
|
|
||||||
- ToLower
|
|
||||||
- ToBase64
|
|
||||||
- FromBase64
|
|
||||||
- ToJson
|
|
||||||
- ToSha1
|
|
||||||
- ToSha256
|
|
||||||
- ToSha512
|
|
||||||
- ToAdler32
|
|
||||||
type: string
|
|
||||||
fmt:
|
|
||||||
description: |-
|
|
||||||
Format the input using a Go format string. See
|
|
||||||
https://golang.org/pkg/fmt/ for details.
|
|
||||||
type: string
|
|
||||||
join:
|
|
||||||
description: Join defines parameters to join a
|
|
||||||
slice of values to a string.
|
|
||||||
properties:
|
|
||||||
separator:
|
|
||||||
description: |-
|
|
||||||
Separator defines the character that should separate the values from each
|
|
||||||
other in the joined string.
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- separator
|
|
||||||
type: object
|
|
||||||
regexp:
|
|
||||||
description: Extract a match from the input using
|
|
||||||
a regular expression.
|
|
||||||
properties:
|
|
||||||
group:
|
|
||||||
description: Group number to match. 0 (the
|
|
||||||
default) matches the entire expression.
|
|
||||||
type: integer
|
|
||||||
match:
|
|
||||||
description: |-
|
|
||||||
Match string. May optionally include submatches, aka capture groups.
|
|
||||||
See https://pkg.go.dev/regexp/ for details.
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- match
|
|
||||||
type: object
|
|
||||||
trim:
|
|
||||||
description: Trim the prefix or suffix from the
|
|
||||||
input
|
|
||||||
type: string
|
|
||||||
type:
|
|
||||||
default: Format
|
|
||||||
description: Type of the string transform to be
|
|
||||||
run.
|
|
||||||
enum:
|
|
||||||
- Format
|
|
||||||
- Convert
|
|
||||||
- TrimPrefix
|
|
||||||
- TrimSuffix
|
|
||||||
- Regexp
|
|
||||||
- Join
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type:
|
|
||||||
description: Type of the transform to be run.
|
|
||||||
enum:
|
|
||||||
- map
|
|
||||||
- match
|
|
||||||
- math
|
|
||||||
- string
|
|
||||||
- convert
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- type
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
type:
|
|
||||||
default: FromCompositeFieldPath
|
|
||||||
description: |-
|
|
||||||
Type sets the patching behaviour to be used. Each patch type may require
|
|
||||||
its own fields to be set on the Patch object.
|
|
||||||
enum:
|
|
||||||
- FromCompositeFieldPath
|
|
||||||
- ToCompositeFieldPath
|
|
||||||
- CombineFromComposite
|
|
||||||
- CombineToComposite
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: array
|
|
||||||
policy:
|
|
||||||
description: |-
|
|
||||||
Policy represents the Resolve and Resolution policies which apply to
|
|
||||||
all EnvironmentSourceReferences in EnvironmentConfigs list.
|
|
||||||
properties:
|
|
||||||
resolution:
|
|
||||||
default: Required
|
|
||||||
description: |-
|
|
||||||
Resolution specifies whether resolution of this reference is required.
|
|
||||||
The default is 'Required', which means the reconcile will fail if the
|
|
||||||
reference cannot be resolved. 'Optional' means this reference will be
|
|
||||||
a no-op if it cannot be resolved.
|
|
||||||
enum:
|
|
||||||
- Required
|
|
||||||
- Optional
|
|
||||||
type: string
|
|
||||||
resolve:
|
|
||||||
description: |-
|
|
||||||
Resolve specifies when this reference should be resolved. The default
|
|
||||||
is 'IfNotPresent', which will attempt to resolve the reference only when
|
|
||||||
the corresponding field is not present. Use 'Always' to resolve the
|
|
||||||
reference on every reconcile.
|
|
||||||
enum:
|
|
||||||
- Always
|
|
||||||
- IfNotPresent
|
|
||||||
type: string
|
|
||||||
type: object
|
|
||||||
type: object
|
|
||||||
mode:
|
|
||||||
default: Resources
|
|
||||||
description: |-
|
|
||||||
Mode controls what type or "mode" of Composition will be used.
|
|
||||||
|
|
||||||
|
|
||||||
"Pipeline" indicates that a Composition specifies a pipeline of
|
|
||||||
Composition Functions, each of which is responsible for producing
|
|
||||||
composed resources that Crossplane should create or update.
|
|
||||||
|
|
||||||
|
|
||||||
"Resources" indicates that a Composition uses what is commonly referred
|
|
||||||
to as "Patch & Transform" or P&T composition. This mode of Composition
|
|
||||||
uses an array of resources, each a template for a composed resource.
|
|
||||||
|
|
||||||
|
|
||||||
All Compositions should use Pipeline mode. Resources mode is deprecated.
|
|
||||||
Resources mode won't be removed in Crossplane 1.x, and will remain the
|
|
||||||
default to avoid breaking legacy Compositions. However, it's no longer
|
|
||||||
accepting new features, and only accepting security related bug fixes.
|
|
||||||
enum:
|
|
||||||
- Resources
|
|
||||||
- Pipeline
|
|
||||||
type: string
|
|
||||||
patchSets:
|
|
||||||
description: |-
|
|
||||||
PatchSets define a named set of patches that may be included by any
|
|
||||||
resource in this Composition. PatchSets cannot themselves refer to other
|
|
||||||
PatchSets.
|
|
||||||
|
|
||||||
|
|
||||||
PatchSets are only used by the "Resources" mode of Composition. They
|
|
||||||
are ignored by other modes.
|
|
||||||
|
|
||||||
|
|
||||||
Deprecated: Use Composition Functions instead.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
A PatchSet is a set of patches that can be reused from all resources within
|
|
||||||
a Composition.
|
|
||||||
properties:
|
|
||||||
name:
|
|
||||||
description: Name of this PatchSet.
|
|
||||||
type: string
|
|
||||||
patches:
|
|
||||||
description: Patches will be applied as an overlay to the base
|
|
||||||
resource.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
Patch objects are applied between composite and composed resources. Their
|
|
||||||
behaviour depends on the Type selected. The default Type,
|
|
||||||
FromCompositeFieldPath, copies a value from the composite resource to
|
|
||||||
the composed resource, applying any defined transformers.
|
|
||||||
properties:
|
|
||||||
combine:
|
|
||||||
description: |-
|
|
||||||
Combine is the patch configuration for a CombineFromComposite,
|
|
||||||
CombineFromEnvironment, CombineToComposite or CombineToEnvironment patch.
|
|
||||||
properties:
|
|
||||||
strategy:
|
|
||||||
description: |-
|
|
||||||
Strategy defines the strategy to use to combine the input variable values.
|
|
||||||
Currently only string is supported.
|
|
||||||
enum:
|
|
||||||
- string
|
|
||||||
type: string
|
|
||||||
string:
|
|
||||||
description: |-
|
|
||||||
String declares that input variables should be combined into a single
|
|
||||||
string, using the relevant settings for formatting purposes.
|
|
||||||
properties:
|
|
||||||
fmt:
|
|
||||||
description: |-
|
|
||||||
Format the input using a Go format string. See
|
|
||||||
https://golang.org/pkg/fmt/ for details.
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- fmt
|
|
||||||
type: object
|
|
||||||
variables:
|
|
||||||
description: |-
|
|
||||||
Variables are the list of variables whose values will be retrieved and
|
|
||||||
combined.
|
|
||||||
items:
|
|
||||||
description: |-
|
|
||||||
A CombineVariable defines the source of a value that is combined with
|
|
||||||
others to form and patch an output value. Currently, this only supports
|
|
||||||
retrieving values from a field path.
|
|
||||||
properties:
|
|
||||||
fromFieldPath:
|
|
||||||
description: |-
|
|
||||||
FromFieldPath is the path of the field on the source whose value is
|
|
||||||
to be used as input.
|
|
||||||
type: string
|
|
||||||
required:
|
|
||||||
- fromFieldPath
|
|
||||||
type: object
|
|
||||||
minItems: 1
|
|
||||||
type: array
|
|
||||||
required:
|
|
||||||
- strategy
|
|
||||||
- variables
|
|
||||||
type: object
|
|
||||||
fromFieldPath:
|
|
||||||
description: |-
|
|
||||||
FromFieldPath is the path of the field on the resource whose value is
|
|
||||||
to be used as input. Required when type is FromCompositeFieldPath,
|
|
||||||
FromEnvironmentFieldPath, ToCompositeFieldPath, ToEnvironmentFieldPath.
|
|
||||||
type: string
|
|
||||||
patchSetName:
|
patchSetName:
|
||||||
description: PatchSetName to include patches from. Required
|
description: PatchSetName to include patches from. Required
|
||||||
when type is PatchSet.
|
when type is PatchSet.
|
||||||
|
@ -741,13 +235,11 @@ spec:
|
||||||
description: |-
|
description: |-
|
||||||
The expected input format.
|
The expected input format.
|
||||||
|
|
||||||
|
|
||||||
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
|
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
|
||||||
Only used during `string -> float64` conversions.
|
Only used during `string -> float64` conversions.
|
||||||
* `json` - parses the input as a JSON string.
|
* `json` - parses the input as a JSON string.
|
||||||
Only used during `string -> object` or `string -> list` conversions.
|
Only used during `string -> object` or `string -> list` conversions.
|
||||||
|
|
||||||
|
|
||||||
If this property is null, the default conversion is applied.
|
If this property is null, the default conversion is applied.
|
||||||
enum:
|
enum:
|
||||||
- none
|
- none
|
||||||
|
@ -822,11 +314,9 @@ spec:
|
||||||
description: |-
|
description: |-
|
||||||
Type specifies how the pattern matches the input.
|
Type specifies how the pattern matches the input.
|
||||||
|
|
||||||
|
|
||||||
* `literal` - the pattern value has to exactly match (case sensitive) the
|
* `literal` - the pattern value has to exactly match (case sensitive) the
|
||||||
input string. This is the default.
|
input string. This is the default.
|
||||||
|
|
||||||
|
|
||||||
* `regexp` - the pattern treated as a regular expression against
|
* `regexp` - the pattern treated as a regular expression against
|
||||||
which the input string is tested. Crossplane will throw an error if the
|
which the input string is tested. Crossplane will throw an error if the
|
||||||
key is not a valid regexp.
|
key is not a valid regexp.
|
||||||
|
@ -964,14 +454,10 @@ spec:
|
||||||
its own fields to be set on the Patch object.
|
its own fields to be set on the Patch object.
|
||||||
enum:
|
enum:
|
||||||
- FromCompositeFieldPath
|
- FromCompositeFieldPath
|
||||||
- FromEnvironmentFieldPath
|
|
||||||
- PatchSet
|
- PatchSet
|
||||||
- ToCompositeFieldPath
|
- ToCompositeFieldPath
|
||||||
- ToEnvironmentFieldPath
|
|
||||||
- CombineFromEnvironment
|
|
||||||
- CombineFromComposite
|
- CombineFromComposite
|
||||||
- CombineToComposite
|
- CombineToComposite
|
||||||
- CombineToEnvironment
|
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
|
@ -986,7 +472,6 @@ spec:
|
||||||
composite resource referring to this composition is created. One of
|
composite resource referring to this composition is created. One of
|
||||||
resources and pipeline must be specified - you cannot specify both.
|
resources and pipeline must be specified - you cannot specify both.
|
||||||
|
|
||||||
|
|
||||||
The Pipeline is only used by the "Pipeline" mode of Composition. It is
|
The Pipeline is only used by the "Pipeline" mode of Composition. It is
|
||||||
ignored by other modes.
|
ignored by other modes.
|
||||||
items:
|
items:
|
||||||
|
@ -1070,7 +555,6 @@ spec:
|
||||||
with which the connection details of composite resources dynamically
|
with which the connection details of composite resources dynamically
|
||||||
provisioned using this composition will be published.
|
provisioned using this composition will be published.
|
||||||
|
|
||||||
|
|
||||||
THIS IS AN ALPHA FIELD. Do not use it in production. It is not honored
|
THIS IS AN ALPHA FIELD. Do not use it in production. It is not honored
|
||||||
unless the relevant Crossplane feature flag is enabled, and may be
|
unless the relevant Crossplane feature flag is enabled, and may be
|
||||||
changed or removed without notice.
|
changed or removed without notice.
|
||||||
|
@ -1086,11 +570,9 @@ spec:
|
||||||
Resources is a list of resource templates that will be used when a
|
Resources is a list of resource templates that will be used when a
|
||||||
composite resource referring to this composition is created.
|
composite resource referring to this composition is created.
|
||||||
|
|
||||||
|
|
||||||
Resources are only used by the "Resources" mode of Composition. They are
|
Resources are only used by the "Resources" mode of Composition. They are
|
||||||
ignored by other modes.
|
ignored by other modes.
|
||||||
|
|
||||||
|
|
||||||
Deprecated: Use Composition Functions instead.
|
Deprecated: Use Composition Functions instead.
|
||||||
items:
|
items:
|
||||||
description: |-
|
description: |-
|
||||||
|
@ -1173,8 +655,8 @@ spec:
|
||||||
properties:
|
properties:
|
||||||
combine:
|
combine:
|
||||||
description: |-
|
description: |-
|
||||||
Combine is the patch configuration for a CombineFromComposite,
|
Combine is the patch configuration for a CombineFromComposite or
|
||||||
CombineFromEnvironment, CombineToComposite or CombineToEnvironment patch.
|
CombineToComposite patch.
|
||||||
properties:
|
properties:
|
||||||
strategy:
|
strategy:
|
||||||
description: |-
|
description: |-
|
||||||
|
@ -1223,8 +705,8 @@ spec:
|
||||||
fromFieldPath:
|
fromFieldPath:
|
||||||
description: |-
|
description: |-
|
||||||
FromFieldPath is the path of the field on the resource whose value is
|
FromFieldPath is the path of the field on the resource whose value is
|
||||||
to be used as input. Required when type is FromCompositeFieldPath,
|
to be used as input. Required when type is FromCompositeFieldPath or
|
||||||
FromEnvironmentFieldPath, ToCompositeFieldPath, ToEnvironmentFieldPath.
|
ToCompositeFieldPath.
|
||||||
type: string
|
type: string
|
||||||
patchSetName:
|
patchSetName:
|
||||||
description: PatchSetName to include patches from. Required
|
description: PatchSetName to include patches from. Required
|
||||||
|
@ -1281,13 +763,11 @@ spec:
|
||||||
description: |-
|
description: |-
|
||||||
The expected input format.
|
The expected input format.
|
||||||
|
|
||||||
|
|
||||||
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
|
* `quantity` - parses the input as a K8s [`resource.Quantity`](https://pkg.go.dev/k8s.io/apimachinery/pkg/api/resource#Quantity).
|
||||||
Only used during `string -> float64` conversions.
|
Only used during `string -> float64` conversions.
|
||||||
* `json` - parses the input as a JSON string.
|
* `json` - parses the input as a JSON string.
|
||||||
Only used during `string -> object` or `string -> list` conversions.
|
Only used during `string -> object` or `string -> list` conversions.
|
||||||
|
|
||||||
|
|
||||||
If this property is null, the default conversion is applied.
|
If this property is null, the default conversion is applied.
|
||||||
enum:
|
enum:
|
||||||
- none
|
- none
|
||||||
|
@ -1362,11 +842,9 @@ spec:
|
||||||
description: |-
|
description: |-
|
||||||
Type specifies how the pattern matches the input.
|
Type specifies how the pattern matches the input.
|
||||||
|
|
||||||
|
|
||||||
* `literal` - the pattern value has to exactly match (case sensitive) the
|
* `literal` - the pattern value has to exactly match (case sensitive) the
|
||||||
input string. This is the default.
|
input string. This is the default.
|
||||||
|
|
||||||
|
|
||||||
* `regexp` - the pattern treated as a regular expression against
|
* `regexp` - the pattern treated as a regular expression against
|
||||||
which the input string is tested. Crossplane will throw an error if the
|
which the input string is tested. Crossplane will throw an error if the
|
||||||
key is not a valid regexp.
|
key is not a valid regexp.
|
||||||
|
@ -1504,14 +982,10 @@ spec:
|
||||||
its own fields to be set on the Patch object.
|
its own fields to be set on the Patch object.
|
||||||
enum:
|
enum:
|
||||||
- FromCompositeFieldPath
|
- FromCompositeFieldPath
|
||||||
- FromEnvironmentFieldPath
|
|
||||||
- PatchSet
|
- PatchSet
|
||||||
- ToCompositeFieldPath
|
- ToCompositeFieldPath
|
||||||
- ToEnvironmentFieldPath
|
|
||||||
- CombineFromEnvironment
|
|
||||||
- CombineFromComposite
|
- CombineFromComposite
|
||||||
- CombineToComposite
|
- CombineToComposite
|
||||||
- CombineToEnvironment
|
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.14.0
|
controller-gen.kubebuilder.io/version: v0.16.5
|
||||||
name: environmentconfigs.apiextensions.crossplane.io
|
name: environmentconfigs.apiextensions.crossplane.io
|
||||||
spec:
|
spec:
|
||||||
group: apiextensions.crossplane.io
|
group: apiextensions.crossplane.io
|
||||||
|
@ -29,6 +29,47 @@ spec:
|
||||||
An EnvironmentConfig contains user-defined unstructured values for
|
An EnvironmentConfig contains user-defined unstructured values for
|
||||||
use in a Composition.
|
use in a Composition.
|
||||||
|
|
||||||
|
Read the Crossplane documentation for
|
||||||
|
[more information about EnvironmentConfigs](https://docs.crossplane.io/latest/concepts/environment-configs).
|
||||||
|
properties:
|
||||||
|
apiVersion:
|
||||||
|
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
|
||||||
|
type: string
|
||||||
|
data:
|
||||||
|
additionalProperties:
|
||||||
|
x-kubernetes-preserve-unknown-fields: true
|
||||||
|
description: |-
|
||||||
|
The data of this EnvironmentConfig.
|
||||||
|
This may contain any kind of structure that can be serialized into JSON.
|
||||||
|
type: object
|
||||||
|
kind:
|
||||||
|
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
|
||||||
|
type: string
|
||||||
|
metadata:
|
||||||
|
type: object
|
||||||
|
type: object
|
||||||
|
served: true
|
||||||
|
storage: false
|
||||||
|
subresources: {}
|
||||||
|
- additionalPrinterColumns:
|
||||||
|
- jsonPath: .metadata.creationTimestamp
|
||||||
|
name: AGE
|
||||||
|
type: date
|
||||||
|
name: v1beta1
|
||||||
|
schema:
|
||||||
|
openAPIV3Schema:
|
||||||
|
description: |-
|
||||||
|
An EnvironmentConfig contains user-defined unstructured values for
|
||||||
|
use in a Composition.
|
||||||
|
|
||||||
Read the Crossplane documentation for
|
Read the Crossplane documentation for
|
||||||
[more information about EnvironmentConfigs](https://docs.crossplane.io/latest/concepts/environment-configs).
|
[more information about EnvironmentConfigs](https://docs.crossplane.io/latest/concepts/environment-configs).
|
||||||
|
|
|
@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
annotations:
|
annotations:
|
||||||
controller-gen.kubebuilder.io/version: v0.14.0
|
controller-gen.kubebuilder.io/version: v0.16.5
|
||||||
name: usages.apiextensions.crossplane.io
|
name: usages.apiextensions.crossplane.io
|
||||||
spec:
|
spec:
|
||||||
group: apiextensions.crossplane.io
|
group: apiextensions.crossplane.io
|
||||||
|
@ -32,11 +32,9 @@ spec:
|
||||||
description: |-
|
description: |-
|
||||||
A Usage defines a deletion blocking relationship between two resources.
|
A Usage defines a deletion blocking relationship between two resources.
|
||||||
|
|
||||||
|
|
||||||
Usages prevent accidental deletion of a single resource or deletion of
|
Usages prevent accidental deletion of a single resource or deletion of
|
||||||
resources with dependent resources.
|
resources with dependent resources.
|
||||||
|
|
||||||
|
|
||||||
Read the Crossplane documentation for
|
Read the Crossplane documentation for
|
||||||
[more information about Compositions](https://docs.crossplane.io/latest/concepts/usages).
|
[more information about Compositions](https://docs.crossplane.io/latest/concepts/usages).
|
||||||
properties:
|
properties:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
release="v1.17.1"
|
release="v1.18.0"
|
||||||
|
|
||||||
apiextensions=$(gh api --jq '.[].name' "/repos/crossplane/crossplane/contents/cluster/crds?ref=${release}" | grep apiextensions)
|
apiextensions=$(gh api --jq '.[].name' "/repos/crossplane/crossplane/contents/cluster/crds?ref=${release}" | grep apiextensions)
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
release="v1.17.1"
|
release="v1.18.0"
|
||||||
file="run_function.proto"
|
file="run_function.proto"
|
||||||
gh api -H "Accept: application/vnd.github.raw+json" "/repos/crossplane/crossplane/contents/apis/apiextensions/fn/proto/v1/${file}?ref=${release}" > $file
|
gh api -H "Accept: application/vnd.github.raw+json" "/repos/crossplane/crossplane/contents/apis/apiextensions/fn/proto/v1/${file}?ref=${release}" > $file
|
||||||
|
|
||||||
|
|
|
@ -226,8 +226,11 @@ message Resource {
|
||||||
// * A Function should set this field to READY_TRUE in a RunFunctionResponse
|
// * A Function should set this field to READY_TRUE in a RunFunctionResponse
|
||||||
// to indicate that a desired composed resource is ready.
|
// to indicate that a desired composed resource is ready.
|
||||||
//
|
//
|
||||||
// * A Function should not set this field in a RunFunctionResponse to indicate
|
// * A Function should set this field to READY_TRUE in a RunFunctionResponse
|
||||||
// that the desired composite resource is ready. This will be ignored.
|
// to indicate that a desired composite resource is ready.
|
||||||
|
// This overwrites the standard readiness detection that determines the
|
||||||
|
// ready state of the composite by the ready state of the the
|
||||||
|
// composed resources.
|
||||||
Ready ready = 3;
|
Ready ready = 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue