Skip to content

Commit

Permalink
Merge pull request #27 from zong-zhe/add-deployment-strategy
Browse files Browse the repository at this point in the history
feat: add 'deploymentStrategy' to server
  • Loading branch information
zong-zhe authored Oct 24, 2024
2 parents 09bfec6 + b7b7fb2 commit f8aa544
Show file tree
Hide file tree
Showing 11 changed files with 102 additions and 5 deletions.
11 changes: 11 additions & 0 deletions examples/server/app_deployment_strategy/base/base.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import konfig.models.kube.frontend
import konfig.models.kube.frontend.container
import konfig.models.kube.templates.resource as res_tpl

# Application Configuration
appConfiguration: frontend.Server {
# Main Container Configuration
mainContainer = container.Main {}
schedulingStrategy.resource = res_tpl.tiny
image = "gcr.io/google-samples/gb-frontend:v4"
}
7 changes: 7 additions & 0 deletions examples/server/app_deployment_strategy/kcl.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[package]
name = "nginx-example"
version = "0.0.1"

[dependencies]
konfig = { path = "../../../../konfig" }
k8s = "1.28"
10 changes: 10 additions & 0 deletions examples/server/app_deployment_strategy/prod/kcl.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[package]
name = "app_stateful_set-prod"
version = "0.0.1"

[dependencies]
konfig = { path = "../../../../../konfig" }
k8s = "1.28"
[profile]
entries = ["../base/base.k", "main.k", "${konfig:KCL_MOD}/models/kube/render/render.k"]

13 changes: 13 additions & 0 deletions examples/server/app_deployment_strategy/prod/main.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import konfig.models.kube.frontend

# The application configuration in stack will overwrite
# the configuration with the same attribute in base.
appConfiguration: frontend.Server {
deploymentStrategy: {
type = "RollingUpdate"
rollingUpdate: {
maxSurge = 1
maxUnavailable = 1
}
}
}
4 changes: 2 additions & 2 deletions examples/server/app_need_namespace/prod/kcl.mod.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
version = "1.31.2"
[dependencies.konfig]
name = "konfig"
full_name = "konfig_0.10.0"
version = "0.10.0"
full_name = "konfig_0.11.0"
version = "0.11.0"
4 changes: 2 additions & 2 deletions examples/server/app_scheduling_strategy/prod/kcl.mod.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
version = "1.31.2"
[dependencies.konfig]
name = "konfig"
full_name = "konfig_0.10.0"
version = "0.10.0"
full_name = "konfig_0.11.0"
version = "0.11.0"
2 changes: 1 addition & 1 deletion kcl.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "konfig"
version = "0.10.0"
version = "0.11.0"

[dependencies]
k8s = "1.31.2"
2 changes: 2 additions & 0 deletions models/kube/backend/server_backend.k
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ schema ServerBackend[inputConfig: server.Server]:
serviceAccountName = config.serviceAccount.name
}
}
if config.deploymentStrategy:
strategy = config.deploymentStrategy
}
}

Expand Down
25 changes: 25 additions & 0 deletions models/kube/frontend/deployment/deployment_strategy.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"""
This is the deployment_strategy module in k8s.api.apps.v1 package.
This file was generated by the KCL auto-gen tool. DO NOT EDIT.
Editing this file might prove futile when you re-run the KCL auto-gen generate command.
"""


schema DeploymentStrategy:
"""
DeploymentStrategy describes how to replace existing pods with new ones.

Attributes
----------
rollingUpdate : RollingUpdateDeployment, default is Undefined, optional
Rolling update config params. Present only if DeploymentStrategyType = RollingUpdate.
$type : str, default is Undefined, optional
Type of deployment. Can be "Recreate" or "RollingUpdate". Default is RollingUpdate.
"""


rollingUpdate?: RollingUpdateDeployment

$type?: str


25 changes: 25 additions & 0 deletions models/kube/frontend/deployment/rolling_update_deployment.k
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
"""
This is the rolling_update_deployment module in k8s.api.apps.v1 package.
This file was generated by the KCL auto-gen tool. DO NOT EDIT.
Editing this file might prove futile when you re-run the KCL auto-gen generate command.
"""


schema RollingUpdateDeployment:
"""
Spec to control the desired behavior of rolling update.

Attributes
----------
maxSurge : int | str, default is Undefined, optional
The maximum number of pods that can be scheduled above the desired number of pods. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). This can not be 0 if MaxUnavailable is 0. Absolute number is calculated from percentage by rounding up. Defaults to 25%. Example: when this is set to 30%, the new ReplicaSet can be scaled up immediately when the rolling update starts, such that the total number of old and new pods do not exceed 130% of desired pods. Once old pods have been killed, new ReplicaSet can be scaled up further, ensuring that total number of pods running at any time during the update is at most 130% of desired pods.
maxUnavailable : int | str, default is Undefined, optional
The maximum number of pods that can be unavailable during the update. Value can be an absolute number (ex: 5) or a percentage of desired pods (ex: 10%). Absolute number is calculated from percentage by rounding down. This can not be 0 if MaxSurge is 0. Defaults to 25%. Example: when this is set to 30%, the old ReplicaSet can be scaled down to 70% of desired pods immediately when the rolling update starts. Once new pods are ready, old ReplicaSet can be scaled down further, followed by scaling up the new ReplicaSet, ensuring that the total number of pods available at all times during the update is at least 70% of desired pods.
"""


maxSurge?: int | str

maxUnavailable?: int | str


4 changes: 4 additions & 0 deletions models/kube/frontend/server.k
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import models.kube.frontend.volume
import models.kube.frontend.sidecar as s
import models.kube.frontend.strategy
import models.kube.frontend.storage
import models.kube.frontend.deployment

schema Server:
"""Server is abstaction of Deployment and StatefulSet.
Expand Down Expand Up @@ -151,3 +152,6 @@ schema Server:

# extra resources
extraResources?: {str: {str:}}

# Strategy for deployment
deploymentStrategy?: deployment.DeploymentStrategy

0 comments on commit f8aa544

Please sign in to comment.