Fix cert recreation

Author: vulkoingim

.werft/util/certs.ts

@@ -14,6 +14,19 @@ export class InstallCertificateParams {
 
 export async function certReady(werft: Werft, config: JobConfig, slice: string): Promise<boolean> {
     const certName = `harvester-${config.previewEnvironment.destname}`;
+    const cpu = config.withLargeVM ? 12 : 6;
+    const memory = config.withLargeVM ? 24 : 12;
+
+    // set some common vars for TF
+    // We pass the GCP credentials explicitly, otherwise for some reason TF doesn't pick them up
+    const commonVars = `GOOGLE_BACKEND_CREDENTIALS=${GCLOUD_SERVICE_ACCOUNT_PATH} \
+                        GOOGLE_APPLICATION_CREDENTIALS=${GCLOUD_SERVICE_ACCOUNT_PATH} \
+                        TF_VAR_dev_kube_path=${CORE_DEV_KUBECONFIG_PATH} \
+                        TF_VAR_harvester_kube_path=${HARVESTER_KUBECONFIG_PATH} \
+                        TF_VAR_preview_name=${config.previewEnvironment.destname} \
+                        TF_VAR_vm_cpu=${cpu} \
+                        TF_VAR_vm_memory=${memory}Gi \
+                        TF_VAR_vm_storage_class="longhorn-gitpod-k3s-202209251218-onereplica"`
 
     if (isCertReady(certName)){
         werft.log(slice, `Certificate ready`);
@@ -23,21 +36,17 @@ export async function certReady(werft: Werft, config: JobConfig, slice: string):
     const maxAttempts = 5
     var certReady = false
     for (var i = 1;i<=maxAttempts;i++) {
-        werft.log(slice, `Creating cert: Attempt ${i}`);
-        exec(`GOOGLE_BACKEND_CREDENTIALS=${GCLOUD_SERVICE_ACCOUNT_PATH} \
-                        GOOGLE_APPLICATION_CREDENTIALS=${GCLOUD_SERVICE_ACCOUNT_PATH} \
-                        TF_VAR_dev_kube_path=${CORE_DEV_KUBECONFIG_PATH} \
-                        TF_VAR_harvester_kube_path=${HARVESTER_KUBECONFIG_PATH} \
-                        TF_VAR_preview_name=${config.previewEnvironment.destname} \
-                        TF_CLI_ARGS_plan="-replace=kubernetes_manifest.cert" \
-                        ./dev/preview/workflow/preview/deploy-harvester.sh`,
-            {slice: slice})
-
         werft.log(slice, `Checking for cert readiness: Attempt ${i}`);
         if (waitCertReady(certName)) {
             certReady = true;
             break;
         }
+
+        werft.log(slice, `Creating cert: Attempt ${i}`);
+        exec(`${commonVars} \
+                        TF_CLI_ARGS_plan="-replace=kubernetes_manifest.cert" \
+                        ./dev/preview/workflow/preview/deploy-harvester.sh`,
+            {slice: slice})
     }
 
     if (!certReady) {

dev/preview/infrastructure/harvester/variables.tf

@@ -15,19 +15,18 @@ variable "dev_kube_path" {
 
 variable "vm_memory" {
   type        = string
-  default     = "2Gi"
+  default     = "12Gi"
   description = "Memory for the VM"
 }
 
 variable "vm_cpu" {
   type        = number
-  default     = 2
+  default     = 6
   description = "CPU for the VM"
 }
 
 variable "vm_storage_class" {
   type        = string
-  default     = "longhorn-gitpod-k3s-202209251218-onereplica"
   description = "The storage class for the VM"
 }