Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-09-28 23:09:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

misc: skip message about community license with marketplace image

Browse source
This commit is contained in:
Malte Poll 2024-03-01 17:06:02 +01:00
parent 1c8a7e4c22
commit f94c6ca0d4
12 changed files with 66 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
internal/config/config.go
View file

@ -720,7 +720,8 @@ func (c *Config) DeployYawolLoadBalancer() bool {
func (c *Config) UseMarketplaceImage() bool {
return (c.Provider.Azure != nil && c.Provider.Azure.UseMarketplaceImage != nil && *c.Provider.Azure.UseMarketplaceImage) ||
(c.Provider.GCP != nil && c.Provider.GCP.UseMarketplaceImage != nil && *c.Provider.GCP.UseMarketplaceImage) ||
(c.Provider.AWS != nil && c.Provider.AWS.UseMarketplaceImage != nil && *c.Provider.AWS.UseMarketplaceImage)
(c.Provider.AWS != nil && c.Provider.AWS.UseMarketplaceImage != nil && *c.Provider.AWS.UseMarketplaceImage) ||
(c.Provider.OpenStack != nil && c.Provider.OpenStack.Cloud == "stackit")
}
// Validate checks the config values and returns validation errors.

3
internal/imagefetcher/imagefetcher.go
View file

@ -131,6 +131,9 @@ func buildMarketplaceImage(payload marketplaceImagePayload) (string, error) {
case cloudprovider.AWS:
// For AWS, we use the AMI alias, which just needs the version and infers the rest transparently.
return fmt.Sprintf("resolve:ssm:/aws/service/marketplace/prod-77ylkenlkgufs/%s", payload.imgInfo.Version), nil
case cloudprovider.OpenStack:
// For OpenStack / STACKIT, we use the image reference directly.
return getReferenceFromImageInfo(payload.provider, payload.attestationVariant.String(), payload.imgInfo, payload.filters...)
default:
return "", fmt.Errorf("marketplace images are not supported for csp %s", payload.provider.String())
}

2
internal/license/license.go
View file

@ -13,6 +13,8 @@ type Action string
const (
// CommunityLicense is used by everyone who has not bought an enterprise license.
CommunityLicense = "00000000-0000-0000-0000-000000000000"
// MarketplaceLicense is used by everyone who uses a marketplace image.
MarketplaceLicense = "11111111-1111-1111-1111-111111111111"
// Init action denotes the initialization of a Constellation cluster.
Init Action = "init"