From c181e05dc4952d00e42e57955551cea066234f3f Mon Sep 17 00:00:00 2001 From: Redouane Kachach Date: Tue, 20 Feb 2024 10:05:24 +0100 Subject: [PATCH 1/2] manifest: reduce CRD size by removing some descriptions Reduce CRD size by removing some descriptions for things that (a) are long, (b) are repeated, and (c) are commong kubernetes types. Remove the `Status` field from VolumeClaimTemplates (a.k.a. PVCs) in types.go to remove all unnecessary status-related fields. Use `yq` to go through generated `crds.yaml` to strip out descriptions for well-known k8s types that are long and repeated where we can't remove them from types.go. This is mostly placement descriptions and volumeSource descriptions. The overall `crds.yaml` file is reduced to less than 60% of its original size. Signed-off-by: Blaine Gardner Signed-off-by: Redouane Kachach Co-authored-by: Blaine Gardner (cherry picked from commit bd7477ec61e4d1ae56f28b7e95d98c0813423b67) # Conflicts: # deploy/charts/rook-ceph/templates/resources.yaml # deploy/examples/crds.yaml --- Documentation/CRDs/specification.md | 237 +- build/crds/build-crds.sh | 20 +- .../charts/rook-ceph/templates/resources.yaml | 2927 ++++++----------- deploy/examples/crds.yaml | 2927 ++++++----------- pkg/apis/ceph.rook.io/v1/types.go | 21 +- pkg/apis/ceph.rook.io/v1/volume.go | 8 + .../ceph.rook.io/v1/zz_generated.deepcopy.go | 26 +- pkg/daemon/ceph/osd/remove_test.go | 8 +- pkg/operator/ceph/cluster/mon/health_test.go | 2 +- pkg/operator/ceph/cluster/mon/mon.go | 6 +- pkg/operator/ceph/cluster/mon/mon_test.go | 22 +- pkg/operator/ceph/cluster/mon/spec_test.go | 6 +- pkg/operator/ceph/cluster/osd/create_test.go | 10 +- pkg/operator/ceph/cluster/osd/deviceSet.go | 2 +- .../ceph/cluster/osd/deviceset_test.go | 10 +- .../ceph/cluster/osd/integration_test.go | 6 +- 16 files changed, 2453 insertions(+), 3785 deletions(-) diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index f946897f7e4c..015665b72d5a 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -7963,8 +7963,8 @@ StretchClusterSpec volumeClaimTemplate
- -Kubernetes core/v1.PersistentVolumeClaim + +VolumeClaimTemplate @@ -8019,8 +8019,8 @@ bool volumeClaimTemplate
- -Kubernetes core/v1.PersistentVolumeClaim + +VolumeClaimTemplate @@ -11153,8 +11153,8 @@ string volumeClaimTemplates
- -[]Kubernetes core/v1.PersistentVolumeClaim + +[]VolumeClaimTemplate @@ -11687,8 +11687,8 @@ map[string]string volumeClaimTemplates
- -[]Kubernetes core/v1.PersistentVolumeClaim + +[]VolumeClaimTemplate @@ -12014,6 +12014,227 @@ KafkaEndpointSpec +

VolumeClaimTemplate +

+

+(Appears on:MonSpec, MonZoneSpec, Selection, StorageClassDeviceSet) +

+
+

VolumeClaimTemplate is a simplified version of K8s corev1’s PVC. It has no type meta or status.

+
+ + + + + + + + + + + + + + + + + +
FieldDescription
+metadata
+ + +Kubernetes meta/v1.ObjectMeta + + +		 +(Optional) +

Standard object’s metadata. +More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata

+Refer to the Kubernetes API documentation for the fields of the +metadata field. +
+spec
+ + +Kubernetes core/v1.PersistentVolumeClaimSpec + + +		 +(Optional) +

spec defines the desired characteristics of a volume requested by a pod author. +More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+accessModes
+ + +[]Kubernetes core/v1.PersistentVolumeAccessMode + + +		 +(Optional) +

accessModes contains the desired access modes the volume should have. +More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1

+
+selector
+ + +Kubernetes meta/v1.LabelSelector + + +		 +(Optional) +

selector is a label query over volumes to consider for binding.

+
+resources
+ + +Kubernetes core/v1.VolumeResourceRequirements + + +		 +(Optional) +

resources represents the minimum resources the volume should have. +If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements +that are lower than previous value but must still be higher than capacity recorded in the +status field of the claim. +More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources

+
+volumeName
+ +string + +		 +(Optional) +

volumeName is the binding reference to the PersistentVolume backing this claim.

+
+storageClassName
+ +string + +		 +(Optional) +

storageClassName is the name of the StorageClass required by the claim. +More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1

+
+volumeMode
+ + +Kubernetes core/v1.PersistentVolumeMode + + +		 +(Optional) +

volumeMode defines what type of volume is required by the claim. +Value of Filesystem is implied when not included in claim spec.

+
+dataSource
+ + +Kubernetes core/v1.TypedLocalObjectReference + + +		 +(Optional) +

dataSource 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. +When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, +and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. +If the namespace is specified, then dataSourceRef will not be copied to dataSource.

+
+dataSourceRef
+ + +Kubernetes core/v1.TypedObjectReference + + +		 +(Optional) +

