diff --git a/cicd-scripts/run-local-e2e-test.sh b/cicd-scripts/run-local-e2e-test.sh old mode 100755 new mode 100644 index 65909dec27..07b5313390 --- a/cicd-scripts/run-local-e2e-test.sh +++ b/cicd-scripts/run-local-e2e-test.sh @@ -36,20 +36,27 @@ container_node_ip=$(docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPA # container nonk8s api server hub_nonk8s_api_server="https://${container_node_ip}:30080" -# container postgres uri -container_pg_port="32432" -database_uri=$(kubectl get secret storage-secret -n $hub_namespace --kubeconfig ${hub_kubeconfig} -ojsonpath='{.data.database_uri}' | base64 -d) -container_pg_uri=$(echo $database_uri | sed "s|@.*hoh|@${container_node_ip}:${container_pg_port}/hoh|g") - printf "options:" > $OPTIONS_FILE printf "\n hub:" >> $OPTIONS_FILE printf "\n name: $HUB_OF_HUB_NAME" >> $OPTIONS_FILE printf "\n namespace: ${hub_namespace}" >> $OPTIONS_FILE printf "\n apiServer: ${hub_api_server}" >> $OPTIONS_FILE printf "\n nonk8sApiServer: ${hub_nonk8s_api_server}" >> $OPTIONS_FILE -printf "\n kubeconfig: ${hub_kubeconfig}" >> $OPTIONS_FILE -printf "\n kubecontext: ${hub_kubecontext}" >> $OPTIONS_FILE -printf '\n databaseURI: %s' ${container_pg_uri} >> $OPTIONS_FILE # contain $ need to use %s +if [ ! -f "IS_CANARY_ENV" ];then + printf "\n kubeconfig: ${ROOT_DIR}/test/setup/config/kubeconfig" >> $OPTIONS_FILE + printf "\n crdsDir: ${ROOT_DIR}/pkg/testdata/crds" >> $OPTIONS_FILE + printf "\n storagePath: ${ROOT_DIR}/test/setup/hoh/postgres_setup.sh" >> $OPTIONS_FILE + printf "\n transportPath: ${ROOT_DIR}/test/setup/hoh/kafka_setup.sh" >> $OPTIONS_FILE +else + printf "\n kubeconfig: ${hub_kubeconfig}" >> $OPTIONS_FILE + printf "\n storagePath: ${ROOT_DIR}/operator/config/samples/storage/deploy_postgres.sh" >> $OPTIONS_FILE + printf "\n transportPath: ${ROOT_DIR}/operator/config/samples/transport/deploy_kafka.sh" >> $OPTIONS_FILE +fi + printf "\n kubecontext: ${hub_kubecontext}" >> $OPTIONS_FILE + printf "\n databaseExternalHost: ${container_node_ip}" >> $OPTIONS_FILE + printf "\n databaseExternalPort: 32432" >> $OPTIONS_FILE + printf "\n mghManagerImageREF: quay.io/stolostron/multicluster-global-hub-manager:latest" >> $OPTIONS_FILE + printf "\n mghAgentImageREF: quay.io/stolostron/multicluster-global-hub-agent:latest" >> $OPTIONS_FILE printf "\n clusters:" >> $OPTIONS_FILE for i in $(seq 1 "${HUB_CLUSTER_NUM}"); do diff --git a/cicd-scripts/run-ocp-e2e-test.sh b/cicd-scripts/run-ocp-e2e-test.sh old mode 100755 new mode 100644 diff --git a/cicd-scripts/run-prow-e2e-test.sh b/cicd-scripts/run-prow-e2e-test.sh old mode 100755 new mode 100644 index 2c1894f7d4..1d3a3301bb --- a/cicd-scripts/run-prow-e2e-test.sh +++ b/cicd-scripts/run-prow-e2e-test.sh @@ -27,6 +27,5 @@ ssh "${OPT[@]}" "$HOST" sudo yum install gcc git wget jq -y ssh "${OPT[@]}" "$HOST" "sudo sh -c 'echo \"fs.inotify.max_user_watches=524288\" >> /etc/sysctl.conf && echo \"fs.inotify.max_user_instances=1024\" >> /etc/sysctl.conf && sysctl -p /etc/sysctl.conf'" echo "setup e2e environment" ssh "${OPT[@]}" "$HOST" "cd $HOST_DIR && . test/resources/env.list && sudo make e2e-setup-dependencies && make e2e-setup-start" > >(tee "$ARTIFACT_DIR/run-e2e-setup.log") 2>&1 - echo "runn e2e tests" ssh "${OPT[@]}" "$HOST" "cd $HOST_DIR && . test/resources/env.list && make e2e-tests-all && make e2e-tests-prune" > >(tee "$ARTIFACT_DIR/run-e2e-test.log") 2>&1 diff --git a/test/pkg/e2e/hoh-application_test.go b/test/pkg/e2e/hoh-application_test.go index 5c23dbbfc6..e8028f2dd5 100644 --- a/test/pkg/e2e/hoh-application_test.go +++ b/test/pkg/e2e/hoh-application_test.go @@ -40,7 +40,7 @@ var _ = Describe("Deploy the application to the managed cluster", Label("e2e-tes transport := &http.Transport{ TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, } - httpClient = &http.Client{Timeout: time.Second * 20, Transport: transport} + httpClient = &http.Client{Timeout: time.Second * 60, Transport: transport} var err error managedClusters, err = getManagedCluster(httpClient, httpToken) if err != nil { @@ -50,7 +50,7 @@ var _ = Describe("Deploy the application to the managed cluster", Label("e2e-tes return fmt.Errorf("managed cluster is not exist") } return nil - }, 3*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) + }, 5*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) By("Get the appsubreport client") scheme := runtime.NewScheme() diff --git a/test/pkg/e2e/hoh-e2e-test_suite_test.go b/test/pkg/e2e/hoh-e2e-test_suite_test.go index 9b30476fe7..7109e369b6 100644 --- a/test/pkg/e2e/hoh-e2e-test_suite_test.go +++ b/test/pkg/e2e/hoh-e2e-test_suite_test.go @@ -47,6 +47,7 @@ func init() { var _ = BeforeSuite(func() { initVars() + deployGlobalHub() By("Init the kubernetes client") clients = utils.NewTestClient(testOptionsContainer.Options) @@ -72,7 +73,7 @@ var _ = BeforeSuite(func() { transport := &http.Transport{ TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, } - httpClient = &http.Client{Timeout: time.Second * 20, Transport: transport} + httpClient = &http.Client{Timeout: time.Second * 50, Transport: transport} }) var _ = AfterSuite(func() { @@ -80,7 +81,7 @@ var _ = AfterSuite(func() { }) func initVars() { - testTimeout = time.Second * 30 + testTimeout = time.Second * 50 klog.V(6).Infof("Options Path: %s", optionsFile) data, err := os.ReadFile(optionsFile) diff --git a/test/pkg/e2e/hoh-label_test.go b/test/pkg/e2e/hoh-label_test.go index a23d166611..6cf06a7d7d 100644 --- a/test/pkg/e2e/hoh-label_test.go +++ b/test/pkg/e2e/hoh-label_test.go @@ -2,13 +2,12 @@ package tests import ( "bytes" + "crypto/tls" "encoding/json" "fmt" "io" "net/http" - "strings" "time" - "crypto/tls" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" @@ -28,9 +27,9 @@ var _ = Describe("Updating cluster label from HoH manager", Label("e2e-tests-lab Eventually(func() error { By("Config request of the api") transport := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, + TLSClientConfig: &tls.Config{InsecureSkipVerify: true}, } - httpClient = &http.Client{Timeout: time.Second * 20, Transport: transport} + httpClient = &http.Client{Timeout: time.Second * 60, Transport: transport} var err error managedClusters, err = getManagedCluster(httpClient, httpToken) if err != nil { @@ -40,7 +39,7 @@ var _ = Describe("Updating cluster label from HoH manager", Label("e2e-tests-lab return fmt.Errorf("managed cluster is not exist") } return nil - }, 3*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) + }, 5*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) }) It("add the label to the managed cluster", func() { @@ -72,7 +71,7 @@ var _ = Describe("Updating cluster label from HoH manager", Label("e2e-tests-lab }) It("add the label to the managed cluster", func() { - for i:=1; i + + + + + + + + + + + + + + + + + + + + + + + > Enter [BeforeSuite] TOP-LEVEL - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:48 @ 06/03/23 03:15:58.865 STEP: deploy globalbub for e2e ENV - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:45 @ 06/03/23 03:15:58.87 STEP: checking postgresql is ready - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:60 @ 06/03/23 03:15:59.549 STEP: checking kafka is ready - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:132 @ 06/03/23 03:16:36.552 STEP: deploying operator - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:177 @ 06/03/23 03:16:36.631 STEP: deploying CR - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:228 @ 06/03/23 03:16:39.021 STEP: deploy globalbub for e2e ENV - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:293 @ 06/03/23 03:16:39.035 STEP: updating deployment && cluster-manager - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:296 @ 06/03/23 03:16:39.035 STEP: waiting for core components to be ready - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-deploy_test.go:319 @ 06/03/23 03:16:39.618 STEP: Init the kubernetes client - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:52 @ 06/03/23 03:16:39.854 STEP: Init the bearer token - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:57 @ 06/03/23 03:16:39.869 STEP: Init the http client - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:72 @ 06/03/23 03:16:44.891 < Exit [BeforeSuite] TOP-LEVEL - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:48 @ 06/03/23 03:16:44.891 (46.025s) + + + + + + + + + + + + + + + + + + + + + > Enter [BeforeAll] Updating cluster label from HoH manager - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:27 @ 06/03/23 03:16:44.891 STEP: Config request of the api - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:29 @ 06/03/23 03:16:44.891 < Exit [BeforeAll] Updating cluster label from HoH manager - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:27 @ 06/03/23 03:16:44.917 (26ms) > Enter [It] add the label to the managed cluster - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:46 @ 06/03/23 03:16:44.917 STEP: Check the label is added - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:55 @ 06/03/23 03:16:44.917 < Exit [It] add the label to the managed cluster - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:46 @ 06/03/23 03:16:44.942 (26ms) + + + > Enter [It] add the label to the managed cluster - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:74 @ 06/03/23 03:16:44.943 STEP: Check the label is added - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:84 @ 06/03/23 03:16:44.943 < Exit [It] add the label to the managed cluster - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:74 @ 06/03/23 03:16:49.984 (5.042s) + + + [INTERRUPTED] Interrupted by User In [It] at: /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 @ 06/03/23 03:16:51.056 This is the Progress Report generated when the interrupt was received: Updating cluster label from HoH manager remove the label from the managed cluster (Spec Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 In [It] (Node Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 At [By Step] Check the label is deleted (Step Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:114 Spec Goroutine goroutine 63 [select] github.com/onsi/gomega/internal.(*AsyncAssertion).match(0xc000625260, {0x1bd98d0?, 0x28a87d0}, 0x0, {0x0, 0x0, 0x0}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/gomega/internal/async_assertion.go:426 github.com/onsi/gomega/internal.(*AsyncAssertion).ShouldNot(0xc000625260, {0x1bd98d0, 0x28a87d0}, {0x0, 0x0, 0x0}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/gomega/internal/async_assertion.go:116 > github.com/stolostron/multicluster-global-hub/test/pkg/e2e.glob..func4.4() /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:131 | } | return nil > }, 3*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) | } | }) github.com/onsi/ginkgo/v2/internal.extractBodyFunction.func3({0x0, 0xc0007c8600}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/node.go:445 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode.func3() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:820 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:807 Other Goroutines goroutine 8 [running] github.com/onsi/ginkgo/v2/internal.extractRunningGoroutines() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:181 github.com/onsi/ginkgo/v2/internal.NewProgressReport(_, {{0xc000579190, 0x1, 0x1}, {0xc00062c9c0, 0x1, 0x1}, {0xc000a0aeb8, 0x1, 0x1}, ...}, ...) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:75 github.com/onsi/ginkgo/v2/internal.(*Suite).generateProgressReport(_, _) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:339 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode(_, {0x14, 0x4, {0x19a5412, 0x29}, 0xc00044adb0, {{0x1f85dc9, 0x47}, 0x68, {0x0, ...}, ...}, ...}, ...) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:900 github.com/onsi/ginkgo/v2/internal.(*group).attemptSpec(0xc0006e1090, 0x1, {{0xc00043f500?, 0xc00062c9c0?, 0x1?}, 0x0?}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/group.go:190 github.com/onsi/ginkgo/v2/internal.(*group).run(0xc0006e1090, {0xc000780240?, 0x3?, 0x0?}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/group.go:330 github.com/onsi/ginkgo/v2/internal.(*Suite).runSpecs(0xc00021c000, {0x1979bf6, 0xc}, {0x28a87d0, 0x0, 0x0}, {0xc00004d3c0, 0x35}, 0x0, {0xc0001bb000, ...}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:441 github.com/onsi/ginkgo/v2/internal.(*Suite).Run(_, {_, _}, {_, _, _}, {_, _}, _, {0x1be8288, ...}, ...) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:110 github.com/onsi/ginkgo/v2.RunSpecs({0x1bd0be0, 0xc000103040}, {0x1979bf6, 0xc}, {0x0?, 0x0, 0x0?}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/core_dsl.go:296 github.com/stolostron/multicluster-global-hub/test/pkg/e2e.TestClient(0x0?) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:39 testing.tRunner(0xc000103040, 0x1a5c5c0) /usr/local/go/src/testing/testing.go:1439 testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 goroutine 1 [chan receive] testing.(*T).Run(0xc000289d40, {0x19775f3?, 0x516be5?}, 0x1a5c5c0) /usr/local/go/src/testing/testing.go:1487 testing.runTests.func1(0xc000289d40?) /usr/local/go/src/testing/testing.go:1839 testing.tRunner(0xc000289d40, 0xc0000ffcd8) /usr/local/go/src/testing/testing.go:1439 testing.runTests(0xc0004a7d60?, {0x283c770, 0x1, 0x1}, {0x7f4246459108?, 0x40?, 0x0?}) /usr/local/go/src/testing/testing.go:1837 testing.(*M).Run(0xc0004a7d60) /usr/local/go/src/testing/testing.go:1719 main.main() _testmain.go:47 goroutine 18 [chan receive] k8s.io/klog.(*loggingT).flushDaemon(0xc0001b2240?) /home/cloud-user/multicluster-global-hub/vendor/k8s.io/klog/klog.go:1010 k8s.io/klog.init.0 /home/cloud-user/multicluster-global-hub/vendor/k8s.io/klog/klog.go:411 goroutine 116 [IO wait] internal/poll.runtime_pollWait(0x7f421cf819c8, 0x72) /usr/local/go/src/runtime/netpoll.go:302 internal/poll.(*pollDesc).wait(0xc00012cd00?, 0xc000315600?, 0x0) /usr/local/go/src/internal/poll/fd_poll_runtime.go:83 internal/poll.(*pollDesc).waitRead(...) /usr/local/go/src/internal/poll/fd_poll_runtime.go:88 internal/poll.(*FD).Read(0xc00012cd00, {0xc000315600, 0xd6b, 0xd6b}) /usr/local/go/src/internal/poll/fd_unix.go:167 net.(*netFD).Read(0xc00012cd00, {0xc000315600?, 0xc0004ec840?, 0xc000315605?}) /usr/local/go/src/net/fd_posix.go:55 net.(*conn).Read(0xc000011870, {0xc000315600?, 0xc0009be200?, 0x6c68c0?}) /usr/local/go/src/net/net.go:183 crypto/tls.(*atLeastReader).Read(0xc000117848, {0xc000315600?, 0x0?, 0x18a7ec0?}) /usr/local/go/src/crypto/tls/conn.go:785 bytes.(*Buffer).ReadFrom(0xc0001b5e78, {0x1bcd3a0, 0xc000117848}) /usr/local/go/src/bytes/buffer.go:204 crypto/tls.(*Conn).readFromUntil(0xc0001b5c00, {0x1bd05c0?, 0xc000011870}, 0x2?) /usr/local/go/src/crypto/tls/conn.go:807 crypto/tls.(*Conn).readRecordOrCCS(0xc0001b5c00, 0x0) /usr/local/go/src/crypto/tls/conn.go:614 crypto/tls.(*Conn).readRecord(...) /usr/local/go/src/crypto/tls/conn.go:582 crypto/tls.(*Conn).Read(0xc0001b5c00, {0xc0009d3000, 0x1000, 0x1?}) /usr/local/go/src/crypto/tls/conn.go:1285 net/http.(*persistConn).Read(0xc0000d6900, {0xc0009d3000?, 0xc0007c92c0?, 0xc0009d0d30?}) /usr/local/go/src/net/http/transport.go:1929 bufio.(*Reader).fill(0xc000206840) /usr/local/go/src/bufio/bufio.go:106 bufio.(*Reader).Peek(0xc000206840, 0x1) /usr/local/go/src/bufio/bufio.go:144 net/http.(*persistConn).readLoop(0xc0000d6900) /usr/local/go/src/net/http/transport.go:2093 net/http.(*Transport).dialConn /usr/local/go/src/net/http/transport.go:1750 goroutine 40 [syscall] os/signal.signal_recv() /usr/local/go/src/runtime/sigqueue.go:151 os/signal.loop() /usr/local/go/src/os/signal/signal_unix.go:23 os/signal.Notify.func1.1 /usr/local/go/src/os/signal/signal.go:151 goroutine 10 [select] github.com/onsi/ginkgo/v2/internal/interrupt_handler.(*InterruptHandler).registerForInterrupts.func2(0x0?) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go:123 github.com/onsi/ginkgo/v2/internal/interrupt_handler.(*InterruptHandler).registerForInterrupts /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go:120 goroutine 25 [select] github.com/onsi/ginkgo/v2/internal.RegisterForProgressSignal.func1() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:32 github.com/onsi/ginkgo/v2/internal.RegisterForProgressSignal /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:30 goroutine 67 [IO wait] internal/poll.runtime_pollWait(0x7f421cf81c98, 0x72) /usr/local/go/src/runtime/netpoll.go:302 internal/poll.(*pollDesc).wait(0xc00012de00?, 0xc000142000?, 0x0) /usr/local/go/src/internal/poll/fd_poll_runtime.go:83 internal/poll.(*pollDesc).waitRead(...) /usr/local/go/src/internal/poll/fd_poll_runtime.go:88 internal/poll.(*FD).Read(0xc00012de00, {0xc000142000, 0xa510, 0xa510}) /usr/local/go/src/internal/poll/fd_unix.go:167 net.(*netFD).Read(0xc00012de00, {0xc000142000?, 0xc0005c01a0?, 0xc000142005?}) /usr/local/go/src/net/fd_posix.go:55 net.(*conn).Read(0xc0005bc530, {0xc000142000?, 0x64fa?, 0xc0005c01a0?}) /usr/local/go/src/net/net.go:183 crypto/tls.(*atLeastReader).Read(0xc0006a05a0, {0xc000142000?, 0x0?, 0x0?}) /usr/local/go/src/crypto/tls/conn.go:785 bytes.(*Buffer).ReadFrom(0xc0001b4978, {0x1bcd3a0, 0xc0006a05a0}) /usr/local/go/src/bytes/buffer.go:204 crypto/tls.(*Conn).readFromUntil(0xc0001b4700, {0x1bd05c0?, 0xc0005bc530}, 0xa510?) /usr/local/go/src/crypto/tls/conn.go:807 crypto/tls.(*Conn).readRecordOrCCS(0xc0001b4700, 0x0) /usr/local/go/src/crypto/tls/conn.go:614 crypto/tls.(*Conn).readRecord(...) /usr/local/go/src/crypto/tls/conn.go:582 crypto/tls.(*Conn).Read(0xc0001b4700, {0xc000357000, 0x1000, 0x0?}) /usr/local/go/src/crypto/tls/conn.go:1285 bufio.(*Reader).Read(0xc0007819e0, {0xc000354740, 0x9, 0xc0004f2508?}) /usr/local/go/src/bufio/bufio.go:236 io.ReadAtLeast({0x1bcd220, 0xc0007819e0}, {0xc000354740, 0x9, 0x9}, 0x9) /usr/local/go/src/io/io.go:331 io.ReadFull(...) /usr/local/go/src/io/io.go:350 golang.org/x/net/http2.readFrameHeader({0xc000354740?, 0x9?, 0xc001283da0?}, {0x1bcd220?, 0xc0007819e0?}) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/frame.go:237 golang.org/x/net/http2.(*Framer).ReadFrame(0xc000354700) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/frame.go:498 golang.org/x/net/http2.(*clientConnReadLoop).run(0xc0005e3f98) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/transport.go:2224 golang.org/x/net/http2.(*ClientConn).readLoop(0xc000368f00) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/transport.go:2119 golang.org/x/net/http2.(*Transport).newClientConn /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/transport.go:817 goroutine 117 [select] net/http.(*persistConn).writeLoop(0xc0000d6900) /usr/local/go/src/net/http/transport.go:2392 net/http.(*Transport).dialConn /usr/local/go/src/net/http/transport.go:1751 + > Enter [It] remove the label from the managed cluster - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 @ 06/03/23 03:16:49.985 STEP: Check the label is deleted - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:114 @ 06/03/23 03:16:49.985 [INTERRUPTED] Interrupted by User In [It] at: /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 @ 06/03/23 03:16:51.056 This is the Progress Report generated when the interrupt was received: Updating cluster label from HoH manager remove the label from the managed cluster (Spec Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 In [It] (Node Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 At [By Step] Check the label is deleted (Step Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:114 Spec Goroutine goroutine 63 [select] github.com/onsi/gomega/internal.(*AsyncAssertion).match(0xc000625260, {0x1bd98d0?, 0x28a87d0}, 0x0, {0x0, 0x0, 0x0}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/gomega/internal/async_assertion.go:426 github.com/onsi/gomega/internal.(*AsyncAssertion).ShouldNot(0xc000625260, {0x1bd98d0, 0x28a87d0}, {0x0, 0x0, 0x0}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/gomega/internal/async_assertion.go:116 > github.com/stolostron/multicluster-global-hub/test/pkg/e2e.glob..func4.4() /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:131 | } | return nil > }, 3*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) | } | }) github.com/onsi/ginkgo/v2/internal.extractBodyFunction.func3({0x0, 0xc0007c8600}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/node.go:445 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode.func3() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:820 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:807 Other Goroutines goroutine 8 [running] github.com/onsi/ginkgo/v2/internal.extractRunningGoroutines() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:181 github.com/onsi/ginkgo/v2/internal.NewProgressReport(_, {{0xc000579190, 0x1, 0x1}, {0xc00062c9c0, 0x1, 0x1}, {0xc000a0aeb8, 0x1, 0x1}, ...}, ...) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:75 github.com/onsi/ginkgo/v2/internal.(*Suite).generateProgressReport(_, _) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:339 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode(_, {0x14, 0x4, {0x19a5412, 0x29}, 0xc00044adb0, {{0x1f85dc9, 0x47}, 0x68, {0x0, ...}, ...}, ...}, ...) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:900 github.com/onsi/ginkgo/v2/internal.(*group).attemptSpec(0xc0006e1090, 0x1, {{0xc00043f500?, 0xc00062c9c0?, 0x1?}, 0x0?}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/group.go:190 github.com/onsi/ginkgo/v2/internal.(*group).run(0xc0006e1090, {0xc000780240?, 0x3?, 0x0?}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/group.go:330 github.com/onsi/ginkgo/v2/internal.(*Suite).runSpecs(0xc00021c000, {0x1979bf6, 0xc}, {0x28a87d0, 0x0, 0x0}, {0xc00004d3c0, 0x35}, 0x0, {0xc0001bb000, ...}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:441 github.com/onsi/ginkgo/v2/internal.(*Suite).Run(_, {_, _}, {_, _, _}, {_, _}, _, {0x1be8288, ...}, ...) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:110 github.com/onsi/ginkgo/v2.RunSpecs({0x1bd0be0, 0xc000103040}, {0x1979bf6, 0xc}, {0x0?, 0x0, 0x0?}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/core_dsl.go:296 github.com/stolostron/multicluster-global-hub/test/pkg/e2e.TestClient(0x0?) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:39 testing.tRunner(0xc000103040, 0x1a5c5c0) /usr/local/go/src/testing/testing.go:1439 testing.(*T).Run /usr/local/go/src/testing/testing.go:1486 goroutine 1 [chan receive] testing.(*T).Run(0xc000289d40, {0x19775f3?, 0x516be5?}, 0x1a5c5c0) /usr/local/go/src/testing/testing.go:1487 testing.runTests.func1(0xc000289d40?) /usr/local/go/src/testing/testing.go:1839 testing.tRunner(0xc000289d40, 0xc0000ffcd8) /usr/local/go/src/testing/testing.go:1439 testing.runTests(0xc0004a7d60?, {0x283c770, 0x1, 0x1}, {0x7f4246459108?, 0x40?, 0x0?}) /usr/local/go/src/testing/testing.go:1837 testing.(*M).Run(0xc0004a7d60) /usr/local/go/src/testing/testing.go:1719 main.main() _testmain.go:47 goroutine 18 [chan receive] k8s.io/klog.(*loggingT).flushDaemon(0xc0001b2240?) /home/cloud-user/multicluster-global-hub/vendor/k8s.io/klog/klog.go:1010 k8s.io/klog.init.0 /home/cloud-user/multicluster-global-hub/vendor/k8s.io/klog/klog.go:411 goroutine 116 [IO wait] internal/poll.runtime_pollWait(0x7f421cf819c8, 0x72) /usr/local/go/src/runtime/netpoll.go:302 internal/poll.(*pollDesc).wait(0xc00012cd00?, 0xc000315600?, 0x0) /usr/local/go/src/internal/poll/fd_poll_runtime.go:83 internal/poll.(*pollDesc).waitRead(...) /usr/local/go/src/internal/poll/fd_poll_runtime.go:88 internal/poll.(*FD).Read(0xc00012cd00, {0xc000315600, 0xd6b, 0xd6b}) /usr/local/go/src/internal/poll/fd_unix.go:167 net.(*netFD).Read(0xc00012cd00, {0xc000315600?, 0xc0004ec840?, 0xc000315605?}) /usr/local/go/src/net/fd_posix.go:55 net.(*conn).Read(0xc000011870, {0xc000315600?, 0xc0009be200?, 0x6c68c0?}) /usr/local/go/src/net/net.go:183 crypto/tls.(*atLeastReader).Read(0xc000117848, {0xc000315600?, 0x0?, 0x18a7ec0?}) /usr/local/go/src/crypto/tls/conn.go:785 bytes.(*Buffer).ReadFrom(0xc0001b5e78, {0x1bcd3a0, 0xc000117848}) /usr/local/go/src/bytes/buffer.go:204 crypto/tls.(*Conn).readFromUntil(0xc0001b5c00, {0x1bd05c0?, 0xc000011870}, 0x2?) /usr/local/go/src/crypto/tls/conn.go:807 crypto/tls.(*Conn).readRecordOrCCS(0xc0001b5c00, 0x0) /usr/local/go/src/crypto/tls/conn.go:614 crypto/tls.(*Conn).readRecord(...) /usr/local/go/src/crypto/tls/conn.go:582 crypto/tls.(*Conn).Read(0xc0001b5c00, {0xc0009d3000, 0x1000, 0x1?}) /usr/local/go/src/crypto/tls/conn.go:1285 net/http.(*persistConn).Read(0xc0000d6900, {0xc0009d3000?, 0xc0007c92c0?, 0xc0009d0d30?}) /usr/local/go/src/net/http/transport.go:1929 bufio.(*Reader).fill(0xc000206840) /usr/local/go/src/bufio/bufio.go:106 bufio.(*Reader).Peek(0xc000206840, 0x1) /usr/local/go/src/bufio/bufio.go:144 net/http.(*persistConn).readLoop(0xc0000d6900) /usr/local/go/src/net/http/transport.go:2093 net/http.(*Transport).dialConn /usr/local/go/src/net/http/transport.go:1750 goroutine 40 [syscall] os/signal.signal_recv() /usr/local/go/src/runtime/sigqueue.go:151 os/signal.loop() /usr/local/go/src/os/signal/signal_unix.go:23 os/signal.Notify.func1.1 /usr/local/go/src/os/signal/signal.go:151 goroutine 10 [select] github.com/onsi/ginkgo/v2/internal/interrupt_handler.(*InterruptHandler).registerForInterrupts.func2(0x0?) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go:123 github.com/onsi/ginkgo/v2/internal/interrupt_handler.(*InterruptHandler).registerForInterrupts /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/interrupt_handler/interrupt_handler.go:120 goroutine 25 [select] github.com/onsi/ginkgo/v2/internal.RegisterForProgressSignal.func1() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:32 github.com/onsi/ginkgo/v2/internal.RegisterForProgressSignal /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/progress_report.go:30 goroutine 67 [IO wait] internal/poll.runtime_pollWait(0x7f421cf81c98, 0x72) /usr/local/go/src/runtime/netpoll.go:302 internal/poll.(*pollDesc).wait(0xc00012de00?, 0xc000142000?, 0x0) /usr/local/go/src/internal/poll/fd_poll_runtime.go:83 internal/poll.(*pollDesc).waitRead(...) /usr/local/go/src/internal/poll/fd_poll_runtime.go:88 internal/poll.(*FD).Read(0xc00012de00, {0xc000142000, 0xa510, 0xa510}) /usr/local/go/src/internal/poll/fd_unix.go:167 net.(*netFD).Read(0xc00012de00, {0xc000142000?, 0xc0005c01a0?, 0xc000142005?}) /usr/local/go/src/net/fd_posix.go:55 net.(*conn).Read(0xc0005bc530, {0xc000142000?, 0x64fa?, 0xc0005c01a0?}) /usr/local/go/src/net/net.go:183 crypto/tls.(*atLeastReader).Read(0xc0006a05a0, {0xc000142000?, 0x0?, 0x0?}) /usr/local/go/src/crypto/tls/conn.go:785 bytes.(*Buffer).ReadFrom(0xc0001b4978, {0x1bcd3a0, 0xc0006a05a0}) /usr/local/go/src/bytes/buffer.go:204 crypto/tls.(*Conn).readFromUntil(0xc0001b4700, {0x1bd05c0?, 0xc0005bc530}, 0xa510?) /usr/local/go/src/crypto/tls/conn.go:807 crypto/tls.(*Conn).readRecordOrCCS(0xc0001b4700, 0x0) /usr/local/go/src/crypto/tls/conn.go:614 crypto/tls.(*Conn).readRecord(...) /usr/local/go/src/crypto/tls/conn.go:582 crypto/tls.(*Conn).Read(0xc0001b4700, {0xc000357000, 0x1000, 0x0?}) /usr/local/go/src/crypto/tls/conn.go:1285 bufio.(*Reader).Read(0xc0007819e0, {0xc000354740, 0x9, 0xc0004f2508?}) /usr/local/go/src/bufio/bufio.go:236 io.ReadAtLeast({0x1bcd220, 0xc0007819e0}, {0xc000354740, 0x9, 0x9}, 0x9) /usr/local/go/src/io/io.go:331 io.ReadFull(...) /usr/local/go/src/io/io.go:350 golang.org/x/net/http2.readFrameHeader({0xc000354740?, 0x9?, 0xc001283da0?}, {0x1bcd220?, 0xc0007819e0?}) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/frame.go:237 golang.org/x/net/http2.(*Framer).ReadFrame(0xc000354700) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/frame.go:498 golang.org/x/net/http2.(*clientConnReadLoop).run(0xc0005e3f98) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/transport.go:2224 golang.org/x/net/http2.(*ClientConn).readLoop(0xc000368f00) /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/transport.go:2119 golang.org/x/net/http2.(*Transport).newClientConn /home/cloud-user/multicluster-global-hub/vendor/golang.org/x/net/http2/transport.go:817 goroutine 117 [select] net/http.(*persistConn).writeLoop(0xc0000d6900) /usr/local/go/src/net/http/transport.go:2392 net/http.(*Transport).dialConn /usr/local/go/src/net/http/transport.go:1751 Interrupted by User First interrupt received; Ginkgo will run any cleanup and reporting nodes but will skip all remaining specs. Interrupt again to skip cleanup. Here's a current progress report: Updating cluster label from HoH manager remove the label from the managed cluster (Spec Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 In [It] (Node Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 At [By Step] Check the label is deleted (Step Runtime: 1.071s) /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:114 Spec Goroutine goroutine 63 [select] github.com/onsi/gomega/internal.(*AsyncAssertion).match(0xc000625260, {0x1bd98d0?, 0x28a87d0}, 0x0, {0x0, 0x0, 0x0}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/gomega/internal/async_assertion.go:426 github.com/onsi/gomega/internal.(*AsyncAssertion).ShouldNot(0xc000625260, {0x1bd98d0, 0x28a87d0}, {0x0, 0x0, 0x0}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/gomega/internal/async_assertion.go:116 > github.com/stolostron/multicluster-global-hub/test/pkg/e2e.glob..func4.4() /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:131 | } | return nil > }, 3*time.Minute, 5*time.Second).ShouldNot(HaveOccurred()) | } | }) github.com/onsi/ginkgo/v2/internal.extractBodyFunction.func3({0x0, 0xc0007c8600}) /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/node.go:445 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode.func3() /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:820 github.com/onsi/ginkgo/v2/internal.(*Suite).runNode /home/cloud-user/multicluster-global-hub/vendor/github.com/onsi/ginkgo/v2/internal/suite.go:807 < Exit [It] remove the label from the managed cluster - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-label_test.go:104 @ 06/03/23 03:16:51.057 (1.072s) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > Enter [AfterSuite] TOP-LEVEL - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:79 @ 06/03/23 03:16:51.059 < Exit [AfterSuite] TOP-LEVEL - /home/cloud-user/multicluster-global-hub/test/pkg/e2e/hoh-e2e-test_suite_test.go:79 @ 06/03/23 03:16:51.068 (9ms) + + + \ No newline at end of file diff --git a/test/setup/common.sh b/test/setup/common.sh old mode 100755 new mode 100644 diff --git a/test/setup/e2e_clean.sh b/test/setup/e2e_clean.sh old mode 100755 new mode 100644 diff --git a/test/setup/e2e_dependencies.sh b/test/setup/e2e_dependencies.sh old mode 100755 new mode 100644 index 42b4c72c4a..ca2e186d02 --- a/test/setup/e2e_dependencies.sh +++ b/test/setup/e2e_dependencies.sh @@ -37,16 +37,16 @@ function versionCompare() { function checkGolang() { export PATH=$PATH:/usr/local/go/bin if ! command -v go >/dev/null 2>&1; then - wget https://dl.google.com/go/go1.18.4.linux-amd64.tar.gz >/dev/null 2>&1 - sudo tar -C /usr/local/ -xvf go1.18.4.linux-amd64.tar.gz >/dev/null 2>&1 + wget https://dl.google.com/go/go1.19.8.linux-amd64.tar.gz >/dev/null 2>&1 + sudo tar -C /usr/local/ -xvf go1.19.8.linux-amd64.tar.gz >/dev/null 2>&1 sudo rm go1.18.4.linux-amd64.tar.gz fi - if [[ $(go version) < "go version go1.18" ]]; then - echo "go version is less than 1.18, update to 1.18" + if [[ $(go version) < "go version go1.19" ]]; then + echo "go version is less than 1.19, update to 1.19" sudo rm -rf /usr/local/go - wget https://dl.google.com/go/go1.18.4.linux-amd64.tar.gz >/dev/null 2>&1 - sudo tar -C /usr/local/ -xvf go1.18.4.linux-amd64.tar.gz >/dev/null 2>&1 - sudo rm go1.18.4.linux-amd64.tar.gz + wget https://dl.google.com/go/go1.19.8.linux-amd64.tar.gz >/dev/null 2>&1 + sudo tar -C /usr/local/ -xvf go1.19.8.linux-amd64.tar.gz >/dev/null 2>&1 + sudo rm go1.19.8.linux-amd64.tar.gz sleep 2 fi echo "go version: $(go version)" @@ -95,7 +95,7 @@ function checkKind() { function checkGinkgo() { if ! command -v ginkgo >/dev/null 2>&1; then - go install github.com/onsi/ginkgo/v2/ginkgo@latest + go install github.com/onsi/ginkgo/v2/ginkgo@v2.9.2 go get github.com/onsi/gomega/... sudo mv $(go env GOPATH)/bin/ginkgo ${binDir}/ginkgo fi diff --git a/test/setup/e2e_setup.sh b/test/setup/e2e_setup.sh old mode 100755 new mode 100644 index 1af6789bd3..0429f61576 --- a/test/setup/e2e_setup.sh +++ b/test/setup/e2e_setup.sh @@ -37,8 +37,8 @@ enableOLM $CTX_HUB 2>&1 >> $LOG & hover $! " Enable OLM for $CTX_HUB" # install some component in microshift in detached mode -bash ${CURRENT_DIR}/hoh/postgres_setup.sh $HOH_KUBECONFIG 2>&1 >> $LOG & -bash ${CURRENT_DIR}/hoh/kafka_setup.sh $HOH_KUBECONFIG 2>&1 >> $LOG & +# bash ${CURRENT_DIR}/hoh/postgres_setup.sh $HOH_KUBECONFIG 2>&1 >> $LOG & +# bash ${CURRENT_DIR}/hoh/kafka_setup.sh $HOH_KUBECONFIG 2>&1 >> $LOG & initHub $CTX_HUB 2>&1 >> $LOG & # init leafhub @@ -69,19 +69,19 @@ for i in $(seq 1 "${HUB_CLUSTER_NUM}"); do done # wait kafka to be ready -waitAppear "kubectl get pods -n kafka -l name=strimzi-cluster-operator --ignore-not-found | grep Running || true" 1200 -waitAppear "kubectl get kafka kafka-brokers-cluster -n kafka -o jsonpath='{.status.listeners[1].certificates[0]}' --ignore-not-found=true" 1200 +# waitAppear "kubectl get pods -n kafka -l name=strimzi-cluster-operator --ignore-not-found | grep Running || true" 1200 +# waitAppear "kubectl get kafka kafka-brokers-cluster -n kafka -o jsonpath='{.status.listeners[1].certificates[0]}' --ignore-not-found=true" 1200 # wait postgres to be ready -waitAppear "kubectl get secret hoh-pguser-postgres -n hoh-postgres --ignore-not-found=true" +# waitAppear "kubectl get secret hoh-pguser-postgres -n hoh-postgres --ignore-not-found=true" #deploy hoh #need the following labels to enable deploying agent in leaf hub cluster for i in $(seq 1 "${HUB_CLUSTER_NUM}"); do kubectl label managedcluster kind-$LEAF_HUB_NAME$i vendor=OpenShift --overwrite 2>&1 >> $LOG done -source ${CURRENT_DIR}/hoh/hoh_setup.sh >> $LOG 2>&1 & -hover $! "6 Deploy hub-of-hubs with $TAG" +# source ${CURRENT_DIR}/hoh/hoh_setup.sh >> $LOG 2>&1 & +# hover $! "6 Deploy hub-of-hubs with $TAG" export KUBECONFIG=$KUBECONFIG printf "%s\033[0;32m%s\n\033[0m" "[Access the Clusters]: " "export KUBECONFIG=$KUBECONFIG" diff --git a/test/setup/hoh/components/kafka-community-cluster.yaml b/test/setup/hoh/components/kafka-community-cluster.yaml index f9c7db5f24..cbc9dd5c59 100644 --- a/test/setup/hoh/components/kafka-community-cluster.yaml +++ b/test/setup/hoh/components/kafka-community-cluster.yaml @@ -27,7 +27,9 @@ spec: - name: external port: 9095 type: nodeport - tls: true + tls: true + # authentication: # the hostname of nodeport is not fixed, so we can't use tls, + # type: tls # https://strimzi.io/blog/2019/04/23/accessing-kafka-part-2/ configuration: bootstrap: nodePort: 30095 @@ -79,3 +81,27 @@ spec: replicas: 2 config: cleanup.policy: compact +--- +apiVersion: kafka.strimzi.io/v1beta2 +kind: KafkaTopic +metadata: + name: event + namespace: kafka + labels: + strimzi.io/cluster: kafka-brokers-cluster +spec: + partitions: 1 + replicas: 2 + config: + cleanup.policy: compact +# --- +# apiVersion: kafka.strimzi.io/v1beta2 +# kind: KafkaUser +# metadata: +# name: global-hub-kafka-user +# namespace: kafka +# labels: +# strimzi.io/cluster: kafka-brokers-cluster +# spec: +# authentication: +# type: tls diff --git a/test/setup/hoh/hoh_setup.sh b/test/setup/hoh/hoh_setup.sh old mode 100755 new mode 100644 diff --git a/test/setup/hoh/kafka_setup.sh b/test/setup/hoh/kafka_setup.sh old mode 100755 new mode 100644 index c9577fe063..c337d51ebe --- a/test/setup/hoh/kafka_setup.sh +++ b/test/setup/hoh/kafka_setup.sh @@ -30,12 +30,21 @@ waitAppear "kubectl get kafkatopic spec -n kafka --ignore-not-found | grep spec waitAppear "kubectl get kafkatopic status -n kafka --ignore-not-found | grep status || true" echo "Kafka topics spec and status are ready!" +# kafkaUser=global-hub-kafka-user +# waitAppear "kubectl get secret ${kafkaUser} -n kafka --ignore-not-found" +# echo "Kafka user ${kafkaUser} is ready!" + # generate transport secret bootstrapServers=$(kubectl get kafka kafka-brokers-cluster -n kafka -o jsonpath='{.status.listeners[1].bootstrapServers}') -kubectl get kafka kafka-brokers-cluster -n kafka -o jsonpath='{.status.listeners[1].certificates[0]}' > $setupDir/config/kafka-cert.pem +kubectl get kafka kafka-brokers-cluster -n kafka -o jsonpath='{.status.listeners[1].certificates[0]}' > $setupDir/config/kafka-ca-cert.pem +# kubectl get secret ${kafkaUser} -n kafka -o jsonpath='{.data.user\.crt}' | base64 -d > $setupDir/config/kafka-client-cert.pem +# kubectl get secret ${kafkaUser} -n kafka -o jsonpath='{.data.user\.key}' | base64 -d > $setupDir/config/kafka-client-key.pem + kubectl create secret generic $transportSecret -n $targetNamespace \ --from-literal=bootstrap_server=$bootstrapServers \ - --from-file=ca.crt=$setupDir/config/kafka-cert.pem + --from-file=ca.crt=$setupDir/config/kafka-ca-cert.pem + # --from-file=client.crt=$setupDir/config/kafka-client-cert.pem \ + # --from-file=client.key=$setupDir/config/kafka-client-key.pem echo "transport secret is ready!" diff --git a/test/setup/hoh/postgres_setup.sh b/test/setup/hoh/postgres_setup.sh old mode 100755 new mode 100644 diff --git a/test/setup/leafhub_clean.sh b/test/setup/leafhub_clean.sh old mode 100755 new mode 100644 diff --git a/test/setup/leafhub_setup.sh b/test/setup/leafhub_setup.sh old mode 100755 new mode 100644 diff --git a/test/setup/microshift/microshift_setup.sh b/test/setup/microshift/microshift_setup.sh old mode 100755 new mode 100644