Add a test to test consul client restart

.circleci/config.yml

@@ -616,9 +616,9 @@ workflows:
       - test-helm-gen
       - unit-helm
       - acceptance
-#          requires:
-#            - unit-helm
-#            - unit-acceptance-framework
+          requires:
+            - unit-helm
+            - unit-acceptance-framework
   nightly-acceptance-tests:
     triggers:
       - schedule:

templates/connect-inject-deployment.yaml

@@ -87,6 +87,8 @@ spec:
                 -consul-image="{{ default .Values.global.image .Values.connectInject.imageConsul }}" \
                 -envoy-image="{{ .Values.global.imageEnvoy }}" \
                 -consul-k8s-image="{{ default .Values.global.imageK8S .Values.connectInject.image }}" \
+                -release-name="{{ .Release.Name }} \
+                -release-namespace="{{ .Release.Namespace }} \
                 -listen=:8080 \
                 {{- if .Values.connectInject.logLevel }}
                 -log-level={{ .Values.connectInject.logLevel }} \

test/acceptance/tests/connect/connect_inject_test.go

@@ -165,3 +165,33 @@ func TestConnectInject_CleanupController(t *testing.T) {
 		})
 	}
 }
+
+// Test that when Consul clients are restarted and lose all their registrations,
+// the services get re-registered and can continue to talk to each other.
+func TestConnectInject_RestartConsulClients(t *testing.T) {
+	cfg := suite.Config()
+	ctx := suite.Environment().DefaultContext(t)
+
+	helmValues := map[string]string{
+		"connectInject.enabled": "true",
+	}
+
+	releaseName := helpers.RandomName()
+	consulCluster := consul.NewHelmCluster(t, helmValues, ctx, cfg, releaseName)
+
+	consulCluster.Create(t)
+
+	logger.Log(t, "creating static-server and static-client deployments")
+	k8s.DeployKustomize(t, ctx.KubectlOptions(t), cfg.NoCleanupOnFailure, cfg.DebugDirectory, "../fixtures/cases/static-server-inject")
+	k8s.DeployKustomize(t, ctx.KubectlOptions(t), cfg.NoCleanupOnFailure, cfg.DebugDirectory, "../fixtures/cases/static-client-inject")
+
+	logger.Log(t, "checking that connection is successful")
+	k8s.CheckStaticServerConnectionSuccessful(t, ctx.KubectlOptions(t), staticClientName, "http://localhost:1234")
+
+	logger.Log(t, "restarting Consul client daemonset")
+	k8s.RunKubectl(t, ctx.KubectlOptions(t), "rollout", "restart", fmt.Sprintf("ds/%s-consul", releaseName))
+	k8s.RunKubectl(t, ctx.KubectlOptions(t), "rollout", "status", fmt.Sprintf("ds/%s-consul", releaseName))
+
+	logger.Log(t, "checking that connection is still successful")
+	k8s.CheckStaticServerConnectionSuccessful(t, ctx.KubectlOptions(t), staticClientName, "http://localhost:1234")
+}

values.yaml

@@ -1549,7 +1549,7 @@ connectInject:
 # ServiceIntentions require consul 1.9+.
 controller:
   # Enables the controller for managing custom resources.
-  enabled: true
+  enabled: false
 
   # The number of deployment replicas.
   replicas: 1