Update consul version to 1.10.4 (#861)

CHANGELOG.md

@@ -23,6 +23,7 @@ IMPROVEMENTS:
   * Delete jobs, cluster roles, and cluster role bindings on `uninstall`. [[GH-820](https://github.com/hashicorp/consul-k8s/pull/820)]
 * Helm Chart
   * Add `component` labels to all resources. [[GH-840](https://github.com/hashicorp/consul-k8s/pull/840)]
+  * Update Consul version to 1.10.4. [[GH-861](https://github.com/hashicorp/consul-k8s/pull/861)]
 
 BUG FIXES:
 * Control Plane

charts/consul/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: consul
 version: 0.36.0
-appVersion: 1.10.3
+appVersion: 1.10.4
 kubeVersion: ">=1.17.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.10.3
+      image: hashicorp/consul:1.10.4
     - name: consul-k8s-control-plane
       image: hashicorp/consul-k8s-control-plane:0.36.0
     - name: envoy

charts/consul/values.yaml

@@ -85,7 +85,7 @@ global:
   # image: "hashicorp/consul-enterprise:1.10.0-ent"
   # ```
   # @default: hashicorp/consul:<latest version>
-  image: "hashicorp/consul:1.10.3"
+  image: "hashicorp/consul:1.10.4"
 
   # 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.

control-plane/catalog/to-k8s/sink_test.go

@@ -150,8 +150,7 @@ func TestK8SSink_createExists(t *testing.T) {
 
 		if actual == nil {
 			r.Fatal("web not found")
-		}
-		if actual.Spec.ExternalName != "example.com." {
+		} else if actual.Spec.ExternalName != "example.com." {
 			r.Fatal("modified")
 		}
 	})