From e97af0de4464bcaa742181ccecd8695e252559c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?= Date: Wed, 18 Nov 2020 14:25:15 +0100 Subject: [PATCH] Release 0.10.0 --- .gitlab-ci/pipeline.yaml | 6 +++--- docs/antora.yml | 2 +- docs/modules/ROOT/pages/CHANGELOG.adoc | 2 +- docs/modules/ROOT/pages/release.adoc | 2 +- examples/eks-aws/.gitlab-ci.yml | 2 +- examples/eks-aws/terraform/main.tf | 4 ++-- examples/k3os-libvirt-demo-app/terraform/main.tf | 4 ++-- examples/k3s-docker-demo-app/terraform/main.tf | 4 ++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci/pipeline.yaml b/.gitlab-ci/pipeline.yaml index 101d362e92..1b6e00ab6d 100644 --- a/.gitlab-ci/pipeline.yaml +++ b/.gitlab-ci/pipeline.yaml @@ -13,7 +13,7 @@ mr:terraform:plan: variables: CLUSTER_NAME: $CI_MERGE_REQUEST_TARGET_BRANCH_NAME script: - - wget -O- https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.9.0/scripts/plan.sh | sh + - wget -O- https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.10.0/scripts/plan.sh | sh allow_failure: true rules: - if: '$CI_MERGE_REQUEST_ID' @@ -29,7 +29,7 @@ pb:terraform:apply: variables: CLUSTER_NAME: $CI_COMMIT_REF_NAME script: - - wget -O- https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.9.0/scripts/provision.sh | sh + - wget -O- https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.10.0/scripts/provision.sh | sh environment: name: cluster/$CI_COMMIT_REF_NAME on_stop: pb:terraform:destroy @@ -47,7 +47,7 @@ pb:terraform:destroy: variables: CLUSTER_NAME: $CI_COMMIT_REF_NAME script: - - wget -O- https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.9.0/scripts/destroy.sh | sh + - wget -O- https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.10.0/scripts/destroy.sh | sh environment: name: cluster/$CI_COMMIT_REF_NAME action: stop diff --git a/docs/antora.yml b/docs/antora.yml index 3964bab306..80e6d25825 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -1,6 +1,6 @@ --- name: camptocamp-devops-stack title: Camptocamp’s DevOps stack -version: 0.9.0 +version: 0.10.0 nav: - modules/ROOT/nav.adoc diff --git a/docs/modules/ROOT/pages/CHANGELOG.adoc b/docs/modules/ROOT/pages/CHANGELOG.adoc index 7276812283..2e78d391b5 100644 --- a/docs/modules/ROOT/pages/CHANGELOG.adoc +++ b/docs/modules/ROOT/pages/CHANGELOG.adoc @@ -1,6 +1,6 @@ = Changelog -== https://github.com/camptocamp/camptocamp-devops-stack/tree/v0.10.0[0.10.0] (unreleased) +== https://github.com/camptocamp/camptocamp-devops-stack/tree/v0.10.0[0.10.0] (2020-11-18) https://github.com/camptocamp/camptocamp-devops-stack/compare/v0.9.0...v0.10.0[Full Changelog] diff --git a/docs/modules/ROOT/pages/release.adoc b/docs/modules/ROOT/pages/release.adoc index 84a9b70376..f52bc0667e 100644 --- a/docs/modules/ROOT/pages/release.adoc +++ b/docs/modules/ROOT/pages/release.adoc @@ -1,7 +1,7 @@ == Release * Update `docs/modules/ROOT/pages/CHANGELOG.adoc` -* Update the version number (e.g. `v0.9.0`) in the following files (mandatory): https://github.com/camptocamp/camptocamp-devops-stack/blob/master/docs/antora.yml#L4[antora.yml] https://github.com/camptocamp/camptocamp-devops-stack/blob/master/.gitlab-ci/pipeline.yaml[.gitlab-ci/pipeline.yaml] +* Update the version number (e.g. `v0.9.0`) in the following files (mandatory): https://github.com/camptocamp/camptocamp-devops-stack/blob/master/docs/antora.yml#L4[docs/antora.yml] https://github.com/camptocamp/camptocamp-devops-stack/blob/master/.gitlab-ci/pipeline.yaml[.gitlab-ci/pipeline.yaml] * Optionally update the version number in the following files: https://github.com/camptocamp/camptocamp-devops-stack/blob/master/examples/eks-aws/.gitlab-ci.yml[examples/eks-aws/.gitlab-ci.yml] https://github.com/camptocamp/camptocamp-devops-stack/blob/master/modules/eks-aws/main.tf[examples/eks-aws/terraform/main.tf] https://github.com/camptocamp/camptocamp-devops-stack/blob/master/modules/k3os-libvirt/main.tf[examples/k3os-libvirt-demo-app/terraform/main.tf] https://github.com/camptocamp/camptocamp-devops-stack/blob/master/modules/k3s-docker/main.tf[examples/k3s-docker-demo-app/terraform/main.tf] * Create a pull request with the updated version. Once it has been reviewed and approved, merge it to `master` * Tag the merged commit (e.g. `v0.9.0`) diff --git a/examples/eks-aws/.gitlab-ci.yml b/examples/eks-aws/.gitlab-ci.yml index 28d10d9a13..4b626b9e56 100644 --- a/examples/eks-aws/.gitlab-ci.yml +++ b/examples/eks-aws/.gitlab-ci.yml @@ -1,3 +1,3 @@ --- include: - - https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.9.0/.gitlab-ci/pipeline.yaml + - https://raw.githubusercontent.com/camptocamp/camptocamp-devops-stack/v0.10.0/.gitlab-ci/pipeline.yaml diff --git a/examples/eks-aws/terraform/main.tf b/examples/eks-aws/terraform/main.tf index 18752249f5..d081c83538 100644 --- a/examples/eks-aws/terraform/main.tf +++ b/examples/eks-aws/terraform/main.tf @@ -1,7 +1,7 @@ locals { base_domain = "example.com" repo_url = "https://github.com/camptocamp/camptocamp-devops-stack.git" - target_revision = "v0.9.0" + target_revision = "v0.10.0" kubernetes_host = module.cluster.kubernetes_host kubernetes_cluster_ca_certificate = module.cluster.kubernetes_cluster_ca_certificate @@ -34,7 +34,7 @@ data "aws_iam_role" "eks_admin" { } module "cluster" { - source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/eks-aws?ref=v0.9.0" + source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/eks-aws?ref=v0.10.0" cluster_name = terraform.workspace cluster_endpoint_public_access_cidrs = local.cluster_endpoint_public_access_cidrs diff --git a/examples/k3os-libvirt-demo-app/terraform/main.tf b/examples/k3os-libvirt-demo-app/terraform/main.tf index 0c7f441642..6ef5cc6e6f 100644 --- a/examples/k3os-libvirt-demo-app/terraform/main.tf +++ b/examples/k3os-libvirt-demo-app/terraform/main.tf @@ -1,6 +1,6 @@ locals { repo_url = "https://github.com/camptocamp/camptocamp-devops-stack.git" - target_revision = "v0.9.0" + target_revision = "v0.10.0" base_domain = module.cluster.base_domain kubernetes_host = module.cluster.kubernetes_host @@ -10,7 +10,7 @@ locals { } module "cluster" { - source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/k3os-libvirt?ref=v0.9.0" + source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/k3os-libvirt?ref=v0.10.0" cluster_name = terraform.workspace node_count = 1 diff --git a/examples/k3s-docker-demo-app/terraform/main.tf b/examples/k3s-docker-demo-app/terraform/main.tf index 0e4739796d..b9456ee674 100644 --- a/examples/k3s-docker-demo-app/terraform/main.tf +++ b/examples/k3s-docker-demo-app/terraform/main.tf @@ -1,6 +1,6 @@ locals { repo_url = "https://github.com/camptocamp/camptocamp-devops-stack.git" - target_revision = "v0.9.0" + target_revision = "v0.10.0" base_domain = module.cluster.base_domain kubernetes_host = module.cluster.kubernetes_host @@ -10,7 +10,7 @@ locals { } module "cluster" { - source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/k3s-docker?ref=v0.9.0" + source = "git::https://github.com/camptocamp/camptocamp-devops-stack.git//modules/k3s-docker?ref=v0.10.0" cluster_name = terraform.workspace node_count = 1