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

Support RevisionHistoryLimit in Deployment and Daemonset for Elastic Agent #5790

Merged
merged 4 commits into from
Jun 20, 2022
Merged

Support RevisionHistoryLimit in Deployment and Daemonset for Elastic Agent #5790

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afdc8c6
feat: add revisionHistoryLimit
knechtionscoding Jun 16, 2022
9be6157
make generate
thbkrkr Jun 17, 2022
2ba001e
Update unit test
thbkrkr Jun 17, 2022
98fe076
Update pkg/apis/agent/v1alpha1/agent_types.go
thbkrkr Jun 17, 2022
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
6 changes: 6 additions & 0 deletions config/crds/v1/all-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ spec:
when created from a template
type: object
x-kubernetes-preserve-unknown-fields: true
revisionHistoryLimit:
format: int32
type: integer
updateStrategy:
description: DaemonSetUpdateStrategy is a struct used to control
the update strategy for a DaemonSet.
Expand Down Expand Up @@ -162,6 +165,9 @@ spec:
replicas:
format: int32
type: integer
revisionHistoryLimit:
format: int32
type: integer
strategy:
description: DeploymentStrategy describes how to replace existing
pods with new ones.
Expand Down
6 changes: 6 additions & 0 deletions config/crds/v1/bases/agent.k8s.elastic.co_agents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7548,6 +7548,9 @@ spec:
type: object
type: object
x-kubernetes-preserve-unknown-fields: true
revisionHistoryLimit:
format: int32
type: integer
updateStrategy:
description: DaemonSetUpdateStrategy is a struct used to control
the update strategy for a DaemonSet.
Expand Down Expand Up @@ -15093,6 +15096,9 @@ spec:
replicas:
format: int32
type: integer
revisionHistoryLimit:
format: int32
type: integer
strategy:
description: DeploymentStrategy describes how to replace existing
pods with new ones.
Expand Down
6 changes: 6 additions & 0 deletions deploy/eck-operator/charts/eck-operator-crds/templates/all-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ spec:
when created from a template
type: object
x-kubernetes-preserve-unknown-fields: true
revisionHistoryLimit:
format: int32
type: integer
updateStrategy:
description: DaemonSetUpdateStrategy is a struct used to control
the update strategy for a DaemonSet.
Expand Down Expand Up @@ -168,6 +171,9 @@ spec:
replicas:
format: int32
type: integer
revisionHistoryLimit:
format: int32
type: integer
strategy:
description: DeploymentStrategy describes how to replace existing
pods with new ones.
Expand Down
2 changes: 2 additions & 0 deletions docs/reference/api-docs.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ AgentSpec defines the desired state of the Agent
|===
| Field | Description
| *`podTemplate`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#podtemplatespec-v1-core[$$PodTemplateSpec$$]__ |
| *`revisionHistoryLimit`* __integer__ |
| *`updateStrategy`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#daemonsetupdatestrategy-v1-apps[$$DaemonSetUpdateStrategy$$]__ |
|===

Expand All @@ -130,6 +131,7 @@ AgentSpec defines the desired state of the Agent
| Field | Description
| *`podTemplate`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#podtemplatespec-v1-core[$$PodTemplateSpec$$]__ |
| *`replicas`* __integer__ |
| *`revisionHistoryLimit`* __integer__ |
| *`strategy`* __link:https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.20/#deploymentstrategy-v1-apps[$$DeploymentStrategy$$]__ |
|===

