From bb9d249db425795ead2258d512a69f8b431fa51c Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Tue, 18 Jan 2022 16:14:06 -0700 Subject: [PATCH 1/2] Update Consul version to 1.11.2 --- .circleci/config.yml | 4 ++-- charts/consul/Chart.yaml | 4 ++-- charts/consul/values.yaml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 48f27ca0cb..1e01969e1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -9,8 +9,8 @@ executors: - image: docker.mirror.hashicorp.services/cimg/go:1.17.5 environment: TEST_RESULTS: /tmp/test-results # path to where test results are saved - CONSUL_VERSION: 1.11.1 # Consul's OSS version to use in tests - CONSUL_ENT_VERSION: 1.11.1+ent # Consul's enterprise version to use in tests + CONSUL_VERSION: 1.11.2 # Consul's OSS version to use in tests + CONSUL_ENT_VERSION: 1.11.2+ent # Consul's enterprise version to use in tests control-plane-path : &control-plane-path control-plane cli-path : &cli-path cli diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml index e7f331c4ae..75bbd9708f 100644 --- a/charts/consul/Chart.yaml +++ b/charts/consul/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: consul version: 0.39.0 -appVersion: 1.11.1 +appVersion: 1.11.2 kubeVersion: ">=1.18.0-0" description: Official HashiCorp Consul Chart home: https://www.consul.io @@ -13,7 +13,7 @@ annotations: artifacthub.io/prerelease: false artifacthub.io/images: | - name: consul - image: hashicorp/consul:1.11.1 + image: hashicorp/consul:1.11.2 - name: consul-k8s-control-plane image: hashicorp/consul-k8s-control-plane:0.39.0 - name: envoy diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml index 5c2b17f4ad..697594850e 100644 --- a/charts/consul/values.yaml +++ b/charts/consul/values.yaml @@ -85,7 +85,7 @@ global: # image: "hashicorp/consul-enterprise:1.10.0-ent" # ``` # @default: hashicorp/consul: - image: "hashicorp/consul:1.11.1" + image: "hashicorp/consul:1.11.2" # Array of objects containing image pull secret names that will be applied to each service account. # This can be used to reference image pull secrets if using a custom consul or consul-k8s-control-plane Docker image. From 571b116c0854a589954cf7ca7e3eb0d5f37bec96 Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Thu, 20 Jan 2022 11:25:54 -0700 Subject: [PATCH 2/2] Add changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 812acbaa53..f12458176e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ FEATURES: * Helm * Support Envoy 1.20.1. [[GH-935](https://github.com/hashicorp/consul-k8s/pull/958)] + * Support Consul 1.11.2. [[GH-976](https://github.com/hashicorp/consul-k8s/pull/976)] IMPROVEMENTS: * Helm