Merge upstream/main

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ichandrabhatta

HomebrewFormula/kiln.rb

@@ -5,20 +5,20 @@
 class Kiln < Formula
   desc ""
   homepage ""
-  version "0.116.0"
+  version "0.117.0"
 
   on_macos do
     if Hardware::CPU.intel?
-      url "https://github.com/pivotal-cf/kiln/releases/download/v0.116.0/kiln-darwin-amd64-0.116.0.tar.gz"
-      sha256 "f9214c2c517a7cc32341dc34384ecb37e9aba5129c37179e6f9e3443a218a4e6"
+      url "https://github.com/pivotal-cf/kiln/releases/download/v0.117.0/kiln-darwin-amd64-0.117.0.tar.gz"
+      sha256 "f04adb2dc4cd9e0ba04b5c7ac2b697aaf378f0a8db90f985b46fc7a9653d9468"
 
       define_method(:install) do
         bin.install "kiln"
       end
     end
     if Hardware::CPU.arm?
-      url "https://github.com/pivotal-cf/kiln/releases/download/v0.116.0/kiln-darwin-arm64-0.116.0.tar.gz"
-      sha256 "5f0e27d727a2bbd145a743830da4739dd15ed309968349e0a396c8d1db43366c"
+      url "https://github.com/pivotal-cf/kiln/releases/download/v0.117.0/kiln-darwin-arm64-0.117.0.tar.gz"
+      sha256 "2e671466ff82ca66fc5b37578a417e65415e348aad5331158ccc923cadb1d5ec"
 
       define_method(:install) do
         bin.install "kiln"
@@ -28,8 +28,8 @@ class Kiln < Formula
 
   on_linux do
     if Hardware::CPU.intel? && Hardware::CPU.is_64_bit?
-      url "https://github.com/pivotal-cf/kiln/releases/download/v0.116.0/kiln-linux-amd64-0.116.0.tar.gz"
-      sha256 "3ba6966934bf6c25f2adbcde1907884a5505319dd1f3018c356275f5ccbc3cec"
+      url "https://github.com/pivotal-cf/kiln/releases/download/v0.117.0/kiln-linux-amd64-0.117.0.tar.gz"
+      sha256 "e2e4f08b07155819e4577d2ff552c126a9190243891a9d496c80f6187ac5f7c6"
       define_method(:install) do
         bin.install "kiln"
       end

TILE_AUTHOR_GUIDE.md

