From b1afdc3fe4b38e333b8dee7b5e2153698eb309b6 Mon Sep 17 00:00:00 2001 From: gkan Date: Fri, 24 Jun 2022 09:27:06 -0700 Subject: [PATCH 01/15] enabling-testkube --- .github/workflows/terragrunt-dev.yaml | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 785d41b38..2beb2f09b 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -203,13 +203,13 @@ jobs: KUBERGRUNT_EXEC: ${{ github.workspace }}/tmp_bin/kubergrunt # TF_LOG: DEBUG - # - name: Testkube Pre-Apply - # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - # id: testkube - # uses: ManagedKube/github-action-testkube@v1.0.14 - # with: - # test-suite-name: 'infra-base' - # cluster-name: ${{ env.ENVIRONMENT_NAME }} + - name: Testkube Pre-Apply + # if: github.ref == 'refs/heads/master' && github.event_name == 'push' + id: testkube + uses: ManagedKube/github-action-testkube@v1.0.14 + with: + test-suite-name: 'infra-base' + cluster-name: ${{ env.ENVIRONMENT_NAME }} - name: Terragrunt Apply if: github.ref == 'refs/heads/main' && github.event_name == 'push' @@ -225,10 +225,10 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} KUBERGRUNT_EXEC: ${{ github.workspace }}/tmp_bin/kubergrunt - # - name: Testkube Post-Apply - # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - # id: testkube - # uses: ManagedKube/github-action-testkube@v1.0.14 - # with: - # test-suite-name: 'infra-base' - # cluster-name: ${{ env.ENVIRONMENT_NAME }} + - name: Testkube Post-Apply + if: github.ref == 'refs/heads/master' && github.event_name == 'push' + id: testkube + uses: ManagedKube/github-action-testkube@v1.0.14 + with: + test-suite-name: 'infra-base' + cluster-name: ${{ env.ENVIRONMENT_NAME }} From 899d3e426ad4189a3a70aeccb3836e8dae5140e3 Mon Sep 17 00:00:00 2001 From: gkan Date: Fri, 24 Jun 2022 09:58:52 -0700 Subject: [PATCH 02/15] Touching local-tests file to induce a gha run --- terraform-environments/aws/terragrunt-dev/progress.md | 8 ++++++++ .../110-testkube/30-local-tests/terragrunt.hcl | 1 + 2 files changed, 9 insertions(+) diff --git a/terraform-environments/aws/terragrunt-dev/progress.md b/terraform-environments/aws/terragrunt-dev/progress.md index c934d2e32..52c40a7b7 100644 --- a/terraform-environments/aws/terragrunt-dev/progress.md +++ b/terraform-environments/aws/terragrunt-dev/progress.md @@ -332,3 +332,11 @@ getting this one certificate would be good enough. PR: https://github.com/ManagedKube/kubernetes-ops/pull/343 Can reach grafana at this URL: https://grafana.terragrunt-dev.managedkube.com + +# enabling testkube + +PR: https://github.com/ManagedKube/kubernetes-ops/pull/346 + +We added testkube deployments into the cluster above but it was disabled b/c the initial +test was testing to see if the prometheus endpoint was up or not. Now that it is, +we can enable it so that it would actually pass. diff --git a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl index d0dd9acbe..673f0a974 100644 --- a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl +++ b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl @@ -62,3 +62,4 @@ locals { inputs = { app_namespace = "my-app" } + From 1fd3c1168957d7960072f1274c6bbc1c908a4d65 Mon Sep 17 00:00:00 2001 From: gkan Date: Fri, 24 Jun 2022 10:02:21 -0700 Subject: [PATCH 03/15] removing duplicate id in the gha file --- .github/workflows/terragrunt-dev.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 2beb2f09b..3db1f38f2 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -205,7 +205,6 @@ jobs: - name: Testkube Pre-Apply # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - id: testkube uses: ManagedKube/github-action-testkube@v1.0.14 with: test-suite-name: 'infra-base' @@ -227,7 +226,6 @@ jobs: - name: Testkube Post-Apply if: github.ref == 'refs/heads/master' && github.event_name == 'push' - id: testkube uses: ManagedKube/github-action-testkube@v1.0.14 with: test-suite-name: 'infra-base' From 463e1033f686818486102094b0c3bd634b066dcb Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 11:49:16 -0700 Subject: [PATCH 04/15] Testing with infra-local ts --- .github/workflows/terragrunt-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 3db1f38f2..15ca0bf11 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -207,7 +207,7 @@ jobs: # if: github.ref == 'refs/heads/master' && github.event_name == 'push' uses: ManagedKube/github-action-testkube@v1.0.14 with: - test-suite-name: 'infra-base' + test-suite-name: infra-local #'infra-base' cluster-name: ${{ env.ENVIRONMENT_NAME }} - name: Terragrunt Apply From f48d27af56daa1196c00d2a7f23e9de06b909951 Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 14:30:13 -0700 Subject: [PATCH 05/15] Updating local infra kubetest --- .../300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl | 1 + .../local/yaml/local-x2-api-gateway-endpoint.yaml.tftpl | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl index 673f0a974..e1819067f 100644 --- a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl +++ b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/30-local-tests/terragrunt.hcl @@ -63,3 +63,4 @@ inputs = { app_namespace = "my-app" } + diff --git a/terraform-modules/aws/testkube/local/yaml/local-x2-api-gateway-endpoint.yaml.tftpl b/terraform-modules/aws/testkube/local/yaml/local-x2-api-gateway-endpoint.yaml.tftpl index 9a8a38352..a46cc28ef 100644 --- a/terraform-modules/aws/testkube/local/yaml/local-x2-api-gateway-endpoint.yaml.tftpl +++ b/terraform-modules/aws/testkube/local/yaml/local-x2-api-gateway-endpoint.yaml.tftpl @@ -9,7 +9,7 @@ spec: { "command": [ "curl", - "http://my-app.${namespace}.svc:80/public-routes" + "http://my-app.${namespace}.svcxxx:80/public-routes" ], "expected_status": "200", "expected_body": "my-app is up" From 9fd283e9d9032d04e22da2f4df290c1ff917217a Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 14:37:00 -0700 Subject: [PATCH 06/15] Running both testkube suites in the gha pipeline --- .github/workflows/terragrunt-dev.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 15ca0bf11..0ec6dfd04 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -203,6 +203,13 @@ jobs: KUBERGRUNT_EXEC: ${{ github.workspace }}/tmp_bin/kubergrunt # TF_LOG: DEBUG + - name: Testkube Pre-Apply - infra-base + # if: github.ref == 'refs/heads/master' && github.event_name == 'push' + uses: ManagedKube/github-action-testkube@v1.0.14 + with: + test-suite-name: infra-base + cluster-name: ${{ env.ENVIRONMENT_NAME }} + - name: Testkube Pre-Apply # if: github.ref == 'refs/heads/master' && github.event_name == 'push' uses: ManagedKube/github-action-testkube@v1.0.14 From eab20cead3baa7257feee46b1b6865d3c3f15fdf Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 14:44:28 -0700 Subject: [PATCH 07/15] Fixing alert manager testkube test --- .../300-kubernetes/110-testkube/20-infra-base/terragrunt.hcl | 2 +- .../test-suites/infra-base/yaml/alert-manager-slack-config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/20-infra-base/terragrunt.hcl b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/20-infra-base/terragrunt.hcl index 4038ba667..894631924 100644 --- a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/20-infra-base/terragrunt.hcl +++ b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/20-infra-base/terragrunt.hcl @@ -4,7 +4,7 @@ include { } terraform { - source = "github.com/ManagedKube/kubernetes-ops.git//terraform-modules/aws/testkube/base-tests/test-suites/infra-base?ref=v2.0.11" + source = "github.com/ManagedKube/kubernetes-ops.git//terraform-modules/aws/testkube/base-tests/test-suites/infra-base?ref=enabling-testkube" } dependency "eks" { diff --git a/terraform-modules/aws/testkube/base-tests/test-suites/infra-base/yaml/alert-manager-slack-config.yaml b/terraform-modules/aws/testkube/base-tests/test-suites/infra-base/yaml/alert-manager-slack-config.yaml index 8fdb2a4cd..4447026c9 100644 --- a/terraform-modules/aws/testkube/base-tests/test-suites/infra-base/yaml/alert-manager-slack-config.yaml +++ b/terraform-modules/aws/testkube/base-tests/test-suites/infra-base/yaml/alert-manager-slack-config.yaml @@ -9,7 +9,7 @@ spec: { "command": [ "curl", - "http://alertmanager-operated.monitoring.svc:9093/api/v2/status" + "http://kube-prometheus-stack-alertmanager.monitoring.svc:9093/api/v2/status" ], "expected_status": "200", "expected_body": "slack_configs" From f432eb06c5ef17da43577b5e44507948aa0a02ec Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 14:45:03 -0700 Subject: [PATCH 08/15] Disabling testkube to apply --- .github/workflows/terragrunt-dev.yaml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 0ec6dfd04..a4b1b9991 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -203,19 +203,19 @@ jobs: KUBERGRUNT_EXEC: ${{ github.workspace }}/tmp_bin/kubergrunt # TF_LOG: DEBUG - - name: Testkube Pre-Apply - infra-base - # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - uses: ManagedKube/github-action-testkube@v1.0.14 - with: - test-suite-name: infra-base - cluster-name: ${{ env.ENVIRONMENT_NAME }} + # - name: Testkube Pre-Apply - infra-base + # # if: github.ref == 'refs/heads/master' && github.event_name == 'push' + # uses: ManagedKube/github-action-testkube@v1.0.14 + # with: + # test-suite-name: infra-base + # cluster-name: ${{ env.ENVIRONMENT_NAME }} - - name: Testkube Pre-Apply - # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - uses: ManagedKube/github-action-testkube@v1.0.14 - with: - test-suite-name: infra-local #'infra-base' - cluster-name: ${{ env.ENVIRONMENT_NAME }} + # - name: Testkube Pre-Apply + # # if: github.ref == 'refs/heads/master' && github.event_name == 'push' + # uses: ManagedKube/github-action-testkube@v1.0.14 + # with: + # test-suite-name: infra-local #'infra-base' + # cluster-name: ${{ env.ENVIRONMENT_NAME }} - name: Terragrunt Apply if: github.ref == 'refs/heads/main' && github.event_name == 'push' From 333f0bcee4f994c8a4839b9016b1e7b1b7a163d9 Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 14:50:10 -0700 Subject: [PATCH 09/15] DEBUG: terraform apply --- .github/workflows/terragrunt-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index a4b1b9991..b5408742d 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -218,7 +218,7 @@ jobs: # cluster-name: ${{ env.ENVIRONMENT_NAME }} - name: Terragrunt Apply - if: github.ref == 'refs/heads/main' && github.event_name == 'push' + # if: github.ref == 'refs/heads/main' && github.event_name == 'push' uses: the-commons-project/terragrunt-github-actions@master with: tf_actions_version: ${{ env.tf_version }} From a2c4309cbb0c70bac59950ef6ff2137359d0fffe Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 14:53:45 -0700 Subject: [PATCH 10/15] Adding back in testkube tests --- .github/workflows/terragrunt-dev.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index b5408742d..eab5a9ead 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -203,12 +203,12 @@ jobs: KUBERGRUNT_EXEC: ${{ github.workspace }}/tmp_bin/kubergrunt # TF_LOG: DEBUG - # - name: Testkube Pre-Apply - infra-base - # # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - # uses: ManagedKube/github-action-testkube@v1.0.14 - # with: - # test-suite-name: infra-base - # cluster-name: ${{ env.ENVIRONMENT_NAME }} + - name: Testkube Pre-Apply - infra-base + # if: github.ref == 'refs/heads/master' && github.event_name == 'push' + uses: ManagedKube/github-action-testkube@v1.0.14 + with: + test-suite-name: infra-base + cluster-name: ${{ env.ENVIRONMENT_NAME }} # - name: Testkube Pre-Apply # # if: github.ref == 'refs/heads/master' && github.event_name == 'push' From 2127fa68cdf2b943e7ef3698d90a44ccc23b9362 Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 15:11:33 -0700 Subject: [PATCH 11/15] Updating testkube helm chart version --- .../300-kubernetes/110-testkube/10-testkube/terragrunt.hcl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl index c9ab2044c..ab60854ac 100644 --- a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl +++ b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl @@ -55,11 +55,13 @@ locals { # MODULE PARAMETERS # These are the variables we have to pass in to use the module specified in the terragrunt configuration above # --------------------------------------------------------------------------------------------------------------------- +# +# Chart source: https://github.com/kubeshop/helm-charts/tree/main/charts/testkube inputs = { repository = "https://kubeshop.github.io/helm-charts" official_chart_name = "testkube" user_chart_name = "testkube" - helm_version = "1.0.25" + helm_version = "1.2.43" namespace = "testkube" helm_values = file("values.yaml") } From 884412ebf0f852de682dcc0645e4d7705641e96d Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 15:14:41 -0700 Subject: [PATCH 12/15] Fixing .terraform.lock.hcl file name --- .../10-testkube/{terraform.lock.hcl => .terraform.lock.hcl} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/{terraform.lock.hcl => .terraform.lock.hcl} (100%) diff --git a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terraform.lock.hcl b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/.terraform.lock.hcl similarity index 100% rename from terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terraform.lock.hcl rename to terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/.terraform.lock.hcl From 065d62d429f156e539a3f8101de625517b396b65 Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 15:57:51 -0700 Subject: [PATCH 13/15] DEBUG: removing terraform apply --- .github/workflows/terragrunt-dev.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index eab5a9ead..426c569e8 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -210,15 +210,8 @@ jobs: test-suite-name: infra-base cluster-name: ${{ env.ENVIRONMENT_NAME }} - # - name: Testkube Pre-Apply - # # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - # uses: ManagedKube/github-action-testkube@v1.0.14 - # with: - # test-suite-name: infra-local #'infra-base' - # cluster-name: ${{ env.ENVIRONMENT_NAME }} - - name: Terragrunt Apply - # if: github.ref == 'refs/heads/main' && github.event_name == 'push' + if: github.ref == 'refs/heads/main' && github.event_name == 'push' uses: the-commons-project/terragrunt-github-actions@master with: tf_actions_version: ${{ env.tf_version }} From 3d2526dc04f9ece070bf0bdd6d33f29744b46c62 Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 16:09:45 -0700 Subject: [PATCH 14/15] Applying back testkube after a manual delete --- .github/workflows/terragrunt-dev.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 426c569e8..03ed811a5 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -203,15 +203,15 @@ jobs: KUBERGRUNT_EXEC: ${{ github.workspace }}/tmp_bin/kubergrunt # TF_LOG: DEBUG - - name: Testkube Pre-Apply - infra-base - # if: github.ref == 'refs/heads/master' && github.event_name == 'push' - uses: ManagedKube/github-action-testkube@v1.0.14 - with: - test-suite-name: infra-base - cluster-name: ${{ env.ENVIRONMENT_NAME }} + # - name: Testkube Pre-Apply - infra-base + # # if: github.ref == 'refs/heads/master' && github.event_name == 'push' + # uses: ManagedKube/github-action-testkube@v1.0.14 + # with: + # test-suite-name: infra-base + # cluster-name: ${{ env.ENVIRONMENT_NAME }} - name: Terragrunt Apply - if: github.ref == 'refs/heads/main' && github.event_name == 'push' + # if: github.ref == 'refs/heads/main' && github.event_name == 'push' uses: the-commons-project/terragrunt-github-actions@master with: tf_actions_version: ${{ env.tf_version }} From 44f20694fe2cc204bfa4765351961e4aff5d0072 Mon Sep 17 00:00:00 2001 From: gkan Date: Mon, 27 Jun 2022 16:35:22 -0700 Subject: [PATCH 15/15] Reverting to the older version --- .../300-kubernetes/110-testkube/10-testkube/terragrunt.hcl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl index ab60854ac..3676ea9b5 100644 --- a/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl +++ b/terraform-environments/aws/terragrunt-dev/us-east-1/terragrunt-dev/300-kubernetes/110-testkube/10-testkube/terragrunt.hcl @@ -61,7 +61,7 @@ inputs = { repository = "https://kubeshop.github.io/helm-charts" official_chart_name = "testkube" user_chart_name = "testkube" - helm_version = "1.2.43" + helm_version = "1.0.25" namespace = "testkube" helm_values = file("values.yaml") }