From 5b42254124ab82c00a0cd1e24d838752eb92adc9 Mon Sep 17 00:00:00 2001
From: Kyle Wuolle <kyle.wuolle@gmail.com>
Date: Fri, 20 Dec 2024 11:19:03 -0800
Subject: [PATCH] Remove k8s version and unused values per review

---
 config/dev/adopted-clusterdeployment.yaml      |  2 +-
 templates/cluster/adopted-cluster/Chart.yaml   |  2 +-
 .../templates/sveltoscluster.yaml              |  3 ---
 .../cluster/adopted-cluster/values.schema.json | 18 ------------------
 templates/cluster/adopted-cluster/values.yaml  |  1 -
 ...r-0-0-4.yaml => adopted-cluster-0-0-1.yaml} |  4 ++--
 6 files changed, 4 insertions(+), 26 deletions(-)
 rename templates/provider/hmc-templates/files/templates/{adopted-cluster-0-0-4.yaml => adopted-cluster-0-0-1.yaml} (84%)

diff --git a/config/dev/adopted-clusterdeployment.yaml b/config/dev/adopted-clusterdeployment.yaml
index 026bf985..c20e819d 100644
--- a/config/dev/adopted-clusterdeployment.yaml
+++ b/config/dev/adopted-clusterdeployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: adopted-dev
   namespace: ${NAMESPACE}
 spec:
-  template: adopted-cluster-0-0-4
+  template: adopted-cluster-0-0-1
   credential: adopted-cluster-cred
   config: {}
   services:
diff --git a/templates/cluster/adopted-cluster/Chart.yaml b/templates/cluster/adopted-cluster/Chart.yaml
index 53fa99c1..71b73c4f 100644
--- a/templates/cluster/adopted-cluster/Chart.yaml
+++ b/templates/cluster/adopted-cluster/Chart.yaml
@@ -6,6 +6,6 @@ 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.4
+version: 0.0.1
 annotations:
   cluster.x-k8s.io/provider: infrastructure-internal
diff --git a/templates/cluster/adopted-cluster/templates/sveltoscluster.yaml b/templates/cluster/adopted-cluster/templates/sveltoscluster.yaml
index dd189255..3c3c2aea 100644
--- a/templates/cluster/adopted-cluster/templates/sveltoscluster.yaml
+++ b/templates/cluster/adopted-cluster/templates/sveltoscluster.yaml
@@ -1,10 +1,7 @@
 apiVersion: lib.projectsveltos.io/v1beta1
 kind: SveltosCluster
 metadata:
-  labels:
-    projectsveltos.io/k8s-version: v1.31.1
   name: {{ include "cluster.name" . }}
-  namespace: {{ .Release.Namespace }}
 spec:
   consecutiveFailureThreshold: {{ .Values.consecutiveFailureThreshold }}
   kubeconfigName: {{ .Values.clusterIdentity.name }}
diff --git a/templates/cluster/adopted-cluster/values.schema.json b/templates/cluster/adopted-cluster/values.schema.json
index d54c0bd5..aaccae33 100644
--- a/templates/cluster/adopted-cluster/values.schema.json
+++ b/templates/cluster/adopted-cluster/values.schema.json
@@ -10,24 +10,6 @@
       "description": "The number of the failures prior to setting the status condition",
       "type": "integer",
       "minimum": 1
-    },
-    "clusterIdentity": {
-      "type": "object",
-      "description": "Adopted Cluster Identity object reference",
-      "required": [
-        "name",
-        "kind"
-      ],
-      "properties": {
-        "name": {
-          "description": "Adopted ClusterIdentity object name",
-          "type": "string"
-        },
-        "kind": {
-          "description": "Adopted ClusterIdentity object kind",
-          "type": "string"
-        }
-      }
     }
   }
 }
diff --git a/templates/cluster/adopted-cluster/values.yaml b/templates/cluster/adopted-cluster/values.yaml
index bb189ced..a0e9d4d8 100644
--- a/templates/cluster/adopted-cluster/values.yaml
+++ b/templates/cluster/adopted-cluster/values.yaml
@@ -2,6 +2,5 @@
 
 clusterIdentity:
   name: "adopted-cluster-identity"
-  kind: "Secret"
 
 consecutiveFailureThreshold: 3
diff --git a/templates/provider/hmc-templates/files/templates/adopted-cluster-0-0-4.yaml b/templates/provider/hmc-templates/files/templates/adopted-cluster-0-0-1.yaml
similarity index 84%
rename from templates/provider/hmc-templates/files/templates/adopted-cluster-0-0-4.yaml
rename to templates/provider/hmc-templates/files/templates/adopted-cluster-0-0-1.yaml
index 19ba46f5..d7a88a27 100644
--- a/templates/provider/hmc-templates/files/templates/adopted-cluster-0-0-4.yaml
+++ b/templates/provider/hmc-templates/files/templates/adopted-cluster-0-0-1.yaml
@@ -1,14 +1,14 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ClusterTemplate
 metadata:
-  name: adopted-cluster-0-0-4
+  name: adopted-cluster-0-0-1
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: adopted-cluster
-      version: 0.0.4
+      version: 0.0.1
       interval: 10m0s
       sourceRef:
         kind: HelmRepository