INFRA-35850: Remove v1 operator support (only v2 is supported now)

charts/terraform-cloud/CHANGELOG.md

@@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.9.0] - 2024-06-17
+### Removed
+- Remove v1 operator support (only v2 is supported now)
+
 ## [v1.8.1] - 2024-06-10
 ### Fixed
 - Fix handling of `workspaceNameOverride` - was being unset prior to rendering of Module

charts/terraform-cloud/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.8.1
+version: 1.9.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/terraform-cloud/README.md

@@ -1,6 +1,6 @@
 # terraform-cloud
 
-![Version: 1.8.1](https://img.shields.io/badge/Version-1.8.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
+![Version: 1.9.0](https://img.shields.io/badge/Version-1.9.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.0.0](https://img.shields.io/badge/AppVersion-2.0.0-informational?style=flat-square)
 
 A Helm chart for provisioning resources using Terraform Cloud
 
@@ -82,7 +82,6 @@ A Helm chart for provisioning resources using Terraform Cloud
 | global.terraform.executionMode | string | `"agent"` | Define where the Terraform code will be executed. |
 | global.terraform.externalSecrets | bool | `true` | Set to true as part of tf cloud migrations. When true, it stops standard-application-stack from creating AWS related external secrets and passes that responsibility to the terraform-cloud chart |
 | global.terraform.irsa | bool | `true` | Set to true as part of tf cloud migrations. When true, standard-application-stack sets the service account eks annotation to match the new IAM roles created by the app-iam module |
-| global.terraform.operatorVersion | string | `"v1"` | Operator version to use (v1 or v2) |
 | global.terraform.organization | string | `"Mintel"` | Name of our Terraform Cloud org |
 | global.terraform.secretsMountPath | string | `"/tmp/secrets"` | Where secrets are mounted inside the Terraform Operator container |
 | global.terraform.terraformVersion | string | `"1.3.10"` | Global Terraform version for all modules |

charts/terraform-cloud/templates/irsa-workspace.yaml

@@ -47,17 +47,7 @@
     {{- $_ := set $irsaConfig "k8s_namespace" $.Release.Namespace }}
   {{- end }}
   # Create the CRD
-{{- if eq $global.terraform.operatorVersion "migrate" }}
-  {{- include "mintel_common.terraform_cloud.workspace_v1" (list $ . $irsaConfig "irsa" $moduleSource $moduleVersion $tfVersion $irsa $notifications) }}
----
-  {{- include "mintel_common.terraform_cloud.module_v2" (list $ . $irsaConfig "irsa" $moduleSource $moduleVersion $tfVersion $irsa $notifications) }}
-{{- end }}
-{{- if eq $global.terraform.operatorVersion "v1" }}
-  {{- include "mintel_common.terraform_cloud.workspace_v1" (list $ . $irsaConfig "irsa" $moduleSource $moduleVersion $tfVersion $irsa $notifications) }}
-{{- end }}
-{{- if eq $global.terraform.operatorVersion "v2" }}
   {{- include "mintel_common.terraform_cloud.workspace_v2" (list $ . $irsaConfig "irsa" $moduleSource $moduleVersion $tfVersion $irsa $notifications) }}
 ---
   {{- include "mintel_common.terraform_cloud.module_v2" (list $ . $irsaConfig "irsa" $moduleSource $moduleVersion $tfVersion $irsa $notifications) }}
 {{- end }}
-{{- end }}

charts/terraform-cloud/templates/workspace.yaml

@@ -73,19 +73,9 @@
       {{- $instanceConfig = mergeOverwrite (include "mintel_common.terraform_cloud.defaultVarValues" $instanceDict | fromJson ) $instanceConfig }}
       # Create the CRD
 ---
-{{- if eq $global.terraform.operatorVersion "migrate" }}
-      {{- include "mintel_common.terraform_cloud.workspace_v1" (list $ . $instanceConfig $resourceType $moduleSource $moduleVersion $tfVersion $resourceConfig "") }}
----
-      {{- include "mintel_common.terraform_cloud.module_v2" (list $ . $instanceConfig $resourceType $moduleSource $moduleVersion $tfVersion $resourceConfig "") }}
-{{- end }}
-{{- if eq $global.terraform.operatorVersion "v1" }}
-      {{- include "mintel_common.terraform_cloud.workspace_v1" (list $ . $instanceConfig $resourceType $moduleSource $moduleVersion $tfVersion $resourceConfig "") }}
-{{- end }}
-{{- if eq $global.terraform.operatorVersion "v2" }}
       {{- include "mintel_common.terraform_cloud.workspace_v2" (list $ . $instanceConfig $resourceType $moduleSource $moduleVersion $tfVersion $resourceConfig "") }}
 ---
       {{- include "mintel_common.terraform_cloud.module_v2" (list $ . $instanceConfig $resourceType $moduleSource $moduleVersion $tfVersion $resourceConfig "") }}
-{{- end }}
     {{- end }}
   {{- end }}
 {{- end }}