Expand Down
9 changes: 5 additions & 4 deletions pkg/apis/agent/v1alpha1/agent_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,18 @@ type Output struct {

type DaemonSetSpec struct {
// +kubebuilder:pruning:PreserveUnknownFields
PodTemplate corev1.PodTemplateSpec `json:"podTemplate,omitempty"`
PodTemplate corev1.PodTemplateSpec `json:"podTemplate,omitempty"`
RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty"`

// +kubebuilder:validation:Optional
UpdateStrategy appsv1.DaemonSetUpdateStrategy `json:"updateStrategy,omitempty"`
}

type DeploymentSpec struct {
// +kubebuilder:pruning:PreserveUnknownFields
PodTemplate corev1.PodTemplateSpec `json:"podTemplate,omitempty"`
Replicas *int32 `json:"replicas,omitempty"`

PodTemplate corev1.PodTemplateSpec `json:"podTemplate,omitempty"`
Replicas *int32 `json:"replicas,omitempty"`
RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty"`
thbkrkr marked this conversation as resolved.
Show resolved Hide resolved
// +kubebuilder:validation:Optional
Strategy appsv1.DeploymentStrategy `json:"strategy,omitempty"`
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/apis/agent/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.

2 changes: 1 addition & 1 deletion pkg/controller/agent/controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func TestReconcileAgent_Reconcile(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "testAgent-agent",
Namespace: "test",
Labels: addLabel(defaultLabels, hash.TemplateHashLabelName, "1678576940"),
Labels: addLabel(defaultLabels, hash.TemplateHashLabelName, "3363336355"),
},
Status: appsv1.DeploymentStatus{
AvailableReplicas: 1,
Expand Down
28 changes: 15 additions & 13 deletions pkg/controller/agent/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,14 @@ func reconcilePodVehicle(params Params, podTemplate corev1.PodTemplateSpec) (*re

func reconcileDeployment(rp ReconciliationParams) (int32, int32, error) {
d := deployment.New(deployment.Params{
Name: Name(rp.agent.Name),
Namespace: rp.agent.Namespace,
Selector: NewLabels(rp.agent),
Labels: NewLabels(rp.agent),
PodTemplateSpec: rp.podTemplate,
Replicas: pointer.Int32OrDefault(rp.agent.Spec.Deployment.Replicas, int32(1)),
Strategy: rp.agent.Spec.Deployment.Strategy,
Name: Name(rp.agent.Name),
Namespace: rp.agent.Namespace,
Selector: NewLabels(rp.agent),
Labels: NewLabels(rp.agent),
PodTemplateSpec: rp.podTemplate,
Replicas: pointer.Int32OrDefault(rp.agent.Spec.Deployment.Replicas, int32(1)),
RevisionHistoryLimit: pointer.Int32OrDefault(rp.agent.Spec.Deployment.RevisionHistoryLimit, int32(10)),
Strategy: rp.agent.Spec.Deployment.Strategy,
})
if err := controllerutil.SetControllerReference(&rp.agent, &d, scheme.Scheme); err != nil {
return 0, 0, err
Expand All @@ -110,12 +111,13 @@ func reconcileDeployment(rp ReconciliationParams) (int32, int32, error) {

func reconcileDaemonSet(rp ReconciliationParams) (int32, int32, error) {
ds := daemonset.New(daemonset.Params{
PodTemplate: rp.podTemplate,
Name: Name(rp.agent.Name),
Owner: &rp.agent,
Labels: NewLabels(rp.agent),
Selectors: NewLabels(rp.agent),
Strategy: rp.agent.Spec.DaemonSet.UpdateStrategy,
PodTemplate: rp.podTemplate,
Name: Name(rp.agent.Name),
Owner: &rp.agent,
Labels: NewLabels(rp.agent),
Selectors: NewLabels(rp.agent),
RevisionHistoryLimit: pointer.Int32OrDefault(rp.agent.Spec.DaemonSet.RevisionHistoryLimit, int32(10)),
Strategy: rp.agent.Spec.DaemonSet.UpdateStrategy,
})

if err := controllerutil.SetControllerReference(&rp.agent, &ds, scheme.Scheme); err != nil {
Expand Down
18 changes: 10 additions & 8 deletions pkg/controller/common/daemonset/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ import (
)

type Params struct {
PodTemplate corev1.PodTemplateSpec
Name string
Owner metav1.Object
Labels map[string]string
Selectors map[string]string
Strategy appsv1.DaemonSetUpdateStrategy
PodTemplate corev1.PodTemplateSpec
Name string
Owner metav1.Object
Labels map[string]string
Selectors map[string]string
RevisionHistoryLimit int32
Strategy appsv1.DaemonSetUpdateStrategy
}

func New(params Params) appsv1.DaemonSet {
Expand All @@ -37,8 +38,9 @@ func New(params Params) appsv1.DaemonSet {
Selector: &metav1.LabelSelector{
MatchLabels: params.Selectors,
},
Template: params.PodTemplate,
UpdateStrategy: params.Strategy,
Template: params.PodTemplate,
RevisionHistoryLimit: &params.RevisionHistoryLimit,
UpdateStrategy: params.Strategy,
},
}
}
Expand Down
22 changes: 9 additions & 13 deletions pkg/controller/common/deployment/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,18 @@ import (
"github.com/elastic/cloud-on-k8s/pkg/controller/common/hash"
"github.com/elastic/cloud-on-k8s/pkg/controller/common/reconciler"
"github.com/elastic/cloud-on-k8s/pkg/utils/k8s"
"github.com/elastic/cloud-on-k8s/pkg/utils/pointer"
)

var (
defaultRevisionHistoryLimit int32
)

// Params to specify a Deployment specification.
type Params struct {
Name string
Namespace string
Selector map[string]string
Labels map[string]string
PodTemplateSpec corev1.PodTemplateSpec
Replicas int32
Strategy appsv1.DeploymentStrategy
Name string
Namespace string
Selector map[string]string
Labels map[string]string
PodTemplateSpec corev1.PodTemplateSpec
Replicas int32
RevisionHistoryLimit int32
Strategy appsv1.DeploymentStrategy
}

// New creates a Deployment from the given params.
Expand All @@ -42,7 +38,7 @@ func New(params Params) appsv1.Deployment {
Labels: params.Labels,
},
Spec: appsv1.DeploymentSpec{
RevisionHistoryLimit: pointer.Int32(defaultRevisionHistoryLimit),
RevisionHistoryLimit: &params.RevisionHistoryLimit,
Selector: &metav1.LabelSelector{
MatchLabels: params.Selector,
},
Expand Down