Add cleanup finalizer for aws/azure standalone templates (Mirantis#749)

Signed-off-by: Andrei Pavlov <[email protected]>
eromanova · Dec 12, 2024 · 4f51cd9 · 4f51cd9
1 parent 230ec7e
commit 4f51cd9
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -217,7 +217,7 @@ spec:
       iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io
       instanceType: ""
     workersNumber: 2
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: aws-credential
   dryRun: true
 ```
@@ -235,7 +235,7 @@ metadata:
   name: aws-standalone
   namespace: hmc-system
 spec:
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: aws-credential
   config:
     region: us-east-2

diff --git a/config/dev/aws-managedcluster.yaml b/config/dev/aws-managedcluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: aws-dev
   namespace: ${NAMESPACE}
 spec:
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: aws-cluster-identity-cred
   config:
     controlPlane:

diff --git a/config/dev/azure-managedcluster.yaml b/config/dev/azure-managedcluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: azure-dev
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-0-3
+  template: azure-standalone-cp-0-0-4
   credential: azure-cluster-identity-cred
   config:
     controlPlaneNumber: 1

diff --git a/templates/cluster/aws-standalone-cp/Chart.yaml b/templates/cluster/aws-standalone-cp/Chart.yaml
@@ -6,7 +6,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: 0.0.3
+version: 0.0.4
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/aws-standalone-cp/templates/awscluster.yaml b/templates/cluster/aws-standalone-cp/templates/awscluster.yaml
@@ -4,6 +4,8 @@ metadata:
   name: {{ include "cluster.name" . }}
   annotations:
     aws.cluster.x-k8s.io/external-resource-gc: "true"
+  finalizers:
+    - hmc.mirantis.com/cleanup
 spec:
   region: {{ .Values.region }}
   identityRef:

diff --git a/templates/cluster/azure-standalone-cp/Chart.yaml b/templates/cluster/azure-standalone-cp/Chart.yaml
@@ -6,7 +6,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: 0.0.3
+version: 0.0.4
 # 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
 # follow Semantic Versioning. They should reflect the version the application is using.

diff --git a/templates/cluster/azure-standalone-cp/templates/azurecluster.yaml b/templates/cluster/azure-standalone-cp/templates/azurecluster.yaml
@@ -2,6 +2,8 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1
 kind: AzureCluster
 metadata:
   name: {{ include "cluster.name" . }}
+  finalizers:
+    - hmc.mirantis.com/cleanup
 spec:
   {{- with .Values.clusterIdentity }}
   identityRef:

diff --git a/...es/templates/aws-standalone-cp-0-0-3.yaml → ...es/templates/aws-standalone-cp-0-0-4.yaml b/...es/templates/aws-standalone-cp-0-0-3.yaml → ...es/templates/aws-standalone-cp-0-0-4.yaml
@@ -1,14 +1,14 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: aws-standalone-cp-0-0-3
+  name: aws-standalone-cp-0-0-4
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: aws-standalone-cp
-      version: 0.0.3
+      version: 0.0.4
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/.../templates/azure-standalone-cp-0-0-3.yaml → .../templates/azure-standalone-cp-0-0-4.yaml b/.../templates/azure-standalone-cp-0-0-3.yaml → .../templates/azure-standalone-cp-0-0-4.yaml
@@ -1,14 +1,14 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: azure-standalone-cp-0-0-3
+  name: azure-standalone-cp-0-0-4
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: azure-standalone-cp
-      version: 0.0.3
+      version: 0.0.4
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

diff --git a/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/aws-standalone-cp.yaml.tpl
@@ -3,7 +3,7 @@ kind: ManagedCluster
 metadata:
   name: ${MANAGED_CLUSTER_NAME}
 spec:
-  template: aws-standalone-cp-0-0-3
+  template: aws-standalone-cp-0-0-4
   credential: ${AWS_CLUSTER_IDENTITY}-cred
   config:
     clusterIdentity:

diff --git a/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl b/test/e2e/managedcluster/resources/azure-standalone-cp.yaml.tpl
@@ -4,7 +4,7 @@ metadata:
   name: ${MANAGED_CLUSTER_NAME}
   namespace: ${NAMESPACE}
 spec:
-  template: azure-standalone-cp-0-0-3
+  template: azure-standalone-cp-0-0-4
   credential: ${AZURE_CLUSTER_IDENTITY}-cred
   config:
     controlPlaneNumber: 1