chore: update Dragonfly operator
All checks were successful
Renovate / renovate (push) Successful in 56s
All checks were successful
Renovate / renovate (push) Successful in 56s
This commit is contained in:
parent
ef0897ed49
commit
7e3db993f9
GPG key ID:
F56BED6903BC5E37
2 changed files with 218 additions and 3 deletions
|
|
@ -9,7 +9,7 @@ images:
|
||||||
newTag: v0.16.0
|
newTag: v0.16.0
|
||||||
- name: dragonfly-operator
|
- name: dragonfly-operator
|
||||||
newName: docker.dragonflydb.io/dragonflydb/operator
|
newName: docker.dragonflydb.io/dragonflydb/operator
|
||||||
newTag: v1.1.3
|
newTag: v1.1.4
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
---
|
|
||||||
apiVersion: apiextensions.k8s.io/v1
|
apiVersion: apiextensions.k8s.io/v1
|
||||||
kind: CustomResourceDefinition
|
kind: CustomResourceDefinition
|
||||||
metadata:
|
metadata:
|
||||||
|
|
@ -35,6 +34,24 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
description: DragonflySpec defines the desired state of Dragonfly
|
description: DragonflySpec defines the desired state of Dragonfly
|
||||||
properties:
|
properties:
|
||||||
|
aclFromSecret:
|
||||||
|
description: (Optional) Acl file Secret to pass to the container
|
||||||
|
properties:
|
||||||
|
key:
|
||||||
|
description: The key of the secret to select from. Must be a
|
||||||
|
valid secret key.
|
||||||
|
type: string
|
||||||
|
name:
|
||||||
|
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
|
||||||
|
TODO: Add other useful fields. apiVersion, kind, uid?'
|
||||||
|
type: string
|
||||||
|
optional:
|
||||||
|
description: Specify whether the Secret or its key must be defined
|
||||||
|
type: boolean
|
||||||
|
required:
|
||||||
|
- key
|
||||||
|
type: object
|
||||||
|
x-kubernetes-map-type: atomic
|
||||||
affinity:
|
affinity:
|
||||||
description: (Optional) Dragonfly pod affinity
|
description: (Optional) Dragonfly pod affinity
|
||||||
properties:
|
properties:
|
||||||
|
|
@ -1031,6 +1048,23 @@ spec:
|
||||||
image:
|
image:
|
||||||
description: Image is the Dragonfly image to use
|
description: Image is the Dragonfly image to use
|
||||||
type: string
|
type: string
|
||||||
|
labels:
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
|
description: (Optional) Labels to add to the Dragonfly pods.
|
||||||
|
type: object
|
||||||
|
memcachedPort:
|
||||||
|
description: (Optional) Dragonfly memcached port
|
||||||
|
format: int32
|
||||||
|
type: integer
|
||||||
|
nodeSelector:
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
|
description: (Optional) Dragonfly pod node selector
|
||||||
|
type: object
|
||||||
|
priorityClassName:
|
||||||
|
description: (Optional) Dragonfly pod priority class name
|
||||||
|
type: string
|
||||||
replicas:
|
replicas:
|
||||||
description: Replicas is the total number of Dragonfly instances including
|
description: Replicas is the total number of Dragonfly instances including
|
||||||
the master
|
the master
|
||||||
|
|
@ -1095,10 +1129,23 @@ spec:
|
||||||
type: string
|
type: string
|
||||||
description: (Optional) Dragonfly Service Annotations
|
description: (Optional) Dragonfly Service Annotations
|
||||||
type: object
|
type: object
|
||||||
|
labels:
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
|
description: (Optional) Dragonfly Service Labels
|
||||||
|
type: object
|
||||||
|
name:
|
||||||
|
description: (Optional) Dragonfly Service name
|
||||||
|
type: string
|
||||||
type:
|
type:
|
||||||
description: (Optional) Dragonfly Service type
|
description: (Optional) Dragonfly Service type
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
|
skipFSGroup:
|
||||||
|
description: (Optional) Skip Assigning FileSystem Group. Required
|
||||||
|
for platforms such as Openshift that require IDs to not be set,
|
||||||
|
as it injects a fixed randomized ID per namespace into all pods.
|
||||||
|
type: boolean
|
||||||
snapshot:
|
snapshot:
|
||||||
description: (Optional) Dragonfly Snapshot configuration
|
description: (Optional) Dragonfly Snapshot configuration
|
||||||
properties:
|
properties:
|
||||||
|
|
@ -1374,6 +1421,174 @@ spec:
|
||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
type: array
|
type: array
|
||||||
|
topologySpreadConstraints:
|
||||||
|
description: (Optional) Dragonfly pod topologySpreadConstraints
|
||||||
|
items:
|
||||||
|
description: TopologySpreadConstraint specifies how to spread matching
|
||||||
|
pods among the given topology.
|
||||||
|
properties:
|
||||||
|
labelSelector:
|
||||||
|
description: LabelSelector is used to find matching pods. Pods
|
||||||
|
that match this label selector are counted to determine the
|
||||||
|
number of pods in their corresponding topology domain.
|
||||||
|
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
|
||||||
|
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. Valid operators are In, NotIn,
|
||||||
|
Exists and DoesNotExist.
|
||||||
|
type: 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
|
||||||
|
required:
|
||||||
|
- key
|
||||||
|
- operator
|
||||||
|
type: object
|
||||||
|
type: array
|
||||||
|
matchLabels:
|
||||||
|
additionalProperties:
|
||||||
|
type: string
|
||||||
|
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
|
||||||
|
matchLabelKeys:
|
||||||
|
description: MatchLabelKeys is a set of pod label keys to select
|
||||||
|
the pods over which spreading will be calculated. The keys
|
||||||
|
are used to lookup values from the incoming pod labels, those
|
||||||
|
key-value labels are ANDed with labelSelector to select the
|
||||||
|
group of existing pods over which spreading will be calculated
|
||||||
|
for the incoming pod. Keys that don't exist in the incoming
|
||||||
|
pod labels will be ignored. A null or empty list means only
|
||||||
|
match against labelSelector.
|
||||||
|
items:
|
||||||
|
type: string
|
||||||
|
type: array
|
||||||
|
x-kubernetes-list-type: atomic
|
||||||
|
maxSkew:
|
||||||
|
description: 'MaxSkew describes the degree to which pods may
|
||||||
|
be unevenly distributed. When `whenUnsatisfiable=DoNotSchedule`,
|
||||||
|
it is the maximum permitted difference between the number
|
||||||
|
of matching pods in the target topology and the global minimum.
|
||||||
|
The global minimum is the minimum number of matching pods
|
||||||
|
in an eligible domain or zero if the number of eligible domains
|
||||||
|
is less than MinDomains. For example, in a 3-zone cluster,
|
||||||
|
MaxSkew is set to 1, and pods with the same labelSelector
|
||||||
|
spread as 2/2/1: In this case, the global minimum is 1. |
|
||||||
|
zone1 | zone2 | zone3 | | P P | P P | P | - if MaxSkew
|
||||||
|
is 1, incoming pod can only be scheduled to zone3 to become
|
||||||
|
2/2/2; scheduling it onto zone1(zone2) would make the ActualSkew(3-1)
|
||||||
|
on zone1(zone2) violate MaxSkew(1). - if MaxSkew is 2, incoming
|
||||||
|
pod can be scheduled onto any zone. When `whenUnsatisfiable=ScheduleAnyway`,
|
||||||
|
it is used to give higher precedence to topologies that satisfy
|
||||||
|
it. It''s a required field. Default value is 1 and 0 is not
|
||||||
|
allowed.'
|
||||||
|
format: int32
|
||||||
|
type: integer
|
||||||
|
minDomains:
|
||||||
|
description: "MinDomains indicates a minimum number of eligible
|
||||||
|
domains. When the number of eligible domains with matching
|
||||||
|
topology keys is less than minDomains, Pod Topology Spread
|
||||||
|
treats \"global minimum\" as 0, and then the calculation of
|
||||||
|
Skew is performed. And when the number of eligible domains
|
||||||
|
with matching topology keys equals or greater than minDomains,
|
||||||
|
this value has no effect on scheduling. As a result, when
|
||||||
|
the number of eligible domains is less than minDomains, scheduler
|
||||||
|
won't schedule more than maxSkew Pods to those domains. If
|
||||||
|
value is nil, the constraint behaves as if MinDomains is equal
|
||||||
|
to 1. Valid values are integers greater than 0. When value
|
||||||
|
is not nil, WhenUnsatisfiable must be DoNotSchedule. \n For
|
||||||
|
example, in a 3-zone cluster, MaxSkew is set to 2, MinDomains
|
||||||
|
is set to 5 and pods with the same labelSelector spread as
|
||||||
|
2/2/2: | zone1 | zone2 | zone3 | | P P | P P | P P |
|
||||||
|
The number of domains is less than 5(MinDomains), so \"global
|
||||||
|
minimum\" is treated as 0. In this situation, new pod with
|
||||||
|
the same labelSelector cannot be scheduled, because computed
|
||||||
|
skew will be 3(3 - 0) if new Pod is scheduled to any of the
|
||||||
|
three zones, it will violate MaxSkew. \n This is a beta field
|
||||||
|
and requires the MinDomainsInPodTopologySpread feature gate
|
||||||
|
to be enabled (enabled by default)."
|
||||||
|
format: int32
|
||||||
|
type: integer
|
||||||
|
nodeAffinityPolicy:
|
||||||
|
description: "NodeAffinityPolicy indicates how we will treat
|
||||||
|
Pod's nodeAffinity/nodeSelector when calculating pod topology
|
||||||
|
spread skew. Options are: - Honor: only nodes matching nodeAffinity/nodeSelector
|
||||||
|
are included in the calculations. - Ignore: nodeAffinity/nodeSelector
|
||||||
|
are ignored. All nodes are included in the calculations. \n
|
||||||
|
If this value is nil, the behavior is equivalent to the Honor
|
||||||
|
policy. This is a beta-level feature default enabled by the
|
||||||
|
NodeInclusionPolicyInPodTopologySpread feature flag."
|
||||||
|
type: string
|
||||||
|
nodeTaintsPolicy:
|
||||||
|
description: "NodeTaintsPolicy indicates how we will treat node
|
||||||
|
taints when calculating pod topology spread skew. Options
|
||||||
|
are: - Honor: nodes without taints, along with tainted nodes
|
||||||
|
for which the incoming pod has a toleration, are included.
|
||||||
|
- Ignore: node taints are ignored. All nodes are included.
|
||||||
|
\n If this value is nil, the behavior is equivalent to the
|
||||||
|
Ignore policy. This is a beta-level feature default enabled
|
||||||
|
by the NodeInclusionPolicyInPodTopologySpread feature flag."
|
||||||
|
type: string
|
||||||
|
topologyKey:
|
||||||
|
description: TopologyKey is the key of node labels. Nodes that
|
||||||
|
have a label with this key and identical values are considered
|
||||||
|
to be in the same topology. We consider each <key, value>
|
||||||
|
as a "bucket", and try to put balanced number of pods into
|
||||||
|
each bucket. We define a domain as a particular instance of
|
||||||
|
a topology. Also, we define an eligible domain as a domain
|
||||||
|
whose nodes meet the requirements of nodeAffinityPolicy and
|
||||||
|
nodeTaintsPolicy. e.g. If TopologyKey is "kubernetes.io/hostname",
|
||||||
|
each Node is a domain of that topology. And, if TopologyKey
|
||||||
|
is "topology.kubernetes.io/zone", each zone is a domain of
|
||||||
|
that topology. It's a required field.
|
||||||
|
type: string
|
||||||
|
whenUnsatisfiable:
|
||||||
|
description: 'WhenUnsatisfiable indicates how to deal with a
|
||||||
|
pod if it doesn''t satisfy the spread constraint. - DoNotSchedule
|
||||||
|
(default) tells the scheduler not to schedule it. - ScheduleAnyway
|
||||||
|
tells the scheduler to schedule the pod in any location, but
|
||||||
|
giving higher precedence to topologies that would help reduce
|
||||||
|
the skew. A constraint is considered "Unsatisfiable" for an
|
||||||
|
incoming pod if and only if every possible node assignment
|
||||||
|
for that pod would violate "MaxSkew" on some topology. For
|
||||||
|
example, in a 3-zone cluster, MaxSkew is set to 1, and pods
|
||||||
|
with the same labelSelector spread as 3/1/1: | zone1 | zone2
|
||||||
|
| zone3 | | P P P | P | P | If WhenUnsatisfiable is
|
||||||
|
set to DoNotSchedule, incoming pod can only be scheduled to
|
||||||
|
zone2(zone3) to become 3/2/1(3/1/2) as ActualSkew(2-1) on
|
||||||
|
zone2(zone3) satisfies MaxSkew(1). In other words, the cluster
|
||||||
|
can still be imbalanced, but scheduler won''t make it *more*
|
||||||
|
imbalanced. It''s a required field.'
|
||||||
|
type: string
|
||||||
|
required:
|
||||||
|
- maxSkew
|
||||||
|
- topologyKey
|
||||||
|
- whenUnsatisfiable
|
||||||
|
type: object
|
||||||
|
type: array
|
||||||
type: object
|
type: object
|
||||||
status:
|
status:
|
||||||
description: DragonflyStatus defines the observed state of Dragonfly
|
description: DragonflyStatus defines the observed state of Dragonfly
|
||||||
|
|
@ -1394,4 +1609,4 @@ spec:
|
||||||
served: true
|
served: true
|
||||||
storage: true
|
storage: true
|
||||||
subresources:
|
subresources:
|
||||||
status: {}
|
status: {}
|
||||||
Loading…
Reference in a new issue