Skip to content

Commit c72c44b

Browse files
HoustonPutmanHoustonPutman
authored
Upgrade dependencies (apache#633)
1 parent c553d94 commit c72c44b

File tree

8 files changed

+741
-434
lines changed

8 files changed

+741
-434
lines changed

‎config/crd/bases/solr.apache.org_solrclouds.yaml

Lines changed: 127 additions & 57 deletions
Large diffs are not rendered by default.

‎config/crd/bases/solr.apache.org_solrprometheusexporters.yaml

Lines changed: 63 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -2100,6 +2100,28 @@ spec:
21002100
exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
21012101
type: object
21022102
type: object
2103+
restartPolicy:
2104+
description: 'RestartPolicy defines the restart behavior
2105+
of individual containers in a pod. This field may
2106+
only be set for init containers, and the only allowed
2107+
value is "Always". For non-init containers or when
2108+
this field is not specified, the restart behavior
2109+
is defined by the Pod''s restart policy and the container
2110+
type. Setting the RestartPolicy as "Always" for the
2111+
init container will have the following effect: this
2112+
init container will be continually restarted on exit
2113+
until all regular containers have terminated. Once
2114+
all regular containers have completed, all init containers
2115+
with restartPolicy "Always" will be shut down. This
2116+
lifecycle differs from normal init containers and
2117+
is often referred to as a "sidecar" container. Although
2118+
this init container still starts in the init container
2119+
sequence, it does not wait for the container to complete
2120+
before proceeding to the next init container. Instead,
2121+
the next init container starts immediately after this
2122+
init container is started, or after any startupProbe
2123+
has successfully completed.'
2124+
type: string
21032125
securityContext:
21042126
description: 'SecurityContext defines the security options
21052127
the container should be run with. If set, the fields
@@ -2229,7 +2251,8 @@ spec:
22292251
The profile must be preconfigured on the node
22302252
to work. Must be a descending path, relative
22312253
to the kubelet's configured seccomp profile
2232-
location. Must only be set if type is "Localhost".
2254+
location. Must be set if type is "Localhost".
2255+
Must NOT be set for any other type.
22332256
type: string
22342257
type:
22352258
description: "type indicates which kind of seccomp
@@ -2265,14 +2288,10 @@ spec:
22652288
hostProcess:
22662289
description: HostProcess determines if a container
22672290
should be run as a 'Host Process' container.
2268-
This field is alpha-level and will only be
2269-
honored by components that enable the WindowsHostProcessContainers
2270-
feature flag. Setting this field without the
2271-
feature flag will result in errors when validating
2272-
the Pod. All of a Pod's containers must have
2273-
the same effective HostProcess value (it is
2274-
not allowed to have a mix of HostProcess containers
2275-
and non-HostProcess containers). In addition,
2291+
All of a Pod's containers must have the same
2292+
effective HostProcess value (it is not allowed
2293+
to have a mix of HostProcess containers and
2294+
non-HostProcess containers). In addition,
22762295
if HostProcess is true then HostNetwork must
22772296
also be set to true.
22782297
type: boolean
@@ -3029,8 +3048,9 @@ spec:
30293048
defined in a file on the node should be used. The
30303049
profile must be preconfigured on the node to work.
30313050
Must be a descending path, relative to the kubelet's
3032-
configured seccomp profile location. Must only be
3033-
set if type is "Localhost".
3051+
configured seccomp profile location. Must be set
3052+
if type is "Localhost". Must NOT be set for any
3053+
other type.
30343054
type: string
30353055
type:
30363056
description: "type indicates which kind of seccomp
@@ -3098,15 +3118,11 @@ spec:
30983118
type: string
30993119
hostProcess:
31003120
description: HostProcess determines if a container
3101-
should be run as a 'Host Process' container. This
3102-
field is alpha-level and will only be honored by
3103-
components that enable the WindowsHostProcessContainers
3104-
feature flag. Setting this field without the feature
3105-
flag will result in errors when validating the Pod.
3106-
All of a Pod's containers must have the same effective
3121+
should be run as a 'Host Process' container. All
3122+
of a Pod's containers must have the same effective
31073123
HostProcess value (it is not allowed to have a mix
3108-
of HostProcess containers and non-HostProcess containers). In
3109-
addition, if HostProcess is true then HostNetwork
3124+
of HostProcess containers and non-HostProcess containers).
3125+
In addition, if HostProcess is true then HostNetwork
31103126
must also be set to true.
31113127
type: boolean
31123128
runAsUserName:
@@ -4208,6 +4224,28 @@ spec:
42084224
exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
42094225
type: object
42104226
type: object
4227+
restartPolicy:
4228+
description: 'RestartPolicy defines the restart behavior
4229+
of individual containers in a pod. This field may
4230+
only be set for init containers, and the only allowed
4231+
value is "Always". For non-init containers or when
4232+
this field is not specified, the restart behavior
4233+
is defined by the Pod''s restart policy and the container
4234+
type. Setting the RestartPolicy as "Always" for the
4235+
init container will have the following effect: this
4236+
init container will be continually restarted on exit
4237+
until all regular containers have terminated. Once
4238+
all regular containers have completed, all init containers
4239+
with restartPolicy "Always" will be shut down. This
4240+
lifecycle differs from normal init containers and
4241+
is often referred to as a "sidecar" container. Although
4242+
this init container still starts in the init container
4243+
sequence, it does not wait for the container to complete
4244+
before proceeding to the next init container. Instead,
4245+
the next init container starts immediately after this
4246+
init container is started, or after any startupProbe
4247+
has successfully completed.'
4248+
type: string
42114249
securityContext:
42124250
description: 'SecurityContext defines the security options
42134251
the container should be run with. If set, the fields
@@ -4337,7 +4375,8 @@ spec:
43374375
The profile must be preconfigured on the node
43384376
to work. Must be a descending path, relative
43394377
to the kubelet's configured seccomp profile
4340-
location. Must only be set if type is "Localhost".
4378+
location. Must be set if type is "Localhost".
4379+
Must NOT be set for any other type.
43414380
type: string
43424381
type:
43434382
description: "type indicates which kind of seccomp
@@ -4373,14 +4412,10 @@ spec:
43734412
hostProcess:
43744413
description: HostProcess determines if a container
43754414
should be run as a 'Host Process' container.
4376-
This field is alpha-level and will only be
4377-
honored by components that enable the WindowsHostProcessContainers
4378-
feature flag. Setting this field without the
4379-
feature flag will result in errors when validating
4380-
the Pod. All of a Pod's containers must have
4381-
the same effective HostProcess value (it is
4382-
not allowed to have a mix of HostProcess containers
4383-
and non-HostProcess containers). In addition,
4415+
All of a Pod's containers must have the same
4416+
effective HostProcess value (it is not allowed
4417+
to have a mix of HostProcess containers and
4418+
non-HostProcess containers). In addition,
43844419
if HostProcess is true then HostNetwork must
43854420
also be set to true.
43864421
type: boolean

