Skip to content

Commit

Permalink
Feat/cld 7451 (#1041)
Browse files Browse the repository at this point in the history
* [CLD-7451]Skip utility with already registered in argocd

* [CLD-7451]Fix file stat validate

* [CLD-7451]remove comment

* [CLD-7451]Fix logic to skip registered unmanaged utility
  • Loading branch information
andrleite authored Apr 24, 2024
1 parent 217f3bb commit 0e5605e
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 7 deletions.
14 changes: 7 additions & 7 deletions internal/provisioner/utility/argo_utility.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,14 +84,14 @@ func ProvisionUtilityArgocd(utilityName, tempDir, clusterID string, allowCIDRRan
}

// Perform substitution
_, err = os.Stat(outputFilePath)
_, err = os.Stat(inputFilePath)
if os.IsNotExist(err) {
err = substituteValues(inputFilePath, outputFilePath, replacements)
if err != nil {
return errors.Wrap(err, "failed to substitute values")
} else {
logger.WithField("Check the output file:", outputFilePath).Info("Substitution successful.")
}
return errors.Wrap(err, "custom values template file does not exist")
}

err = substituteValues(inputFilePath, outputFilePath, replacements)
if err != nil {
return errors.Wrap(err, "failed to substitute values")
}

commitMsg := "Adding: utility:" + utilityName + " to cluster: " + clusterID
Expand Down
11 changes: 11 additions & 0 deletions internal/provisioner/utility/utility_group.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,17 @@ func (group utilityGroup) ProvisionUtilityGroup() error {
for _, utility := range group.utilities {
logger.Infof("Provisioning utility %s\n", utility.Name())

// Check ActualVersion for the cluster creation phase to avoid invalid memory address
if utility.ActualVersion() != nil {
if utility.ActualVersion().Chart == "unmanaged" && group.cluster.DesiredUtilityVersion(utility.Name()).IsEmpty() {
logger.WithFields(log.Fields{
"unmanaged-action": "skip",
"utility": utility.Name(),
}).Info("Utility has already defined in argocd; skippping...")
continue
}
}

if utility.DesiredVersion().IsEmpty() {
logger.WithField("utility", utility.Name()).Info("Skipping reprovision")
} else {
Expand Down

0 comments on commit 0e5605e

Please sign in to comment.