Commit 1cccfca1 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch 'auto_devops_kubernetes_active' into 'master'

Switch kubernetes:active with checking $KUBECONFIG

Closes gitlab-ee#8311

See merge request gitlab-org/gitlab-ce!22929
parents f3c44f64 1e367810
---
title: Switch kubernetes:active with checking in Auto-DevOps.gitlab-ci.yml
merge_request: 22929
author:
type: fixed
...@@ -149,10 +149,10 @@ performance: ...@@ -149,10 +149,10 @@ performance:
only: only:
refs: refs:
- branches - branches
kubernetes: active
except: except:
variables: variables:
- $PERFORMANCE_DISABLED - $PERFORMANCE_DISABLED
- $KUBECONFIG == null
sast: sast:
stage: test stage: test
...@@ -227,7 +227,6 @@ dast: ...@@ -227,7 +227,6 @@ dast:
only: only:
refs: refs:
- branches - branches
kubernetes: active
variables: variables:
- $GITLAB_FEATURES =~ /\bdast\b/ - $GITLAB_FEATURES =~ /\bdast\b/
except: except:
...@@ -235,6 +234,7 @@ dast: ...@@ -235,6 +234,7 @@ dast:
- master - master
variables: variables:
- $DAST_DISABLED - $DAST_DISABLED
- $KUBECONFIG == null
review: review:
stage: review stage: review
...@@ -256,12 +256,12 @@ review: ...@@ -256,12 +256,12 @@ review:
only: only:
refs: refs:
- branches - branches
kubernetes: active
except: except:
refs: refs:
- master - master
variables: variables:
- $REVIEW_DISABLED - $REVIEW_DISABLED
- $KUBECONFIG == null
stop_review: stop_review:
stage: cleanup stage: cleanup
...@@ -279,12 +279,12 @@ stop_review: ...@@ -279,12 +279,12 @@ stop_review:
only: only:
refs: refs:
- branches - branches
kubernetes: active
except: except:
refs: refs:
- master - master
variables: variables:
- $REVIEW_DISABLED - $REVIEW_DISABLED
- $KUBECONFIG == null
# Staging deploys are disabled by default since # Staging deploys are disabled by default since
# continuous deployment to production is enabled by default # continuous deployment to production is enabled by default
...@@ -308,9 +308,11 @@ staging: ...@@ -308,9 +308,11 @@ staging:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $STAGING_ENABLED - $STAGING_ENABLED
except:
variables:
- $KUBECONFIG == null
# Canaries are also disabled by default, but if you want them, # Canaries are also disabled by default, but if you want them,
# and know what the downsides are, you can enable this by setting # and know what the downsides are, you can enable this by setting
...@@ -333,9 +335,11 @@ canary: ...@@ -333,9 +335,11 @@ canary:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $CANARY_ENABLED - $CANARY_ENABLED
except:
variables:
- $KUBECONFIG == null
.production: &production_template .production: &production_template
stage: production stage: production
...@@ -361,13 +365,13 @@ production: ...@@ -361,13 +365,13 @@ production:
only: only:
refs: refs:
- master - master
kubernetes: active
except: except:
variables: variables:
- $STAGING_ENABLED - $STAGING_ENABLED
- $CANARY_ENABLED - $CANARY_ENABLED
- $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_ENABLED
- $INCREMENTAL_ROLLOUT_MODE - $INCREMENTAL_ROLLOUT_MODE
- $KUBECONFIG == null
production_manual: production_manual:
<<: *production_template <<: *production_template
...@@ -376,7 +380,6 @@ production_manual: ...@@ -376,7 +380,6 @@ production_manual:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $STAGING_ENABLED - $STAGING_ENABLED
- $CANARY_ENABLED - $CANARY_ENABLED
...@@ -384,6 +387,7 @@ production_manual: ...@@ -384,6 +387,7 @@ production_manual:
variables: variables:
- $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_ENABLED
- $INCREMENTAL_ROLLOUT_MODE - $INCREMENTAL_ROLLOUT_MODE
- $KUBECONFIG == null
# This job implements incremental rollout on for every push to `master`. # This job implements incremental rollout on for every push to `master`.
...@@ -413,13 +417,13 @@ production_manual: ...@@ -413,13 +417,13 @@ production_manual:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $INCREMENTAL_ROLLOUT_MODE == "manual" - $INCREMENTAL_ROLLOUT_MODE == "manual"
- $INCREMENTAL_ROLLOUT_ENABLED - $INCREMENTAL_ROLLOUT_ENABLED
except: except:
variables: variables:
- $INCREMENTAL_ROLLOUT_MODE == "timed" - $INCREMENTAL_ROLLOUT_MODE == "timed"
- $KUBECONFIG == null
.timed_rollout_template: &timed_rollout_template .timed_rollout_template: &timed_rollout_template
<<: *rollout_template <<: *rollout_template
...@@ -428,9 +432,11 @@ production_manual: ...@@ -428,9 +432,11 @@ production_manual:
only: only:
refs: refs:
- master - master
kubernetes: active
variables: variables:
- $INCREMENTAL_ROLLOUT_MODE == "timed" - $INCREMENTAL_ROLLOUT_MODE == "timed"
except:
variables:
- $KUBECONFIG == null
timed rollout 10%: timed rollout 10%:
<<: *timed_rollout_template <<: *timed_rollout_template
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment