mirror of https://github.com/k3s-io/k3s
Add instance metadata from flag even when using image config.
parent
baa6b2ff20
commit
2c129e4d6a
|
@ -208,11 +208,15 @@ func main() {
|
|||
images = []string{imageConfig.Image}
|
||||
}
|
||||
for _, image := range images {
|
||||
metadata := imageConfig.Metadata
|
||||
if len(strings.TrimSpace(*instanceMetadata)) > 0 {
|
||||
metadata += "," + *instanceMetadata
|
||||
}
|
||||
gceImage := internalGCEImage{
|
||||
image: image,
|
||||
imageDesc: imageConfig.ImageDesc,
|
||||
project: imageConfig.Project,
|
||||
metadata: getImageMetadata(imageConfig.Metadata),
|
||||
metadata: getImageMetadata(metadata),
|
||||
machine: imageConfig.Machine,
|
||||
tests: imageConfig.Tests,
|
||||
resources: imageConfig.Resources,
|
||||
|
|
Loading…
Reference in New Issue