Prerelease 0.43.0 (#1182)

* bump image versions for release * remove beta images from acceptance tests * fix assertion to not be specific to envoy image version, but check if it contains a common string
hashicorp · Apr 21, 2022 · ebf241f · ebf241f
1 parent 68bcc72
commit ebf241f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 13 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -103,7 +103,6 @@ commands:
                           ${ENABLE_ENTERPRISE:+-enable-enterprise} \
                           -enable-multi-cluster \
                           -debug-directory="$TEST_RESULTS/debug" \
-                          -consul-image=docker.mirror.hashicorp.services/hashicorp/consul-enterprise:1.12.0-beta1-ent \
                           -consul-k8s-image=<< parameters.consul-k8s-image >>
                     then
                       echo "Tests in ${pkg} failed, aborting early"
@@ -135,7 +134,6 @@ commands:
                       -enable-multi-cluster \
                       ${ENABLE_ENTERPRISE:+-enable-enterprise} \
                       -debug-directory="$TEST_RESULTS/debug" \
-                      -consul-image=docker.mirror.hashicorp.services/hashicorp/consul-enterprise:1.12.0-beta1-ent \
                       -consul-k8s-image=<< parameters.consul-k8s-image >>
 
 jobs:

diff --git a/charts/consul/Chart.yaml b/charts/consul/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: consul
-version: 0.42.0
-appVersion: 1.11.4
+version: 0.43.0
+appVersion: 1.12.0
 kubeVersion: ">=1.19.0-0"
 description: Official HashiCorp Consul Chart
 home: https://www.consul.io
@@ -13,11 +13,11 @@ annotations:
   artifacthub.io/prerelease: false
   artifacthub.io/images: |
     - name: consul
-      image: hashicorp/consul:1.11.4
+      image: hashicorp/consul:1.12.0
     - name: consul-k8s-control-plane
-      image: hashicorp/consul-k8s-control-plane:0.42.0
+      image: hashicorp/consul-k8s-control-plane:0.43.0
     - name: envoy
-      image: envoyproxy/envoy-alpine:v1.20.2
+      image: envoyproxy/envoy:v1.22.0
   artifacthub.io/license: MPL-2.0
   artifacthub.io/links: |
     - name: Documentation

diff --git a/charts/consul/test/unit/ingress-gateways-deployment.bats b/charts/consul/test/unit/ingress-gateways-deployment.bats
@@ -148,7 +148,8 @@ load _helpers
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -s -r '.[0].spec.template.spec.containers[0].image' | tee /dev/stderr)
-  [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.2" ]
+  [[ "${actual}" =~ "envoyproxy/envoy:v" ]]
+
 }
 
 @test "ingressGateways/Deployment: envoy image can be set using the global value" {

diff --git a/charts/consul/test/unit/mesh-gateway-deployment.bats b/charts/consul/test/unit/mesh-gateway-deployment.bats
@@ -335,7 +335,8 @@ key2: value2' \
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -r '.spec.template.spec.containers[0].image' | tee /dev/stderr)
-  [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.2" ]
+  [[ "${actual}" =~ "envoyproxy/envoy:v" ]]
+
 }
 
 @test "meshGateway/Deployment: setting meshGateway.imageEnvoy fails" {

diff --git a/charts/consul/test/unit/terminating-gateways-deployment.bats b/charts/consul/test/unit/terminating-gateways-deployment.bats
@@ -137,7 +137,7 @@ load _helpers
       --set 'connectInject.enabled=true' \
       . | tee /dev/stderr |
       yq -s -r '.[0].spec.template.spec.containers[0].image' | tee /dev/stderr)
-  [ "${actual}" = "envoyproxy/envoy-alpine:v1.20.2" ]
+  [[ "${actual}" =~ "envoyproxy/envoy:v" ]]
 }
 
 @test "terminatingGateways/Deployment: envoy image can be set using the global value" {

diff --git a/charts/consul/values.yaml b/charts/consul/values.yaml
@@ -87,7 +87,7 @@ global:
   # image: "hashicorp/consul-enterprise:1.10.0-ent"
   # ```
   # @default: hashicorp/consul:<latest version>
-  image: "hashicorp/consul:1.11.4"
+  image: "hashicorp/consul:1.12.0"
 
   # 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.
@@ -107,7 +107,7 @@ global:
   # image that is used for functionality such as catalog sync.
   # This can be overridden per component.
   # @default: hashicorp/consul-k8s-control-plane:<latest version>
-  imageK8S: "hashicorp/consul-k8s-control-plane:0.42.0"
+  imageK8S: "hashicorp/consul-k8s-control-plane:0.43.0"
 
   # The name of the datacenter that the agents should
   # register as. This can't be changed once the Consul cluster is up and running
@@ -556,7 +556,7 @@ global:
   # connect-injected sidecar proxies and mesh, terminating, and ingress gateways.
   # See https://www.consul.io/docs/connect/proxies/envoy for full compatibility matrix between Consul and Envoy.
   # @default: envoyproxy/envoy-alpine:<latest supported version>
-  imageEnvoy: "envoyproxy/envoy-alpine:v1.20.2"
+  imageEnvoy: "envoyproxy/envoy:v1.22.0"
 
   # Configuration for running this Helm chart on the Red Hat OpenShift platform.
   # This Helm chart currently supports OpenShift v4.x+.