@@ -129,6 +129,43 @@ The property definition in [releen/hello-tile/properties/hello.yml](https://gith
 in referenced in `base.yml` using `$( property "port" )`.
 Most other product template part functions behave similarly.
 
+### Carvel / Kubernetes Tile Metadata (`base.yml`)
+
+When building Carvel/Kubernetes tiles using `kiln carvel bake`, the `base.yml` metadata file supports the following additional top-level fields:
+
+- `supports_parallel_deploys` (boolean): Indicates whether the tile supports parallel deployments in Ops Manager.
+- `requires_product_versions` (list): Specifies product version dependencies required by the tile.
+  - `name`: Product name.
+  - `version`: Version requirement constraint (e.g. `>=1.0.0`).
+  - `optional` (boolean): Whether the dependency is optional.
+- `compatible_kubernetes_distributions` (list): Supported Kubernetes distribution criteria.
+  - `name`: Distribution name (e.g. `k0s`).
+  - `version`: Version requirement constraint (e.g. `>0.0.0`).
+- `package_installs` (list): References to Carvel package install templates.
+
+Example Carvel tile `base.yml`:
+
+```yaml
+name: k8s-tile-name
+label: "My K8s Tile"
+icon_image: $( icon )
+metadata_version: "3.2.0"
+minimum_version_for_upgrade: 0.0.0
+product_version: $( version )
+rank: 1
+serial: false
+supports_parallel_deploys: true
+requires_product_versions:
+  - name: some-other-product
+    version: ">=1.0.0"
+    optional: true
+compatible_kubernetes_distributions:
+  - name: k0s
+    version: ">0.0.0"
+package_installs:
+  - $( package "my-package" )
+```
+
 ## <a id="bosh-release-tarballs"></a> Managing BOSH Release Tarballs
 
 `kiln fetch` downloads BOSH Release Tarballs from any of the following "sources"

internal/acceptance/carvel/carvel_workflow_test.go

@@ -287,12 +287,12 @@ var _ = Describe("carvel full workflow", Ordered, func() {
 
 		Expect(lock.Releases).To(HaveLen(1))
 		rel := lock.Releases[0]
-		Expect(rel.Name).To(Equal("k8s-tile-test"))
+		Expect(rel.Name).To(Equal("k8s-tile-test-pkg"))
 		Expect(rel.Version).To(HavePrefix("0.1.1+"))
 		Expect(rel.Version).To(MatchRegexp(`^0\.1\.1\+[0-9a-f]{12}$`))
 		Expect(rel.SHA1).NotTo(BeEmpty(), "lock must contain SHA1 of uploaded tarball")
 		Expect(rel.RemoteSource).To(Equal("artifactory"))
-		Expect(rel.RemotePath).To(Equal("bosh-releases/k8s-tile-test/k8s-tile-test-" + rel.Version + ".tgz"))
+		Expect(rel.RemotePath).To(Equal("bosh-releases/k8s-tile-test-pkg/k8s-tile-test-pkg-" + rel.Version + ".tgz"))
 
 		gitInTile("add", "Kilnfile.lock")
 		gitInTile("commit", "-m", "add Kilnfile.lock from upload")

internal/acceptance/carvel/fixtures/sample-tile/base.yml

@@ -17,3 +17,8 @@ package_installs:
 compatible_kubernetes_distributions:
 - name: k0s
   version: '>0.0.0'
+supports_parallel_deploys: true
+requires_product_versions:
+- name: some-other-product
+  version: '>=1.0.0'
+  optional: true

internal/carvel/baker.go

@@ -38,6 +38,7 @@ type Baker interface {
 	KilnBake(destination string) error
 	ParseMetadata(source string) error
 	GetName() string
+	GetBoshReleaseName() string
 	// GetVersion returns the product version from base.yml or the version file.
 	GetVersion() (string, error)
 	// GetReleaseVersion returns the BOSH release version, which includes a
@@ -98,6 +99,9 @@ func (b *baker) Bake(source string, kilnfile cargo.Kilnfile, kilnfileLock cargo.
 	if err != nil {
 		return err
 	}
+	if b.metadata.Name == "" {
+		return errors.New("missing required field 'name' in tile metadata (base.yml)")
+	}
 	if err := validateVariables(b.metadata.Variables); err != nil {
 		return err
 	}
@@ -149,6 +153,9 @@ func (b *baker) BakeFromLockfile(source string, kilnfile cargo.Kilnfile, kilnfil
 	if err != nil {
 		return err
 	}
+	if b.metadata.Name == "" {
+		return errors.New("missing required field 'name' in tile metadata (base.yml)")
+	}
 	if err := validateVariables(b.metadata.Variables); err != nil {
 		return err
 	}
@@ -159,8 +166,8 @@ func (b *baker) BakeFromLockfile(source string, kilnfile cargo.Kilnfile, kilnfil
 	}
 	b.progress(fmt.Sprintf("Tile: %s version %s (metadata_version %s)", b.metadata.Name, ver, b.metadata.MetadataVersion))
 
-	if releaseLock.Name != b.metadata.Name {
-		return fmt.Errorf("lockfile release name %q does not match tile name %q", releaseLock.Name, b.metadata.Name)
+	if releaseLock.Name != b.GetBoshReleaseName() {
+		return fmt.Errorf("lockfile release name %q does not match tile-derived name %q", releaseLock.Name, b.GetBoshReleaseName())
 	}
 
 	b.releaseVersion = releaseLock.Version
@@ -202,7 +209,7 @@ func (b *baker) BakeFromLockfile(source string, kilnfile cargo.Kilnfile, kilnfil
 		return err
 	}
 
-	destTarball := path.Join(releasesDir, b.metadata.Name+"-"+releaseLock.Version+".tgz")
+	destTarball := path.Join(releasesDir, b.GetBoshReleaseName()+"-"+releaseLock.Version+".tgz")
 
 	b.progress("Copying cached BOSH release from " + localTarball)
 	b.log("copying cached BOSH release from " + localTarball)
@@ -228,7 +235,7 @@ func (b *baker) GetReleaseTarball() (string, error) {
 	if b.releaseVersion == "" {
 		return "", fmt.Errorf("release version not set -- call Bake() or BakeFromLockfile() first")
 	}
-	tarball := path.Join(b.destination, "releases", b.metadata.Name+"-"+b.releaseVersion+".tgz")
+	tarball := path.Join(b.destination, "releases", b.GetBoshReleaseName()+"-"+b.releaseVersion+".tgz")
 	if _, err := os.Stat(tarball); err != nil {
 		return "", fmt.Errorf("release tarball not found at %s: %w", tarball, err)
 	}
@@ -300,6 +307,13 @@ func (b *baker) hookModeGroups() []hookModeGroup {
 	}
 }
 
+func (b *baker) GetBoshReleaseName() string {
+	if b.metadata.Name == "" {
+		return ""
+	}
+	return b.metadata.Name + "-pkg"
+}
+
 func (b *baker) GetReleaseVersion() string {
 	return b.releaseVersion
 }
@@ -336,7 +350,7 @@ func (b *baker) progress(message string) {
 
 // deduplicateConsumes removes duplicate BOSH link consumer entries by name.
 // Identical duplicates are dropped silently. If two entries share a name but
-// differ in type or optional, the first is kept and a WARNING is emitted —
+// differ in any field, the first is kept and a WARNING is emitted —
 // BOSH rejects duplicate link names in job.MF, so the second is always ignored.
 func (b *baker) deduplicateConsumes(consumes []boshLinkConsumer) []boshLinkConsumer {
 	seen := make(map[string]boshLinkConsumer)
@@ -351,19 +365,59 @@ func (b *baker) deduplicateConsumes(consumes []boshLinkConsumer) []boshLinkConsu
 		if existing != c {
 			b.progress(fmt.Sprintf(
 				"WARNING: duplicate BOSH link consumer name %q found across packageinstalls.\n"+
-					"  Keeping:  {type: %s, optional: %v}\n"+
-					"  Ignoring: {type: %s, optional: %v}\n"+
+					"  Keeping:  {type: %s, optional: %v, from: %s, deployment: %s}\n"+
+					"  Ignoring: {type: %s, optional: %v, from: %s, deployment: %s}\n"+
 					"  Ensure all packageinstalls agree on the link definition.",
-				c.Name, existing.Type, existing.Optional, c.Type, c.Optional,
+				c.Name,
+				existing.Type, existing.Optional, existing.From, existing.Deployment,
+				c.Type, c.Optional, c.From, c.Deployment,
 			))
 		}
 	}
 	return deduped
 }
 
+// readJobSpecOverlays reads all *.job-spec-overlay.yml sidecars for the tile's
+// package installs and returns the merged slice of boshLinkConsumer entries.
+func (b *baker) readJobSpecOverlays() ([]boshLinkConsumer, error) {
+	var all []boshLinkConsumer
+	for _, entry := range b.metadata.PackageInstalls {
+		entry = strings.Trim(entry, "$() ")
+		entry = strings.TrimPrefix(entry, "package")
+		entry = strings.Trim(entry, `"' `)
+
+		overlayPath := path.Join(b.source, "packageinstalls", entry+".job-spec-overlay.yml")
+		data, err := os.ReadFile(overlayPath)
+		if errors.Is(err, os.ErrNotExist) {
+			continue
+		}
+		if err != nil {
+			return nil, fmt.Errorf("reading %s: %w", overlayPath, err)
+		}
+		var overlay jobSpecOverlay
+		if err := yaml.Unmarshal(data, &overlay); err != nil {
+			return nil, fmt.Errorf("parsing %s: %w", overlayPath, err)
+		}
+		all = append(all, overlay.Consumes...)
+	}
+	return all, nil
+}
+
 // boshLinkConsumer declares a BOSH link the registry-data job should consume.
 // Populated from per-packageinstall *.job-spec-overlay.yml sidecar files.
+// When From or Deployment is set, kiln also emits a cross-deployment consumes
+// entry for the link in the runtime config addon job.
 type boshLinkConsumer struct {
+	Name       string `yaml:"name"`
+	Type       string `yaml:"type"`
+	Optional   bool   `yaml:"optional"`
+	From       string `yaml:"from,omitempty"`
+	Deployment string `yaml:"deployment,omitempty"`
+}
+
+// boshConsumes is the BOSH job spec consumes schema: name, type, and optional only.
+// From/Deployment are runtime-config-only and must not appear in the job spec.
+type boshConsumes struct {
 	Name     string `yaml:"name"`
 	Type     string `yaml:"type"`
 	Optional bool   `yaml:"optional"`
@@ -372,6 +426,8 @@ type boshLinkConsumer struct {
 // jobSpecOverlay is the schema for <entry>.job-spec-overlay.yml sidecar files.
 // kiln reads these from packageinstalls/ and merges the consumes entries into
 // the generated registry-data job.MF alongside the hardcoded cluster-info link.
+// Entries that set from or deployment are also emitted as cross-deployment
+// consumes on the runtime config addon job.
 type jobSpecOverlay struct {
 	Consumes []boshLinkConsumer `yaml:"consumes"`
 }
@@ -434,7 +490,6 @@ files:
 
 	registryDataTemplates := ""
 	registryDataProperties := ""
-	var allConsumes []boshLinkConsumer
 
 	b.progress("  Configuring package installs")
 	for _, entry := range b.metadata.PackageInstalls {
@@ -495,21 +550,6 @@ files:
 			overlayContent = string(overlayData)
 		}
 
-		// Read optional job-spec-overlay sidecar to discover additional BOSH link consumptions.
-		jobSpecOverlayPath := path.Join(b.source, "packageinstalls", entry+".job-spec-overlay.yml")
-		overlayData, overlayErr = os.ReadFile(jobSpecOverlayPath)
-		if overlayErr != nil {
-			if !errors.Is(overlayErr, os.ErrNotExist) {
-				return overlayErr
-			}
-		} else {
-			var overlay jobSpecOverlay
-			if parseErr := yaml.Unmarshal(overlayData, &overlay); parseErr != nil {
-				return fmt.Errorf("parsing %s: %w", jobSpecOverlayPath, parseErr)
-			}
-			allConsumes = append(allConsumes, overlay.Consumes...)
-		}
-
 		manifestTemplate := generateManifestTemplate(entry, overlayContent)
 
 		err = os.WriteFile(
@@ -522,9 +562,17 @@ files:
 		}
 	}
 
+	allConsumes, err := b.readJobSpecOverlays()
+	if err != nil {
+		return err
+	}
 	deduped := b.deduplicateConsumes(allConsumes)
 
-	registryDataSpec, err := buildRegistryDataSpec(registryDataTemplates, registryDataProperties, deduped)
+	boshLinks := make([]boshConsumes, len(deduped))
+	for i, c := range deduped {
+		boshLinks[i] = boshConsumes{Name: c.Name, Type: c.Type, Optional: c.Optional}
+	}
+	registryDataSpec, err := buildRegistryDataSpec(registryDataTemplates, registryDataProperties, boshLinks)
 	if err != nil {
 		return err
 	}
@@ -583,7 +631,7 @@ properties: {}
 // buildRegistryDataSpec constructs the job.MF content for the registry-data BOSH job.
 // It always includes the hardcoded cluster-info link and appends any additional links
 // collected from *.job-spec-overlay.yml sidecars in the packageinstalls/ directory.
-func buildRegistryDataSpec(templates, properties string, additionalLinks []boshLinkConsumer) (string, error) {
+func buildRegistryDataSpec(templates, properties string, additionalLinks []boshConsumes) (string, error) {
 	extraLinks := ""
 	if len(additionalLinks) > 0 {
 		data, err := yaml.Marshal(additionalLinks)
@@ -741,6 +789,8 @@ func (b *baker) generateBaseYaml() error {
 	meta.Rank = b.metadata.Rank
 	meta.Serial = b.metadata.Serial
 	meta.CompatibleKubernetesDistributions = b.metadata.CompatibleKubernetesDistributions
+	meta.SupportsParallelDeploys = b.metadata.SupportsParallelDeploys
+	meta.RequiresProductVersions = b.metadata.RequiresProductVersions
 	meta.FormTypes = b.metadata.FormTypes
 	meta.PropertyBlueprints = b.metadata.PropertyBlueprints
 	meta.Variables = b.metadata.Variables
@@ -756,7 +806,7 @@ func (b *baker) generateBaseYaml() error {
 	}
 
 	meta.Releases = []string{
-		`$( release "` + b.metadata.Name + `" )`,
+		`$( release "` + b.GetBoshReleaseName() + `" )`,
 	}
 	for _, ar := range b.metadata.AdditionalReleases {
 		meta.Releases = append(meta.Releases, `$( release "`+ar.Name+`" )`)
@@ -849,11 +899,30 @@ func (b *baker) generateRuntimeConfigs() error {
 		}
 	}
 
+	allConsumes, err := b.readJobSpecOverlays()
+	if err != nil {
+		return err
+	}
+	deduped := b.deduplicateConsumes(allConsumes)
+
+	consumesMap := make(map[string]models.JobConsumes)
+	for _, c := range deduped {
+		if c.From != "" || c.Deployment != "" {
+			consumesMap[c.Name] = models.JobConsumes{
+				From:       c.From,
+				Deployment: c.Deployment,
+			}
+		}
+	}
+
 	registryDataJob := models.Job{
 		Name:       "registry-data",
-		Release:    b.metadata.Name,
+		Release:    b.GetBoshReleaseName(),
 		Properties: registryDataProps,
 	}
+	if len(consumesMap) > 0 {
+		registryDataJob.Consumes = consumesMap
+	}
 
 	releases := []string{`$( release "` + b.metadata.Name + `" )`}
 	addonJobs := []models.Job{registryDataJob}
@@ -1050,12 +1119,12 @@ func (b *baker) createBoshRelease() error {
 	releaseVersion := buildReleaseVersion(productVersion, fingerprint)
 	b.releaseVersion = releaseVersion
 
-	finalTarball := path.Join(b.destination, "releases", b.metadata.Name+"-"+releaseVersion+".tgz")
+	finalTarball := path.Join(b.destination, "releases", b.GetBoshReleaseName()+"-"+releaseVersion+".tgz")
 	cmd := exec.Command("bosh",
 		"create-release",
 		"--dir="+dirName,
 		"--force",
-		"--name", b.metadata.Name,
+		"--name", b.GetBoshReleaseName(),
 		"--version", releaseVersion,
 		"--tarball", finalTarball)
 	b.log("executing " + cmd.String())