‎controllers/solrcloud_controller.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -402,9 +402,6 @@ func (r *SolrCloudReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
402402
}
403403
statefulSet = foundStatefulSet
404404
}
405-
if err != nil {
406-
return requeueOrNot, err
407-
}
408405
} else {
409406
// If we are blocking the reconciliation of the statefulSet, we still want to find information about it.
410407
err = r.Get(ctx, types.NamespacedName{Name: instance.StatefulSetName(), Namespace: instance.Namespace}, statefulSet)
@@ -416,6 +413,9 @@ func (r *SolrCloudReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
416413
}
417414
}
418415
}
416+
if err != nil {
417+
return requeueOrNot, err
418+
}
419419

420420
// *********************************************************
421421
// The operations after this require a statefulSet to exist,
@@ -428,7 +428,7 @@ func (r *SolrCloudReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
428428
// Do not reconcile the storage finalizer unless we have PVC Labels that we know the Solr data PVCs are using.
429429
// Otherwise it will delete all PVCs possibly
430430
if len(statefulSet.Spec.Selector.MatchLabels) > 0 {
431-
if err := r.reconcileStorageFinalizer(ctx, instance, statefulSet.Spec.Selector.MatchLabels, logger); err != nil {
431+
if err = r.reconcileStorageFinalizer(ctx, instance, statefulSet.Spec.Selector.MatchLabels, logger); err != nil {
432432
logger.Error(err, "Cannot delete PVCs while garbage collecting after deletion.")
433433
updateRequeueAfter(&requeueOrNot, time.Second*15)
434434
}

0 commit comments

Comments
 (0)