Merge branch 'main' into adopted-cluster

Signed-off-by: Kyle <[email protected]>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,23 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[bug] <your bug title here>"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. <step 1>
+2. <step 2>
+3. <step 3>
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/epic.md

@@ -0,0 +1,37 @@
+---
+name: Epic
+about: Feature request that is larger body of work
+title: ''
+labels: epic
+assignees: ''
+
+---
+
+**Goals**
+<business / project goals>
+
+**Major deliverables**
+<short description of the deliverables>
+
+**Who it benefits**
+<describe groups / target audience and what are the benefits of feature implementation for them>
+
+**Acceptance criteria**
+- <acc criterion 1>
+- <acc criterion 2>
+- <acc criterion 3>
+
+**Telemetry & Success Criteria**
+<is any telemetry data needed? If yes, what is it?>
+
+**Assumptions** 
+<any assumptions that are taken into account>
+
+**Limitations**
+<list of limitations>
+
+**Out of scope**
+<clear description of what is out of scope>
+
+**User stories** 
+<list of user stories>

.github/ISSUE_TEMPLATE/feature-request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[enhancement] <your feature request title>"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your enhancement / feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

README.md

@@ -20,13 +20,13 @@ Detailed documentation is available in [Project 0x2A Docs](https://mirantis.gith
 ### TL;DR
 
 ```bash
-kubectl apply -f https://github.com/Mirantis/hmc/releases/download/v0.0.4/install.yaml
+kubectl apply -f https://github.com/Mirantis/hmc/releases/download/v0.0.5/install.yaml
 ```
 
 or install using `helm`
 
 ```bash
-helm install hmc oci://ghcr.io/mirantis/hmc/charts/hmc --version 0.0.4 -n hmc-system --create-namespace
+helm install hmc oci://ghcr.io/mirantis/hmc/charts/hmc --version 0.0.5 -n hmc-system --create-namespace
 ```
 
 Then follow the [Deploy a cluster deployment](#deploy-a-cluster-deployment) guide to
@@ -83,7 +83,7 @@ spec:
   - name: cluster-api-provider-azure
   - name: cluster-api-provider-vsphere
   - name: projectsveltos
-  release: hmc-0-0-4
+  release: hmc-0-0-5
 ```
 
 There are two options to override the default management configuration of HMC:

api/v1alpha1/templates_common.go

@@ -68,6 +68,8 @@ type TemplateStatusCommon struct {
 	// ChartRef is a reference to a source controller resource containing the
 	// Helm chart representing the template.
 	ChartRef *helmcontrollerv2.CrossNamespaceSourceReference `json:"chartRef,omitempty"`
+	// ChartVersion represents the version of the Helm Chart associated with this template.
+	ChartVersion string `json:"chartVersion,omitempty"`
 	// Description contains information about the template.
 	Description string `json:"description,omitempty"`
 

go.mod

@@ -21,7 +21,7 @@ require (
 	github.com/stretchr/testify v1.10.0
 	github.com/vmware-tanzu/velero v1.15.0
 	gopkg.in/yaml.v3 v3.0.1
-	helm.sh/helm/v3 v3.16.3
+	helm.sh/helm/v3 v3.16.4
 	k8s.io/api v0.31.3
 	k8s.io/apiextensions-apiserver v0.31.3
 	k8s.io/apimachinery v0.31.3

go.sum

@@ -648,8 +648,8 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
 gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
-helm.sh/helm/v3 v3.16.3 h1:kb8bSxMeRJ+knsK/ovvlaVPfdis0X3/ZhYCSFRP+YmY=
-helm.sh/helm/v3 v3.16.3/go.mod h1:zeVWGDR4JJgiRbT3AnNsjYaX8OTJlIE9zC+Q7F7iUSU=
+helm.sh/helm/v3 v3.16.4 h1:rBn/h9MACw+QlhxQTjpl8Ifx+VTWaYsw3rguGBYBzr0=
+helm.sh/helm/v3 v3.16.4/go.mod h1:k8QPotUt57wWbi90w3LNmg3/MWcLPigVv+0/X4B8BzA=
 k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8=
 k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE=
 k8s.io/apiextensions-apiserver v0.31.3 h1:+GFGj2qFiU7rGCsA5o+p/rul1OQIq6oYpQw4+u+nciE=

internal/controller/template_controller.go

@@ -214,6 +214,8 @@ func (r *TemplateReconciler) ReconcileTemplate(ctx context.Context, template tem
 		Name:      hcChart.Name,
 		Namespace: hcChart.Namespace,
 	}
+	status.ChartVersion = hcChart.Spec.Version
+
 	if reportStatus, err := helm.ArtifactReady(hcChart); err != nil {
 		l.Info("HelmChart Artifact is not ready")
 		if reportStatus {

internal/telemetry/tracker.go

@@ -91,7 +91,7 @@ func (t *Tracker) trackClusterDeploymentHeartbeat(ctx context.Context) error {
 			string(clusterDeployment.UID),
 			clusterID,
 			clusterDeployment.Spec.Template,
-			template.Spec.Helm.ChartSpec.Version,
+			template.Status.ChartVersion,
 			template.Status.Providers,
 		)
 		if err != nil {

templates/provider/hmc-templates/Chart.yaml

@@ -13,4 +13,4 @@ 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.5

templates/provider/hmc-templates/files/release.yaml

@@ -1,13 +1,13 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: Release
 metadata:
-  name: hmc-0-0-4
+  name: hmc-0-0-5
   annotations:
     helm.sh/resource-policy: keep
 spec:
-  version: 0.0.4
+  version: 0.0.5
   hmc:
-    template: hmc-0-0-4
+    template: hmc-0-0-5
   capi:
     template: cluster-api-0-0-5
   providers:

templates/provider/hmc-templates/files/templates/hmc.yaml

@@ -1,14 +1,14 @@
 apiVersion: hmc.mirantis.com/v1alpha1
 kind: ProviderTemplate
 metadata:
-  name: hmc-0-0-4
+  name: hmc-0-0-5
   annotations:
     helm.sh/resource-policy: keep
 spec:
   helm:
     chartSpec:
       chart: hmc
-      version: 0.0.4
+      version: 0.0.5
       interval: 10m0s
       sourceRef:
         kind: HelmRepository

templates/provider/hmc/Chart.yaml

@@ -13,7 +13,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.4
+version: 0.0.5
 
 dependencies:
   - name: flux2

templates/provider/hmc/templates/crds/hmc.mirantis.com_clustertemplates.yaml

@@ -295,6 +295,10 @@ spec:
                 - kind
                 - name
                 type: object
+              chartVersion:
+                description: ChartVersion represents the version of the Helm Chart
+                  associated with this template.
+                type: string
               config:
                 description: |-
                   Config demonstrates available parameters for template customization,

templates/provider/hmc/templates/crds/hmc.mirantis.com_providertemplates.yaml

@@ -300,6 +300,10 @@ spec:
                 - kind
                 - name
                 type: object
+              chartVersion:
+                description: ChartVersion represents the version of the Helm Chart
+                  associated with this template.
+                type: string
               config:
                 description: |-
                   Config demonstrates available parameters for template customization,

templates/provider/hmc/templates/crds/hmc.mirantis.com_servicetemplates.yaml

@@ -284,6 +284,10 @@ spec:
                 - kind
                 - name
                 type: object
+              chartVersion:
+                description: ChartVersion represents the version of the Helm Chart
+                  associated with this template.
+                type: string
               config:
                 description: |-
                   Config demonstrates available parameters for template customization,