move them to infra tests

Signed-off-by: Tarun Pothulapati <[email protected]>

Author: Pothulapati

.werft/installer-tests.ts

@@ -99,6 +99,7 @@ const TEST_CONFIGURATIONS: { [name: string]: TestConfig } = {
         DESCRIPTION: `${op} an EKS cluster(version ${k8s_version})`,
         PHASES: [
             "STANDARD_EKS_CLUSTER",
+            "CALICO",
             "CERT_MANAGER",
             "EXTERNALDNS",
             "CLUSTER_ISSUER",
@@ -168,6 +169,11 @@ const INFRA_PHASES: { [name: string]: InfraConfig } = {
         makeTarget: "external-dns",
         description: `Deploys external-dns with ${cloud} provider`,
     },
+    CALICO: {
+        phase: "calico",
+        makeTarget: "calico",
+        description: `Deploys Calico`,
+    },
     ADD_NS_RECORD: {
         phase: "add-ns-record",
         makeTarget: "add-ns-record",

install/tests/Makefile

@@ -180,9 +180,15 @@ k3s-standard-cluster: check-env-cluster-version
 	@echo "Done creating k3s cluster"
 
 .PHONY:
-## cert-manager: Installs cert-manager, optionally create secret for cloud-dns access
-cert-manager:
+## calico: Installs calico
+calico:
 	$(MAKE) select-workspace && \
+	terraform apply -target=module.aws-calico -var kubeconfig=${KUBECONFIG} --auto-approve
+	@echo "Done installing Calico"
+
+.PHONY:
+## cert-manager: Installs cert-manager, optionally create secret for cloud-dns access
+cert-manager: check-env-cloud select-workspace
 	terraform apply -target=module.certmanager -var kubeconfig=${KUBECONFIG} --auto-approve
 	@echo "Done installing cert-manager"
 

install/tests/main.tf

@@ -13,7 +13,7 @@ variable "project" { default = "sh-automated-tests" }
 variable "sa_creds" { default = null }
 variable "dns_sa_creds" { default = null }
 
-data local_file "dns_credentials" {
+data "local_file" "dns_credentials" {
   filename = var.dns_sa_creds
 }
 
@@ -62,10 +62,10 @@ module "k3s" {
 }
 
 module "gcp-issuer" {
-  source      = "../infra/modules/tools/issuer"
-  kubeconfig  = var.kubeconfig
+  source          = "../infra/modules/tools/issuer"
+  kubeconfig      = var.kubeconfig
   gcp_credentials = data.local_file.dns_credentials.content
-  issuer_name = "cloudDNS"
+  issuer_name     = "cloudDNS"
   cert_manager_issuer = {
     project = "dns-for-playgrounds"
     serviceAccountSecretRef = {
@@ -91,14 +91,14 @@ module "aks" {
 }
 
 module "eks" {
-  source                 = "../infra/modules/eks"
-  domain_name            = "${var.TEST_ID}.${var.domain}"
-  cluster_name           = var.TEST_ID
-  region                 = "eu-west-1"
-  vpc_availability_zones = ["eu-west-1c", "eu-west-1b"]
-  image_id               = var.eks_node_image_id
-  kubeconfig             = var.kubeconfig
-  cluster_version        = var.cluster_version
+  source                   = "../infra/modules/eks"
+  domain_name              = "${var.TEST_ID}.${var.domain}"
+  cluster_name             = var.TEST_ID
+  region                   = "eu-west-1"
+  vpc_availability_zones   = ["eu-west-1c", "eu-west-1b"]
+  image_id                 = var.eks_node_image_id
+  kubeconfig               = var.kubeconfig
+  cluster_version          = var.cluster_version
   create_external_registry = true
   create_external_database = true
   create_external_storage  = true
@@ -110,7 +110,7 @@ module "certmanager" {
   # source = "github.com/gitpod-io/gitpod//install/infra/terraform/tools/cert-manager?ref=main"
   source = "../infra/modules/tools/cert-manager"
 
-  kubeconfig  = var.kubeconfig
+  kubeconfig = var.kubeconfig
 }
 
 module "clouddns-externaldns" {
@@ -161,6 +161,11 @@ module "azure-add-dns-record" {
   domain_name      = "${var.TEST_ID}.${var.domain}"
 }
 
+module "aws-calico" {
+  source     = "../infra/modules/tools/aws-calico"
+  kubeconfig = var.kubeconfig
+}
+
 module "aws-add-dns-record" {
   source           = "../infra/modules/tools/cloud-dns-ns"
   credentials      = var.dns_sa_creds