minor fix for kubernetes plugin

AgnostiqHQ · Jan 18, 2024 · 8330a1e · 8330a1e
1 parent da9b1b6
commit 8330a1e
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -114,9 +114,8 @@ ipython_config.py
 # Coverage
 .coverage
 
-infra/.terraform/*
-infra/*.tfstate*
-infra/cluster_autoscaler.yml
-infra/.terraform.lock.hcl
-infra/covalent-eks-cluster_config
-infra/.tfvars
+.terraform
+*.tfstate*
+*.terraform.lock.hcl
+covalent-eks-cluster_config
+*.tfvars
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+## Changed
+
+- Changed the folder structure for the terraform files matching standard plugin folder format
+- Minor code changes to kubernetes yml files
+
 ## [0.2.0] - 2023-09-20
 
 ### Changed

diff --git a/Makefile b/Makefile
@@ -5,8 +5,8 @@ all:
 	@echo "To tear down infrastructure, use 'make clean'."
 
 deploy:
-	(cd infra && bash ./deploy-eks.sh)
+	(cd covalent_kubernetes_plugin/assets/infra && bash ./deploy-eks.sh)
 
 clean:
-	(cd infra && terraform destroy -auto-approve -state $(HOME)/.cache/covalent/terraform.tfstate)
-	rm -f infra/cluster_autoscaler.yml
+	(cd covalent_kubernetes_plugin/assets/infra && terraform destroy -auto-approve -state $(HOME)/.cache/covalent/terraform.tfstate)
+	rm -f covalent_kubernetes_plugin/infra/templates/cluster_autoscaler.yml
diff --git a/infra/covalent_eks.tf → ...netes_plugin/assets/infra/covalent_eks.tf b/infra/covalent_eks.tf → ...netes_plugin/assets/infra/covalent_eks.tf
@@ -18,7 +18,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 4.23"
+      version = "5.17.0"
     }
   }
 }
@@ -83,6 +83,7 @@ resource "aws_ecr_repository" "ecr_repository" {
 
 resource "aws_s3_bucket" "s3_bucket" {
   bucket = var.aws_s3_bucket
+  force_destroy = true
 }
 
 data "aws_iam_policy_document" "s3_access_document" {

diff --git a/infra/deploy-eks.sh → ...ernetes_plugin/assets/infra/deploy-eks.sh b/infra/deploy-eks.sh → ...ernetes_plugin/assets/infra/deploy-eks.sh
diff --git a/infra/eks-admin-service-account.yaml → ...sets/infra/eks-admin-service-account.yaml b/infra/eks-admin-service-account.yaml → ...sets/infra/eks-admin-service-account.yaml
diff --git a/infra/outputs.tf → ...kubernetes_plugin/assets/infra/outputs.tf b/infra/outputs.tf → ...kubernetes_plugin/assets/infra/outputs.tf
diff --git a/infra/sample_job.yaml → ...netes_plugin/assets/infra/sample_job.yaml b/infra/sample_job.yaml → ...netes_plugin/assets/infra/sample_job.yaml
@@ -21,8 +21,8 @@ metadata:
 spec:
   template:
     spec:
+      restartPolicy: Never
       containers:
       - name: covalent-k8s-test
-	image: "hello-world:latest"
-      restartPolicy: Never
-  backoffLimit: 4
+        image: hello-world:latest
+  backoffLimit: 4
diff --git a/infra/templates/cluster_autoscaler.yml → ...ts/infra/templates/cluster_autoscaler.yml b/infra/templates/cluster_autoscaler.yml → ...ts/infra/templates/cluster_autoscaler.yml
diff --git a/infra/templates/config.tpl → ..._plugin/assets/infra/templates/config.tpl b/infra/templates/config.tpl → ..._plugin/assets/infra/templates/config.tpl
diff --git a/infra/variables.tf → ...bernetes_plugin/assets/infra/variables.tf b/infra/variables.tf → ...bernetes_plugin/assets/infra/variables.tf
diff --git a/covalent_kubernetes_plugin/k8s.py b/covalent_kubernetes_plugin/k8s.py
@@ -220,11 +220,12 @@ def _format_exec_script(
 
         # Execution preamble
         exec_script = """
-import os
-import cloudpickle as pickle
 
-local_func_filename = os.path.join("{docker_working_dir}", "{func_filename}")
-local_result_filename = os.path.join("{docker_working_dir}", "{result_filename}")
+        import os
+        import cloudpickle as pickle
+
+        local_func_filename = os.path.join("{docker_working_dir}", "{func_filename}")
+        local_result_filename = os.path.join("{docker_working_dir}", "{result_filename}")
 
         """.format(
             docker_working_dir=docker_working_dir,
@@ -449,6 +450,7 @@ def _package_and_upload(
                 raise Exception(proc.stderr.decode("utf-8"))
         else:
             app_log.debug("Uploading image to ECR.")
+            app_log.debug(f"the image URI is {image_uri}")
             response = docker_client.images.push(image_uri, tag=image_tag)
             app_log.debug(f"Response: {response}")
 

diff --git a/infra/defaults.tfvars b/infra/defaults.tfvars
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
-covalent==0.177.0.post1.dev1
+covalent==0.220.0.post2
 docker==6.0.0
 kubernetes==24.2.0