Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-01-25 23:06:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

cli: fix supportedVersions during upgrade check

Browse Source 
Previously the service version was always 0.0.0
This commit is contained in:
Otto Bittner 2023-05-16 15:21:15 +02:00
parent 13f1eb23d7
commit 3b3be85841
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli/internal/cmd/upgradecheck.go
View File

@ -319,10 +319,9 @@ type supportedVersionInfo struct {
// supportedVersions returns slices of supported versions. // supportedVersions returns slices of supported versions.
func (v *versionCollector) supportedVersions(ctx context.Context, version, currentK8sVersion string) (supportedVersionInfo, error) { func (v *versionCollector) supportedVersions(ctx context.Context, version, currentK8sVersion string) (supportedVersionInfo, error) {
k8sVersions := versions.SupportedK8sVersions() k8sVersions := versions.SupportedK8sVersions()
serviceVersion, err := helm.AvailableServiceVersions() // Each CLI comes with a set of services that have the same version as the CLI.
if err != nil { serviceVersion := compatibility.EnsurePrefixV(constants.VersionInfo())
return supportedVersionInfo{}, fmt.Errorf("loading service versions: %w", err)
}
imageVersions, err := v.newImages(ctx, version) imageVersions, err := v.newImages(ctx, version)
if err != nil { if err != nil {
return supportedVersionInfo{}, fmt.Errorf("loading image versions: %w", err) return supportedVersionInfo{}, fmt.Errorf("loading image versions: %w", err)

10
cli/internal/helm/loader.go
View File

@ -100,16 +100,6 @@ func NewLoader(csp cloudprovider.Provider, k8sVersion versions.ValidK8sVersion)
} }
} }
// AvailableServiceVersions returns the chart version number of the bundled service versions.
func AvailableServiceVersions() (string, error) {
servicesChart, err := loadChartsDir(helmFS, constellationServicesInfo.path)
if err != nil {
return "", fmt.Errorf("loading constellation-services chart: %w", err)
}
return compatibility.EnsurePrefixV(servicesChart.Metadata.Version), nil
}
// Load the embedded helm charts. // Load the embedded helm charts.
func (i *ChartLoader) Load(config *config.Config, conformanceMode bool, masterSecret, salt []byte) ([]byte, error) { func (i *ChartLoader) Load(config *config.Config, conformanceMode bool, masterSecret, salt []byte) ([]byte, error) {
ciliumRelease, err := i.loadRelease(ciliumInfo) ciliumRelease, err := i.loadRelease(ciliumInfo)