You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ho...@apache.org on 2022/07/05 14:14:04 UTC
[solr-operator] branch main updated: Upgrade Zookeeper Operator dep to 0.2.14 (#449)
This is an automated email from the ASF dual-hosted git repository.
houston pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/solr-operator.git
The following commit(s) were added to refs/heads/main by this push:
new bdc11be Upgrade Zookeeper Operator dep to 0.2.14 (#449)
bdc11be is described below
commit bdc11be1b2d7593d858403219c6508146b4c90cc
Author: Houston Putman <ho...@apache.org>
AuthorDate: Tue Jul 5 10:13:58 2022 -0400
Upgrade Zookeeper Operator dep to 0.2.14 (#449)
---
NOTICE | 2 +-
config/dependencies/zookeeper_cluster_crd.yaml | 1035 ++++++++++++++++++-----
controllers/zk_api/zkcluster.go | 15 +-
docs/development.md | 2 +-
docs/upgrade-notes.md | 2 +-
hack/headers/zookeeper-operator-header.yaml.txt | 2 +-
hack/zk-operator/update-crd.sh | 5 +-
helm/solr-operator/Chart.yaml | 12 +-
helm/solr-operator/README.md | 4 +-
versions.props | 2 +-
10 files changed, 857 insertions(+), 224 deletions(-)
diff --git a/NOTICE b/NOTICE
index 2eec9c2..6482ebc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -40,4 +40,4 @@ The Zookeeper Operator is used as an optional dependency, however the ZookeeperC
config/dependencies/zookeeper_cluster_crd.yaml
The API code was also copied to the following directory
controllers/zk_api
-This was taken from https://github.com/pravega/zookeeper-operator (version v0.2.13)
+This was taken from https://github.com/pravega/zookeeper-operator (version v0.2.14)
diff --git a/config/dependencies/zookeeper_cluster_crd.yaml b/config/dependencies/zookeeper_cluster_crd.yaml
index ea6a78d..0991866 100644
--- a/config/dependencies/zookeeper_cluster_crd.yaml
+++ b/config/dependencies/zookeeper_cluster_crd.yaml
@@ -6,16 +6,20 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
#
-# Find source at: https://github.com/pravega/zookeeper-operator/tree/v0.2.13
+# Find source at: https://github.com/pravega/zookeeper-operator/tree/v0.2.14
+
+---
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
- name: zookeeperclusters.zookeeper.pravega.io
annotations:
- operator.zookeeper.pravega.io/version: v0.2.13
+ operator.zookeeper.pravega.io/version: v0.2.14
argocd.argoproj.io/sync-options: Replace=true
+ controller-gen.kubebuilder.io/version: v0.6.2
+ creationTimestamp: null
+ name: zookeeperclusters.zookeeper.pravega.io
spec:
group: zookeeper.pravega.io
names:
@@ -201,10 +205,11 @@ spec:
CMD is used if this is not provided. Variable references $(VAR_NAME)
are expanded using the container''s environment. If a variable
cannot be resolved, the reference in the input string will
- be unchanged. The $(VAR_NAME) syntax can be escaped with a
- double $$, ie: $$(VAR_NAME). Escaped references will never
- be expanded, regardless of whether the variable exists or
- not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+ be unchanged. Double $$ are reduced to a single $, which allows
+ for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+ produce the string literal "$(VAR_NAME)". Escaped references
+ will never be expanded, regardless of whether the variable
+ exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
items:
type: string
type: array
@@ -213,10 +218,12 @@ spec:
The docker image''s ENTRYPOINT is used if this is not provided.
Variable references $(VAR_NAME) are expanded using the container''s
environment. If a variable cannot be resolved, the reference
- in the input string will be unchanged. The $(VAR_NAME) syntax
- can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
- references will never be expanded, regardless of whether the
- variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+ in the input string will be unchanged. Double $$ are reduced
+ to a single $, which allows for escaping the $(VAR_NAME) syntax:
+ i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+ Escaped references will never be expanded, regardless of whether
+ the variable exists or not. Cannot be updated. More info:
+ https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
items:
type: string
type: array
@@ -233,13 +240,15 @@ spec:
type: string
value:
description: 'Variable references $(VAR_NAME) are expanded
- using the previous defined environment variables in
+ using the previously defined environment variables in
the container and any service environment variables.
If a variable cannot be resolved, the reference in the
- input string will be unchanged. The $(VAR_NAME) syntax
- can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
- references will never be expanded, regardless of whether
- the variable exists or not. Defaults to "".'
+ input string will be unchanged. Double $$ are reduced
+ to a single $, which allows for escaping the $(VAR_NAME)
+ syntax: i.e. "$$(VAR_NAME)" will produce the string
+ literal "$(VAR_NAME)". Escaped references will never
+ be expanded, regardless of whether the variable exists
+ or not. Defaults to "".'
type: string
valueFrom:
description: Source for the environment variable's value.
@@ -399,8 +408,7 @@ spec:
info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
properties:
exec:
- description: One and only one of the following should
- be specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -461,9 +469,10 @@ spec:
- port
type: object
tcpSocket:
- description: 'TCPSocket specifies an action involving
- a TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: Deprecated. TCPSocket is NOT supported
+ as a LifecycleHandler and kept for the backward compatibility.
+ There are no validation of this field and lifecycle
+ hooks will fail in runtime when tcp handler is specified.
properties:
host:
description: 'Optional: Host name to connect to,
@@ -486,18 +495,16 @@ spec:
is terminated due to an API request or management event
such as liveness/startup probe failure, preemption, resource
contention, etc. The handler is not called if the container
- crashes or exits. The reason for termination is passed
- to the handler. The Pod''s termination grace period countdown
- begins before the PreStop hooked is executed. Regardless
- of the outcome of the handler, the container will eventually
- terminate within the Pod''s termination grace period.
- Other management of the container blocks until the hook
- completes or until the termination grace period is reached.
- More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+ crashes or exits. The Pod''s termination grace period
+ countdown begins before the PreStop hook is executed.
+ Regardless of the outcome of the handler, the container
+ will eventually terminate within the Pod''s termination
+ grace period (unless delayed by finalizers). Other management
+ of the container blocks until the hook completes or until
+ the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
properties:
exec:
- description: One and only one of the following should
- be specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -558,9 +565,10 @@ spec:
- port
type: object
tcpSocket:
- description: 'TCPSocket specifies an action involving
- a TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: Deprecated. TCPSocket is NOT supported
+ as a LifecycleHandler and kept for the backward compatibility.
+ There are no validation of this field and lifecycle
+ hooks will fail in runtime when tcp handler is specified.
properties:
host:
description: 'Optional: Host name to connect to,
@@ -585,8 +593,7 @@ spec:
info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
- description: One and only one of the following should be
- specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -607,6 +614,25 @@ spec:
to 3. Minimum value is 1.
format: int32
type: integer
+ grpc:
+ description: GRPC specifies an action involving a GRPC port.
+ This is an alpha field and requires enabling GRPCContainerProbe
+ feature gate.
+ properties:
+ port:
+ description: Port number of the gRPC service. Number
+ must be in the range 1 to 65535.
+ format: int32
+ type: integer
+ service:
+ 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
+ type: object
httpGet:
description: HTTPGet specifies the http request to perform.
properties:
@@ -670,9 +696,8 @@ spec:
format: int32
type: integer
tcpSocket:
- description: 'TCPSocket specifies an action involving a
- TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: TCPSocket specifies an action involving a TCP
+ port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
@@ -689,6 +714,23 @@ spec:
required:
- port
type: object
+ terminationGracePeriodSeconds:
+ description: Optional duration in seconds the pod needs
+ to terminate gracefully upon probe failure. The grace
+ period is the duration in seconds after the processes
+ running in the pod are sent a termination signal and the
+ time when the processes are forcibly halted with a kill
+ signal. Set this value longer than the expected cleanup
+ time for your process. If this value is nil, the pod's
+ terminationGracePeriodSeconds will be used. Otherwise,
+ this value overrides the value provided by the pod spec.
+ Value must be non-negative integer. The value zero indicates
+ stop immediately via the kill signal (no opportunity to
+ shut down). This is a beta field and requires enabling
+ ProbeTerminationGracePeriod feature gate. Minimum value
+ is 1. spec.terminationGracePeriodSeconds is used if unset.
+ format: int64
+ type: integer
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
@@ -735,10 +777,10 @@ spec:
be referred to by services.
type: string
protocol:
+ default: TCP
description: Protocol for port. Must be UDP, TCP, or SCTP.
Defaults to "TCP".
type: string
- default: TCP
required:
- containerPort
type: object
@@ -753,8 +795,7 @@ spec:
fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
- description: One and only one of the following should be
- specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -775,6 +816,25 @@ spec:
to 3. Minimum value is 1.
format: int32
type: integer
+ grpc:
+ description: GRPC specifies an action involving a GRPC port.
+ This is an alpha field and requires enabling GRPCContainerProbe
+ feature gate.
+ properties:
+ port:
+ description: Port number of the gRPC service. Number
+ must be in the range 1 to 65535.
+ format: int32
+ type: integer
+ service:
+ 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
+ type: object
httpGet:
description: HTTPGet specifies the http request to perform.
properties:
@@ -838,9 +898,8 @@ spec:
format: int32
type: integer
tcpSocket:
- description: 'TCPSocket specifies an action involving a
- TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: TCPSocket specifies an action involving a TCP
+ port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
@@ -857,6 +916,23 @@ spec:
required:
- port
type: object
+ terminationGracePeriodSeconds:
+ description: Optional duration in seconds the pod needs
+ to terminate gracefully upon probe failure. The grace
+ period is the duration in seconds after the processes
+ running in the pod are sent a termination signal and the
+ time when the processes are forcibly halted with a kill
+ signal. Set this value longer than the expected cleanup
+ time for your process. If this value is nil, the pod's
+ terminationGracePeriodSeconds will be used. Otherwise,
+ this value overrides the value provided by the pod spec.
+ Value must be non-negative integer. The value zero indicates
+ stop immediately via the kill signal (no opportunity to
+ shut down). This is a beta field and requires enabling
+ ProbeTerminationGracePeriod feature gate. Minimum value
+ is 1. spec.terminationGracePeriodSeconds is used if unset.
+ format: int64
+ type: integer
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
@@ -866,7 +942,7 @@ spec:
type: object
resources:
description: 'Compute Resources required by this container.
- Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
properties:
limits:
additionalProperties:
@@ -876,7 +952,7 @@ spec:
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.io/docs/concepts/configuration/manage-compute-resources-container/'
+ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
@@ -889,13 +965,14 @@ spec:
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified,
otherwise to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
securityContext:
- description: 'Security options the pod should run with. More
- info: https://kubernetes.io/docs/concepts/policy/security-context/
- More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+ description: 'SecurityContext defines the security options the
+ container should be run with. If set, the fields of SecurityContext
+ override the equivalent fields of PodSecurityContext. More
+ info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
properties:
allowPrivilegeEscalation:
description: 'AllowPrivilegeEscalation controls whether
@@ -903,12 +980,14 @@ spec:
This bool directly controls if the no_new_privs flag will
be set on the container process. AllowPrivilegeEscalation
is true always when the container is: 1) run as Privileged
- 2) has CAP_SYS_ADMIN'
+ 2) has CAP_SYS_ADMIN Note that this field cannot be set
+ when spec.os.name is windows.'
type: boolean
capabilities:
description: The capabilities to add/drop when running containers.
Defaults to the default set of capabilities granted by
- the container runtime.
+ the container runtime. Note that this field cannot be
+ set when spec.os.name is windows.
properties:
add:
description: Added capabilities
@@ -928,25 +1007,29 @@ spec:
privileged:
description: Run container in privileged mode. Processes
in privileged containers are essentially equivalent to
- root on the host. Defaults to false.
+ root on the host. Defaults to false. Note that this field
+ cannot be set when spec.os.name is windows.
type: boolean
procMount:
description: procMount denotes the type of proc mount to
use for the containers. The default is DefaultProcMount
which uses the container runtime defaults for readonly
paths and masked paths. This requires the ProcMountType
- feature flag to be enabled.
+ feature flag to be enabled. Note that this field cannot
+ be set when spec.os.name is windows.
type: string
readOnlyRootFilesystem:
description: Whether this container has a read-only root
- filesystem. Default is false.
+ filesystem. Default is false. Note that this field cannot
+ be set when spec.os.name is windows.
type: boolean
runAsGroup:
description: The GID to run the entrypoint of the container
process. Uses runtime default if unset. May also be set
in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
- takes precedence.
+ takes precedence. Note that this field cannot be set when
+ spec.os.name is windows.
format: int64
type: integer
runAsNonRoot:
@@ -964,7 +1047,8 @@ spec:
process. Defaults to user specified in image metadata
if unspecified. May also be set in PodSecurityContext. If
set in both SecurityContext and PodSecurityContext, the
- value specified in SecurityContext takes precedence.
+ value specified in SecurityContext takes precedence. Note
+ that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
seLinuxOptions:
@@ -973,7 +1057,8 @@ spec:
random SELinux context for each container. May also be
set in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
- takes precedence.
+ takes precedence. Note that this field cannot be set when
+ spec.os.name is windows.
properties:
level:
description: Level is SELinux level label that applies
@@ -996,6 +1081,8 @@ spec:
description: The seccomp options to use by this container.
If seccomp options are provided at both the pod & container
level, the container options override the pod options.
+ Note that this field cannot be set when spec.os.name is
+ windows.
properties:
localhostProfile:
description: localhostProfile indicates a profile defined
@@ -1021,6 +1108,8 @@ spec:
containers. If unspecified, the options from the PodSecurityContext
will be used. If set in both SecurityContext and PodSecurityContext,
the value specified in SecurityContext takes precedence.
+ Note that this field cannot be set when spec.os.name is
+ linux.
properties:
gmsaCredentialSpec:
description: GMSACredentialSpec is where the GMSA admission
@@ -1032,6 +1121,19 @@ spec:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use.
type: string
+ hostProcess:
+ description: HostProcess determines if a container should
+ be run as a 'Host Process' container. This field is
+ alpha-level and will only be honored by components
+ that enable the WindowsHostProcessContainers feature
+ flag. Setting this field without the feature flag
+ will result in errors when validating the Pod. All
+ of a Pod's containers must have the same effective
+ HostProcess value (it is not allowed to have a mix
+ of HostProcess containers and non-HostProcess containers). In
+ addition, if HostProcess is true then HostNetwork
+ must also be set to true.
+ type: boolean
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
@@ -1050,12 +1152,10 @@ spec:
can be used to provide different probe parameters at the beginning
of a Pod''s lifecycle, when it might take a long time to load
data or warm a cache, than during steady-state operation.
- This cannot be updated. This is a beta feature enabled by
- the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
- description: One and only one of the following should be
- specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -1076,6 +1176,25 @@ spec:
to 3. Minimum value is 1.
format: int32
type: integer
+ grpc:
+ description: GRPC specifies an action involving a GRPC port.
+ This is an alpha field and requires enabling GRPCContainerProbe
+ feature gate.
+ properties:
+ port:
+ description: Port number of the gRPC service. Number
+ must be in the range 1 to 65535.
+ format: int32
+ type: integer
+ service:
+ 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
+ type: object
httpGet:
description: HTTPGet specifies the http request to perform.
properties:
@@ -1139,9 +1258,8 @@ spec:
format: int32
type: integer
tcpSocket:
- description: 'TCPSocket specifies an action involving a
- TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: TCPSocket specifies an action involving a TCP
+ port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
@@ -1158,6 +1276,23 @@ spec:
required:
- port
type: object
+ terminationGracePeriodSeconds:
+ description: Optional duration in seconds the pod needs
+ to terminate gracefully upon probe failure. The grace
+ period is the duration in seconds after the processes
+ running in the pod are sent a termination signal and the
+ time when the processes are forcibly halted with a kill
+ signal. Set this value longer than the expected cleanup
+ time for your process. If this value is nil, the pod's
+ terminationGracePeriodSeconds will be used. Otherwise,
+ this value overrides the value provided by the pod spec.
+ Value must be non-negative integer. The value zero indicates
+ stop immediately via the kill signal (no opportunity to
+ shut down). This is a beta field and requires enabling
+ ProbeTerminationGracePeriod feature gate. Minimum value
+ is 1. spec.terminationGracePeriodSeconds is used if unset.
+ format: int64
+ type: integer
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
@@ -1350,10 +1485,11 @@ spec:
CMD is used if this is not provided. Variable references $(VAR_NAME)
are expanded using the container''s environment. If a variable
cannot be resolved, the reference in the input string will
- be unchanged. The $(VAR_NAME) syntax can be escaped with a
- double $$, ie: $$(VAR_NAME). Escaped references will never
- be expanded, regardless of whether the variable exists or
- not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+ be unchanged. Double $$ are reduced to a single $, which allows
+ for escaping the $(VAR_NAME) syntax: i.e. "$$(VAR_NAME)" will
+ produce the string literal "$(VAR_NAME)". Escaped references
+ will never be expanded, regardless of whether the variable
+ exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
items:
type: string
type: array
@@ -1362,10 +1498,12 @@ spec:
The docker image''s ENTRYPOINT is used if this is not provided.
Variable references $(VAR_NAME) are expanded using the container''s
environment. If a variable cannot be resolved, the reference
- in the input string will be unchanged. The $(VAR_NAME) syntax
- can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
- references will never be expanded, regardless of whether the
- variable exists or not. Cannot be updated. More info: https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
+ in the input string will be unchanged. Double $$ are reduced
+ to a single $, which allows for escaping the $(VAR_NAME) syntax:
+ i.e. "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+ Escaped references will never be expanded, regardless of whether
+ the variable exists or not. Cannot be updated. More info:
+ https://kubernetes.io/docs/tasks/inject-data-application/define-command-argument-container/#running-a-command-in-a-shell'
items:
type: string
type: array
@@ -1382,13 +1520,15 @@ spec:
type: string
value:
description: 'Variable references $(VAR_NAME) are expanded
- using the previous defined environment variables in
+ using the previously defined environment variables in
the container and any service environment variables.
If a variable cannot be resolved, the reference in the
- input string will be unchanged. The $(VAR_NAME) syntax
- can be escaped with a double $$, ie: $$(VAR_NAME). Escaped
- references will never be expanded, regardless of whether
- the variable exists or not. Defaults to "".'
+ input string will be unchanged. Double $$ are reduced
+ to a single $, which allows for escaping the $(VAR_NAME)
+ syntax: i.e. "$$(VAR_NAME)" will produce the string
+ literal "$(VAR_NAME)". Escaped references will never
+ be expanded, regardless of whether the variable exists
+ or not. Defaults to "".'
type: string
valueFrom:
description: Source for the environment variable's value.
@@ -1548,8 +1688,7 @@ spec:
info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
properties:
exec:
- description: One and only one of the following should
- be specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -1610,9 +1749,10 @@ spec:
- port
type: object
tcpSocket:
- description: 'TCPSocket specifies an action involving
- a TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: Deprecated. TCPSocket is NOT supported
+ as a LifecycleHandler and kept for the backward compatibility.
+ There are no validation of this field and lifecycle
+ hooks will fail in runtime when tcp handler is specified.
properties:
host:
description: 'Optional: Host name to connect to,
@@ -1635,18 +1775,16 @@ spec:
is terminated due to an API request or management event
such as liveness/startup probe failure, preemption, resource
contention, etc. The handler is not called if the container
- crashes or exits. The reason for termination is passed
- to the handler. The Pod''s termination grace period countdown
- begins before the PreStop hooked is executed. Regardless
- of the outcome of the handler, the container will eventually
- terminate within the Pod''s termination grace period.
- Other management of the container blocks until the hook
- completes or until the termination grace period is reached.
- More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
+ crashes or exits. The Pod''s termination grace period
+ countdown begins before the PreStop hook is executed.
+ Regardless of the outcome of the handler, the container
+ will eventually terminate within the Pod''s termination
+ grace period (unless delayed by finalizers). Other management
+ of the container blocks until the hook completes or until
+ the termination grace period is reached. More info: https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/#container-hooks'
properties:
exec:
- description: One and only one of the following should
- be specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -1707,9 +1845,10 @@ spec:
- port
type: object
tcpSocket:
- description: 'TCPSocket specifies an action involving
- a TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: Deprecated. TCPSocket is NOT supported
+ as a LifecycleHandler and kept for the backward compatibility.
+ There are no validation of this field and lifecycle
+ hooks will fail in runtime when tcp handler is specified.
properties:
host:
description: 'Optional: Host name to connect to,
@@ -1734,8 +1873,7 @@ spec:
info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
- description: One and only one of the following should be
- specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -1756,6 +1894,25 @@ spec:
to 3. Minimum value is 1.
format: int32
type: integer
+ grpc:
+ description: GRPC specifies an action involving a GRPC port.
+ This is an alpha field and requires enabling GRPCContainerProbe
+ feature gate.
+ properties:
+ port:
+ description: Port number of the gRPC service. Number
+ must be in the range 1 to 65535.
+ format: int32
+ type: integer
+ service:
+ 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
+ type: object
httpGet:
description: HTTPGet specifies the http request to perform.
properties:
@@ -1819,9 +1976,8 @@ spec:
format: int32
type: integer
tcpSocket:
- description: 'TCPSocket specifies an action involving a
- TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: TCPSocket specifies an action involving a TCP
+ port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
@@ -1838,6 +1994,23 @@ spec:
required:
- port
type: object
+ terminationGracePeriodSeconds:
+ description: Optional duration in seconds the pod needs
+ to terminate gracefully upon probe failure. The grace
+ period is the duration in seconds after the processes
+ running in the pod are sent a termination signal and the
+ time when the processes are forcibly halted with a kill
+ signal. Set this value longer than the expected cleanup
+ time for your process. If this value is nil, the pod's
+ terminationGracePeriodSeconds will be used. Otherwise,
+ this value overrides the value provided by the pod spec.
+ Value must be non-negative integer. The value zero indicates
+ stop immediately via the kill signal (no opportunity to
+ shut down). This is a beta field and requires enabling
+ ProbeTerminationGracePeriod feature gate. Minimum value
+ is 1. spec.terminationGracePeriodSeconds is used if unset.
+ format: int64
+ type: integer
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
@@ -1884,10 +2057,10 @@ spec:
be referred to by services.
type: string
protocol:
+ default: TCP
description: Protocol for port. Must be UDP, TCP, or SCTP.
Defaults to "TCP".
type: string
- default: TCP
required:
- containerPort
type: object
@@ -1902,8 +2075,7 @@ spec:
fails. Cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
- description: One and only one of the following should be
- specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -1924,6 +2096,25 @@ spec:
to 3. Minimum value is 1.
format: int32
type: integer
+ grpc:
+ description: GRPC specifies an action involving a GRPC port.
+ This is an alpha field and requires enabling GRPCContainerProbe
+ feature gate.
+ properties:
+ port:
+ description: Port number of the gRPC service. Number
+ must be in the range 1 to 65535.
+ format: int32
+ type: integer
+ service:
+ 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
+ type: object
httpGet:
description: HTTPGet specifies the http request to perform.
properties:
@@ -1987,9 +2178,8 @@ spec:
format: int32
type: integer
tcpSocket:
- description: 'TCPSocket specifies an action involving a
- TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: TCPSocket specifies an action involving a TCP
+ port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
@@ -2006,6 +2196,23 @@ spec:
required:
- port
type: object
+ terminationGracePeriodSeconds:
+ description: Optional duration in seconds the pod needs
+ to terminate gracefully upon probe failure. The grace
+ period is the duration in seconds after the processes
+ running in the pod are sent a termination signal and the
+ time when the processes are forcibly halted with a kill
+ signal. Set this value longer than the expected cleanup
+ time for your process. If this value is nil, the pod's
+ terminationGracePeriodSeconds will be used. Otherwise,
+ this value overrides the value provided by the pod spec.
+ Value must be non-negative integer. The value zero indicates
+ stop immediately via the kill signal (no opportunity to
+ shut down). This is a beta field and requires enabling
+ ProbeTerminationGracePeriod feature gate. Minimum value
+ is 1. spec.terminationGracePeriodSeconds is used if unset.
+ format: int64
+ type: integer
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
@@ -2015,7 +2222,7 @@ spec:
type: object
resources:
description: 'Compute Resources required by this container.
- Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
properties:
limits:
additionalProperties:
@@ -2025,7 +2232,7 @@ spec:
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.io/docs/concepts/configuration/manage-compute-resources-container/'
+ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
@@ -2038,13 +2245,14 @@ spec:
resources required. If Requests is omitted for a container,
it defaults to Limits if that is explicitly specified,
otherwise to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
securityContext:
- description: 'Security options the pod should run with. More
- info: https://kubernetes.io/docs/concepts/policy/security-context/
- More info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
+ description: 'SecurityContext defines the security options the
+ container should be run with. If set, the fields of SecurityContext
+ override the equivalent fields of PodSecurityContext. More
+ info: https://kubernetes.io/docs/tasks/configure-pod-container/security-context/'
properties:
allowPrivilegeEscalation:
description: 'AllowPrivilegeEscalation controls whether
@@ -2052,12 +2260,14 @@ spec:
This bool directly controls if the no_new_privs flag will
be set on the container process. AllowPrivilegeEscalation
is true always when the container is: 1) run as Privileged
- 2) has CAP_SYS_ADMIN'
+ 2) has CAP_SYS_ADMIN Note that this field cannot be set
+ when spec.os.name is windows.'
type: boolean
capabilities:
description: The capabilities to add/drop when running containers.
Defaults to the default set of capabilities granted by
- the container runtime.
+ the container runtime. Note that this field cannot be
+ set when spec.os.name is windows.
properties:
add:
description: Added capabilities
@@ -2077,25 +2287,29 @@ spec:
privileged:
description: Run container in privileged mode. Processes
in privileged containers are essentially equivalent to
- root on the host. Defaults to false.
+ root on the host. Defaults to false. Note that this field
+ cannot be set when spec.os.name is windows.
type: boolean
procMount:
description: procMount denotes the type of proc mount to
use for the containers. The default is DefaultProcMount
which uses the container runtime defaults for readonly
paths and masked paths. This requires the ProcMountType
- feature flag to be enabled.
+ feature flag to be enabled. Note that this field cannot
+ be set when spec.os.name is windows.
type: string
readOnlyRootFilesystem:
description: Whether this container has a read-only root
- filesystem. Default is false.
+ filesystem. Default is false. Note that this field cannot
+ be set when spec.os.name is windows.
type: boolean
runAsGroup:
description: The GID to run the entrypoint of the container
process. Uses runtime default if unset. May also be set
in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
- takes precedence.
+ takes precedence. Note that this field cannot be set when
+ spec.os.name is windows.
format: int64
type: integer
runAsNonRoot:
@@ -2113,7 +2327,8 @@ spec:
process. Defaults to user specified in image metadata
if unspecified. May also be set in PodSecurityContext. If
set in both SecurityContext and PodSecurityContext, the
- value specified in SecurityContext takes precedence.
+ value specified in SecurityContext takes precedence. Note
+ that this field cannot be set when spec.os.name is windows.
format: int64
type: integer
seLinuxOptions:
@@ -2122,7 +2337,8 @@ spec:
random SELinux context for each container. May also be
set in PodSecurityContext. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
- takes precedence.
+ takes precedence. Note that this field cannot be set when
+ spec.os.name is windows.
properties:
level:
description: Level is SELinux level label that applies
@@ -2145,6 +2361,8 @@ spec:
description: The seccomp options to use by this container.
If seccomp options are provided at both the pod & container
level, the container options override the pod options.
+ Note that this field cannot be set when spec.os.name is
+ windows.
properties:
localhostProfile:
description: localhostProfile indicates a profile defined
@@ -2170,6 +2388,8 @@ spec:
containers. If unspecified, the options from the PodSecurityContext
will be used. If set in both SecurityContext and PodSecurityContext,
the value specified in SecurityContext takes precedence.
+ Note that this field cannot be set when spec.os.name is
+ linux.
properties:
gmsaCredentialSpec:
description: GMSACredentialSpec is where the GMSA admission
@@ -2181,6 +2401,19 @@ spec:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use.
type: string
+ hostProcess:
+ description: HostProcess determines if a container should
+ be run as a 'Host Process' container. This field is
+ alpha-level and will only be honored by components
+ that enable the WindowsHostProcessContainers feature
+ flag. Setting this field without the feature flag
+ will result in errors when validating the Pod. All
+ of a Pod's containers must have the same effective
+ HostProcess value (it is not allowed to have a mix
+ of HostProcess containers and non-HostProcess containers). In
+ addition, if HostProcess is true then HostNetwork
+ must also be set to true.
+ type: boolean
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
@@ -2199,12 +2432,10 @@ spec:
can be used to provide different probe parameters at the beginning
of a Pod''s lifecycle, when it might take a long time to load
data or warm a cache, than during steady-state operation.
- This cannot be updated. This is a beta feature enabled by
- the StartupProbe feature flag. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
+ This cannot be updated. More info: https://kubernetes.io/docs/concepts/workloads/pods/pod-lifecycle#container-probes'
properties:
exec:
- description: One and only one of the following should be
- specified. Exec specifies the action to take.
+ description: Exec specifies the action to take.
properties:
command:
description: Command is the command line to execute
@@ -2225,6 +2456,25 @@ spec:
to 3. Minimum value is 1.
format: int32
type: integer
+ grpc:
+ description: GRPC specifies an action involving a GRPC port.
+ This is an alpha field and requires enabling GRPCContainerProbe
+ feature gate.
+ properties:
+ port:
+ description: Port number of the gRPC service. Number
+ must be in the range 1 to 65535.
+ format: int32
+ type: integer
+ service:
+ 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
+ type: object
httpGet:
description: HTTPGet specifies the http request to perform.
properties:
@@ -2288,9 +2538,8 @@ spec:
format: int32
type: integer
tcpSocket:
- description: 'TCPSocket specifies an action involving a
- TCP port. TCP hooks not yet supported TODO: implement
- a realistic TCP lifecycle hook'
+ description: TCPSocket specifies an action involving a TCP
+ port.
properties:
host:
description: 'Optional: Host name to connect to, defaults
@@ -2307,6 +2556,23 @@ spec:
required:
- port
type: object
+ terminationGracePeriodSeconds:
+ description: Optional duration in seconds the pod needs
+ to terminate gracefully upon probe failure. The grace
+ period is the duration in seconds after the processes
+ running in the pod are sent a termination signal and the
+ time when the processes are forcibly halted with a kill
+ signal. Set this value longer than the expected cleanup
+ time for your process. If this value is nil, the pod's
+ terminationGracePeriodSeconds will be used. Otherwise,
+ this value overrides the value provided by the pod spec.
+ Value must be non-negative integer. The value zero indicates
+ stop immediately via the kill signal (no opportunity to
+ shut down). This is a beta field and requires enabling
+ ProbeTerminationGracePeriod feature gate. Minimum value
+ is 1. spec.terminationGracePeriodSeconds is used if unset.
+ format: int64
+ type: integer
timeoutSeconds:
description: 'Number of seconds after which the probe times
out. Defaults to 1 second. Minimum value is 1. More info:
@@ -2434,6 +2700,11 @@ spec:
description: Labels specifies the labels to attach to pods the operator
creates for the zookeeper cluster.
type: object
+ maxUnavailableReplicas:
+ description: MaxUnavailableReplicas defines the MaxUnavailable Replicas
+ in pdb. Default is 1.
+ format: int32
+ type: integer
persistence:
description: Persistence is the configuration for zookeeper persistent
layer. PersistentVolumeClaimSpec and VolumeReclaimPolicy can be
@@ -2467,18 +2738,51 @@ spec:
type: array
dataSource:
description: 'This field can be used to specify either: *
- An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
- - Beta) * An existing PVC (PersistentVolumeClaim) * An existing
- custom resource/object that implements data population (Alpha)
- In order to use VolumeSnapshot object types, the appropriate
- feature gate must be enabled (VolumeSnapshotDataSource or
- AnyVolumeDataSource) 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.
- If the specified data source is not supported, the volume
- will not be created and the failure will be reported as
- an event. In the future, we plan to support more data source
- types and the behavior of the provisioner may change.'
+ 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. If the AnyVolumeDataSource
+ feature gate is enabled, this field will always have the
+ same contents as the DataSourceRef field.'
+ properties:
+ apiGroup:
+ 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
+ type: string
+ name:
+ description: Name is the name of resource being referenced
+ type: string
+ required:
+ - kind
+ - name
+ type: object
+ dataSourceRef:
+ description: 'Specifies the object from which to populate
+ the volume with data, if a non-empty volume is desired.
+ This may be any local 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, 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. There
+ are two 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. (Alpha) Using
+ this field requires the AnyVolumeDataSource feature gate
+ to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource being
@@ -2498,7 +2802,11 @@ spec:
type: object
resources:
description: 'Resources represents the minimum resources the
- volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
+ 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:
limits:
additionalProperties:
@@ -2508,7 +2816,7 @@ spec:
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.io/docs/concepts/configuration/manage-compute-resources-container/'
+ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
@@ -2521,7 +2829,7 @@ spec:
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.
- More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
selector:
@@ -2883,10 +3191,73 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
+ namespaceSelector:
+ description: A label query over the set of namespaces
+ that the term applies to. The term is applied
+ to the union of the namespaces selected by
+ this field and the ones listed in the namespaces
+ field. null selector and null or empty namespaces
+ list means "this pod's namespace". An empty
+ selector ({}) matches all namespaces. This
+ field is beta-level and is only honored when
+ PodAffinityNamespaceSelector feature is enabled.
+ 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
namespaces:
- description: namespaces specifies which namespaces
- the labelSelector applies to (matches against);
- null or empty list means "this pod's namespace"
+ description: namespaces specifies a static list
+ of namespace names that the term applies to.
+ The term is applied to the union of the namespaces
+ listed in this field and the ones selected
+ by namespaceSelector. null or empty namespaces
+ list and null namespaceSelector means "this
+ pod's namespace"
items:
type: string
type: array
@@ -2983,10 +3354,71 @@ spec:
The requirements are ANDed.
type: object
type: object
+ namespaceSelector:
+ description: A label query over the set of namespaces
+ that the term applies to. The term is applied
+ to the union of the namespaces selected by this
+ field and the ones listed in the namespaces field.
+ null selector and null or empty namespaces list
+ means "this pod's namespace". An empty selector
+ ({}) matches all namespaces. This field is beta-level
+ and is only honored when PodAffinityNamespaceSelector
+ feature is enabled.
+ 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
namespaces:
- description: namespaces specifies which namespaces
- the labelSelector applies to (matches against);
- null or empty list means "this pod's namespace"
+ description: namespaces specifies a static list
+ of namespace names that the term applies to. The
+ term is applied to the union of the namespaces
+ listed in this field and the ones selected by
+ namespaceSelector. null or empty namespaces list
+ and null namespaceSelector means "this pod's namespace"
items:
type: string
type: array
@@ -3083,10 +3515,73 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
+ namespaceSelector:
+ description: A label query over the set of namespaces
+ that the term applies to. The term is applied
+ to the union of the namespaces selected by
+ this field and the ones listed in the namespaces
+ field. null selector and null or empty namespaces
+ list means "this pod's namespace". An empty
+ selector ({}) matches all namespaces. This
+ field is beta-level and is only honored when
+ PodAffinityNamespaceSelector feature is enabled.
+ 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
namespaces:
- description: namespaces specifies which namespaces
- the labelSelector applies to (matches against);
- null or empty list means "this pod's namespace"
+ description: namespaces specifies a static list
+ of namespace names that the term applies to.
+ The term is applied to the union of the namespaces
+ listed in this field and the ones selected
+ by namespaceSelector. null or empty namespaces
+ list and null namespaceSelector means "this
+ pod's namespace"
items:
type: string
type: array
@@ -3183,10 +3678,71 @@ spec:
The requirements are ANDed.
type: object
type: object
+ namespaceSelector:
+ description: A label query over the set of namespaces
+ that the term applies to. The term is applied
+ to the union of the namespaces selected by this
+ field and the ones listed in the namespaces field.
+ null selector and null or empty namespaces list
+ means "this pod's namespace". An empty selector
+ ({}) matches all namespaces. This field is beta-level
+ and is only honored when PodAffinityNamespaceSelector
+ feature is enabled.
+ 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
namespaces:
- description: namespaces specifies which namespaces
- the labelSelector applies to (matches against);
- null or empty list means "this pod's namespace"
+ description: namespaces specifies a static list
+ of namespace names that the term applies to. The
+ term is applied to the union of the namespaces
+ listed in this field and the ones selected by
+ namespaceSelector. null or empty namespaces list
+ and null namespaceSelector means "this pod's namespace"
items:
type: string
type: array
@@ -3224,13 +3780,14 @@ spec:
type: string
value:
description: 'Variable references $(VAR_NAME) are expanded
- using the previous defined environment variables in the
- container and any service environment variables. If a
- variable cannot be resolved, the reference in the input
- string will be unchanged. The $(VAR_NAME) syntax can be
- escaped with a double $$, ie: $$(VAR_NAME). Escaped references
- will never be expanded, regardless of whether the variable
- exists or not. Defaults to "".'
+ using the previously defined environment variables in
+ the container and any service environment variables. If
+ a variable cannot be resolved, the reference in the input
+ string will be unchanged. Double $$ are reduced to a single
+ $, which allows for escaping the $(VAR_NAME) syntax: i.e.
+ "$$(VAR_NAME)" will produce the string literal "$(VAR_NAME)".
+ Escaped references will never be expanded, regardless
+ of whether the variable exists or not. Defaults to "".'
type: string
valueFrom:
description: Source for the environment variable's value.
@@ -3359,7 +3916,7 @@ spec:
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.io/docs/concepts/configuration/manage-compute-resources-container/'
+ resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
@@ -3371,7 +3928,7 @@ spec:
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. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ to an implementation-defined value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
securityContext:
@@ -3386,7 +3943,8 @@ spec:
bit is set (new files created in the volume will be owned
by FSGroup) 3. The permission bits are OR'd with rw-rw----
\n If unset, the Kubelet will not modify the ownership and
- permissions of any volume."
+ permissions of any volume. Note that this field cannot be
+ set when spec.os.name is windows."
format: int64
type: integer
fsGroupChangePolicy:
@@ -3396,14 +3954,16 @@ spec:
support fsGroup based ownership(and permissions). It will
have no effect on ephemeral volume types such as: secret,
configmaps and emptydir. Valid values are "OnRootMismatch"
- and "Always". If not specified defaults to "Always".'
+ and "Always". If not specified, "Always" is used. Note that
+ this field cannot be set when spec.os.name is windows.'
type: string
runAsGroup:
description: The GID to run the entrypoint of the container
process. Uses runtime default if unset. May also be set
in SecurityContext. If set in both SecurityContext and
PodSecurityContext, the value specified in SecurityContext
- takes precedence for that container.
+ takes precedence for that container. Note that this field
+ cannot be set when spec.os.name is windows.
format: int64
type: integer
runAsNonRoot:
@@ -3421,6 +3981,8 @@ spec:
unspecified. May also be set in SecurityContext. If set
in both SecurityContext and PodSecurityContext, the value
specified in SecurityContext takes precedence for that container.
+ Note that this field cannot be set when spec.os.name is
+ windows.
format: int64
type: integer
seLinuxOptions:
@@ -3429,7 +3991,8 @@ spec:
SELinux context for each container. May also be set in
SecurityContext. If set in both SecurityContext and PodSecurityContext,
the value specified in SecurityContext takes precedence
- for that container.
+ for that container. Note that this field cannot be set when
+ spec.os.name is windows.
properties:
level:
description: Level is SELinux level label that applies
@@ -3450,7 +4013,8 @@ spec:
type: object
seccompProfile:
description: The seccomp options to use by the containers
- in this pod.
+ in this pod. Note that this field cannot be set when spec.os.name
+ is windows.
properties:
localhostProfile:
description: localhostProfile indicates a profile defined
@@ -3473,6 +4037,8 @@ spec:
description: A list of groups applied to the first process
run in each container, in addition to the container's primary
GID. If unspecified, no groups will be added to any container.
+ Note that this field cannot be set when spec.os.name is
+ windows.
items:
format: int64
type: integer
@@ -3480,7 +4046,8 @@ spec:
sysctls:
description: Sysctls hold a list of namespaced sysctls used
for the pod. Pods with unsupported sysctls (by the container
- runtime) might fail to launch.
+ runtime) might fail to launch. Note that this field cannot
+ be set when spec.os.name is windows.
items:
description: Sysctl defines a kernel parameter to be set
properties:
@@ -3500,7 +4067,8 @@ spec:
containers. If unspecified, the options within a container's
SecurityContext will be used. If set in both SecurityContext
and PodSecurityContext, the value specified in SecurityContext
- takes precedence.
+ takes precedence. Note that this field cannot be set when
+ spec.os.name is linux.
properties:
gmsaCredentialSpec:
description: GMSACredentialSpec is where the GMSA admission
@@ -3512,6 +4080,18 @@ spec:
description: GMSACredentialSpecName is the name of the
GMSA credential spec to use.
type: string
+ hostProcess:
+ description: HostProcess determines if a container should
+ be run as a 'Host Process' container. This field is
+ alpha-level and will only be honored by components that
+ enable the WindowsHostProcessContainers feature flag.
+ Setting this field without the feature flag will result
+ in errors when validating the Pod. All of a Pod's containers
+ must have the same effective HostProcess value (it is
+ not allowed to have a mix of HostProcess containers
+ and non-HostProcess containers). In addition, if HostProcess
+ is true then HostNetwork must also be set to true.
+ type: boolean
runAsUserName:
description: The UserName in Windows to run the entrypoint
of the container process. Defaults to the user specified
@@ -3601,10 +4181,10 @@ spec:
services.
type: string
protocol:
+ default: TCP
description: Protocol for port. Must be UDP, TCP, or SCTP. Defaults
to "TCP".
type: string
- default: TCP
required:
- containerPort
type: object
@@ -3674,7 +4254,9 @@ spec:
StorageType is Persistence storage
type: string
triggerRollingRestart:
- description: if set to true, triggers a cluster restart. this value should be set to false by the operator once the restart completes for all pods.
+ description: TriggerRollingRestart if set to true will instruct operator
+ to restart all the pods in the zookeeper cluster, after which this
+ value will be set to false
type: boolean
volumeMounts:
description: VolumeMounts defines to support customized volumeMounts
@@ -4098,14 +4680,14 @@ spec:
type: object
ephemeral:
description: "Ephemeral represents a volume that is handled
- by a cluster storage driver (Alpha feature). The volume's
- lifecycle is tied to the pod that defines it - it will be
- created before the pod starts, and deleted when the pod is
- removed. \n Use this if: a) the volume is only needed while
- the pod runs, b) features of normal volumes like restoring
- from snapshot or capacity tracking are needed, c) the storage
- driver is specified through a storage class, and d) the storage
- driver supports dynamic volume provisioning through a PersistentVolumeClaim
+ by a cluster storage driver. The volume's lifecycle is tied
+ to the pod that defines it - it will be created before the
+ pod starts, and deleted when the pod is removed. \n Use this
+ if: a) the volume is only needed while the pod runs, b) features
+ of normal volumes like restoring from snapshot or capacity
+ \ tracking are needed, c) the storage driver is specified
+ through a storage class, and d) the storage driver supports
+ dynamic volume provisioning through a PersistentVolumeClaim
(see EphemeralVolumeSource for more information on the
connection between this volume type and PersistentVolumeClaim).
\n Use PersistentVolumeClaim or one of the vendor-specific
@@ -4116,10 +4698,6 @@ spec:
pod can use both types of ephemeral volumes and persistent
volumes at the same time."
properties:
- readOnly:
- description: Specifies a read-only configuration for the
- volume. Defaults to false (read/write).
- type: boolean
volumeClaimTemplate:
description: "Will be used to create a stand-alone PVC to
provision the volume. The pod in which this EphemeralVolumeSource
@@ -4160,20 +4738,59 @@ spec:
type: array
dataSource:
description: 'This field can be used to specify
- either: * An existing VolumeSnapshot object (snapshot.storage.k8s.io/VolumeSnapshot
- - Beta) * An existing PVC (PersistentVolumeClaim)
- * An existing custom resource/object that implements
- data population (Alpha) In order to use VolumeSnapshot
- object types, the appropriate feature gate must
- be enabled (VolumeSnapshotDataSource or AnyVolumeDataSource)
- 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. If the specified data source is not
- supported, the volume will not be created and
- the failure will be reported as an event. In the
- future, we plan to support more data source types
- and the behavior of the provisioner may change.'
+ 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. If the AnyVolumeDataSource feature
+ gate is enabled, this field will always have the
+ same contents as the DataSourceRef field.'
+ properties:
+ apiGroup:
+ 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
+ type: string
+ name:
+ description: Name is the name of resource being
+ referenced
+ type: string
+ required:
+ - kind
+ - name
+ type: object
+ dataSourceRef:
+ description: 'Specifies the object from which to
+ populate the volume with data, if a non-empty
+ volume is desired. This may be any local 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, 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. There are two 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.
+ (Alpha) Using this field requires the AnyVolumeDataSource
+ feature gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for the resource
@@ -4196,7 +4813,11 @@ spec:
type: object
resources:
description: 'Resources represents the minimum resources
- the volume should have. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#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:
limits:
additionalProperties:
@@ -4206,7 +4827,7 @@ spec:
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.io/docs/concepts/configuration/manage-compute-resources-container/'
+ of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
requests:
additionalProperties:
@@ -4220,7 +4841,7 @@ spec:
is omitted for a container, it defaults to
Limits if that is explicitly specified, otherwise
to an implementation-defined value. More info:
- https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
+ https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object
type: object
selector:
@@ -4876,8 +5497,6 @@ spec:
type: object
type: object
type: array
- required:
- - sources
type: object
quobyte:
description: Quobyte represents a Quobyte mount on the host
@@ -5230,3 +5849,9 @@ spec:
storage: true
subresources:
status: {}
+status:
+ acceptedNames:
+ kind: ""
+ plural: ""
+ conditions: []
+ storedVersions: []
diff --git a/controllers/zk_api/zkcluster.go b/controllers/zk_api/zkcluster.go
index 57ae4d7..aadd1ca 100644
--- a/controllers/zk_api/zkcluster.go
+++ b/controllers/zk_api/zkcluster.go
@@ -26,7 +26,7 @@ const (
// DefaultZkContainerVersion is the default tag used for for the zookeeper
// container
- DefaultZkContainerVersion = "0.2.13"
+ DefaultZkContainerVersion = "0.2.14"
// DefaultZkContainerPolicy is the default container pull policy used
DefaultZkContainerPolicy = "Always"
@@ -156,6 +156,11 @@ type ZookeeperClusterSpec struct {
// for the zookeeper pods.
// +optional
Probes *Probes `json:"probes,omitempty"`
+
+ // MaxUnavailableReplicas defines the
+ // MaxUnavailable Replicas in pdb.
+ // Default is 1.
+ MaxUnavailableReplicas int32 `json:"maxUnavailableReplicas,omitempty"`
}
type Probes struct {
@@ -282,6 +287,10 @@ func (s *ZookeeperClusterSpec) withDefaults(z *ZookeeperCluster) (changed bool)
changed = true
}
}
+ if s.MaxUnavailableReplicas < 1 {
+ s.MaxUnavailableReplicas = 1
+ changed = true
+ }
return changed
}
@@ -314,7 +323,6 @@ type Probe struct {
// +kubebuilder:printcolumn:name="Internal Endpoint",type=string,JSONPath=`.status.internalClientEndpoint`,description="Client endpoint internal to cluster network"
// +kubebuilder:printcolumn:name="External Endpoint",type=string,JSONPath=`.status.externalClientEndpoint`,description="Client endpoint external to cluster network via LoadBalancer"
// +kubebuilder:printcolumn:name="Age",type=date,JSONPath=`.metadata.creationTimestamp`
-// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
// +k8s:openapi-gen=true
// ZookeeperCluster is the Schema for the zookeeperclusters API
@@ -775,7 +783,8 @@ const (
VolumeReclaimPolicyDelete VolumeReclaimPolicy = "Delete"
)
-//+kubebuilder:object:root=true
+// +kubebuilder:object:root=true
+
// ZookeeperClusterList contains a list of ZookeeperCluster
type ZookeeperClusterList struct {
metav1.TypeMeta `json:",inline"`
diff --git a/docs/development.md b/docs/development.md
index abf23e3..59bc4a0 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -41,7 +41,7 @@ It is optional, however, as described in the [Zookeeper Reference](solr-cloud/so
```bash
helm repo add pravega https://charts.pravega.io
-helm install zookeeper-operator pravega/zookeeper-operator --version 0.2.13
+helm install zookeeper-operator pravega/zookeeper-operator --version 0.2.14
```
Install necessary dependencies for building and deploying the operator.
diff --git a/docs/upgrade-notes.md b/docs/upgrade-notes.md
index 87af161..aa1dd33 100644
--- a/docs/upgrade-notes.md
+++ b/docs/upgrade-notes.md
@@ -112,7 +112,7 @@ _Note that the Helm chart version does not contain a `v` prefix, which the downl
This will not affect any existing resources, as default versions are hard-written to the resources immediately.
Only new resources created after the Solr Operator is upgraded to `v0.6.0` will be affected.
-- The required version of the [Zookeeper Operator](https://github.com/pravega/zookeeper-operator) to use with this version has been upgraded from `v0.2.12` to `v0.2.13`.
+- The required version of the [Zookeeper Operator](https://github.com/pravega/zookeeper-operator) to use with this version has been upgraded from `v0.2.12` to `v0.2.14`.
If you use the Solr Operator helm chart, then by default the new version of the Zookeeper Operator will be installed as well.
Refer to the helm chart documentation if you want to manage the Zookeeper Operator installation yourself.
Please refer to the [Zookeeper Operator release notes](https://github.com/pravega/zookeeper-operator/releases) before upgrading.
diff --git a/hack/headers/zookeeper-operator-header.yaml.txt b/hack/headers/zookeeper-operator-header.yaml.txt
index 223c088..cb39d05 100644
--- a/hack/headers/zookeeper-operator-header.yaml.txt
+++ b/hack/headers/zookeeper-operator-header.yaml.txt
@@ -6,4 +6,4 @@
#
# http://www.apache.org/licenses/LICENSE-2.0
#
-# Find source at: https://github.com/pravega/zookeeper-operator/tree/v0.2.13
\ No newline at end of file
+# Find source at: https://github.com/pravega/zookeeper-operator/tree/v0.2.14
\ No newline at end of file
diff --git a/hack/zk-operator/update-crd.sh b/hack/zk-operator/update-crd.sh
index cbe955a..6bf018b 100755
--- a/hack/zk-operator/update-crd.sh
+++ b/hack/zk-operator/update-crd.sh
@@ -27,9 +27,8 @@ ZK_OP_VERSION="$(cat versions.props | grep -E 'zookeeper-operator' | grep -o 'v[
{
cat hack/headers/zookeeper-operator-header.yaml.txt;
printf "\n\n---\n"
- curl -sL "https://raw.githubusercontent.com/pravega/zookeeper-operator/${ZK_OP_VERSION}/deploy/crds/zookeeper.pravega.io_zookeeperclusters_crd.yaml" \
- | sed -e "/^ name: zookeeperclusters.zookeeper.pravega.io$/a \\
- annotations:\\
+ curl -sL "https://raw.githubusercontent.com/pravega/zookeeper-operator/${ZK_OP_VERSION}/config/crd/bases/zookeeper.pravega.io_zookeeperclusters.yaml" \
+ | sed -e "/^ annotations:$/a \\
operator.zookeeper.pravega.io\\/version: ${ZK_OP_VERSION}\\
argocd.argoproj.io\\/sync-options: Replace=true"
} > config/dependencies/zookeeper_cluster_crd.yaml
diff --git a/helm/solr-operator/Chart.yaml b/helm/solr-operator/Chart.yaml
index 0262e1c..992b453 100644
--- a/helm/solr-operator/Chart.yaml
+++ b/helm/solr-operator/Chart.yaml
@@ -36,7 +36,7 @@ maintainers:
icon: https://solr.apache.org/theme/images/identity/Solr_Logo_on_white.png
dependencies:
- name: 'zookeeper-operator'
- version: 0.2.13
+ version: 0.2.14
repository: https://charts.pravega.io
condition: zookeeper-operator.install
annotations:
@@ -62,14 +62,14 @@ annotations:
- name: Github PR
url: https://github.com/apache/solr-operator/pull/388
- kind: changed
- description: The required Zookeeper Operator version has been upgraded to v0.2.13
+ description: The required Zookeeper Operator version has been upgraded to v0.2.14
links:
- name: Github Issue
- url: https://github.com/apache/solr-operator/issues/396
+ url: https://github.com/apache/solr-operator/issues/443
- name: Github PR
- url: https://github.com/apache/solr-operator/pull/397
- - name: Zookeeper Operator v0.2.13 Release
- url: https://github.com/pravega/zookeeper-operator/releases/tag/v0.2.13
+ url: https://github.com/apache/solr-operator/pull/449
+ - name: Zookeeper Operator v0.2.14 Release
+ url: https://github.com/pravega/zookeeper-operator/releases/tag/v0.2.14
- kind: changed
description: Loosen requirement on GCS backup credential/secret. Can now be omitted if using GKE's Workload Identity.
links:
diff --git a/helm/solr-operator/README.md b/helm/solr-operator/README.md
index 5620bf4..429a1c7 100644
--- a/helm/solr-operator/README.md
+++ b/helm/solr-operator/README.md
@@ -19,7 +19,7 @@ There may be breaking changes between the version you are running and the versio
Before installing the Solr Operator, we need to install the [Zookeeper Operator](https://github.com/pravega/zookeeper-operator).
This is because the Solr Operator, in most instances, relies on the Zookeeper Operator to create the Zookeeper clusters that Solr coordinates through.
-The Solr Operator helm chart has a conditional dependency on the [official Zookeeper Operator helm chart](https://github.com/pravega/zookeeper-operator/tree/v0.2.13/charts/zookeeper-operator#installing-the-chart),
+The Solr Operator helm chart has a conditional dependency on the [official Zookeeper Operator helm chart](https://github.com/pravega/zookeeper-operator/tree/v0.2.14/charts/zookeeper-operator#installing-the-chart),
which is enabled **by default**.
If you wish to manage the installation of the Zookeeper Operator yourself, set:
@@ -192,7 +192,7 @@ The command removes all the Kubernetes components associated with the chart and
### Configuring the Zookeeper Operator
-If you have `zookeeper-operator.install` set to `true`, which is the default behavior, then you can use the [Zookeeper Operator Chart values](https://github.com/pravega/zookeeper-operator/tree/v0.2.13/charts/zookeeper-operator#configuration).
+If you have `zookeeper-operator.install` set to `true`, which is the default behavior, then you can use the [Zookeeper Operator Chart values](https://github.com/pravega/zookeeper-operator/tree/v0.2.14/charts/zookeeper-operator#configuration).
You must prefix every Zookeeper Operator configuration with `zookeeper-operator.`, in order for it to be used.
For example:
diff --git a/versions.props b/versions.props
index 6f5a7d5..559dfca 100644
--- a/versions.props
+++ b/versions.props
@@ -1 +1 @@
-zookeeper-operator = v0.2.13
+zookeeper-operator = v0.2.14