Skip to content

Commit

Permalink
Merge pull request #114 from red-hat-storage/sync_us--main
Browse files Browse the repository at this point in the history 
Syncing latest changes from upstream main for kubernetes-csi-addons
  • Loading branch information
@openshift-merge-bot
openshift-merge-bot[bot] authored Jan 24, 2024
2 parents e62686e + 3e23531 commit dad4baa
Show file tree
Hide file tree
Showing 606 changed files with 39,773 additions and 22,459 deletions.
61 changes: 36 additions & 25 deletions config/crd/bases/csiaddons.openshift.io_csiaddonsnodes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: csiaddonsnodes.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -36,40 +36,49 @@ spec:
description: CSIAddonsNode is the Schema for the csiaddonsnode API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
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. 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'
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: CSIAddonsNodeSpec defines the desired state of CSIAddonsNode
properties:
driver:
description: Driver is the information of the CSI Driver existing
on a node. If the driver is uninstalled, this can become empty.
description: |-
Driver is the information of the CSI Driver existing on a node.
If the driver is uninstalled, this can become empty.
properties:
endpoint:
description: EndPoint is url that contains the ip-address to which
the CSI-Addons side-car listens to.
description: |-
EndPoint is url that contains the ip-address to which the CSI-Addons
side-car listens to.
type: string
name:
description: 'Name is the name of the CSI driver that this object
refers to. This must be the same name returned by the CSI-Addons
GetIdentity() call for that driver. The name of the driver is
in the format: `example.csi.ceph.com`'
description: |-
Name is the name of the CSI driver that this object refers to.
This must be the same name returned by the CSI-Addons GetIdentity()
call for that driver. The name of the driver is in the format:
`example.csi.ceph.com`
type: string
x-kubernetes-validations:
- message: name is immutable
rule: self == oldSelf
nodeID:
description: NodeID is the ID of the node to identify on which
node the side-car is running.
description: |-
NodeID is the ID of the node to identify on which node the side-car
is running.
type: string
x-kubernetes-validations:
- message: nodeID is immutable
Expand All @@ -86,18 +95,20 @@ spec:
description: CSIAddonsNodeStatus defines the observed state of CSIAddonsNode
properties:
message:
description: Message is a human-readable message indicating details
about why the CSIAddonsNode is in this state.
description: |-
Message is a human-readable message indicating details about why the CSIAddonsNode
is in this state.
type: string
reason:
description: Reason is a brief CamelCase string that describes any
failure and is meant for machine parsing and tidy display in the
CLI.
description: |-
Reason is a brief CamelCase string that describes any failure and is meant
for machine parsing and tidy display in the CLI.
type: string
state:
description: State represents the state of the CSIAddonsNode object.
It informs whether or not the CSIAddonsNode is Connected to the
CSI Driver.
description: |-
State represents the state of the CSIAddonsNode object.
It informs whether or not the CSIAddonsNode is Connected
to the CSI Driver.
type: string
type: object
required:
Expand Down
86 changes: 47 additions & 39 deletions config/crd/bases/csiaddons.openshift.io_networkfences.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: networkfences.csiaddons.openshift.io
spec:
group: csiaddons.openshift.io
Expand Down Expand Up @@ -36,14 +36,19 @@ spec:
description: NetworkFence is the Schema for the networkfences API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
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. 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'
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
Expand All @@ -64,8 +69,9 @@ spec:
rule: self == oldSelf
fenceState:
default: Fenced
description: FenceState contains the desired state for the CIDRs mentioned
in the Spec. i.e. Fenced or Unfenced
description: |-
FenceState contains the desired state for the CIDRs
mentioned in the Spec. i.e. Fenced or Unfenced
enum:
- Fenced
- Unfenced
Expand All @@ -90,7 +96,8 @@ spec:
- message: name is immutable
rule: self == oldSelf
namespace:
description: Namespace specifies the namespace in which the secret
description: |-
Namespace specifies the namespace in which the secret
is located.
type: string
x-kubernetes-validations:
Expand All @@ -117,42 +124,42 @@ spec:
description: Conditions are the list of conditions and their status.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
description: |-
lastTransitionTime is the last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
description: |-
observedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
Expand All @@ -166,11 +173,12 @@ spec:
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
Loading

0 comments on commit dad4baa

Please sign in to comment.