Skip to content
Snippets Groups Projects
Commit 7bfd32fa authored by Remi  PLANEL's avatar Remi PLANEL
Browse files

Merge branch 'deploy-strategy' into 'dev'

Recreate deploy strategy

See merge request !11
parents 0969d950 c007dad3
No related branches found
No related tags found
1 merge request!11Recreate deploy strategy
Pipeline #112268 passed
...@@ -50,6 +50,8 @@ build:dev: ...@@ -50,6 +50,8 @@ build:dev:
variables: variables:
CI_DEBUG_TRACE: "true" CI_DEBUG_TRACE: "true"
TEAM_ID: "df" TEAM_ID: "df"
DEPLOY_STRATEGY: RollingUpdate
script: script:
- > - >
helm upgrade --install $CI_PROJECT_NAME-$CI_ENVIRONMENT_NAME ./deploy/df-wiki --namespace=${KUBE_NAMESPACE} helm upgrade --install $CI_PROJECT_NAME-$CI_ENVIRONMENT_NAME ./deploy/df-wiki --namespace=${KUBE_NAMESPACE}
...@@ -61,6 +63,7 @@ build:dev: ...@@ -61,6 +63,7 @@ build:dev:
--set image.repository="$CI_REGISTRY_IMAGE/$IMAGE_NAME" --set image.repository="$CI_REGISTRY_IMAGE/$IMAGE_NAME"
--set image.tag="$CI_COMMIT_SHORT_SHA" --set image.tag="$CI_COMMIT_SHORT_SHA"
--set image.pullPolicy='Always' --set image.pullPolicy='Always'
--set strategy.type="${DEPLOY_STRATEGY}"
--set env="$ENV" --set env="$ENV"
deploy:dev: deploy:dev:
...@@ -77,6 +80,7 @@ deploy:dev: ...@@ -77,6 +80,7 @@ deploy:dev:
AUTOSCALE: "true" AUTOSCALE: "true"
AUTSCALING_MIN_REPLICAS: "1" AUTSCALING_MIN_REPLICAS: "1"
AUTSCALING_MAX_REPLICAS: "4" AUTSCALING_MAX_REPLICAS: "4"
DEPLOY_STRATEGY: "Recreate"
ENV: "development" ENV: "development"
environment: environment:
name: k8sdev-01 name: k8sdev-01
......
...@@ -8,6 +8,8 @@ spec: ...@@ -8,6 +8,8 @@ spec:
{{- if not .Values.autoscaling.enabled }} {{- if not .Values.autoscaling.enabled }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
{{- end }} {{- end }}
strategy:
type: {{ .Values.strategy.type }}
selector: selector:
matchLabels: matchLabels:
{{- include "df-wiki.selectorLabels" . | nindent 6 }} {{- include "df-wiki.selectorLabels" . | nindent 6 }}
......
...@@ -13,6 +13,8 @@ image: ...@@ -13,6 +13,8 @@ image:
imagePullSecrets: [] imagePullSecrets: []
nameOverride: "" nameOverride: ""
fullnameOverride: "" fullnameOverride: ""
strategy:
type: RollingUpdate
serviceAccount: serviceAccount:
# Specifies whether a service account should be created # Specifies whether a service account should be created
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment