Skip to content

Detect target types automatically #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Gchbg merged 1 commit into from
Jul 28, 2026
Merged

Detect target types automatically #445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 27 additions & 54 deletions glci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,58 +1,31 @@
flavors:
- target_type: Aliyun
flavor: ali-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-arm64
- target_type: AWS
flavor: aws-gardener_fips_prod-amd64
- target_type: AWS
flavor: aws-gardener_fips_prod-arm64
- target_type: Azure
flavor: azure-gardener_prod-amd64
- target_type: Azure
flavor: azure-gardener_prod-arm64
- target_type: GCP
flavor: gcp-gardener_prod-amd64
- target_type: GCP
flavor: gcp-gardener_prod-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod-amd64
- target_type: OpenStack
flavor: openstack-gardener-metal_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-arm64
- target_type: AWS
flavor: aws-gardener_fips_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_fips_prod_usi-arm64
- target_type: Azure
flavor: azure-gardener_prod_usi-amd64
- target_type: Azure
flavor: azure-gardener_prod_usi-arm64
- target_type: GCP
flavor: gcp-gardener_prod_usi-amd64
- target_type: GCP
flavor: gcp-gardener_prod_usi-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod_usi-amd64
- target_type: OpenStack
flavor: openstack-gardener-metal_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
- flavor: ali-gardener_prod-amd64
- flavor: aws-gardener_prod-amd64
- flavor: aws-gardener_prod-arm64
- flavor: aws-gardener_fips_prod-amd64
- flavor: aws-gardener_fips_prod-arm64
- flavor: azure-gardener_prod-amd64
- flavor: azure-gardener_prod-arm64
- flavor: gcp-gardener_prod-amd64
- flavor: gcp-gardener_prod-arm64
- flavor: openstack-gardener_prod-amd64
- flavor: openstack-gardener-metal_prod-amd64
- flavor: aws-gardener_prod_usi-amd64
- flavor: aws-gardener_prod_usi-arm64
- flavor: aws-gardener_fips_prod_usi-amd64
- flavor: aws-gardener_fips_prod_usi-arm64
- flavor: azure-gardener_prod_usi-amd64
- flavor: azure-gardener_prod_usi-arm64
- flavor: gcp-gardener_prod_usi-amd64
- flavor: gcp-gardener_prod_usi-arm64
- flavor: openstack-gardener_prod_usi-amd64
- flavor: openstack-gardener-metal_prod_usi-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
publishing:
credentials:
source: Vault
Expand Down
27 changes: 9 additions & 18 deletions glci_1592.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,13 @@
flavors:
- target_type: Aliyun
flavor: ali-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-arm64
- target_type: Azure
flavor: azure-gardener_prod-amd64
- target_type: Azure
flavor: azure-gardener_prod-arm64
- target_type: GCP
flavor: gcp-gardener_prod-amd64
- target_type: GCP
flavor: gcp-gardener_prod-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod-amd64
- target_type: OpenStack
flavor: openstackbaremetal-gardener_prod-amd64
- flavor: ali-gardener_prod-amd64
- flavor: aws-gardener_prod-amd64
- flavor: aws-gardener_prod-arm64
- flavor: azure-gardener_prod-amd64
- flavor: azure-gardener_prod-arm64
- flavor: gcp-gardener_prod-amd64
- flavor: gcp-gardener_prod-arm64
- flavor: openstack-gardener_prod-amd64
- flavor: openstackbaremetal-gardener_prod-amd64
publishing:
credentials:
source: Vault
Expand Down
78 changes: 26 additions & 52 deletions glci_1877.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,56 +1,30 @@
flavors:
- target_type: Aliyun
flavor: ali-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-arm64
- target_type: AWS
flavor: aws-gardener_fips_prod-amd64
- target_type: AWS
flavor: aws-gardener_fips_prod-arm64
- target_type: Azure
flavor: azure-gardener_prod-amd64
- target_type: Azure
flavor: azure-gardener_prod-arm64
- target_type: GCP
flavor: gcp-gardener_prod-amd64
- target_type: GCP
flavor: gcp-gardener_prod-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod-amd64
- target_type: OpenStack
flavor: openstackbaremetal-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-arm64
- target_type: AWS
flavor: aws-gardener_fips_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_fips_prod_usi-arm64
- target_type: Azure
flavor: azure-gardener_prod_usi-amd64
- target_type: Azure
flavor: azure-gardener_prod_usi-arm64
- target_type: GCP
flavor: gcp-gardener_prod_usi-amd64
- target_type: GCP
flavor: gcp-gardener_prod_usi-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
- flavor: ali-gardener_prod-amd64
- flavor: aws-gardener_prod-amd64
- flavor: aws-gardener_prod-arm64
- flavor: aws-gardener_fips_prod-amd64
- flavor: aws-gardener_fips_prod-arm64
- flavor: azure-gardener_prod-amd64
- flavor: azure-gardener_prod-arm64
- flavor: gcp-gardener_prod-amd64
- flavor: gcp-gardener_prod-arm64
- flavor: openstack-gardener_prod-amd64
- flavor: openstackbaremetal-gardener_prod-amd64
- flavor: aws-gardener_prod_usi-amd64
- flavor: aws-gardener_prod_usi-arm64
- flavor: aws-gardener_fips_prod_usi-amd64
- flavor: aws-gardener_fips_prod_usi-arm64
- flavor: azure-gardener_prod_usi-amd64
- flavor: azure-gardener_prod_usi-arm64
- flavor: gcp-gardener_prod_usi-amd64
- flavor: gcp-gardener_prod_usi-arm64
- flavor: openstack-gardener_prod_usi-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
publishing:
credentials:
source: Vault
Expand Down
69 changes: 23 additions & 46 deletions glci_2150.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,27 @@
flavors:
- target_type: Aliyun
flavor: ali-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-arm64
- target_type: Azure
flavor: azure-gardener_prod-amd64
- target_type: Azure
flavor: azure-gardener_prod-arm64
- target_type: GCP
flavor: gcp-gardener_prod-amd64
- target_type: GCP
flavor: gcp-gardener_prod-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod-amd64
- target_type: OpenStack
flavor: openstack-gardener-metal_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-arm64
- target_type: Azure
flavor: azure-gardener_prod_usi-amd64
- target_type: Azure
flavor: azure-gardener_prod_usi-arm64
- target_type: GCP
flavor: gcp-gardener_prod_usi-amd64
- target_type: GCP
flavor: gcp-gardener_prod_usi-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod_usi-amd64
- target_type: OpenStack
flavor: openstack-gardener-metal_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
- flavor: ali-gardener_prod-amd64
- flavor: aws-gardener_prod-amd64
- flavor: aws-gardener_prod-arm64
- flavor: azure-gardener_prod-amd64
- flavor: azure-gardener_prod-arm64
- flavor: gcp-gardener_prod-amd64
- flavor: gcp-gardener_prod-arm64
- flavor: openstack-gardener_prod-amd64
- flavor: openstack-gardener-metal_prod-amd64
- flavor: aws-gardener_prod_usi-amd64
- flavor: aws-gardener_prod_usi-arm64
- flavor: azure-gardener_prod_usi-amd64
- flavor: azure-gardener_prod_usi-arm64
- flavor: gcp-gardener_prod_usi-amd64
- flavor: gcp-gardener_prod_usi-arm64
- flavor: openstack-gardener_prod_usi-amd64
- flavor: openstack-gardener-metal_prod_usi-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
publishing:
credentials:
source: Vault
Expand Down
75 changes: 25 additions & 50 deletions glci_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,54 +1,29 @@
flavors:
- target_type: Aliyun
flavor: ali-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod-arm64
- target_type: AWS
flavor: aws-gardener_fips_prod-amd64
- target_type: AWS
flavor: aws-gardener_fips_prod-arm64
- target_type: Azure
flavor: azure-gardener_prod-amd64
- target_type: Azure
flavor: azure-gardener_prod-arm64
- target_type: GCP
flavor: gcp-gardener_prod-amd64
- target_type: GCP
flavor: gcp-gardener_prod-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_usi-arm64
- target_type: AWS
flavor: aws-gardener_fips_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_fips_prod_usi-arm64
- target_type: Azure
flavor: azure-gardener_prod_usi-amd64
- target_type: Azure
flavor: azure-gardener_prod_usi-arm64
- target_type: GCP
flavor: gcp-gardener_prod_usi-amd64
- target_type: GCP
flavor: gcp-gardener_prod_usi-arm64
- target_type: OpenStack
flavor: openstack-gardener_prod_usi-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- target_type: AWS
flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- target_type: Azure
flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- target_type: GCP
flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
- flavor: ali-gardener_prod-amd64
- flavor: aws-gardener_prod-amd64
- flavor: aws-gardener_prod-arm64
- flavor: aws-gardener_fips_prod-amd64
- flavor: aws-gardener_fips_prod-arm64
- flavor: azure-gardener_prod-amd64
- flavor: azure-gardener_prod-arm64
- flavor: gcp-gardener_prod-amd64
- flavor: gcp-gardener_prod-arm64
- flavor: openstack-gardener_prod-amd64
- flavor: aws-gardener_prod_usi-amd64
- flavor: aws-gardener_prod_usi-arm64
- flavor: aws-gardener_fips_prod_usi-amd64
- flavor: aws-gardener_fips_prod_usi-arm64
- flavor: azure-gardener_prod_usi-amd64
- flavor: azure-gardener_prod_usi-arm64
- flavor: gcp-gardener_prod_usi-amd64
- flavor: gcp-gardener_prod_usi-arm64
- flavor: openstack-gardener_prod_usi-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-amd64
- flavor: aws-gardener_prod_tpm2_trustedboot-arm64
- flavor: azure-gardener_prod_tpm2_trustedboot-amd64
- flavor: azure-gardener_prod_tpm2_trustedboot-arm64
- flavor: gcp-gardener_prod_tpm2_trustedboot-amd64
- flavor: gcp-gardener_prod_tpm2_trustedboot-arm64
publishing:
credentials:
source: Vault
Expand Down
27 changes: 13 additions & 14 deletions internal/publisher/publish.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ func (p *Publisher) publish(ctx context.Context, version, commit string, omitCom
for i, flavorConfig := range p.flavors {
fetchManifests.Go(func(ctx context.Context) (parallel.ResultSyncFunc, error) {
manifestKey := fmt.Sprintf("meta/singles/%s-%s-%.8s", flavorConfig.Flavor, version, commit)
ctx = log.WithValues(ctx, "flavor", flavorConfig.Flavor, "targetType", flavorConfig.TargetType)
ctx = log.WithValues(ctx, "flavor", flavorConfig.Flavor)

log.Info(ctx, "Retrieving manifest")
manifest, er := cloudprovider.GetManifest(ctx, p.manifestSource, manifestKey)
Expand Down Expand Up @@ -85,21 +85,20 @@ func (p *Publisher) publish(ctx context.Context, version, commit string, omitCom
manifest = targetManifest
}

for _, target := range p.targets {
if target.CanPublish(manifest) {
return func() error {
publications[i] = cloudprovider.Publication{
Flavor: flavorConfig.Flavor,
Manifest: manifest,
Target: target,
}

return nil
}, nil
}
var target cloudprovider.PublishingTarget
target, er = p.selectTarget(manifest, flavorConfig.Flavor)
if er != nil {
return nil, er
}
return func() error {
publications[i] = cloudprovider.Publication{
Flavor: flavorConfig.Flavor,
Manifest: manifest,
Target: target,
}

return nil, fmt.Errorf("no publishing target for %s", flavorConfig.Flavor)
return nil
}, nil
})
}
err = fetchManifests.Wait()
Expand Down
Loading