dataSourceRef specifies the object from which to populate the volume with data, if a non-empty +volume is desired. This may be any 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, when namespace isn’t specified in dataSourceRef, +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. +When namespace is specified in dataSourceRef, +dataSource isn’t set to the same value and must be empty. +There are three 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. +* While dataSource only allows local objects, dataSourceRef allows objects +in any namespaces. +(Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. +(Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.

+
+volumeAttributesClassName
+ +string + +		 +(Optional) +

volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. +If specified, the CSI driver will create or update the volume with the attributes defined +in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, +it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass +will be applied to the claim but it’s not allowed to reset this field to empty string once it is set. +If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass +will be set by the persistentvolume controller if it exists. +If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be +set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource +exists. +More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass +(Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.

+
+

ZoneSpec

diff --git a/build/crds/build-crds.sh b/build/crds/build-crds.sh index 929534fb4a8f..c88adb3b04d4 100755 --- a/build/crds/build-crds.sh +++ b/build/crds/build-crds.sh @@ -23,7 +23,7 @@ set -o pipefail SCRIPT_ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P) CONTROLLER_GEN_BIN_PATH=$1 YQ_BIN_PATH=$2 -: "${MAX_DESC_LEN:=100}" +: "${MAX_DESC_LEN:=-1}" # allowDangerousTypes is used to accept float64 CRD_OPTIONS="crd:maxDescLen=$MAX_DESC_LEN,generateEmbeddedObjectMeta=true,allowDangerousTypes=true" @@ -113,4 +113,22 @@ done < <(find "$OLM_CATALOG_DIR" -type f -name '*.yaml' | sort) echo "---" >>"$CEPH_CRDS_FILE_PATH" # yq doesn't output the first doc separator $YQ_BIN_PATH eval-all '.' "${CRD_FILES[@]}" >>"$CEPH_CRDS_FILE_PATH" +# Remove long, repeat descriptions in CRDs, especially for things that are well-known K8s types +# Use this to manually inspect descriptions to see where there are repetitions of long ones: +# cat deploy/examples/crds.yaml | grep description | sed 's/^[[:space:]]*//g' | sort > desc.yml + +# remove descriptions from all placement configs +$YQ_BIN_PATH --inplace eval 'del(.. | .placement? | .. | .description?)' "$CEPH_CRDS_FILE_PATH" +$YQ_BIN_PATH --inplace eval 'del(.. | .preparePlacement? | .. | .description?)' "$CEPH_CRDS_FILE_PATH" + +$YQ_BIN_PATH --inplace eval 'del(.. | .terminationGracePeriodSeconds? | .description?)' "$CEPH_CRDS_FILE_PATH" + +# volume source usage is a well-known k8s type +$YQ_BIN_PATH --inplace eval 'del(.. | .volumeSource? | .. | .description?)' "$CEPH_CRDS_FILE_PATH" + +# yq turns 'creationTimestamp: null' into 'creationTimestamp: {}' in CRDs +# this field is also unnecessary, so just remove it +$YQ_BIN_PATH --inplace eval 'del(.. | .creationTimestamp?)' "$CEPH_CRDS_FILE_PATH" + +# generate helm resources after pruning build_helm_resources diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index 015c476c78a2..153bd980e94c 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -6,7 +6,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephblockpoolradosnamespaces.ceph.rook.io spec: group: ceph.rook.io @@ -23,10 +22,10 @@ spec: description: CephBlockPoolRadosNamespace represents a Ceph BlockPool Rados Namespace properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -40,7 +39,7 @@ spec: - message: blockPoolName is immutable rule: self == oldSelf name: - description: The name of the CephBlockPoolRadosNamespaceSpec namespace. + description: The name of the CephBlockPoolRadosNamespaceSpec namespace. If not set, the default is the name of the CR. type: string x-kubernetes-validations: - message: name is immutable @@ -76,7 +75,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephblockpools.ceph.rook.io spec: group: ceph.rook.io @@ -97,18 +95,18 @@ spec: description: CephBlockPool represents a Ceph Storage Pool properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 spec: - description: NamedBlockPoolSpec allows a block pool to be created with a non-default name. + description: NamedBlockPoolSpec allows a block pool to be created with a non-default name. This is more specific than the NamedPoolSpec so we get schema validation on the allowed pool names that can be specified. properties: compressionMode: - description: 'DEPRECATED: use Parameters instead, e.g.' + description: 'DEPRECATED: use Parameters instead, e.g., Parameters["compression_mode"] = "force" The inline compression mode in Bluestore OSD to set to (options are: none, passive, aggressive, force) Do NOT set a default value for kubebuilder as this will override the Parameters' enum: - none - passive @@ -135,11 +133,11 @@ spec: description: The algorithm for erasure coding type: string codingChunks: - description: Number of coding chunks per object in an erasure coded storage pool (required for erasure-coded pool + description: Number of coding chunks per object in an erasure coded storage pool (required for erasure-coded pool type). This is the number of OSDs that can be lost simultaneously before data cannot be recovered. minimum: 0 type: integer dataChunks: - description: Number of data chunks per object in an erasure coded storage pool (required for erasure-coded pool t + description: Number of data chunks per object in an erasure coded storage pool (required for erasure-coded pool type). The number of chunks required to recover an object when any single OSD is lost is the same as dataChunks so be aware that the larger the number of data chunks, the higher the cost of recovery. minimum: 0 type: integer required: @@ -147,7 +145,7 @@ spec: - dataChunks type: object failureDomain: - description: 'The failure domain: osd/host/(region or zone if available) - technically also any type in the crush ' + description: 'The failure domain: osd/host/(region or zone if available) - technically also any type in the crush map' type: string mirroring: description: The mirroring settings @@ -243,14 +241,14 @@ spec: description: RequireSafeReplicaSize if false allows you to set replica 1 type: boolean size: - description: Size - Number of copies per object in a replicated storage pool, including the object itself (requir + description: Size - Number of copies per object in a replicated storage pool, including the object itself (required for replicated pool type) minimum: 0 type: integer subFailureDomain: description: SubFailureDomain the name of the sub-failure domain type: string targetSizeRatio: - description: TargetSizeRatio gives a hint (%) to Ceph in terms of expected consumption of the total cluster capac + description: TargetSizeRatio gives a hint (%) to Ceph in terms of expected consumption of the total cluster capacity type: number required: - size @@ -460,7 +458,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephbucketnotifications.ceph.rook.io spec: group: ceph.rook.io @@ -477,10 +474,10 @@ spec: description: CephBucketNotification represents a Bucket Notifications properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -615,7 +612,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephbuckettopics.ceph.rook.io spec: group: ceph.rook.io @@ -636,10 +632,10 @@ spec: description: CephBucketTopic represents a Ceph Object Topic for Bucket Notifications properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -682,7 +678,7 @@ spec: description: Indicate whether the server certificate is validated by the client or not type: boolean sendCloudEvents: - description: 'Send the notifications with the CloudEvents header: https://github.' + description: 'Send the notifications with the CloudEvents header: https://github.com/cloudevents/spec/blob/main/cloudevents/adapters/aws-s3.md' type: boolean uri: description: The URI of the HTTP endpoint to push notification to @@ -764,7 +760,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephclients.ceph.rook.io spec: group: ceph.rook.io @@ -785,10 +780,10 @@ spec: description: CephClient represents a Ceph Client properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -837,7 +832,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephclusters.ceph.rook.io spec: group: ceph.rook.io @@ -884,10 +878,10 @@ spec: description: CephCluster is a Ceph storage cluster properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -920,10 +914,10 @@ spec: description: Whether to allow unsupported versions (do not set to true in production) type: boolean image: - description: Image is the container image used to launch the ceph daemons, such as quay. + description: Image is the container image used to launch the ceph daemons, such as quay.io/ceph/ceph: The full list of images can be found at https://quay.io/repository/ceph/ceph?tab=tags type: string imagePullPolicy: - description: ImagePullPolicy describes a policy for if/when to pull a container image One of Always, Never, IfNot + description: ImagePullPolicy describes a policy for if/when to pull a container image One of Always, Never, IfNotPresent. enum: - IfNotPresent - Always @@ -932,11 +926,11 @@ spec: type: string type: object cleanupPolicy: - description: Indicates user intent when deleting a cluster; blocks orchestration and should not be set if cluster + description: Indicates user intent when deleting a cluster; blocks orchestration and should not be set if cluster deletion is not imminent. nullable: true properties: allowUninstallWithVolumes: - description: AllowUninstallWithVolumes defines whether we can proceed with the uninstall if they are RBD images s + description: AllowUninstallWithVolumes defines whether we can proceed with the uninstall if they are RBD images still present type: boolean confirmation: description: Confirmation represents the cleanup confirmation @@ -966,7 +960,7 @@ spec: type: object type: object continueUpgradeAfterChecksEvenIfNotHealthy: - description: ContinueUpgradeAfterChecksEvenIfNotHealthy defines if an upgrade should continue even if PGs are not + description: ContinueUpgradeAfterChecksEvenIfNotHealthy defines if an upgrade should continue even if PGs are not clean type: boolean crashCollector: description: A spec for the crash controller @@ -996,7 +990,7 @@ spec: description: ReadAffinity defines the read affinity settings for CSI driver. properties: crushLocationLabels: - description: CrushLocationLabels defines which node labels to use as CRUSH location. + description: CrushLocationLabels defines which node labels to use as CRUSH location. This should correspond to the values set in the CRUSH map. items: type: string type: array @@ -1051,19 +1045,19 @@ spec: description: This enables management of poddisruptionbudgets type: boolean osdMaintenanceTimeout: - description: 'OSDMaintenanceTimeout sets how many additional minutes the DOWN/OUT interval is for drained failure ' + description: OSDMaintenanceTimeout sets how many additional minutes the DOWN/OUT interval is for drained failure domains it only works if managePodBudgets is true. the default is 30 minutes format: int64 type: integer pgHealthCheckTimeout: - description: PGHealthCheckTimeout is the time (in minutes) that the operator will wait for the placement groups t + description: PGHealthCheckTimeout is the time (in minutes) that the operator will wait for the placement groups to become healthy (active+clean) after a drain was completed and OSDs came back up. Rook will continue with the next drain if the timeout exceeds. It only works if managePodBudgets is true. No values or 0 means that the operator will wait until the placement groups are healthy before unblocking the next drain. format: int64 type: integer pgHealthyRegex: - description: PgHealthyRegex is the regular expression that is used to determine which PG states should be conside + description: PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy. The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$` type: string type: object external: - description: Whether the Ceph Cluster is running external to this Kubernetes cluster mon, mgr, osd, mds, and disc + description: Whether the Ceph Cluster is running external to this Kubernetes cluster mon, mgr, osd, mds, and discover daemons will not be created for external clusters. nullable: true properties: enable: @@ -1124,19 +1118,19 @@ spec: description: Disabled determines whether probe is disable or not type: boolean probe: - description: 'Probe describes a health check to be performed against a container to determine whether it is alive ' + description: Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. properties: exec: description: Exec specifies the action to take. properties: command: - description: 'Command is the command line to execute inside the container, the working directory for the command ' + description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. items: type: string type: array type: object failureThreshold: - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. + description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. format: int32 type: integer grpc: @@ -1147,7 +1141,7 @@ spec: format: int32 type: integer service: - description: Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github. + description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC." type: string required: - port @@ -1156,7 +1150,7 @@ spec: description: HTTPGet specifies the http request to perform. properties: host: - description: Host name to connect to, defaults to the pod IP. + description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. type: string httpHeaders: description: Custom headers to set in the request. HTTP allows repeated headers. @@ -1164,7 +1158,7 @@ spec: description: HTTPHeader describes a custom header to be used in HTTP probes properties: name: - description: The header field name. + description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header. type: string value: description: The header field value @@ -1181,7 +1175,7 @@ spec: anyOf: - type: integer - type: string - description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. + description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true scheme: description: Scheme to use for connecting to the host. Defaults to HTTP. @@ -1190,7 +1184,7 @@ spec: - port type: object initialDelaySeconds: - description: Number of seconds after the container has started before liveness probes are initiated. + description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer periodSeconds: @@ -1198,7 +1192,7 @@ spec: format: int32 type: integer successThreshold: - description: Minimum consecutive successes for the probe to be considered successful after having failed. + description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. format: int32 type: integer tcpSocket: @@ -1211,17 +1205,16 @@ spec: anyOf: - type: integer - type: string - description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. + description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true required: - port type: object terminationGracePeriodSeconds: - description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. format: int64 type: integer timeoutSeconds: - description: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. + description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer type: object @@ -1236,19 +1229,19 @@ spec: description: Disabled determines whether probe is disable or not type: boolean probe: - description: 'Probe describes a health check to be performed against a container to determine whether it is alive ' + description: Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. properties: exec: description: Exec specifies the action to take. properties: command: - description: 'Command is the command line to execute inside the container, the working directory for the command ' + description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. items: type: string type: array type: object failureThreshold: - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. + description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. format: int32 type: integer grpc: @@ -1259,7 +1252,7 @@ spec: format: int32 type: integer service: - description: Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github. + description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC." type: string required: - port @@ -1268,7 +1261,7 @@ spec: description: HTTPGet specifies the http request to perform. properties: host: - description: Host name to connect to, defaults to the pod IP. + description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. type: string httpHeaders: description: Custom headers to set in the request. HTTP allows repeated headers. @@ -1276,7 +1269,7 @@ spec: description: HTTPHeader describes a custom header to be used in HTTP probes properties: name: - description: The header field name. + description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header. type: string value: description: The header field value @@ -1293,7 +1286,7 @@ spec: anyOf: - type: integer - type: string - description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. + description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true scheme: description: Scheme to use for connecting to the host. Defaults to HTTP. @@ -1302,7 +1295,7 @@ spec: - port type: object initialDelaySeconds: - description: Number of seconds after the container has started before liveness probes are initiated. + description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer periodSeconds: @@ -1310,7 +1303,7 @@ spec: format: int32 type: integer successThreshold: - description: Minimum consecutive successes for the probe to be considered successful after having failed. + description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. format: int32 type: integer tcpSocket: @@ -1323,17 +1316,16 @@ spec: anyOf: - type: integer - type: string - description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. + description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true required: - port type: object terminationGracePeriodSeconds: - description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. format: int64 type: integer timeoutSeconds: - description: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. + description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer type: object @@ -1434,14 +1426,8 @@ spec: volumeClaimTemplate: description: VolumeClaimTemplate is the PVC template properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -1461,18 +1447,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1486,10 +1472,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1498,14 +1484,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -1529,7 +1515,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -1538,7 +1524,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -1547,16 +1533,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -1568,20 +1554,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -1648,6 +1641,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -1657,14 +1652,8 @@ spec: volumeClaimTemplate: description: VolumeClaimTemplate is the PVC definition properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -1684,18 +1673,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1709,10 +1698,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1721,14 +1710,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -1752,7 +1741,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -1761,7 +1750,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -1770,16 +1759,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -1791,20 +1780,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' + type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -1871,6 +1867,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true zones: @@ -1887,14 +1885,8 @@ spec: volumeClaimTemplate: description: VolumeClaimTemplate is the PVC template properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -1914,18 +1906,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1939,10 +1931,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1951,14 +1943,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -1982,7 +1974,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -1991,7 +1983,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -2000,16 +1992,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -2021,20 +2013,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -2101,6 +2100,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -2116,7 +2117,7 @@ spec: nullable: true properties: enabled: - description: Enabled determines whether to create the prometheus rules for the ceph cluster. + description: Enabled determines whether to create the prometheus rules for the ceph cluster. If true, the prometheus types must exist or the creation will fail. Default is false. type: boolean externalMgrEndpoints: description: ExternalMgrEndpoints points to an existing Ceph prometheus exporter endpoint @@ -2127,7 +2128,7 @@ spec: description: The Hostname of this endpoint type: string ip: - description: The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0. + description: The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.0/16 or fe80::/10), or link-local multicast (224.0.0.0/24 or ff02::/16). type: string nodeName: description: 'Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.' @@ -2139,22 +2140,22 @@ spec: description: API version of the referent. type: string fieldPath: - description: If referring to a piece of an object instead of an entire object, this string should contain a valid + description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.' type: string kind: - description: 'Kind of the referent. More info: https://git.k8s.' + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string name: - description: 'Name of the referent. More info: https://kubernetes.' + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' type: string namespace: - description: 'Namespace of the referent. More info: https://kubernetes.' + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' type: string resourceVersion: - description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.' + description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' type: string uid: - description: 'UID of the referent. More info: https://kubernetes.' + description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' type: string type: object x-kubernetes-map-type: atomic @@ -2173,7 +2174,7 @@ spec: description: Interval determines prometheus scrape interval type: string metricsDisabled: - description: Whether to disable the metrics reported by Ceph. + description: Whether to disable the metrics reported by Ceph. If false, the prometheus mgr module and Ceph exporter are enabled. If true, the prometheus mgr module and Ceph exporter are both disabled. Default is false. type: boolean port: description: Port is the prometheus server port @@ -2186,20 +2187,20 @@ spec: nullable: true properties: addressRanges: - description: AddressRanges specify a list of CIDRs that Rook will apply to Ceph's 'public_network' and/or 'cluste + description: AddressRanges specify a list of CIDRs that Rook will apply to Ceph's 'public_network' and/or 'cluster_network' configurations. This config section may be used for the "host" or "multus" network providers. nullable: true properties: cluster: description: Cluster defines a list of CIDRs to use for Ceph cluster network communication. items: - description: An IPv4 or IPv6 network CIDR. + description: "An IPv4 or IPv6 network CIDR. \n This naive kubebuilder regex provides immediate feedback for some typos and for a common problem case where the range spec is forgotten (e.g., /24). Rook does in-depth validation in code." pattern: ^[0-9a-fA-F:.]{2,}\/[0-9]{1,3}$ type: string type: array public: description: Public defines a list of CIDRs to use for Ceph public network communication. items: - description: An IPv4 or IPv6 network CIDR. + description: "An IPv4 or IPv6 network CIDR. \n This naive kubebuilder regex provides immediate feedback for some typos and for a common problem case where the range spec is forgotten (e.g., /24). Rook does in-depth validation in code." pattern: ^[0-9a-fA-F:.]{2,}\/[0-9]{1,3}$ type: string type: array @@ -2221,18 +2222,18 @@ spec: nullable: true properties: enabled: - description: Whether to encrypt the data in transit across the wire to prevent eavesdropping the data on the netw + description: Whether to encrypt the data in transit across the wire to prevent eavesdropping the data on the network. The default is not set. Even if encryption is not enabled, clients still establish a strong initial authentication for the connection and data integrity is still validated with a crc check. When encryption is enabled, all communication between clients and Ceph daemons, or between Ceph daemons will be encrypted. type: boolean type: object requireMsgr2: - description: Whether to require msgr2 (port 3300) even if compression or encryption are not enabled. + description: Whether to require msgr2 (port 3300) even if compression or encryption are not enabled. If true, the msgr1 port (6789) will be disabled. Requires a kernel that supports msgr2 (kernel 5.11 or CentOS 8.4 or newer). type: boolean type: object dualStack: description: DualStack determines whether Ceph daemons should listen on both IPv4 and IPv6 type: boolean hostNetwork: - description: HostNetwork to enable host network. + description: HostNetwork to enable host network. If host networking is enabled or disabled on a running cluster, then the operator will automatically fail over all the mons to apply the new network settings. type: boolean ipFamily: description: IPFamily is the single stack IPv6 or IPv4 protocol @@ -2245,14 +2246,14 @@ spec: description: Enable multiClusterService to export the Services between peer clusters properties: clusterID: - description: ClusterID uniquely identifies a cluster. It is used as a prefix to nslookup exported services. + description: 'ClusterID uniquely identifies a cluster. It is used as a prefix to nslookup exported services. For example: ...svc.clusterset.local' type: string enabled: - description: Enable multiClusterService to export the mon and OSD services to peer cluster. + description: Enable multiClusterService to export the mon and OSD services to peer cluster. Ensure that peer clusters are connected using an MCS API compatible application, like Globalnet Submariner. type: boolean type: object provider: - description: Provider is what provides network connectivity to the cluster e.g. "host" or "multus". + description: Provider is what provides network connectivity to the cluster e.g. "host" or "multus". If the Provider is updated from being empty to "host" on a running cluster, then the operator will automatically fail over all the mons to apply the "host" network settings. enum: - "" - host @@ -2265,7 +2266,7 @@ spec: selectors: additionalProperties: type: string - description: Selectors define NetworkAttachmentDefinitions to be used for Ceph public and/or cluster networks whe + description: "Selectors define NetworkAttachmentDefinitions to be used for Ceph public and/or cluster networks when the \"multus\" network provider is used. This config section is not used for other network providers. \n Valid keys are \"public\" and \"cluster\". Refer to Ceph networking documentation for more: https://docs.ceph.com/en/reef/rados/configuration/network-config-ref/ \n Refer to Multus network annotation documentation for help selecting values: https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/how-to-use.md#run-pod-with-network-annotation \n Rook will make a best-effort attempt to automatically detect CIDR address ranges for given network attachment definitions. Rook's methods are robust but may be imprecise for sufficiently complicated networks. Rook's auto-detection process obtains a new IP address lease for each CephCluster reconcile. If Rook fails to detect, incorrectly detects, only partially detects, or if underlying networks do not support reusing old IP addresses, it is best to use the 'addressRanges' config section to specify CIDR ranges for the Ceph cluster. \n As a contrived example, one can use a theoretical Kubernetes-wide network for Ceph client traffic and a theoretical Rook-only network for Ceph replication traffic as shown: selectors: public: \"default/cluster-fast-net\" cluster: \"rook-ceph/ceph-backend-net\"" nullable: true type: object type: object @@ -2277,32 +2278,22 @@ spec: rule: '!has(self.hostNetwork) || self.hostNetwork == false || !has(self.provider) || self.provider == ""' placement: additionalProperties: - description: Placement is the placement for an object properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2312,18 +2303,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2335,7 +2321,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -2344,26 +2329,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2373,18 +2350,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2402,32 +2374,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2439,26 +2401,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2470,23 +2438,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -2495,26 +2459,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2526,26 +2482,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2557,17 +2519,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -2575,32 +2534,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2612,26 +2561,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2643,23 +2598,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -2668,26 +2619,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2699,26 +2642,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2730,17 +2679,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -2748,49 +2694,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -3266,6 +3189,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object @@ -3295,33 +3220,23 @@ spec: description: Name is a unique identifier for the set type: string placement: - description: Placement is the placement for an object nullable: true properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3331,18 +3246,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3354,7 +3264,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -3363,26 +3272,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3392,18 +3293,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3421,32 +3317,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3458,26 +3344,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3489,23 +3381,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -3514,26 +3402,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3545,26 +3425,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3576,17 +3462,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -3594,32 +3477,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3631,26 +3504,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3662,23 +3541,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -3687,26 +3562,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3718,26 +3585,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3749,17 +3622,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -3767,49 +3637,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4057,23 +3871,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -4082,26 +3892,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4113,26 +3915,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4144,17 +3952,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -4162,32 +3967,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4199,26 +3994,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4230,23 +4031,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -4255,26 +4052,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4286,26 +4075,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4317,17 +4112,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -4335,49 +4127,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -4695,6 +4465,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array required: @@ -4714,7 +4486,7 @@ spec: - bluestore-rdr type: string updateStore: - description: UpdateStore updates the backend store for existing OSDs. + description: UpdateStore updates the backend store for existing OSDs. It destroys each OSD one at a time, cleans up the backing disk and prepares same OSD on that disk pattern: ^$|^yes-really-update-store$ type: string type: object @@ -4726,16 +4498,10 @@ spec: volumeClaimTemplates: description: PersistentVolumeClaims to use as storage items: - description: PersistentVolumeClaim is a user's request for and claim to a persistent volume + description: VolumeClaimTemplate is a simplified version of K8s corev1's PVC. It has no type meta or status. properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -4755,18 +4521,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -4780,10 +4546,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -4792,14 +4558,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -4823,7 +4589,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -4832,7 +4598,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -4841,16 +4607,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -4862,20 +4628,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -4942,11 +4715,13 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object waitTimeoutForHealthyOSDInMinutes: - description: WaitTimeoutForHealthyOSDInMinutes defines the time the operator would wait before an OSD can be stop + description: WaitTimeoutForHealthyOSDInMinutes defines the time the operator would wait before an OSD can be stopped for upgrade or restart. If the timeout exceeds and OSD is not ok to stop, then the operator would skip upgrade for the current OSD and proceed with the next one if `continueUpgradeAfterChecksEvenIfNotHealthy` is `false`. If `continueUpgradeAfterChecksEvenIfNotHealthy` is `true`, then operator would continue with the upgrade of an OSD even if its not ok to stop after the timeout. This timeout won't be applied if `skipUpgradeChecks` is `true`. The default wait timeout is 10 minutes. format: int64 type: integer type: object @@ -5120,7 +4895,6 @@ metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 helm.sh/resource-policy: keep - creationTimestamp: null name: cephcosidrivers.ceph.rook.io spec: group: ceph.rook.io @@ -5139,10 +4913,10 @@ spec: description: CephCOSIDriver represents the CRD for the Ceph COSI Driver Deployment properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -5163,32 +4937,22 @@ spec: description: ObjectProvisionerImage is the container image to run the COSI driver sidecar type: string placement: - description: Placement is the placement strategy to use for the COSI driver properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5198,18 +4962,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5221,7 +4980,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -5230,26 +4988,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5259,18 +5009,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5288,32 +5033,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5325,26 +5060,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5356,23 +5097,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -5381,26 +5118,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5412,26 +5141,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5443,17 +5178,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -5461,32 +5193,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5498,26 +5220,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5529,23 +5257,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -5554,26 +5278,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5585,26 +5301,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5616,17 +5338,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -5634,49 +5353,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6014,23 +5676,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -6039,26 +5697,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6070,26 +5720,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6101,17 +5757,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -6119,32 +5772,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6156,26 +5799,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6187,23 +5836,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -6212,26 +5857,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6243,26 +5880,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6274,17 +5917,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -6292,49 +5932,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7172,23 +6754,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -7197,26 +6775,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7228,26 +6798,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7259,17 +6835,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -7277,32 +6850,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7314,26 +6877,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7345,23 +6914,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -7370,26 +6935,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7401,26 +6958,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7432,17 +6995,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -7450,49 +7010,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8224,56 +7769,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -8285,22 +7816,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8308,25 +7833,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -8335,26 +7854,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8362,10 +7874,8 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object @@ -8374,32 +7884,24 @@ spec: description: DomainName should be set to the Kerberos Realm. type: string keytabFile: - description: KeytabFile defines where the Kerberos keytab should be sourced from. + description: KeytabFile defines where the Kerberos keytab should be sourced from. The keytab file will be placed into `/etc/krb5.keytab`. If this is left empty, Rook will not add the file. This allows you to manage the `krb5.keytab` file yourself however you wish. For example, you may build it into your custom Ceph container image or use the Vault agent injector to securely add the file via annotations on the CephNFS spec (passed to the NFS server pods). properties: volumeSource: - description: VolumeSource accepts a pared down version of the standard Kubernetes VolumeSource for the Kerberos k properties: configMap: - description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8407,80 +7909,99 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic emptyDir: - description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: medium represents what type of storage medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: sizeLimit is the total amount of local storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object hostPath: - description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: path of the directory on the host. type: string type: - description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object persistentVolumeClaim: - description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. type: boolean required: - claimName type: object projected: - description: projected items for all in one resources secrets, configmaps, and downward API properties: defaultMode: - description: defaultMode are the mode bits used to set permissions on created files by default. format: int32 type: integer sources: - description: sources is the list of volume projections items: - description: Projection that may be projected along with other supported volume types properties: +<<<<<<< HEAD +======= + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8488,56 +8009,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -8549,22 +8056,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8572,25 +8073,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -8599,26 +8094,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8626,60 +8114,50 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object type: object principalName: default: nfs - description: PrincipalName corresponds directly to NFS-Ganesha's NFS_KRB5:PrincipalName config. + description: 'PrincipalName corresponds directly to NFS-Ganesha''s NFS_KRB5:PrincipalName config. In practice, this is the service prefix of the principal name. The default is "nfs". This value is combined with (a) the namespace and name of the CephNFS (with a hyphen between) and (b) the Realm configured in the user-provided krb5.conf to determine the full principal name: /-@. e.g., nfs/rook-ceph-my-nfs@example.net. See https://github.com/nfs-ganesha/nfs-ganesha/wiki/RPCSEC_GSS for more detail.' type: string type: object sssd: - description: SSSD enables integration with System Security Services Daemon (SSSD). + description: SSSD enables integration with System Security Services Daemon (SSSD). SSSD can be used to provide user ID mapping from a number of sources. See https://sssd.io for more information about the SSSD project. nullable: true properties: sidecar: description: Sidecar tells Rook to run SSSD in a sidecar alongside the NFS-Ganesha server in each NFS pod. properties: additionalFiles: - description: AdditionalFiles defines any number of additional files that should be mounted into the SSSD sidecar. + description: AdditionalFiles defines any number of additional files that should be mounted into the SSSD sidecar. These files may be referenced by the sssd.conf config file. items: - description: SSSDSidecarAdditionalFile represents the source from where additional files for the the SSSD configu + description: SSSDSidecarAdditionalFile represents the source from where additional files for the the SSSD configuration should come from and are made available. properties: subPath: - description: SubPath defines the sub-path in `/etc/sssd/rook-additional/` where the additional file(s) will be pl + description: SubPath defines the sub-path in `/etc/sssd/rook-additional/` where the additional file(s) will be placed. Each subPath definition must be unique and must not contain ':'. minLength: 1 pattern: ^[^:]+$ type: string volumeSource: - description: VolumeSource accepts a pared down version of the standard Kubernetes VolumeSource for the additional properties: configMap: - description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8687,80 +8165,99 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic emptyDir: - description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: medium represents what type of storage medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: sizeLimit is the total amount of local storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object hostPath: - description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: path of the directory on the host. type: string type: - description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object persistentVolumeClaim: - description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. type: boolean required: - claimName type: object projected: - description: projected items for all in one resources secrets, configmaps, and downward API properties: defaultMode: - description: defaultMode are the mode bits used to set permissions on created files by default. format: int32 type: integer sources: - description: sources is the list of volume projections items: - description: Projection that may be projected along with other supported volume types properties: +<<<<<<< HEAD +======= + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8768,56 +8265,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -8829,22 +8312,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8852,25 +8329,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -8879,26 +8350,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8906,10 +8370,8 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object @@ -8919,7 +8381,7 @@ spec: type: object type: array debugLevel: - description: DebugLevel sets the debug level for SSSD. If unset or set to 0, Rook does nothing. + description: 'DebugLevel sets the debug level for SSSD. If unset or set to 0, Rook does nothing. Otherwise, this may be a value between 1 and 10. See SSSD docs for more info: https://sssd.io/troubleshooting/basics.html#sssd-debug-logs' maximum: 10 minimum: 0 type: integer @@ -8931,12 +8393,12 @@ spec: description: Resources allow specifying resource requests/limits on the SSSD sidecar container. properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -8952,7 +8414,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -8961,36 +8423,28 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object sssdConfigFile: - description: SSSDConfigFile defines where the SSSD configuration should be sourced from. + description: SSSDConfigFile defines where the SSSD configuration should be sourced from. The config file will be placed into `/etc/sssd/sssd.conf`. If this is left empty, Rook will not add the file. This allows you to manage the `sssd.conf` file yourself however you wish. For example, you may build it into your custom Ceph container image or use the Vault agent injector to securely add the file via annotations on the CephNFS spec (passed to the NFS server pods). properties: volumeSource: - description: VolumeSource accepts a pared down version of the standard Kubernetes VolumeSource for the SSSD confi properties: configMap: - description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8998,80 +8452,99 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic emptyDir: - description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: medium represents what type of storage medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: sizeLimit is the total amount of local storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object hostPath: - description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: path of the directory on the host. type: string type: - description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object persistentVolumeClaim: - description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. type: boolean required: - claimName type: object projected: - description: projected items for all in one resources secrets, configmaps, and downward API properties: defaultMode: - description: defaultMode are the mode bits used to set permissions on created files by default. format: int32 type: integer sources: - description: sources is the list of volume projections items: - description: Projection that may be projected along with other supported volume types properties: +<<<<<<< HEAD +======= + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -9079,56 +8552,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -9140,22 +8599,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -9163,25 +8616,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -9190,26 +8637,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -9217,10 +8657,8 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object @@ -9244,7 +8682,7 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true hostNetwork: - description: Whether host networking is enabled for the Ganesha server. + description: Whether host networking is enabled for the Ganesha server. If not set, the network settings from the cluster CR will be applied. nullable: true type: boolean labels: @@ -9255,25 +8693,25 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true livenessProbe: - description: A liveness-probe to verify that Ganesha server has valid run-time state. If LivenessProbe. + description: A liveness-probe to verify that Ganesha server has valid run-time state. If LivenessProbe.Disabled is false and LivenessProbe.Probe is nil uses default probe. properties: disabled: description: Disabled determines whether probe is disable or not type: boolean probe: - description: 'Probe describes a health check to be performed against a container to determine whether it is alive ' + description: Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. properties: exec: description: Exec specifies the action to take. properties: command: - description: 'Command is the command line to execute inside the container, the working directory for the command ' + description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. items: type: string type: array type: object failureThreshold: - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. + description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. format: int32 type: integer grpc: @@ -9284,7 +8722,7 @@ spec: format: int32 type: integer service: - description: Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github. + description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC." type: string required: - port @@ -9293,7 +8731,7 @@ spec: description: HTTPGet specifies the http request to perform. properties: host: - description: Host name to connect to, defaults to the pod IP. + description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. type: string httpHeaders: description: Custom headers to set in the request. HTTP allows repeated headers. @@ -9301,7 +8739,7 @@ spec: description: HTTPHeader describes a custom header to be used in HTTP probes properties: name: - description: The header field name. + description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header. type: string value: description: The header field value @@ -9318,7 +8756,7 @@ spec: anyOf: - type: integer - type: string - description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. + description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true scheme: description: Scheme to use for connecting to the host. Defaults to HTTP. @@ -9327,7 +8765,7 @@ spec: - port type: object initialDelaySeconds: - description: Number of seconds after the container has started before liveness probes are initiated. + description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer periodSeconds: @@ -9335,7 +8773,7 @@ spec: format: int32 type: integer successThreshold: - description: Minimum consecutive successes for the probe to be considered successful after having failed. + description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. format: int32 type: integer tcpSocket: @@ -9348,17 +8786,16 @@ spec: anyOf: - type: integer - type: string - description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. + description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true required: - port type: object terminationGracePeriodSeconds: - description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. format: int64 type: integer timeoutSeconds: - description: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. + description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer type: object @@ -9367,33 +8804,23 @@ spec: description: LogLevel set logging level type: string placement: - description: The affinity to place the ganesha pods nullable: true properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9403,18 +8830,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9426,7 +8848,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -9435,26 +8856,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9464,18 +8877,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9493,32 +8901,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9530,26 +8928,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9561,23 +8965,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -9586,26 +8986,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9617,26 +9009,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9648,17 +9046,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -9666,32 +9061,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9703,26 +9088,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9734,23 +9125,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -9759,26 +9146,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9790,26 +9169,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9821,17 +9206,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -9839,49 +9221,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10559,23 +9883,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -10584,26 +9904,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10615,26 +9927,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10646,17 +9964,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -10664,32 +9979,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10701,26 +10006,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10732,23 +10043,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -10757,26 +10064,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10788,26 +10087,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10819,17 +10124,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -10837,49 +10139,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12506,23 +11746,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -12531,26 +11767,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12562,26 +11790,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12593,17 +11827,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -12611,32 +11842,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12648,26 +11869,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12679,23 +11906,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -12704,26 +11927,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12735,26 +11950,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12766,17 +11987,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -12784,49 +12002,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple The full list of images can be found at https://quay.io/repository/ceph/ceph?tab=tags type: string imagePullPolicy: - description: ImagePullPolicy describes a policy for if/when to pull a container image One of Always, Never, IfNot + description: ImagePullPolicy describes a policy for if/when to pull a container image One of Always, Never, IfNotPresent. enum: - IfNotPresent - Always @@ -930,11 +924,11 @@ spec: type: string type: object cleanupPolicy: - description: Indicates user intent when deleting a cluster; blocks orchestration and should not be set if cluster + description: Indicates user intent when deleting a cluster; blocks orchestration and should not be set if cluster deletion is not imminent. nullable: true properties: allowUninstallWithVolumes: - description: AllowUninstallWithVolumes defines whether we can proceed with the uninstall if they are RBD images s + description: AllowUninstallWithVolumes defines whether we can proceed with the uninstall if they are RBD images still present type: boolean confirmation: description: Confirmation represents the cleanup confirmation @@ -964,7 +958,7 @@ spec: type: object type: object continueUpgradeAfterChecksEvenIfNotHealthy: - description: ContinueUpgradeAfterChecksEvenIfNotHealthy defines if an upgrade should continue even if PGs are not + description: ContinueUpgradeAfterChecksEvenIfNotHealthy defines if an upgrade should continue even if PGs are not clean type: boolean crashCollector: description: A spec for the crash controller @@ -994,7 +988,7 @@ spec: description: ReadAffinity defines the read affinity settings for CSI driver. properties: crushLocationLabels: - description: CrushLocationLabels defines which node labels to use as CRUSH location. + description: CrushLocationLabels defines which node labels to use as CRUSH location. This should correspond to the values set in the CRUSH map. items: type: string type: array @@ -1049,19 +1043,19 @@ spec: description: This enables management of poddisruptionbudgets type: boolean osdMaintenanceTimeout: - description: 'OSDMaintenanceTimeout sets how many additional minutes the DOWN/OUT interval is for drained failure ' + description: OSDMaintenanceTimeout sets how many additional minutes the DOWN/OUT interval is for drained failure domains it only works if managePodBudgets is true. the default is 30 minutes format: int64 type: integer pgHealthCheckTimeout: - description: PGHealthCheckTimeout is the time (in minutes) that the operator will wait for the placement groups t + description: PGHealthCheckTimeout is the time (in minutes) that the operator will wait for the placement groups to become healthy (active+clean) after a drain was completed and OSDs came back up. Rook will continue with the next drain if the timeout exceeds. It only works if managePodBudgets is true. No values or 0 means that the operator will wait until the placement groups are healthy before unblocking the next drain. format: int64 type: integer pgHealthyRegex: - description: PgHealthyRegex is the regular expression that is used to determine which PG states should be conside + description: PgHealthyRegex is the regular expression that is used to determine which PG states should be considered healthy. The default is `^(active\+clean|active\+clean\+scrubbing|active\+clean\+scrubbing\+deep)$` type: string type: object external: - description: Whether the Ceph Cluster is running external to this Kubernetes cluster mon, mgr, osd, mds, and disc + description: Whether the Ceph Cluster is running external to this Kubernetes cluster mon, mgr, osd, mds, and discover daemons will not be created for external clusters. nullable: true properties: enable: @@ -1122,19 +1116,19 @@ spec: description: Disabled determines whether probe is disable or not type: boolean probe: - description: 'Probe describes a health check to be performed against a container to determine whether it is alive ' + description: Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. properties: exec: description: Exec specifies the action to take. properties: command: - description: 'Command is the command line to execute inside the container, the working directory for the command ' + description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. items: type: string type: array type: object failureThreshold: - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. + description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. format: int32 type: integer grpc: @@ -1145,7 +1139,7 @@ spec: format: int32 type: integer service: - description: Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github. + description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC." type: string required: - port @@ -1154,7 +1148,7 @@ spec: description: HTTPGet specifies the http request to perform. properties: host: - description: Host name to connect to, defaults to the pod IP. + description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. type: string httpHeaders: description: Custom headers to set in the request. HTTP allows repeated headers. @@ -1162,7 +1156,7 @@ spec: description: HTTPHeader describes a custom header to be used in HTTP probes properties: name: - description: The header field name. + description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header. type: string value: description: The header field value @@ -1179,7 +1173,7 @@ spec: anyOf: - type: integer - type: string - description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. + description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true scheme: description: Scheme to use for connecting to the host. Defaults to HTTP. @@ -1188,7 +1182,7 @@ spec: - port type: object initialDelaySeconds: - description: Number of seconds after the container has started before liveness probes are initiated. + description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer periodSeconds: @@ -1196,7 +1190,7 @@ spec: format: int32 type: integer successThreshold: - description: Minimum consecutive successes for the probe to be considered successful after having failed. + description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. format: int32 type: integer tcpSocket: @@ -1209,17 +1203,16 @@ spec: anyOf: - type: integer - type: string - description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. + description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true required: - port type: object terminationGracePeriodSeconds: - description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. format: int64 type: integer timeoutSeconds: - description: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. + description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer type: object @@ -1234,19 +1227,19 @@ spec: description: Disabled determines whether probe is disable or not type: boolean probe: - description: 'Probe describes a health check to be performed against a container to determine whether it is alive ' + description: Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. properties: exec: description: Exec specifies the action to take. properties: command: - description: 'Command is the command line to execute inside the container, the working directory for the command ' + description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. items: type: string type: array type: object failureThreshold: - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. + description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. format: int32 type: integer grpc: @@ -1257,7 +1250,7 @@ spec: format: int32 type: integer service: - description: Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github. + description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC." type: string required: - port @@ -1266,7 +1259,7 @@ spec: description: HTTPGet specifies the http request to perform. properties: host: - description: Host name to connect to, defaults to the pod IP. + description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. type: string httpHeaders: description: Custom headers to set in the request. HTTP allows repeated headers. @@ -1274,7 +1267,7 @@ spec: description: HTTPHeader describes a custom header to be used in HTTP probes properties: name: - description: The header field name. + description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header. type: string value: description: The header field value @@ -1291,7 +1284,7 @@ spec: anyOf: - type: integer - type: string - description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. + description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true scheme: description: Scheme to use for connecting to the host. Defaults to HTTP. @@ -1300,7 +1293,7 @@ spec: - port type: object initialDelaySeconds: - description: Number of seconds after the container has started before liveness probes are initiated. + description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer periodSeconds: @@ -1308,7 +1301,7 @@ spec: format: int32 type: integer successThreshold: - description: Minimum consecutive successes for the probe to be considered successful after having failed. + description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. format: int32 type: integer tcpSocket: @@ -1321,17 +1314,16 @@ spec: anyOf: - type: integer - type: string - description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. + description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true required: - port type: object terminationGracePeriodSeconds: - description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. format: int64 type: integer timeoutSeconds: - description: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. + description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer type: object @@ -1432,14 +1424,8 @@ spec: volumeClaimTemplate: description: VolumeClaimTemplate is the PVC template properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -1459,18 +1445,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1484,10 +1470,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1496,14 +1482,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -1527,7 +1513,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -1536,7 +1522,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -1545,16 +1531,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -1566,20 +1552,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -1646,6 +1639,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -1655,14 +1650,8 @@ spec: volumeClaimTemplate: description: VolumeClaimTemplate is the PVC definition properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -1682,18 +1671,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1707,10 +1696,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1719,14 +1708,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -1750,7 +1739,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -1759,7 +1748,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -1768,16 +1757,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -1789,20 +1778,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' + type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -1869,6 +1865,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true zones: @@ -1885,14 +1883,8 @@ spec: volumeClaimTemplate: description: VolumeClaimTemplate is the PVC template properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -1912,18 +1904,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1937,10 +1929,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -1949,14 +1941,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -1980,7 +1972,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -1989,7 +1981,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -1998,16 +1990,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -2019,20 +2011,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -2099,6 +2098,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -2114,7 +2115,7 @@ spec: nullable: true properties: enabled: - description: Enabled determines whether to create the prometheus rules for the ceph cluster. + description: Enabled determines whether to create the prometheus rules for the ceph cluster. If true, the prometheus types must exist or the creation will fail. Default is false. type: boolean externalMgrEndpoints: description: ExternalMgrEndpoints points to an existing Ceph prometheus exporter endpoint @@ -2125,7 +2126,7 @@ spec: description: The Hostname of this endpoint type: string ip: - description: The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0. + description: The IP of this endpoint. May not be loopback (127.0.0.0/8 or ::1), link-local (169.254.0.0/16 or fe80::/10), or link-local multicast (224.0.0.0/24 or ff02::/16). type: string nodeName: description: 'Optional: Node hosting this endpoint. This can be used to determine endpoints local to a node.' @@ -2137,22 +2138,22 @@ spec: description: API version of the referent. type: string fieldPath: - description: If referring to a piece of an object instead of an entire object, this string should contain a valid + description: 'If referring to a piece of an object instead of an entire object, this string should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2]. For example, if the object reference is to a container within a pod, this would take on a value like: "spec.containers{name}" (where "name" refers to the name of the container that triggered the event) or if no container name is specified "spec.containers[2]" (container with index 2 in this pod). This syntax is chosen only to have some well-defined way of referencing a part of an object. TODO: this design is not final and this field is subject to change in the future.' type: string kind: - description: 'Kind of the referent. More info: https://git.k8s.' + description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' type: string name: - description: 'Name of the referent. More info: https://kubernetes.' + description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names' type: string namespace: - description: 'Namespace of the referent. More info: https://kubernetes.' + description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/' type: string resourceVersion: - description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.' + description: 'Specific resourceVersion to which this reference is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency' type: string uid: - description: 'UID of the referent. More info: https://kubernetes.' + description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids' type: string type: object x-kubernetes-map-type: atomic @@ -2171,7 +2172,7 @@ spec: description: Interval determines prometheus scrape interval type: string metricsDisabled: - description: Whether to disable the metrics reported by Ceph. + description: Whether to disable the metrics reported by Ceph. If false, the prometheus mgr module and Ceph exporter are enabled. If true, the prometheus mgr module and Ceph exporter are both disabled. Default is false. type: boolean port: description: Port is the prometheus server port @@ -2184,20 +2185,20 @@ spec: nullable: true properties: addressRanges: - description: AddressRanges specify a list of CIDRs that Rook will apply to Ceph's 'public_network' and/or 'cluste + description: AddressRanges specify a list of CIDRs that Rook will apply to Ceph's 'public_network' and/or 'cluster_network' configurations. This config section may be used for the "host" or "multus" network providers. nullable: true properties: cluster: description: Cluster defines a list of CIDRs to use for Ceph cluster network communication. items: - description: An IPv4 or IPv6 network CIDR. + description: "An IPv4 or IPv6 network CIDR. \n This naive kubebuilder regex provides immediate feedback for some typos and for a common problem case where the range spec is forgotten (e.g., /24). Rook does in-depth validation in code." pattern: ^[0-9a-fA-F:.]{2,}\/[0-9]{1,3}$ type: string type: array public: description: Public defines a list of CIDRs to use for Ceph public network communication. items: - description: An IPv4 or IPv6 network CIDR. + description: "An IPv4 or IPv6 network CIDR. \n This naive kubebuilder regex provides immediate feedback for some typos and for a common problem case where the range spec is forgotten (e.g., /24). Rook does in-depth validation in code." pattern: ^[0-9a-fA-F:.]{2,}\/[0-9]{1,3}$ type: string type: array @@ -2219,18 +2220,18 @@ spec: nullable: true properties: enabled: - description: Whether to encrypt the data in transit across the wire to prevent eavesdropping the data on the netw + description: Whether to encrypt the data in transit across the wire to prevent eavesdropping the data on the network. The default is not set. Even if encryption is not enabled, clients still establish a strong initial authentication for the connection and data integrity is still validated with a crc check. When encryption is enabled, all communication between clients and Ceph daemons, or between Ceph daemons will be encrypted. type: boolean type: object requireMsgr2: - description: Whether to require msgr2 (port 3300) even if compression or encryption are not enabled. + description: Whether to require msgr2 (port 3300) even if compression or encryption are not enabled. If true, the msgr1 port (6789) will be disabled. Requires a kernel that supports msgr2 (kernel 5.11 or CentOS 8.4 or newer). type: boolean type: object dualStack: description: DualStack determines whether Ceph daemons should listen on both IPv4 and IPv6 type: boolean hostNetwork: - description: HostNetwork to enable host network. + description: HostNetwork to enable host network. If host networking is enabled or disabled on a running cluster, then the operator will automatically fail over all the mons to apply the new network settings. type: boolean ipFamily: description: IPFamily is the single stack IPv6 or IPv4 protocol @@ -2243,14 +2244,14 @@ spec: description: Enable multiClusterService to export the Services between peer clusters properties: clusterID: - description: ClusterID uniquely identifies a cluster. It is used as a prefix to nslookup exported services. + description: 'ClusterID uniquely identifies a cluster. It is used as a prefix to nslookup exported services. For example: ...svc.clusterset.local' type: string enabled: - description: Enable multiClusterService to export the mon and OSD services to peer cluster. + description: Enable multiClusterService to export the mon and OSD services to peer cluster. Ensure that peer clusters are connected using an MCS API compatible application, like Globalnet Submariner. type: boolean type: object provider: - description: Provider is what provides network connectivity to the cluster e.g. "host" or "multus". + description: Provider is what provides network connectivity to the cluster e.g. "host" or "multus". If the Provider is updated from being empty to "host" on a running cluster, then the operator will automatically fail over all the mons to apply the "host" network settings. enum: - "" - host @@ -2263,7 +2264,7 @@ spec: selectors: additionalProperties: type: string - description: Selectors define NetworkAttachmentDefinitions to be used for Ceph public and/or cluster networks whe + description: "Selectors define NetworkAttachmentDefinitions to be used for Ceph public and/or cluster networks when the \"multus\" network provider is used. This config section is not used for other network providers. \n Valid keys are \"public\" and \"cluster\". Refer to Ceph networking documentation for more: https://docs.ceph.com/en/reef/rados/configuration/network-config-ref/ \n Refer to Multus network annotation documentation for help selecting values: https://github.com/k8snetworkplumbingwg/multus-cni/blob/master/docs/how-to-use.md#run-pod-with-network-annotation \n Rook will make a best-effort attempt to automatically detect CIDR address ranges for given network attachment definitions. Rook's methods are robust but may be imprecise for sufficiently complicated networks. Rook's auto-detection process obtains a new IP address lease for each CephCluster reconcile. If Rook fails to detect, incorrectly detects, only partially detects, or if underlying networks do not support reusing old IP addresses, it is best to use the 'addressRanges' config section to specify CIDR ranges for the Ceph cluster. \n As a contrived example, one can use a theoretical Kubernetes-wide network for Ceph client traffic and a theoretical Rook-only network for Ceph replication traffic as shown: selectors: public: \"default/cluster-fast-net\" cluster: \"rook-ceph/ceph-backend-net\"" nullable: true type: object type: object @@ -2275,32 +2276,22 @@ spec: rule: '!has(self.hostNetwork) || self.hostNetwork == false || !has(self.provider) || self.provider == ""' placement: additionalProperties: - description: Placement is the placement for an object properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2310,18 +2301,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2333,7 +2319,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -2342,26 +2327,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2371,18 +2348,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -2400,32 +2372,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2437,26 +2399,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2468,23 +2436,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -2493,26 +2457,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2524,26 +2480,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2555,17 +2517,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -2573,32 +2532,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2610,26 +2559,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2641,23 +2596,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -2666,26 +2617,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2697,26 +2640,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -2728,17 +2677,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -2746,49 +2692,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -3264,6 +3187,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object @@ -3293,33 +3218,23 @@ spec: description: Name is a unique identifier for the set type: string placement: - description: Placement is the placement for an object nullable: true properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3329,18 +3244,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3352,7 +3262,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -3361,26 +3270,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3390,18 +3291,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -3419,32 +3315,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3456,26 +3342,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3487,23 +3379,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -3512,26 +3400,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3543,26 +3423,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3574,17 +3460,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -3592,32 +3475,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3629,26 +3502,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3660,23 +3539,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -3685,26 +3560,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3716,26 +3583,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -3747,17 +3620,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -3765,49 +3635,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4055,23 +3869,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -4080,26 +3890,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4111,26 +3913,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4142,17 +3950,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -4160,32 +3965,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4197,26 +3992,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4228,23 +4029,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -4253,26 +4050,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4284,26 +4073,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -4315,17 +4110,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -4333,49 +4125,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -4693,6 +4463,8 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array required: @@ -4712,7 +4484,7 @@ spec: - bluestore-rdr type: string updateStore: - description: UpdateStore updates the backend store for existing OSDs. + description: UpdateStore updates the backend store for existing OSDs. It destroys each OSD one at a time, cleans up the backing disk and prepares same OSD on that disk pattern: ^$|^yes-really-update-store$ type: string type: object @@ -4724,16 +4496,10 @@ spec: volumeClaimTemplates: description: PersistentVolumeClaims to use as storage items: - description: PersistentVolumeClaim is a user's request for and claim to a persistent volume + description: VolumeClaimTemplate is a simplified version of K8s corev1's PVC. It has no type meta or status. properties: - apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. - type: string - kind: - description: Kind is a string value representing the REST resource this object represents. - type: string metadata: - description: 'Standard object''s metadata. More info: https://git.k8s.' + description: 'Standard object''s metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata' properties: annotations: additionalProperties: @@ -4753,18 +4519,18 @@ spec: type: string type: object spec: - description: spec defines the desired characteristics of a volume requested by a pod author. + description: 'spec defines the desired characteristics of a volume requested by a pod author. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#persistentvolumeclaims' properties: accessModes: - description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.' + description: 'accessModes contains the desired access modes the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1' items: type: string type: array dataSource: - description: 'dataSource field can be used to specify either: * An existing VolumeSnapshot object (snapshot.' + description: 'dataSource 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. When the AnyVolumeDataSource feature gate is enabled, dataSource contents will be copied to dataSourceRef, and dataSourceRef contents will be copied to dataSource when dataSourceRef.namespace is not specified. If the namespace is specified, then dataSourceRef will not be copied to dataSource.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -4778,10 +4544,10 @@ spec: type: object x-kubernetes-map-type: atomic dataSourceRef: - description: dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volum + description: 'dataSourceRef specifies the object from which to populate the volume with data, if a non-empty volume is desired. This may be any 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, when namespace isn''t specified in dataSourceRef, 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. When namespace is specified in dataSourceRef, dataSource isn''t set to the same value and must be empty. There are three 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. * While dataSource only allows local objects, dataSourceRef allows objects in any namespaces. (Beta) Using this field requires the AnyVolumeDataSource feature gate to be enabled. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.' properties: apiGroup: - description: APIGroup is the group for the resource being referenced. + 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. type: string kind: description: Kind is the type of resource being referenced @@ -4790,14 +4556,14 @@ spec: description: Name is the name of resource being referenced type: string namespace: - description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a g + description: Namespace is the namespace of resource being referenced Note that when a namespace is specified, a gateway.networking.k8s.io/ReferenceGrant object is required in the referent namespace to allow that namespace's owner to accept the reference. See the ReferenceGrant documentation for details. (Alpha) This field requires the CrossNamespaceVolumeDataSource feature gate to be enabled. type: string required: - kind - name type: object resources: - description: resources represents the minimum resources the volume should have. + description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: description: Claims lists the names of resources, defined in spec. @@ -4821,7 +4587,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -4830,7 +4596,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object selector: @@ -4839,16 +4605,16 @@ spec: matchExpressions: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates + description: A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. + description: operator represents a key's relationship to a set of values. Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. + description: values is an array of string values. If the operator is In or NotIn, the values array must be non-empty. If the operator is Exists or DoesNotExist, the values array must be empty. This array is replaced during a strategic merge patch. items: type: string type: array @@ -4860,20 +4626,27 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. + description: matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels map is equivalent to an element of matchExpressions, whose key field is "key", the operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic storageClassName: - description: storageClassName is the name of the StorageClass required by the claim. + description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' + type: string +<<<<<<< HEAD +======= + volumeAttributesClassName: + description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' type: string +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: - description: volumeMode defines what type of volume is required by the claim. + description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string volumeName: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object +<<<<<<< HEAD status: description: status represents the current information/status of a persistent volume claim. Read-only. properties: @@ -4940,11 +4713,13 @@ spec: description: phase represents the current phase of PersistentVolumeClaim. type: string type: object +======= +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object waitTimeoutForHealthyOSDInMinutes: - description: WaitTimeoutForHealthyOSDInMinutes defines the time the operator would wait before an OSD can be stop + description: WaitTimeoutForHealthyOSDInMinutes defines the time the operator would wait before an OSD can be stopped for upgrade or restart. If the timeout exceeds and OSD is not ok to stop, then the operator would skip upgrade for the current OSD and proceed with the next one if `continueUpgradeAfterChecksEvenIfNotHealthy` is `false`. If `continueUpgradeAfterChecksEvenIfNotHealthy` is `true`, then operator would continue with the upgrade of an OSD even if its not ok to stop after the timeout. This timeout won't be applied if `skipUpgradeChecks` is `true`. The default wait timeout is 10 minutes. format: int64 type: integer type: object @@ -5117,7 +4892,6 @@ kind: CustomResourceDefinition metadata: annotations: controller-gen.kubebuilder.io/version: v0.11.3 - creationTimestamp: null name: cephcosidrivers.ceph.rook.io spec: group: ceph.rook.io @@ -5136,10 +4910,10 @@ spec: description: CephCOSIDriver represents the CRD for the Ceph COSI Driver Deployment properties: apiVersion: - description: APIVersion defines the versioned schema of this representation of an object. + 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 kind: - description: Kind is a string value representing the REST resource this object represents. + 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 @@ -5160,32 +4934,22 @@ spec: description: ObjectProvisionerImage is the container image to run the COSI driver sidecar type: string placement: - description: Placement is the placement strategy to use for the COSI driver properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5195,18 +4959,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5218,7 +4977,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -5227,26 +4985,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5256,18 +5006,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -5285,32 +5030,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5322,26 +5057,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5353,23 +5094,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -5378,26 +5115,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5409,26 +5138,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5440,17 +5175,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -5458,32 +5190,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5495,26 +5217,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5526,23 +5254,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -5551,26 +5275,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5582,26 +5298,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -5613,17 +5335,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -5631,49 +5350,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6010,23 +5672,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -6035,26 +5693,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6066,26 +5716,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6097,17 +5753,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -6115,32 +5768,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6152,26 +5795,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6183,23 +5832,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -6208,26 +5853,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6239,26 +5876,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -6270,17 +5913,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -6288,49 +5928,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7167,23 +6749,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -7192,26 +6770,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7223,26 +6793,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7254,17 +6830,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -7272,32 +6845,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7309,26 +6872,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7340,23 +6909,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -7365,26 +6930,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7396,26 +6953,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -7427,17 +6990,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -7445,49 +7005,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8217,56 +7762,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -8278,22 +7809,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8301,25 +7826,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -8328,26 +7847,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8355,10 +7867,8 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object @@ -8367,32 +7877,24 @@ spec: description: DomainName should be set to the Kerberos Realm. type: string keytabFile: - description: KeytabFile defines where the Kerberos keytab should be sourced from. + description: KeytabFile defines where the Kerberos keytab should be sourced from. The keytab file will be placed into `/etc/krb5.keytab`. If this is left empty, Rook will not add the file. This allows you to manage the `krb5.keytab` file yourself however you wish. For example, you may build it into your custom Ceph container image or use the Vault agent injector to securely add the file via annotations on the CephNFS spec (passed to the NFS server pods). properties: volumeSource: - description: VolumeSource accepts a pared down version of the standard Kubernetes VolumeSource for the Kerberos k properties: configMap: - description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8400,80 +7902,99 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic emptyDir: - description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: medium represents what type of storage medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: sizeLimit is the total amount of local storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object hostPath: - description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: path of the directory on the host. type: string type: - description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object persistentVolumeClaim: - description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. type: boolean required: - claimName type: object projected: - description: projected items for all in one resources secrets, configmaps, and downward API properties: defaultMode: - description: defaultMode are the mode bits used to set permissions on created files by default. format: int32 type: integer sources: - description: sources is the list of volume projections items: - description: Projection that may be projected along with other supported volume types properties: +<<<<<<< HEAD +======= + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8481,56 +8002,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -8542,22 +8049,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8565,25 +8066,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -8592,26 +8087,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8619,60 +8107,50 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object type: object principalName: default: nfs - description: PrincipalName corresponds directly to NFS-Ganesha's NFS_KRB5:PrincipalName config. + description: 'PrincipalName corresponds directly to NFS-Ganesha''s NFS_KRB5:PrincipalName config. In practice, this is the service prefix of the principal name. The default is "nfs". This value is combined with (a) the namespace and name of the CephNFS (with a hyphen between) and (b) the Realm configured in the user-provided krb5.conf to determine the full principal name: /-@. e.g., nfs/rook-ceph-my-nfs@example.net. See https://github.com/nfs-ganesha/nfs-ganesha/wiki/RPCSEC_GSS for more detail.' type: string type: object sssd: - description: SSSD enables integration with System Security Services Daemon (SSSD). + description: SSSD enables integration with System Security Services Daemon (SSSD). SSSD can be used to provide user ID mapping from a number of sources. See https://sssd.io for more information about the SSSD project. nullable: true properties: sidecar: description: Sidecar tells Rook to run SSSD in a sidecar alongside the NFS-Ganesha server in each NFS pod. properties: additionalFiles: - description: AdditionalFiles defines any number of additional files that should be mounted into the SSSD sidecar. + description: AdditionalFiles defines any number of additional files that should be mounted into the SSSD sidecar. These files may be referenced by the sssd.conf config file. items: - description: SSSDSidecarAdditionalFile represents the source from where additional files for the the SSSD configu + description: SSSDSidecarAdditionalFile represents the source from where additional files for the the SSSD configuration should come from and are made available. properties: subPath: - description: SubPath defines the sub-path in `/etc/sssd/rook-additional/` where the additional file(s) will be pl + description: SubPath defines the sub-path in `/etc/sssd/rook-additional/` where the additional file(s) will be placed. Each subPath definition must be unique and must not contain ':'. minLength: 1 pattern: ^[^:]+$ type: string volumeSource: - description: VolumeSource accepts a pared down version of the standard Kubernetes VolumeSource for the additional properties: configMap: - description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8680,80 +8158,99 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic emptyDir: - description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: medium represents what type of storage medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: sizeLimit is the total amount of local storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object hostPath: - description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: path of the directory on the host. type: string type: - description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object persistentVolumeClaim: - description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. type: boolean required: - claimName type: object projected: - description: projected items for all in one resources secrets, configmaps, and downward API properties: defaultMode: - description: defaultMode are the mode bits used to set permissions on created files by default. format: int32 type: integer sources: - description: sources is the list of volume projections items: - description: Projection that may be projected along with other supported volume types properties: +<<<<<<< HEAD +======= + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8761,56 +8258,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -8822,22 +8305,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8845,25 +8322,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -8872,26 +8343,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8899,10 +8363,8 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object @@ -8912,7 +8374,7 @@ spec: type: object type: array debugLevel: - description: DebugLevel sets the debug level for SSSD. If unset or set to 0, Rook does nothing. + description: 'DebugLevel sets the debug level for SSSD. If unset or set to 0, Rook does nothing. Otherwise, this may be a value between 1 and 10. See SSSD docs for more info: https://sssd.io/troubleshooting/basics.html#sssd-debug-logs' maximum: 10 minimum: 0 type: integer @@ -8924,12 +8386,12 @@ spec: description: Resources allow specifying resource requests/limits on the SSSD sidecar container. properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -8945,7 +8407,7 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.' + description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object requests: additionalProperties: @@ -8954,36 +8416,28 @@ spec: - type: string pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true - description: Requests describes the minimum amount of compute resources required. + description: 'Requests describes the minimum amount of compute resources required. If Requests is omitted for a container, it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value. Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' type: object type: object sssdConfigFile: - description: SSSDConfigFile defines where the SSSD configuration should be sourced from. + description: SSSDConfigFile defines where the SSSD configuration should be sourced from. The config file will be placed into `/etc/sssd/sssd.conf`. If this is left empty, Rook will not add the file. This allows you to manage the `sssd.conf` file yourself however you wish. For example, you may build it into your custom Ceph container image or use the Vault agent injector to securely add the file via annotations on the CephNFS spec (passed to the NFS server pods). properties: volumeSource: - description: VolumeSource accepts a pared down version of the standard Kubernetes VolumeSource for the SSSD confi properties: configMap: - description: configMap represents a configMap that should populate this volume properties: defaultMode: - description: 'defaultMode is optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -8991,80 +8445,99 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic emptyDir: - description: emptyDir represents a temporary directory that shares a pod's lifetime. properties: medium: - description: medium represents what type of storage medium should back this directory. type: string sizeLimit: anyOf: - type: integer - type: string - description: sizeLimit is the total amount of local storage required for this EmptyDir volume. pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true type: object hostPath: - description: hostPath represents a pre-existing file or directory on the host machine that is directly exposed to properties: path: - description: path of the directory on the host. type: string type: - description: 'type for HostPath Volume Defaults to "" More info: https://kubernetes.' type: string required: - path type: object persistentVolumeClaim: - description: persistentVolumeClaimVolumeSource represents a reference to a PersistentVolumeClaim in the same name properties: claimName: - description: claimName is the name of a PersistentVolumeClaim in the same namespace as the pod using this volume. type: string readOnly: - description: readOnly Will force the ReadOnly setting in VolumeMounts. Default false. type: boolean required: - claimName type: object projected: - description: projected items for all in one resources secrets, configmaps, and downward API properties: defaultMode: - description: defaultMode are the mode bits used to set permissions on created files by default. format: int32 type: integer sources: - description: sources is the list of volume projections items: - description: Projection that may be projected along with other supported volume types properties: +<<<<<<< HEAD +======= + clusterTrustBundle: + properties: + labelSelector: + properties: + matchExpressions: + items: + properties: + key: + type: string + operator: + type: string + values: + items: + type: string + type: array + required: + - key + - operator + type: object + type: array + matchLabels: + additionalProperties: + type: string + type: object + type: object + x-kubernetes-map-type: atomic + name: + type: string + optional: + type: boolean + path: + type: string + signerName: + type: string + required: + - path + type: object +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: - description: configMap information about the configMap data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced ConfigMap will be proj items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -9072,56 +8545,42 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional specify whether the ConfigMap or its keys must be defined type: boolean type: object x-kubernetes-map-type: atomic downwardAPI: - description: downwardAPI information about the downwardAPI data to project properties: items: - description: Items is a list of DownwardAPIVolume file items: - description: DownwardAPIVolumeFile represents information to create the file containing the pod field properties: fieldRef: - description: 'Required: Selects a field of the pod: only annotations, labels, name and namespace are supported.' properties: apiVersion: - description: Version of the schema the FieldPath is written in terms of, defaults to "v1". type: string fieldPath: - description: Path of the field to select in the specified API version. type: string required: - fieldPath type: object x-kubernetes-map-type: atomic mode: - description: 'Optional: mode bits used to set permissions on this file, must be an octal value between 0000 and 07' format: int32 type: integer path: - description: 'Required: Path is the relative path name of the file to be created.' type: string resourceFieldRef: - description: 'Selects a resource of the container: only resources limits and requests (limits.cpu, limits.' properties: containerName: - description: 'Container name: required for volumes, optional for env vars' type: string divisor: anyOf: - type: integer - type: string - description: Specifies the output format of the exposed resources, defaults to "1" pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ x-kubernetes-int-or-string: true resource: - description: 'Required: resource to select' type: string required: - resource @@ -9133,22 +8592,16 @@ spec: type: array type: object secret: - description: secret information about the secret data to project properties: items: - description: items if unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -9156,25 +8609,19 @@ spec: type: object type: array name: - description: 'Name of the referent. More info: https://kubernetes.' type: string optional: - description: optional field specify whether the Secret or its key must be defined type: boolean type: object x-kubernetes-map-type: atomic serviceAccountToken: - description: serviceAccountToken is information about the serviceAccountToken data to project properties: audience: - description: audience is the intended audience of the token. type: string expirationSeconds: - description: expirationSeconds is the requested duration of validity of the service account token. format: int64 type: integer path: - description: path is the path relative to the mount point of the file to project the token into. type: string required: - path @@ -9183,26 +8630,19 @@ spec: type: array type: object secret: - description: 'secret represents a secret that should populate this volume. More info: https://kubernetes.' properties: defaultMode: - description: 'defaultMode is Optional: mode bits used to set permissions on created files by default.' format: int32 type: integer items: - description: items If unspecified, each key-value pair in the Data field of the referenced Secret will be project items: - description: Maps a string key to a path within a volume. properties: key: - description: key is the key to project. type: string mode: - description: 'mode is Optional: mode bits used to set permissions on this file.' format: int32 type: integer path: - description: path is the relative path of the file to map the key to. May not be an absolute path. type: string required: - key @@ -9210,10 +8650,8 @@ spec: type: object type: array optional: - description: optional field specify whether the Secret or its keys must be defined type: boolean secretName: - description: 'secretName is the name of the secret in the pod''s namespace to use. More info: https://kubernetes.' type: string type: object type: object @@ -9237,7 +8675,7 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true hostNetwork: - description: Whether host networking is enabled for the Ganesha server. + description: Whether host networking is enabled for the Ganesha server. If not set, the network settings from the cluster CR will be applied. nullable: true type: boolean labels: @@ -9248,25 +8686,25 @@ spec: type: object x-kubernetes-preserve-unknown-fields: true livenessProbe: - description: A liveness-probe to verify that Ganesha server has valid run-time state. If LivenessProbe. + description: A liveness-probe to verify that Ganesha server has valid run-time state. If LivenessProbe.Disabled is false and LivenessProbe.Probe is nil uses default probe. properties: disabled: description: Disabled determines whether probe is disable or not type: boolean probe: - description: 'Probe describes a health check to be performed against a container to determine whether it is alive ' + description: Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic. properties: exec: description: Exec specifies the action to take. properties: command: - description: 'Command is the command line to execute inside the container, the working directory for the command ' + description: Command is the command line to execute inside the container, the working directory for the command is root ('/') in the container's filesystem. The command is simply exec'd, it is not run inside a shell, so traditional shell instructions ('|', etc) won't work. To use a shell, you need to explicitly call out to that shell. Exit status of 0 is treated as live/healthy and non-zero is unhealthy. items: type: string type: array type: object failureThreshold: - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. + description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. format: int32 type: integer grpc: @@ -9277,7 +8715,7 @@ spec: format: int32 type: integer service: - description: Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github. + description: "Service is the name of the service to place in the gRPC HealthCheckRequest (see https://github.com/grpc/grpc/blob/master/doc/health-checking.md). \n If this is not specified, the default behavior is defined by gRPC." type: string required: - port @@ -9286,7 +8724,7 @@ spec: description: HTTPGet specifies the http request to perform. properties: host: - description: Host name to connect to, defaults to the pod IP. + description: Host name to connect to, defaults to the pod IP. You probably want to set "Host" in httpHeaders instead. type: string httpHeaders: description: Custom headers to set in the request. HTTP allows repeated headers. @@ -9294,7 +8732,7 @@ spec: description: HTTPHeader describes a custom header to be used in HTTP probes properties: name: - description: The header field name. + description: The header field name. This will be canonicalized upon output, so case-variant names will be understood as the same header. type: string value: description: The header field value @@ -9311,7 +8749,7 @@ spec: anyOf: - type: integer - type: string - description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. + description: Name or number of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true scheme: description: Scheme to use for connecting to the host. Defaults to HTTP. @@ -9320,7 +8758,7 @@ spec: - port type: object initialDelaySeconds: - description: Number of seconds after the container has started before liveness probes are initiated. + description: 'Number of seconds after the container has started before liveness probes are initiated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer periodSeconds: @@ -9328,7 +8766,7 @@ spec: format: int32 type: integer successThreshold: - description: Minimum consecutive successes for the probe to be considered successful after having failed. + description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness and startup. Minimum value is 1. format: int32 type: integer tcpSocket: @@ -9341,17 +8779,16 @@ spec: anyOf: - type: integer - type: string - description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. + description: Number or name of the port to access on the container. Number must be in the range 1 to 65535. Name must be an IANA_SVC_NAME. x-kubernetes-int-or-string: true required: - port type: object terminationGracePeriodSeconds: - description: Optional duration in seconds the pod needs to terminate gracefully upon probe failure. format: int64 type: integer timeoutSeconds: - description: Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. + description: 'Number of seconds after which the probe times out. Defaults to 1 second. Minimum value is 1. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes' format: int32 type: integer type: object @@ -9360,33 +8797,23 @@ spec: description: LogLevel set logging level type: string placement: - description: The affinity to place the ganesha pods nullable: true properties: nodeAffinity: - description: NodeAffinity is a group of node affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: An empty preferred scheduling term matches all objects with implicit weight 0 (i.e. it's a no-op). properties: preference: - description: A node selector term, associated with the corresponding weight. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9396,18 +8823,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9419,7 +8841,6 @@ spec: type: object x-kubernetes-map-type: atomic weight: - description: Weight associated with matching the corresponding nodeSelectorTerm, in the range 1-100. format: int32 type: integer required: @@ -9428,26 +8849,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no properties: nodeSelectorTerms: - description: Required. A list of node selector terms. The terms are ORed. items: - description: A null or empty node selector term matches no objects. The requirements of them are ANDed. properties: matchExpressions: - description: A list of node selector requirements by node's labels. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9457,18 +8870,13 @@ spec: type: object type: array matchFields: - description: A list of node selector requirements by node's fields. items: - description: 'A node selector requirement is a selector that contains values, a key, and an operator that relates ' properties: key: - description: The label key that the selector applies to. type: string operator: - description: Represents a key's relationship to a set of values. type: string values: - description: An array of string values. If the operator is In or NotIn, the values array must be non-empty. items: type: string type: array @@ -9486,32 +8894,22 @@ spec: x-kubernetes-map-type: atomic type: object podAffinity: - description: PodAffinity is a group of inter pod affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: 'The scheduler will prefer to schedule pods to nodes that satisfy the affinity expressions specified ' items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9523,26 +8921,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9554,23 +8958,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -9579,26 +8979,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9610,26 +9002,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9641,17 +9039,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -9659,32 +9054,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9696,26 +9081,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9727,23 +9118,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -9752,26 +9139,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9783,26 +9162,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -9814,17 +9199,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -9832,49 +9214,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10550,23 +9874,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -10575,26 +9895,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10606,26 +9918,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10637,17 +9955,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -10655,32 +9970,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10692,26 +9997,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10723,23 +10034,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -10748,26 +10055,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10779,26 +10078,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -10810,17 +10115,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -10828,49 +10130,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple >>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12493,23 +11733,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -12518,26 +11754,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the affinity requirements specified by this field are not met at scheduling time, the pod will no items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12549,26 +11777,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12580,17 +11814,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -12598,32 +11829,22 @@ spec: type: array type: object podAntiAffinity: - description: PodAntiAffinity is a group of inter pod anti affinity scheduling rules properties: preferredDuringSchedulingIgnoredDuringExecution: - description: The scheduler will prefer to schedule pods to nodes that satisfy the anti-affinity expressions speci items: - description: The weights of all of the matched WeightedPodAffinityTerm fields are added per-node to find the most properties: podAffinityTerm: - description: Required. A pod affinity term, associated with the corresponding weight. properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12635,26 +11856,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12666,23 +11893,19 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey type: object weight: - description: weight associated with matching the corresponding podAffinityTerm, in the range 1-100. format: int32 type: integer required: @@ -12691,26 +11914,18 @@ spec: type: object type: array requiredDuringSchedulingIgnoredDuringExecution: - description: If the anti-affinity requirements specified by this field are not met at scheduling time, the pod wi items: - description: Defines a set of pods (namely those matching the labelSelector relative to the given namespace(s)) t properties: labelSelector: - description: A label query over a set of resources, in this case pods. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12722,26 +11937,32 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic +<<<<<<< HEAD +======= + matchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic + mismatchLabelKeys: + items: + type: string + type: array + x-kubernetes-list-type: atomic +>>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: - description: A label query over the set of namespaces that the term applies to. properties: matchExpressions: - description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector that contains values, a key, and an operator that relates properties: key: - description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship to a set of values. type: string values: - description: values is an array of string values. items: type: string type: array @@ -12753,17 +11974,14 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. type: object type: object x-kubernetes-map-type: atomic namespaces: - description: namespaces specifies a static list of namespace names that the term applies to. items: type: string type: array topologyKey: - description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching th type: string required: - topologyKey @@ -12771,49 +11989,34 @@ spec: type: array type: object tolerations: - description: The pod this Toleration is attached to tolerates any taint that matches the triple Date: Tue, 20 Feb 2024 12:08:18 +0100 Subject: [PATCH 2/2] manifest: adding a null check to PersistentVolumeClaim conversion Signed-off-by: Redouane Kachach (cherry picked from commit 7a7b98362809b17bea43f46b87d4baa6b24e0823) --- Documentation/CRDs/specification.md | 27 +- .../charts/rook-ceph/templates/resources.yaml | 1110 +---------------- deploy/examples/crds.yaml | 1110 +---------------- pkg/apis/ceph.rook.io/v1/volume.go | 6 +- 4 files changed, 38 insertions(+), 2215 deletions(-) diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index 015665b72d5a..ba54268aa5ed 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -12096,8 +12096,8 @@ Kubernetes meta/v1.LabelSelector resources
- -Kubernetes core/v1.VolumeResourceRequirements + +Kubernetes core/v1.ResourceRequirements @@ -12207,29 +12207,6 @@ in any namespaces. (Alpha) Using the namespace field of dataSourceRef requires the CrossNamespaceVolumeDataSource feature gate to be enabled.

- - -volumeAttributesClassName
- -string - - - -(Optional) -

volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. -If specified, the CSI driver will create or update the volume with the attributes defined -in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, -it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass -will be applied to the claim but it’s not allowed to reset this field to empty string once it is set. -If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass -will be set by the persistentvolume controller if it exists. -If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be -set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource -exists. -More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass -(Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.

- - diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index 153bd980e94c..87cacb515743 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -1494,12 +1494,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -1561,12 +1561,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -1574,75 +1568,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -1720,12 +1645,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -1787,12 +1712,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -1800,75 +1719,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true zones: @@ -1953,12 +1803,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -2020,12 +1870,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -2033,75 +1877,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -2404,19 +2179,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -2485,19 +2247,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -2564,19 +2313,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -2645,19 +2381,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3042,12 +2765,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -3109,12 +2832,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -3122,75 +2839,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object @@ -3347,19 +2995,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3428,19 +3063,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3507,19 +3129,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3588,19 +3197,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3837,19 +3433,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3918,19 +3501,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3997,19 +3567,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -4078,19 +3635,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -4318,12 +3862,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -4385,12 +3929,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -4398,75 +3936,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array required: @@ -4568,12 +4037,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -4635,12 +4104,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -4648,75 +4111,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object @@ -5059,23 +4453,10 @@ spec: type: array matchLabels: additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) + type: string + type: object + type: object + x-kubernetes-map-type: atomic namespaceSelector: properties: matchExpressions: @@ -5144,19 +4525,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5223,19 +4591,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5304,19 +4659,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5642,19 +4984,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5723,19 +5052,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5802,19 +5118,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5883,19 +5186,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6720,19 +6010,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6801,19 +6078,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6880,19 +6144,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6961,19 +6212,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -7711,46 +6949,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -7951,46 +7149,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -8207,46 +7365,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -8494,46 +7612,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -8931,19 +8009,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9012,19 +8077,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9091,19 +8143,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9172,19 +8211,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9849,19 +8875,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9930,19 +8943,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -10009,19 +9009,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -10090,19 +9077,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11712,19 +10686,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11793,19 +10754,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11872,19 +10820,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11953,19 +10888,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index fc7a57fe2e0b..d623b0e90977 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -1492,12 +1492,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -1559,12 +1559,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -1572,75 +1566,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -1718,12 +1643,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -1785,12 +1710,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -1798,75 +1717,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true zones: @@ -1951,12 +1801,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -2018,12 +1868,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -2031,75 +1875,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object x-kubernetes-preserve-unknown-fields: true type: object @@ -2402,19 +2177,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -2483,19 +2245,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -2562,19 +2311,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -2643,19 +2379,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3040,12 +2763,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -3107,12 +2830,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -3120,75 +2837,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object @@ -3345,19 +2993,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3426,19 +3061,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3505,19 +3127,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3586,19 +3195,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3835,19 +3431,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3916,19 +3499,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -3995,19 +3565,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -4076,19 +3633,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -4316,12 +3860,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -4383,12 +3927,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -4396,75 +3934,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array required: @@ -4566,12 +4035,12 @@ spec: description: 'resources represents the minimum resources the volume should have. If RecoverVolumeExpansionFailure feature is enabled users are allowed to specify resource requirements that are lower than previous value but must still be higher than capacity recorded in the status field of the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources' properties: claims: - description: Claims lists the names of resources, defined in spec. + description: "Claims lists the names of resources, defined in spec.resourceClaims, that are used by this container. \n This is an alpha field and requires enabling the DynamicResourceAllocation feature gate. \n This field is immutable. It can only be set for containers." items: description: ResourceClaim references one entry in PodSpec.ResourceClaims. properties: name: - description: Name must match the name of one entry in pod.spec. + description: Name must match the name of one entry in pod.spec.resourceClaims of the Pod where this field is used. It makes that resource available inside a container. type: string required: - name @@ -4633,12 +4102,6 @@ spec: storageClassName: description: 'storageClassName is the name of the StorageClass required by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1' type: string -<<<<<<< HEAD -======= - volumeAttributesClassName: - description: 'volumeAttributesClassName may be used to set the VolumeAttributesClass used by this claim. If specified, the CSI driver will create or update the volume with the attributes defined in the corresponding VolumeAttributesClass. This has a different purpose than storageClassName, it can be changed after the claim is created. An empty string value means that no VolumeAttributesClass will be applied to the claim but it''s not allowed to reset this field to empty string once it is set. If unspecified and the PersistentVolumeClaim is unbound, the default VolumeAttributesClass will be set by the persistentvolume controller if it exists. If the resource referred to by volumeAttributesClass does not exist, this PersistentVolumeClaim will be set to a Pending state, as reflected by the modifyVolumeStatus field, until such as a resource exists. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass (Alpha) Using this field requires the VolumeAttributesClass feature gate to be enabled.' - type: string ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) volumeMode: description: volumeMode defines what type of volume is required by the claim. Value of Filesystem is implied when not included in claim spec. type: string @@ -4646,75 +4109,6 @@ spec: description: volumeName is the binding reference to the PersistentVolume backing this claim. type: string type: object -<<<<<<< HEAD - status: - description: status represents the current information/status of a persistent volume claim. Read-only. - properties: - accessModes: - description: accessModes contains the actual access modes the volume backing the PVC has. - items: - type: string - type: array - allocatedResourceStatuses: - additionalProperties: - description: When a controller receives persistentvolume claim update with ClaimResourceStatus for a resource tha - type: string - description: allocatedResourceStatuses stores status of resource being resized for the given PVC. - type: object - x-kubernetes-map-type: granular - allocatedResources: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: allocatedResources tracks the resources allocated to a PVC including its capacity. - type: object - capacity: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ - x-kubernetes-int-or-string: true - description: capacity represents the actual resources of the underlying volume. - type: object - conditions: - description: conditions is the current Condition of persistent volume claim. - items: - description: PersistentVolumeClaimCondition contains details about state of pvc - properties: - lastProbeTime: - description: lastProbeTime is the time we probed the condition. - format: date-time - type: string - lastTransitionTime: - description: lastTransitionTime is the time the condition transitioned from one status to another. - format: date-time - type: string - message: - description: message is the human-readable message indicating details about last transition. - type: string - reason: - description: 'reason is a unique, this should be a short, machine understandable string that gives the reason for ' - type: string - status: - type: string - type: - description: PersistentVolumeClaimConditionType is a valid value of PersistentVolumeClaimCondition.Type - type: string - required: - - status - - type - type: object - type: array - phase: - description: phase represents the current phase of PersistentVolumeClaim. - type: string - type: object -======= ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) type: object type: array type: object @@ -5056,23 +4450,10 @@ spec: type: array matchLabels: additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) + type: string + type: object + type: object + x-kubernetes-map-type: atomic namespaceSelector: properties: matchExpressions: @@ -5141,19 +4522,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5220,19 +4588,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5301,19 +4656,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5638,19 +4980,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5719,19 +5048,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5798,19 +5114,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -5879,19 +5182,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6715,19 +6005,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6796,19 +6073,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6875,19 +6139,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -6956,19 +6207,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -7704,46 +6942,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -7944,46 +7142,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -8200,46 +7358,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -8487,46 +7605,6 @@ spec: sources: items: properties: -<<<<<<< HEAD -======= - clusterTrustBundle: - properties: - labelSelector: - properties: - matchExpressions: - items: - properties: - key: - type: string - operator: - type: string - values: - items: - type: string - type: array - required: - - key - - operator - type: object - type: array - matchLabels: - additionalProperties: - type: string - type: object - type: object - x-kubernetes-map-type: atomic - name: - type: string - optional: - type: boolean - path: - type: string - signerName: - type: string - required: - - path - type: object ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) configMap: properties: items: @@ -8924,19 +8002,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9005,19 +8070,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9084,19 +8136,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9165,19 +8204,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9840,19 +8866,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -9921,19 +8934,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -10000,19 +9000,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -10081,19 +9068,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11699,19 +10673,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11780,19 +10741,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11859,19 +10807,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: @@ -11940,19 +10875,6 @@ spec: type: object type: object x-kubernetes-map-type: atomic -<<<<<<< HEAD -======= - matchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic - mismatchLabelKeys: - items: - type: string - type: array - x-kubernetes-list-type: atomic ->>>>>>> bd7477ec6 (manifest: reduce CRD size by removing some descriptions) namespaceSelector: properties: matchExpressions: diff --git a/pkg/apis/ceph.rook.io/v1/volume.go b/pkg/apis/ceph.rook.io/v1/volume.go index 1ecde81760fa..9acb4d8e1de7 100644 --- a/pkg/apis/ceph.rook.io/v1/volume.go +++ b/pkg/apis/ceph.rook.io/v1/volume.go @@ -50,9 +50,11 @@ func (src *ConfigFileVolumeSource) ToKubernetesVolumeSource() *corev1.VolumeSour } func (t *VolumeClaimTemplate) ToPVC() *corev1.PersistentVolumeClaim { - ret := &corev1.PersistentVolumeClaim{ + if t == nil { + return nil + } + return &corev1.PersistentVolumeClaim{ ObjectMeta: *t.ObjectMeta.DeepCopy(), Spec: *t.Spec.DeepCopy(), } - return ret }