Unverified Commit 8ff54d8f authored by Di Xu's avatar Di Xu Committed by GitHub
Browse files

generate hr name based on namespaced name of chart (#153)

No related merge requests found
Showing with 6 additions and 2 deletions
+6 -2
......@@ -251,7 +251,7 @@ func (deployer *Deployer) populateHelmRelease(desc *appsapi.Description) error {
hr := &appsapi.HelmRelease{
ObjectMeta: metav1.ObjectMeta{
Name: fmt.Sprintf("%s-%s", desc.Name, chartRef.Name),
Name: utils.GenerateHelmReleaseName(desc.Name, chartRef),
Namespace: desc.Namespace,
Labels: map[string]string{
known.ObjectCreatedByLabel: known.ClusternetHubName,
......
......@@ -196,7 +196,7 @@ func GetOverrides(descLister applisters.DescriptionLister, hr *appsapi.HelmRelea
var found bool
var index int
for idx, chart := range desc.Spec.Charts {
if chart.Namespace == hr.Namespace && chart.Name == hr.Name {
if GenerateHelmReleaseName(desc.Name, chart) == hr.Name {
found = true
index = idx
break
......@@ -223,6 +223,10 @@ func GetOverrides(descLister applisters.DescriptionLister, hr *appsapi.HelmRelea
return overrideValues, nil
}
func GenerateHelmReleaseName(descName string, chartRef appsapi.ChartReference) string {
return fmt.Sprintf("%s-%s-%s", descName, chartRef.Namespace, chartRef.Name)
}
func UpdateHelmReleaseStatus(ctx context.Context, clusternetClient *clusternetclientset.Clientset,
hrLister applisters.HelmReleaseLister, descLister applisters.DescriptionLister,
hr *appsapi.HelmRelease, status *appsapi.HelmReleaseStatus) error {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment