Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump default to humio/humio-core:1.153.1 and add EnableZoneAwareness … #860

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump default to humio/humio-core:1.153.1 and add EnableZoneAwareness … #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8666642
Bump default to humio/humio-core:1.153.1 and add EnableZoneAwareness …
SaaldjorMike Sep 26, 2024
b7922da
Filter out pods without nodeName before fetching zone for the nodeName.
SaaldjorMike Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ test: manifests generate fmt vet ginkgo ## Run tests.
go install sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
$(SHELL) -c "\
eval \$$($(GOBIN)/setup-envtest use -p env ${TEST_K8S_VERSION}); \
export USE_CERTMANAGER=false; \
export TEST_USE_EXISTING_CLUSTER=false; \
export TEST_USING_ENVTEST=true; \
$(GINKGO) --label-filter=envtest -vv --no-color --procs 3 -output-dir=${PWD} -keep-separate-reports -race --junit-report=test-results-junit.xml --randomize-suites --randomize-all -timeout 10m ./... -covermode=count -coverprofile cover.out \
"

Expand Down
10 changes: 9 additions & 1 deletion api/v1alpha1/humiocluster_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,14 @@ type HumioUpdateStrategy struct {
// +kubebuilder:validation:Enum=OnDelete;RollingUpdate;ReplaceAllOnUpdate;RollingUpdateBestEffort
Type string `json:"type,omitempty"`

// The minimum time in seconds that a pod must be ready before the next pod can be deleted when doing rolling update.
// MinReadySeconds is the minimum time in seconds that a pod must be ready before the next pod can be deleted when doing rolling update.
MinReadySeconds int32 `json:"minReadySeconds,omitempty"`

// EnableZoneAwareness toggles zone awareness on or off during updates. When enabled, the pod replacement logic
// will go through all pods in a specific zone before it starts replacing pods in the next zone.
// If pods are failing, they bypass the zone limitation and are restarted immediately - ignoring the zone.
// Zone awareness is enabled by default.
EnableZoneAwareness *bool `json:"enableZoneAwareness,omitempty"`
}

type HumioNodePoolSpec struct {
Expand Down Expand Up @@ -384,6 +390,8 @@ type HumioNodePoolStatus struct {
State string `json:"state,omitempty"`
// DesiredPodRevision holds the desired pod revision for pods of the given node pool.
DesiredPodRevision int `json:"desiredPodRevision,omitempty"`
// ZoneUnderMaintenance holds the name of the availability zone currently under maintenance
ZoneUnderMaintenance string `json:"zoneUnderMaintenance,omitempty"`
}

// HumioClusterStatus defines the observed state of HumioCluster
Expand Down
7 changes: 6 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 24 additions & 5 deletions charts/humio-operator/crds/core.humio.com_humioclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13082,10 +13082,17 @@ spec:
UpdateStrategy controls how Humio pods are updated when changes are made to the HumioCluster resource that results
in a change to the Humio pods
properties:
enableZoneAwareness:
description: |-
EnableZoneAwareness toggles zone awareness on or off during updates. When enabled, the pod replacement logic
will go through all pods in a specific zone before it starts replacing pods in the next zone.
If pods are failing, they bypass the zone limitation and are restarted immediately - ignoring the zone.
Zone awareness is enabled by default.
type: boolean
minReadySeconds:
description: The minimum time in seconds that a pod
must be ready before the next pod can be deleted when
doing rolling update.
description: MinReadySeconds is the minimum time in
seconds that a pod must be ready before the next pod
can be deleted when doing rolling update.
format: int32
type: integer
type:
Expand Down Expand Up @@ -14987,9 +14994,17 @@ spec:
UpdateStrategy controls how Humio pods are updated when changes are made to the HumioCluster resource that results
in a change to the Humio pods
properties:
enableZoneAwareness:
description: |-
EnableZoneAwareness toggles zone awareness on or off during updates. When enabled, the pod replacement logic
will go through all pods in a specific zone before it starts replacing pods in the next zone.
If pods are failing, they bypass the zone limitation and are restarted immediately - ignoring the zone.
Zone awareness is enabled by default.
type: boolean
minReadySeconds:
description: The minimum time in seconds that a pod must be ready
before the next pod can be deleted when doing rolling update.
description: MinReadySeconds is the minimum time in seconds that
a pod must be ready before the next pod can be deleted when
doing rolling update.
format: int32
type: integer
type:
Expand Down Expand Up @@ -15062,6 +15077,10 @@ spec:
From there it can be "Running", "Upgrading", "Restarting"
or "Pending"
type: string
zoneUnderMaintenance:
description: ZoneUnderMaintenance holds the name of the availability
zone currently under maintenance
type: string
required:
- name
type: object
Expand Down
29 changes: 24 additions & 5 deletions config/crd/bases/core.humio.com_humioclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13082,10 +13082,17 @@ spec:
UpdateStrategy controls how Humio pods are updated when changes are made to the HumioCluster resource that results
in a change to the Humio pods
properties:
enableZoneAwareness:
description: |-
EnableZoneAwareness toggles zone awareness on or off during updates. When enabled, the pod replacement logic
will go through all pods in a specific zone before it starts replacing pods in the next zone.
If pods are failing, they bypass the zone limitation and are restarted immediately - ignoring the zone.
Zone awareness is enabled by default.
type: boolean
minReadySeconds:
description: The minimum time in seconds that a pod
must be ready before the next pod can be deleted when
doing rolling update.
description: MinReadySeconds is the minimum time in
seconds that a pod must be ready before the next pod
can be deleted when doing rolling update.
format: int32
type: integer
type:
Expand Down Expand Up @@ -14987,9 +14994,17 @@ spec:
UpdateStrategy controls how Humio pods are updated when changes are made to the HumioCluster resource that results
in a change to the Humio pods
properties:
enableZoneAwareness:
description: |-
EnableZoneAwareness toggles zone awareness on or off during updates. When enabled, the pod replacement logic
will go through all pods in a specific zone before it starts replacing pods in the next zone.
If pods are failing, they bypass the zone limitation and are restarted immediately - ignoring the zone.
Zone awareness is enabled by default.
type: boolean
minReadySeconds:
description: The minimum time in seconds that a pod must be ready
before the next pod can be deleted when doing rolling update.
description: MinReadySeconds is the minimum time in seconds that
a pod must be ready before the next pod can be deleted when
doing rolling update.
format: int32
type: integer
type:
Expand Down Expand Up @@ -15062,6 +15077,10 @@ spec:
From there it can be "Running", "Upgrading", "Restarting"
or "Pending"
type: string
zoneUnderMaintenance:
description: ZoneUnderMaintenance holds the name of the availability
zone currently under maintenance
type: string
required:
- name
type: object
Expand Down
Loading
Loading