From f092e461d5e8ee33272b29bba309c16fd1ed00e9 Mon Sep 17 00:00:00 2001 From: Iryna Shustava Date: Tue, 18 Oct 2022 15:30:01 -0600 Subject: [PATCH] add more logging and switch consul image --- .circleci/config.yml | 6 +++--- control-plane/subcommand/connect-init/command.go | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5e4d7996b9..2219bd5762 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -521,7 +521,7 @@ jobs: - run: mkdir -p $TEST_RESULTS - run-acceptance-tests: failfast: true - additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -consul-image=hashicorppreview/consul-enterprise:1.14-dev + additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -consul-image=ishustava/consul:latest@sha256:3985a25200ef3f593c75ffbbbadc9fcc3a1d07da4aafb2222ab65e9e893d468a - store_test_results: path: /tmp/test-results - store_artifacts: @@ -553,7 +553,7 @@ jobs: - run: mkdir -p $TEST_RESULTS - run-acceptance-tests: failfast: true - additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy -consul-image=hashicorppreview/consul-enterprise:1.14-dev + additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy -consul-image=ishustava/consul:latest@sha256:3985a25200ef3f593c75ffbbbadc9fcc3a1d07da4aafb2222ab65e9e893d468a - store_test_results: path: /tmp/test-results - store_artifacts: @@ -585,7 +585,7 @@ jobs: - run: mkdir -p $TEST_RESULTS - run-acceptance-tests: failfast: true - additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy -enable-cni + additional-flags: -use-kind -kubecontext="kind-dc1" -secondary-kubecontext="kind-dc2" -enable-transparent-proxy -enable-cni -consul-image=ishustava/consul:latest@sha256:3985a25200ef3f593c75ffbbbadc9fcc3a1d07da4aafb2222ab65e9e893d468a - store_test_results: path: /tmp/test-results - store_artifacts: diff --git a/control-plane/subcommand/connect-init/command.go b/control-plane/subcommand/connect-init/command.go index aa67d61b5c..651be98a38 100644 --- a/control-plane/subcommand/connect-init/command.go +++ b/control-plane/subcommand/connect-init/command.go @@ -404,7 +404,12 @@ func (c *Command) applyTrafficRedirectionRules(svc *api.AgentService) error { } // Configure any relevant information from the proxy service - return iptables.Setup(c.iptablesConfig) + err = iptables.Setup(c.iptablesConfig) + if err != nil { + return err + } + c.logger.Info("Successfully applied traffic redirection rules") + return nil } const synopsis = "Inject connect init command."