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

Cndr liveness #218

Merged
merged 3 commits into from
Dec 24, 2023
Merged

Cndr liveness #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fa04e1a
Fix cndr liveness.
sergeykostov Dec 22, 2023
1009e2e
Merge pull request #217 from sergeykostov/skostov-fix-cndr-liveness
BenRub Dec 24, 2023
68f2071
Update specs with cndr probes
Dec 24, 2023
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
2 changes: 1 addition & 1 deletion api/v1/cndr_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ type CBContainersCndrSensorSpec struct {
Image CBContainersImageSpec `json:"image,omitempty"`
// +kubebuilder:default:={requests: {memory: "64Mi", cpu: "30m"}, limits: {memory: "1024Mi", cpu: "500m"}}
Resources coreV1.ResourceRequirements `json:"resources,omitempty"`
// +kubebuilder:default:={initialDelaySeconds: 45, timeoutSeconds: 5, periodSeconds: 30, successThreshold: 1, failureThreshold: 3, readinessPath: "/tmp/ready", livenessPath: "/tmp/alive" }
// +kubebuilder:default:={initialDelaySeconds: 240, timeoutSeconds: 1, periodSeconds: 30, successThreshold: 1, failureThreshold: 5, readinessPath: "/tmp/ready", livenessPath: "/tmp/alive" }
Probes CBContainersFileProbesSpec `json:"probes,omitempty"`
// +kubebuilder:default:={port: 7071}
Prometheus CBContainersPrometheusSpec `json:"prometheus,omitempty"`
Expand Down
1 change: 1 addition & 0 deletions api/v1/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.

1 change: 1 addition & 0 deletions charts/cbcontainers-agent/cbcontainers-agent-chart/example-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,6 @@ components:
enabled: false
cndr:
enabled: true
probes: {}
# accessTokenSecretName is the name of the Kubernetes object of type Secret that holds the values of the Company Code
companyCodeSecretName: "my-company-code-secret-name"
37 changes: 37 additions & 0 deletions charts/cbcontainers-operator/cbcontainers-operator-chart/templates/operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4837,6 +4837,43 @@ spec:
type: string
default: {}
type: object
probes:
default:
failureThreshold: 5
initialDelaySeconds: 240
livenessPath: /tmp/alive
periodSeconds: 30
readinessPath: /tmp/ready
successThreshold: 1
timeoutSeconds: 1
properties:
failureThreshold:
default: 3
format: int32
type: integer
initialDelaySeconds:
default: 3
format: int32
type: integer
livenessPath:
default: /tmp/alive
type: string
periodSeconds:
default: 30
format: int32
type: integer
readinessPath:
default: /tmp/ready
type: string
successThreshold:
default: 1
format: int32
type: integer
timeoutSeconds:
default: 1
format: int32
type: integer
type: object
prometheus:
default:
port: 7071
Expand Down
37 changes: 37 additions & 0 deletions config/crd/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4827,6 +4827,43 @@ spec:
type: string
default: {}
type: object
probes:
default:
failureThreshold: 5
initialDelaySeconds: 240
livenessPath: /tmp/alive
periodSeconds: 30
readinessPath: /tmp/ready
successThreshold: 1
timeoutSeconds: 1
properties:
failureThreshold:
default: 3
format: int32
type: integer
initialDelaySeconds:
default: 3
format: int32
type: integer
livenessPath:
default: /tmp/alive
type: string
periodSeconds:
default: 30
format: int32
type: integer
readinessPath:
default: /tmp/ready
type: string
successThreshold:
default: 1
format: int32
type: integer
timeoutSeconds:
default: 1
format: int32
type: integer
type: object
prometheus:
default:
port: 7071
Expand Down
22 changes: 22 additions & 0 deletions config/crd_v1beta1/bases/operator.containers.carbonblack.io_cbcontainersagents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4472,6 +4472,28 @@ spec:
additionalProperties:
type: string
type: object
probes:
properties:
failureThreshold:
format: int32
type: integer
initialDelaySeconds:
format: int32
type: integer
livenessPath:
type: string
periodSeconds:
format: int32
type: integer
readinessPath:
type: string
successThreshold:
format: int32
type: integer
timeoutSeconds:
format: int32
type: integer
type: object
prometheus:
properties:
enabled:
Expand Down
Loading