diff --git a/.github/workflows/terragrunt-dev.yaml b/.github/workflows/terragrunt-dev.yaml index 785d41b38..03ed811a5 100644 --- a/.github/workflows/terragrunt-dev.yaml +++ b/.github/workflows/terragrunt-dev.yaml @@ -203,16 +203,15 @@ 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 + # - 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' + # 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 }} @@ -225,10 +224,9 @@ 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' + uses: ManagedKube/github-action-testkube@v1.0.14 + with: + test-suite-name: 'infra-base' + cluster-name: ${{ env.ENVIRONMENT_NAME }} 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/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 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..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 @@ -55,6 +55,8 @@ 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" 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-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..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 @@ -62,3 +62,5 @@ locals { inputs = { app_namespace = "my-app" } + + 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" 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"